diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm index 47c16a377e..64c5dfd551 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm @@ -21,33 +21,33 @@ /datum/outfit/job/roguetown/adventurer/sfighter/pre_equip(mob/living/carbon/human/H) ..() H.adjust_blindness(-3) - var/classes = list("Warrior","Monster Hunter",) // To Do - knight errant unique archetype(5 percent chance) + var/classes = list("Mighty Warrior","Swift Warrior",) // To Do - knight errant unique archetype(5 percent chance) var/classchoice = input("Choose your archetypes", "Available archetypes") as anything in classes switch(classchoice) - if("Warrior") + if("Mighty Warrior") H.set_blindness(0) - to_chat(H, "Warriors are well rounded fighters, experienced often in many theaters of warfare and battle they are capable of rising to any challenge that might greet them on the path.") - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,2), TRUE) + to_chat(H, "Strong and tough, Mighty Warriors are ready to crush their opponents under their mace while wearing heavy armor.") + H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axes, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, rand(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/maces, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, rand(1,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, pick(1,1,2), TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/knives, rand(1,2), TRUE) H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/misc/riding, pick(2,3), TRUE) H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.change_stat("strength", 2) + ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + H.change_stat("strength", 3) H.change_stat("endurance", 2) // 7 stat points total as a low-skill martial role without magic. Compared to Pally with 5 points. H.change_stat("constitution", 2) - H.change_stat("speed", 1) shoes = /obj/item/clothing/shoes/roguetown/boots gloves = /obj/item/clothing/gloves/roguetown/leather belt = /obj/item/storage/belt/rogue/leather @@ -60,10 +60,8 @@ else armor = /obj/item/clothing/suit/roguetown/armor/plate/scale if(prob(20)) - mask = /obj/item/clothing/mask/rogue/facemask - else if(prob(60)) head = /obj/item/clothing/head/roguetown/helmet/leather - else if(prob(20)) + else if(prob(50)) head = /obj/item/clothing/head/roguetown/helmet/skullcap else head = /obj/item/clothing/head/roguetown/helmet/kettle @@ -71,53 +69,53 @@ backr = /obj/item/rogueweapon/shield/wood beltl = /obj/item/rogueweapon/huntingknife if(prob(50)) - beltr = /obj/item/rogueweapon/sword/iron - else - beltr = /obj/item/rogueweapon/sword/sabre - if("Monster Hunter") + beltr = /obj/item/rogueweapon/mace/ + if("Swift Warrior") H.set_blindness(0) - to_chat(H, "Monsters Hunters are typically contracted champions of the common folk dedicated to the slaying of both lesser vermin and greater beasts of the wilds.") - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, rand(1,2), TRUE) + to_chat(H, "Swift Warriors are able to evade their opponents while executing precise strikes, but only wear light armor.") + 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/wrestling, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, rand(1,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, pick(1,1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/sneaking, pick(2,2,3), 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/riding, pick(2,3), TRUE) H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.change_stat("strength", 2) - H.change_stat("endurance", 1) // Weaker endurance compared to a traditional warrior/soldier. Smarter due to study of rare magical beasts. + H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE) + H.change_stat("endurance", 2) H.change_stat("constitution", 2) - H.change_stat("intelligence", 1) - H.change_stat("speed", 1) + H.change_stat("speed", 2) shoes = /obj/item/clothing/shoes/roguetown/boots gloves = /obj/item/clothing/gloves/roguetown/leather belt = /obj/item/storage/belt/rogue/leather neck = /obj/item/storage/belt/rogue/pouch/coins/poor shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random - if(prob(40)) - armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE) - backr = /obj/item/rogueweapon/sword/long - else if(prob(60)) - armor = /obj/item/clothing/suit/roguetown/armor/plate/half/iron - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/maces, 2, TRUE) - r_hand = /obj/item/rogueweapon/spear/billhook - else - armor = /obj/item/clothing/suit/roguetown/armor/plate/scale // No helms for monster hunters. - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axes, 3, TRUE) - backr = /obj/item/rogueweapon/stoneaxe/battle backl = /obj/item/storage/backpack/rogue/satchel - beltl = /obj/item/rogueweapon/huntingknife + if(prob(33)) + head = /obj/item/clothing/head/roguetown/helmet/leather + wrists = /obj/item/clothing/wrists/roguetown/bracers/leather + armor = /obj/item/clothing/suit/roguetown/armor/leather/hide + pants = /obj/item/clothing/under/roguetown/trou/leather + beltr = /obj/item/rogueweapon/sword/sabre + beltl = /obj/item/rogueweapon/huntingknife + else if(prob(50)) + beltl = /obj/item/rogueweapon/huntingknife/idagger/steel + beltr = /obj/item/rogueweapon/huntingknife/idagger/steel + armor = /obj/item/clothing/suit/roguetown/armor/leather/studded + wrists = /obj/item/clothing/wrists/roguetown/bracers/leather + pants = /obj/item/clothing/under/roguetown/trou/leather + else + beltr = /obj/item/rogueweapon/sword/sabre + beltl = /obj/item/rogueweapon/huntingknife + armor = /obj/item/clothing/suit/roguetown/armor/leather/studded + wrists = /obj/item/clothing/wrists/roguetown/bracers/leather + pants = /obj/item/clothing/under/roguetown/trou/leather + if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/black else @@ -125,6 +123,3 @@ H.underwear_color = CLOTHING_BLACK H.update_body() pants = /obj/item/clothing/under/roguetown/tights/black - - ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) - ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)