add silly items

15 files changed, 101 insertions, 2 deletions

diff --git a/graphics/items/generic/moss.png b/graphics/items/generic/moss.png
new file mode 100644
index 00000000..0a23ee39
--- /dev/null
+++ b/graphics/items/generic/moss.png
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index c28ab4e8..289b0d58 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -241,4 +241,9 @@
   <include name="items/generic/item5125_UnderworldKey.xml"/>
   <include name="items/generic/item5126_EmptyJar.xml"/>
   <include name="items/generic/item5127_JarofOwnBlood.xml"/>
+  <include name="items/generic/item5211_ActivatedSulphur.xml"/>
+  <include name="items/generic/item5212_FairTradeSoil.xml"/>
+  <include name="items/generic/item5215_FreeRangeMoss.xml"/>
+  <include name="items/generic/item5216_JadeEgg.xml"/>
+  <include name="items/generic/item5217_RawAir.xml"/>
 </items>
diff --git a/items/generic/item5211_ActivatedSulphur.xml b/items/generic/item5211_ActivatedSulphur.xml
new file mode 100644
index 00000000..2005e499
--- /dev/null
+++ b/items/generic/item5211_ActivatedSulphur.xml
@@ -0,0 +1,10 @@
+<?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="5211" image="generic/powder.png|W:#ffcc00" name="Activated Sulphur" description="Even better than activated charcoal!" type="generic" weight="10"/>
+</items>
diff --git a/items/generic/item5212_FairTradeSoil.xml b/items/generic/item5212_FairTradeSoil.xml
new file mode 100644
index 00000000..ecb2b369
--- /dev/null
+++ b/items/generic/item5212_FairTradeSoil.xml
@@ -0,0 +1,10 @@
+<?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="5212" image="generic/terraniteore.png|S:#806b4c,483535,b89c75,6a4d4d,534632,2e2121,352d20,1e1515" name="Fair Trade Soil" description="A pricier version of regular soil." type="generic" weight="40"/>
+</items>
diff --git a/items/generic/item5215_FreeRangeMoss.xml b/items/generic/item5215_FreeRangeMoss.xml
new file mode 100644
index 00000000..dc0ca855
--- /dev/null
+++ b/items/generic/item5215_FreeRangeMoss.xml
@@ -0,0 +1,10 @@
+<?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="5215" image="generic/moss.png" name="Free Range Moss" description="Roams freely outdoors." type="generic" weight="5"/>
+</items>
diff --git a/items/generic/item5216_JadeEgg.xml b/items/generic/item5216_JadeEgg.xml
new file mode 100644
index 00000000..bc0c7fb2
--- /dev/null
+++ b/items/generic/item5216_JadeEgg.xml
@@ -0,0 +1,10 @@
+<?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="5216" image="use/food/snake-egg.png|W:#8463a0;R:#8463a0;G:#8463a0" name="Jade Egg" description="For your yoni." type="generic" weight="2"/>
+</items>
diff --git a/items/generic/item5217_RawAir.xml b/items/generic/item5217_RawAir.xml
new file mode 100644
index 00000000..c3885092
--- /dev/null
+++ b/items/generic/item5217_RawAir.xml
@@ -0,0 +1,10 @@
+<?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="5217" image="generic/bottle-empty.png|S:#5b2400,30094e,a36c21,7c19c8,c79045,9f41e6,7f4800,56118a,ebb469,bf80ef" name="Raw Air" description="Raw air is free from any toxins, similar to what our brave cave ancestors breathed before it was ruined by pesky carbon dioxide. Now you can experience it too!" type="generic" weight="1"/>
+</items>
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index b35630ed..e46fa549 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -97,4 +97,7 @@
   <include name="items/usable/item3010_CandyPumpkin.xml"/>
   <include name="items/usable/item4035_PickledBeets.xml"/>
   <include name="items/usable/item4036_RoastedAcorn.xml"/>
+  <include name="items/usable/item5210_GrassFedTofu.xml"/>
+  <include name="items/usable/item5213_VeganWater.xml"/>
+  <include name="items/usable/item5214_LactoseFreeAcorn.xml"/>
 </items>
