From 43981fb34e557468193c844fbb7263c47d5506ca Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 5 May 2015 20:54:57 -0400 Subject: [PATCH] Added lightning spell to wizards --- code/datums/spells/lightning.dm | 6 +++++- code/game/gamemodes/wizard/spellbook.dm | 9 ++++++++- code/modules/mob/living/carbon/superheros.dm | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm index a8b1d454572..3c658775af1 100644 --- a/code/datums/spells/lightning.dm +++ b/code/datums/spells/lightning.dm @@ -3,7 +3,7 @@ desc = "Throws a lightning bolt at the nearby enemy. Classic." charge_type = "recharge" charge_max = 300 - clothes_req = 0 + clothes_req = 1 invocation = "UN'LTD P'WAH!" invocation_type = "shout" range = 7 @@ -15,6 +15,10 @@ var/image/halo = null icon_power_button = "spell_tech" +/obj/effect/proc_holder/spell/wizard/targeted/lightning/lightnian + clothes_req = 0 + + /obj/effect/proc_holder/spell/wizard/targeted/lightning/Click() if(!ready) if(cast_check()) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index d7620449593..6b372031732 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -99,6 +99,9 @@ dat += "Flesh to Stone (60)
" dat += "This spell will curse a person to immediately turn into an unmoving statue. The effect will eventually wear off if the statue is not destroyed.
" + dat += "Lightning Bolt (30)
" + dat += "Charge up and throw lightning bolt at the nearby enemy. Classic. The longer you charge the more powerful the spell, beware of overcharge however!
" + dat += "Instant Summons (10)
" dat += "This spell can be used to bind a valuable item to you, bringing it to your hand at will. Using this spell while holding the bound item will allow you to unbind it. It does not require wizard garb.
" @@ -202,7 +205,7 @@ uses-- /* */ - var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disintegrate = "Disintegrate", disabletech = "Disable Tech", repulse = "Repulse", smoke = "Smoke", blind = "Blind", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", horseman = "Curse of the Horseman", fleshtostone = "Flesh to Stone", summonitem = "Instant Summons", summonguns = "Summon Guns", summonmagic = "Summon Magic", staffchange = "Staff of Change", soulstone = "Six Soul Stone Shards and the spell Artificer", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation", staffchaos = "Staff of Chaos", staffdoor = "Staff of Door Creation", wands = "Wand Assortment") + var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disintegrate = "Disintegrate", disabletech = "Disable Tech", repulse = "Repulse", smoke = "Smoke", blind = "Blind", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", horseman = "Curse of the Horseman", fleshtostone = "Flesh to Stone", lightningbolt = "Lightning Bolt", summonitem = "Instant Summons", summonguns = "Summon Guns", summonmagic = "Summon Magic", staffchange = "Staff of Change", soulstone = "Six Soul Stone Shards and the spell Artificer", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation", staffchaos = "Staff of Chaos", staffdoor = "Staff of Door Creation", wands = "Wand Assortment") var/already_knows = 0 for(var/obj/effect/proc_holder/spell/wizard/aspell in H.spell_list) if(available_spells[href_list["spell_choice"]] == initial(aspell.name)) @@ -305,6 +308,10 @@ feedback_add_details("wizard_spell_learned","FS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells H.spell_list += new /obj/effect/proc_holder/spell/wizard/targeted/inflict_handler/flesh_to_stone(H) temp = "You have learned flesh to stone." + if("lightningbolt") + feedback_add_details("wizard_spell_learned","LB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells + H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/lightning(null) + temp = "You have learned lightning bolt." if("summonitem") feedback_add_details("wizard_spell_learned","IS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells H.spell_list += new /obj/effect/proc_holder/spell/wizard/targeted/summonitem(null) diff --git a/code/modules/mob/living/carbon/superheros.dm b/code/modules/mob/living/carbon/superheros.dm index f218fd96074..7d561b83c7c 100644 --- a/code/modules/mob/living/carbon/superheros.dm +++ b/code/modules/mob/living/carbon/superheros.dm @@ -76,7 +76,7 @@ /datum/superheros/lightnian name = "LightnIan" default_genes = list(REGEN, NO_BREATH) - default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/lightning) + default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/lightning/lightnian) /datum/superheros/lightnian/equip(var/mob/living/carbon/human/H) ..()