From 436e781ec94930e55cb9838dcdb18e424fb33eda Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 6 Mar 2020 15:37:59 -0800 Subject: [PATCH] Removed assassin-only, made subterfuge more likely to assassinate --- .../antagonists/traitor/classes/assassin.dm | 2 +- .../antagonists/traitor/classes/subterfuge.dm | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/code/modules/antagonists/traitor/classes/assassin.dm b/code/modules/antagonists/traitor/classes/assassin.dm index ca192aff5a..0c1d950f57 100644 --- a/code/modules/antagonists/traitor/classes/assassin.dm +++ b/code/modules/antagonists/traitor/classes/assassin.dm @@ -1,7 +1,7 @@ /datum/traitor_class/human/assassin name = "Donk Co Operative" employer = "Donk Corporation" - weight = 4 + weight = 0 chaos = 1 cost = 2 diff --git a/code/modules/antagonists/traitor/classes/subterfuge.dm b/code/modules/antagonists/traitor/classes/subterfuge.dm index 2b4716e67e..8e97a6a2ba 100644 --- a/code/modules/antagonists/traitor/classes/subterfuge.dm +++ b/code/modules/antagonists/traitor/classes/subterfuge.dm @@ -6,22 +6,24 @@ /datum/traitor_class/human/subterfuge/forge_single_objective(datum/antagonist/traitor/T) .=1 - var/assassin_prob = 20 + var/assassin_prob = 30 var/is_dynamic = FALSE var/datum/game_mode/dynamic/mode if(istype(SSticker.mode,/datum/game_mode/dynamic)) mode = SSticker.mode is_dynamic = TRUE - assassin_prob = max(0,mode.threat_level-50) + assassin_prob = max(0,mode.threat_level-40) if(prob(assassin_prob)) - if(is_dynamic) - var/threat_spent = CONFIG_GET(number/dynamic_assassinate_cost) - mode.spend_threat(threat_spent) - mode.log_threat("[T.owner.name] spent [threat_spent] on an assassination target.") - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = T.owner - maroon_objective.find_target() - T.add_objective(maroon_objective) + if(prob(assassin_prob)) + var/datum/objective/assassinate/once/kill_objective = new + kill_objective.owner = T.owner + kill_objective.find_target() + T.add_objective(kill_objective) + else + var/datum/objective/maroon/maroon_objective = new + maroon_objective.owner = T.owner + maroon_objective.find_target() + T.add_objective(maroon_objective) else if(prob(15) && !(locate(/datum/objective/download) in T.objectives) && !(T.owner.assigned_role in list("Research Director", "Scientist", "Roboticist"))) var/datum/objective/download/download_objective = new