From 0629944cc59d37c0bea62d61bb5195020a08a0b6 Mon Sep 17 00:00:00 2001 From: Archie Date: Tue, 22 Jun 2021 16:17:35 -0300 Subject: [PATCH 1/7] wardens actually exist btw --- .../dynamic/dynamic_rulesets_midround.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index b223d835..afc7ad0a 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -408,7 +408,7 @@ name = "Malfunctioning AI" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_MALF - enemy_roles = list("Security Officer", "Warden","Detective","Head of Security", "Captain", "Scientist", "Research Director", "Chief Engineer", "Engineer", "Shaft Miner") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Scientist", "Research Director", "Chief Engineer", "Engineer", "Shaft Miner") exclusive_roles = list("AI") required_enemies = list(4,4,4,4,4,4,2,2,2,0) required_candidates = 1 @@ -461,7 +461,7 @@ name = "Wizard" antag_datum = /datum/antagonist/wizard antag_flag = ROLE_WIZARD - enemy_roles = list("Security Officer","Detective","Head of Security", "Captain") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,1,1,0) required_candidates = 1 weight = 1 @@ -495,7 +495,7 @@ name = "Nuclear Assault" antag_flag = ROLE_OPERATIVE antag_datum = /datum/antagonist/nukeop - enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden","Detective","Head of Security", "Captain") + enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective","Head of Security", "Captain") required_enemies = list(3,3,3,3,3,2,2,2,2,1) required_candidates = 5 weight = 5 @@ -539,7 +539,7 @@ name = "Blob" antag_datum = /datum/antagonist/blob antag_flag = ROLE_BLOB - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain", "Station Engineer") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Station Engineer") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 3 @@ -629,7 +629,7 @@ datum/dynamic_ruleset/midround/bloodcult/trim_candidates() name = "Alien Infestation" antag_datum = /datum/antagonist/xeno antag_flag = ROLE_ALIEN - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 3 @@ -680,7 +680,7 @@ datum/dynamic_ruleset/midround/bloodcult/trim_candidates() controller = /datum/round_event_control/nightmare antag_flag = "Nightmare" antag_flag_override = ROLE_ALIEN - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 4 @@ -728,7 +728,7 @@ datum/dynamic_ruleset/midround/bloodcult/trim_candidates() //config_tag = "abductors" antag_flag = ROLE_ABDUCTOR // Has two antagonist flags, in fact - enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden","Detective","Head of Security", "Captain") + enemy_roles = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_enemies = list(3,3,2,2,2,2,2,2,2,0) required_candidates = 2 weight = 3 @@ -770,7 +770,7 @@ datum/dynamic_ruleset/midround/bloodcult/trim_candidates() name = "Space Ninja" //config_tag = "ninja" antag_flag = ROLE_NINJA - enemy_roles = list("Security Officer","Head of Security","Captain") + enemy_roles = list("Security Officer", "Warden", "Head of Security", "Captain") required_enemies = list(3,3,2,2,2,2,1,1,1,0) required_candidates = 1 weight = 4 From a089d2437da4702947328abf8262556b786ce9a2 Mon Sep 17 00:00:00 2001 From: Archie Date: Tue, 22 Jun 2021 16:24:11 -0300 Subject: [PATCH 2/7] This too. --- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index afc7ad0a..8d063c7e 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -210,7 +210,7 @@ restricted_roles = list("AI", "Cyborg", "Positronic Brain") protected_roles = list("Rookie", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_candidates = 1 - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") + enemy_roles = list("Rookie", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_enemies = list(2,2,1,1,1,1,1,0,0,0) weight = 4 cost = 10 @@ -847,7 +847,7 @@ datum/dynamic_ruleset/midround/bloodcult/trim_candidates() restricted_roles = list("AI", "Cyborg") protected_roles = list("Rookie", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_candidates = 1 - enemy_roles = list("Security Officer","Head of Security","Captain","AI","Cyborg","Chaplain","Curator") + enemy_roles = list("Security Officer", "Head of Security", "Captain", "AI", "Cyborg", "Chaplain", "Curator", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_enemies = list(3,2,2,2,2,2,2,2,2,2) weight = 3 cost = 10 From 39490fbe056bcf534ee616c0ef4387c60e20037a Mon Sep 17 00:00:00 2001 From: Archie Date: Wed, 23 Jun 2021 01:42:08 -0300 Subject: [PATCH 3/7] vote stuff --- code/controllers/subsystem/vote.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 4d7d3361..1e411ef8 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -1,6 +1,7 @@ #define DYNAMIC_DEFAULT_CHAOS 1.0 //The default chaos value for low pop low vote rounds -#define DYNAMIC_VOTE_NORMALIZATION 7 //If there are fewer than this many votes, the average will be skewed towards the default +#define DYNAMIC_VOTE_NORMALIZATION 8 //If there are fewer than this many votes, the average will be skewed towards the default #define DYNAMIC_NONVOTER_FACTOR 0.5 // 1 means they count for a full vote +#define DYNAMIC_NONVOTER_VALUE 1.5 // The chaos value that non-voters should account for. SUBSYSTEM_DEF(vote) name = "Vote" @@ -154,10 +155,10 @@ SUBSYSTEM_DEF(vote) while (v < DYNAMIC_VOTE_NORMALIZATION) //For low low pop, low vote rounds. numbers += DYNAMIC_DEFAULT_CHAOS //stops the one person voting from setting the chaos to five and flooding the station with anomalies v += 1 - else if (voted.len < GLOB.clients.len) //Have non-voters "vote" 2, if we're not lowpop + else if (voted.len < GLOB.clients.len) //Have non-voters "vote" if we're not lowpop for(var/I in 1 to (GLOB.clients.len - voted.len)) v += DYNAMIC_NONVOTER_FACTOR //Instead of a fixed value, this will now factor how much non-voter votes are 'worth' in the system. - numbers += 2 + numbers += DYNAMIC_NONVOTER_VALUE v = round(v) //This rounds the value to the nearest multiple, to make sure no calculations go fucky wucky. var/total = 0 for (var/i in numbers) From a944052897903a021955445850ed664f545a0d6e Mon Sep 17 00:00:00 2001 From: Archie Date: Wed, 23 Jun 2021 01:44:44 -0300 Subject: [PATCH 4/7] Adjustments! --- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 8d063c7e..2cffd340 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -210,7 +210,7 @@ restricted_roles = list("AI", "Cyborg", "Positronic Brain") protected_roles = list("Rookie", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_candidates = 1 - enemy_roles = list("Rookie", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") required_enemies = list(2,2,1,1,1,1,1,0,0,0) weight = 4 cost = 10 From 066f66406ebadb4bc7c2dccf3f90058126c59acc Mon Sep 17 00:00:00 2001 From: Archie Date: Wed, 23 Jun 2021 01:51:37 -0300 Subject: [PATCH 5/7] Bloodsuckies --- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 2cffd340..b83bb4fb 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -847,7 +847,7 @@ datum/dynamic_ruleset/midround/bloodcult/trim_candidates() restricted_roles = list("AI", "Cyborg") protected_roles = list("Rookie", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_candidates = 1 - enemy_roles = list("Security Officer", "Head of Security", "Captain", "AI", "Cyborg", "Chaplain", "Curator", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Curator") required_enemies = list(3,2,2,2,2,2,2,2,2,2) weight = 3 cost = 10 From 0b49d6a9f6c126e3a4e48accf247384e7c6ab841 Mon Sep 17 00:00:00 2001 From: Archie Date: Wed, 23 Jun 2021 01:56:20 -0300 Subject: [PATCH 6/7] Chappie only --- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index b83bb4fb..dc05198d 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -847,7 +847,7 @@ datum/dynamic_ruleset/midround/bloodcult/trim_candidates() restricted_roles = list("AI", "Cyborg") protected_roles = list("Rookie", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_candidates = 1 - enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Curator") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain") required_enemies = list(3,2,2,2,2,2,2,2,2,2) weight = 3 cost = 10 From 7a9692609c9cf7fa9f985c42e99d93395566c1cd Mon Sep 17 00:00:00 2001 From: ArchieBeepBoop <53913550+ArchieBeepBoop@users.noreply.github.com> Date: Wed, 23 Jun 2021 02:17:33 -0300 Subject: [PATCH 7/7] dahl changes ye --- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index dc05198d..f1032541 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -408,7 +408,7 @@ name = "Malfunctioning AI" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_MALF - enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Scientist", "Research Director", "Chief Engineer", "Engineer", "Shaft Miner") + enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") exclusive_roles = list("AI") required_enemies = list(4,4,4,4,4,4,2,2,2,0) required_candidates = 1