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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-04-22 20:12:14 +01:00
parent 6e610127ee 23200456b2
commit 50e2482613
145 changed files with 4044 additions and 173000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
code/controllers/configuration.dm
View File

@@ -57,6 +57,8 @@ var/list/gamemode_cache = list()
var/list/modes = list() // allowed modes
var/list/votable_modes = list() // votable modes
var/list/probabilities = list() // relative probability of each mode
var/list/player_requirements = list() // Overrides for how many players readied up a gamemode needs to start.
var/list/player_requirements_secret = list() // Same as above, but for the secret gamemode.
var/humans_need_surnames = 0
var/allow_random_events = 0 // enables random events mid-round when set to 1
var/allow_ai = 1 // allow ai job
@@ -237,6 +239,7 @@ var/list/gamemode_cache = list()
var/radiation_lower_limit = 0.35 //If the radiation level for a turf would be below this, ignore it.
var/random_submap_orientation = FALSE // If true, submaps loaded automatically can be rotated.
var/autostart_solars = FALSE // If true, specifically mapped in solar control computers will set themselves up when the round starts.
/datum/configuration/New()
var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -248,9 +251,11 @@ var/list/gamemode_cache = list()
gamemode_cache[M.config_tag] = M // So we don't instantiate them repeatedly.
if(!(M.config_tag in modes)) // ensure each mode is added only once
log_misc("Adding game mode [M.name] ([M.config_tag]) to configuration.")
src.modes += M.config_tag
src.mode_names[M.config_tag] = M.name
src.probabilities[M.config_tag] = M.probability
modes += M.config_tag
mode_names[M.config_tag] = M.name
probabilities[M.config_tag] = M.probability
player_requirements[M.config_tag] = M.required_players
player_requirements_secret[M.config_tag] = M.required_players_secret
if (M.votable)
src.votable_modes += M.config_tag
src.votable_modes += "secret"
@@ -522,6 +527,25 @@ var/list/gamemode_cache = list()
else
log_misc("Incorrect probability configuration definition: [prob_name] [prob_value].")
if ("required_players", "required_players_secret")
var/req_pos = findtext(value, " ")
var/req_name = null
var/req_value = null
var/is_secret_override = findtext(name, "required_players_secret") // Being extra sure we're not picking up an override for Secret by accident.
if(req_pos)
req_name = lowertext(copytext(value, 1, req_pos))
req_value = copytext(value, req_pos + 1)
if(req_name in config.modes)
if(is_secret_override)
config.player_requirements_secret[req_name] = text2num(req_value)
else
config.player_requirements[req_name] = text2num(req_value)
else
log_misc("Unknown game mode player requirement configuration definition: [req_name].")
else
log_misc("Incorrect player requirement configuration definition: [req_name] [req_value].")
if("allow_random_events")
config.allow_random_events = 1
@@ -764,6 +788,9 @@ var/list/gamemode_cache = list()
if("random_submap_orientation")
config.random_submap_orientation = 1
if("autostart_solars")
config.autostart_solars = TRUE
else
log_misc("Unknown setting in configuration: '[name]'")