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

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source
This commit is contained in:
VitrescentTortoise
2013-05-26 00:45:47 -07:00
parent b13424322a 76525a4ccf
commit c842f21bc5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,8 @@
sleep(2400) sleep(2400)
*/ */
var/list/event_last_fired = list()
//Always triggers an event when called, dynamically chooses events based on job population //Always triggers an event when called, dynamically chooses events based on job population
/proc/spawn_dynamic_event() /proc/spawn_dynamic_event()
if(!config.allow_random_events) if(!config.allow_random_events)
@@ -86,8 +88,14 @@
if(!sent_ninja_to_station && toggle_space_ninja) if(!sent_ninja_to_station && toggle_space_ninja)
possibleEvents[/datum/event/space_ninja] = max(active_with_role["Security"], 5) possibleEvents[/datum/event/space_ninja] = max(active_with_role["Security"], 5)
for(var/event_type in event_last_fired) if(possibleEvents[event_type])
var/time_passed = world.time - event_last_fired[event_type]
var/weight_modifier = max(0, 60 * 60 - time_passed / 100)
possibleEvents[event_type] = max(possibleEvents[event_type] - weight_modifier, 0)
var/picked_event = pickweight(possibleEvents) var/picked_event = pickweight(possibleEvents)
event_last_fired[picked_event] = world.time
// Debug code below here, very useful for testing so don't delete please. // Debug code below here, very useful for testing so don't delete please.
var/debug_message = "Firing random event. " var/debug_message = "Firing random event. "

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

@@ -2,8 +2,8 @@ var/list/allEvents = typesof(/datum/event) - /datum/event
var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event
//var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event - /datum/event/spider_infestation - /datum/event/alien_infestation //var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event - /datum/event/spider_infestation - /datum/event/alien_infestation
var/eventTimeLower = 10000 //15 minutes var/eventTimeLower = 6000 //10 minutes
var/eventTimeUpper = 25000 //30 minutes var/eventTimeUpper = 12000 //15 minutes
var/scheduledEvent = null var/scheduledEvent = null