Mouse sprite movement states (#24202)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 7ce9313e35058ddf346edf5932b62cff8229db1b..1c564d78fcfae226309e928346cf5d94190f8459 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1387,8 +1387,15 @@
     drawdepth: SmallMobs
     sprite: Mobs/Animals/mouse.rsi
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: mouse-0
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: mouse-moving-0
+    noMovementLayers:
+      movement:
+        state: mouse-0
   - type: Item
     size: Tiny
   - type: Clothing
@@ -1542,8 +1549,15 @@
   components:
   - type: Sprite
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: mouse-1
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: mouse-moving-1
+    noMovementLayers:
+      movement:
+        state: mouse-1
   - type: Clothing
     equippedPrefix: 1
   - type: DamageStateVisuals
@@ -1561,8 +1575,15 @@
   components:
   - type: Sprite
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: mouse-2
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: mouse-moving-2
+    noMovementLayers:
+      movement:
+        state: mouse-2
   - type: Clothing
     equippedPrefix: 2
   - type: DamageStateVisuals

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index dd507e9516e5e3fa3e740fe9ade038d274101639..a28755821272226f2f0bd9722b0bfdddef656600 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -182,8 +182,15 @@
     drawdepth: SmallMobs
     sprite: Mobs/Animals/mouse.rsi
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: mouse-3
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: mouse-moving-3
+    noMovementLayers:
+      movement:
+        state: mouse-3
   - type: Physics
     bodyType: KinematicController
   - type: Fixtures

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
index b144e0e973c48a22a656ddafdae36cb141da746f..fb49b05c138ca05ae6258a2695ccbb3b06e69472 100644 (file)
--- a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
@@ -16,11 +16,15 @@
     {
       "name": "icon-2"
     },
-       {
+    {
       "name": "icon-3"
     },
     {
       "name": "mouse-0",
+      "directions": 4
+    },
+    {
+      "name": "mouse-moving-0",
       "directions": 4,
       "delays": [
         [
@@ -47,6 +51,10 @@
     },
     {
       "name": "mouse-1",
+      "directions": 4
+    },
+    {
+      "name": "mouse-moving-1",
       "directions": 4,
       "delays": [
         [
@@ -73,6 +81,10 @@
     },
     {
       "name": "mouse-2",
+      "directions": 4
+    },
+    {
+      "name": "mouse-moving-2",
       "directions": 4,
       "delays": [
         [
@@ -97,8 +109,12 @@
         ]
       ]
     },
-       {
+    {
       "name": "mouse-3",
+      "directions": 4
+    },
+    {
+      "name": "mouse-moving-3",
       "directions": 4,
       "delays": [
         [
@@ -132,7 +148,7 @@
     {
       "name": "dead-2"
     },
-       {
+    {
       "name": "dead-3"
     },
     {
@@ -144,7 +160,7 @@
     {
       "name": "splat-2"
     },
-       {
+    {
       "name": "splat-3"
     },
     {

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-0.png b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-0.png
index 1cfe399b63b1d818997e6313a13e273b10042058..ee62220aa1961ed6b13e68b849b878232d76b51f 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-0.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-0.png differ

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-1.png b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-1.png
index 5d96953df5ed5868e348fe94a8806f89c58b6a57..def2943b925a8c2c787568b9d8e0bf5c662c8cbf 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-1.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-1.png differ

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-2.png b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-2.png
index fe0969a1bb06135191701a2f25840a61a0c3b81d..be76731fec941da6eb9622b1e38b18c12d56fd1c 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-2.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-2.png differ

diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-3.png b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-3.png
index 6f9840680268143f6b89ff699a267612bcc96b5c..c7ac23e929b2d9adc5b2fdf3106cd6dea2ef5095 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-3.png and b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-3.png differ

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

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

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

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