From 0280b81eb41958b364e92641fb46df5212283d39 Mon Sep 17 00:00:00 2001
From: Rane <60792108+Elijahrane@users.noreply.github.com>
Date: Sat, 15 Jan 2022 00:02:16 -0500
Subject: [PATCH] Rebalanced traitor objective difficulty (#6173)

---
 .../Conditions/KillPersonCondition.cs         |  2 +-
 .../Objectives/Conditions/StealCondition.cs   |  2 +-
 .../Objectives/traitorObjectives..yml         | 32 ++++++-------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/Content.Server/Objectives/Conditions/KillPersonCondition.cs b/Content.Server/Objectives/Conditions/KillPersonCondition.cs
index 6d4c61856f..5fe620a2d5 100644
--- a/Content.Server/Objectives/Conditions/KillPersonCondition.cs
+++ b/Content.Server/Objectives/Conditions/KillPersonCondition.cs
@@ -35,7 +35,7 @@ namespace Content.Server.Objectives.Conditions
 
         public float Progress => (Target?.CharacterDeadIC ?? true) ? 1f : 0f;
 
-        public float Difficulty => 2.25f;
+        public float Difficulty => 2f;
 
         public bool Equals(IObjectiveCondition? other)
         {
diff --git a/Content.Server/Objectives/Conditions/StealCondition.cs b/Content.Server/Objectives/Conditions/StealCondition.cs
index b85ebf4443..9c710fdb21 100644
--- a/Content.Server/Objectives/Conditions/StealCondition.cs
+++ b/Content.Server/Objectives/Conditions/StealCondition.cs
@@ -65,7 +65,7 @@ namespace Content.Server.Objectives.Conditions
             }
         }
 
-        public float Difficulty => 2f;
+        public float Difficulty => 2.25f;
 
         public bool Equals(IObjectiveCondition? other)
         {
diff --git a/Resources/Prototypes/Objectives/traitorObjectives..yml b/Resources/Prototypes/Objectives/traitorObjectives..yml
index 7f60a7b028..ce788a3e07 100644
--- a/Resources/Prototypes/Objectives/traitorObjectives..yml
+++ b/Resources/Prototypes/Objectives/traitorObjectives..yml
@@ -1,6 +1,7 @@
 - type: objective
   id: CaptainIDStealObjective
   issuer: syndicate
+  difficultyOverride: 2.75
   requirements:
     - !type:TraitorRequirement {}
     - !type:IncompatibleConditionsRequirement
@@ -21,7 +22,7 @@
   conditions:
     - !type:KillRandomPersonCondition {}
   canBeDuplicate: true
-  
+
 - type: objective
   id: RandomTraitorAliveObjective
   issuer: syndicate
@@ -61,7 +62,7 @@
 - type: objective
   id: CMOHyposprayStealObjective
   issuer: syndicate
-  difficultyOverride: 2.25
+  difficultyOverride: 2.75
   requirements:
     - !type:TraitorRequirement {}
     - !type:IncompatibleConditionsRequirement
@@ -70,11 +71,11 @@
   conditions:
     - !type:StealCondition
       prototype: Hypospray
-      
+
 - type: objective
   id: RDHardsuitStealObjective
   issuer: syndicate
-  difficultyOverride: 2.5
+  difficultyOverride: 2.75
   requirements:
     - !type:TraitorRequirement {}
     - !type:IncompatibleConditionsRequirement
@@ -83,7 +84,7 @@
   conditions:
     - !type:StealCondition
       prototype: ClothingOuterHardsuitRd
-      
+
 - type: objective
   id: NukeDiskStealObjective
   issuer: syndicate
@@ -95,7 +96,7 @@
   conditions:
     - !type:StealCondition
       prototype: NukeDisk
-      
+
 - type: objective
   id: IDComputerBoardStealObjective
   issuer: syndicate
@@ -107,11 +108,11 @@
   conditions:
     - !type:StealCondition
       prototype: IDComputerCircuitboard
-      
+
 - type: objective
   id: MagbootsStealObjective #Replace this with CE magboots when we get those
   issuer: syndicate
-  difficultyOverride: 1.5
+  difficultyOverride: 1.75
   requirements:
     - !type:TraitorRequirement {}
     - !type:IncompatibleConditionsRequirement
@@ -120,20 +121,7 @@
   conditions:
     - !type:StealCondition
       prototype: ClothingShoesBootsMag
-      
-- type: objective
-  id: HOSHardsuitHelmStealObjective
-  issuer: syndicate
-  difficultyOverride: 2.5
-  requirements:
-    - !type:TraitorRequirement {}
-    - !type:IncompatibleConditionsRequirement
-      conditions:
-        - DieCondition
-  conditions:
-    - !type:StealCondition
-      prototype: ClothingHeadHelmetHardsuitSecurityRed
-      
+
 - type: objective
   id: SupplyConsoleBoardStealObjective
   issuer: syndicate