From: themias <89101928+themias@users.noreply.github.com>
Date: Wed, 17 Jan 2024 21:26:53 +0000 (-0500)
Subject: Mouse sprite movement states (#24202)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=47159d1c235aa8b8e79fe8ee6d36b76a92e78fb5;p=space-station-14.git

Mouse sprite movement states (#24202)
---

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 7ce9313e35..1c564d78fc 100644
--- 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 dd507e9516..a287558212 100644
--- 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 b144e0e973..fb49b05c13 100644
--- 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 1cfe399b63..ee62220aa1 100644
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 5d96953df5..def2943b92 100644
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 fe0969a1bb..be76731fec 100644
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 6f98406802..c7ac23e929 100644
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
index 0000000000..1cfe399b63
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
index 0000000000..5d96953df5
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
index 0000000000..37ed844f6a
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
index 0000000000..4b0694a76b
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-moving-3.png differ