From 30acf39aa6746534ad654cb41fde2a50c74de7d4 Mon Sep 17 00:00:00 2001 From: Ghosti <83688318+Gw0sty@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:59:37 -0600 Subject: [PATCH] A little disease, as a treat (#5129) * Rats rats we are the rats * Further tweaking * Forgot to update the wieghts * lets see how one occurance works --- code/modules/events/disease_outbreak.dm | 20 +++++++++---------- .../code/modules/events/fake_virus.dm | 5 +++-- .../virology/disease/plague_rat/event.dm | 6 +++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index c72edc22171f..8cf6ffe1a00c 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -23,10 +23,10 @@ name = "Disease Outbreak: Classic" typepath = /datum/round_event/disease_outbreak max_occurrences = 2 - min_players = 10 - weight = 0 + min_players = 15 + weight = 4 track = EVENT_TRACK_MAJOR //monkie edit - earliest_start = 55 MINUTES + earliest_start = 20 MINUTES category = EVENT_CATEGORY_HEALTH description = "A 'classic' virus will infect some members of the crew." min_wizard_trigger_potency = 2 @@ -112,13 +112,13 @@ var/virus_choice = pick(WILD_ACUTE_DISEASES) var/list/anti = list( ANTIGEN_BLOOD = 1, - ANTIGEN_COMMON = 1, + ANTIGEN_COMMON = 2, ANTIGEN_RARE = 2, ANTIGEN_ALIEN = 0, ) var/list/bad = list( - EFFECT_DANGER_HELPFUL = 0, - EFFECT_DANGER_FLAVOR = 1, + EFFECT_DANGER_HELPFUL = 2, + EFFECT_DANGER_FLAVOR = 2, EFFECT_DANGER_ANNOYING = 2, EFFECT_DANGER_HINDRANCE = 3, EFFECT_DANGER_HARMFUL = 0, @@ -146,9 +146,9 @@ name = "Disease Outbreak: Advanced" typepath = /datum/round_event/disease_outbreak/advanced category = EVENT_CATEGORY_HEALTH - weight = 0 //monkestation change 15 ==> 5 + weight = 3 //monkestation change 15 ==> 3 min_players = 35 // To avoid shafting lowpop - earliest_start = 55 MINUTES // give the chemist a chance + earliest_start = 40 MINUTES // give the chemist a chance description = "An 'advanced' disease will infect some members of the crew." min_wizard_trigger_potency = 2 max_wizard_trigger_potency = 6 @@ -228,11 +228,11 @@ ) var/list/bad = list( EFFECT_DANGER_HELPFUL = 0, - EFFECT_DANGER_FLAVOR = 0, + EFFECT_DANGER_FLAVOR = 2, EFFECT_DANGER_ANNOYING = 2, EFFECT_DANGER_HINDRANCE = 3, EFFECT_DANGER_HARMFUL = 3, - EFFECT_DANGER_DEADLY = 1, + EFFECT_DANGER_DEADLY = 0, ) var/datum/disease/acute/new_disease = new virus_choice new_disease.makerandom(list(50,90),list(50,100),anti,bad,src) diff --git a/monkestation/code/modules/events/fake_virus.dm b/monkestation/code/modules/events/fake_virus.dm index 1d00ec6e7884..ee5622c86a93 100644 --- a/monkestation/code/modules/events/fake_virus.dm +++ b/monkestation/code/modules/events/fake_virus.dm @@ -1,2 +1,3 @@ -/datum/round_event_control/fake_virus - earliest_start = 55 MINUTES +/datum/round_event_control/fake_virus //Matching earliest possible disease + earliest_start = 20 MINUTES + min_players = 15 diff --git a/monkestation/code/modules/virology/disease/plague_rat/event.dm b/monkestation/code/modules/virology/disease/plague_rat/event.dm index 9ed00b05632a..4cc24a9a9650 100644 --- a/monkestation/code/modules/virology/disease/plague_rat/event.dm +++ b/monkestation/code/modules/virology/disease/plague_rat/event.dm @@ -1,11 +1,11 @@ /datum/round_event_control/plague_rat name = "Spawn Plague Rats" typepath = /datum/round_event/ghost_role/plague_rat - weight = 1 + weight = 2 max_occurrences = 1 track = EVENT_TRACK_MAJOR - min_players = 30 //monke edit: 20 to 30 - earliest_start = 55 MINUTES //monke edit: 20 to 60 + min_players = 35 //monke edit: 20 to 35 + earliest_start = 55 MINUTES //monke edit: 20 to 55 //dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "Spawns a horde of plague rats."