More sprite movement states (#24237)

* More sprite movement states

* what

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 75e89cccddc019d9c5afef79c65f066b7a26a723..6e0df641d735a2ffa60f3c57b3004876638fc177 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -786,9 +786,16 @@
   - type: Sprite
     drawdepth: Mobs
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: crab
       sprite: Mobs/Animals/crab.rsi
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: crab-moving
+    noMovementLayers:
+      movement:
+        state: crab
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -1769,9 +1776,16 @@
   - type: Sprite
     drawdepth: Mobs
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: frog
       sprite: Mobs/Animals/frog.rsi
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: frog-moving
+    noMovementLayers:
+      movement:
+        state: frog
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2043,9 +2057,16 @@
   - type: Sprite
     drawdepth: Mobs
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: tarantula
       sprite: Mobs/Animals/spider.rsi
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: tarantula-moving
+    noMovementLayers:
+      movement:
+        state: tarantula
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2353,8 +2374,15 @@
     drawdepth: Mobs
     sprite: Mobs/Animals/fox.rsi
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: fox
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: fox-moving
+    noMovementLayers:
+      movement:
+        state: fox
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -2888,8 +2916,15 @@
     drawdepth: SmallMobs
     sprite: Mobs/Animals/hamster.rsi
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: hamster-0
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: hamster-moving-0
+    noMovementLayers:
+      movement:
+        state: hamster-0
   - type: Item
     size: Tiny
   - type: Physics

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index b5144f3b00ae9bb33b39be2608e5a30846d7523e..6ad5a4f647c25d1fe40d7f52f4f1f5d6b976e85a 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -557,8 +557,15 @@
     drawdepth: SmallMobs
     sprite: Mobs/Pets/hamlet.rsi
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: hamster-0
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: hamster-moving-0
+    noMovementLayers:
+      movement:
+        state: hamster-0
   - type: GhostRole
     makeSentient: true
     allowSpeech: true
@@ -608,9 +615,16 @@
   - type: Sprite
     drawdepth: Mobs
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: shiva
       sprite: Mobs/Pets/shiva.rsi
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: shiva-moving
+    noMovementLayers:
+      movement:
+        state: shiva
   - type: HTN
     rootTask:
       task: SimpleHostileCompound

diff --git a/Resources/Textures/Mobs/Animals/crab.rsi/crab-moving.png b/Resources/Textures/Mobs/Animals/crab.rsi/crab-moving.png
new file mode 100644 (file)
index 0000000..e40337e
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/crab.rsi/crab-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/crab.rsi/crab.png b/Resources/Textures/Mobs/Animals/crab.rsi/crab.png
index e40337e1ec66e78050ebf6404fda13676d50df8f..970c8b5c0734922d7d054d0835a55b38107aa9a2 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/crab.rsi/crab.png and b/Resources/Textures/Mobs/Animals/crab.rsi/crab.png differ

diff --git a/Resources/Textures/Mobs/Animals/crab.rsi/meta.json b/Resources/Textures/Mobs/Animals/crab.rsi/meta.json
index 5559f5b36d1214a9a314d5d3238dcd91c0a115fe..8baee0e1ca158cafd1223d6816e431805dd25d1a 100644 (file)
--- a/Resources/Textures/Mobs/Animals/crab.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/crab.rsi/meta.json
@@ -9,6 +9,10 @@
   "states": [
     {
       "name": "crab",
+      "directions": 4
+    },
+    {
+      "name": "crab-moving",
       "directions": 4,
       "delays": [
         [
@@ -34,12 +38,7 @@
       ]
     },
     {
-      "name": "dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "dead"
     }
   ]
 }

diff --git a/Resources/Textures/Mobs/Animals/fox.rsi/fox-moving.png b/Resources/Textures/Mobs/Animals/fox.rsi/fox-moving.png
new file mode 100644 (file)
index 0000000..a06ffee
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/fox.rsi/fox-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/fox.rsi/meta.json b/Resources/Textures/Mobs/Animals/fox.rsi/meta.json
index c3e16806c9bed7082c43b3ad907e6a13aaa2602e..e5f03a2e8083686e4022c551784d9f4d9d196f5e 100644 (file)
--- a/Resources/Textures/Mobs/Animals/fox.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/fox.rsi/meta.json
@@ -11,14 +11,40 @@
   [\r
     {\r
       "name": "fox",\r
+      "directions": 4\r
+       },\r
+    {\r
+      "name": "fox-moving",\r
       "directions": 4,\r
-      "delays": [[1],[1],[1],[1]]\r
+      "delays": [\r
+           [\r
+             0.2,\r
+                 0.2,\r
+                 0.2,\r
+                 0.2\r
+           ],\r
+           [\r
+             0.2,\r
+                 0.2,\r
+                 0.2,\r
+                 0.2\r
+           ],      \r
+               [\r
+             0.2,\r
+                 0.2,\r
+                 0.2,\r
+                 0.2\r
+           ],\r
+           [\r
+             0.2,\r
+                 0.2,\r
+                 0.2,\r
+                 0.2\r
+           ]\r
+         ]\r
     },\r
-\r
     {\r
-      "name": "fox_dead",\r
-      "directions": 1,\r
-      "delays": [[1]]\r
+      "name": "fox_dead"\r
     }\r
   ]\r
 }\r

