Merge branch 'Ores' into 'master'

Ores

See merge request TMW2/clientdata!33

3 files changed, 23 insertions, 8 deletions

diff --git a/graphics/items/generic/ore.png b/graphics/items/generic/ore.png
index 30ea18e3..46a552b1 100644
--- a/graphics/items/generic/ore.png
+++ b/graphics/items/generic/ore.png
diff --git a/itemcolors.xml b/itemcolors.xml
index f8a851a2..a6e25da7 100644
--- a/itemcolors.xml
+++ b/itemcolors.xml
@@ -124,4 +124,19 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
         <color id="8" name="Ghost" value="#3c3c3c,35313d,4d4d4d,443f4f,686868,485c6b,919191,50918f,b6b6b6,75c7a8,dfdfdf,c3e8c4"/>
         <color id="9" name="Undead" value="#640088,b350e0,ecb7ff"/>
     </list>
+
+    <!-- Colors for Ores -->
+    <list name="ores">
+        <color id="1" name="Rock_brown" value="#1b120c,2e1f15,3d291c,60402b,65442e,8c5e3f,af7650,c6a48d,e7ddd6"/>
+        <color id="2" name="Rock_grey" value="#000000,121212,1d1d1d,383838,5c5c5c,787878,acacac,e9e9e9"/>
+        <color id="3" name="Rock_black" value="#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4"/>
+        <color id="4" name="Copper" value="#401500,742600,b03a00,e84c00"/>
+        <color id="5" name="Silver" value="#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"/>
+        <color id="6" name="Gold" value="#7a5f00,ac8600,e6b300,ffcc1d"/>
+        <color id="7" name="Platinum" value="#1d2229,2f3846,47546b,6c83a8,8399bd,aabbd6,ecf3ff"/>
+        <color id="8" name="Lead" value="#191919,2a2a2a,3f3f3f,626262,8d8d8d,b8b8b8,bfbfbf"/>
+        <color id="9" name="Tin" value="#000000,404040,5b5b5b,848484,c8c8c8,d4d4d4"/>
+        <color id="10" name="Iridium" value="#272727,663432,823937,ae423f,c64643,d0716f,d27d7a"/>
+        <color id="11" name="Titanium" value="#145d5d,2ba2a2,67bcbc,80c5c5,d1e0e0,e0e3e3"/>
+    </list>
 </colors>
diff --git a/items.xml b/items.xml
index aa411112..1bd96f6b 100644
--- a/items.xml
+++ b/items.xml
@@ -2115,50 +2115,50 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="80"/>
 	<item id="842"
-		image="generic/ore.png|W:#334422,556644,778866"
+		image="generic/ore.png|W:#000000,121212,1d1d1d,383838,5c5c5c,787878,acacac,e9e9e9;R:#401500,742600,b03a00,e84c00"
 		name="Copper Ore"
 		description="Copper in its brute form."
 		type="generic"
 		weight="1000"/>
 	<item id="843"
-		image="generic/ore.png|W:#111111,333333,555555"
+		image="generic/ore.png|W:#1b120c,2e1f15,3d291c,60402b,65442e,8c5e3f,af7650,c6a48d,e7ddd6;R:#191919,2a2a2a,3f3f3f,626262,8d8d8d,b8b8b8,bfbfbf"
 		name="Lead Ore"
 		description="Lead in its brute form."
 		type="generic"
 		weight="1000"/>
 	<!-- BR: Estanho, FR: Étain -->
 	<item id="844"
-		image="generic/ore.png|W:#555555,777777,999999"
+		image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#000000,404040,5b5b5b,848484,c8c8c8,d4d4d4"
 		name="Tin Ore"
 		description="Tin in its brute form."
 		type="generic"
 		weight="1000"/>
 	<item id="845"
-		image="generic/ore.png|W:#AAAAAA,CCCCCC,EEEEEE"
+		image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"
 		name="Silver Ore"
 		description="Silver in its brute form."
 		type="generic"
 		weight="1000"/>
 	<item id="846"
-		image="generic/ore.png|W:#888844,CCCC66,FFFF88"
+		image="generic/ore.png|W:#1b120c,2e1f15,3d291c,60402b,65442e,8c5e3f,af7650,c6a48d,e7ddd6;R:#7a5f00,ac8600,e6b300,ffcc1d"
 		name="Gold Ore"
 		description="Gold in its brute form."
 		type="generic"
 		weight="1000"/>
 	<item id="847"
-		image="generic/ore.png|W:#888888,AAAAAA,CCCCCC"
+		image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1d2229,2f3846,47546b,6c83a8,8399bd,aabbd6,ecf3ff"
 		name="Platinum Ore"
 		description="Platinum in its brute form."
 		type="generic"
 		weight="1000"/>
 	<item id="848"
-		image="generic/ore.png|W:#884444,CC6666,FF8888"
+		image="generic/ore.png|W:#000000,121212,1d1d1d,383838,5c5c5c,787878,acacac,e9e9e9;R:#272727,663432,823937,ae423f,c64643,d0716f,d27d7a"
 		name="Iridium Ore"
 		description="Iridium in its brute form."
 		type="generic"
 		weight="1000"/>
 	<item id="849"
-		image="generic/ore.png|W:#9999BB,BBBBDD,DDDDFF"
+		image="generic/ore.png|W:#000000,121212,1d1d1d,383838,5c5c5c,787878,acacac,e9e9e9;R:#145d5d,2ba2a2,67bcbc,80c5c5,d1e0e0,e0e3e3"
 		name="Titanium Ore"
 		description="Titanium in its brute form."
 		type="generic"