Changes event earliest_start to use time helpers (#35841)

* uses time helpers, tweaks santa/shuttle loan times

* hourS
This commit is contained in:
81Denton
2018-02-21 18:38:09 +01:00
committed by CitadelStationBot
parent c1d66af3a1
commit cfd768e09f
33 changed files with 50 additions and 53 deletions

View File

@@ -5,7 +5,6 @@
typepath = /datum/round_event/ghost_role/revenant
weight = 7
max_occurrences = 1
earliest_start = 12000 //Meant to mix things up early-game.
min_players = 5

View File

@@ -3,7 +3,7 @@
typepath = /datum/round_event/ghost_role/slaughter
weight = 1 //Very rare
max_occurrences = 1
earliest_start = 36000 //1 hour
earliest_start = 1 HOURS
min_players = 20

View File

@@ -3,7 +3,7 @@
typepath = /datum/round_event/spawn_swarmer
weight = 7
max_occurrences = 1 //Only once okay fam
earliest_start = 18000 //30 minutes
earliest_start = 30 MINUTES
min_players = 15

View File

@@ -8,7 +8,7 @@
//10 is the default weight. 20 is twice more likely; 5 is half as likely as this default.
//0 here does NOT disable the event, it just makes it extremely unlikely
var/earliest_start = 12000 //The earliest world.time that an event can start (round-duration in deciseconds) default: 20 mins
var/earliest_start = 20 MINUTES //The earliest world.time that an event can start (round-duration in deciseconds) default: 20 mins
var/min_players = 0 //The minimum amount of alive, non-AFK human players on server required to start the event.
var/occurrences = 0 //How many times this event has occured

View File

@@ -3,7 +3,7 @@
typepath = /datum/round_event/carp_migration
weight = 15
min_players = 2
earliest_start = 6000
earliest_start = 10 MINUTES
max_occurrences = 6
/datum/round_event/carp_migration

View File

@@ -3,7 +3,7 @@
typepath = /datum/round_event/space_dust
weight = 200
max_occurrences = 1000
earliest_start = 0
earliest_start = 0 MINUTES
alertadmins = 0
/datum/round_event/space_dust
@@ -19,7 +19,7 @@
typepath = /datum/round_event/sandstorm
weight = 0
max_occurrences = 0
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/sandstorm
startWhen = 1

View File

@@ -1,7 +1,7 @@
/datum/round_event_control/electrical_storm
name = "Electrical Storm"
typepath = /datum/round_event/electrical_storm
earliest_start = 6000
earliest_start = 10 MINUTES
min_players = 5
weight = 40
alertadmins = 0

View File

@@ -3,7 +3,6 @@
typepath = /datum/round_event/heart_attack
weight = 20
max_occurrences = 2
earliest_start = 12000
min_players = 40 // To avoid shafting lowpop
/datum/round_event/heart_attack/start()

View File

@@ -4,7 +4,7 @@
typepath = /datum/round_event/spooky
weight = -1 //forces it to be called, regardless of weight
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/spooky/start()
..()

View File

@@ -10,7 +10,7 @@
typepath = /datum/round_event/valentines
weight = -1 //forces it to be called, regardless of weight
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/valentines/start()
..()

View File

@@ -64,7 +64,7 @@
typepath = /datum/round_event/santa
weight = 20
max_occurrences = 1
earliest_start = 20000
earliest_start = 30 MINUTES
/datum/round_event/santa
var/mob/living/carbon/human/santa //who is our santa?

View File

@@ -3,7 +3,7 @@
typepath = /datum/round_event/portal_storm/syndicate_shocktroop
weight = 2
min_players = 15
earliest_start = 18000
earliest_start = 30 MINUTES
/datum/round_event/portal_storm/syndicate_shocktroop
boss_types = list(/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper = 2)

View File

@@ -10,7 +10,7 @@
name = "Shuttle Loan"
typepath = /datum/round_event/shuttle_loan
max_occurrences = 1
earliest_start = 4000
earliest_start = 7 MINUTES
/datum/round_event/shuttle_loan
announceWhen = 1

View File

@@ -3,7 +3,7 @@
typepath = /datum/round_event/spontaneous_appendicitis
weight = 20
max_occurrences = 4
earliest_start = 6000
earliest_start = 10 MINUTES
min_players = 5 // To make your chance of getting help a bit higher.
/datum/round_event/spontaneous_appendicitis

View File

@@ -3,7 +3,7 @@
weight = 2
typepath = /datum/round_event/wizard/darkness
max_occurrences = 2
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/darkness
endWhen = 0

View File

@@ -5,7 +5,7 @@
weight = 2
typepath = /datum/round_event/wizard/robelesscasting
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/robelesscasting/start()
@@ -27,7 +27,7 @@
weight = 3
typepath = /datum/round_event/wizard/improvedcasting
max_occurrences = 4 //because that'd be max level spells
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/improvedcasting/start()
for(var/i in GLOB.mob_living_list)

View File

@@ -3,7 +3,6 @@
weight = 3
typepath = /datum/round_event/wizard/blobies
max_occurrences = 3
earliest_start = 12000 // 20 minutes (gotta get some bodies made!)
/datum/round_event/wizard/blobies/start()

View File

@@ -3,7 +3,7 @@
weight = 3
typepath = /datum/round_event/wizard/cursed_items
max_occurrences = 3
earliest_start = 0
earliest_start = 0 MINUTES
//Note about adding items to this: Because of how NODROP_1 works if an item spawned to the hands can also be equiped to a slot
//it will be able to be put into that slot from the hand, but then get stuck there. To avoid this make a new subtype of any

View File

@@ -3,7 +3,7 @@
weight = 0 //An order that requires order in a round of chaos was maybe not the best idea. Requiescat in pace departmental uprising August 2014 - March 2015
typepath = /datum/round_event/wizard/deprevolt
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/deprevolt/start()

View File

@@ -3,7 +3,7 @@
weight = 0 //Badmin exclusive now because once it's expected its not funny
typepath = /datum/round_event/wizard/fake_explosion
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/fake_explosion/start()
sound_to_playing_players('sound/machines/alarm.ogg')

View File

@@ -3,7 +3,7 @@
weight = 3
typepath = /datum/round_event/wizard/ghost
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/ghost/start()
var/msg = "<span class='warning'>You suddenly feel extremely obvious...</span>"
@@ -17,7 +17,7 @@
weight = 2
typepath = /datum/round_event/wizard/possession
max_occurrences = 5
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/possession/start()
for(var/mob/dead/observer/G in GLOB.player_list)

View File

@@ -3,7 +3,7 @@
weight = 4
typepath = /datum/round_event/wizard/greentext
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/greentext/start()

View File

@@ -3,7 +3,7 @@
weight = 1
typepath = /datum/round_event/wizard/imposter
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/imposter/start()
for(var/datum/mind/M in SSticker.mode.wizards)

View File

@@ -3,7 +3,7 @@
weight = 3
typepath = /datum/round_event/wizard/invincible
max_occurrences = 5
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/invincible/start()

View File

@@ -3,7 +3,7 @@
weight = 2
typepath = /datum/round_event/wizard/lava
max_occurrences = 3
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/lava
endWhen = 0

View File

@@ -3,7 +3,7 @@
weight = 1
typepath = /datum/round_event/wizard/magicarp
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/magicarp
announceWhen = 3

View File

@@ -3,7 +3,7 @@
weight = 2
typepath = /datum/round_event/wizard/petsplosion
max_occurrences = 1 //Exponential growth is nothing to sneeze at!
earliest_start = 0
earliest_start = 0 MINUTES
var/mobs_to_dupe = 0
/datum/round_event_control/wizard/petsplosion/preRunEvent()

View File

@@ -3,7 +3,7 @@
weight = 2
typepath = /datum/round_event/wizard/race
max_occurrences = 5
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/race/start()

View File

@@ -3,7 +3,7 @@
weight = 3
typepath = /datum/round_event/wizard/rpgloot
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/rpgloot/start()
var/upgrade_scroll_chance = 0

View File

@@ -6,7 +6,7 @@
weight = 2
typepath = /datum/round_event/wizard/shuffleloc
max_occurrences = 5
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/shuffleloc/start()
var/list/moblocs = list()
@@ -42,7 +42,7 @@
weight = 4
typepath = /datum/round_event/wizard/shufflenames
max_occurrences = 5
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/shufflenames/start()
var/list/mobnames = list()
@@ -76,7 +76,7 @@
weight = 1
typepath = /datum/round_event/wizard/shuffleminds
max_occurrences = 3
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/wizard/shuffleminds/start()
var/list/mobs = list()

View File

@@ -3,7 +3,7 @@
weight = 1
typepath = /datum/round_event/wizard/summonguns
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event_control/wizard/summonguns/New()
if(CONFIG_GET(flag/no_summon_guns))
@@ -18,7 +18,7 @@
weight = 1
typepath = /datum/round_event/wizard/summonmagic
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event_control/wizard/summonmagic/New()
if(CONFIG_GET(flag/no_summon_magic))

View File

@@ -4,7 +4,7 @@
typepath = /datum/round_event/easter
weight = -1
max_occurrences = 1
earliest_start = 0
earliest_start = 0 MINUTES
/datum/round_event/easter/announce(fake)
priority_announce(pick("Hip-hop into Easter!","Find some Bunny's stash!","Today is National 'Hunt a Wabbit' Day.","Be kind, give Chocolate Eggs!"))

View File

@@ -13,7 +13,7 @@ Contents:
name = "Space Ninja"
typepath = /datum/round_event/ghost_role/ninja
max_occurrences = 1
earliest_start = 30000 // 1 hour
earliest_start = 1 HOURS
min_players = 15
/datum/round_event/ghost_role/ninja