From 8cd47739d285b40fa6c27df88780d6c29f8f2f27 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Tue, 19 Feb 2013 14:04:33 +1000 Subject: [PATCH] removed event debug string, bumped up minimum event interval, tweak to space carp Signed-off-by: Cael_Aislinn --- code/modules/events/carp_migration.dm | 7 ++++--- code/modules/events/event_dynamic.dm | 2 +- code/modules/events/event_manager.dm | 8 ++++---- code/modules/events/infestation.dm | 6 +----- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index dffb2836688..e90e20c9f88 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -18,6 +18,7 @@ /datum/event/carp_migration/end() for(var/mob/living/simple_animal/hostile/carp/C in spawned_carp) - var/turf/T = get_turf(C) - if(istype(T, /turf/space)) - del(C) + if(!C.stat) + var/turf/T = get_turf(C) + if(istype(T, /turf/space)) + del(C) diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 38e86ec0e56..4a2c43bdf6c 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -43,7 +43,7 @@ possibleEvents[/datum/event/carp_migration] = 50 + 50 * active_with_role["Engineer"] possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Janitor"] - possibleEvents[/datum/event/rogue_drone] = 50 + 25 * active_with_role["Engineer"] + 25 * active_with_role["Security"] + possibleEvents[/datum/event/rogue_drone] = 25 + 25 * active_with_role["Engineer"] + 25 * active_with_role["Security"] possibleEvents[/datum/event/infestation] = 50 + 25 * active_with_role["Janitor"] possibleEvents[/datum/event/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role["Scientist"] * 25 diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 40f8483ca4b..ab505e5d832 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -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 - /datum/event/spider_infestation - /datum/event/alien_infestation -var/eventTimeLower = 15000 //15 minutes -var/eventTimeUpper = 30000 //45 minutes +var/eventTimeLower = 20000 //20 minutes +var/eventTimeUpper = 45000 //45 minutes var/scheduledEvent = null @@ -19,7 +19,7 @@ var/scheduledEvent = null /proc/checkEvent() if(!scheduledEvent) //more players = more time between events, less players = less time between events - var/playercount_modifier = 0.5 + var/playercount_modifier = 1 switch(player_list.len) if(0 to 10) playercount_modifier = 1.2 @@ -63,4 +63,4 @@ var/scheduledEvent = null if(ispath(type)) new type - message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1) \ No newline at end of file + message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1) diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 04dc7d46a17..4099927ac9f 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -70,24 +70,20 @@ turfs += F var/list/spawn_types = list() - var/max_number vermin = rand(0,2) switch(vermin) if(VERM_MICE) spawn_types = list(/mob/living/simple_animal/mouse/gray, /mob/living/simple_animal/mouse/brown, /mob/living/simple_animal/mouse/white) - max_number = 12 vermstring = "mice" if(VERM_LIZARDS) spawn_types = list(/mob/living/simple_animal/lizard) - max_number = 6 vermstring = "lizards" if(VERM_SLIMES) spawn_types = list(/mob/living/carbon/slime) - max_number = 3 vermstring = "slimes" spawn(0) - var/num = rand(2,max_number) + var/num = rand(1, 3) while(turfs.len > 0 && num > 0) var/turf/simulated/floor/T = pick(turfs) turfs.Remove(T)