]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Chicken sprite movement states (#24205)
authorthemias <89101928+themias@users.noreply.github.com>
Wed, 17 Jan 2024 22:26:19 +0000 (17:26 -0500)
committerGitHub <noreply@github.com>
Wed, 17 Jan 2024 22:26:19 +0000 (09:26 +1100)
12 files changed:
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Textures/Mobs/Animals/chicken.rsi/chicken-0.png
Resources/Textures/Mobs/Animals/chicken.rsi/chicken-1.png
Resources/Textures/Mobs/Animals/chicken.rsi/chicken-2.png
Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-0.png [new file with mode: 0644]
Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-1.png [new file with mode: 0644]
Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-2.png [new file with mode: 0644]
Resources/Textures/Mobs/Animals/chicken.rsi/dead-1.png
Resources/Textures/Mobs/Animals/chicken.rsi/dead-2.png
Resources/Textures/Mobs/Animals/chicken.rsi/icon-1.png
Resources/Textures/Mobs/Animals/chicken.rsi/icon-2.png
Resources/Textures/Mobs/Animals/chicken.rsi/meta.json

index 1c564d78fcfae226309e928346cf5d94190f8459..75e89cccddc019d9c5afef79c65f066b7a26a723 100644 (file)
   - type: Sprite
     drawdepth: Mobs
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: chicken-0
       sprite: Mobs/Animals/chicken.rsi
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: chicken-moving-0
+    noMovementLayers:
+      movement:
+        state: chicken-0
   - type: Fixtures
     fixtures:
       fix1:
     states:
       Alive:
         Base: chicken-0
+      Critical:
+        Base: dead-0
       Dead:
         Base: dead-0
   - type: Butcherable
   - type: NpcFactionMember
     factions:
     - Passive
+    
+- type: entity
+  parent: MobChicken
+  id: MobChicken1
+  components:
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
+      state: chicken-1
+      sprite: Mobs/Animals/chicken.rsi
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: chicken-moving-1
+    noMovementLayers:
+      movement:
+        state: chicken-1
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: chicken-1
+      Critical:
+        Base: dead-1
+      Dead:
+        Base: dead-1
+        
+- type: entity
+  parent: MobChicken
+  id: MobChicken2
+  components:
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
+      state: chicken-2
+      sprite: Mobs/Animals/chicken.rsi
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: chicken-moving-2
+    noMovementLayers:
+      movement:
+        state: chicken-2
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: chicken-2
+      Critical:
+        Base: dead-2
+      Dead:
+        Base: dead-2
 
 - type: entity
   id: FoodEggChickenFertilized
   - type: TimedSpawner
     prototypes:
     - MobChicken
+    - MobChicken1
+    - MobChicken2
     intervalSeconds: 20
     minimumEntitiesSpawned: 1
     maximumEntitiesSpawned: 1
index f7476ff0f821a2bc0b8f907922594afee1b32f6f..ece560af853f9ef410c24556f7ad154ca425dacb 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-0.png and b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-0.png differ
index c2f2bd7cf70e1c69156ee8dc39013f2eeabf6c96..70a5363e10e441f1a502cbdaccfd9e499102a83d 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-1.png and b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-1.png differ
index 366315fdd9b4c2748a10c5fb20b989e86850b876..073d92b793a9a89ca454e6ec0ab113ebbaf637f4 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-2.png and b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-2.png differ
diff --git a/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-0.png b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-0.png
new file mode 100644 (file)
index 0000000..f7476ff
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-0.png differ
diff --git a/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-1.png b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-1.png
new file mode 100644 (file)
index 0000000..eaf5c24
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-1.png differ
diff --git a/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-2.png b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-2.png
new file mode 100644 (file)
index 0000000..da62f95
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/chicken.rsi/chicken-moving-2.png differ
index 5ea03157c93a24be91bdccf35362d27b781b1d3e..5edf120300d686af410465ebf5cb5905cf07d0fe 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/chicken.rsi/dead-1.png and b/Resources/Textures/Mobs/Animals/chicken.rsi/dead-1.png differ
index 87f5d022775bee162db17ad35042c82c315ba962..900fd5fac811f10a3a345d9673c18c5ae18c77d3 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/chicken.rsi/dead-2.png and b/Resources/Textures/Mobs/Animals/chicken.rsi/dead-2.png differ
index 69360a0393d482ca9c20ed5f277aa5d0dc861431..f68bf67532525101186777089f4852c1e224af0f 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/chicken.rsi/icon-1.png and b/Resources/Textures/Mobs/Animals/chicken.rsi/icon-1.png differ
index 7d579a9ed3f285d3a6c0e8ba243945d5fa2d3437..4e19bb6bb9a4744c5bcb122d9331a0e442027e7c 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/chicken.rsi/icon-2.png and b/Resources/Textures/Mobs/Animals/chicken.rsi/icon-2.png differ
index 42f14d611e4df6c8d2406d30cc288e59d534572e..2fe526ac5499556934d347fa8980dcad14687c13 100644 (file)
         ]
       ]
     },
-    {
+       {
       "name": "chicken-0",
+      "directions": 4
+    },
+    {
+      "name": "chicken-moving-0",
       "directions": 4,
       "delays": [
         [
           0.2
         ]
       ]
+    },
+       {
+      "name" : "chicken-1",
+      "directions" : 4
     },
     {
-      "name": "chicken-1",
+      "name": "chicken-moving-1",
       "directions": 4,
       "delays": [
         [
     },
     {
       "name": "chicken-2",
+      "directions": 4
+    },
+    {
+      "name": "chicken-moving-2",
       "directions": 4,
       "delays": [
         [