Merge branch 'horak_items' into 'master'

Added HoraK's items from an MR with a conflict

See merge request legacy/clientdata!543

5 files changed, 23 insertions, 3 deletions

diff --git a/graphics/items/generic/crystalized-dragon-blood.png b/graphics/items/generic/crystalized-dragon-blood.png
new file mode 100644
index 00000000..355dbf22
--- /dev/null
+++ b/graphics/items/generic/crystalized-dragon-blood.png
diff --git a/graphics/items/generic/golden-tooth.png b/graphics/items/generic/golden-tooth.png
new file mode 100644
index 00000000..e02d3ba9
--- /dev/null
+++ b/graphics/items/generic/golden-tooth.png
diff --git a/graphics/items/generic/pink-flower-seed.png b/graphics/items/generic/pink-flower-seed.png
new file mode 100644
index 00000000..6f2c0d44
--- /dev/null
+++ b/graphics/items/generic/pink-flower-seed.png
diff --git a/items.xml b/items.xml
index bd5ad6be..dde607c4 100644
--- a/items.xml
+++ b/items.xml
@@ -218,14 +218,31 @@
         description="Can be sold for a considerable amount of money."
         type="generic"
         weight="40" />
-
+  <item id="5293"
+        image="generic/crystalized-dragon-blood.png"
+        name="Crystallized Dragon Blood"
+        description="The blood of a slain dragon that seeped down to the earth's core and was formed into a crystal by the enormous pressure. It is still surrounded by an aura of incredible power that is almost as strong as it was during the dragon's lifetime."
+        type="generic"
+        weight="1111"/>
   <item id="5294"
         image="use/food/rum.png"
         name="Rum"
         description="Hohoho and a bottle of rum!"
         effect="Hangover"
         type="usable"
-        weight="2"
-  />
+        weight="2"/>
+  <item id="5295"
+        image="generic/pink-flower-seed.png"
+        name="Pink Flower Seed"
+        description="You could swear that this seed is watching you."
+        type="generic"
+        weight="10"/>
+  <item id="5297"
+        image="generic/golden-tooth.png"
+        name="Golden Tooth"
+        description="Somebody was very rich during his lifetime."
+        type="generic"
+        sellProtected="true"
+        weight="40"/>
 
 </items>
diff --git a/license.md b/license.md
index c25cf7e3..7099ef99 100644
--- a/license.md
+++ b/license.md
@@ -398,6 +398,7 @@ File | Artists | Licenses
 `graphics/items/generic/coal.png` | Enchilado, Meway, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/coinbag.png` | :grey_question:, Enchilado | GPLv2
 `graphics/items/generic/crystal.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
+`graphics/items/generic/crystalized-dragon-blood.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/generic/dark-easter-egg.png` | :grey_question:, Enchilado | GPLv2
 `graphics/items/generic/dark-petal.png` | Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/doll.png` | Lizandra, Enchilado | GPLv2, CC BY-SA 3.0
@@ -414,6 +415,7 @@ 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/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
@@ -441,6 +443,7 @@ File | Artists | Licenses
 `graphics/items/generic/patch-leather.png` | :grey_question:, Enchilado | GPLv2
 `graphics/items/generic/pearl.png` | Fate, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/petal.png` | :grey_question:, Enchilado | GPLv2
+`graphics/items/generic/pink-flower-seed.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/generic/pinkantennae.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/plushmouboo.png` | Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/powder.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0