From 46cf029a2823871e647f4f5600882e6cd88cf795 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 5 Jan 2020 11:19:18 -0800 Subject: [PATCH 1/3] Update twohanded.dm --- code/game/objects/items/twohanded.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index d7891feaa0..a81a45d6e4 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -781,6 +781,9 @@ throwforce = 20 throw_speed = 4 attack_verb = list("gored") + var/clonechance = 50 + var/clonedamage = 12 + var/clonespeed = 0.5 /obj/item/twohanded/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity) . = ..() @@ -791,9 +794,11 @@ var/mob/living/L = AM if(istype (L, /mob/living/simple_animal/hostile/illusion)) return - if(!L.stat && prob(50)) + if(!L.stat && prob(clonechance)) var/mob/living/simple_animal/hostile/illusion/M = new(user.loc) M.faction = user.faction.Copy() + M.melee_damage_upper = M.melee_damage_lower = clonedamage + M.set_varspeed(clonespeed) M.Copy_Parent(user, 100, user.health/2.5, 12, 30) M.GiveTarget(L) @@ -1010,4 +1015,4 @@ var/client/C = user.client C.change_view(CONFIG_GET(string/default_view)) user.client.pixel_x = 0 - user.client.pixel_y = 0 \ No newline at end of file + user.client.pixel_y = 0 From 4d151b2a7ca731992c7ad972ab5b94270a5437eb Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 5 Jan 2020 11:20:13 -0800 Subject: [PATCH 2/3] Update twohanded.dm --- code/game/objects/items/twohanded.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index a81a45d6e4..3802b01bc4 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -783,7 +783,7 @@ attack_verb = list("gored") var/clonechance = 50 var/clonedamage = 12 - var/clonespeed = 0.5 + var/clonespeed = 0 /obj/item/twohanded/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity) . = ..() From 0f909a1437f4ea84e65a215f134dc298bae88968 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 5 Jan 2020 12:50:51 -0800 Subject: [PATCH 3/3] Update twohanded.dm --- code/game/objects/items/twohanded.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index 3802b01bc4..3f180bdce8 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -784,6 +784,8 @@ var/clonechance = 50 var/clonedamage = 12 var/clonespeed = 0 + var/clone_replication_chance = 30 + var/clone_lifespan = 100 /obj/item/twohanded/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity) . = ..() @@ -797,9 +799,8 @@ if(!L.stat && prob(clonechance)) var/mob/living/simple_animal/hostile/illusion/M = new(user.loc) M.faction = user.faction.Copy() - M.melee_damage_upper = M.melee_damage_lower = clonedamage M.set_varspeed(clonespeed) - M.Copy_Parent(user, 100, user.health/2.5, 12, 30) + M.Copy_Parent(user, clone_lifespan, user.health/2.5, clonedamage, clone_replication_chance) M.GiveTarget(L) /obj/item/twohanded/pitchfork