Merge branch 'ranger' into 'master'

Ranger Hat

See merge request evol/clientdata!179

5 files changed, 27 insertions, 0 deletions

diff --git a/LICENSE b/LICENSE
index 0a1d4248..dd4e17cc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -165,6 +165,7 @@ legal@themanaworld.org
     graphics/items/equipment/head/nohmask.png (LEGACY)                      (GPLv2)               (-)
     graphics/items/equipment/head/pinkiehat.png (LEGACY)                    (GPLv2)               (-)
     graphics/items/equipment/head/pumpkinhat.png (Modanung)                 (CC BY-SA 3.0)        (-)
+    graphics/items/equipment/head/rangerhat.png (Pauan)                     (GPLv2)               (-)
     graphics/items/equipment/head/rosehat.png (Nami, skipy)                 (GPLv2)               (Alige, Micksha)
     graphics/items/equipment/head/silkheadband.png (LEGACY)                 (GPLv2)               (-)
     graphics/items/equipment/head/standardheadband.png (LEGACY)             (GPLv2)               (-)
@@ -895,6 +896,7 @@ legal@themanaworld.org
     graphics/sprites/equipment/head/pumpkinhat.png (Modanung)               (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/head/purplemodel.png (Saulc)                 (GPLv2)               (-)
     graphics/sprites/equipment/head/rosehat.png (LEGACY)                    (GPLv2)               (Micksha)
+    graphics/sprites/equipment/head/rangerhat.png (Pauan)                   (GPLv2)               (Micksha)
     graphics/sprites/equipment/head/santabeardhat.png (LEGACY)              (GPLv2)               (-)
     graphics/sprites/equipment/head/santahat.png (LEGACY)                   (GPLv2)               (-)
     graphics/sprites/equipment/head/silkheadband.png (LEGACY)               (GPLv2)               (-)
diff --git a/graphics/items/equipment/head/rangerhat.png b/graphics/items/equipment/head/rangerhat.png
new file mode 100644
index 00000000..f3a419ae
--- /dev/null
+++ b/graphics/items/equipment/head/rangerhat.png
diff --git a/graphics/sprites/equipment/head/rangerhat.png b/graphics/sprites/equipment/head/rangerhat.png
new file mode 100644
index 00000000..0a6b70ab
--- /dev/null
+++ b/graphics/sprites/equipment/head/rangerhat.png
diff --git a/graphics/sprites/equipment/head/rangerhat.xml b/graphics/sprites/equipment/head/rangerhat.xml
new file mode 100644
index 00000000..ad9f3926
--- /dev/null
+++ b/graphics/sprites/equipment/head/rangerhat.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2020 rEvolt -->
+
+<sprite>
+
+    <imageset name="base"
+              src="graphics/sprites/equipment/head/rangerhat.png"
+              width="42"
+              height="64"
+              offsetY="1"/>
+
+    <include file="equipment/head/headmodel-male.xml"/>
+
+</sprite>
diff --git a/items.xml b/items.xml
index 3ecaf9dd..a6571f42 100644
--- a/items.xml
+++ b/items.xml
@@ -3267,6 +3267,16 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
 		weight="100">
 		<sprite>equipment/head/captainhat.xml</sprite>
 	</item>
+	<item id="2935"
+		image="equipment/head/rangerhat.png"
+		name="Ranger Hat"
+		description="A leather hat traditionally worn by Rangers. Symbol of the Pinkie-Hater cult."
+		defense="5"
+		level="21"
+		type="equip-head"
+		weight="220">
+		<sprite>equipment/head/rangerhat.xml</sprite>
+	</item>
 
     <!-- Neck Armors & Accessoires -->
     <item id="3200"