From de334904b4e60e1e339faf2d5ada5183e0a6520a Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Fri, 2 Aug 2019 22:44:43 +0200
Subject: [PATCH] Spears get inhands.

---
 .../Entities/items/weapons/spear.yml          |  10 +++-
 .../Objects/items/spear.rsi/inhand-left.png   | Bin 0 -> 242 bytes
 .../Objects/items/spear.rsi/inhand-right.png  | Bin 0 -> 243 bytes
 .../Objects/items/spear.rsi/meta.json         |  49 ++++++++++++++++++
 .../Objects/{ => items/spear.rsi}/spear.png   | Bin
 5 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Objects/items/spear.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/items/spear.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/items/spear.rsi/meta.json
 rename Resources/Textures/Objects/{ => items/spear.rsi}/spear.png (100%)

diff --git a/Resources/Prototypes/Entities/items/weapons/spear.yml b/Resources/Prototypes/Entities/items/weapons/spear.yml
index 9c3caf8aea..ac57358c87 100644
--- a/Resources/Prototypes/Entities/items/weapons/spear.yml
+++ b/Resources/Prototypes/Entities/items/weapons/spear.yml
@@ -4,9 +4,15 @@
   id: Spear
   components:
   - type: Sprite
-    texture: Objects/spear.png
+    sprite: Objects/items/spear.rsi
+    state: spear
+
   - type: Icon
-    texture: Objects/spear.png
+    sprite: Objects/items/spear.rsi
+    state: spear
+
   - type: MeleeWeapon
   - type: Item
     Size: 24
+    sprite: Objects/items/spear.rsi
+    prefix: inhand
diff --git a/Resources/Textures/Objects/items/spear.rsi/inhand-left.png b/Resources/Textures/Objects/items/spear.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a2b620b11eeac3701f0fd50fb46d2afaad931ab
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o7G?$ph6wkZw+svn5&=FTt_%ze+S=MK&d!mM
zkqK4pQ<ra@dFKCr28N6q7EKHc42&f~e!&b5&u*kKFfep@x;Tb-98XS=U}a{$AtCfZ
z+as0Zu=e>^rv!u={2Qwnn6m}tD$^Jh4rVk&H!98$Ii`7Dg<+Y5Xn|%x%O$2AA{+v;
zF+MFK56W11I0Q`&HB8`oc(KHq>jkqA$5eSnmMM<h>~mT<f;GFWVs6f7OjkUl<Dl?Z
sL+FHs4-?BKedWs3qZx`$<_rwinmMca<AOLC7#J8lUHx3vIVCg!06Zy2(EtDd

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/items/spear.rsi/inhand-right.png b/Resources/Textures/Objects/items/spear.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..34d3fb1a35d064c13afc8864dad5c27d17e1ce7a
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o7G?$ph6wkZw+svn5&=FTt_%ze+S=MK&d!mM
zkqK4pQ<ra@dFKCr28N6q7EKHc42&f~e!&b5&u*kKFfep_x;Tb-98XS=VEw|B^JA&7
zM1=5%EdGRq(xb~2R2mu;V;HyF1Z#GP99w%pz{g1H!K8Gth6_$RL^PZ--D1`W97veJ
zHiJVmKqZAiv749kgfVxI+LJ(o2dr#MmK=ypVBqH7z!YB7%F6LT%Rr%(bsiJ*#J~;W
t5+@{GI|9OvMkR1Oc+w*#*38Pl5E97o^!sksXABGs44$rjF6*2Ung9esO*jAm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/items/spear.rsi/meta.json b/Resources/Textures/Objects/items/spear.rsi/meta.json
new file mode 100644
index 0000000000..0828bd95af
--- /dev/null
+++ b/Resources/Textures/Objects/items/spear.rsi/meta.json
@@ -0,0 +1,49 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "spear",
+            "directions": 1
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/spear.png b/Resources/Textures/Objects/items/spear.rsi/spear.png
similarity index 100%
rename from Resources/Textures/Objects/spear.png
rename to Resources/Textures/Objects/items/spear.rsi/spear.png