From: themias <89101928+themias@users.noreply.github.com>
Date: Thu, 18 Jan 2024 23:48:27 +0000 (-0500)
Subject: More sprite movement states (#24237)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0c944ed81ee8f96769f77e0d535629d90abf40f5;p=space-station-14.git

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 75e89cccdd..6e0df641d7 100644
--- 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 b5144f3b00..6ad5a4f647 100644
--- 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
index 0000000000..e40337e1ec
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 e40337e1ec..970c8b5c07 100644
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 5559f5b36d..8baee0e1ca 100644
--- 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
index 0000000000..a06ffee7bd
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 c3e16806c9..e5f03a2e80 100644
--- a/Resources/Textures/Mobs/Animals/fox.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/fox.rsi/meta.json
@@ -11,14 +11,40 @@
   [
     {
       "name": "fox",
+      "directions": 4
+	},
+    {
+      "name": "fox-moving",
       "directions": 4,
-      "delays": [[1],[1],[1],[1]]
+      "delays": [
+	    [
+	      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",
-      "directions": 1,
-      "delays": [[1]]
+      "name": "fox_dead"
     }
   ]
 }
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
index 0000000000..fd401f307a
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 fd401f307a..553980702a 100644
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 22406ca7ec..766513722d 100644
--- 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 449523446f..9a8d85188a 100644
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
index 0000000000..449523446f
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 d09ebc8383..85616627ce 100644
--- 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
index 0000000000..0bc66cd834
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 0bc66cd834..8385d12a8d 100644
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
index 0000000000..e74c8aa459
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 e74c8aa459..824b37b634 100644
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 080af7172a..ae39fa9d1e 100644
--- 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
index 0000000000..9c9ef66268
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 9c9ef66268..2f797d36c1 100644
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
index 0000000000..33bd6e2681
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 33bd6e2681..33f7d2ccd1 100644
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
index 0000000000..cad7aca897
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 cad7aca897..59d5c6915b 100644
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
index 0000000000..4a3b9b9c7d
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 4a3b9b9c7d..d68144add4 100644
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
index 0000000000..a06ffee7bd
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 46837bff60..5758a5f850 100644
--- 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 c008c71684..a42972ba0c 100644
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
index 0000000000..c008c71684
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 b517009dfe..7fa6edb9ec 100644
--- 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 dbf2bccbef..d4488148d9 100644
--- 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
index 0000000000..bcaef60343
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 bcaef60343..895d005889 100644
Binary files a/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png and b/Resources/Textures/Mobs/Pets/shiva.rsi/shiva.png differ