From 50986b279e0c6b76d7e3c5d6800263a7d43d7a6e Mon Sep 17 00:00:00 2001 From: keronshb Date: Mon, 25 Oct 2021 21:14:25 -0400 Subject: [PATCH 1/5] Requirement rework --- .../dynamic/dynamic_rulesets_latejoin.dm | 4 +-- .../dynamic/dynamic_rulesets_midround.dm | 26 +++++++++---------- .../dynamic/dynamic_rulesets_roundstart.dm | 14 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 76f09793fb..8f22f5a5a0 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -63,7 +63,7 @@ required_candidates = 1 weight = 7 cost = 5 - requirements = list(40,30,20,10,10,10,10,10,10,10) + requirements = list(101,40,25,20,15,10,10,10,10,10) repeatable = TRUE ////////////////////////////////////////////// @@ -159,5 +159,5 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,101,50,40,10,10,10,10,10) + requirements = list(101,101,60,50,40,20,20,15,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 a89ca65e3a..6b600a23bf 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -308,7 +308,7 @@ required_candidates = 1 weight = 2 cost = 20 - requirements = list(101,101,100,80,50,30,20,10,10,10) + requirements = list(101,101,80,60,40,20,20,20,10,10) repeatable = TRUE var/datum/mind/wizard @@ -355,7 +355,7 @@ required_candidates = 5 weight = 3 cost = 35 - requirements = list(101,101,101,80,50,40,30,15,10,10) + requirements = list(101,101,101,60,40,30,20,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 @@ -397,7 +397,7 @@ required_candidates = 1 weight = 2 cost = 10 - requirements = list(101,101,101,101,70,40,25,20,10,10) + requirements = list(101,101,101,101,50,40,30,20,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/blob/generate_ruleset_body(mob/applicant) @@ -416,7 +416,7 @@ required_candidates = 1 weight = 2 cost = 10 - requirements = list(101,101,101,101,70,40,25,20,10,10) + requirements = list(101,101,101,101,50,40,30,20,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/blob_infection/trim_candidates() @@ -454,7 +454,7 @@ required_candidates = 1 weight = 3 cost = 10 - requirements = list(101,101,101,101,60,50,30,20,10,10) + requirements = list(101,101,101,101,50,40,30,20,10,10) repeatable = TRUE var/list/vents = list() @@ -500,7 +500,7 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,101,40,30,20,10,10,10,10) + requirements = list(101,101,50,30,25,20,10,10,10,10) repeatable = TRUE var/list/spawn_locs = list() @@ -546,7 +546,7 @@ required_candidates = 1 weight = 3 cost = 10 - requirements = list(101,101,101,101,60,50,30,20,10,10) + requirements = list(101,101,101,101,50,40,30,20,10,10) repeatable = TRUE var/list/spawn_locs = list() @@ -591,7 +591,7 @@ required_applicants = 2 weight = 3 cost = 10 - requirements = list(101,101,101,101,101,40,25,20,10,10) + requirements = list(101,101,101,101,101,30,20,15,10,10) repeatable = TRUE var/datum/team/abductor_team/new_team @@ -629,7 +629,7 @@ required_candidates = 0 weight = 3 cost = 10 - requirements = list(101,101,101,101,60,50,30,20,10,10) + requirements = list(101,101,101,101,50,40,30,20,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/swarmers/execute() @@ -662,7 +662,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,50,40,30,10,10,10,10) repeatable = TRUE var/list/spawn_locs = list() @@ -703,7 +703,7 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,101,70,50,40,20,15,10,10) + requirements = list(101,101,50,30,35,20,10,10,10,10) repeatable = TRUE var/dead_mobs_required = 20 var/need_extra_spawns_value = 15 @@ -748,7 +748,7 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,101,70,50,40,20,15,10,10) + requirements = list(101,101,50,30,35,20,10,10,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/sentient_disease/generate_ruleset_body(mob/applicant) @@ -769,7 +769,7 @@ required_candidates = 0 weight = 4 cost = 10 - requirements = list(101,101,101,50,40,25,10,10,10,10) + requirements = list(101,101,101,40,30,20,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 a37c387283..b73212d765 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -103,7 +103,7 @@ weight = 3 cost = 16 scaling_cost = 10 - requirements = list(101,70,60,50,40,20,20,10,10,10) + requirements = list(101,60,50,40,30,20,15,10,10,10) antag_cap = list("denominator" = 29) /datum/dynamic_ruleset/roundstart/changeling/pre_execute(population) @@ -138,7 +138,7 @@ weight = 3 cost = 15 scaling_cost = 9 - requirements = list(101,101,101,55,40,25,20,15,10,10)//higher because of 'round end' + requirements = list(101,101,60,50,40,20,20,15,10,10)//higher because of 'round end' antag_cap = list("denominator" = 24) @@ -179,7 +179,7 @@ required_candidates = 1 weight = 3 cost = 20 - requirements = list(101,101,100,80,50,40,30,20,10,10)//100 because of configt, otherwise equal to nukies + requirements = list(101,101,80,60,40,20,20,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) @@ -223,7 +223,7 @@ 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,60,40,20,10,10,10) + requirements = list(101,101,101,101,50,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,50,40,30,15,10,10) + requirements = list(101,101,101,60,40,30,20,15,10,10) flags = HIGH_IMPACT_RULESET antag_cap = list("denominator" = 18, "offset" = 1) var/datum/team/nuclear/nuke_team @@ -365,7 +365,7 @@ weight = 2 delay = 7 MINUTES cost = 20 - requirements = list(101,101,101,101,60,40,20,10,10,10) + requirements = list(101,101,101,101,50,40,20,10,10,10) antag_cap = 3 flags = HIGH_IMPACT_RULESET blocking_rules = list(/datum/dynamic_ruleset/latejoin/provocateur) @@ -445,7 +445,7 @@ required_candidates = 2 weight = 3 //higher weight than blood cult and revs because it's more balanced cost = 20 - requirements = list(101,101,101,101,60,40,20,10,10,10) //slightly higher than nukies + requirements = list(101,101,101,101,50,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 From ccb65156ac642ef5cd188627a584135cd76972a5 Mon Sep 17 00:00:00 2001 From: keronshb Date: Tue, 26 Oct 2021 12:53:50 -0400 Subject: [PATCH 2/5] Adjustments and fixes --- code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm | 2 +- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 6 +++--- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 8f22f5a5a0..fe651be77c 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -159,5 +159,5 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,60,50,40,20,20,15,10,10) + requirements = list(101,101,80,50,40,20,20,15,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 6b600a23bf..d01d56ff13 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -662,7 +662,7 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,101,50,40,30,10,10,10,10) + requirements = list(101,101,101,60,50,30,10,10,10,10) repeatable = TRUE var/list/spawn_locs = list() @@ -703,7 +703,7 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,50,30,35,20,10,10,10,10) + requirements = list(101,101,50,30,25,20,10,10,10,10) repeatable = TRUE var/dead_mobs_required = 20 var/need_extra_spawns_value = 15 @@ -748,7 +748,7 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,50,30,35,20,10,10,10,10) + requirements = list(101,101,50,30,25,20,10,10,10,10) repeatable = TRUE /datum/dynamic_ruleset/midround/from_ghosts/sentient_disease/generate_ruleset_body(mob/applicant) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index b73212d765..c405d50f03 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -138,7 +138,7 @@ weight = 3 cost = 15 scaling_cost = 9 - requirements = list(101,101,60,50,40,20,20,15,10,10)//higher because of 'round end' + requirements = list(101,101,80,50,40,20,20,15,10,10)//higher because of 'round end' antag_cap = list("denominator" = 24) From 02eb4685a93d2d4be77aa03e1df034fc376a02cb Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 28 Oct 2021 23:44:02 -0400 Subject: [PATCH 3/5] Some adjustments --- code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm | 2 +- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 2 +- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index fe651be77c..a719ec6198 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -159,5 +159,5 @@ required_candidates = 1 weight = 4 cost = 10 - requirements = list(101,101,80,50,40,20,20,15,10,10) + requirements = list(101,101,101,50,40,20,20,15,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 d01d56ff13..0f6b93d0ec 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -308,7 +308,7 @@ required_candidates = 1 weight = 2 cost = 20 - requirements = list(101,101,80,60,40,20,20,20,10,10) + requirements = list(101,101,90,60,40,20,20,20,10,10) repeatable = TRUE var/datum/mind/wizard diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index c405d50f03..4a26c2726a 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -138,7 +138,7 @@ weight = 3 cost = 15 scaling_cost = 9 - requirements = list(101,101,80,50,40,20,20,15,10,10)//higher because of 'round end' + requirements = list(101,101,101,50,40,20,20,15,10,10)//higher because of 'round end' antag_cap = list("denominator" = 24) @@ -179,7 +179,7 @@ required_candidates = 1 weight = 3 cost = 20 - requirements = list(101,101,80,60,40,20,20,20,10,10)//100 because of configt, otherwise equal to nukies + requirements = list(101,101,90,60,40,20,20,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) From 133225c0834008520baf77c8f0b6a7ba4aa86a15 Mon Sep 17 00:00:00 2001 From: keronshb Date: Thu, 28 Oct 2021 23:48:50 -0400 Subject: [PATCH 4/5] Removes required enemies --- .../dynamic/dynamic_rulesets_midround.dm | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 0f6b93d0ec..9a1d735b6f 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -254,7 +254,7 @@ antag_flag = ROLE_MALF enemy_roles = list("Security Officer", "Warden","Detective","Head of Security", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer") exclusive_roles = list("AI") - required_enemies = list(4,4,4,4,4,4,2,2,2,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 3 cost = 35 @@ -304,7 +304,7 @@ antag_flag = "wizard mid" antag_flag_override = ROLE_WIZARD enemy_roles = list("Security Officer","Detective","Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 2 cost = 20 @@ -351,7 +351,7 @@ antag_datum = /datum/antagonist/nukeop antag_flag_override = ROLE_OPERATIVE 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_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 5 weight = 3 cost = 35 @@ -393,7 +393,7 @@ antag_datum = /datum/antagonist/blob antag_flag = ROLE_BLOB enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 2 cost = 10 @@ -412,7 +412,7 @@ protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") restricted_roles = list("Cyborg", "AI", "Positronic Brain") enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 2 cost = 10 @@ -450,7 +450,7 @@ antag_datum = /datum/antagonist/xeno antag_flag = ROLE_ALIEN enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 3 cost = 10 @@ -496,7 +496,7 @@ antag_flag = "Nightmare" antag_flag_override = ROLE_ALIEN enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 4 cost = 10 @@ -542,7 +542,7 @@ antag_flag = ROLE_SPACE_DRAGON antag_flag_override = ROLE_SPACE_DRAGON enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 3 cost = 10 @@ -586,7 +586,7 @@ antag_flag = "Abductor" antag_flag_override = ROLE_ABDUCTOR enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 2 required_applicants = 2 weight = 3 @@ -625,7 +625,7 @@ antag_flag_override = ROLE_ALIEN required_type = /mob/dead/observer enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 0 weight = 3 cost = 10 @@ -658,7 +658,7 @@ antag_flag = "Space Ninja" antag_flag_override = ROLE_NINJA enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 4 cost = 10 @@ -699,7 +699,7 @@ antag_flag = "Revenant" antag_flag_override = ROLE_REVENANT enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 4 cost = 10 @@ -765,7 +765,7 @@ antag_flag = "Space Pirates" required_type = /mob/dead/observer enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") - required_enemies = list(2,2,1,1,1,1,1,0,0,0) + required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 0 weight = 4 cost = 10 From b58d3f14a3816da59871633f641097fbbb86346e Mon Sep 17 00:00:00 2001 From: keronshb Date: Sat, 30 Oct 2021 10:24:58 -0400 Subject: [PATCH 5/5] More adjustments --- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 2 +- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 2 +- code/modules/antagonists/traitor/classes/subterfuge.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 9a1d735b6f..b62befc88c 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -308,7 +308,7 @@ required_candidates = 1 weight = 2 cost = 20 - requirements = list(101,101,90,60,40,20,20,20,10,10) + requirements = list(101,101,100,60,40,20,20,20,10,10) repeatable = TRUE var/datum/mind/wizard diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 4a26c2726a..9e985e9c47 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -179,7 +179,7 @@ required_candidates = 1 weight = 3 cost = 20 - requirements = list(101,101,90,60,40,20,20,20,10,10)//100 because of configt, otherwise equal to nukies + requirements = list(101,101,100,60,40,20,20,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) diff --git a/code/modules/antagonists/traitor/classes/subterfuge.dm b/code/modules/antagonists/traitor/classes/subterfuge.dm index 54f07eb23c..6c4bd26afb 100644 --- a/code/modules/antagonists/traitor/classes/subterfuge.dm +++ b/code/modules/antagonists/traitor/classes/subterfuge.dm @@ -9,7 +9,7 @@ var/datum/game_mode/dynamic/mode if(istype(SSticker.mode,/datum/game_mode/dynamic)) mode = SSticker.mode - assassin_prob = max(0,mode.threat_level-40) + assassin_prob = max(0,mode.threat_level-20) if(prob(assassin_prob)) var/datum/objective/assassinate/once/kill_objective = new kill_objective.owner = T.owner