From a4203070652e358cec8daa6d8274f633c0862483 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 31 Jan 2014 18:03:27 +0100 Subject: [PATCH 1/2] tweaked dynamic event probablilities, removed broken money hacker event for now --- code/modules/events/event_dynamic.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 3dd9e76cf91..6019d176887 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -59,20 +59,20 @@ var/global/list/possibleEvents = list() 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) +// if(!account_hack_attempted) +// possibleEvents[/datum/event/money_hacker] = max(min(25, player_list.len) * 4, 200) - possibleEvents[/datum/event/carp_migration] = 50 + 50 * active_with_role["Engineer"] + possibleEvents[/datum/event/carp_migration] = 50 + 25 * active_with_role["Engineer"] possibleEvents[/datum/event/spider_infestation] = 50 + 25 * active_with_role["Security"] possibleEvents[/datum/event/dust] = 50 + 50 * active_with_role["Engineer"] possibleEvents[/datum/event/dust/meaty] = 50 + 50 * active_with_role["Engineer"] - possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Engineer"] + possibleEvents[/datum/event/brand_intelligence] = 50 + 20 * active_with_role["Engineer"] 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 - 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/communications_blackout] = 50 + 30 * active_with_role["AI"] + active_with_role["Scientist"] * 25 + possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 50 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 possibleEvents[/datum/event/grid_check] = 25 + 20 * active_with_role["Engineer"] possibleEvents[/datum/event/electrical_storm] = 10 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] possibleEvents[/datum/event/wallrot] = 30 * active_with_role["Engineer"] + 50 * active_with_role["Botanist"] @@ -100,7 +100,7 @@ var/global/list/possibleEvents = list() possibleEvents[/datum/event/alien_infestation] = max(active_with_role["Security"], 5) + 2.5 if(!sent_ninja_to_station && toggle_space_ninja) possibleEvents[/datum/event/space_ninja] = active_with_role["Security"] * 20 - possibleEvents[/datum/event/undead] = active_with_role["Security"] * 10 + possibleEvents[/datum/event/undead] = active_with_role["Security"] * 15 possibleEvents[/datum/event/ghosts] = active_with_role["Security"] * 25 possibleEvents[/datum/event/tear] = active_with_role["Security"] * 25 From f6b16135f981baa8182bf9a22a1a44db209d1099 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 31 Jan 2014 18:14:26 +0100 Subject: [PATCH 2/2] Added biomass random event --- code/game/gamemodes/events/biomass.dm | 5 +++++ code/modules/events/event_dynamic.dm | 1 + 2 files changed, 6 insertions(+) diff --git a/code/game/gamemodes/events/biomass.dm b/code/game/gamemodes/events/biomass.dm index c86f444f00f..4835d9a61b6 100644 --- a/code/game/gamemodes/events/biomass.dm +++ b/code/game/gamemodes/events/biomass.dm @@ -157,6 +157,8 @@ /obj/effect/biomass/temperature_expose(null, temp, volume) //hotspots kill biomass del src +/datum/event/biomass/start() + biomass_infestation() /proc/biomass_infestation() @@ -173,3 +175,6 @@ var/turf/simulated/floor/T = pick(turfs) new/obj/effect/biomass_controller(T) //spawn a controller at turf message_admins("\blue Event: Biomass spawned at [T.loc.loc] ([T.x],[T.y],[T.z])") + + + diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 6019d176887..78667ddfb88 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -77,6 +77,7 @@ var/global/list/possibleEvents = list() possibleEvents[/datum/event/electrical_storm] = 10 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] possibleEvents[/datum/event/wallrot] = 30 * active_with_role["Engineer"] + 50 * active_with_role["Botanist"] possibleEvents[/datum/event/spacevine] = 25 + 5 * active_with_role["Engineer"] + possibleEvents[/datum/event/biomass] = 25 + 5 * active_with_role["Engineer"] if(minutes_passed >= 30) // Give engineers time to set up engine possibleEvents[/datum/event/meteor_wave] = 10 * active_with_role["Engineer"]