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!ia0vp^4j|0J3?w7mbKU|ei2$DvS0Jset?lCM92pszP}M$l
z`PP|d{{LrS$hcwA1e9Ye3GxeOaCmkj4an*6ba4#vIG&s!!OF~hLqh0-wnr+*VeRv;
zP6-G#_%~KDFlP(ORi-g29L#8lZd9Bha!m8Q3d1r9(E`nYmP<@KL^uRwV|-df9+a{2
za0r?lYM8+F@M4KI*9&GLj;ZpDEK?l0+2^!!1Z#F##oV0Fn67w8$3fw-hR_KMA10Pf
j`pT85M>7<i%o!N2HFH+;#|3c!-NfMO>gTe~DWM4fJSj)f

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!ia0vp^4j|0J3?w7mbKU|ei2$DvS0Jset?lCM92pszP}M$l
z`PP|d{{LrS$hcwA1e9Ye3GxeOaCmkj4an*Aba4#vIG&s!!TN<M=f_fEi3s5jS^NnJ
zrAL=5s5CSx#xQQT3D)coIkxtIfRB;XgGuRP4Hukth-f%vy2Y#$IFK-bZ3c&CfJzF3
zVmB}631jXawI_iF4_MijEIAOHz`)JDfhoMEm6hXxmVrVm>pUjriGdr$B~D1Xb_9eS
ljY{Bn@T5mfteKU8AtaFF>G$2N&w!3%@O1TaS?83{1ONm=O*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