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

removed event debug string, bumped up minimum event interval, tweak to space carp

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-02-19 14:04:33 +10:00
parent e9981b91ec
commit 8cd47739d2
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/events/carp_migration.dm
View File

@@ -18,6 +18,7 @@
/datum/event/carp_migration/end() /datum/event/carp_migration/end()
for(var/mob/living/simple_animal/hostile/carp/C in spawned_carp) for(var/mob/living/simple_animal/hostile/carp/C in spawned_carp)
var/turf/T = get_turf(C) if(!C.stat)
if(istype(T, /turf/space)) var/turf/T = get_turf(C)
del(C) if(istype(T, /turf/space))
del(C)

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

@@ -43,7 +43,7 @@
possibleEvents[/datum/event/carp_migration] = 50 + 50 * active_with_role["Engineer"] 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/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/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/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role["Scientist"] * 25

8
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 = 15000 //15 minutes var/eventTimeLower = 20000 //20 minutes
var/eventTimeUpper = 30000 //45 minutes var/eventTimeUpper = 45000 //45 minutes
var/scheduledEvent = null var/scheduledEvent = null
@@ -19,7 +19,7 @@ var/scheduledEvent = null
/proc/checkEvent() /proc/checkEvent()
if(!scheduledEvent) if(!scheduledEvent)
//more players = more time between events, less players = less time between events //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) switch(player_list.len)
if(0 to 10) if(0 to 10)
playercount_modifier = 1.2 playercount_modifier = 1.2
@@ -63,4 +63,4 @@ var/scheduledEvent = null
if(ispath(type)) if(ispath(type))
new type new type
message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1) message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1)

6
code/modules/events/infestation.dm
View File

@@ -70,24 +70,20 @@
turfs += F turfs += F
var/list/spawn_types = list() var/list/spawn_types = list()
var/max_number
vermin = rand(0,2) vermin = rand(0,2)
switch(vermin) switch(vermin)
if(VERM_MICE) if(VERM_MICE)
spawn_types = list(/mob/living/simple_animal/mouse/gray, /mob/living/simple_animal/mouse/brown, /mob/living/simple_animal/mouse/white) 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" vermstring = "mice"
if(VERM_LIZARDS) if(VERM_LIZARDS)
spawn_types = list(/mob/living/simple_animal/lizard) spawn_types = list(/mob/living/simple_animal/lizard)
max_number = 6
vermstring = "lizards" vermstring = "lizards"
if(VERM_SLIMES) if(VERM_SLIMES)
spawn_types = list(/mob/living/carbon/slime) spawn_types = list(/mob/living/carbon/slime)
max_number = 3
vermstring = "slimes" vermstring = "slimes"
spawn(0) spawn(0)
var/num = rand(2,max_number) var/num = rand(1, 3)
while(turfs.len > 0 && num > 0) while(turfs.len > 0 && num > 0)
var/turf/simulated/floor/T = pick(turfs) var/turf/simulated/floor/T = pick(turfs)
turfs.Remove(T) turfs.Remove(T)