Skip to content

Commit

Permalink
Merge pull request #1151 from FreeStylaLT/how-long-has-this-been-a-pr…
Browse files Browse the repository at this point in the history 
…oblem-lol

Reworks (buffs) Orthodoxist Disciple. Adds Otavan Brute Archetype
  • Loading branch information
@Lutowski
Lutowski authored Jan 18, 2025
2 parents 88e90d6 + fe51624 commit a4503f6
Showing 1 changed file with 58 additions and 15 deletions.
73 changes: 58 additions & 15 deletions code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/disciple.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,79 @@

/datum/outfit/job/roguetown/disciple/pre_equip(mob/living/carbon/human/H)
..()
neck = /obj/item/clothing/neck/roguetown/psicross/astrata
cloak = /obj/item/clothing/cloak/psydontabard/alt
pants = /obj/item/clothing/under/roguetown/tights/black
wrists = /obj/item/clothing/wrists/roguetown/wrappings
shoes = /obj/item/clothing/shoes/roguetown/sandals
neck = /obj/item/clothing/neck/roguetown/psicross/silver
pants = /obj/item/clothing/under/roguetown/heavy_leather_pants
wrists = /obj/item/clothing/wrists/roguetown/bracers
shoes = /obj/item/clothing/shoes/roguetown/sandals
belt = /obj/item/storage/belt/rogue/leather/black
beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
id = /obj/item/clothing/ring/silver
backl = /obj/item/storage/backpack/rogue/satchel
backpack_contents = list(/obj/item/roguekey/inquisition = 1)
mask = /obj/item/clothing/mask/rogue/facemask/psydonmask
head = /obj/item/clothing/head/roguetown/roguehood/psydon
var/classes = list("Otavan Brute", "Nadeli-Trained Scholar")
var/classchoice = input("Choose your archetypes", "Available archetypes") as anything in classes
switch(classchoice)
if("Otavan Brute")
H.set_blindness(0)
brute_equip(H)
if("Nadeli-Trained Scholar")
H.set_blindness(0)
nadeli_equip(H)

if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE)

var/datum/devotion/C = new /datum/devotion(H, H.patron)
C.grant_spells_templar(H)
H.verbs += list(/mob/living/carbon/human/proc/devotionreport, /mob/living/carbon/human/proc/clericpray)

/datum/outfit/job/roguetown/disciple/proc/brute_equip(mob/living/carbon/human/H)
backpack_contents = list(/obj/item/roguekey/inquisition = 1, /obj/item/clothing/cloak/psydontabard/alt)
gloves = /obj/item/clothing/gloves/roguetown/chain/psydon
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 5, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 5, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
H.change_stat("strength", 3)
H.change_stat("endurance", 2)
H.change_stat("constitution", 2)
H.change_stat("intelligence", -2)
ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_INQUISITION, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_CRITICAL_RESISTANCE, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOPAINSTUN, TRAIT_GENERIC)

/datum/outfit/job/roguetown/disciple/proc/nadeli_equip(mob/living/carbon/human/H)
armor = /obj/item/clothing/suit/roguetown/armor/leather/heavy/coat
cloak = /obj/item/clothing/cloak/psydontabard/alt
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 5, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE)
H.mind.adjust_spellpoints(-6)
H.change_stat("strength", 3)
H.change_stat("endurance", 2)
H.change_stat("speed", 2)
H.change_stat("endurance", 2)
H.change_stat("constitution", 1)
H.change_stat("perception", -1)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/fetch) // Pre-set spell list
H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/sickness)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/forcewall)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/self/message)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/summonrogueweapon/bladeofpsydon)
ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_INQUISITION, TRAIT_GENERIC)

var/datum/devotion/C = new /datum/devotion(H, H.patron)
C.grant_spells_templar(H)
H.verbs += list(/mob/living/carbon/human/proc/devotionreport, /mob/living/carbon/human/proc/clericpray)

0 comments on commit a4503f6

Please sign in to comment.