Skip to content

Commit

Permalink
Squire trvthnvke
Browse files Browse the repository at this point in the history
  • Loading branch information
@SirSwagmeyer
SirSwagmeyer authored Jan 1, 2025
1 parent 7667afa commit 644961a
Showing 1 changed file with 19 additions and 20 deletions.
39 changes: 19 additions & 20 deletions code/modules/jobs/job_types/roguetown/youngfolk/squire.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,27 @@
/datum/outfit/job/roguetown/squire/lancer/pre_equip(mob/living/carbon/human/H)
r_hand = /obj/item/rogueweapon/spear
armor = /obj/item/clothing/suit/roguetown/armor/chainmail
gloves = /obj/item/clothing/gloves/roguetown/leather
gloves = /obj/item/clothing/gloves/roguetown/chain
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
pants = /obj/item/clothing/under/roguetown/chainlegs/iron
pants = /obj/item/clothing/under/roguetown/chainlegs/
backr = /obj/item/storage/backpack/rogue/satchel
backpack_contents = list(
/obj/item/storage/belt/rogue/pouch,
/obj/item/clothing/neck/roguetown/chaincoif
)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/maces, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) //Every other subclass gets at least 1 other respective skill in apprentice
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) //They deserve this
H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) ///Riding literally doesn't matter anyway
H.change_stat("strength", 1)
H.change_stat("perception", 1)
H.change_stat("endurance", 1)
H.change_stat("constitution", 1)
H.change_stat("intelligence", 1)
H.change_stat("speed", 1)
Expand All @@ -92,40 +91,40 @@

/datum/outfit/job/roguetown/squire/footman/pre_equip(mob/living/carbon/human/H)
armor = /obj/item/clothing/suit/roguetown/armor/chainmail
gloves = /obj/item/clothing/gloves/roguetown/leather
gloves = /obj/item/clothing/gloves/roguetown/chain
wrists = /obj/item/clothing/wrists/roguetown/bracers/leather
pants = /obj/item/clothing/under/roguetown/chainlegs/iron
pants = /obj/item/clothing/under/roguetown/chainlegs/
backr = /obj/item/storage/backpack/rogue/satchel
backpack_contents = list(
/obj/item/storage/belt/rogue/pouch,
/obj/item/clothing/neck/roguetown/chaincoif
)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) ///The chvds won't like this one...
H.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) ///i can swing my sword sword sword my diamond sword sword...
H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
H.change_stat("strength", 1)
H.change_stat("perception", 1)
H.change_stat("endurance", 1)
H.change_stat("constitution", 1)
H.change_stat("intelligence", 1)
H.change_stat("speed", 1)
ADD_TRAIT(H, TRAIT_SQUIRE_REPAIR, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)

H.adjust_blindness(-3)
var/weapons = list("Iron Sword","Cudgel",)
var/weapons = list("Shortsword","Cudgel",)
var/weapon_choice = input("Choose your weapon.", "TAKE UP ARMS") as anything in weapons
H.set_blindness(0)
switch(weapon_choice)
if("Iron Sword")
beltr = /obj/item/rogueweapon/sword/iron
if("Shortsword") ////More fitting than a full-on sword.
beltr = /obj/item/rogueweapon/sword/short
if("Cudgel")
beltr = /obj/item/rogueweapon/mace/cudgel

Expand All @@ -149,11 +148,11 @@
backpack_contents = list(
/obj/item/rogueweapon/huntingknife/idagger,
/obj/item/storage/belt/rogue/pouch,
/obj/item/clothing/neck/roguetown/chaincoif,
/obj/item/clothing/neck/roguetown/gorget,
)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE)
Expand Down

0 comments on commit 644961a

Please sign in to comment.