shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made minor starts affect full round less; added fallback

Browse Source
This commit is contained in:
Putnam
2020-10-19 20:28:56 -07:00
parent 1738233c27
commit 7789aeeefc
2 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/dynamic/dynamic.dm
+14 -17
View File
@@ -128,7 +128,7 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
/// If a only ruleset has been executed. No other rulesets will be run.
var/only_ruleset_executed = FALSE
/// If the first picked ruleset was a minor ruleset. Minor antagonists will be weighted higher.
var/minor_ruleset_round = FALSE
var/minor_ruleset_start = FALSE
/// Antags rolled by rules so far, to keep track of and discourage scaling past a certain ratio of crew/antags especially on lowpop.
var/antags_rolled = 0
// Arbitrary threat addition, for fudging purposes.
@@ -402,7 +402,7 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
rigged_roundstart()
else
roundstart()
if(minor_ruleset_round)
if(minor_ruleset_start)
log_game("DYNAMIC: Starting a minor ruleset round.")
else
var/starting_rulesets = ""
@@ -414,7 +414,7 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
/datum/game_mode/dynamic/post_setup(report)
update_playercounts()
if(minor_ruleset_round)
if(minor_ruleset_start)
addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/minor_roundstart),rand(1 MINUTES,5 MINUTES))
else
for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules)
@@ -426,10 +426,6 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
var/list/potential_minor_rulesets = storyteller.minor_rule_draft()
var/iterations = 0
var/num_rulesets_executed = 0
for(var/r in midround_rules | latejoin_rules)
var/datum/dynamic_ruleset/rule = r
if(CHECK_BITFIELD(rule.flags,MINOR_RULESET))
rule.weight_mult *= 1.5
while(threat < threat_level && potential_minor_rulesets.len && (!CHECK_TICK || iterations < 100))
var/datum/dynamic_ruleset/minor/rule = pickweight(potential_minor_rulesets)
rule.candidates = current_players[CURRENT_LIVING_PLAYERS].Copy()
@@ -465,17 +461,17 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
if (GLOB.dynamic_forced_extended)
log_game("DYNAMIC: Starting a round of forced extended.")
return TRUE
if(prob(storyteller.minor_round_chance()))
minor_ruleset_round = TRUE
message_admins("Dynamic has started a minor antag round. Antags will be assigned in 1-5 minutes.")
log_game("DYNAMIC: Minor round started.")
return
if(prob(storyteller.minor_start_chance()))
minor_ruleset_start = TRUE
message_admins("Dynamic has initialized a minor antag start. Antags will be assigned in 1-5 minutes.")
log_game("DYNAMIC: Minor start initialized.")
return TRUE
var/list/drafted_rules = storyteller.roundstart_draft()
if(!drafted_rules.len)
message_admins("Not enough threat level for roundstart antags!")
log_game("DYNAMIC: Not enough threat level for roundstart antags!")
midround_injection_cooldown = round((midround_injection_cooldown + world.time) / 2, 1)
latejoin_injection_cooldown = round((latejoin_injection_cooldown + world.time) / 2, 1)
message_admins("No roundstart antags drafted! Falling back to minor ruleset start.")
log_game("DYNAMIC: No roundstart antags drafted! Falling back to minor ruleset start.")
minor_ruleset_start = TRUE
return FALSE
var/indice_pop = min(10,round(roundstart_pop_ready/pop_per_requirement)+1)
extra_rulesets_amount = 0
if (GLOB.dynamic_classic_secret)
@@ -509,8 +505,9 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
else
if(threat_level >= 50)
message_admins("DYNAMIC: Picking first roundstart ruleset failed. You should report this.")
message_admins("DYNAMIC: Picking first roundstart ruleset failed. You should report this. Falling back to minor antag start.")
log_game("DYNAMIC: Picking first roundstart ruleset failed. drafted_rules.len = [drafted_rules.len] and threat = [threat]/[threat_level]")
minor_ruleset_start = TRUE
return FALSE
return TRUE
code/game/gamemodes/dynamic/dynamic_storytellers.dm
+9 -9
View File
@@ -32,7 +32,7 @@ Property weights are added to the config weight of the ruleset. They are:
"conversion" -- Basically a bool. Conversion antags, well, convert. It's in its own class 'cause people kinda hate conversion.
*/
/datum/dynamic_storyteller/proc/minor_round_chance()
/datum/dynamic_storyteller/proc/minor_start_chance()
return clamp(60 - mode.threat_level,0,100) // by default higher threat = lower chance of minor round
/datum/dynamic_storyteller/proc/start_injection_cooldowns()
@@ -107,7 +107,7 @@ Property weights are added to the config weight of the ruleset. They are:
/datum/dynamic_storyteller/proc/roundstart_draft()
var/list/drafted_rules = list()
var/minor_round_weight_mult = (100-minor_round_chance()) / 100
var/minor_round_weight_mult = (100-minor_start_chance()) / 100
for (var/datum/dynamic_ruleset/roundstart/rule in mode.roundstart_rules)
if (rule.acceptable(mode.roundstart_pop_ready, mode.threat_level)) // If we got the population and threat required
rule.candidates = mode.candidates.Copy()
@@ -217,7 +217,7 @@ Property weights are added to the config weight of the ruleset. They are:
min_players = 30
var/refund_cooldown = 0
/datum/dynamic_storyteller/chaotic/minor_round_chance()
/datum/dynamic_storyteller/chaotic/minor_start_chance()
return 0
/datum/dynamic_storyteller/chaotic/do_process()
@@ -240,7 +240,7 @@ Property weights are added to the config weight of the ruleset. They are:
flags = WAROPS_ALWAYS_ALLOWED | USE_PREV_ROUND_WEIGHTS
property_weights = list("valid" = 3, "trust" = 5)
/datum/dynamic_storyteller/chaotic/minor_round_chance()
/datum/dynamic_storyteller/chaotic/minor_start_chance()
return 0
/datum/dynamic_storyteller/team/should_inject_antag(dry_run = FALSE)
@@ -256,7 +256,7 @@ Property weights are added to the config weight of the ruleset. They are:
flags = WAROPS_ALWAYS_ALLOWED
property_weights = list("valid" = 1, "conversion" = 20)
/datum/dynamic_storyteller/chaotic/minor_round_chance()
/datum/dynamic_storyteller/chaotic/minor_start_chance()
return 0
/datum/dynamic_storyteller/random
@@ -275,7 +275,7 @@ Property weights are added to the config weight of the ruleset. They are:
/datum/dynamic_storyteller/random/should_inject_antag()
return prob(50)
/datum/dynamic_storyteller/chaotic/minor_round_chance()
/datum/dynamic_storyteller/chaotic/minor_start_chance()
return 20
/datum/dynamic_storyteller/random/roundstart_draft()
@@ -352,7 +352,7 @@ Property weights are added to the config weight of the ruleset. They are:
flags = USE_PREV_ROUND_WEIGHTS
property_weights = list("trust" = -2)
/datum/dynamic_storyteller/intrigue/minor_round_chance()
/datum/dynamic_storyteller/intrigue/minor_start_chance()
return 100 - mode.threat_level
/datum/dynamic_storyteller/grabbag
@@ -362,7 +362,7 @@ Property weights are added to the config weight of the ruleset. They are:
weight = 2
flags = USE_PREF_WEIGHTS | USE_PREV_ROUND_WEIGHTS
/datum/dynamic_storyteller/grabbag/minor_round_chance()
/datum/dynamic_storyteller/grabbag/minor_start_chance()
return 100
/datum/dynamic_storyteller/liteextended
@@ -376,7 +376,7 @@ Property weights are added to the config weight of the ruleset. They are:
dead_player_weight = 5
property_weights = list("extended" = 2, "chaos" = -1, "valid" = -1, "conversion" = -10)
/datum/dynamic_storyteller/liteextended/minor_round_chance()
/datum/dynamic_storyteller/liteextended/minor_start_chance()
return 100
/datum/dynamic_storyteller/no_antag