From d4151671f44987d74fc7333119e386dab764b0ca Mon Sep 17 00:00:00 2001 From: russ-money Date: Wed, 28 Aug 2024 00:25:15 -0500 Subject: [PATCH] changing player amount requirements rebels & bandits only needs 5 players vamps & werewolves needs 1 vamp 2 wolves --- code/game/gamemodes/roguetown/roguetown.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/roguetown/roguetown.dm b/code/game/gamemodes/roguetown/roguetown.dm index 7e0da61d..431cd9df 100644 --- a/code/game/gamemodes/roguetown/roguetown.dm +++ b/code/game/gamemodes/roguetown/roguetown.dm @@ -24,7 +24,7 @@ var/global/list/roguegamemodes = list("Rebellion", "Vampires and Werewolves", "E var/datum/team/roguecultists // DEBUG var/list/forcedmodes = list() - var/mob/living/carbon/human/vlord = null + var/mob/living/carbon/human/vlord = null // GAMEMODE SPECIFIC var/banditcontrib = 0 var/banditgoal = 1 @@ -189,29 +189,29 @@ var/global/list/roguegamemodes = list("Rebellion", "Vampires and Werewolves", "E "Priest", "Knight") var/num_bandits = 0 - if(num_players() >= 10) + if(num_players() >= 5) num_bandits = CLAMP(round(num_players() / 2), 15, 20) banditgoal += (num_bandits * rand(200,400)) if(num_bandits) //antag_candidates = get_players_for_role(ROLE_BANDIT, pre_do=TRUE) //pre_do checks for their preferences since they don't have a job yet /* - Lets go over some things here to whomever sees this from my observations (which may be incorrect). + Lets go over some things here to whomever sees this from my observations (which may be incorrect). The other modes (that aren't this) choose antags in pre_setup() which makes the restricted_jobs list work as its checked in DivideOccupations() DivideOccupations() occurs and checks it right after the current mode pre_setup() call on SSticker Then we call this brand new after_DO() proc AFTER the jobs have been assigned to the mind/checks occur on SSticker via DivideOccupations() In after_DO() we go through all the mode/antag selection instructions linking into these pick_antag() procs All the characters are made and equipped in the instruction sets between now and post_setup() - Then the post_setup() proc which is called on SSticker doles out the antag datums from anything stuck into the pre_antag lists here + Then the post_setup() proc which is called on SSticker doles out the antag datums from anything stuck into the pre_antag lists here Both pre_setup() and post_setup() get called within the Setup() proc in SSticker at earlier and later timings. - Also the pre_do param only checks to see if a job preference is set to HIGH, + Also the pre_do param only checks to see if a job preference is set to HIGH, so if it was working a medium priority king would still get shunted into a bandit. Along with that every person who has a restricted job set to HIGH would also just get rejected from it. Also to note, we check the restricted jobs list on the mind in get_players_for_role() too - Except all these pick procs also set the list after the assignment/use of it too. + Except all these pick procs also set the list after the assignment/use of it too. And the get_players_for_role in pre_setup to put them into the allantags list to be sorted in the pick procs also has no restricted_jobs list on mind at that point also */ @@ -285,7 +285,7 @@ var/global/list/roguegamemodes = list("Rebellion", "Vampires and Werewolves", "E /datum/game_mode/chaosmode/proc/pick_rebels() restricted_jobs = list() //handled after picking var/num_rebels = 0 - if(num_players() >= 10) + if(num_players() >= 5) num_rebels = CLAMP(round(num_players() / 3), 1, 3) if(num_rebels) antag_candidates = get_players_for_role(ROLE_PREBEL) @@ -341,7 +341,7 @@ var/global/list/roguegamemodes = list("Rebellion", "Vampires and Werewolves", "E restricted_jobs = list() /datum/game_mode/chaosmode/proc/pick_vampires() - var/vampsremaining = 3 + var/vampsremaining = 1 restricted_jobs = list( "King", "Queen Consort", @@ -402,7 +402,7 @@ var/global/list/roguegamemodes = list("Rebellion", "Vampires and Werewolves", "E "Cleric", "Guard Captain", "Court Magician", - "Templar", + "Templar", "Bog Guard", "Bog Master", "Knight", @@ -411,7 +411,7 @@ var/global/list/roguegamemodes = list("Rebellion", "Vampires and Werewolves", "E "Desert Rider Mercenary", "Grenzelhoft Mercenary" ) - + var/num_werewolves = rand(1,2) antag_candidates = get_players_for_role(ROLE_WEREWOLF) antag_candidates = shuffle(antag_candidates)