From 83e0ff876dcb56645a4b1c6d137745764e4df201 Mon Sep 17 00:00:00 2001
From: ali-g <gauvain.dauchy@free.fr>
Date: Sat, 29 Oct 2011 08:25:29 +0200
Subject: Made the name of each item be the same everywhere. Changed some names
 in item_db.txt and the same one in corresponding scripts.

---
 world/map/npc/018-2/caul.txt   |  2 +-
 world/map/npc/018-2/miners.txt | 48 +++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'world/map/npc/018-2')

diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index 11197ef3..752be33e 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -963,7 +963,7 @@ L_usepearl:
     set @finish_dempo, 1;
     callsub L_check_explosion;
     // ok now you really did it. Here is your potion:
-    getitem "DementiaPotion",1;
+    getitem "GrimaceOfDementia",1;
 
     mes "[Caul]";
     mes "\"The potion is now ready. It seems as if it worked fine.\"";
diff --git a/world/map/npc/018-2/miners.txt b/world/map/npc/018-2/miners.txt
index 03be24c0..6a295675 100644
--- a/world/map/npc/018-2/miners.txt
+++ b/world/map/npc/018-2/miners.txt
@@ -50,42 +50,42 @@ L_Check_Gems:
     set @c, 0;
 
 L_Check_Diamond:
-    if (countitem("GemRawWhite") < 1)
+    if (countitem("Diamond") < 1)
         goto L_Check_Ruby;
     set @menuitems$[@c], "A diamond.";
     set @menuid[@c], 0;
     set @c, @c + 1;
 
 L_Check_Ruby:
-    if (countitem("GemRawRed") < 1)
+    if (countitem("Ruby") < 1)
         goto L_Check_Emerald;
     set @menuitems$[@c], "A ruby.";
     set @menuid[@c], 1;
     set @c, @c + 1;
 
 L_Check_Emerald:
-    if (countitem("GemRawGreen") < 1)
+    if (countitem("Emerald") < 1)
         goto L_Check_Sapphire;
     set @menuitems$[@c], "An emerald.";
     set @menuid[@c], 2;
     set @c, @c + 1;
 
 L_Check_Sapphire:
-    if (countitem("GemRawBlue") < 1)
+    if (countitem("Sapphire") < 1)
         goto L_Check_Topaz;
     set @menuitems$[@c], "A sapphire.";
     set @menuid[@c], 3;
     set @c, @c + 1;
 
 L_Check_Topaz:
-    if (countitem("GemRawYellow") < 1)
+    if (countitem("Topaz") < 1)
         goto L_Check_Amethyst;
     set @menuitems$[@c], "A topaz.";
     set @menuid[@c], 4;
     set @c, @c + 1;
 
 L_Check_Amethyst:
-    if (countitem("GemRawPurple") < 1)
+    if (countitem("Amethyst") < 1)
         goto L_Choose_Gem;
     set @menuitems$[@c], "An amethyst.";
     set @menuid[@c], 5;
@@ -106,17 +106,17 @@ L_Choose_Gem:
     set @menu, @menu - 1;
     if (@menu >= @c) close;
     if (@menuid[@menu] == 0)
-        set @gem$, "GemRawWhite";
+        set @gem$, "Diamond";
     if (@menuid[@menu] == 1)
-        set @gem$, "GemRawRed";
+        set @gem$, "Ruby";
     if (@menuid[@menu] == 2)
-        set @gem$, "GemRawGreen";
+        set @gem$, "Emerald";
     if (@menuid[@menu] == 3)
-        set @gem$, "GemRawBlue";
+        set @gem$, "Sapphire";
     if (@menuid[@menu] == 4)
-        set @gem$, "GemRawYellow";
+        set @gem$, "Topaz";
     if (@menuid[@menu] == 5)
-        set @gem$, "GemRawPurple";
+        set @gem$, "Amethyst";
     if (@menuid[@menu] == 6)
         goto L_abort;
 
@@ -127,18 +127,18 @@ L_Choose_Gem:
         && countitem(@gem$) > 1)
             goto L_TooMany;
     delitem @gem$, 1;
-    if (@gem$ == "GemRawWhite")
-        getitem "GemPowderWhite", @MIN_GEM_AMOUNT + rand(6) + rand(6);
-    if (@gem$ == "GemRawRed")
-        getitem "GemPowderRed", @MIN_GEM_AMOUNT + rand(6);
-    if (@gem$ == "GemRawGreen")
-        getitem "GemPowderGreen", @MIN_GEM_AMOUNT + rand(6);
-    if (@gem$ == "GemRawBlue")
-        getitem "GemPowderBlue", @MIN_GEM_AMOUNT + rand(6);
-    if (@gem$ == "GemRawYellow")
-        getitem "GemPowderYellow", @MIN_GEM_AMOUNT + rand(6);
-    if (@gem$ == "GemRawPurple")
-        getitem "GemPowderPurple", @MIN_GEM_AMOUNT + rand(6);
+    if (@gem$ == "Diamond")
+        getitem "DiamondPowder", @MIN_GEM_AMOUNT + rand(6) + rand(6);
+    if (@gem$ == "Ruby")
+        getitem "RubyPowder", @MIN_GEM_AMOUNT + rand(6);
+    if (@gem$ == "Emerald")
+        getitem "EmeraldPowder", @MIN_GEM_AMOUNT + rand(6);
+    if (@gem$ == "Sapphire")
+        getitem "SapphirePowder", @MIN_GEM_AMOUNT + rand(6);
+    if (@gem$ == "Topaz")
+        getitem "TopazPowder", @MIN_GEM_AMOUNT + rand(6);
+    if (@gem$ == "Amethyst")
+        getitem "AmethystPowder", @MIN_GEM_AMOUNT + rand(6);
 
     mes "[Malek]";
     mes "\"Here's your powder. Hope it's fine enough for you.\"";
-- 
cgit v1.2.3-60-g2f50