письма и аномалии

Resources/Prototypes/Objectives/objectiveGroups.yml

@@ -6,7 +6,7 @@
     TraitorObjectiveGroupKill: 1
     TraitorObjectiveGroupState: 1 #As in, something about your character. Alive, dead, arrested, gained an ability...
     TraitorObjectiveGroupSocial: 1 #Involves helping/harming others without killing them or stealing their stuff
-    TraitorObjectiveGroupSabotage: 1
+    # TraitorObjectiveGroupSabotage: 1 # WL-Changes
     TraitorObjectiveGroupOther: 1
     TraitorObjectiveGroupNukieDisk: 0.05  #Corvax
 
@@ -47,17 +47,17 @@
 #    RandomTraitorAliveObjective: 1 - Removed because the objective was boring and didn't progress the round.
     RandomTraitorProgressObjective: 1
 
-- type: weightedRandom
-  id: TraitorObjectiveGroupSabotage
-  weights:
-    SupercritAnomaliesObjective: 1
+#- type: weightedRandom
+#  id: TraitorObjectiveGroupSabotage
+#  weights:
+#    SupercritAnomaliesObjective: 1
 
 #misc objectives that don't fall other another category
 - type: weightedRandom
   id: TraitorObjectiveGroupOther
   weights:
     HijackTradeStationObjective: 1
-    MailFraudObjective: 1
+#    MailFraudObjective: 1
 
 
 #Thief groups

Resources/Prototypes/Objectives/thief.yml

@@ -181,6 +181,24 @@
 
 # steal item
 
+- type: entity
+  parent: [BaseThiefObjective, BaseCounterObjective]
+  id: MailFraudObjective
+  description: We're interested in Nanotrasen's correspondence. Letter opener not provided.
+  components:
+  - type: Objective
+    difficulty: 0.5
+    icon:
+      sprite: Objects/Specific/Cargo/mail_bag.rsi
+      state: icon
+  - type: MailFraudCondition
+  - type: NumberObjective
+    min: 8
+    max: 12
+    title: objective-condition-mail-fraud-title
+  - type: ObjectiveLimit
+    limit: 1
+
 - type: entity                                      #Security subgroup
   parent: BaseThiefStealObjective
   id: ForensicScannerStealObjective

Resources/Prototypes/Objectives/traitor.yml

@@ -380,26 +380,6 @@
     # owner: objective-condition-steal-station
 # Corvax-MRP-End
 
-# sabotage
-- type: entity
-  parent: BaseTraitorObjective
-  id: SupercritAnomaliesObjective
-  description: Nanotrasen is very interested in anomalies with potentially catastrophic consequences. Introduce them to the fire they're playing with.
-  components:
-  - type: Objective
-    difficulty: 2
-    icon:
-      sprite: Structures/Specific/anomaly.rsi
-      state: anom1
-  - type: SupercriticalAnomaliesCondition
-  - type: NumberObjective
-    min: 3
-    max: 4
-    title: objective-condition-supercrit-anomalies-title
-  - type: ObjectiveLimit
-    limit: 1
-
-# other
 - type: entity
   parent: BaseTraitorObjective
   id: HijackTradeStationObjective
@@ -416,20 +396,20 @@
     # There is only one trade station so there should never be more than one of these objectives.
     limit: 1
 
-- type: entity
-  parent: [BaseTraitorObjective, BaseCounterObjective]
-  id: MailFraudObjective
-  description: We're interested in Nanotrasen's correspondence. Letter opener not provided.
-  components:
-  - type: Objective
-    difficulty: 0.5
-    icon:
-      sprite: Objects/Specific/Cargo/mail_bag.rsi
-      state: icon
-  - type: MailFraudCondition
-  - type: NumberObjective
-    min: 8
-    max: 12
-    title: objective-condition-mail-fraud-title
-  - type: ObjectiveLimit
-    limit: 1
+#- type: entity
+#  parent: [BaseThiefObjective, BaseCounterObjective] # WL-Changes: BaseTraitorObjective -> BaseThiefObjective
+#  id: MailFraudObjective
+#  description: We're interested in Nanotrasen's correspondence. Letter opener not provided.
+#  components:
+#  - type: Objective
+#    difficulty: 0.5
+#    icon:
+#      sprite: Objects/Specific/Cargo/mail_bag.rsi
+#      state: icon
+#  - type: MailFraudCondition
+#  - type: NumberObjective
+#    min: 8
+#    max: 12
+#    title: objective-condition-mail-fraud-title
+#  - type: ObjectiveLimit
+#    limit: 1