From edd1946bf9f620217eb6cf5ed355027908c8766b Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Thu, 21 Nov 2019 17:20:33 +0100 Subject: [PATCH] Changes code as requested by kev Very very light knockdown for the clock spearthrow, CLAMPed values for everything that used a += (including the blood stun used on normal people), removed the vars as they were deemed unneccessary by kev so the values were moved directly to the debuff effects. --- .../clockcult/clock_helpers/slab_abilities.dm | 7 +++---- .../clock_items/clock_weapons/ratvarian_spear.dm | 4 ++-- code/modules/antagonists/cult/blood_magic.dm | 13 ++++++------- code/modules/antagonists/cult/cult_items.dm | 3 +-- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index 1b6b1b9cda..1f616b7dbc 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -179,7 +179,6 @@ . = ..() /obj/item/projectile/kindle/on_hit(atom/target, blocked = FALSE) - var/narsiandog_punish = 8 if(isliving(target)) var/mob/living/L = target if(is_servant_of_ratvar(L) || L.stat || L.has_status_effect(STATUS_EFFECT_KINDLE)) @@ -210,9 +209,9 @@ L.flash_act(1,1) if(iscarbon(target)) var/mob/living/carbon/C = L - C.stuttering = max(narsiandog_punish, C.stuttering) - C.drowsyness = max(narsiandog_punish, C.drowsyness) - C.confused += narsiandog_punish + C.stuttering = max(8, C.stuttering) + C.drowsyness = max(8, C.drowsyness) + C.confused += CLAMP(16 - C.confused, 0, 8) C.apply_status_effect(STATUS_EFFECT_BELLIGERENT) L.adjustFireLoss(15) ..() diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm index f10479c331..2256bbe5b1 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm @@ -13,7 +13,6 @@ hitsound = 'sound/weapons/bladeslice.ogg' w_class = WEIGHT_CLASS_BULKY var/bonus_burn = 5 - var/narsiandog_confuse = 5 /obj/item/clockwork/weapon/ratvarian_spear/ratvar_act() if(GLOB.ratvar_awakens) //If Ratvar is alive, the spear is extremely powerful @@ -60,9 +59,10 @@ if(issilicon(L)) L.Knockdown(100) else if(iscultist(L)) - L.confused += narsiandog_confuse // Spearthrow now confuses enemy cultists + just deals extra damage / sets on fire instead of hardstunning + damage + L.confused += CLAMP(10 - L.confused, 0, 5) // Spearthrow now confuses enemy cultists + just deals extra damage / sets on fire instead of hardstunning + damage to_chat(L, "[src] crashes into you with burning force, sending you reeling!") L.adjust_fire_stacks(2) + L.Knockdown(1) L.IgniteMob() else L.Knockdown(40) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 5f3856dda1..666e80b5e5 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -409,7 +409,6 @@ name = "Stunning Aura" color = RUNE_COLOR_RED invocation = "Fuu ma'jin." - var/ratvarscum_punish = 10 /obj/item/melee/blood_magic/stun/afterattack(atom/target, mob/living/carbon/user, proximity) if(!isliving(target) || !proximity) @@ -448,16 +447,16 @@ S.emp_act(EMP_HEAVY) else if(iscarbon(target)) var/mob/living/carbon/C = L - C.silent += 6 - C.stuttering += 15 - C.cultslurring += 15 + C.silent += CLAMP(12 - C.silent, 0, 6) + C.stuttering += CLAMP(30 - C.stuttering, 0, 15) + C.cultslurring += CLAMP(30 - C.cultslurring, 0, 15) C.Jitter(15) else // cultstun no longer hardstuns + damages hostile cultists, instead debuffs them hard + deals some damage; debuffs for a bit longer since they don't add the clockie belligerent debuff if(iscarbon(target)) var/mob/living/carbon/C = L - C.stuttering = max(ratvarscum_punish, C.stuttering) - C.drowsyness = max(ratvarscum_punish, C.drowsyness) - C.confused += ratvarscum_punish + C.stuttering = max(10, C.stuttering) + C.drowsyness = max(10, C.drowsyness) + C.confused += CLAMP(20 - C.confused, 0, 10) L.adjustBruteLoss(15) to_chat(user, "In an brilliant flash of red, [L] [iscultist(L) ? "writhes in pain" : "falls to the ground!"]") uses-- diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 6b37b33360..f7382359eb 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -676,7 +676,6 @@ sharpness = IS_SHARP hitsound = 'sound/weapons/bladeslice.ogg' var/datum/action/innate/cult/spear/spear_act - var/ratvarscum_confuse = 5 /obj/item/twohanded/cult_spear/Initialize() . = ..() @@ -704,7 +703,7 @@ if(!L.anti_magic_check()) if(is_servant_of_ratvar(L)) to_chat(L, "\"Kneel for me, scum\"") - L.confused += ratvarscum_confuse //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before + L.confused += CLAMP(10, L.confused, 0, 5) //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before L.Knockdown(15) L.adjustBruteLoss(10) else