Mobs and Items

31 files changed, 475 insertions, 8 deletions

diff --git a/graphics/items/equipment/head/sunshroomhat.png b/graphics/items/equipment/head/sunshroomhat.png
new file mode 100644
index 00000000..4166ed53
--- /dev/null
+++ b/graphics/items/equipment/head/sunshroomhat.png
diff --git a/graphics/items/generic/glass-shards.png b/graphics/items/generic/glass-shards.png
new file mode 100644
index 00000000..e749aaff
--- /dev/null
+++ b/graphics/items/generic/glass-shards.png
diff --git a/graphics/items/generic/hay.png b/graphics/items/generic/hay.png
new file mode 100644
index 00000000..40d6cf8a
--- /dev/null
+++ b/graphics/items/generic/hay.png
diff --git a/graphics/items/generic/straw.png b/graphics/items/generic/straw.png
new file mode 100644
index 00000000..ec8aed19
--- /dev/null
+++ b/graphics/items/generic/straw.png
diff --git a/graphics/particles/flame_8x8.png b/graphics/particles/flame_8x8.png
new file mode 100644
index 00000000..daaea9af
--- /dev/null
+++ b/graphics/particles/flame_8x8.png
diff --git a/graphics/particles/monster-sunshroom.particle.xml b/graphics/particles/monster-sunshroom.particle.xml
new file mode 100644
index 00000000..50b2a8cf
--- /dev/null
+++ b/graphics/particles/monster-sunshroom.particle.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+Light blue particles which float to the ground.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="0">
+
+    <emitter>
+      <property name="vertical-angle" min="0" max="360"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="position-x" min="-16" max="16"/>
+      <property name="position-y" min="-48" max="8"/>
+      <property name="position-z" min="-16" max="16"/>
+      <property name="acceleration" value="0.01"/>
+      <property name="alpha" value="0.9"/>
+      <property name="gravity" value="0.02"/>
+      <property name="momentum" value="0.9"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ffff00"/>
+      <property name="lifetime" value="60"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="50"/>
+      <property name="bounce" value="0.8"/>
+      <property name="output-pause" value="11"/>
+      <property name="output" min="1" max="2"/>
+      <property name="power" min="0.5" max="1.5"/>
+      <property name="randomness" value="100"/>
+    </emitter>
+
+    <emitter>
+      <property name="vertical-angle" min="0" max="360"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="position-x" min="-8" max="24"/>
+      <property name="position-y" min="-48" max="8"/>
+      <property name="position-z" min="-16" max="16"/>
+      <property name="acceleration" value="0.01"/>
+      <property name="alpha" value="0.9"/>
+      <property name="gravity" value="0.01"/>
+      <property name="momentum" value="0.9"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ffff00"/>
+      <property name="lifetime" value="60"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="50"/>
+      <property name="bounce" value="0.8"/>
+      <property name="output-pause" value="22"/>
+      <property name="output" min="1" max="1"/>
+      <property name="power" min="0.5" max="1.5"/>
+      <property name="randomness" value="100"/>
+
+      <emitter>
+        <property name="vertical-angle" min="-30" max="-150"/>
+        <property name="horizontal-angle" min="0" max="360"/>
+        <property name="acceleration" value="0.01"/>
+        <property name="output-pause" value="44"/>
+        <property name="output" min="0" max="1"/>
+        <property name="lifetime" value="160"/>
+        <property name="fade-in" value="40"/>
+        <property name="fade-out" value="150"/>
+        <property name="alpha" value="0.9"/>
+        <property name="gravity" value="0.09"/>
+        <property name="power" min="0" max="1"/>
+        <property name="bounce" value="0.1"/>
+        <property name="follow-parent" value="1"/>
+        <animation imageset="graphics/particles/flame_8x8.png" width="8" height="8">
+          <sequence start="0" end="4" delay="22"/>
+          <sequence start="3" end="0" delay="22"/>
+        </animation>
+      </emitter>
+    </emitter>
+
+  </particle>
+</effect>
diff --git a/graphics/particles/sunshroom-attack.particle.xml b/graphics/particles/sunshroom-attack.particle.xml
new file mode 100644
index 00000000..e22c8fe6
--- /dev/null
+++ b/graphics/particles/sunshroom-attack.particle.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<!--
+A energy ball like particle effect intended for use of the Moonshroom's attacks.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="22" lifetime="1">
+    <emitter>
+      <property name="vertical-angle" min="0" max="360"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="alpha" value="0.9"/>
+      <property name="gravity" value="0.01"/>
+      <property name="momentum" value="0.9"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ffff00"/>
+      <property name="lifetime" value="220"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="210"/>
+      <property name="bounce" value="0.8"/>
+      <property name="output" min="4" max="6"/>
+      <property name="output-pause" value="0"/>
+      <property name="power" min="0.5" max="1"/>
+      <property name="randomness" value="100"/>
+      <property name="follow-parent" value="0"/>
+    </emitter>
+
+
+    <emitter>
+      <property name="vertical-angle" min="0" max="360"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="alpha" value="0.9"/>
+      <property name="gravity" value="0.01"/>
+      <property name="momentum" value="0.9"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ffff00"/>
+      <property name="lifetime" value="220"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="210"/>
+      <property name="bounce" value="0.8"/>
+      <property name="output" min="1" max="2"/>
+      <property name="output-pause" value="3"/>
+      <property name="power" min="0.5" max="1.5"/>
+      <property name="randomness" value="100"/>
+      <property name="follow-parent" value="0"/>
+      <emitter>
+        <property name="vertical-angle" min="-30" max="-150"/>
+        <property name="horizontal-angle" min="0" max="360"/>
+        <property name="output" min="0" max="1"/>
+        <property name="output-pause" value="12"/>
+        <property name="lifetime" value="220"/>
+        <property name="fade-in" value="80"/>
+        <property name="fade-out" value="210"/>
+        <property name="alpha" value="0.9"/>
+        <property name="gravity" value="0.1"/>
+        <property name="power" min="0" max="1"/>
+        <property name="bounce" value="0.1"/>
+        <property name="follow-parent" value="1"/>
+        <animation imageset="graphics/particles/flame_8x8.png" width="8" height="8">
+          <sequence start="0" end="4" delay="11"/>
+          <sequence start="3" end="0" delay="11"/>
+        </animation>
+      </emitter>
+    </emitter>
+
+    <emitter>
+      <property name="vertical-angle" min="0" max="360"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="alpha" value="0.9"/>
+      <property name="gravity" value="0.01"/>
+      <property name="momentum" value="0.9"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ffff00"/>
+      <property name="lifetime" value="220"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="210"/>
+      <property name="bounce" value="0.8"/>
+      <property name="output" min="4" max="6"/>
+      <property name="output-pause" value="0"/>
+      <property name="power" min="0.5" max="1"/>
+      <property name="randomness" value="100"/>
+      <property name="follow-parent" value="1"/>
+    </emitter>
+
+    <emitter>
+      <property name="vertical-angle" min="0" max="360"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="alpha" value="0.9"/>
+      <property name="gravity" value="0.01"/>
+      <property name="momentum" value="0.9"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ffff00"/>
+      <property name="lifetime" value="180"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="170"/>
+      <property name="bounce" value="0.8"/>
+      <property name="output" min="1" max="2"/>
+      <property name="output-pause" value="2"/>
+      <property name="power" min="0.5" max="1"/>
+      <property name="randomness" value="100"/>
+      <property name="follow-parent" value="1"/>
+
+      <emitter>
+        <property name="vertical-angle" min="-30" max="-150"/>
+        <property name="horizontal-angle" min="0" max="360"/>
+        <property name="output" min="0" max="1"/>
+        <property name="output-pause" value="8"/>
+        <property name="lifetime" value="180"/>
+        <property name="fade-in" value="80"/>
+        <property name="fade-out" value="170"/>
+        <property name="alpha" value="0.9"/>
+        <property name="gravity" value="0.1"/>
+        <property name="power" min="0" max="1"/>
+        <property name="bounce" value="0.1"/>
+        <property name="follow-parent" value="1"/>
+        <animation imageset="graphics/particles/flame_8x8.png" width="8" height="8">
+          <sequence start="0" end="5" delay="11"/>
+          <sequence start="4" end="0" delay="11"/>
+        </animation>
+      </emitter>
+    </emitter>
+
+  </particle>
+</effect>
diff --git a/graphics/sprites/equipment/head/sunshroomhat-female.xml b/graphics/sprites/equipment/head/sunshroomhat-female.xml
new file mode 100644
index 00000000..d984dc22
--- /dev/null
+++ b/graphics/sprites/equipment/head/sunshroomhat-female.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset height="40" name="base" src="graphics/sprites/equipment/head/sunshroomhat.png" width="40"/>
+  <include file="hairstyles/hairstyle01-female.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/head/sunshroomhat.png b/graphics/sprites/equipment/head/sunshroomhat.png
new file mode 100644
index 00000000..90885482
--- /dev/null
+++ b/graphics/sprites/equipment/head/sunshroomhat.png
diff --git a/graphics/sprites/equipment/head/sunshroomhat.xml b/graphics/sprites/equipment/head/sunshroomhat.xml
new file mode 100644
index 00000000..b4e0cba2
--- /dev/null
+++ b/graphics/sprites/equipment/head/sunshroomhat.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/equipment/head/sunshroomhat.png" width="40" height="40"/>
+  <include file="hairstyles/hairstyle01-male.xml"/>
+</sprite>
diff --git a/graphics/sprites/monsters/moonshroom.png b/graphics/sprites/monsters/mushroom-moon.png
index 27b21fdd..27b21fdd 100644
--- a/graphics/sprites/monsters/moonshroom.png
+++ b/graphics/sprites/monsters/mushroom-moon.png
diff --git a/graphics/sprites/monsters/mushroom-moon.xml b/graphics/sprites/monsters/mushroom-moon.xml
new file mode 100644
index 00000000..894e34e3
--- /dev/null
+++ b/graphics/sprites/monsters/mushroom-moon.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/mushroom-moon.png" width="42" height="33"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="7" offsetY="-10"/>
+    </animation>
+    <animation direction="left">
+      <frame index="10" offsetX="5" offsetY="-10"/>
+    </animation>
+    <animation direction="up">
+      <frame index="20" offsetX="7" offsetY="-10"/>
+    </animation>
+    <animation direction="right">
+      <frame index="30" offsetX="7" offsetY="-10"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="1" end="4" delay="125" offsetX="7" offsetY="-10"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="11" end="14" delay="125" offsetX="5" offsetY="-10"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="21" end="24" delay="125" offsetX="7" offsetY="-10"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="31" end="34" delay="250" offsetX="7" offsetY="-10"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="down">
+      <frame index="9" offsetX="7" offsetY="-10"/>
+    </animation>
+    <animation direction="left">
+      <frame index="19" offsetX="5" offsetY="-10"/>
+    </animation>
+    <animation direction="up">
+      <frame index="29" offsetX="7" offsetY="-10"/>
+    </animation>
+    <animation direction="right">
+      <frame index="39" offsetX="7" offsetY="-10"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <sequence start="5" end="8" delay="150" offsetX="7" offsetY="-10"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="15" end="18" delay="150" offsetX="5" offsetY="-10"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="25" end="28" delay="150" offsetX="7" offsetY="-10"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="35" end="38" delay="150" offsetX="7" offsetY="-10"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/monsters/mushroom-sun.png b/graphics/sprites/monsters/mushroom-sun.png
new file mode 100644
index 00000000..b4c23785
--- /dev/null
+++ b/graphics/sprites/monsters/mushroom-sun.png
diff --git a/graphics/sprites/monsters/moonshroom.xml b/graphics/sprites/monsters/mushroom-sun.xml
index be815e17..ca7c0614 100644
--- a/graphics/sprites/monsters/moonshroom.xml
+++ b/graphics/sprites/monsters/mushroom-sun.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/moonshroom.png" width="42" height="33"/>
+  <imageset name="base" src="graphics/sprites/monsters/mushroom-sun.png" width="42" height="33"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="7" offsetY="-10"/>
diff --git a/graphics/sprites/monsters/skull-golden.png b/graphics/sprites/monsters/skull-golden.png
new file mode 100644
index 00000000..53a71314
--- /dev/null
+++ b/graphics/sprites/monsters/skull-golden.png
diff --git a/graphics/sprites/monsters/skull-golden.xml b/graphics/sprites/monsters/skull-golden.xml
new file mode 100644
index 00000000..b3976a01
--- /dev/null
+++ b/graphics/sprites/monsters/skull-golden.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/skull-golden.png" width="45" height="60"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" delay="350"/>
+      <frame index="1" delay="350"/>
+    </animation>
+    <animation direction="left">
+      <frame index="12" delay="350"/>
+      <frame index="13" delay="350"/>
+    </animation>
+    <animation direction="up">
+      <frame index="24" delay="350"/>
+      <frame index="25" delay="350"/>
+    </animation>
+    <animation direction="right">
+      <frame index="36" delay="350"/>
+      <frame index="37" delay="350"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="0" end="4" delay="150"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="12" end="16" delay="150"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="24" end="28" delay="150"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="36" end="40" delay="150"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="right">
+      <sequence start="44" end="46" delay="150"/>
+      <frame index="47" delay="0"/>
+    </animation>
+    <animation direction="down">
+      <sequence start="8" end="10" delay="150"/>
+      <frame index="11" delay="0"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="20" end="22" delay="150"/>
+      <frame index="23" delay="0"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="32" end="34" delay="150"/>
+      <frame index="35" delay="0"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <sequence start="5" end="7" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="17" end="19" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="29" end="31" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="41" end="43" delay="100"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/monsters/skull-warlord.png b/graphics/sprites/monsters/skull-warlord.png
new file mode 100644
index 00000000..c5f7c739
--- /dev/null
+++ b/graphics/sprites/monsters/skull-warlord.png
diff --git a/graphics/sprites/monsters/skull-warlord.xml b/graphics/sprites/monsters/skull-warlord.xml
new file mode 100644
index 00000000..381d6211
--- /dev/null
+++ b/graphics/sprites/monsters/skull-warlord.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/monsters/skull-warlord.png" width="50" height="64" />
+
+ <action name="stand" imageset="base">
+  <animation direction="down">
+   <sequence start="0" end="3" delay="100" />
+  </animation>
+  <animation direction="left">
+   <sequence start="10" end="13" delay="100" />
+  </animation>
+  <animation direction="up">
+   <sequence start="20" end="23" delay="100" />
+  </animation>
+  <animation direction="right">
+   <sequence start="30" end="33" delay="100" />
+  </animation>
+ </action>
+
+ <action name="dead" imageset="base">
+  <animation direction="down">
+    <frame index="9" />
+  </animation>
+  <animation direction="left">
+    <frame index="19" />
+  </animation>
+  <animation direction="up">
+    <frame index="29" />
+  </animation>
+  <animation direction="right">
+    <frame index="39" />
+  </animation>
+ </action>
+
+ <action name="attack" imageset="base">
+  <animation direction="down">
+   <sequence start="4" end="8" delay="75" />
+     <end />
+  </animation>
+  <animation direction="left">
+   <sequence start="14" end="18" delay="75" />
+     <end />
+  </animation>
+  <animation direction="up">
+   <sequence start="24" end="28" delay="75" />
+     <end />
+  </animation>
+  <animation direction="right">
+   <sequence start="34" end="38" delay="75" />
+     <end />
+  </animation>
+ </action>
+
+</sprite>
+
+
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index d8077c1e..b211f996 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -229,4 +229,5 @@
   <include name="items/equip-head/item5324_BlackWarlordHelmet.xml"/>
   <include name="items/equip-head/item5325_BlackInfantryHelmet.xml"/>
   <include name="items/equip-head/item5326_BlackCrusadeHelmet.xml"/>
