Skip to content

Commit

Permalink
Templar Weapon Fix
Browse files Browse the repository at this point in the history
There's currently a block of code in the templar role that is supposed to give them a choice of weapon and a slight boost to that skill, putting them on par with the average melee class. This did not work. These errors have been corrected.

This bug existed in Azure since early September - it's still not fixed yet :^)
  • Loading branch information
Lhars committed Nov 27, 2024
1 parent 12d5ca4 commit ade4688
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions code/modules/jobs/job_types/roguetown/church/templar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,23 +171,24 @@
ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)

H.dna.species.soundpack_m = new /datum/voicepack/male/knight()
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/templar/crusader/choose_loadout(mob/living/carbon/human/H)
. = ..()
var/weapons = list("Bastard Sword","Flail","Mace")
var/weapon_choice = input(H,"Choose your weapon.", "TAKE UP ARMS") as anything in weapons
switch(weapon_choice)
if("Bastard Sword")
H.put_in_hands(new /obj/item/rogueweapon/sword/long(H), TRUE)
H.put_in_hands(new /obj/item/rogueweapon/sword/long, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
if("Flail")
H.put_in_hands(new /obj/item/rogueweapon/flail(H), TRUE)
H.put_in_hands(new /obj/item/rogueweapon/flail, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
if("Mace")
H.put_in_hands(new /obj/item/rogueweapon/mace(H), TRUE)
H.put_in_hands(new /obj/item/rogueweapon/mace, TRUE)
H.mind.adjust_skillrank(/datum/skill/combat/maces, 1, TRUE)


H.dna.species.soundpack_m = new /datum/voicepack/male/knight()
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 ade4688

Please sign in to comment.