From 39689f05c761f421b59fbf94217f5f182384e7db Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 18 Sep 2014 21:41:54 +0930 Subject: [PATCH 1/2] Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency. --- code/game/gamemodes/calamity/calamity.dm | 2 +- code/modules/events/event_dynamic.dm | 14 +++++++++++--- code/modules/events/event_manager.dm | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm index 2f41c24fe4..c46c5e840a 100644 --- a/code/game/gamemodes/calamity/calamity.dm +++ b/code/game/gamemodes/calamity/calamity.dm @@ -17,7 +17,7 @@ uplink_uses = 10 //Possible roundstart antag types. - var/list/atypes = list("syndi","ling","tater","wiz","ninja","vox","slug","cult") + var/list/atypes = list("syndi","ling","tater","wiz","ninja","vox","cult") //Readd slug when borer spawn is fixed. var/list/chosen_atypes = list() var/list/chosen_candidates = list() var/list/already_assigned_candidates = list() diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 7ca50ad9eb..fc96c21821 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -44,15 +44,23 @@ var/list/event_last_fired = list() //see: // Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events.dm // Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm - possibleEvents[/datum/event/economic_event] = 300 - possibleEvents[/datum/event/trivial_news] = 400 - possibleEvents[/datum/event/mundane_news] = 300 + + if(ticker.mode && ticker.mode.name == "calamity") //Calamity mode messes with some events. + possibleEvents[/datum/event/borer_infestation] = 400 + possibleEvents[/datum/event/economic_event] = 25 + possibleEvents[/datum/event/trivial_news] = 25 + possibleEvents[/datum/event/mundane_news] = 25 + else + possibleEvents[/datum/event/economic_event] = 300 + possibleEvents[/datum/event/trivial_news] = 400 + possibleEvents[/datum/event/mundane_news] = 300 possibleEvents[/datum/event/pda_spam] = max(min(25, player_list.len) * 4, 200) possibleEvents[/datum/event/money_lotto] = max(min(5, player_list.len), 50) if(account_hack_attempted) possibleEvents[/datum/event/money_hacker] = max(min(25, player_list.len) * 4, 200) + possibleEvents[/datum/event/carp_migration] = 20 + 10 * active_with_role["Engineer"] possibleEvents[/datum/event/brand_intelligence] = 20 + 25 * active_with_role["Janitor"] diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 1311e1c71b..12efae2fac 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -32,7 +32,7 @@ var/scheduledEvent = null playercount_modifier = 0.8 if(ticker.mode && ticker.mode.name == "calamity") //Calamity mode lowers the time required between events drastically. - playercount_modifier = playercount_modifier * 0.3 + playercount_modifier = playercount_modifier * 0.5 var/next_event_delay = rand(eventTimeLower, eventTimeUpper) * playercount_modifier scheduledEvent = world.timeofday + next_event_delay From 4bedceca78ae430275074d2ee5c7cc4673ed1f8e Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 18 Sep 2014 21:45:12 +0930 Subject: [PATCH 2/2] Hydro tweaks. --- code/modules/hydroponics/hydro_tray.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index f1da2234ac..a7aeba259c 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -172,7 +172,7 @@ // Weeds like water and nutrients, there's a chance the weed population will increase. // Bonus chance if the tray is unoccupied. - if(waterlevel > 10 && nutrilevel > 2 && prob(isnull(seed) ? 6 : 3)) + if(waterlevel > 10 && nutrilevel > 2 && prob(isnull(seed) ? 5 : 2)) weedlevel += 1 * HYDRO_SPEED_MULTIPLIER // There's a chance for a weed explosion to happen if the weeds take over. @@ -187,7 +187,7 @@ return // Advance plant age. - if(prob(50)) age += 1 * HYDRO_SPEED_MULTIPLIER + if(prob(30)) age += 1 * HYDRO_SPEED_MULTIPLIER //Highly mutable plants have a chance of mutating every tick. if(seed.immutable == -1)