+  <include name="items/equip-head/item5392_SunshroomHat.xml"/>
 </items>
diff --git a/items/equip-head/item5392_SunshroomHat.xml b/items/equip-head/item5392_SunshroomHat.xml
new file mode 100644
index 00000000..cc4c9a6c
--- /dev/null
+++ b/items/equip-head/item5392_SunshroomHat.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5392" image="equipment/head/sunshroomhat.png" name="Sunshroom Hat" description="Your head is always warm with this hat and you have light at night." type="equip-head" defense="15" mattack="5" weight="30" sellProtected="true">
+    <sprite gender="unisex">equipment/head/sunshroomhat.xml</sprite>
+    <sprite gender="female">equipment/head/sunshroomhat-female.xml</sprite>
+    <replace sprite="hair">
+      <item from="-6" to="-1"/>
+    </replace>
+  </item>
+</items>
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index f670aec9..8f6ae723 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -223,7 +223,7 @@
   <include name="items/generic/item5113_Ectoplasm.xml"/>
   <include name="items/generic/item5114_Urn.xml"/>
   <include name="items/generic/item5115_VampireBatWing.xml"/>
-  <include name="items/generic/item5116_WraithHorn.xml"/>
+  <include name="items/generic/item5116_StalkerHorn.xml"/>
   <include name="items/generic/item5117_AstralCube.xml"/>
   <include name="items/generic/item5118_RunestoneA.xml"/>
   <include name="items/generic/item5119_RunestoneL.xml"/>
