From af2777a604066640f48eea333b466d588251e5f8 Mon Sep 17 00:00:00 2001 From: keronshb Date: Sat, 25 Sep 2021 17:56:15 -0400 Subject: [PATCH] Citadel weight adjustments and config --- .../dynamic/dynamic_rulesets_latejoin.dm | 6 +-- .../dynamic/dynamic_rulesets_midround.dm | 38 +++++++-------- .../dynamic/dynamic_rulesets_roundstart.dm | 24 +++++----- config/dynamic.json | 48 +++++++++---------- 4 files changed, 57 insertions(+), 59 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 49a474f55f..9ff996c655 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -83,7 +83,7 @@ weight = 2 delay = 1 MINUTES // Prevents rule start while head is offstation. cost = 20 - requirements = list(101,101,70,40,30,20,20,20,20,20) + requirements = list(101,101,101,101,50,20,20,20,20,20) flags = HIGH_IMPACT_RULESET blocking_rules = list(/datum/dynamic_ruleset/roundstart/revs) var/required_heads_of_staff = 3 @@ -143,7 +143,7 @@ ////////////////////////////////////////////// // // -// HERETIC SMUGGLER // +// HERETIC SMUGGLER // // // ////////////////////////////////////////////// @@ -157,5 +157,5 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,101,10,10,10,10,10,10,10) + requirements = list(101,101,101,50,40,10,10,10,10,10) repeatable = TRUE diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 1329395df7..56a75f6d88 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -190,7 +190,7 @@ required_candidates = 1 weight = 7 cost = 10 - requirements = list(50,40,30,20,10,10,10,10,10,10) + requirements = list(101,40,30,20,10,10,10,10,10,10) repeatable = TRUE /// Whether or not this instance of sleeper agent should be randomly acceptable. @@ -303,9 +303,9 @@ enemy_roles = list("Security Officer","Detective","Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 - weight = 1 + weight = 2 cost = 20 - requirements = list(101,101,100,80,60,40,30,20,10,10) + requirements = list(101,101,100,80,50,30,20,10,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/wizard/ready(forced = FALSE) @@ -335,10 +335,10 @@ enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden","Detective","Head of Security", "Captain") required_enemies = list(3,3,3,3,3,2,1,1,0,0) required_candidates = 5 - weight = 5 + weight = 3 cost = 35 - requirements = list(101,101,101,80,60,40,30,20,10,10) - var/list/operative_cap = list(2,2,3,3,4,5,5,5,5,5) + requirements = list(101,101,101,80,50,40,30,15,10,10) + var/list/operative_cap = list(2,2,3,3,3,4,5,5,5,5) var/datum/team/nuclear/nuke_team flags = HIGH_IMPACT_RULESET @@ -379,7 +379,7 @@ required_candidates = 1 weight = 2 cost = 10 - requirements = list(101,101,101,80,60,50,30,20,10,10) + requirements = list(101,101,101,101,70,40,25,20,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/blob/generate_ruleset_body(mob/applicant) @@ -398,7 +398,7 @@ required_candidates = 1 weight = 2 cost = 10 - requirements = list(101,101,101,80,60,50,30,20,10,10) + requirements = list(101,101,101,101,70,40,25,20,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/blob_infection/trim_candidates() @@ -436,7 +436,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,101,60,50,30,20,10,10) repeatable = TRUE var/list/vents = list() @@ -480,9 +480,9 @@ enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 - weight = 3 + weight = 4 cost = 10 - requirements = list(101,101,101,70,50,40,20,15,10,10) + requirements = list(101,101,101,40,30,20,10,10,10,10) repeatable = TRUE var/list/spawn_locs = list() @@ -526,9 +526,9 @@ enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 - weight = 4 + weight = 3 cost = 10 - requirements = list(101,101,101,80,60,50,30,20,10,10) + requirements = list(101,101,101,101,60,50,30,20,10,10) repeatable = TRUE var/list/spawn_locs = list() @@ -571,9 +571,9 @@ required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 2 required_applicants = 2 - weight = 4 + weight = 3 cost = 10 - requirements = list(101,101,101,80,60,50,30,20,10,10) + requirements = list(101,101,101,101,101,40,25,20,10,10) repeatable = TRUE var/datum/team/abductor_team/new_team @@ -611,7 +611,7 @@ required_candidates = 0 weight = 3 cost = 10 - requirements = list(101,101,101,80,60,50,30,20,10,10) + requirements = list(101,101,101,101,60,50,30,20,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/swarmers/execute() @@ -622,7 +622,7 @@ if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) spawn_locs += spawn_turf if(!spawn_locs.len) - message_admins("No valid sspawn locations found in GLOB.xeno_spawn, aborting swarmer spawning...") + message_admins("No valid spawn locations found in GLOB.xeno_spawn, aborting swarmer spawning...") return MAP_ERROR new /obj/effect/mob_spawn/swarmer(get_turf(GLOB.the_gateway)) log_game("A Swarmer was spawned via Dynamic Mode.") @@ -730,7 +730,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,70,50,40,20,15,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/sentient_disease/generate_ruleset_body(mob/applicant) @@ -751,7 +751,7 @@ required_candidates = 0 weight = 4 cost = 10 - requirements = list(101,101,101,80,60,50,30,20,10,10) + requirements = list(101,101,101,50,40,25,10,10,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/pirates/acceptable(population=0, threat=0) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index eae312bfa3..c90fa4f1c8 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -55,7 +55,7 @@ weight = 4 cost = 15 scaling_cost = 15 - requirements = list(40,30,30,20,20,15,15,15,10,10) + requirements = list(101,101,101,101,101,101,101,101,101,101)//disabled for now antag_cap = 2 // Can pick 3 per team, but rare enough it doesn't matter. var/list/datum/team/brother_team/pre_brother_teams = list() var/const/min_team_size = 2 @@ -138,7 +138,7 @@ weight = 3 cost = 15 scaling_cost = 9 - requirements = list(101,101,101,40,35,20,20,15,10,10) + requirements = list(101,101,101,55,40,25,20,15,10,10)//higher because of 'round end' antag_cap = list("denominator" = 24) @@ -177,9 +177,9 @@ minimum_required_age = 14 restricted_roles = list("Head of Security", "Captain") // Just to be sure that a wizard getting picked won't ever imply a Captain or HoS not getting drafted required_candidates = 1 - weight = 2 + weight = 3 cost = 20 - requirements = list(101,101,100,80,60,40,30,20,10,10) + requirements = list(101,101,100,80,50,40,30,20,10,10)//100 because of configt, otherwise equal to nukies var/list/roundstart_wizards = list() /datum/dynamic_ruleset/roundstart/wizard/acceptable(population=0, threat=0) @@ -220,10 +220,10 @@ minimum_required_age = 14 restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel") required_candidates = 2 - weight = 3 + weight = 2 //lower weight because of easy steamroll potential cost = 20 //requirements = list(100,90,80,60,40,30,10,10,10,10) - requirements = list(101,101,101,101,40,30,10,10,10,10) + requirements = list(101,101,101,101,60,40,20,10,10,10) flags = HIGH_IMPACT_RULESET antag_cap = list("denominator" = 20, "offset" = 1) var/datum/team/cult/main_cult @@ -279,7 +279,7 @@ required_candidates = 5 weight = 3 cost = 20 - requirements = list(101,101,101,80,60,40,30,20,10,10) + requirements = list(101,101,101,80,50,40,30,15,10,10) flags = HIGH_IMPACT_RULESET antag_cap = list("denominator" = 18, "offset" = 1) var/datum/team/nuclear/nuke_team @@ -362,11 +362,10 @@ minimum_required_age = 14 restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director") required_candidates = 3 - weight = 3 + weight = 2 delay = 7 MINUTES cost = 20 - //requirements = list(101,101,70,40,30,20,10,10,10,10) - requirements = list(101,101,101,101,30,20,10,10,10,10) + requirements = list(101,101,101,101,60,40,20,10,10,10) antag_cap = 3 flags = HIGH_IMPACT_RULESET blocking_rules = list(/datum/dynamic_ruleset/latejoin/provocateur) @@ -444,10 +443,9 @@ minimum_required_age = 14 restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel") required_candidates = 2 - weight = 3 + weight = 3 //higher weight than blood cult and revs because it's more balanced cost = 20 - //requirements = list(100,90,80,60,40,30,10,10,10,10) - requirements = list(101,101,101,101,40,30,10,10,10,10) + requirements = list(101,101,101,101,60,40,20,10,10,10) //slightly higher than nukies flags = HIGH_IMPACT_RULESET antag_cap = list("denominator" = 20, "offset" = 1) var/datum/team/clockcult/main_clockcult diff --git a/config/dynamic.json b/config/dynamic.json index 6c475c776d..bed7b4b387 100644 --- a/config/dynamic.json +++ b/config/dynamic.json @@ -4,11 +4,11 @@ "Traitors": { "cost": 8, "scaling_cost": 9, - "weight": 0, + "weight": 5, "required_candidates": 1, "minimum_required_age": 0, "requirements": [ - 10, + 101, 10, 10, 10, @@ -40,81 +40,81 @@ }, "Changelings": { - "weight": 0 + "weight": 3 }, "Heretics": { - "weight": 0 + "weight": 3 }, "Wizard": { - "weight": 0 + "weight": 3 }, "Blood Cult": { - "weight": 0 + "weight": 2 }, "Nuclear Emergency": { - "weight": 0 + "weight": 3 }, "Revolution": { - "weight": 0 + "weight": 2 }, "Clock Cult": { - "weight": 0 + "weight": 3 } }, "Midround": { "Syndicate Sleeper Agent": { - "weight": 0 + "weight": 7 }, "Malfunctioning AI": { - "weight": 0 + "weight": 3 }, "Wizard": { - "weight": 0 + "weight": 2 }, "Nuclear Assault": { - "weight": 0 + "weight": 3 }, "Blob": { - "weight": 0 + "weight": 2 }, "Blob Infection": { - "weight": 0 + "weight": 2 }, "Alien Infestation": { - "weight": 0 + "weight": 3 }, "Nightmare": { - "weight": 0 + "weight": 4 }, "Space Dragon": { - "weight": 0 + "weight": 3 }, "Abductors": { - "weight": 0 + "weight": 3 }, "Swarmers": { - "weight": 0 + "weight": 3 }, "Space Ninja": { - "weight": 0 + "weight": 4 }, "Spiders": { @@ -124,15 +124,15 @@ "Latejoin": { "Syndicate Infiltrator": { - "weight": 0 + "weight": 7 }, "Provocateur": { - "weight": 0 + "weight": 2 }, "Heretic Smuggler": { - "weight": 0 + "weight": 4 } } }