Fix Darkelm and Bull. Fix Earth Powder drop rate.

9 files changed, 24 insertions, 12 deletions

diff --git a/db/craft_db.conf b/db/craft_db.conf
index c7f947dd0..08b7243a3 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -678,6 +678,18 @@ craft_db: (
 },
 /****************************************************************************/
 
+
+
+
+
+
+
+
+
+
+
+
+
 // Crafting System (ID 51~100, Flag 16)
 // 51~71 → Swords
 // 72~76 → Bows (ok)
diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf
index 0cfa03cdd..9e55834d7 100644
--- a/db/re/item_chain.conf
+++ b/db/re/item_chain.conf
@@ -20,7 +20,7 @@
 */
 
 ITMCHAIN_ORE: {
-	EarthPowder: 20000
+	EarthPowder: 2000
 	Coal: 500
 	IronOre: 380
 	CopperOre: 250
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 4a5a0919a..609da7e58 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -8885,8 +8885,8 @@ item_db: (
 },
 {
 	Id: 2906
-	AegisName: "Bull"
-	Name: "Bull"
+	AegisName: "BullHelmet"
+	Name: "Bull Helmet"
 	Type: "IT_ARMOR"
 	Buy: 1600
 	Sell: 300
@@ -8902,8 +8902,8 @@ item_db: (
 },
 {
 	Id: 2907
-	AegisName: "Darkelm"
-	Name: "Darkhelm"
+	AegisName: "DarkHelm"
+	Name: "Dark Helm"
 	Type: "IT_ARMOR"
 	Buy: 1600
 	Sell: 300
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 136221492..2216281fa 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -439,7 +439,7 @@ OnTimer5000:
 OnInit:
     // Check items.xml for info about this.
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, Bull);
+    setunitdata(.@npcId, UDT_HEADTOP, BullHelmet);
     setunitdata(.@npcId, UDT_HEADMIDDLE, LieutenantArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
     setunitdata(.@npcId, UDT_SHIELD, LousyMoccasins);    // TODO FIXME: Display Boots
diff --git a/npc/003-10/arnea.txt b/npc/003-10/arnea.txt
index b9039e121..75594b08c 100644
--- a/npc/003-10/arnea.txt
+++ b/npc/003-10/arnea.txt
@@ -164,7 +164,7 @@ L_Quit:
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, Darkelm);
+    setunitdata(.@npcId, UDT_HEADTOP, DarkHelm);
     setunitdata(.@npcId, UDT_HEADMIDDLE, CopperArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps);
     setunitdata(.@npcId, UDT_WEAPON, RockKnife);
diff --git a/npc/003-13/arnea.txt b/npc/003-13/arnea.txt
index f3f89f1f9..58ce04fe4 100644
--- a/npc/003-13/arnea.txt
+++ b/npc/003-13/arnea.txt
@@ -210,7 +210,7 @@ OnVerify:
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, Darkelm);
+    setunitdata(.@npcId, UDT_HEADTOP, DarkHelm);
     setunitdata(.@npcId, UDT_HEADMIDDLE, CopperArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps);
     setunitdata(.@npcId, UDT_WEAPON, RockKnife);
@@ -223,7 +223,7 @@ OnInit:
 
 OnInstanceInit:
     .@npcId = getnpcid(instance_npcname(.name$));
-    setunitdata(.@npcId, UDT_HEADTOP, Darkelm);
+    setunitdata(.@npcId, UDT_HEADTOP, DarkHelm);
     setunitdata(.@npcId, UDT_HEADMIDDLE, CopperArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps);
     setunitdata(.@npcId, UDT_WEAPON, RockKnife);
diff --git a/npc/009-1/guards.txt b/npc/009-1/guards.txt
index 83c9e0841..7a4c2863c 100644
--- a/npc/009-1/guards.txt
+++ b/npc/009-1/guards.txt
@@ -131,7 +131,7 @@ OnInit:
 
     // Check items.xml for info about this.
     .@npcId = getnpcid();
-    setunitdata(.@npcId, UDT_HEADTOP, Bull);
+    setunitdata(.@npcId, UDT_HEADTOP, BullHelmet);
     setunitdata(.@npcId, UDT_HEADMIDDLE, LieutenantArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
     setunitdata(.@npcId, UDT_SHIELD, LousyMoccasins);    // TODO FIXME: Display Boots
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 214ef3529..6cb5a7aba 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -210,7 +210,7 @@ OnInit:
     .distance = 4;
 
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, Bull);
+    setunitdata(.@npcId, UDT_HEADTOP, BullHelmet);
     setunitdata(.@npcId, UDT_HEADMIDDLE, LieutenantArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
     setunitdata(.@npcId, UDT_SHIELD, LousyMoccasins);    // TODO FIXME: Display Boots
diff --git a/npc/020-1/guards.txt b/npc/020-1/guards.txt
index 4211f16a5..cac5dc79d 100644
--- a/npc/020-1/guards.txt
+++ b/npc/020-1/guards.txt
@@ -89,7 +89,7 @@ OnInit:
 
     // Check items.xml for info about this.
     .@npcId = getnpcid();
-    setunitdata(.@npcId, UDT_HEADTOP, Bull);
+    setunitdata(.@npcId, UDT_HEADTOP, BullHelmet);
     setunitdata(.@npcId, UDT_HEADMIDDLE, LieutenantArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
     setunitdata(.@npcId, UDT_SHIELD, LousyMoccasins);    // TODO FIXME: Display Boots