Pets (#278)

* Pets * Pets * No need with the use of the crate * Pets * Pets * Pets * Pets * Update emotionalsupportanimals.yml * Delete NPCCombatTargetComponent.cs * Update emotionalsupportpet_inventory_template.yml
new-frontiers-14 · Aug 30, 2023 · bb47465 · bb47465
1 parent dd0193d
commit bb47465
Show file tree

Hide file tree

Showing 16 changed files with 428 additions and 90 deletions.
diff --git a/Resources/Locale/en-US/_Nyano/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/_Nyano/interaction/interaction-popup-component.ftl
@@ -0,0 +1,4 @@
+## Petting animals
+
+#petting-failure-pibble = You reach out to pet {THE($target)}, and {SUBJECT($target)} lunges at you!
+petting-failure-pibble = You reach out to pet {THE($target)}, but think better of it.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -216,6 +216,7 @@
   - type: NpcFactionMember
     factions:
     - Passive
+    - Chicken
 
 - type: entity
   id: FoodEggChickenFertilized
@@ -868,6 +869,7 @@
   - type: NpcFactionMember
     factions:
     - Passive
+    - Monkey
   - type: GhostRole
     prob: 0.05
     makeSentient: true
@@ -2002,6 +2004,9 @@
   id: MobCat
   description: Feline pet, very funny.
   components:
+  - type: NpcFactionMember
+    factions:
+      - Cat
   - type: Sprite
     drawdepth: Mobs
     sprite: Mobs/Pets/cat.rsi
@@ -2076,10 +2081,15 @@
 - type: entity
   name: space cat
   id: MobCatSpace
-  parent: MobCat
+  parent: SimpleSpaceSuitMobBase
   description: Feline pet, prepared for the worst.
   components:
+  - type: NpcFactionMember
+    factions:
+      - Cat
   - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Pets/cat.rsi
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: spacecat
@@ -2096,21 +2106,41 @@
     interactFailureString: petting-failure-generic
     interactSuccessSound:
       path: /Audio/Animals/cat_meow.ogg
-  - type: Barotrauma
-    damage:
-      types:
-        Blunt: 0.0 #per second, scales with pressure and other constants.
-  - type: Temperature
-    heatDamageThreshold: 360
-    coldDamageThreshold: 0
-    currentTemperature: 310.15
-    coldDamage:
-      types:
-        Cold : 0.1 #per second, scales with temperature & other constants
-    specificHeat: 42
-    heatDamage:
-      types:
-        Heat : 0.1 #per second, scales with temperature & other constants
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 15
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Inventory
+    speciesId: cat
+    templateId: pet
+  - type: InventorySlots
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 3
+  - type: ReplacementAccent
+    accent: cat
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: MobPrice
+    price: 200
+  - type: Tag
+    tags:
+    - VimPilot
 
 - type: entity
   name: caracal cat

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -90,6 +90,7 @@
   - type: NpcFactionMember
     factions:
       - PetsNT
+      - Cat
   - type: HTN
     rootTask:
       task: SimpleHostileCompound
@@ -110,6 +111,7 @@
   - type: NpcFactionMember
     factions:
       - PetsNT
+      - Cat
   - type: Grammar
     attributes:
       gender: male
@@ -124,6 +126,9 @@
   parent: MobCatCaracal
   description: He out here.
   components:
+  - type: NpcFactionMember
+    factions:
+      - Cat
   - type: Fixtures
     fixtures:
       fix1:
@@ -163,6 +168,9 @@
   id: MobBingus
   description: Bingus my beloved...
   components:
+  - type: NpcFactionMember
+    factions:
+      - Cat
   - type: Sprite
     drawdepth: Mobs
     sprite: Mobs/Pets/bingus.rsi

diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -56,6 +56,10 @@
   - type: Speech
     speechSounds: Bass
   - type: Perishable
+  - type: NpcFactionMember
+    factions:
+    - NanoTrasen
+    - Dwarf
 
 - type: entity
   save: false

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml
@@ -1,4 +1,5 @@
 - type: entity
+  name: Emotional support pet crate
   id: CrateNPCEmotionalSupport
   parent: CrateLivestock
   components:
@@ -11,20 +12,56 @@
         prob: 1
         orGroup: MobCatGhost
       - id: MobCatCaracalGhost
-        prob: 0.15
+        prob: 1
+        orGroup: MobCatGhost
+      - id: MobBingusGhost
+        prob: 1
+        orGroup: MobCatGhost
+      - id: MobCatSpaceGhost
+        prob: 1
+        orGroup: MobCatGhost
+      - id: MobCorgiGhost
+        prob: 1
+        orGroup: MobCatGhost
+      - id: MobCorgiPuppyGhost
+        prob: 1
+        orGroup: MobCatGhost
+      - id: MobChickenGhost
+        prob: 1
+        orGroup: MobCatGhost
+      - id: MobPibbleGhost
+        prob: 0.25
+        orGroup: MobCatGhost
+
+- type: entity
+  name: Emotional support pet crate
+  id: CrateNPCEmotionalSupportSafe # No pitbull
+  parent: CrateLivestock
+  suffix: Safe
+  components:
+  - type: StorageFill
+    contents:
+      - id: MobCatGhost
+        prob: 1
+        orGroup: MobCatGhost
+      - id: MobCatCalicoGhost
+        prob: 1
+        orGroup: MobCatGhost
+      - id: MobCatCaracalGhost
+        prob: 1
         orGroup: MobCatGhost
       - id: MobBingusGhost
-        prob: 0.15
+        prob: 1
         orGroup: MobCatGhost
       - id: MobCatSpaceGhost
-        prob: 0.15
+        prob: 1
         orGroup: MobCatGhost
       - id: MobCorgiGhost
         prob: 1
         orGroup: MobCatGhost
       - id: MobCorgiPuppyGhost
-        prob: 0.15
+        prob: 1
         orGroup: MobCatGhost
       - id: MobChickenGhost
-        prob: 0.15
-        orGroup: MobCatGhost
+        prob: 1
+        orGroup: MobCatGhost