From fe1d12f7a671d121b8a55e6c63cabd0085d71a3a Mon Sep 17 00:00:00 2001
From: HoraK-FDF <horak-fdf@web.de>
Date: Thu, 21 Mar 2024 08:45:44 +0100
Subject: item changes

---
 items/generic/_include.xml             |  3 ++-
 items/generic/item5288_Naphthalene.xml | 10 ++++++++++
 items/generic/item5331_Naphthalene.xml | 10 ----------
 items/generic/item5332_Charcoal.xml    | 10 ++++++++++
 items/usable/_include.xml              |  2 +-
 items/usable/item5288_YellowApple.xml  |  4 ----
 items/usable/item5331_YellowApple.xml  |  4 ++++
 7 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 items/generic/item5288_Naphthalene.xml
 delete mode 100644 items/generic/item5331_Naphthalene.xml
 create mode 100644 items/generic/item5332_Charcoal.xml
 delete mode 100644 items/usable/item5288_YellowApple.xml
 create mode 100644 items/usable/item5331_YellowApple.xml

diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index b7fcd0db..3e96b79a 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -251,6 +251,7 @@
   <include name="items/generic/item5256_PVPCoin.xml"/>
   <include name="items/generic/item5265_LoveLetter.xml"/>
   <include name="items/generic/item5279_Carrot.xml"/>
+  <include name="items/generic/item5288_Naphthalene.xml"/>
   <include name="items/generic/item5292_SilverOre.xml"/>
   <include name="items/generic/item5293_CrystallizedDragonBlood.xml"/>
   <include name="items/generic/item5295_PinkFlowerSeed.xml"/>
@@ -267,5 +268,5 @@
   <include name="items/generic/item5319_ShadowPlantCrystalDust.xml"/>
   <include name="items/generic/item5327_CopperOre.xml"/>
   <include name="items/generic/item5328_CopperIngot.xml"/>
-  <include name="items/generic/item5331_Naphthalene.xml"/>
+  <include name="items/generic/item5332_Charcoal.xml"/>
 </items>
diff --git a/items/generic/item5288_Naphthalene.xml b/items/generic/item5288_Naphthalene.xml
new file mode 100644
index 00000000..47ad85dc
--- /dev/null
+++ b/items/generic/item5288_Naphthalene.xml
@@ -0,0 +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="10"
+  />
+</items>
diff --git a/items/generic/item5331_Naphthalene.xml b/items/generic/item5331_Naphthalene.xml
deleted file mode 100644
index c656df6e..00000000
--- a/items/generic/item5331_Naphthalene.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="5331"
-    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="10"
-  />
-</items>
diff --git a/items/generic/item5332_Charcoal.xml b/items/generic/item5332_Charcoal.xml
new file mode 100644
index 00000000..a8f373e7
--- /dev/null
+++ b/items/generic/item5332_Charcoal.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5332"
+    image="generic/charcoal.png"
+    name="Charcoal"
+    description="Strongly heated wood in minimal oxygen."
+    type="generic"
+    weight="10"
+  />
+</items>
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index b1b4d1df..5aa9a977 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -104,11 +104,11 @@
   <include name="items/usable/item5237_CaramelCandy.xml"/>
   <include name="items/usable/item5251_Tomato.xml"/>
   <include name="items/usable/item5263_LovePotion.xml"/>
-  <include name="items/usable/item5288_YellowApple.xml"/>
   <include name="items/usable/item5294_CrazyRum.xml"/>
   <include name="items/usable/item5309_ManaDust.xml"/>
   <include name="items/usable/item5310_EnlighteningElixir.xml"/>
   <include name="items/usable/item5312_Honey.xml"/>
   <include name="items/usable/item5329_IronShovel.xml"/>
   <include name="items/usable/item5330_ShadowScroll.xml"/>
+  <include name="items/usable/item5331_YellowApple.xml"/>
 </items>
diff --git a/items/usable/item5288_YellowApple.xml b/items/usable/item5288_YellowApple.xml
deleted file mode 100644
index 73d12052..00000000
--- a/items/usable/item5288_YellowApple.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="5288" image="use/food/apple.png|R:#ffff00;Y:#ffffff;G:#66cc33" name="Yellow Apple" description="A healthy yellow apple." type="usable" hp="55" weight="5"/>
-</items>
diff --git a/items/usable/item5331_YellowApple.xml b/items/usable/item5331_YellowApple.xml
new file mode 100644
index 00000000..c2eae7a9
--- /dev/null
+++ b/items/usable/item5331_YellowApple.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5331" image="use/food/apple.png|R:#ffff00;Y:#ffffff;G:#66cc33" name="Yellow Apple" description="A healthy yellow apple." type="usable" hp="50" weight="5"/>
+</items>
-- 
cgit v1.2.3-60-g2f50