Merge pull request #170 from wushin/halloween-annual

Make a visible cue to Halloween starting

8 files changed, 22 insertions, 8 deletions

diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index d6ca52ca..eb108f3b 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -78,6 +78,7 @@
   <include name="items/equip-head/item900_YellowRoseHat.xml"/>
   <include name="items/equip-head/item901_OrangeRoseHat.xml"/>
   <include name="items/equip-head/item902_BlueRoseHat.xml"/>
+  <include name="items/equip-head/item905_BucketHat.xml"/>
   <include name="items/equip-head/item1173_TamOShanter.xml"/>
   <include name="items/equip-head/item1174_CashiersShade.xml"/>
   <include name="items/equip-head/item1175_AutumnMask.xml"/>
diff --git a/items/equip-head/item905_BucketHat.xml b/items/equip-head/item905_BucketHat.xml
new file mode 100644
index 00000000..bf2c9f7f
--- /dev/null
+++ b/items/equip-head/item905_BucketHat.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="905" image="equipment/head/bucket.png" name="Bucket" description="A Bucket for your head." effect="M. Attack +4" type="equip-head" defense="1" weight="1">
+    <sprite gender="male">equipment/head/bucket-male.xml</sprite>
+    <sprite gender="female">equipment/head/bucket-female.xml</sprite>
+  </item>
+</items>
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index 9ae8a333..06ecbe01 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -196,10 +196,6 @@
   <include name="items/generic/item3002_RealisticBrain.xml"/>
   <include name="items/generic/item3003_JarofBlood.xml"/>
   <include name="items/generic/item3004_Tongue.xml"/>
-  <include name="items/generic/item3006_TonoriDelight.xml"/>
-  <include name="items/generic/item3007_Marshmallow.xml"/>
-  <include name="items/generic/item3009_JellySkull.xml"/>
-  <include name="items/generic/item3010_CandyPumpkin.xml"/>
   <include name="items/generic/item3011_PumpkinSeeds.xml"/>
   <include name="items/generic/item4000_AngryScorpionStinger.xml"/>
   <include name="items/generic/item4001_Coal.xml"/>
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index d3dcc590..98efbb66 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -90,6 +90,10 @@
   <include name="items/usable/item1258_Honey.xml"/>
   <include name="items/usable/item1280_Scissors.xml"/>
   <include name="items/usable/item1281_ShockSweet.xml"/>
+  <include name="items/usable/item3006_TonoriDelight.xml"/>
+  <include name="items/usable/item3007_Marshmallow.xml"/>
+  <include name="items/usable/item3009_JellySkull.xml"/>
+  <include name="items/usable/item3010_CandyPumpkin.xml"/>
   <include name="items/usable/item4035_PickledBeets.xml"/>
   <include name="items/usable/item4036_RoastedAcorn.xml"/>
 </items>
diff --git a/items/generic/item3006_TonoriDelight.xml b/items/usable/item3006_TonoriDelight.xml
index 422ae753..19cc6f04 100644
--- a/items/generic/item3006_TonoriDelight.xml
+++ b/items/usable/item3006_TonoriDelight.xml
@@ -6,5 +6,5 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="3006" image="use/food/tonoridelight.png" name="Tonori Delight" description="A softly-scented jelly-like treat, dusted with the sweet white sands of Eastern Tonori." type="generic" weight="2"/>
+  <item id="3006" image="use/food/tonoridelight.png" name="Tonori Delight" description="A softly-scented jelly-like treat, dusted with the sweet white sands of Eastern Tonori." type="usable" hp="10" weight="2"/>
 </items>
diff --git a/items/generic/item3007_Marshmallow.xml b/items/usable/item3007_Marshmallow.xml
index 0079772a..39243f7e 100644
--- a/items/generic/item3007_Marshmallow.xml
+++ b/items/usable/item3007_Marshmallow.xml
@@ -6,5 +6,5 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="3007" image="use/food/marshmallow.png" name="Marshmallow" description="Flavoured with real marshmallow root." type="generic" weight="2"/>
+  <item id="3007" image="use/food/marshmallow.png" name="Marshmallow" description="Flavoured with real marshmallow root." type="usable" hp="10" weight="2"/>
 </items>
diff --git a/items/generic/item3009_JellySkull.xml b/items/usable/item3009_JellySkull.xml
index e9a5293d..435f66e8 100644
--- a/items/generic/item3009_JellySkull.xml
+++ b/items/usable/item3009_JellySkull.xml
@@ -6,5 +6,5 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="3009" image="use/food/jellyskull.png" name="Jelly Skull" description="Like a jelly bean, but in the shape of skull." type="generic" weight="2"/>
+  <item id="3009" image="use/food/jellyskull.png" name="Jelly Skull" description="Like a jelly bean, but in the shape of skull." type="usable" hp="10" weight="2"/>
 </items>
diff --git a/items/generic/item3010_CandyPumpkin.xml b/items/usable/item3010_CandyPumpkin.xml
index 986e807b..24f72fa0 100644
--- a/items/generic/item3010_CandyPumpkin.xml
+++ b/items/usable/item3010_CandyPumpkin.xml
@@ -6,5 +6,5 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="3010" image="use/food/candypumpkin.png" name="Candy Pumpkin" description="With a squishy interior inside a hard, crunchy shell, this sweet has a warm and delicious pumpkin flavour." type="generic" weight="2"/>
+  <item id="3010" image="use/food/candypumpkin.png" name="Candy Pumpkin" description="With a squishy interior inside a hard, crunchy shell, this sweet has a warm and delicious pumpkin flavour." type="usable" hp="10" weight="2"/>
 </items>