Add a few missing items and the Noh Mask

10 files changed, 55 insertions, 0 deletions

diff --git a/LICENSE b/LICENSE
index 996b62bb..21e354d3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -78,6 +78,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/equipment/head/fairyhat.png (Goku)                       (GPLv2)               (-)
     graphics/items/equipment/head/fancyhat.png (Crush)                      (CC BY-SA 3.0)        (-)
     graphics/items/equipment/head/infantryhelmet.png (Black Don)            (GPLv2)               (-)
+    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/tophat.png (QOAL)                         (GPLv2)               (-)
@@ -165,6 +166,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/usable/aquada.png (Reid)                                 (CC BY-SA 3.0)        (-)
     graphics/items/usable/atroposmixture.png (Reid)                         (CC BY-SA 3.0)        (-)
     graphics/items/usable/beer.png (LEGACY)                                 (CC BY-SA 3.0)        (Micksha)
+    graphics/items/usable/bottleofwater.png (LEGACY)                        (CC BY-SA 3.0)        (-)
     graphics/items/usable/blobime.png (Enchilado)                           (CC BY-SA 3.0)        (-)
     graphics/items/usable/book-chorus.png (Hal9000)                         (CC BY-SA 3.0)        (Reid)
     graphics/items/usable/book-comtheory.png (Hal9000)                      (CC BY-SA 3.0)        (Reid)
@@ -176,6 +178,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/usable/bread.png (Coolkid782)                            (CC BY-SA 3.0)        (-)
     graphics/items/usable/carrot.png (Enchilado)                            (CC BY-SA 3.0)        (Reid)
     graphics/items/usable/cheese.png (Reid)                                 (CC BY-SA 3.0)        (-)
+    graphics/items/usable/cherrycake.png (LEGACY)                           (CC BY-SA 3.0)        (-)
     graphics/items/usable/curshroom.png (Reid)                              (CC BY-SA 3.0)        (-)
     graphics/items/usable/clotholiquor.png (Reid)                           (CC BY-SA 3.0)        (-)
     graphics/items/usable/croconut.png (Hal9000)                            (CC BY-SA 3.0)        (-)
@@ -192,6 +195,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/usable/gem3-polished.png (Micksha)                       (CC BY-SA 3.0)        (-)
     graphics/items/usable/gem-crude.png (LEGACY)                            (CC BY-SA 3.0)        (Micksha)
     graphics/items/usable/honey.png (LEGACY)                                (CC BY-SA 3.0)        (Micksha)
+    graphics/items/usable/maggotslime.png (LEGACY)                          (CC BY-SA 3.0)        (Micksha)
     graphics/items/usable/manana.png (Reid)                                 (CC BY-SA 3.0)        (IvanMorve)
     graphics/items/usable/lachesisbrew.png (Reid)                           (CC BY-SA 3.0)        (-)
     graphics/items/usable/lettuceleaf.png (Reid)                            (CC BY-SA 3.0)        (-)
@@ -202,6 +206,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/usable/plushroom.png (Reid)                              (CC BY-SA 3.0)        (-)
     graphics/items/usable/pumpkinjuice.png (Enchilado)                      (CC BY-SA 3.0)        (Reid)
     graphics/items/usable/pumpkinseeds.png (Enchilado)                      (CC BY-SA 3.0)        (-)
+    graphics/items/usable/roastedmaggot.png (LEGACY)                        (CC BY-SA 3.0)        (Micksha)
     graphics/items/usable/sandwich-carp.png (Micksha)                       (CC BY-SA 3.0)        (-)
     graphics/items/usable/sandwich-pioulegs.png (Micksha)                   (CC BY-SA 3.0)        (-)
     graphics/items/usable/sandwich-manana.png (Micksha)                     (CC BY-SA 3.0)        (-)
@@ -358,6 +363,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/equipment/head/fancyhat.png (Crush)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/head/headmodel-male.png (Saulc)              (GPLv2)               (-)
     graphics/sprites/equipment/head/infantryhelmet.png (LEGACY)             (GPLv2)               (-)
