From f2075c2e4608ddb7010ab218b8b7b17593f18fbf Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue, 19 Jul 2022 15:42:40 -0400 Subject: [PATCH] Fixes magic missile stun time, cult magic missile does knockdown (#18409) * Moves artificer magic missile to knockdown, fixes magic missile stun time * don't double down * Move seconds to spell * fix --- code/datums/spells/construct_spells.dm | 5 +++++ code/datums/spells/inflict_handler.dm | 2 ++ code/datums/spells/wizard.dm | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index f51bf72e8e6..b62cd3220a9 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -146,6 +146,7 @@ invocation_type = "none" holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel proj_lifespan = 10 + proj_type = "/obj/effect/proc_holder/spell/inflict_handler/magic_missile/lesser" /obj/effect/proc_holder/spell/projectile/magic_missile/lesser/create_new_targeting() var/datum/spell_targeting/targeted/T = new() @@ -154,6 +155,10 @@ T.max_targets = 6 return T +/obj/effect/proc_holder/spell/inflict_handler/magic_missile/lesser + amt_knockdown = 6 SECONDS + amt_weakened = 0 + /obj/effect/proc_holder/spell/smoke/disable name = "Paralysing Smoke" desc = "This spell spawns a cloud of paralysing smoke." diff --git a/code/datums/spells/inflict_handler.dm b/code/datums/spells/inflict_handler.dm index 476f8540ee5..d69253f5911 100644 --- a/code/datums/spells/inflict_handler.dm +++ b/code/datums/spells/inflict_handler.dm @@ -5,6 +5,7 @@ var/amt_weakened = 0 var/amt_paralysis = 0 var/amt_stunned = 0 + var/amt_knockdown = 0 //set to negatives for healing var/amt_dam_fire = 0 @@ -52,6 +53,7 @@ target.Weaken(amt_weakened) target.Paralyse(amt_paralysis) target.Stun(amt_stunned) + target.KnockDown(amt_knockdown) target.AdjustEyeBlind(amt_eye_blind) target.AdjustEyeBlurry(amt_eye_blurry) diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 8f71801b010..fb05d3afd9f 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -32,7 +32,7 @@ return T /obj/effect/proc_holder/spell/inflict_handler/magic_missile - amt_weakened = 3 + amt_weakened = 6 SECONDS sound = 'sound/magic/mm_hit.ogg' @@ -72,7 +72,7 @@ return T /obj/effect/proc_holder/spell/inflict_handler/honk_missile - amt_weakened = 3 + amt_weakened = 6 SECONDS sound = 'sound/items/bikehorn.ogg' /obj/effect/proc_holder/spell/noclothes