From 1880c50fb9d728bde44e3c4eac17fb17275ef7cf Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Tue, 14 Jun 2022 20:40:23 -0400
Subject: [PATCH] Makes the game track steal objectives individually. (#17963)
* Makes the game track steal objectives individually.
* removes uptick of number
---
code/game/gamemodes/changeling/changeling.dm | 12 ++++++++++--
code/game/gamemodes/traitor/traitor.dm | 12 ++++++++++--
code/game/gamemodes/vampire/vampire_gamemode.dm | 12 ++++++++++--
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 3a9b3865275..1c85abc046e 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -208,10 +208,18 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E
for(var/datum/objective/objective in all_objectives)
if(objective.check_completion())
text += "
Objective #[count]: [objective.explanation_text] Success!"
- SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "SUCCESS"))
+ if(istype(objective, /datum/objective/steal))
+ var/datum/objective/steal/S = objective
+ SSblackbox.record_feedback("nested tally", "changeling_steal_objective", 1, list("Steal [S.steal_target]", "SUCCESS"))
+ else
+ SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "SUCCESS"))
else
text += "
Objective #[count]: [objective.explanation_text] Fail."
- SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "FAIL"))
+ if(istype(objective, /datum/objective/steal))
+ var/datum/objective/steal/S = objective
+ SSblackbox.record_feedback("nested tally", "changeling_steal_objective", 1, list("Steal [S.steal_target]", "FAIL"))
+ else
+ SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "FAIL"))
changelingwin = 0
count++
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index fa77a65a0a8..4901d344945 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -96,10 +96,18 @@
for(var/datum/objective/objective in all_objectives)
if(objective.check_completion())
text += "
Objective #[count]: [objective.explanation_text] Success!"
- SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "SUCCESS"))
+ if(istype(objective, /datum/objective/steal))
+ var/datum/objective/steal/S = objective
+ SSblackbox.record_feedback("nested tally", "traitor_steal_objective", 1, list("Steal [S.steal_target]", "SUCCESS"))
+ else
+ SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "SUCCESS"))
else
text += "
Objective #[count]: [objective.explanation_text] Fail."
- SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "FAIL"))
+ if(istype(objective, /datum/objective/steal))
+ var/datum/objective/steal/S = objective
+ SSblackbox.record_feedback("nested tally", "traitor_steal_objective", 1, list("Steal [S.steal_target]", "FAIL"))
+ else
+ SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "FAIL"))
traitorwin = FALSE
count++
diff --git a/code/game/gamemodes/vampire/vampire_gamemode.dm b/code/game/gamemodes/vampire/vampire_gamemode.dm
index 0cc14812d47..bfd7e7ac769 100644
--- a/code/game/gamemodes/vampire/vampire_gamemode.dm
+++ b/code/game/gamemodes/vampire/vampire_gamemode.dm
@@ -74,10 +74,18 @@
for(var/datum/objective/objective in all_objectives)
if(objective.check_completion())
text += "
Objective #[count]: [objective.explanation_text] Success!"
- SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "SUCCESS"))
+ if(istype(objective, /datum/objective/steal))
+ var/datum/objective/steal/S = objective
+ SSblackbox.record_feedback("nested tally", "traitor_steal_objective", 1, list("Steal [S.steal_target]", "SUCCESS"))
+ else
+ SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "SUCCESS"))
else
text += "
Objective #[count]: [objective.explanation_text] Fail."
- SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "FAIL"))
+ if(istype(objective, /datum/objective/steal))
+ var/datum/objective/steal/S = objective
+ SSblackbox.record_feedback("nested tally", "traitor_steal_objective", 1, list("Steal [S.steal_target]", "FAIL"))
+ else
+ SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "FAIL"))
traitorwin = FALSE
count++