+    graphics/sprites/equipment/head/nohmask.png (LEGACY)                    (GPLv2)               (-)
     graphics/sprites/equipment/head/pinkiehat.png (LEGACY)                  (GPLv2)               (-)
     graphics/sprites/equipment/head/pumpkinhat.png (Modanung)               (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/head/purplemodel.png (Saulc)                 (GPLv2)               (-)
diff --git a/graphics/items/equipment/head/nohmask.png b/graphics/items/equipment/head/nohmask.png
new file mode 100644
index 00000000..43d43fb3
--- /dev/null
+++ b/graphics/items/equipment/head/nohmask.png
diff --git a/graphics/items/generic/__LEGACY__rawlog.png b/graphics/items/generic/__LEGACY__rawlog.png
deleted file mode 100644
index 3e790620..00000000
--- a/graphics/items/generic/__LEGACY__rawlog.png
+++ /dev/null
diff --git a/graphics/items/generic/mug-empty.png b/graphics/items/generic/mug-empty.png
index 11297640..347b4244 100644
--- a/graphics/items/generic/mug-empty.png
+++ b/graphics/items/generic/mug-empty.png
diff --git a/graphics/items/usable/bottleofwater.png b/graphics/items/usable/bottleofwater.png
new file mode 100644
index 00000000..d1c04adc
--- /dev/null
+++ b/graphics/items/usable/bottleofwater.png
diff --git a/graphics/items/usable/cherrycake.png b/graphics/items/usable/cherrycake.png
new file mode 100644
index 00000000..4005b804
--- /dev/null
+++ b/graphics/items/usable/cherrycake.png
diff --git a/graphics/items/usable/roastedmaggot.png b/graphics/items/usable/roastedmaggot.png
new file mode 100644
index 00000000..80e51c72
--- /dev/null
+++ b/graphics/items/usable/roastedmaggot.png
diff --git a/graphics/sprites/equipment/head/nohmask.png b/graphics/sprites/equipment/head/nohmask.png
new file mode 100644
index 00000000..f6f58b95
--- /dev/null
+++ b/graphics/sprites/equipment/head/nohmask.png
diff --git a/graphics/sprites/equipment/head/nohmask.xml b/graphics/sprites/equipment/head/nohmask.xml
new file mode 100644
index 00000000..9dd928bc
--- /dev/null
+++ b/graphics/sprites/equipment/head/nohmask.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2018 Evol -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/head/nohmask.png"
+              width="32"
+              height="64"
+              offsetY="1"/>
+
+    <include file="equipment/head/headmodel-male.xml"/>
+</sprite>
diff --git a/items.xml b/items.xml
index 0fd05f2b..9d2d615d 100644
--- a/items.xml
+++ b/items.xml
@@ -529,6 +529,33 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="usable"
         weight="50"
         maxFloorOffset="6"/>
+    <item id="564"
+        image="usable/roastedmaggot.png"
+        name="Roasted Maggot"
+        useButton="Eat"
+        description="a maggot, roasted on fire. Mmh, crunchy!"
+        effect="Heal 100-250 HP"
+        type="usable"
+        weight="5"
+        maxFloorOffset="6"/>
+    <item id="565"
+        image="usable/bottleofwater.png"
+        name="Bottle of Water"
+        useButton="Eat"
+        description="Fresh springwater from Hurnscald area. Healthy!"
+        effect="Heal 300-500 HP"
+        type="usable"
+        weight="25"
+        maxFloorOffset="6"/>
+    <item id="566"
+        image="usable/cherrycake.png"
+        name="Cherry Cake"
+        useButton="Eat"
+        description="If you like sweets, you will love this homemade cherry cake."
+        effect="Heal 180-360 HP"
+        type="usable"
+        weight="10"
+        maxFloorOffset="6"/>
 
     <!-- Generic Items -->
     <item id="700"
@@ -1445,6 +1472,16 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item from="-14" to="-9"/>
     <item from="-15" to="-19"/>
         </replace>
+    </item>    
+    <item id="2914"
+        image="equipment/head/nohmask.png"
+        name="Noh Mask"
+        description="A traditional chinese Noh Mask."
+        defense="0"
+        level="15"
+        type="equip-head"
+        weight="50">
+        <sprite>equipment/head/nohmask.xml</sprite>
     </item>
 
     <!-- Neck Armors -->