@@ -294,4 +294,10 @@
   <include name="items/generic/item5381_Brick.xml"/>
   <include name="items/generic/item5384_MountainCrystal.xml"/>
   <include name="items/generic/item5385_BlackQuartz.xml"/>
+  <include name="items/generic/item5386_GlassShards.xml"/>
+  <include name="items/generic/item5387_Hay.xml"/>
+  <include name="items/generic/item5388_Straw.xml"/>
+  <include name="items/generic/item5389_SpeltSeeds.xml"/>
+  <include name="items/generic/item5390_MoonDust.xml"/>
+  <include name="items/generic/item5391_SunDust.xml"/>
 </items>
diff --git a/items/generic/item5116_StalkerHorn.xml b/items/generic/item5116_StalkerHorn.xml
new file mode 100644
index 00000000..a3abec3c
--- /dev/null
+++ b/items/generic/item5116_StalkerHorn.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5116" image="generic/wraithhorn.png" name="Stalker Horn" description="The horn from stalker." type="generic" weight="10"/>
+</items>
diff --git a/items/generic/item5116_WraithHorn.xml b/items/generic/item5116_WraithHorn.xml
deleted file mode 100644
index ed65df51..00000000
--- a/items/generic/item5116_WraithHorn.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="5116" image="generic/wraithhorn.png" name="Wraith Horn" description="The horn from stalker." type="generic" weight="10"/>
-</items>
diff --git a/items/generic/item5386_GlassShards.xml b/items/generic/item5386_GlassShards.xml
new file mode 100644
index 00000000..64bfd655
--- /dev/null
+++ b/items/generic/item5386_GlassShards.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5386" image="generic/glass-shards.png" name="GlassShards" description="A pile of glass shards." type="generic" weight="5"/>
+</items>
diff --git a/items/generic/item5387_Hay.xml b/items/generic/item5387_Hay.xml
new file mode 100644
index 00000000..41497f7a
--- /dev/null
+++ b/items/generic/item5387_Hay.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5387" image="generic/hay.png" name="Hay" description="A pile of hay." type="generic" weight="11"/>
+</items>
diff --git a/items/generic/item5388_Straw.xml b/items/generic/item5388_Straw.xml
new file mode 100644
index 00000000..15c6f8be
--- /dev/null
+++ b/items/generic/item5388_Straw.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5388" image="generic/straw.png" name="Straw" description="A pile of straw." type="generic" weight="11"/>
+</items>
diff --git a/items/generic/item5389_SpeltSeeds.xml b/items/generic/item5389_SpeltSeeds.xml
new file mode 100644
index 00000000..d05f47ad
--- /dev/null
+++ b/items/generic/item5389_SpeltSeeds.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5389" image="generic/grassseeds.png" name="Spelt Seeds" description="Some spelt seeds." type="generic" weight="8"/>
+</items>
diff --git a/items/generic/item5390_MoonDust.xml b/items/generic/item5390_MoonDust.xml
new file mode 100644
index 00000000..4464262c
--- /dev/null
+++ b/items/generic/item5390_MoonDust.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5390" image="generic/powder.png|W:#7b7a76,9d9c98,abaaa8,babdc4,c0c7da,f4f8ff" name="Moon Dust" description="You getting sleepy on smelling this stuff." type="generic" weight="1"/>
+</items>
diff --git a/items/generic/item5391_SunDust.xml b/items/generic/item5391_SunDust.xml
new file mode 100644
index 00000000..dab7cd40
--- /dev/null
+++ b/items/generic/item5391_SunDust.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5391" image="generic/powder.png|W:#d84900,fca901,ffb400,ffff00" name="Sun Dust" description="This stuff is hot." type="generic" weight="1"/>
+</items>
diff --git a/license.md b/license.md
index a26b76c5..cda001df 100644
--- a/license.md
+++ b/license.md
@@ -267,6 +267,7 @@ File | Artists | Licenses
 `graphics/items/equipment/head/minershat.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/items/equipment/head/monocle.png` | Skipy | GPLv2
 `graphics/items/equipment/head/monster-skull-helm.png` | Black Don | GPLv2
