diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index d69798bf9d..59b6bcd0b7 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -71,13 +71,13 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) * If it is seven the range is: * 0-6, 7-13, 14-20, 21-27, 28-34, 35-41, 42-48, 49-55, 56-62, 63+ */ - var/pop_per_requirement = 6 + var/pop_per_requirement = 9 /// The requirement used for checking if a second rule should be selected. - var/list/second_rule_req = list(100, 100, 80, 70, 60, 50, 30, 20, 10, 0) + var/list/second_rule_req = list(101, 101, 101, 101, 100, 90, 80, 70, 60, 50) /// The requirement used for checking if a third rule should be selected. - var/list/third_rule_req = list(100, 100, 100, 90, 80, 70, 60, 50, 40, 30) + var/list/third_rule_req = list(101, 101, 101, 101, 101, 100, 90, 80, 70, 60) /// Threat requirement for a second ruleset when high pop override is in effect. - var/high_pop_second_rule_req = 40 + var/high_pop_second_rule_req = 50 /// Threat requirement for a third ruleset when high pop override is in effect. var/high_pop_third_rule_req = 60 /// Number of players who were ready on roundstart. diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 838ca3ec62..192cca3a4b 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -60,8 +60,8 @@ required_candidates = 1 weight = 7 cost = 5 - requirements = list(40,30,20,10,10,10,10,10,10,10) - high_population_requirement = 10 + requirements = list(40,30,20,15,15,15,15,15,15,15) + high_population_requirement = 15 repeatable = TRUE flags = TRAITOR_RULESET diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index c13ba9fd80..7ba3388736 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -177,9 +177,9 @@ required_candidates = 1 weight = 7 cost = 10 - requirements = list(50,40,30,20,10,10,10,10,10,10) + requirements = list(30,25,20,15,15,15,15,15,15,15) repeatable = TRUE - high_population_requirement = 10 + high_population_requirement = 15 flags = TRAITOR_RULESET /datum/dynamic_ruleset/midround/autotraitor/acceptable(population = 0, threat = 0) @@ -232,10 +232,10 @@ exclusive_roles = list("AI") required_enemies = list(6,6,6,4,4,4,2,2,2,1) required_candidates = 1 - weight = 3 + weight = 2 cost = 35 - requirements = list(101,101,80,70,60,60,50,50,40,40) - high_population_requirement = 35 + requirements = list(101,101,70,50,50,50,40,30,30,30) + high_population_requirement = 30 required_type = /mob/living/silicon/ai var/ion_announce = 33 var/removeDontImproveChance = 10 @@ -286,8 +286,8 @@ required_candidates = 1 weight = 1 cost = 20 - requirements = list(90,90,70,40,30,20,10,10,10,10) - high_population_requirement = 50 + requirements = list(90,90,70,50,50,50,50,40,30,30) + high_population_requirement = 30 repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/wizard/ready(forced = FALSE) @@ -319,8 +319,8 @@ required_candidates = 5 weight = 5 cost = 35 - requirements = list(90,90,90,80,60,40,30,20,10,10) - high_population_requirement = 10 + requirements = list(90,90,90,80,70,60,50,40,40,40) + high_population_requirement = 40 var/operative_cap = list(2,2,3,3,4,5,5,5,5,5) var/datum/team/nuclear/nuke_team flags = HIGHLANDER_RULESET @@ -363,7 +363,7 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,101,80,60,50,30,20,10,10) + requirements = list(101,101,101,80,60,50,50,50,50,50) high_population_requirement = 50 repeatable = TRUE @@ -387,7 +387,7 @@ required_candidates = 1 weight = 3 cost = 10 - requirements = list(101,101,101,70,50,40,20,15,10,10) + requirements = list(101,101,101,70,50,50,50,50,50,50) high_population_requirement = 50 repeatable = TRUE var/list/vents = list() @@ -435,7 +435,7 @@ required_candidates = 1 weight = 3 cost = 10 - requirements = list(101,101,101,70,50,40,20,15,10,10) + requirements = list(101,101,101,70,50,40,20,15,15,15) high_population_requirement = 50 repeatable = TRUE var/list/spawn_locs = list() diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index b69133a710..e95f809fb8 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -17,8 +17,8 @@ required_candidates = 1 weight = 5 cost = 10 - requirements = list(10,10,10,10,10,10,10,10,10,10) - high_population_requirement = 10 + requirements = list(101,101,100,90,80,70,60,50,50,50) + high_population_requirement = 50 var/autotraitor_cooldown = 450 // 15 minutes (ticks once per 2 sec) /datum/dynamic_ruleset/roundstart/traitor/pre_execute() @@ -58,8 +58,8 @@ required_candidates = 1 weight = 1 cost = 35 - requirements = list(101,101,80,70,60,60,50,50,40,40) - high_population_requirement = 35 + requirements = list(101,101,101,101,101,100,90,80,70,60) + high_population_requirement = 50 required_type = /mob/living/silicon/ai var/autotraitor_cooldown = 450 // 15 minutes (ticks once per 2 sec) @@ -112,8 +112,8 @@ required_candidates = 2 weight = 4 cost = 10 - requirements = list(40,30,30,20,20,15,15,15,10,10) - high_population_requirement = 15 + requirements = list(101,101,101,101,101,101,101,101,101,101) + high_population_requirement = 101 var/list/datum/team/brother_team/pre_brother_teams = list() var/const/team_amount = 2 // Hard limit on brother teams if scaling is turned off var/const/min_team_size = 2 @@ -165,7 +165,7 @@ required_candidates = 1 weight = 3 cost = 30 - requirements = list(80,70,60,50,40,20,20,10,10,10) + requirements = list(101,101,101,101,101,101,101,101,101,101) high_population_requirement = 10 var/team_mode_probability = 30 @@ -215,8 +215,8 @@ required_candidates = 1 weight = 1 cost = 30 - requirements = list(90,90,70,40,30,20,10,10,10,10) - high_population_requirement = 10 + requirements = list(101,101,101,100,90,80,70,60,50,50) + high_population_requirement = 50 var/list/roundstart_wizards = list() /datum/dynamic_ruleset/roundstart/wizard/acceptable(population=0, threat=0) @@ -262,8 +262,8 @@ required_candidates = 2 weight = 3 cost = 30 - requirements = list(100,90,80,60,40,30,10,10,10,10) - high_population_requirement = 10 + requirements = list(101,101,101,100,90,80,70,60,50,50) + high_population_requirement = 50 flags = HIGHLANDER_RULESET var/cultist_cap = list(2,2,2,3,3,4,4,4,4,4) var/datum/team/cult/main_cult @@ -322,8 +322,8 @@ required_candidates = 5 weight = 3 cost = 40 - requirements = list(90,90,90,80,60,40,30,20,10,10) - high_population_requirement = 10 + requirements = list(101,101,101,100,90,80,70,60,50,50) + high_population_requirement = 50 flags = HIGHLANDER_RULESET var/operative_cap = list(2,2,2,3,3,3,4,4,5,5) var/datum/team/nuclear/nuke_team @@ -412,8 +412,8 @@ required_candidates = 3 weight = 2 cost = 35 - requirements = list(101,101,70,40,30,20,10,10,10,10) - high_population_requirement = 10 + requirements = list(101,101,101,100,90,80,70,60,50,50) + high_population_requirement = 50 delay = 5 MINUTES flags = HIGHLANDER_RULESET // I give up, just there should be enough heads with 35 players... @@ -523,9 +523,9 @@ restricted_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_candidates = 4 weight = 3 - cost = 0 - requirements = list(101,101,101,101,101,101,101,101,101,101) - high_population_requirement = 101 + cost = 35 + requirements = list(101,101,101,100,90,80,70,60,50,50) + high_population_requirement = 50 flags = HIGHLANDER_RULESET var/ark_time