From 46729ebc6e86bdb3c33819cc29781e0a13d2402d Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Wed, 9 Aug 2023 15:50:04 -0400 Subject: [PATCH 1/2] tweaks to clamp, sleeper and extended. --- code/game/gamemodes/dynamic/dynamic.dm | 2 +- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 6 +++--- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index fb13f6a44290..d85171b1186d 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -393,7 +393,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) threat_level = round(GLOB.dynamic_forced_threat_level, 0.1) else generate_threat() - threat_level = clamp(threat_level,roundstart_pop_ready*0.75, roundstart_pop_ready*2) //Minimum threat is playercount and the max is playercount * 2, grabbed from OG Monke + threat_level = clamp(threat_level,roundstart_pop_ready*1, roundstart_pop_ready*2) //Minimum threat is playercount and the max is playercount * 2, grabbed from OG Monke generate_budgets() set_cooldowns() log_dynamic("Dynamic Mode initialized with a Threat Level of... [threat_level]! ([round_start_budget] round start budget)") diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index c8be5a378342..048beb557e4a 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -226,9 +226,9 @@ ) required_candidates = 1 minimum_players = 8 - weight = 15 - cost = 10 - requirements = list(20,15,15,15,15,15,15,15,15,15) + weight = 25 + cost = 5 + requirements = list(8,10,10,10,10,10,10,10,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/from_living/autotraitor/trim_candidates() diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 99877d6b94d2..3bef86eaa9a1 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -30,11 +30,10 @@ weight = 5 cost = 8 // Avoid raising traitor threat above this, as it is the default low cost ruleset. scaling_cost = 9 + minimum_players = 8 requirements = list(101,8,8,8,8,8,8,8,8,8) antag_cap = list("denominator" = 38) - minimum_players = 8 - var/autotraitor_cooldown = (15 MINUTES) /datum/dynamic_ruleset/roundstart/traitor/pre_execute(population) @@ -630,8 +629,8 @@ antag_datum = null restricted_roles = list() required_candidates = 0 - maximum_players = 6 - weight = 5 + maximum_players = 4 + weight = 3 cost = 0 requirements = list(1,101,101,101,101,101,101,101,101,101) flags = LONE_RULESET From 3625605b2f74ca34f194f2555153ef1fb916a2a1 Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Wed, 9 Aug 2023 20:29:54 -0400 Subject: [PATCH 2/2] disables extended since it's being funky. --- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 3bef86eaa9a1..278df4c77186 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -632,7 +632,7 @@ maximum_players = 4 weight = 3 cost = 0 - requirements = list(1,101,101,101,101,101,101,101,101,101) + requirements = list(101,101,101,101,101,101,101,101,101,101) // flags = LONE_RULESET /datum/dynamic_ruleset/roundstart/extended/pre_execute()