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.
This commit is contained in:
DeltaFire
2019-11-21 17:20:33 +01:00
parent df4ae7ea18
commit edd1946bf9
4 changed files with 12 additions and 15 deletions
@@ -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)
..()
@@ -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, "<span class ='userdanger'>[src] crashes into you with burning force, sending you reeling!</span>")
L.adjust_fire_stacks(2)
L.Knockdown(1)
L.IgniteMob()
else
L.Knockdown(40)
+6 -7
View File
@@ -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, "<span class='cultitalic'>In an brilliant flash of red, [L] [iscultist(L) ? "writhes in pain" : "falls to the ground!"]</span>")
uses--
+1 -2
View File
@@ -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, "<span class='cultlarge'>\"Kneel for me, scum\"</span>")
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