Merge branch 'crozenite_gold_bromenal_stuff' into 'master'

crozenite gold bromenal stuff

See merge request legacy/clientdata!577

13 files changed, 88 insertions, 15 deletions

diff --git a/graphics/items/generic/bromenal-droplet.png b/graphics/items/generic/bromenal-droplet.png
new file mode 100644
index 00000000..74955530
--- /dev/null
+++ b/graphics/items/generic/bromenal-droplet.png
diff --git a/graphics/items/generic/crystal-crozenite.png b/graphics/items/generic/crystal-crozenite.png
new file mode 100644
index 00000000..bfde775a
--- /dev/null
+++ b/graphics/items/generic/crystal-crozenite.png
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index 8e28c004..2fdf55fc 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -259,4 +259,10 @@
   <include name="items/generic/item5297_GoldenTooth.xml"/>
   <include name="items/generic/item5298_CloverDrawing.xml"/>
   <include name="items/generic/item5311_ShadowHerb.xml"/>
+  <include name="items/generic/item5313_CrozeniteCrystal.xml"/>
+  <include name="items/generic/item5314_GoldOre.xml"/>
+  <include name="items/generic/item5315_GoldIngot.xml"/>
+  <include name="items/generic/item5316_BromenalOre.xml"/>
+  <include name="items/generic/item5317_BromenalIngot.xml"/>
+  <include name="items/generic/item5318_BromenalDroplet.xml"/>
 </items>
diff --git a/items/generic/item5288_Naphthalene.xml b/items/generic/item5288_Naphthalene.xml
index ae4e3f89..00c0c880 100644
--- a/items/generic/item5288_Naphthalene.xml
+++ b/items/generic/item5288_Naphthalene.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <items>
-    <item id="5288"
-	image="generic/naftalin.png"
-	name="Naphthalene"
-	description="Used to produce powerful dyes and medicine, and usually produced from burning a special kind of Coal."
-	type="generic"
-	weight="1"
-    />
+  <item id="5288"
+    image="generic/naftalin.png"
+    name="Naphthalene"
+    description="Used to produce powerful dyes and medicine, and usually produced from burning a special kind of Coal."
+    type="generic"
+    weight="1"
+  />
 </items>
diff --git a/items/generic/item5292_SilverOre.xml b/items/generic/item5292_SilverOre.xml
index 34dc56ec..483cbc82 100644
--- a/items/generic/item5292_SilverOre.xml
+++ b/items/generic/item5292_SilverOre.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <items>
-    <item id="5292"
-	image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"
-	name="Silver Ore"
-	description="Can be sold for a considerable amount of money."
-	type="generic"
-	weight="40"
-    />
+  <item id="5292"
+    image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"
+    name="Silver Ore"
+    description="Can be sold for a considerable amount of money."
+    type="generic"
+    weight="40"
+  />
 </items>
diff --git a/items/generic/item5297_GoldenTooth.xml b/items/generic/item5297_GoldenTooth.xml
index 9c2bf0a7..cc9c441d 100644
--- a/items/generic/item5297_GoldenTooth.xml
+++ b/items/generic/item5297_GoldenTooth.xml
@@ -6,6 +6,6 @@
     description="Someone was very rich during their lifetime."
     type="generic"
     sellProtected="true"
-    weight="40"
+    weight="20"
   />
 </items>
diff --git a/items/generic/item5313_CrozeniteCrystal.xml b/items/generic/item5313_CrozeniteCrystal.xml
new file mode 100644
index 00000000..cce5c85d
--- /dev/null
+++ b/items/generic/item5313_CrozeniteCrystal.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5313"
+    image="generic/crystal-crozenite.png"
+    name="Crozenite Crystal"
+    description="A rare crystal with unique properties."
+    type="generic"
+    weight="555"
+  />
+</items>
diff --git a/items/generic/item5314_GoldOre.xml b/items/generic/item5314_GoldOre.xml
new file mode 100644
index 00000000..bb6ece6b
--- /dev/null
+++ b/items/generic/item5314_GoldOre.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5314"
+    image="generic/ore.png|W:#1b120c,2e1f15,3d291c,60402b,65442e,8c5e3f,af7650,c6a48d,e7ddd6;R:#7a5f00,ac8600,e6b300,ffcc1d"
+    name="Gold Ore"
+    description="Can be sold for a considerable amount of money."
+    type="generic"
+    weight="40"
+  />
+</items>
diff --git a/items/generic/item5315_GoldIngot.xml b/items/generic/item5315_GoldIngot.xml
new file mode 100644
index 00000000..f4bf128e
--- /dev/null
+++ b/items/generic/item5315_GoldIngot.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5315"
+    image="generic/ingot.png|W:#888844,CCCC66,FFFF88"
+    name="Gold Ingot"
+    description="Used to craft gold objects."
+    type="generic"
+    sellProtected="true"
+    weight="1000"
+  />
+</items>
+
diff --git a/items/generic/item5316_BromenalOre.xml b/items/generic/item5316_BromenalOre.xml
new file mode 100644
index 00000000..743ccfff
--- /dev/null
+++ b/items/generic/item5316_BromenalOre.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5316"
+    image="generic/ore.png|W:#3f2e26,644435,7c513c,ffffff"
+    name="Bromenal Ore"
+    description="Can be sold for a considerable amount of money."
+    type="generic"
+    weight="40"
+  />
+</items>
diff --git a/items/generic/item5317_BromenalIngot.xml b/items/generic/item5317_BromenalIngot.xml
new file mode 100644
index 00000000..fbc5044f
--- /dev/null
+++ b/items/generic/item5317_BromenalIngot.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5317"
+    image="generic/ingot.png|W:#3f2e26,644435,7c513c,ffffff"
+    name="Bromenal Ingot"
+    description="Used to craft bromenal objects."
+    type="generic"
+    sellProtected="true"
+    weight="1000"
+  />
+</items>
+
diff --git a/items/generic/item5318_BromenalDroplet.xml b/items/generic/item5318_BromenalDroplet.xml
new file mode 100644
index 00000000..3c1ac35a
--- /dev/null
+++ b/items/generic/item5318_BromenalDroplet.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5318"
+    image="generic/bromenal-droplet.png"
+    name="Bromenal Droplet"
+    description="A pure bromenal droplet melted out of the ore by the extreme heat in the earth's mantle."
+    type="generic"
+    sellProtected="true"
+    weight="20"
+  />
+</items>
diff --git a/license.md b/license.md
index f9cb040d..177899bd 100644
--- a/license.md
+++ b/license.md
@@ -386,6 +386,7 @@ File | Artists | Licenses
 `graphics/items/generic/bottle-sand.png` | FotherJ, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/broken-fourleaf-amulet.png` | Alige, Fate, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/generic/brokendoll.png` | Enchilado | GPLv2, CC BY-SA 3.0
+`graphics/items/generic/bromenal-droplet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/generic/bugleg.png` | :grey_question:, Enchilado | GPLv2
 `graphics/items/generic/casinocoins.png` | :grey_question:, Enchilado | GPLv2
 `graphics/items/generic/cavesnakelamp.png` | :grey_question:, Enchilado | GPLv2
@@ -398,6 +399,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/crystal-crozenite.png` | HoraK-FDF | GPLv2, CC BY-SA 4.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