Pettable Animals (#6530)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-02-13 21:20:47 -06:00
parent ac23899a39
commit cd7843028b
20 changed files with 343 additions and 97 deletions
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -39,6 +39,10 @@
  - type: Butcherable
    meat: FoodMeat
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.2
+    interactSuccessString: petting-success-soft-floofy
+    interactFailureString: petting-failure-bat

 - type: entity
  name: bee
@@ -130,6 +134,12 @@
  - type: Butcherable
    meat: FoodMeatChicken
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.8
+    interactSuccessString: petting-success-bird
+    interactFailureString: petting-failure-generic
+    interactSuccessSound:
+      path: /Audio/Animals/chicken_cluck_happy.ogg

 - type: entity
  name: mallard duck #Quack
@@ -152,6 +162,12 @@
  - type: Butcherable
    meat: FoodMeatDuck
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.9
+    interactSuccessString: petting-success-bird
+    interactFailureString: petting-failure-generic
+    interactSuccessSound:
+      path: /Audio/Animals/duck_quack_happy.ogg

 - type: entity
  name: white duck #Quack
@@ -174,6 +190,12 @@
  - type: Butcherable
    meat: FoodMeatDuck
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.9
+    interactSuccessString: petting-success-bird
+    interactFailureString: petting-failure-generic
+    interactSuccessSound:
+      path: /Audio/Animals/duck_quack_happy.ogg

 - type: entity
  name: brown duck #Quack
@@ -196,6 +218,12 @@
  - type: Butcherable
    meat: FoodMeatDuck
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.9
+    interactSuccessString: petting-success-bird
+    interactFailureString: petting-failure-generic
+    interactSuccessSound:
+      path: /Audio/Animals/duck_quack_happy.ogg

 - type: entity
  name: butterfly
@@ -295,6 +323,13 @@
  - type: Butcherable
    meat: FoodMeat
    pieces: 5
+  - type: Grammar
+    attributes:
+      gender: female # Here because of UdderComponent
+  - type: InteractionPopup
+    successChance: 0.7
+    interactSuccessString: petting-success-soft-floofy
+    interactFailureString: petting-failure-generic

 - type: entity
  name: crab
@@ -332,12 +367,16 @@
  - type: Butcherable
    meat: FoodMeatCrab
    pieces: 2
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-crab
+    interactFailureString: petting-failure-crab

 - type: entity
  name: goat
  parent: SimpleMobBase
  id: MobGoat
-  description: His spine consists of long sharp segments, no wonder he is so grumpy.
+  description: Her spine consists of long sharp segments, no wonder she is so grumpy.
  components:
  - type: Sprite
    drawdepth: Mobs
@@ -366,6 +405,13 @@
  - type: Butcherable
    meat: FoodMeat
    pieces: 4
+  - type: Grammar
+    attributes:
+      gender: female # Here because of UdderComponent
+  - type: InteractionPopup
+    successChance: 0.2
+    interactSuccessString: petting-success-goat
+    interactFailureString: petting-failure-goat

 # Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
 - type: entity
@@ -389,6 +435,10 @@
  - type: Butcherable
    meat: FoodMeatChicken
    pieces: 2
+  - type: InteractionPopup # TODO: Make it so there's a separate chance to make certain animals outright hostile towards you.
+    successChance: 0.1 # Yeah, good luck with that.
+    interactSuccessString: petting-success-goose
+    interactFailureString: petting-failure-goose

 - type: entity
  name: gorilla
@@ -679,6 +729,10 @@
  - type: Butcherable
    meat: FoodMeat
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.3
+    interactSuccessString: petting-success-reptile
+    interactFailureString: petting-failure-generic

 - type: entity
  name: frog
@@ -718,6 +772,10 @@
  - type: Butcherable
    meat: FoodMeat
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.6
+    interactSuccessString: petting-success-frog
+    interactFailureString: petting-failure-generic

 # Would be cool to have some functionality for the parrot to be able to sit on stuff
 - type: entity
@@ -758,6 +816,10 @@
  - type: Butcherable
    meat: FoodMeat
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.6
+    interactSuccessString: petting-success-bird
+    interactFailureString: petting-failure-generic

 - type: entity
  name: penguin
@@ -794,6 +856,10 @@
  - type: Butcherable
    meat: FoodMeatPenguin
    pieces: 3
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-bird
+    interactFailureString: petting-failure-generic

 - type: entity
  name: snake
@@ -833,6 +899,10 @@
  - type: Butcherable
    meat: FoodMeat
    pieces: 1
+  - type: InteractionPopup
+    successChance: 0.6
+    interactSuccessString: petting-success-reptile
+    interactFailureString: petting-failure-generic

 # Code unique spider prototypes or combine them all into one spider and get a
 # random sprite state when you spawn it.
@@ -871,3 +941,7 @@
  - type: Butcherable
    meat: FoodMeatSpider
    pieces: 2
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-tarantula
+    interactFailureString: petting-failure-generic
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -38,6 +38,14 @@
    pieces: 3
  - type: ReplacementAccent
    accent: dog
+  - type: InteractionPopup
+    interactSuccessString: petting-success-dog
+    interactFailureString: petting-failure-generic
+    interactSuccessSound:
+      path: /Audio/Animals/small_dog_bark_happy.ogg
+  - type: Grammar
+    attributes:
+      gender: epicene

 - type: entity
  name: corrupted corgi
@@ -71,6 +79,13 @@
  - type: AiFactionTag
    factions:
    - SimpleHostile
+  - type: InteractionPopup
+    successChance: 0 # Override the automatic success that would normally be inherited from MobCorgi.
+    interactSuccessString: petting-success-corrupted-corgi # Normally impossible but added an easter egg just in case.
+    interactFailureString: petting-failure-corrupted-corgi
+  - type: Grammar
+    attributes:
+      gender: epicene

 - type: entity
  name: Ian
@@ -90,6 +105,10 @@
      normal: ian
      crit: ian_dead
      dead: ian_dead
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male

 - type: entity
  name: Old Ian
@@ -109,6 +128,10 @@
      normal: old_ian
      crit: old_ian_dead
      dead: old_ian_dead
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male

 - type: entity
  name: Lisa
@@ -128,6 +151,10 @@
      normal: lisa
      crit: lisa_dead
      dead: lisa_dead
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: female

 - type: entity
  name: corgi puppy
@@ -147,6 +174,9 @@
      normal: puppy
      crit: puppy_dead
      dead: puppy_dead
+  - type: Grammar
+    attributes:
+      gender: epicene

 - type: entity
  name: cat
@@ -185,6 +215,15 @@
    pieces: 2
  - type: ReplacementAccent
    accent: cat
+  - type: InteractionPopup
+    successChance: 0.7
+    interactSuccessString: petting-success-cat
+    interactFailureString: petting-failure-generic
+    interactSuccessSound:
+      path: /Audio/Animals/cat_meow.ogg
+  - type: Grammar
+    attributes:
+      gender: epicene

 - type: entity
  name: calico cat
@@ -204,6 +243,9 @@
      normal: cat2
      crit: cat2_dead
      dead: cat2_dead
+  - type: Grammar
+    attributes:
+      gender: epicene

 - type: entity
  name: space cat
@@ -223,6 +265,15 @@
      normal: spacecat
      crit: spacecat_dead
      dead: spacecat_dead
+  - type: InteractionPopup
+    successChance: 0.7
+    interactSuccessString: petting-success-space-cat
+    interactFailureString: petting-failure-generic
+    interactSuccessSound:
+      path: /Audio/Animals/cat_meow.ogg
+  - type: Grammar
+    attributes:
+      gender: epicene

 - type: entity
  name: caracal cat
@@ -242,6 +293,9 @@
      normal: caracal_flop
      crit: caracal_dead
      dead: caracal_dead
+  - type: Grammar
+    attributes:
+      gender: epicene

 - type: entity
  name: sloth
@@ -281,3 +335,10 @@
  - type: Butcherable
    meat: FoodMeat
    pieces: 3
+  - type: InteractionPopup
+    successChance: 0.9
+    interactSuccessString: petting-success-sloth
+    interactFailureString: petting-failure-sloth
+  - type: Grammar
+    attributes:
+      gender: epicene
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -12,6 +12,7 @@
    tags:
      - RCDDeconstructWhitelist
      - ForceFixRotations
+      - Window
  - type: Sprite
    netsync: false
    drawdepth: WallTops
@@ -64,7 +65,11 @@
  - type: IconSmooth
    key: windows
    base: window
-  - type: Window
+  - type: InteractionPopup
+    interactSuccessString: comp-window-knock
+    popupPerceivedByOthers: true
+    interactSuccessSound:
+      path: /Audio/Effects/glass_knock.ogg
  - type: Construction
    graph: Window
    node: window
@@ -89,6 +94,9 @@
  components:
    # Attention! If adding tags here:
    # Keep WindowTintedDirectional in mind
+  - type: Tag
+    tags:
+      - Window
  - type: Sprite
    netsync: false
    sprite: Structures/Windows/directional.rsi
@@ -96,6 +104,11 @@
  - type: Icon
    sprite: Structures/Windows/directional.rsi
    state: window
+  - type: InteractionPopup
+    interactSuccessString: comp-window-knock
+    popupPerceivedByOthers: true
+    interactSuccessSound:
+      path: /Audio/Effects/glass_knock.ogg
  - type: Physics
  - type: Fixtures
    fixtures:
@@ -136,7 +149,6 @@
    noAirWhenFullyAirBlocked: false
    airBlockedDirection:
    - South
-  - type: Window
  - type: Construction
    graph: WindowDirectional
    node: windowDirectional