diff --git a/Resources/Textures/Mobs/Animals/frog.rsi/frog-moving.png b/Resources/Textures/Mobs/Animals/frog.rsi/frog-moving.png
new file mode 100644 (file)
index 0000000..fd401f3
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/frog.rsi/frog-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/frog.rsi/frog.png b/Resources/Textures/Mobs/Animals/frog.rsi/frog.png
index fd401f307a4d4b729f4d19cd572b6dd31a3fc662..553980702a1519176e853d25f17eb4dffa874029 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/frog.rsi/frog.png and b/Resources/Textures/Mobs/Animals/frog.rsi/frog.png differ

diff --git a/Resources/Textures/Mobs/Animals/frog.rsi/meta.json b/Resources/Textures/Mobs/Animals/frog.rsi/meta.json
index 22406ca7ec6ae3a8d51d2adbb93ebb96fcd3a4ee..766513722d7a7544ceaa83b688e6f0ff68347184 100644 (file)
--- a/Resources/Textures/Mobs/Animals/frog.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/frog.rsi/meta.json
@@ -9,6 +9,10 @@
   "states": [
     {
       "name": "frog",
+      "directions": 4
+    },
+    {
+      "name": "frog-moving",
       "directions": 4,
       "delays": [
         [

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png b/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png
index 449523446ffb5a973ebce1cd151f21282b5d41a2..9a8d85188ad397d304ca77912e23f34b0f653d01 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png and b/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png differ

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-moving-0.png b/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-moving-0.png
new file mode 100644 (file)
index 0000000..4495234
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-moving-0.png differ

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json b/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json
index d09ebc83831a93b2d913fc0d3996e95bec9395db..85616627cecacda0475671daa57e69379baa357e 100644 (file)
--- a/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json
@@ -12,6 +12,10 @@
     },
     {
       "name": "hamster-0",
+      "directions": 4
+    },
+    {
+      "name": "hamster-moving-0",
       "directions": 4,
       "delays": [
         [

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/guard-moving.png b/Resources/Textures/Mobs/Animals/spider.rsi/guard-moving.png
new file mode 100644 (file)
index 0000000..0bc66cd
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spider.rsi/guard-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/guard.png b/Resources/Textures/Mobs/Animals/spider.rsi/guard.png
index 0bc66cd8340b7cb960cf627f77b0a5fdec88cf24..8385d12a8d8cc641ab4d199c60f80365c48170cf 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/spider.rsi/guard.png and b/Resources/Textures/Mobs/Animals/spider.rsi/guard.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/hunter-moving.png b/Resources/Textures/Mobs/Animals/spider.rsi/hunter-moving.png
new file mode 100644 (file)
index 0000000..e74c8aa
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spider.rsi/hunter-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/hunter.png b/Resources/Textures/Mobs/Animals/spider.rsi/hunter.png
index e74c8aa459dd95299e40866463198881d36c0d0e..824b37b634297aeb1422fe05e99b8635b2c835a9 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/spider.rsi/hunter.png and b/Resources/Textures/Mobs/Animals/spider.rsi/hunter.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/meta.json b/Resources/Textures/Mobs/Animals/spider.rsi/meta.json
index 080af7172a33cbcc629438bb752fbd059a2a4a71..ae39fa9d1ec9f768339e6479714572e71ffad840 100644 (file)
--- a/Resources/Textures/Mobs/Animals/spider.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/spider.rsi/meta.json
@@ -9,6 +9,10 @@
   "states": [
     {
       "name": "hunter",
+      "directions": 4
+    },
+    {
+      "name": "hunter-moving",
       "directions": 4,
       "delays": [
         [
@@ -33,8 +37,12 @@
         ]
       ]
     },
-    {
+       {
       "name": "midwife",
+      "directions": 4
+    },
+    {
+      "name": "midwife-moving",
       "directions": 4,
       "delays": [
         [
@@ -61,6 +69,10 @@
     },
     {
       "name": "viper",
+      "directions": 4
+       },
+    {
+      "name": "viper-moving",
       "directions": 4,
       "delays": [
         [
@@ -87,6 +99,10 @@
     },
     {
       "name": "tarantula",
+      "directions": 4
+       },
+    {
+      "name": "tarantula-moving",
       "directions": 4,
       "delays": [
         [
@@ -111,8 +127,12 @@
         ]
       ]
     },
-    {
+       {
       "name": "nurse",
+      "directions": 4
+    },
+    {
+      "name": "nurse-moving",
       "directions": 4,
       "delays": [
         [
@@ -139,6 +159,10 @@
     },
     {
       "name": "guard",
+      "directions": 4
+       },
+    {
+      "name": "guard-moving",
       "directions": 4,
       "delays": [
         [

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/midwife-moving.png b/Resources/Textures/Mobs/Animals/spider.rsi/midwife-moving.png
new file mode 100644 (file)
index 0000000..9c9ef66
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spider.rsi/midwife-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/midwife.png b/Resources/Textures/Mobs/Animals/spider.rsi/midwife.png
index 9c9ef66268f30f9a37e550c2d5c79eb9edf61814..2f797d36c157d994fba2d9c9e5ad4e3f88c38b7c 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/spider.rsi/midwife.png and b/Resources/Textures/Mobs/Animals/spider.rsi/midwife.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/nurse-moving.png b/Resources/Textures/Mobs/Animals/spider.rsi/nurse-moving.png
new file mode 100644 (file)
index 0000000..33bd6e2
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spider.rsi/nurse-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/nurse.png b/Resources/Textures/Mobs/Animals/spider.rsi/nurse.png
index 33bd6e2681530bd80e950dcfd2ab5fd1a2297b5f..33f7d2ccd14ebc284cee87a29fe9a78eb341b38d 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/spider.rsi/nurse.png and b/Resources/Textures/Mobs/Animals/spider.rsi/nurse.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/tarantula-moving.png b/Resources/Textures/Mobs/Animals/spider.rsi/tarantula-moving.png
new file mode 100644 (file)
index 0000000..cad7aca
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spider.rsi/tarantula-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/tarantula.png b/Resources/Textures/Mobs/Animals/spider.rsi/tarantula.png
index cad7aca897762d2eb7d01c2674f6babbb2d4acd8..59d5c6915b0aeaf9d8ad5f8661290dc9331589a0 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/spider.rsi/tarantula.png and b/Resources/Textures/Mobs/Animals/spider.rsi/tarantula.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/viper-moving.png b/Resources/Textures/Mobs/Animals/spider.rsi/viper-moving.png
new file mode 100644 (file)
index 0000000..4a3b9b9
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/spider.rsi/viper-moving.png differ

diff --git a/Resources/Textures/Mobs/Animals/spider.rsi/viper.png b/Resources/Textures/Mobs/Animals/spider.rsi/viper.png
index 4a3b9b9c7d88655523cdeaca8b020f30fdd18cde..d68144add4ee0ac111e29a58a2feeea4a9b8259b 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/spider.rsi/viper.png and b/Resources/Textures/Mobs/Animals/spider.rsi/viper.png differ

diff --git a/Resources/Textures/Mobs/Pets/fox.rsi/fox-moving.png b/Resources/Textures/Mobs/Pets/fox.rsi/fox-moving.png
new file mode 100644 (file)
index 0000000..a06ffee
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/fox.rsi/fox-moving.png differ

diff --git a/Resources/Textures/Mobs/Pets/fox.rsi/meta.json b/Resources/Textures/Mobs/Pets/fox.rsi/meta.json
index 46837bff609ce8ffc62c61579d46d96211b995b2..5758a5f8504256f767658490ba09ef3232c74464 100644 (file)
--- a/Resources/Textures/Mobs/Pets/fox.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/fox.rsi/meta.json
@@ -9,81 +9,54 @@
   "states": [
     {
       "name": "fox",
+      "directions": 4
+    },
+    {
+      "name": "fox-moving",
       "directions": 4,
       "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+           [
+             0.2,
+                 0.2,
+                 0.2,
+                 0.2
+           ],
+           [
+             0.2,
+                 0.2,
+                 0.2,
+                 0.2
+           ],      
+               [
+             0.2,
+                 0.2,
+                 0.2,
+                 0.2
+           ],
+           [
+             0.2,
+                 0.2,
+                 0.2,
+                 0.2
+           ]
+         ]
     },
     {
-      "name": "fox_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "fox_dead"
     },
     {
-      "name": "fox_deadcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "fox_deadcollar"
     },
     {
-      "name": "fox_deadtag",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "fox_deadtag"
     },
     {
       "name": "foxcollar",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "foxtag",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/hamster-0.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/hamster-0.png
index c008c71684a7d32f9ca45ffccfc3135eaba79c06..a42972ba0c2ee618a9d80a9f3af583afd1cbaf08 100644 (file)
Binary files a/Resources/Textures/Mobs/Pets/hamlet.rsi/hamster-0.png and b/Resources/Textures/Mobs/Pets/hamlet.rsi/hamster-0.png differ

diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/hamster-moving-0.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/hamster-moving-0.png
new file mode 100644 (file)
index 0000000..c008c71
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/hamlet.rsi/hamster-moving-0.png differ

diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json b/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json
index b517009dfe3ee3d891825220182f031273557bed..7fa6edb9ece64da39ae6f0451df3d6d5dbd23d79 100644 (file)
--- a/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json
@@ -9,6 +9,10 @@
   "states": [
     {
       "name": "hamster-0",
+      "directions": 4
+    },
+    {
+      "name": "hamster-moving-0",
       "directions": 4,
       "delays": [
         [

diff --git a/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json b/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json
index dbf2bccbefef7f6c3e79ee4e5267f8d868841be7..d4488148d948dfe06d0829437d6fe5899100b92a 100644 (file)
--- a/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/shiva.rsi/meta.json
@@ -9,6 +9,10 @@
   "states": [
     {
       "name": "shiva",
+      "directions": 4
+    },
+    {
+      "name": "shiva-moving",
       "directions": 4,
       "delays": [
         [

diff --git a/Resources/Textures/Mobs/Pets/shiva.rsi/shiva-moving.png b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva-moving.png
new file mode 100644 (file)
index 0000000..bcaef60
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva-moving.png differ

diff --git a/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png
index bcaef6034351da64f428948d6cd408e0fadf6c91..895d005889e06793e68f17ca8989673d26dae3a2 100644 (file)
Binary files a/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png and b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png differ