diff --git a/items/usable/item1258_Honey.xml b/items/usable/item1258_Honey.xml
index 8409549e..d7d51c38 100644
--- a/items/usable/item1258_Honey.xml
+++ b/items/usable/item1258_Honey.xml
@@ -6,5 +6,5 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="1258" image="use/food/honey.png" name="Honey" description="A sweet food made by certain insects using nectar from flowers." type="usable" hp="45" weight="20"/>
+  <item id="1258" image="use/food/honey.png" name="Gluten-Free Honey" description="A sweet food made by certain insects using nectar from flowers." type="usable" hp="45" weight="20"/>
 </items>
diff --git a/items/usable/item5210_GrassFedTofu.xml b/items/usable/item5210_GrassFedTofu.xml
new file mode 100644
index 00000000..87b353f8
--- /dev/null
+++ b/items/usable/item5210_GrassFedTofu.xml
@@ -0,0 +1,10 @@
+<?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="5210" image="use/food/tonoridelight.png|S:#6b1f1f,777777,ffb7b7,e5e5e5,ff5b5b,c3c3c3,ff8989,d4d4d4,bf4b4b,a6a6a6,9f2525,8d8d8d" name="Grass-Fed Tofu" description="Chock-full of omega-6 fatty acids." type="usable" hp="-10" mp="-2" weight="2"/>
+</items>
diff --git a/items/usable/item5213_VeganWater.xml b/items/usable/item5213_VeganWater.xml
new file mode 100644
index 00000000..3c7bf624
--- /dev/null
+++ b/items/usable/item5213_VeganWater.xml
@@ -0,0 +1,10 @@
+<?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="5213" image="use/food/water.png" name="Vegan Water" description="A bottle of cruelty-free water." type="usable" hp="250" weight="10"/>
+</items>
diff --git a/items/usable/item5214_LactoseFreeAcorn.xml b/items/usable/item5214_LactoseFreeAcorn.xml
new file mode 100644
index 00000000..7c5cdcce
--- /dev/null
+++ b/items/usable/item5214_LactoseFreeAcorn.xml
@@ -0,0 +1,10 @@
+<?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="5214" image="use/food/acornroasted.png" name="Lactose-Free Acorn" description="" type="usable" hp="15" weight="1"/>
+</items>
diff --git a/npcs/README.md b/npcs/README.md
index d7dce1f6..0474b8ea 100644
--- a/npcs/README.md
+++ b/npcs/README.md
@@ -17,7 +17,7 @@ See here for documentation: http://manaplus.org/npcs.xml
 ###Free slots
 **Please edit when you take a slot**
 ```
-        188   194   200   203   219   220
+              194   200   203   219   220
   221   222   223   224   225   226   227
   228   229   230   231   232   233   234
   235   236   237   238   239   240   241
diff --git a/npcs/_include.xml b/npcs/_include.xml
index 15d80149..1a153f9d 100644
--- a/npcs/_include.xml
+++ b/npcs/_include.xml
@@ -87,6 +87,7 @@
   <include name="npcs/npc185.xml"/>
   <include name="npcs/npc186.xml"/>
   <include name="npcs/npc187.xml"/>
+  <include name="npcs/npc188.xml"/>
   <include name="npcs/npc189.xml"/>
   <include name="npcs/npc190.xml"/>
   <include name="npcs/npc191.xml"/>
diff --git a/npcs/npc188.xml b/npcs/npc188.xml
new file mode 100644
index 00000000..34a53401
--- /dev/null
+++ b/npcs/npc188.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<npcs>
+  <npc id="188">
+    <sprite>model/female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#3a3a3a,d5d5d5</sprite>
+    <sprite>hairstyles/hairstyle19-female.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#dbd41e</sprite>
+    <sprite>equipment/head/rosehat-female.xml|#dddddd,ffffff</sprite>
+    <sprite>equipment/chest/shorttanktop-female.xml|#255511,579932,4aaf36,4ed65e</sprite>
+    <sprite>equipment/legs/silkpants-female.xml|#87876c,bbc39c,edf4e1,ffffff</sprite>
+  </npc>
+</npcs>