+`graphics/items/equipment/head/moonshroomhat.png` | Cassy | CC BY-SA 3.0
 `graphics/items/equipment/head/opera-mask.png` | Meway | GPLv2, CC BY-SA 3.0
 `graphics/items/equipment/head/overlord-helm.png` | Black Don | GPLv2
 `graphics/items/equipment/head/paladin-helm.png` | Black Don | GPLv2
@@ -288,6 +289,7 @@ File | Artists | Licenses
 `graphics/items/equipment/head/skullmask.png` | Beelzebub, FotherJ | GPLv2
 `graphics/items/equipment/head/snowgoggles.png` | VXD | GPLv2, CC BY-SA 3.0
 `graphics/items/equipment/head/sunglasses.png` | UntamedMonkey | GPLv2, CC BY-SA 3.0
+`graphics/items/equipment/head/sunshroomhat.png` | Cassy, HoraK-FDF | CC BY-SA 3.0
 `graphics/items/equipment/head/terranitehelm.png` | Kr0n05931 | GPLv2
 `graphics/items/equipment/head/thin-crown.png` | Black Don, V0id | GPLv2
 `graphics/items/equipment/head/tophat.png` | QOAL | GPLv2
@@ -441,11 +443,13 @@ File | Artists | Licenses
 `graphics/items/generic/gempowder.png` | Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/gemstone-a.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/gemstone-b.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
