From eceb46d02bf6914630edb0e73452e9bf9c959868 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 7 Jun 2020 02:10:28 -0700 Subject: [PATCH 1/6] Update datum_traitor.dm --- code/modules/antagonists/traitor/datum_traitor.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 4422f2f174..0309b7e826 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -47,6 +47,8 @@ for(var/C in GLOB.traitor_classes) if(!(C in blacklist)) var/datum/traitor_class/class = GLOB.traitor_classes[C] + if(class.min_players > length(GLOB.joined_player_list)) + continue var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0) weights[C] = weight * 1000 var/choice = pickweight(weights, 0) From 35abf4ffc9e03654714ebdae790a43b9628e6176 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 7 Jun 2020 02:11:43 -0700 Subject: [PATCH 2/6] Update traitor_class.dm --- code/modules/antagonists/traitor/classes/traitor_class.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/classes/traitor_class.dm b/code/modules/antagonists/traitor/classes/traitor_class.dm index 260e978bec..568619f59d 100644 --- a/code/modules/antagonists/traitor/classes/traitor_class.dm +++ b/code/modules/antagonists/traitor/classes/traitor_class.dm @@ -7,6 +7,8 @@ GLOBAL_LIST_EMPTY(traitor_classes) var/chaos = 0 var/threat = 0 var/TC = 20 + /// Minimum players for this to randomly roll via get_random_traitor_class(). + var/min_players = 0 var/list/uplink_filters /datum/traitor_class/New() @@ -41,4 +43,4 @@ GLOBAL_LIST_EMPTY(traitor_classes) /datum/traitor_class/proc/clean_up_traitor(datum/antagonist/traitor/T) // Any effects that need to be cleaned up if traitor class is being swapped. - \ No newline at end of file + From 7b69daffd736ece97444a33cdb5fc4d373fb9e07 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 7 Jun 2020 02:12:12 -0700 Subject: [PATCH 3/6] Update hijack.dm --- code/modules/antagonists/traitor/classes/hijack.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/antagonists/traitor/classes/hijack.dm b/code/modules/antagonists/traitor/classes/hijack.dm index dbfa78eb96..6701b1e793 100644 --- a/code/modules/antagonists/traitor/classes/hijack.dm +++ b/code/modules/antagonists/traitor/classes/hijack.dm @@ -4,6 +4,7 @@ weight = 3 chaos = 5 threat = 3 + min_players = 35 uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit) /datum/traitor_class/human/hijack/forge_objectives(datum/antagonist/traitor/T) From 210c873fe6362b8a82145af51a990a94d7840633 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 7 Jun 2020 02:12:28 -0700 Subject: [PATCH 4/6] Update martyr.dm --- code/modules/antagonists/traitor/classes/martyr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/antagonists/traitor/classes/martyr.dm b/code/modules/antagonists/traitor/classes/martyr.dm index 72f9ac86fc..9422daa9d8 100644 --- a/code/modules/antagonists/traitor/classes/martyr.dm +++ b/code/modules/antagonists/traitor/classes/martyr.dm @@ -4,6 +4,7 @@ weight = 2 chaos = 5 threat = 5 + min_players = 25 uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit,/datum/uplink_item/bundles_TC/contract_kit) /datum/traitor_class/human/martyr/forge_objectives(datum/antagonist/traitor/T) From 3960050c71d7414ad47775d798105ad3c81024b9 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 8 Jun 2020 21:16:26 -0700 Subject: [PATCH 5/6] Update code/modules/antagonists/traitor/classes/hijack.dm Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/antagonists/traitor/classes/hijack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/classes/hijack.dm b/code/modules/antagonists/traitor/classes/hijack.dm index 6701b1e793..bbfb0cb11d 100644 --- a/code/modules/antagonists/traitor/classes/hijack.dm +++ b/code/modules/antagonists/traitor/classes/hijack.dm @@ -4,7 +4,7 @@ weight = 3 chaos = 5 threat = 3 - min_players = 35 + min_players = 25 uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit) /datum/traitor_class/human/hijack/forge_objectives(datum/antagonist/traitor/T) From 139720e2ce7471fdc892692b0c3e6ed432f25c05 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 8 Jun 2020 21:16:32 -0700 Subject: [PATCH 6/6] Update code/modules/antagonists/traitor/classes/martyr.dm Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/antagonists/traitor/classes/martyr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/traitor/classes/martyr.dm b/code/modules/antagonists/traitor/classes/martyr.dm index 9422daa9d8..5c407b70fd 100644 --- a/code/modules/antagonists/traitor/classes/martyr.dm +++ b/code/modules/antagonists/traitor/classes/martyr.dm @@ -4,7 +4,7 @@ weight = 2 chaos = 5 threat = 5 - min_players = 25 + min_players = 20 uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit,/datum/uplink_item/bundles_TC/contract_kit) /datum/traitor_class/human/martyr/forge_objectives(datum/antagonist/traitor/T)