From 72b3ab37035b4bb08ff134f862484e18d04e8aee Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 26 Nov 2023 17:11:29 +0100 Subject: [PATCH 01/25] remove and comment out part of code and a double of the "survive_mob_death = TRUE" also remove the change of desc of the variable no point setting it twice to null same for curable --- code/datums/diseases/black_goo.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index d4d9b6f50996..4ea4e9588bbb 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -7,17 +7,15 @@ spread = "Bites" spread_type = SPECIAL affected_species = list("Human") - curable = 0 - cure_chance = 100 - desc = "" + cure_chance = 100 //meaning the cure will kill the virus asap severity = "Medium" agent = "Unknown Biological Organism X-65" hidden = list(1,0) //Hidden from med-huds, but not pandemic scanners. BLOOD TESTS FOR THE WIN permeability_mod = 2 stage_prob = 4 stage_minimum_age = 150 - survive_mob_death = TRUE //FALSE //switch to true to make dead infected humans still transform - longevity = 500 //should allow the dead to rise + survive_mob_death = TRUE //We want the dead to turn into zombie. + longevity = 500 //the virus tend to die before the dead is turn into zombie this should fix it. var/zombie_transforming = 0 //whether we're currently transforming the host into a zombie. var/goo_message_cooldown = 0 //to make sure we don't spam messages too often. var/stage_counter = 0 // tells a dead infectee their stage, so they can know when-abouts they'll revive @@ -35,7 +33,6 @@ if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage One! Zombie transformation begins at Stage Four.")) stage_counter = stage - survive_mob_death = TRUE //changed because infection rate was REALLY horrible. if(goo_message_cooldown < world.time ) if(prob(3)) to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) @@ -54,7 +51,6 @@ to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Three! Zombie transformation begins at Stage Four, which will be soon.")) stage_counter = stage hidden = list(0,0) - //survive_mob_death = TRUE //even if host dies now, the transformation will occur. H.next_move_slowdown = max(H.next_move_slowdown, 1) if(goo_message_cooldown < world.time) if (prob(3)) From e6eef9d7cb7a3ad70530c8742cb51f896bf230b7 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 26 Nov 2023 19:19:32 +0100 Subject: [PATCH 02/25] put new system in place that's a lot --- code/datums/diseases/black_goo.dm | 104 +++++++++++++++++++----------- 1 file changed, 65 insertions(+), 39 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 4ea4e9588bbb..a1d639874c05 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -1,7 +1,7 @@ //Disease Datum /datum/disease/black_goo name = "Black Goo" - max_stages = 5 + max_stages = 4 cure = "Anti-Zed" cure_id = "antiZed" spread = "Bites" @@ -12,75 +12,102 @@ agent = "Unknown Biological Organism X-65" hidden = list(1,0) //Hidden from med-huds, but not pandemic scanners. BLOOD TESTS FOR THE WIN permeability_mod = 2 - stage_prob = 4 - stage_minimum_age = 150 + survive_mob_death = TRUE //We want the dead to turn into zombie. longevity = 500 //the virus tend to die before the dead is turn into zombie this should fix it. var/zombie_transforming = 0 //whether we're currently transforming the host into a zombie. var/goo_message_cooldown = 0 //to make sure we don't spam messages too often. var/stage_counter = 0 // tells a dead infectee their stage, so they can know when-abouts they'll revive + // set of new var to handle stage progress and + var/stage_level = 0 // we start at zero when dead everything go twice as fast each stage take 6 min so it need 360 and if your dead it require 180 so 3 min + var/infection_rate = 1 + /datum/disease/black_goo/stage_act() ..() if(!ishuman(affected_mob)) return var/mob/living/carbon/human/H = affected_mob - if(age > 1.5*stage_minimum_age) stage_prob = 100 //if it takes too long we force a stage increase - else stage_prob = initial(stage_prob) - if(H.stat == DEAD) stage_minimum_age = 75 //the virus progress faster when the host is dead. + // check if your already a zombie or in the process of being transform into one... + if(H.species.name == SPECIES_ZOMBIE || zombie_transforming = TRUE) + return + + //check if dead + if(H.stat == DEAD) + infection_rate = 2 + + //check if he isn't dead + if(H.stat != DEAD) + infection_rate = 1 + + // here we add the new infection rate to the stage level. + stage_level = stage_level + infection_rate + + //we want to check if we have reach enough stage level to gain a stage + // change to 60 for testing should be at 360 normaly + if(stage_level >= 60) + stage ++ + stage_level = stage_level - 60 + switch(stage) + //stage 1 : Viatiate "afflicted" + // goign to keep you feel warm and maybe add you can experience paranoia don't know how? if(1) if(H.stat == DEAD && stage_counter != stage) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage One! Zombie transformation begins at Stage Four.")) + to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage One! Zombie transformation begins at Stage Three.")) stage_counter = stage if(goo_message_cooldown < world.time ) - if(prob(3)) - to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) + if(prob(5)) + to_chat(affected_mob, SPAN_DANGER("You feel warm..."))//small hint that your infected + goo_message_cooldown = world.time + 100 + else if(prob(3)) + to_chat(affected_mob, SPAN_DANGER("You can't trust them..."))//try at making you feel paranoic goo_message_cooldown = world.time + 100 + + //stage 2 : Ague "Febrile" + //pain fever and the eye will darken ? some veine become dark as the tissue start to necrose + //maybe febrile seizure due to fever basicly. pain is from necrosis...(witch is not ingame) + // screaming, seizure from fever fever symptome, pain if(2) if(H.stat == DEAD && stage_counter != stage) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Two! Zombie transformation begins at Stage Four.")) + to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Two! Zombie transformation begins at Stage Three.")) stage_counter = stage if(goo_message_cooldown < world.time) if (prob(3)) to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) else if (prob(6)) to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) + else if (prob(2)) to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) + else if (prob(2))to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) else if (prob(2)) H.vomit_on_floor() goo_message_cooldown = world.time + 100 + + //stage 3 : Lusus "Freak" you turn into a zombie (should be pretty dramatic scream etc... convulsion coma etc...?) + //you become animalistic husk you will attack everyone on sight some can retain some inteligence (using tools ) maybe just make it justify + // for them to avoid running to certain death and allow them to be "smart" will staying withing RP/// + // at the end of stage 3 you will be turned into a "zombie" if(3) + //check if your already a zombie just return to avoid weird stuff... if for some weird reason first filter deoesn't work... + if(H.species.name == SPECIES_ZOMBIE || zombie_transforming = TRUE) + return + if(H.stat == DEAD && stage_counter != stage) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Three! Zombie transformation begins at Stage Four, which will be soon.")) + to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Three! Zombie transformation begin!")) stage_counter = stage - hidden = list(0,0) - H.next_move_slowdown = max(H.next_move_slowdown, 1) - if(goo_message_cooldown < world.time) - if (prob(3)) - to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) - goo_message_cooldown = world.time + 100 - else if (prob(6)) - to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) - goo_message_cooldown = world.time + 100 - else if (prob(9)) - to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) - goo_message_cooldown = world.time + 100 - else if(prob(5)) - goo_message_cooldown = world.time + 100 - H.vomit_on_floor() + //hidden = list(0,0)//why? + if(!zombie_transforming) + zombie_transform(H) + H.next_move_slowdown = max(H.next_move_slowdown, 2)//what is this? + + //stage 4 : Lusus "Freak" this part will be to force people to turn in case stage 3 fail + // safety stage will be remove if nobody reach it in my tests.. if(4) if(H.stat == DEAD && stage_counter != stage) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Four! Your transformation will happen any moment now.")) + to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Four! Zombie transformation begin!")) stage_counter = stage - H.next_move_slowdown = max(H.next_move_slowdown, 2) - if(prob(5) || age >= stage_minimum_age-1) - if(!zombie_transforming) - zombie_transform(H) - else if(prob(5)) - H.vomit_on_floor() - if(5) if(H.stat == DEAD && stage_counter != stage) - stage_counter = stage - if(H.species.name != SPECIES_ZOMBIE && !zombie_transforming) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Five! Your transformation should have happened already, but will be forced now.")) - zombie_transform(H) + stage_counter = stage + if(H.species.name != SPECIES_ZOMBIE && !zombie_transforming) + to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Five! Your transformation should have happened already, but will be forced now.")) + zombie_transform(H) if(!zombie_transforming && prob(50)) if(H.stat != DEAD) var/healamt = 2 @@ -91,7 +118,6 @@ H.apply_damage(-healamt, OXY) H.nutrition = NUTRITION_MAX //never hungry - /datum/disease/black_goo/proc/zombie_transform(mob/living/carbon/human/human) set waitfor = 0 zombie_transforming = TRUE From a61df29ad2068c778d3ce1f33c89119b421a73ff Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 26 Nov 2023 19:21:26 +0100 Subject: [PATCH 03/25] for testing --- code/datums/diseases/black_goo.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index a1d639874c05..3e5331258ae7 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -1,7 +1,7 @@ //Disease Datum /datum/disease/black_goo name = "Black Goo" - max_stages = 4 + max_stages = 3 cure = "Anti-Zed" cure_id = "antiZed" spread = "Bites" @@ -96,7 +96,7 @@ if(!zombie_transforming) zombie_transform(H) H.next_move_slowdown = max(H.next_move_slowdown, 2)//what is this? - +/*shouldn't need this going to test it without it... //stage 4 : Lusus "Freak" this part will be to force people to turn in case stage 3 fail // safety stage will be remove if nobody reach it in my tests.. if(4) @@ -117,7 +117,7 @@ H.apply_damage(-healamt, TOX) H.apply_damage(-healamt, OXY) H.nutrition = NUTRITION_MAX //never hungry - +*/ /datum/disease/black_goo/proc/zombie_transform(mob/living/carbon/human/human) set waitfor = 0 zombie_transforming = TRUE From 45f40ffa72d8ace919d034e29e123c0643d2cf89 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 26 Nov 2023 19:23:58 +0100 Subject: [PATCH 04/25] fix --- code/datums/diseases/black_goo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 3e5331258ae7..c69d09e770f5 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -29,7 +29,7 @@ var/mob/living/carbon/human/H = affected_mob // check if your already a zombie or in the process of being transform into one... - if(H.species.name == SPECIES_ZOMBIE || zombie_transforming = TRUE) + if(H.species.name == SPECIES_ZOMBIE || zombie_transforming == TRUE) return //check if dead @@ -86,7 +86,7 @@ // at the end of stage 3 you will be turned into a "zombie" if(3) //check if your already a zombie just return to avoid weird stuff... if for some weird reason first filter deoesn't work... - if(H.species.name == SPECIES_ZOMBIE || zombie_transforming = TRUE) + if(H.species.name == SPECIES_ZOMBIE || zombie_transforming == TRUE) return if(H.stat == DEAD && stage_counter != stage) From 71e4dc73ae94fec467f5801d0d803651aa4e807e Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 26 Nov 2023 19:52:09 +0100 Subject: [PATCH 05/25] for test --- code/datums/diseases/black_goo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index c69d09e770f5..0c24908f8680 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -45,9 +45,9 @@ //we want to check if we have reach enough stage level to gain a stage // change to 60 for testing should be at 360 normaly - if(stage_level >= 60) + if(stage_level >= 120) stage ++ - stage_level = stage_level - 60 + stage_level = stage_level - 120 switch(stage) //stage 1 : Viatiate "afflicted" From 09e263061dff030cd2ac78fccf6230f69b7c8b6d Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 26 Nov 2023 19:55:27 +0100 Subject: [PATCH 06/25] fix stage --- code/datums/diseases/black_goo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 0c24908f8680..1f0772bf6c45 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -135,7 +135,7 @@ playsound(human.loc, 'sound/hallucinations/wail.ogg', 25, 1) human.jitteriness = 0 human.set_species(SPECIES_ZOMBIE) - stage = 5 + stage = 3 human.faction = FACTION_ZOMBIE zombie_transforming = FALSE From 392fa451a12ccb1e69aedaf429cac3e813c8f787 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 26 Nov 2023 20:05:34 +0100 Subject: [PATCH 07/25] no randomness --- code/datums/diseases/black_goo.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 1f0772bf6c45..23f13f67739a 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -22,6 +22,7 @@ // set of new var to handle stage progress and var/stage_level = 0 // we start at zero when dead everything go twice as fast each stage take 6 min so it need 360 and if your dead it require 180 so 3 min var/infection_rate = 1 + stage_prob = 0//no randomness /datum/disease/black_goo/stage_act() ..() From 1c08cd55332db8c8e63aa4070e5b32c5913a6c71 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 26 Nov 2023 20:37:42 +0100 Subject: [PATCH 08/25] clean up the code from my comment and commented out codes.... --- code/datums/diseases/black_goo.dm | 73 ++++++++++++------------------- 1 file changed, 28 insertions(+), 45 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 23f13f67739a..c0d731d37d44 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -33,58 +33,62 @@ if(H.species.name == SPECIES_ZOMBIE || zombie_transforming == TRUE) return - //check if dead + // check if dead if(H.stat == DEAD) infection_rate = 2 - //check if he isn't dead + // check if he isn't dead if(H.stat != DEAD) infection_rate = 1 // here we add the new infection rate to the stage level. stage_level = stage_level + infection_rate - //we want to check if we have reach enough stage level to gain a stage - // change to 60 for testing should be at 360 normaly - if(stage_level >= 120) + // we want to check if we have reach enough stage level to gain a stage 3 stage of 6 min if you get it once. + if(stage_level >= 360) stage ++ - stage_level = stage_level - 120 + stage_level = stage_level - 360 switch(stage) //stage 1 : Viatiate "afflicted" - // goign to keep you feel warm and maybe add you can experience paranoia don't know how? if(1) if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage One! Zombie transformation begins at Stage Three.")) stage_counter = stage if(goo_message_cooldown < world.time ) if(prob(5)) - to_chat(affected_mob, SPAN_DANGER("You feel warm..."))//small hint that your infected + to_chat(affected_mob, SPAN_DANGER("You feel warm...")) goo_message_cooldown = world.time + 100 + stage_level = stage_level + 4 else if(prob(3)) - to_chat(affected_mob, SPAN_DANGER("You can't trust them..."))//try at making you feel paranoic + to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) goo_message_cooldown = world.time + 100 + stage_level = stage_level + 2 //stage 2 : Ague "Febrile" - //pain fever and the eye will darken ? some veine become dark as the tissue start to necrose - //maybe febrile seizure due to fever basicly. pain is from necrosis...(witch is not ingame) - // screaming, seizure from fever fever symptome, pain if(2) if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Two! Zombie transformation begins at Stage Three.")) stage_counter = stage if(goo_message_cooldown < world.time) - if (prob(3)) to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) - else if (prob(6)) to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) - else if (prob(2)) to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) - else if (prob(2))to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) - else if (prob(2)) H.vomit_on_floor() + if (prob(5)) + to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) + stage_level = stage_level + 10 + else if (prob(6)) + to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) + stage_level = stage_level +5 + else if (prob(2)) + to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) + stage_level = stage_level + 20 + else if (prob(2)) + H.vomit_on_floor() + stage_level = stage_level + 15 + else if(prob(3)) + to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) + stage_level = stage_level + 4 goo_message_cooldown = world.time + 100 - //stage 3 : Lusus "Freak" you turn into a zombie (should be pretty dramatic scream etc... convulsion coma etc...?) - //you become animalistic husk you will attack everyone on sight some can retain some inteligence (using tools ) maybe just make it justify - // for them to avoid running to certain death and allow them to be "smart" will staying withing RP/// - // at the end of stage 3 you will be turned into a "zombie" + //stage 3 : Lusus "Freak" if(3) //check if your already a zombie just return to avoid weird stuff... if for some weird reason first filter deoesn't work... if(H.species.name == SPECIES_ZOMBIE || zombie_transforming == TRUE) @@ -93,32 +97,11 @@ if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Three! Zombie transformation begin!")) stage_counter = stage - //hidden = list(0,0)//why? + hidden = list(0,0) if(!zombie_transforming) zombie_transform(H) - H.next_move_slowdown = max(H.next_move_slowdown, 2)//what is this? -/*shouldn't need this going to test it without it... - //stage 4 : Lusus "Freak" this part will be to force people to turn in case stage 3 fail - // safety stage will be remove if nobody reach it in my tests.. - if(4) - if(H.stat == DEAD && stage_counter != stage) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Four! Zombie transformation begin!")) - stage_counter = stage - if(H.stat == DEAD && stage_counter != stage) - stage_counter = stage - if(H.species.name != SPECIES_ZOMBIE && !zombie_transforming) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Five! Your transformation should have happened already, but will be forced now.")) - zombie_transform(H) - if(!zombie_transforming && prob(50)) - if(H.stat != DEAD) - var/healamt = 2 - if(H.health < H.maxHealth) - H.apply_damage(-healamt, BURN) - H.apply_damage(-healamt, BRUTE) - H.apply_damage(-healamt, TOX) - H.apply_damage(-healamt, OXY) - H.nutrition = NUTRITION_MAX //never hungry -*/ + H.next_move_slowdown = max(H.next_move_slowdown, 2) + /datum/disease/black_goo/proc/zombie_transform(mob/living/carbon/human/human) set waitfor = 0 zombie_transforming = TRUE From 530c2da22039ae90cdbae2f6ad3bfd6abea6a5e2 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Tue, 28 Nov 2023 19:44:39 +0100 Subject: [PATCH 09/25] Update black_goo.dm make dead host turn faster. --- code/datums/diseases/black_goo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index c0d731d37d44..1f6ec91260ec 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -35,7 +35,7 @@ // check if dead if(H.stat == DEAD) - infection_rate = 2 + infection_rate = 4 // check if he isn't dead if(H.stat != DEAD) From 43e8f1350f43d76e3666046429460ac054d24e69 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 3 Dec 2023 10:17:08 +0100 Subject: [PATCH 10/25] basic clean up of the code --- code/datums/diseases/black_goo.dm | 40 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 1f6ec91260ec..53652c73d9a3 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -12,17 +12,24 @@ agent = "Unknown Biological Organism X-65" hidden = list(1,0) //Hidden from med-huds, but not pandemic scanners. BLOOD TESTS FOR THE WIN permeability_mod = 2 - survive_mob_death = TRUE //We want the dead to turn into zombie. longevity = 500 //the virus tend to die before the dead is turn into zombie this should fix it. - var/zombie_transforming = 0 //whether we're currently transforming the host into a zombie. - var/goo_message_cooldown = 0 //to make sure we don't spam messages too often. - var/stage_counter = 0 // tells a dead infectee their stage, so they can know when-abouts they'll revive + stage_prob = 0//no randomness + + /// whether we're currently transforming the host into a zombie. + var/zombie_transforming = 0 + /// to make sure we don't spam messages too often. + var/goo_message_cooldown = 0 + /// tells a dead infectee their stage, so they can know when-abouts they'll revive + var/stage_counter = 0 - // set of new var to handle stage progress and - var/stage_level = 0 // we start at zero when dead everything go twice as fast each stage take 6 min so it need 360 and if your dead it require 180 so 3 min +//new variables to handle infection progression inside a stage. + + /// variable that contain accumulated virus progression for an host. + var/stage_level = 0 + /// variable that handle passive increase of the virus of an host. var/infection_rate = 1 - stage_prob = 0//no randomness + /datum/disease/black_goo/stage_act() ..() @@ -42,7 +49,7 @@ infection_rate = 1 // here we add the new infection rate to the stage level. - stage_level = stage_level + infection_rate + stage_level += infection_rate // we want to check if we have reach enough stage level to gain a stage 3 stage of 6 min if you get it once. if(stage_level >= 360) @@ -50,7 +57,6 @@ stage_level = stage_level - 360 switch(stage) - //stage 1 : Viatiate "afflicted" if(1) if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage One! Zombie transformation begins at Stage Three.")) @@ -59,13 +65,12 @@ if(prob(5)) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) goo_message_cooldown = world.time + 100 - stage_level = stage_level + 4 + stage_level += 4 else if(prob(3)) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) goo_message_cooldown = world.time + 100 - stage_level = stage_level + 2 + stage_level += 2 - //stage 2 : Ague "Febrile" if(2) if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Two! Zombie transformation begins at Stage Three.")) @@ -73,22 +78,21 @@ if(goo_message_cooldown < world.time) if (prob(5)) to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) - stage_level = stage_level + 10 + stage_level += 10 else if (prob(6)) to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) - stage_level = stage_level +5 + stage_level += 5 else if (prob(2)) to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) - stage_level = stage_level + 20 + stage_level += 20 else if (prob(2)) H.vomit_on_floor() - stage_level = stage_level + 15 + stage_level += 15 else if(prob(3)) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - stage_level = stage_level + 4 + stage_level += 4 goo_message_cooldown = world.time + 100 - //stage 3 : Lusus "Freak" if(3) //check if your already a zombie just return to avoid weird stuff... if for some weird reason first filter deoesn't work... if(H.species.name == SPECIES_ZOMBIE || zombie_transforming == TRUE) From 1cf74c488450288671c3951c00d86b2844b83766 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 3 Dec 2023 10:27:53 +0100 Subject: [PATCH 11/25] turned H.species.name == SPECIES_ZOMBIE into a proper typecheck: iszombie(H) also removed zombie_transforming == TRUE that was with it. also some minor clean up of code --- code/datums/diseases/black_goo.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 53652c73d9a3..8a7a0c88773f 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -30,14 +30,13 @@ /// variable that handle passive increase of the virus of an host. var/infection_rate = 1 - /datum/disease/black_goo/stage_act() ..() if(!ishuman(affected_mob)) return var/mob/living/carbon/human/H = affected_mob // check if your already a zombie or in the process of being transform into one... - if(H.species.name == SPECIES_ZOMBIE || zombie_transforming == TRUE) + if(iszombie(H)) return // check if dead @@ -54,7 +53,7 @@ // we want to check if we have reach enough stage level to gain a stage 3 stage of 6 min if you get it once. if(stage_level >= 360) stage ++ - stage_level = stage_level - 360 + stage_level -= 360 switch(stage) if(1) @@ -95,7 +94,7 @@ if(3) //check if your already a zombie just return to avoid weird stuff... if for some weird reason first filter deoesn't work... - if(H.species.name == SPECIES_ZOMBIE || zombie_transforming == TRUE) + if(iszombie(H)) return if(H.stat == DEAD && stage_counter != stage) From 0ef5324f0ec6544c2d932daf203c24632fd49000 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 3 Dec 2023 13:08:55 +0100 Subject: [PATCH 12/25] trying to implement cooldown macro --- code/datums/diseases/black_goo.dm | 65 ++++++++++++++++++------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 8a7a0c88773f..ded6a8521d54 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -19,7 +19,7 @@ /// whether we're currently transforming the host into a zombie. var/zombie_transforming = 0 /// to make sure we don't spam messages too often. - var/goo_message_cooldown = 0 + //var/goo_message_cooldown = 0 /// tells a dead infectee their stage, so they can know when-abouts they'll revive var/stage_counter = 0 @@ -30,6 +30,12 @@ /// variable that handle passive increase of the virus of an host. var/infection_rate = 1 +//cooldown + + var/message_cooldown_time = 100 + COOLDOWN_DECLARE(goo_message_cooldown) + COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) + /datum/disease/black_goo/stage_act() ..() if(!ishuman(affected_mob)) return @@ -60,37 +66,42 @@ if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage One! Zombie transformation begins at Stage Three.")) stage_counter = stage - if(goo_message_cooldown < world.time ) - if(prob(5)) - to_chat(affected_mob, SPAN_DANGER("You feel warm...")) - goo_message_cooldown = world.time + 100 - stage_level += 4 - else if(prob(3)) - to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - goo_message_cooldown = world.time + 100 - stage_level += 2 + + if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) + return + COOLDOWN_RESET(src, goo_message_cooldown) + + if(prob(5)) + to_chat(affected_mob, SPAN_DANGER("You feel warm...")) + stage_level += 4 + else if(prob(3)) + to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) + stage_level += 2 if(2) if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Two! Zombie transformation begins at Stage Three.")) stage_counter = stage - if(goo_message_cooldown < world.time) - if (prob(5)) - to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) - stage_level += 10 - else if (prob(6)) - to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) - stage_level += 5 - else if (prob(2)) - to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) - stage_level += 20 - else if (prob(2)) - H.vomit_on_floor() - stage_level += 15 - else if(prob(3)) - to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - stage_level += 4 - goo_message_cooldown = world.time + 100 + + if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) + return + COOLDOWN_RESET(src, goo_message_cooldown) + + if (prob(5)) + to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) + stage_level += 10 + else if (prob(6)) + to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) + stage_level += 5 + else if (prob(2)) + to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) + stage_level += 20 + else if (prob(2)) + H.vomit_on_floor() + stage_level += 15 + else if(prob(3)) + to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) + stage_level += 4 if(3) //check if your already a zombie just return to avoid weird stuff... if for some weird reason first filter deoesn't work... From dd6801f8f2c66946ead8ab37015078c3cc28570c Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 3 Dec 2023 13:10:03 +0100 Subject: [PATCH 13/25] fix? --- code/datums/diseases/black_goo.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index ded6a8521d54..7d53ca4b83fa 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -34,7 +34,7 @@ var/message_cooldown_time = 100 COOLDOWN_DECLARE(goo_message_cooldown) - COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) + /datum/disease/black_goo/stage_act() ..() @@ -69,7 +69,7 @@ if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) return - COOLDOWN_RESET(src, goo_message_cooldown) + COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) if(prob(5)) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) @@ -85,7 +85,7 @@ if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) return - COOLDOWN_RESET(src, goo_message_cooldown) + COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) if (prob(5)) to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) From b85b59a0785c0c86b069761404029caaabc08f0b Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 3 Dec 2023 13:54:53 +0100 Subject: [PATCH 14/25] change Stage to stage and all the number that had a maj for some reason... --- code/datums/diseases/black_goo.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 7d53ca4b83fa..e604c2824cff 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -64,7 +64,7 @@ switch(stage) if(1) if(H.stat == DEAD && stage_counter != stage) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage One! Zombie transformation begins at Stage Three.")) + to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at stage one! Zombie transformation begins at stage three.")) stage_counter = stage if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) @@ -80,7 +80,7 @@ if(2) if(H.stat == DEAD && stage_counter != stage) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Two! Zombie transformation begins at Stage Three.")) + to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at stage two! Zombie transformation begins at stage three.")) stage_counter = stage if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) @@ -109,7 +109,7 @@ return if(H.stat == DEAD && stage_counter != stage) - to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at Stage Three! Zombie transformation begin!")) + to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at stage three! Zombie transformation begin!")) stage_counter = stage hidden = list(0,0) if(!zombie_transforming) From fc65da718018f35f69d879405fca0ab192e6ee83 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 7 Dec 2023 12:10:02 +0100 Subject: [PATCH 15/25] implement switch rand for symptom made 360 a variable turn comment into doc format stage ++ to stage++ --- code/datums/diseases/black_goo.dm | 56 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index e604c2824cff..103d533db7a3 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -30,11 +30,12 @@ /// variable that handle passive increase of the virus of an host. var/infection_rate = 1 -//cooldown - + ///the number of stage level needed to pass another stage. + var/stage_level_check = 360 + + /// cooldown between each check to see if we display a symptome var/message_cooldown_time = 100 COOLDOWN_DECLARE(goo_message_cooldown) - /datum/disease/black_goo/stage_act() ..() @@ -57,9 +58,9 @@ stage_level += infection_rate // we want to check if we have reach enough stage level to gain a stage 3 stage of 6 min if you get it once. - if(stage_level >= 360) - stage ++ - stage_level -= 360 + if(stage_level >= stage_level_check) + stage++ + stage_level -= stage_level_check switch(stage) if(1) @@ -70,13 +71,13 @@ if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) return COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) - - if(prob(5)) - to_chat(affected_mob, SPAN_DANGER("You feel warm...")) - stage_level += 4 - else if(prob(3)) + switch(rand(0, 100)) + if(80 to 95) + to_chat(affected_mob, SPAN_DANGER("You feel warm...")) + stage_level += 3 + if(95 to 100) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - stage_level += 2 + stage_level += 5 if(2) if(H.stat == DEAD && stage_counter != stage) @@ -87,21 +88,22 @@ return COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) - if (prob(5)) - to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) - stage_level += 10 - else if (prob(6)) - to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) - stage_level += 5 - else if (prob(2)) - to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) - stage_level += 20 - else if (prob(2)) - H.vomit_on_floor() - stage_level += 15 - else if(prob(3)) - to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - stage_level += 4 + switch(rand(0, 100)) + if(65 to 75) + to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) + stage_level += 4 + if(75 to 80) + to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) + stage_level += 5 + if(80 to 85) + to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) + stage_level += 10 + if(85 to 95) + H.vomit_on_floor() + stage_level += 15 + if(95 to 100) + to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) + stage_level += 20 if(3) //check if your already a zombie just return to avoid weird stuff... if for some weird reason first filter deoesn't work... From d5a01124ef2018c4b97b0b6034c1637872244e5b Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 7 Dec 2023 12:30:03 +0100 Subject: [PATCH 16/25] fix --- code/datums/diseases/black_goo.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 103d533db7a3..a725254e2c6f 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -71,13 +71,14 @@ if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) return COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) + switch(rand(0, 100)) if(80 to 95) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) stage_level += 3 if(95 to 100) - to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - stage_level += 5 + to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) + stage_level += 5 if(2) if(H.stat == DEAD && stage_counter != stage) From ac1db6bb7cd12d2835e2c84ea181b9e97db0549a Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 7 Dec 2023 12:34:42 +0100 Subject: [PATCH 17/25] fix --- code/datums/diseases/black_goo.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index a725254e2c6f..e0fa78d7a819 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -32,7 +32,7 @@ ///the number of stage level needed to pass another stage. var/stage_level_check = 360 - + /// cooldown between each check to see if we display a symptome var/message_cooldown_time = 100 COOLDOWN_DECLARE(goo_message_cooldown) @@ -73,7 +73,7 @@ COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) switch(rand(0, 100)) - if(80 to 95) + if(0 to 95) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) stage_level += 3 if(95 to 100) @@ -90,7 +90,7 @@ COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) switch(rand(0, 100)) - if(65 to 75) + if(0 to 75) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) stage_level += 4 if(75 to 80) From 421a2717768388307917357ce14500fae0018841 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 7 Dec 2023 12:48:15 +0100 Subject: [PATCH 18/25] updating symptome table a bit --- code/datums/diseases/black_goo.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index e0fa78d7a819..07dae62001eb 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -73,12 +73,15 @@ COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) switch(rand(0, 100)) - if(0 to 95) + if(0 to 50) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) - stage_level += 3 + stage_level += 2 + if(0 to 50) + to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) + stage_level += 5 if(95 to 100) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - stage_level += 5 + stage_level += 10 if(2) if(H.stat == DEAD && stage_counter != stage) @@ -90,13 +93,13 @@ COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) switch(rand(0, 100)) - if(0 to 75) + if(0 to 50) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) stage_level += 4 - if(75 to 80) + if(50 to 70) to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) stage_level += 5 - if(80 to 85) + if(70 to 85) to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) stage_level += 10 if(85 to 95) From b1bf0d69b55e06b931fcb1d6d5ca0ae5e3a23848 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 7 Dec 2023 12:59:14 +0100 Subject: [PATCH 19/25] change stuff make symptome to be more impactfulll since they are rarer... --- code/datums/diseases/black_goo.dm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 07dae62001eb..f6e8336dddb7 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -67,26 +67,30 @@ if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at stage one! Zombie transformation begins at stage three.")) stage_counter = stage + //doesn't want dead to have symptome make no sense + return if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) return COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) switch(rand(0, 100)) - if(0 to 50) + if(0 to 75) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) - stage_level += 2 - if(0 to 50) + stage_level += 9 + if(75 to 95) to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) - stage_level += 5 + stage_level += 18 if(95 to 100) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - stage_level += 10 + stage_level += 36 if(2) if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at stage two! Zombie transformation begins at stage three.")) stage_counter = stage + //doesn't want dead to have symptome make no sense + return if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) return @@ -95,19 +99,19 @@ switch(rand(0, 100)) if(0 to 50) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) - stage_level += 4 - if(50 to 70) - to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) stage_level += 5 - if(70 to 85) + if(50 to 75) + to_chat(affected_mob, SPAN_DANGER("You feel really warm...")) + stage_level += 9 + if(75 to 85) to_chat(affected_mob, SPAN_DANGER("Your throat is really dry...")) - stage_level += 10 + stage_level += 18 if(85 to 95) H.vomit_on_floor() - stage_level += 15 + stage_level += 36 if(95 to 100) to_chat(affected_mob, SPAN_DANGER("You cough up some black fluid...")) - stage_level += 20 + stage_level += 42 if(3) //check if your already a zombie just return to avoid weird stuff... if for some weird reason first filter deoesn't work... From c5fbd289d7781ab7150dd4879d1396fb16c99e13 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 7 Dec 2023 13:19:42 +0100 Subject: [PATCH 20/25] small change --- code/datums/diseases/black_goo.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index f6e8336dddb7..06c31af6e7a8 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -33,8 +33,8 @@ ///the number of stage level needed to pass another stage. var/stage_level_check = 360 - /// cooldown between each check to see if we display a symptome - var/message_cooldown_time = 100 + /// cooldown between each check to see if we display a symptome idea is to get 60s between symptome atleast. + var/message_cooldown_time = 600 COOLDOWN_DECLARE(goo_message_cooldown) /datum/disease/black_goo/stage_act() @@ -75,7 +75,9 @@ COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) switch(rand(0, 100)) - if(0 to 75) + if(0 to 25) + + if(25 to 75) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) stage_level += 9 if(75 to 95) @@ -97,7 +99,9 @@ COOLDOWN_START(src, goo_message_cooldown, message_cooldown_time) switch(rand(0, 100)) - if(0 to 50) + if(0 to 25) + + if(25 to 50) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) stage_level += 5 if(50 to 75) From e0867ff4ae5b83625febf806e67602d2b3e0a97f Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 7 Dec 2023 13:32:43 +0100 Subject: [PATCH 21/25] remove stuff to check if dead for no symptome another time --- code/datums/diseases/black_goo.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 06c31af6e7a8..842316f4ee3f 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -67,8 +67,6 @@ if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at stage one! Zombie transformation begins at stage three.")) stage_counter = stage - //doesn't want dead to have symptome make no sense - return if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) return @@ -91,8 +89,6 @@ if(H.stat == DEAD && stage_counter != stage) to_chat(H, SPAN_CENTERBOLD("Your zombie infection is now at stage two! Zombie transformation begins at stage three.")) stage_counter = stage - //doesn't want dead to have symptome make no sense - return if (!COOLDOWN_FINISHED(src, goo_message_cooldown)) return From 73d9ddbb0572095977472941b1b48f09ec18f4cf Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:40:30 +0100 Subject: [PATCH 22/25] Update black_goo.dm remove some empty because harry probably made a block for empty --- code/datums/diseases/black_goo.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 842316f4ee3f..4a98e23e48bf 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -74,7 +74,6 @@ switch(rand(0, 100)) if(0 to 25) - if(25 to 75) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) stage_level += 9 @@ -96,7 +95,6 @@ switch(rand(0, 100)) if(0 to 25) - if(25 to 50) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) stage_level += 5 From c60a87b65fc240678bebfaa5d214d6541b922e92 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:45:14 +0100 Subject: [PATCH 23/25] Update black_goo.dm add return because someone hate empty block --- code/datums/diseases/black_goo.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 4a98e23e48bf..aa1ea252fb0f 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -74,6 +74,7 @@ switch(rand(0, 100)) if(0 to 25) + return if(25 to 75) to_chat(affected_mob, SPAN_DANGER("You feel warm...")) stage_level += 9 @@ -95,6 +96,7 @@ switch(rand(0, 100)) if(0 to 25) + return if(25 to 50) to_chat(affected_mob, SPAN_DANGER("You can't trust them...")) stage_level += 5 From 53fd16b227acc0ddbf42b88523f15ea2ac6706c2 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Thu, 7 Dec 2023 15:15:21 +0100 Subject: [PATCH 24/25] Update black_goo.dm macro time is a thing apparently --- code/datums/diseases/black_goo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index aa1ea252fb0f..b2ef214ade20 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -34,7 +34,7 @@ var/stage_level_check = 360 /// cooldown between each check to see if we display a symptome idea is to get 60s between symptome atleast. - var/message_cooldown_time = 600 + var/message_cooldown_time = 1 MINUTES COOLDOWN_DECLARE(goo_message_cooldown) /datum/disease/black_goo/stage_act() From 1976ea44a791164a0dc973b511614ab68ce2373f Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Fri, 15 Dec 2023 21:20:20 -0800 Subject: [PATCH 25/25] Update code/datums/diseases/black_goo.dm --- code/datums/diseases/black_goo.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index b2ef214ade20..7ee83f4def9c 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -18,8 +18,6 @@ /// whether we're currently transforming the host into a zombie. var/zombie_transforming = 0 - /// to make sure we don't spam messages too often. - //var/goo_message_cooldown = 0 /// tells a dead infectee their stage, so they can know when-abouts they'll revive var/stage_counter = 0