+`graphics/items/generic/glass-shards.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/generic/golden-tooth.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/generic/grassliner.png` | Salmondine, Enchilado | GPLv2
 `graphics/items/generic/grassseeds.png` | Coolkid782, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/grub-slime.png` | Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/hardspike.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
+`graphics/items/generic/hay.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/generic/heart-diseased.png` | FotherJ, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/herb.png` | Irukard | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/herb-mauve.png` | Enchilado | GPLv2, CC BY-SA 3.0
@@ -518,6 +522,7 @@ File | Artists | Licenses
 `graphics/items/generic/stinger.png` | Wombat, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/stone-a.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/generic/strange-coin.png` | :grey_question:, Enchilado | GPLv2
+`graphics/items/generic/straw.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/generic/terraniteore.png` | Kr0n05931, Enchilado | GPLv2
 `graphics/items/generic/tongue.png` | Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/toothbrush.png` | Chay | GPLv2, CC BY-SA 3.0
@@ -667,6 +672,7 @@ File | Artists | Licenses
 `graphics/particles/bubble_32px.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/casket-trap_96x96.png` | Skipy | GPLv2
 `graphics/particles/dart.png` | Ledmitz | GPLv2, CC BY-SA 3.0
+`graphics/particles/flame-8x8.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/particles/fog-medium-a.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/fog-medium-b.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/fog-medium-c.png` | Crush | GPLv2, CC BY-SA 3.0
@@ -915,6 +921,7 @@ File | Artists | Licenses
 `graphics/sprites/equipment/head/minershat.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/sprites/equipment/head/monocle.png` | Skipy | GPLv2
 `graphics/sprites/equipment/head/monster-skull-helm.png` | Black Don | GPLv2
+`graphics/sprites/equipment/head/moonshroomhat.png` | Saulc, Cassy | CC BY-SA 3.0
 `graphics/sprites/equipment/head/mushroom.png` | crevost2, Yuuki | GPLv2
 `graphics/sprites/equipment/head/nutcrackerhat.png` | Chayenne, :grey_question:, Alige, Lizandra, Salmondine | GPLv2
 `graphics/sprites/equipment/head/operamask.png` | Meway | GPLv2, CC BY-SA 3.0
@@ -940,6 +947,7 @@ File | Artists | Licenses
 `graphics/sprites/equipment/head/smileycap.png` | +seeds | GPLv2, CC BY-SA 3.0
 `graphics/sprites/equipment/head/snowgoggles.png` | VXD | GPLv2, CC BY-SA 3.0
 `graphics/sprites/equipment/head/sunglasses.png` | UntamedMonkey | GPLv2, CC BY-SA 3.0
+`graphics/sprites/equipment/head/sunshroomhat.png` | Saulc, Cassy, HoraK-FDF | CC BY-SA 3.0
 `graphics/sprites/equipment/head/terranitehelm.png` | Kr0n05931 | GPLv2
 `graphics/sprites/equipment/head/thin-crown.png` | Black Don, V0id | GPLv2
 `graphics/sprites/equipment/head/tophat.png` | QOAL | GPLv2
@@ -1056,11 +1064,12 @@ File | Artists | Licenses
 `graphics/sprites/monsters/mouboo-demonic.png` | Cassy, Yuuki | GPLv2
 `graphics/sprites/monsters/moubootaur.png` | Hocus | MIT
 `graphics/sprites/monsters/montblanc.png` | KokoroReflections (piratehat.png | Fettsack | GPLv2) (cannon | AntumDeluge | CC BY 3.0, OGA BY 3.0) | CC BY 4.0
+`graphics/sprites/monsters/mushroom-moon.png` | Cassy, Yuuki | GPLv2
 `graphics/sprites/monsters/mushroom-red.png` | Yuuki | GPLv2
 `graphics/sprites/monsters/mushroom-spiky.png` | Yuuki | GPLv2
+`graphics/sprites/monsters/mushroom-sun.png` | Cassy, Yuuki, HoraK-FDF | GPLv2
 `graphics/sprites/monsters/mushroom-void.png` | Cassy, Yuuki, Jesusalva | GPLv2
 `graphics/sprites/monsters/mushroom-wicked.png` | Cassy, Yuuki | GPLv2
-`graphics/sprites/monsters/mushroom-moon.png` | Cassy, Yuuki | GPLv2
 `graphics/sprites/monsters/nutcracker.png` | Chayenne, :grey_question:, Alige, Lizandra, Salmondine | GPLv2
 `graphics/sprites/monsters/penguin.png` | Fother | GPLv2
 `graphics/sprites/monsters/pinkie.png` | Crush | GPLv2, CC BY-SA 3.0
diff --git a/monsters.xml b/monsters.xml
index 39696caa..239046e3 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1148,7 +1148,7 @@
     </monster>
 
     <monster id="1130" name="Moonshroom">
-        <sprite>monsters/moonshroom.xml</sprite>
+        <sprite>monsters/mushroom-moon.xml</sprite>
         <particlefx>graphics/particles/monster-moonshroom.particle.xml</particlefx>
         <attack id="1" missile-particle="graphics/particles/moonshroom-attack.particle.xml" action="attack"/>
         <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
@@ -1987,6 +1987,31 @@
         <sound event="miss">monsters/golem/miss1.ogg</sound>
     </monster>
 
+    <monster id="1227" name="Grass">
+        <sprite>monsters/grass.xml</sprite>
+    </monster>
+
+    <monster id="1228" name="Spelt">
+        <sprite>monsters/spelt.xml</sprite>
+    </monster>
+
+    <monster id="1229" name="Warlord Skull">
+        <sprite>monsters/skull-warlord.xml</sprite>
+    </monster>
+
+    <monster id="1230" name="Golden Skull">
+        <sprite>monsters/skull-golden.xml</sprite>
+    </monster>
+
+    <monster id="1231" name="Sunshroom">
+        <sprite>monsters/mushroom-sun.xml</sprite>
+        <particlefx>graphics/particles/monster-sunshroom.particle.xml</particlefx>
+        <attack id="1" missile-particle="graphics/particles/sunshroom-attack.particle.xml" action="attack"/>
+        <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
+        <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound>
+        <sound event="die">monsters/shroom/shroom-die1.ogg</sound>
+    </monster>
+
     <!-- Mods should use the following code -->
     <include name="mods/monsters.xml" />
 </monsters>