From 93890de42d4545e27efbd72d8770da98304b7daa Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 3 Nov 2019 15:28:52 +0200 Subject: [PATCH] Reverts Antag Chances (#7324) --- code/game/antagonist/antagonist.dm | 5 +---- code/game/antagonist/antagonist_helpers.dm | 6 ------ code/game/antagonist/station/changeling.dm | 1 - code/game/antagonist/station/cultist.dm | 1 - code/game/antagonist/station/loyalist.dm | 1 - code/game/antagonist/station/revolutionary.dm | 1 - code/game/antagonist/station/traitor.dm | 1 - code/game/antagonist/station/vampire.dm | 1 - code/game/gamemodes/game_mode.dm | 4 ---- html/changelogs/geeves - revertSecChances.yml | 6 ++++++ 10 files changed, 7 insertions(+), 20 deletions(-) create mode 100644 html/changelogs/geeves - revertSecChances.yml diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index 38da6769880..d3a0f0151a6 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -4,7 +4,6 @@ var/list/restricted_jobs = list() // Jobs that cannot be this antagonist (depending on config) var/list/protected_jobs = list() // As above. var/list/restricted_species = list() // species that cannot be this antag - Ryan784 - var/list/chance_restricted_jobs = list() // chance based restrictions // Strings. var/welcome_text = "Cry havoc and let slip the dogs of war!" @@ -94,7 +93,7 @@ return 1 // Get the raw list of potential players. -/datum/antagonist/proc/build_candidate_list(var/ghosts_only, var/allow_animals = 0, var/chance_per_job = TRUE) +/datum/antagonist/proc/build_candidate_list(var/ghosts_only, var/allow_animals = 0) candidates = list() // Clear. // Prune restricted status. Broke it up for readability. @@ -112,8 +111,6 @@ log_debug("[key_name(player)] is not eligible to become a [role_text]: They are blacklisted for this role!") else if(player_is_antag(player)) log_debug("[key_name(player)] is not eligible to become a [role_text]: They are already an antagonist!") - else if(!can_become_antag_chance(player) && chance_per_job) - log_debug("[key_name(player)] is not eligible to become a [role_text]: They are unlucky (based on job)!") else candidates += player diff --git a/code/game/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm index b13c341926f..13fdc257277 100644 --- a/code/game/antagonist/antagonist_helpers.dm +++ b/code/game/antagonist/antagonist_helpers.dm @@ -12,12 +12,6 @@ return 0 return 1 -/datum/antagonist/proc/can_become_antag_chance(var/datum/mind/player) - if(!isnull(chance_restricted_jobs[player.assigned_role])) - return prob(chance_restricted_jobs[player.assigned_role]) - else - return 1 - /datum/antagonist/proc/antags_are_dead() for(var/datum/mind/antag in current_antagonists) if(mob_path && !istype(antag.current,mob_path)) diff --git a/code/game/antagonist/station/changeling.dm b/code/game/antagonist/station/changeling.dm index a7b3416835c..d11f74a3c6d 100644 --- a/code/game/antagonist/station/changeling.dm +++ b/code/game/antagonist/station/changeling.dm @@ -7,7 +7,6 @@ restricted_jobs = list("AI", "Cyborg", "Head of Security", "Captain", "Internal Affairs Agent") protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Forensic Technician") - chance_restricted_jobs = list("Security Officer" = 50, "Security Cadet" = 75, "Warden" = 40, "Detective" = 50, "Forensic Technician" = 50, "Head of Personnel" = 25, "Chief Engineer" = 25, "Research Director" = 25, "Chief Medical Officer" = 25) //Second value is chance to be considered for antag. Unlisted roles here are 100 by default. restricted_species = list( "Baseline Frame", "Shell Frame", diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm index 5838e43d5b6..fb1257fad52 100644 --- a/code/game/antagonist/station/cultist.dm +++ b/code/game/antagonist/station/cultist.dm @@ -19,7 +19,6 @@ var/datum/antagonist/cultist/cult bantype = "cultist" restricted_jobs = list("Chaplain","AI", "Cyborg", "Internal Affairs Agent", "Head of Security", "Captain") protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Forensic Technician") - chance_restricted_jobs = list("Security Officer" = 50, "Security Cadet" = 75, "Warden" = 40, "Detective" = 50, "Forensic Technician" = 50, "Head of Personnel" = 25, "Chief Engineer" = 25, "Research Director" = 25, "Chief Medical Officer" = 25) //Second value is chance to be considered for antag. Unlisted roles here are 100 by default. feedback_tag = "cult_objective" antag_indicator = "cult" welcome_text = "You have a talisman in your possession; one that will help you start the cult on this station. Use it well and remember - there are others." diff --git a/code/game/antagonist/station/loyalist.dm b/code/game/antagonist/station/loyalist.dm index 35b9ca9cfe4..adf62d50e72 100644 --- a/code/game/antagonist/station/loyalist.dm +++ b/code/game/antagonist/station/loyalist.dm @@ -28,7 +28,6 @@ var/datum/antagonist/loyalists/loyalists faction_indicator = "loyal" faction_invisible = 1 restricted_jobs = list("AI", "Cyborg") - chance_restricted_jobs = list("Security Officer" = 50, "Security Cadet" = 75, "Warden" = 40, "Detective" = 50, "Forensic Technician" = 50) //Second value is chance to be considered for antag. Unlisted roles here are 100 by default. /datum/antagonist/loyalists/New() ..() diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm index cc0b0ec9c8e..416a756aebc 100644 --- a/code/game/antagonist/station/revolutionary.dm +++ b/code/game/antagonist/station/revolutionary.dm @@ -30,7 +30,6 @@ var/datum/antagonist/revolutionary/revs restricted_jobs = list("AI", "Cyborg") protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Forensic Technician", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Captain", "Head of Security", "Internal Affairs Agent") - chance_restricted_jobs = list("Security Officer" = 50, "Security Cadet" = 75, "Warden" = 40, "Detective" = 50, "Forensic Technician" = 50, "Head of Personnel" = 25, "Chief Engineer" = 25, "Research Director" = 25, "Chief Medical Officer" = 25) //Second value is chance to be considered for antag. Unlisted roles here are 100 by default. /datum/antagonist/revolutionary/New() ..() diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index 3471faa82db..8f357370ebf 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -5,7 +5,6 @@ var/datum/antagonist/traitor/traitors id = MODE_TRAITOR restricted_jobs = list("Internal Affairs Agent", "Head of Security", "Captain", "AI") protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Forensic Technician") - chance_restricted_jobs = list("Security Officer" = 50, "Security Cadet" = 75, "Warden" = 40, "Detective" = 50, "Forensic Technician" = 50, "Head of Personnel" = 25, "Chief Engineer" = 25, "Research Director" = 25, "Chief Medical Officer" = 25) //Second value is chance to be considered for antag. Unlisted roles here are 100 by default. flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE faction = "syndicate" diff --git a/code/game/antagonist/station/vampire.dm b/code/game/antagonist/station/vampire.dm index f9c5575b300..142d80cb6c5 100644 --- a/code/game/antagonist/station/vampire.dm +++ b/code/game/antagonist/station/vampire.dm @@ -9,7 +9,6 @@ var/datum/antagonist/vampire/vamp = null restricted_jobs = list("AI", "Cyborg", "Chaplain", "Head of Security", "Captain", "Internal Affairs Agent") protected_jobs = list("Security Officer", "Security Cadet", "Warden", "Detective", "Forensic Technician") - chance_restricted_jobs = list("Security Officer" = 50, "Security Cadet" = 75, "Warden" = 40, "Detective" = 50, "Forensic Technician" = 50, "Head of Personnel" = 25, "Chief Engineer" = 25, "Research Director" = 25, "Chief Medical Officer" = 25) //Second value is chance to be considered for antag. Unlisted roles here are 100 by default. restricted_species = list( "Baseline Frame", "Shell Frame", diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 990ee261152..462b9539d15 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -218,10 +218,6 @@ var/global/list/additional_antag_types = list() antag.update_initial_spawn_target() antag.build_candidate_list() //compile a list of all eligible candidates - //can't find enough antags? check again but don't apply the antag chance restrictions per job - if(antag.candidates.len < required_enemies) - antag.build_candidate_list(FALSE, FALSE, FALSE) - //antag roles that replace jobs need to be assigned before the job controller hands out jobs. if(antag.flags & ANTAG_OVERRIDE_JOB) antag.attempt_spawn() //select antags to be spawned diff --git a/html/changelogs/geeves - revertSecChances.yml b/html/changelogs/geeves - revertSecChances.yml new file mode 100644 index 00000000000..f46c689b198 --- /dev/null +++ b/html/changelogs/geeves - revertSecChances.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Reverts the sec antag chances changes, gamemodes should be normal again now."