From ad227f09254184460c2847f55012f0c9b7b6e775 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Tue, 19 Feb 2013 14:18:55 +1000 Subject: [PATCH 1/2] removed debug string, bumped event intervals, decreased probability of some events Signed-off-by: Cael_Aislinn --- code/modules/events/event_dynamic.dm | 8 ++++---- code/modules/events/event_manager.dm | 10 +++++----- code/modules/events/infestation.dm | 2 +- code/modules/events/viral_infection.dm | 2 +- code/modules/events/viral_outbreak.dm | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 38e86ec0e56..731cc56551e 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -47,13 +47,13 @@ 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 - possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 - possibleEvents[/datum/event/grid_check] = 10 * active_with_role["Engineer"] + possibleEvents[/datum/event/ionstorm] = 25 + active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 + possibleEvents[/datum/event/grid_check] = 25 + 10 * active_with_role["Engineer"] possibleEvents[/datum/event/electrical_storm] = 75 + 25 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] if(!spacevines_spawned) possibleEvents[/datum/event/spacevine] = 5 + 10 * active_with_role["Engineer"] - if(active_with_role["Engineer"] > 0 && minutes_passed >= 30) // Give engineers time to set up engine + if(minutes_passed >= 30) // Give engineers time to set up engine possibleEvents[/datum/event/meteor_wave] = 20 * active_with_role["Engineer"] possibleEvents[/datum/event/meteor_shower] = 80 * active_with_role["Engineer"] possibleEvents[/datum/event/blob] = 30 * active_with_role["Engineer"] @@ -64,8 +64,8 @@ possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 75 possibleEvents[/datum/event/viral_outbreak] = active_with_role["Medical"] * 5 + possibleEvents[/datum/event/prison_break] = active_with_role["Security"] * 50 if(active_with_role["Security"] > 0) - possibleEvents[/datum/event/prison_break] = active_with_role["Security"] * 50 if(!sent_spiders_to_station) possibleEvents[/datum/event/spider_infestation] = max(active_with_role["Security"], 5) + 5 if(aliens_allowed && !sent_aliens_to_station) diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 40f8483ca4b..855e4d969ba 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 @@ -25,11 +25,11 @@ var/scheduledEvent = null playercount_modifier = 1.2 if(11 to 15) playercount_modifier = 1.1 - if(16 to 20) + if(16 to 25) playercount_modifier = 1 - if(21 to 25) + if(26 to 35) playercount_modifier = 0.9 - if(26 to 100000) + if(36 to 100000) playercount_modifier = 0.8 scheduledEvent = world.timeofday + rand(eventTimeLower, eventTimeUpper) * playercount_modifier diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 513f83ea5ed..04dc7d46a17 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -94,7 +94,7 @@ var/spawn_type = pick(spawn_types) new spawn_type(T) num-- - world << "[vermstring] spawned in [spawn_area_type]" + //world << "[vermstring] spawned in [spawn_area_type]" /datum/event/infestation/announce() command_alert("Bioscans indicate that [vermstring] have been breeding in [locstring]. Clear them out, before this starts to affect productivity.", "Vermin infestation") diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 3644905d8c3..2798e51dfbc 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -8,7 +8,7 @@ datum/event/viral_infection/setup() severity = rand(1, 3) datum/event/viral_infection/announce() - command_alert("Confirmed outbreak of level [severity + rand(2,3)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") + command_alert("Confirmed outbreak of level five biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak5.ogg') datum/event/viral_infection/start() diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm index 49fbcdebd68..7a21ecccf9c 100644 --- a/code/modules/events/viral_outbreak.dm +++ b/code/modules/events/viral_outbreak.dm @@ -8,7 +8,7 @@ datum/event/viral_outbreak/setup() severity = rand(2, 4) datum/event/viral_outbreak/announce() - command_alert("Confirmed outbreak of level [severity + rand(3,5)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") + command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak7.ogg') datum/event/viral_outbreak/start() From 93ef7b83d88af85a6a8a15c9171d0b879062057c Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Wed, 20 Feb 2013 20:36:16 +1000 Subject: [PATCH 2/2] replaced infestation slimes with spiderlings (with 0% chance to grow into giant spiders), reduced spiderling noisiness, made them less jittery (easier to squish) Signed-off-by: Cael_Aislinn --- code/game/objects/effects/spiders.dm | 26 +++++++++++++++----------- code/modules/events/infestation.dm | 21 ++++++++++++--------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index d357740a6f4..68f57112cbf 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -95,15 +95,16 @@ anchored = 0 layer = 2.7 health = 3 - var/amount_grown = 0 + var/amount_grown = -1 var/obj/machinery/atmospherics/unary/vent_pump/entry_vent var/travelling_in_vent = 0 New() pixel_x = rand(6,-6) pixel_y = rand(6,-6) + processing_objects.Add(src) //50% chance to grow up if(prob(50)) - processing_objects.Add(src) + amount_grown = 1 /obj/effect/spider/spiderling/Bump(atom/user) if(istype(user, /obj/structure/table)) @@ -134,8 +135,8 @@ entry_vent = null return var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents) - if(prob(50)) - src.visible_message("[src] scrambles into the ventillation ducts!") + /*if(prob(50)) + src.visible_message("[src] scrambles into the ventillation ducts!")*/ spawn(rand(20,60)) loc = exit_vent @@ -164,21 +165,24 @@ entry_vent = null //================= - else if(prob(33)) - var/list/nearby = oview(10, src) + else if(prob(25)) + var/list/nearby = oview(5, src) if(nearby.len) var/target_atom = pick(nearby) - walk_to(src, target_atom) - if(prob(40)) + walk_to(src, target_atom, 5) + if(prob(25)) src.visible_message("\blue \the [src] skitters[pick(" away"," around","")].") - else if(prob(10)) + else if(prob(5)) //ventcrawl! for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) if(!v.welded) entry_vent = v - walk_to(src, entry_vent, 1) + walk_to(src, entry_vent, 5) break - if(isturf(loc)) + + if(prob(1)) + src.visible_message("\blue \the [src] chitters.") + if(isturf(loc) && amount_grown > 0) amount_grown += rand(0,2) if(amount_grown >= 100) var/spawn_type = pick(typesof(/mob/living/simple_animal/hostile/giant_spider)) diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 04dc7d46a17..8cc42d32fd4 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -11,7 +11,7 @@ #define VERM_MICE 0 #define VERM_LIZARDS 1 -#define VERM_SLIMES 2 +#define VERM_SPIDERS 2 /datum/event/infestation announceWhen = 10 @@ -81,20 +81,23 @@ 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" + if(VERM_SPIDERS) + spawn_types = list(/obj/effect/spider/spiderling) + max_number = 6 + vermstring = "spiders" spawn(0) var/num = rand(2,max_number) while(turfs.len > 0 && num > 0) var/turf/simulated/floor/T = pick(turfs) turfs.Remove(T) - var/spawn_type = pick(spawn_types) - new spawn_type(T) num-- - //world << "[vermstring] spawned in [spawn_area_type]" + if(vermin == VERM_SPIDERS) + var/obj/effect/spider/spiderling/S = new(T) + S.amount_grown = -1 + else + var/spawn_type = pick(spawn_types) + new spawn_type(T) /datum/event/infestation/announce() command_alert("Bioscans indicate that [vermstring] have been breeding in [locstring]. Clear them out, before this starts to affect productivity.", "Vermin infestation") @@ -111,4 +114,4 @@ #undef VERM_MICE #undef VERM_LIZARDS -#undef VERM_SLIMES \ No newline at end of file +#undef VERM_SPIDERS \ No newline at end of file