cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency.

Browse Source
This commit is contained in:
Zuhayr
2014-09-18 21:41:54 +09:30
parent afde93e94d
commit 39689f05c7
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/calamity/calamity.dm
View File

@@ -17,7 +17,7 @@
uplink_uses = 10 uplink_uses = 10
//Possible roundstart antag types. //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_atypes = list()
var/list/chosen_candidates = list() var/list/chosen_candidates = list()
var/list/already_assigned_candidates = list() var/list/already_assigned_candidates = list()

14
code/modules/events/event_dynamic.dm
View File

@@ -44,15 +44,23 @@ var/list/event_last_fired = list()
//see: //see:
// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events.dm // Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events.dm
// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm // Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm
possibleEvents[/datum/event/economic_event] = 300
possibleEvents[/datum/event/trivial_news] = 400 if(ticker.mode && ticker.mode.name == "calamity") //Calamity mode messes with some events.
possibleEvents[/datum/event/mundane_news] = 300 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/pda_spam] = max(min(25, player_list.len) * 4, 200)
possibleEvents[/datum/event/money_lotto] = max(min(5, player_list.len), 50) possibleEvents[/datum/event/money_lotto] = max(min(5, player_list.len), 50)
if(account_hack_attempted) if(account_hack_attempted)
possibleEvents[/datum/event/money_hacker] = max(min(25, player_list.len) * 4, 200) 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/carp_migration] = 20 + 10 * active_with_role["Engineer"]
possibleEvents[/datum/event/brand_intelligence] = 20 + 25 * active_with_role["Janitor"] possibleEvents[/datum/event/brand_intelligence] = 20 + 25 * active_with_role["Janitor"]

2
code/modules/events/event_manager.dm
View File

@@ -32,7 +32,7 @@ var/scheduledEvent = null
playercount_modifier = 0.8 playercount_modifier = 0.8
if(ticker.mode && ticker.mode.name == "calamity") //Calamity mode lowers the time required between events drastically. 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 var/next_event_delay = rand(eventTimeLower, eventTimeUpper) * playercount_modifier
scheduledEvent = world.timeofday + next_event_delay scheduledEvent = world.timeofday + next_event_delay