From 5f4fbe03796c878d254f019f686d415a3b45e2d2 Mon Sep 17 00:00:00 2001 From: AnturK Date: Fri, 1 May 2015 12:40:23 +0200 Subject: [PATCH] Fixes #9251 - Lightning Bolt issues --- code/datums/spells/lightning.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm index 38249722221..352539c9bfb 100644 --- a/code/datums/spells/lightning.dm +++ b/code/datums/spells/lightning.dm @@ -17,11 +17,11 @@ action_icon_state = "lightning" /obj/effect/proc_holder/spell/targeted/lightning/Click() - if(!ready) + if(!ready && energy==0) if(cast_check()) StartChargeup() else - if(cast_check(skipcharge=1)) + if(ready && cast_check(skipcharge=1)) choose_targets() return 1 @@ -32,10 +32,10 @@ user.overlays.Add(halo) spawn(0) while(ready) - sleep(1) energy++ if(energy >= 100 && ready) Discharge() + sleep(1) obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) ready = 0 @@ -57,7 +57,7 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) /obj/effect/proc_holder/spell/targeted/lightning/cast(list/targets, mob/user = usr) - + ready = 0 var/mob/living/carbon/target = targets[1] if(get_dist(user,target)>range) @@ -68,7 +68,7 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) user.Beam(target,icon_state="lightning",icon='icons/effects/effects.dmi',time=5) switch(energy) - if(0 to 25) + if(1 to 25) target.electrocute_act(10,"Lightning Bolt") playsound(get_turf(target), 'sound/machines/defib_zap.ogg', 50, 1, -1) if(25 to 75)