From 2643aaf19992837c03d8a433e69a6b1d01af9129 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Tue, 28 Oct 2014 02:45:25 +0100
Subject: Add the second brimmed hat variation.

---
 LICENSE                                               |   2 ++
 graphics/items/equipment/head/brimmedfeatherhat.png   | Bin 5996 -> 5996 bytes
 graphics/items/equipment/head/brimmedflowerhat.png    | Bin 0 -> 6203 bytes
 graphics/sprites/equipment/head/brimmedfeatherhat.png | Bin 9037 -> 9325 bytes
 graphics/sprites/equipment/head/brimmedflowerhat.png  | Bin 0 -> 9514 bytes
 graphics/sprites/equipment/head/brimmedflowerrhat.xml |  12 ++++++++++++
 items.xml                                             |  15 ++++++++++++---
 7 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 graphics/items/equipment/head/brimmedflowerhat.png
 create mode 100644 graphics/sprites/equipment/head/brimmedflowerhat.png
 create mode 100644 graphics/sprites/equipment/head/brimmedflowerrhat.xml

diff --git a/LICENSE b/LICENSE
index 7516e190..42ff1bbe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -52,6 +52,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ### Head
     graphics/items/equipment/head/bandana.png (Modanung)                    (CC BY-SA 3.0)        (-)
     graphics/items/equipment/head/brimmedfeatherhat.png (Reid)              (CC BY-SA 3.0)        (-)
+    graphics/items/equipment/head/brimmedflowerhat.png (Reid)              (CC BY-SA 3.0)        (-)
     graphics/items/equipment/head/brimmedhat.png (Reid)                     (CC BY-SA 3.0)        (-)
     graphics/items/equipment/head/fancyhat.png (Crush)                      (CC BY-SA 3.0)        (-)
     graphics/items/equipment/head/pumpkinhat.png (Modanung)                 (CC BY-SA 3.0)        (-)
@@ -155,6 +156,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/equipment/head/bandana-female.png (Modanung)           (CC BY-SA 3.0)        (Alige, Reid)
     graphics/sprites/equipment/head/bandana-male.png (Modanung)             (CC BY-SA 3.0)        (Alige)
     graphics/sprites/equipment/head/brimmedfeatherhat.png (Reid)            (CC BY-SA 3.0)        (-)
+    graphics/sprites/equipment/head/brimmedflowerhat.png (Reid)             (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/head/brimmedhat.png (Reid)                   (CC BY-SA 3.0)        (Reid)
     graphics/sprites/equipment/head/fancyhat.png (Crush)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/head/pumpkinhat.png (Modanung)               (CC BY-SA 3.0)        (-)
diff --git a/graphics/items/equipment/head/brimmedfeatherhat.png b/graphics/items/equipment/head/brimmedfeatherhat.png
index 33f1c953..49987050 100644
Binary files a/graphics/items/equipment/head/brimmedfeatherhat.png and b/graphics/items/equipment/head/brimmedfeatherhat.png differ
diff --git a/graphics/items/equipment/head/brimmedflowerhat.png b/graphics/items/equipment/head/brimmedflowerhat.png
new file mode 100644
index 00000000..3d7497cd
Binary files /dev/null and b/graphics/items/equipment/head/brimmedflowerhat.png differ
diff --git a/graphics/sprites/equipment/head/brimmedfeatherhat.png b/graphics/sprites/equipment/head/brimmedfeatherhat.png
index 5825565c..9555c1fa 100644
Binary files a/graphics/sprites/equipment/head/brimmedfeatherhat.png and b/graphics/sprites/equipment/head/brimmedfeatherhat.png differ
diff --git a/graphics/sprites/equipment/head/brimmedflowerhat.png b/graphics/sprites/equipment/head/brimmedflowerhat.png
new file mode 100644
index 00000000..4667a3b6
Binary files /dev/null and b/graphics/sprites/equipment/head/brimmedflowerhat.png differ
diff --git a/graphics/sprites/equipment/head/brimmedflowerrhat.xml b/graphics/sprites/equipment/head/brimmedflowerrhat.xml
new file mode 100644
index 00000000..31918960
--- /dev/null
+++ b/graphics/sprites/equipment/head/brimmedflowerrhat.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2014 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/head/brimmedflowerhat.png"
+              width="27"
+              height="20"
+              offsetY="-9"/>
+
+    <include file="equipment/head/pumpkinhat.xml"/>
+</sprite>
diff --git a/items.xml b/items.xml
index 34a4f26f..d55d71ba 100644
--- a/items.xml
+++ b/items.xml
@@ -731,13 +731,22 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     </item>
     <item id="2904"
         image="equipment/head/brimmedfeatherhat.png"
-        name="Brimmed Hat"
+        name="Brimmed Feather Hat"
         description="-"
-        defense="2"
+        defense="6"
         type="equip-head"
-        weight="20">
+        weight="23">
         <sprite>equipment/head/brimmedfeatherhat.xml</sprite>
     </item>
+    <item id="2905"
+        image="equipment/head/brimmedflowerhat.png"
+        name="Brimmed Flower Hat"
+        description="-"
+        defense="6"
+        type="equip-head"
+        weight="22">
+        <sprite>equipment/head/brimmedflowerhat.xml</sprite>
+    </item>
 
     <!-- Neck Armors
     <item id="3200"
-- 
cgit v1.2.3-60-g2f50