From aba2398b9d5c056f54e1ba1328ffdf6bdd684cab Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Mar 2019 11:03:09 +0100 Subject: [PATCH 1/4] Pitcher growth rate limiting. Spaghetti coding if(maxhealth <= 499) //Ok maybe there are limits maxhealth = health //Limits are merely a suggestion if(vore_fullness && !antispam) antispam = 1 spawn(10) maxHealth += 1 health += 1 antispam = !antispam --- .../living/simple_animal/animals/tomato.dm | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm index b8d7df185a..fec4dc90f7 100644 --- a/code/modules/mob/living/simple_animal/animals/tomato.dm +++ b/code/modules/mob/living/simple_animal/animals/tomato.dm @@ -171,22 +171,35 @@ B.digest_brute = 12 /mob/living/simple_animal/hostile/piranhaplant/pitcher + icon_state = "pitcher" + icon_living = "pitcher" name = "Pitcher Plant" desc = "It's a plant! How pretty" tt_desc = "Brig Flower" - health = 500 - maxHealth = 500 //starts with 50 + health = 50 + maxHealth = 50 //starts with 50 + var/antispam = 0 -/mob/living/simple_animal/hostile/piranhaplant/pitcher/New() +/mob/living/simple_animal/hostile/piranhaplant/pitcher/death() ..() - health -= 450 + new /obj/item/weapon/reagent_containers/food/snacks/aesirsalad(location) + new /obj/item/weapon/reagent_containers/food/snacks/aesirsalad(location) + new /obj/item/weapon/reagent_containers/food/snacks/aesirsalad(location) + new /obj/item/weapon/reagent_containers/food/snacks/aesirsalad(location) /mob/living/simple_animal/hostile/piranhaplant/pitcher/Life() ..() if(!anchored) anchored=1 - if(vore_fullness) - health = health + 0.1 + if(maxhealth <= 499) //Ok maybe there are limits + maxhealth = health //Limits are merely a suggestion + if(vore_fullness && !antispam) + antispam = 1 + spawn(10) + maxHealth += 1 + health += 1 + antispam = !antispam + if(size_multiplier!=1*health/100) size_multiplier=1*health/100 update_icons() From 311c48ab04e5be64f15575bfb499589a5abfc195 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Mar 2019 11:03:47 +0100 Subject: [PATCH 2/4] Update tomato.dm --- code/modules/mob/living/simple_animal/animals/tomato.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm index fec4dc90f7..2edab37c12 100644 --- a/code/modules/mob/living/simple_animal/animals/tomato.dm +++ b/code/modules/mob/living/simple_animal/animals/tomato.dm @@ -186,6 +186,7 @@ new /obj/item/weapon/reagent_containers/food/snacks/aesirsalad(location) new /obj/item/weapon/reagent_containers/food/snacks/aesirsalad(location) new /obj/item/weapon/reagent_containers/food/snacks/aesirsalad(location) + qdel(src) /mob/living/simple_animal/hostile/piranhaplant/pitcher/Life() ..() From c4dd7e6a5ba1d5d5da6d5895645d127d1e9f7247 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Mar 2019 11:06:23 +0100 Subject: [PATCH 3/4] Update tomato.dm --- code/modules/mob/living/simple_animal/animals/tomato.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm index 2edab37c12..54fd4354f4 100644 --- a/code/modules/mob/living/simple_animal/animals/tomato.dm +++ b/code/modules/mob/living/simple_animal/animals/tomato.dm @@ -197,7 +197,8 @@ if(vore_fullness && !antispam) antispam = 1 spawn(10) - maxHealth += 1 + if(maxhealth <= 499) + maxHealth += 1 health += 1 antispam = !antispam From 40a1f6d20023779046bc983ed3271c08a44d5901 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Fri, 22 Mar 2019 11:39:43 +0100 Subject: [PATCH 4/4] maxHealth not maxhealth --- code/modules/mob/living/simple_animal/animals/tomato.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tomato.dm b/code/modules/mob/living/simple_animal/animals/tomato.dm index 54fd4354f4..59da8d5bb3 100644 --- a/code/modules/mob/living/simple_animal/animals/tomato.dm +++ b/code/modules/mob/living/simple_animal/animals/tomato.dm @@ -192,12 +192,12 @@ ..() if(!anchored) anchored=1 - if(maxhealth <= 499) //Ok maybe there are limits - maxhealth = health //Limits are merely a suggestion + if(maxHealth <= 499) //Ok maybe there are limits + maxHealth = health //Limits are merely a suggestion if(vore_fullness && !antispam) antispam = 1 spawn(10) - if(maxhealth <= 499) + if(maxHealth <= 499) maxHealth += 1 health += 1 antispam = !antispam