Merge pull request #12471 from Citadel-Station-13/poplock
poplocks hijack/glorious death
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
weight = 3
|
weight = 3
|
||||||
chaos = 5
|
chaos = 5
|
||||||
threat = 3
|
threat = 3
|
||||||
|
min_players = 25
|
||||||
uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit)
|
uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit)
|
||||||
|
|
||||||
/datum/traitor_class/human/hijack/forge_objectives(datum/antagonist/traitor/T)
|
/datum/traitor_class/human/hijack/forge_objectives(datum/antagonist/traitor/T)
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
weight = 2
|
weight = 2
|
||||||
chaos = 5
|
chaos = 5
|
||||||
threat = 5
|
threat = 5
|
||||||
|
min_players = 20
|
||||||
uplink_filters = list(/datum/uplink_item/stealthy_weapons/romerol_kit,/datum/uplink_item/bundles_TC/contract_kit)
|
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)
|
/datum/traitor_class/human/martyr/forge_objectives(datum/antagonist/traitor/T)
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ GLOBAL_LIST_EMPTY(traitor_classes)
|
|||||||
var/chaos = 0
|
var/chaos = 0
|
||||||
var/threat = 0
|
var/threat = 0
|
||||||
var/TC = 20
|
var/TC = 20
|
||||||
|
/// Minimum players for this to randomly roll via get_random_traitor_class().
|
||||||
|
var/min_players = 0
|
||||||
var/list/uplink_filters
|
var/list/uplink_filters
|
||||||
|
|
||||||
/datum/traitor_class/New()
|
/datum/traitor_class/New()
|
||||||
@@ -41,4 +43,4 @@ GLOBAL_LIST_EMPTY(traitor_classes)
|
|||||||
|
|
||||||
/datum/traitor_class/proc/clean_up_traitor(datum/antagonist/traitor/T)
|
/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.
|
// Any effects that need to be cleaned up if traitor class is being swapped.
|
||||||
|
|
||||||
|
|||||||
@@ -47,6 +47,8 @@
|
|||||||
for(var/C in GLOB.traitor_classes)
|
for(var/C in GLOB.traitor_classes)
|
||||||
if(!(C in blacklist))
|
if(!(C in blacklist))
|
||||||
var/datum/traitor_class/class = GLOB.traitor_classes[C]
|
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)
|
var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0)
|
||||||
weights[C] = weight * 1000
|
weights[C] = weight * 1000
|
||||||
var/choice = pickweight(weights, 0)
|
var/choice = pickweight(weights, 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user