From 14b16ba080ce6f0d36f6b91152a322d40f2993d8 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Sun, 30 Aug 2020 17:18:30 -0400 Subject: [PATCH 1/5] Buffs punch damage, makes guardian and host shock proof --- .../miniantags/guardian/types/lightning.dm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm index bf84e199bab..fbcf4773b14 100644 --- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm +++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm @@ -3,12 +3,12 @@ layer = LYING_MOB_LAYER /mob/living/simple_animal/hostile/guardian/beam - melee_damage_lower = 7 - melee_damage_upper = 7 + melee_damage_lower = 12 + melee_damage_upper = 12 attacktext = "shocks" melee_damage_type = BURN attack_sound = 'sound/machines/defib_zap.ogg' - damage_transfer = 0.7 + damage_transfer = 0.6 range = 7 playstyle_string = "As a Lightning type, you will apply lightning chains to targets on attack and have a lightning chain to your summoner. Lightning chains will shock anyone near them." magic_fluff_string = "..And draw the Tesla, a shocking, lethal source of power." @@ -18,6 +18,15 @@ var/list/enemychains = list() var/successfulshocks = 0 +/mob/living/simple_animal/hostile/guardian/beam/Life(seconds, times_fired) //Dies if the summoner dies + ..() + if(summoner) + if(!(NO_SHOCK in summoner.mutations)) + summoner.mutations.Add(NO_SHOCK) + +/mob/living/simple_animal/hostile/guardian/beam/electrocute_act() + return //You are lightning, you should not be hurt by such things. + /mob/living/simple_animal/hostile/guardian/beam/AttackingTarget() . = ..() if(. && isliving(target) && target != src && target != summoner) From 2286cea7da87b9b19e29c59f4ccbdbf6bddc0ad5 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Sun, 30 Aug 2020 18:00:56 -0400 Subject: [PATCH 2/5] Fixes the code hopefully --- code/game/gamemodes/miniantags/guardian/types/lightning.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm index fbcf4773b14..602bf49030c 100644 --- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm +++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm @@ -24,8 +24,8 @@ if(!(NO_SHOCK in summoner.mutations)) summoner.mutations.Add(NO_SHOCK) -/mob/living/simple_animal/hostile/guardian/beam/electrocute_act() - return //You are lightning, you should not be hurt by such things. +/mob/living/simple_animal/hostile/guardian/beam/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE) + return FALSE //You are lightning, you should not be hurt by such things. /mob/living/simple_animal/hostile/guardian/beam/AttackingTarget() . = ..() From 7d1faa5045f1f7f3388c2b9e783c36a1bec3790d Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Sun, 30 Aug 2020 22:15:58 -0400 Subject: [PATCH 3/5] Takes Steels Suggestion --- .../miniantags/guardian/types/lightning.dm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm index 602bf49030c..e3657cf2350 100644 --- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm +++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm @@ -18,11 +18,13 @@ var/list/enemychains = list() var/successfulshocks = 0 -/mob/living/simple_animal/hostile/guardian/beam/Life(seconds, times_fired) //Dies if the summoner dies - ..() - if(summoner) - if(!(NO_SHOCK in summoner.mutations)) - summoner.mutations.Add(NO_SHOCK) +/mob/living/simple_animal/hostile/guardian/beam/New(loc, mob/living/user) + . = ..() + if(!user) + return + summoner = user + if(!(NO_SHOCK in summoner.mutations)) + summoner.mutations.Add(NO_SHOCK) /mob/living/simple_animal/hostile/guardian/beam/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE) return FALSE //You are lightning, you should not be hurt by such things. @@ -115,3 +117,8 @@ ) L.adjustFireLoss(1.2) //adds up very rapidly . = 1 + +/mob/living/simple_animal/hostile/guardian/beam/death(gibbed) + if(summoner && (NO_SHOCK in summoner.mutations)) + summoner.mutations.Remove(NO_SHOCK) + return ..() \ No newline at end of file From 5f231445a4201e46a7d4037108e49a21e29ffa8a Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Mon, 31 Aug 2020 08:50:48 -0400 Subject: [PATCH 4/5] More steel suggestions --- code/game/gamemodes/miniantags/guardian/types/lightning.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm index e3657cf2350..8cedb5dbd84 100644 --- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm +++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm @@ -18,7 +18,7 @@ var/list/enemychains = list() var/successfulshocks = 0 -/mob/living/simple_animal/hostile/guardian/beam/New(loc, mob/living/user) +/mob/living/simple_animal/hostile/guardian/beam/New(loc, mob/living/user, mob/living/user) . = ..() if(!user) return @@ -121,4 +121,4 @@ /mob/living/simple_animal/hostile/guardian/beam/death(gibbed) if(summoner && (NO_SHOCK in summoner.mutations)) summoner.mutations.Remove(NO_SHOCK) - return ..() \ No newline at end of file + return ..() From 793e2f7561a739c9357e46153fe0384478a87d3c Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Mon, 31 Aug 2020 11:06:26 -0400 Subject: [PATCH 5/5] fixes more suggestions since I can not follow directions --- code/game/gamemodes/miniantags/guardian/guardian.dm | 2 +- code/game/gamemodes/miniantags/guardian/types/lightning.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index fdf17f6ddda..d063b742047 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -363,7 +363,7 @@ if("Protector") pickedtype = /mob/living/simple_animal/hostile/guardian/protector - var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user) + var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user, user) G.summoner = user G.summoned = TRUE G.key = key diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm index 8cedb5dbd84..2c716d5d4a4 100644 --- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm +++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm @@ -18,7 +18,7 @@ var/list/enemychains = list() var/successfulshocks = 0 -/mob/living/simple_animal/hostile/guardian/beam/New(loc, mob/living/user, mob/living/user) +/mob/living/simple_animal/hostile/guardian/beam/New(loc, mob/living/user) . = ..() if(!user) return