Tropico pet added to thief objective pool (#24119)

* git it's the same stop gaslighting yourself

* tropico added to thief objective pool

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index b743c37420d4bd074b2061482569eca5f7a142f3..b5144f3b00ae9bb33b39be2608e5a30846d7523e 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -807,3 +807,5 @@
       proper: true
       gender: male
 #  - type: AlwaysRevolutionaryConvertible
+  - type: StealTarget
+    stealGroup: AnimalTropico

diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 5ca0be76c895b20813bcf018cc4426be27559c20..f2d900afe61f80614bee989dcd1473d8be9e5bb3 100644 (file)
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -92,7 +92,7 @@
     BibleStealObjective: 1
     ClothingNeckGoldmedalStealObjective: 1              #other
     ClothingNeckClownmedalStealObjective: 0.5
-    
+
 - type: weightedRandom
   id: ThiefObjectiveGroupStructure
   weights:
@@ -120,7 +120,8 @@
     ShivaStealObjective: 1
     SmileStealObjective: 1
     PunPunStealObjective: 1
-    
+    TropicoStealObjective: 1
+
 - type: weightedRandom
   id: ThiefObjectiveGroupEscape
   weights:

diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 2ec94a7c24efecb10d4e04fa1dea407f277477e8..9b659da55e3f32646c3a11bb68537cef0d7efd15 100644 (file)
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -3,77 +3,77 @@
 - type: stealTargetGroup
   id: Hypospray
   name: hypospray
-  sprite: 
+  sprite:
     sprite: Objects/Specific/Medical/hypospray.rsi
     state: hypo
 
 - type: stealTargetGroup
   id: ClothingOuterHardsuitRd
   name: experimental research hardsuit
-  sprite: 
+  sprite:
     sprite: Clothing/OuterClothing/Hardsuits/rd.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: HandTeleporter
   name: hand teleporter
-  sprite: 
+  sprite:
     sprite: Objects/Devices/hand_teleporter.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: BookSecretDocuments
   name: "emergency security orders"
-  sprite: 
+  sprite:
     sprite: Objects/Misc/bureaucracy.rsi
     state: folder-sec-doc
-    
+
 - type: stealTargetGroup
   id: ClothingShoesBootsMagAdv
   name: advanced magboots
-  sprite: 
+  sprite:
     sprite: Clothing/Shoes/Boots/magboots-advanced.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: BoxFolderQmClipboard
   name: requisition digi-board
-  sprite: 
+  sprite:
     sprite: Objects/Misc/qm_clipboard.rsi
     state: qm_clipboard
-    
+
 - type: stealTargetGroup
   id: FoodMeatCorgi
   name: prime-cut corgi meat
-  sprite: 
+  sprite:
     sprite: Objects/Consumable/Food/meat.rsi
     state: corgi
     #
 - type: stealTargetGroup
   id: CaptainIDCard
   name: captain ID card
-  sprite: 
+  sprite:
     sprite: Objects/Misc/id_cards.rsi
     state: ert_commander #no one will know the difference.
 
 - type: stealTargetGroup
   id: JetpackCaptainFilled
   name: captain's jetpack
-  sprite: 
+  sprite:
     sprite: Objects/Tanks/Jetpacks/captain.rsi
     state: icon
 
 - type: stealTargetGroup
   id: WeaponAntiqueLaser
   name: antique laser pistol
-  sprite: 
+  sprite:
     sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi
     state: base
 
 - type: stealTargetGroup
   id: NukeDisk
   name: nuclear authentication disk
-  sprite: 
+  sprite:
     sprite: Objects/Misc/nukedisk.rsi
     state: icon
 
@@ -82,21 +82,21 @@
 - type: stealTargetGroup
   id: Figurines
   name: figurines (any)
-  sprite: 
+  sprite:
     sprite: Objects/Fun/figurines.rsi
     state: figurine_spawner
 
 - type: stealTargetGroup
   id: HeadCloak
   name: head's cloaks (any)
-  sprite: 
+  sprite:
     sprite: Clothing/Neck/Cloaks/cap.rsi
     state: icon
 
 - type: stealTargetGroup
   id: HeadBedsheet
   name: head's bedsheets (any)
-  sprite: 
+  sprite:
     sprite: Objects/Misc/bedsheets.rsi
     state: sheetNT
 
@@ -106,21 +106,21 @@
   sprite:
     sprite: Objects/Misc/stamps.rsi
     state: stamp-cap
-    
+
 - type: stealTargetGroup
   id: DoorRemote
   name: door remotes (any)
   sprite:
     sprite: Objects/Devices/door_remote.rsi
     state: door_remotebase
-    
+
 - type: stealTargetGroup
   id: EncryptionKey
   name: encryption keys (any)
   sprite:
     sprite: Objects/Devices/encryption_keys.rsi
     state: crypt_gray
-    
+
 - type: stealTargetGroup
   id: TechnologyDisk
   name: technology disks
@@ -164,105 +164,105 @@
   sprite:
     sprite: Objects/Tools/lighters.rsi
     state: zippo_engraved_icon_base
-    
+
 - type: stealTargetGroup
   id: AmmoTechFabCircuitboard
   name: ammo techfab circuit board
   sprite:
     sprite: Objects/Misc/module.rsi
     state: security
-    
+
 - type: stealTargetGroup
   id: ClothingHeadHatWarden
   name: warden's cap
   sprite:
     sprite: Clothing/Head/Hats/warden.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: ClothingOuterHardsuitVoidParamed
   name: paramedic void suit
   sprite:
     sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: MedicalTechFabCircuitboard
   name: medical techfab machine board
   sprite:
     sprite: Objects/Misc/module.rsi
     state: medical
-    
+
 - type: stealTargetGroup
   id: ClothingHeadsetAltMedical
   name: chief medical officer's over-ear headset
   sprite:
     sprite: Clothing/Ears/Headsets/medical.rsi
     state: icon_alt
-    
+
 - type: stealTargetGroup
   id: ResearchAndDevelopmentServerMachineCircuitboard
   name: R&D server machine board
   sprite:
     sprite: Objects/Misc/module.rsi
     state: science
-    
+
 - type: stealTargetGroup
   id: FireAxe
   name: fireaxe
   sprite:
     sprite: Objects/Weapons/Melee/fireaxe.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: AmePart
   name: AME part
   sprite:
     sprite: Objects/Power/AME/ame_part.rsi
     state: box
-    
+
 - type: stealTargetGroup
   id: SalvageExpeditionsComputerCircuitboard
   name: salvage expeditions computer board
   sprite:
     sprite: Objects/Misc/module.rsi
     state: cpu_supply
-    
+
 - type: stealTargetGroup
   id: CargoShuttleConsoleCircuitboard
   name: cargo shuttle console board
   sprite:
     sprite: Objects/Misc/module.rsi
     state: cpuboard
-    
+
 - type: stealTargetGroup
   id: SalvageShuttleConsoleCircuitboard
   name: salvage shuttle console board
   sprite:
     sprite: Objects/Misc/module.rsi
     state: cpuboard
-    
+
 - type: stealTargetGroup
   id: ClothingEyesHudBeer
   name: beer goggles
   sprite:
     sprite: Clothing/Eyes/Hud/beergoggles.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: Bible
   name: bible
   sprite:
     sprite: Objects/Specific/Chapel/bible.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: ClothingNeckGoldmedal
   name: gold medal of crewmanship
   sprite:
     sprite: Clothing/Neck/Medals/gold.rsi
     state: icon
-    
+
 - type: stealTargetGroup
   id: ClothingNeckClownmedal
   name: clown medal
@@ -350,35 +350,35 @@
   sprite:
     sprite: Mobs/Pets/corgi.rsi
     state: ian
-    
+
 - type: stealTargetGroup
   id: AnimalBingus
   name: Bingus
   sprite:
     sprite: Mobs/Pets/bingus.rsi
     state: bingus
-    
+
 - type: stealTargetGroup
   id: AnimalMcGriff
   name: McGriff
   sprite:
     sprite: Mobs/Pets/mcgriff.rsi
     state: mcgriff
-    
+
 - type: stealTargetGroup
   id: AnimalWalter
   name: Walter
   sprite:
     sprite: Mobs/Pets/walter.rsi
     state: walter
-    
+
 - type: stealTargetGroup
   id: AnimalMorty
   name: Morty
   sprite:
     sprite: Mobs/Animals/possum.rsi
     state: possum
-    
+
 - type: stealTargetGroup
   id: AnimalRenault
   name: Renault
@@ -413,3 +413,10 @@
   sprite:
     sprite: Mobs/Animals/monkey.rsi
     state: monkey
+
+- type: stealTargetGroup
+  id: AnimalTropico
+  name: Tropico
+  sprite:
+    sprite: Mobs/Animals/crab.rsi
+    state: crab

diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 957be6adb22154d8e302b1c5352040a9b40bdd89..4fc44119e3d4b6ac0b960ce839ac0cd4abf2225c 100644 (file)
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -27,7 +27,7 @@
   - type: StealCondition
     verifyMapExistance: true
     descriptionText: objective-condition-thief-description
-    
+
 - type: entity
   abstract: true
   parent: [BaseThiefObjective, BaseStealObjective]
@@ -38,7 +38,7 @@
     descriptionText: objective-condition-thief-description
   - type: Objective
     difficulty: 2 # it's hard to hide
-    
+
 - type: entity
   abstract: true
   parent: [BaseThiefObjective, BaseStealObjective]
@@ -65,7 +65,7 @@
     maxCollectionSize: 50 #will be limited to the number of figures on the station anyway.
   - type: Objective
     difficulty: 0.25
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealCollectionObjective
@@ -187,7 +187,7 @@
   - type: Objective
     difficulty: 1
 
-- type: entity                                      
+- type: entity
   noSpawn: true
   parent: BaseThiefStealObjective
   id: FlippoEngravedLighterStealObjective
@@ -402,7 +402,7 @@
     stealGroup: ChemDispenser
   - type: Objective
     difficulty: 1
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealStructureObjective
@@ -414,7 +414,7 @@
     stealGroup: XenoArtifact
   - type: Objective
     difficulty: 0.5
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealStructureObjective
@@ -426,7 +426,7 @@
     stealGroup: FreezerHeater
   - type: Objective
     difficulty: 0.5
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealStructureObjective
@@ -438,7 +438,7 @@
     stealGroup: Teg
   - type: Objective
     difficulty: 1
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealStructureObjective
@@ -450,7 +450,7 @@
     stealGroup: BoozeDispenser
   - type: Objective
     difficulty: 0.5
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealStructureObjective
@@ -462,7 +462,7 @@
     stealGroup: AltarNanotrasen
   - type: Objective
     difficulty: 0.5
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealStructureObjective
@@ -544,7 +544,7 @@
     stealGroup: AnimalRenault
   - type: Objective
     difficulty: 2
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealAnimalObjective
@@ -556,7 +556,7 @@
     stealGroup: AnimalHamlet
   - type: Objective
     difficulty: 1
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealAnimalObjective
@@ -568,7 +568,7 @@
     stealGroup: AnimalShiva
   - type: Objective
     difficulty: 2
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealAnimalObjective
@@ -580,7 +580,7 @@
     stealGroup: AnimalSmile
   - type: Objective
     difficulty: 1
-    
+
 - type: entity
   noSpawn: true
   parent: BaseThiefStealAnimalObjective
@@ -593,6 +593,18 @@
   - type: Objective
     difficulty: 2
 
+- type: entity
+  noSpawn: true
+  parent: BaseThiefStealAnimalObjective
+  id: TropicoStealObjective
+  components:
+  - type: NotJobRequirement
+    job: AtmosphericTechnician
+  - type: StealCondition
+    stealGroup: AnimalTropico
+  - type: Objective
+    difficulty: 1
+
 # Escape
 
 - type: entity