Made the name of each item be the same everywhere.

Changed some names in item_db.txt and the same one in corresponding scripts.

1 files changed, 72 insertions, 72 deletions

diff --git a/world/map/npc/003-1/stranger.txt b/world/map/npc/003-1/stranger.txt
index 31667b8c..d8e05cc2 100644
--- a/world/map/npc/003-1/stranger.txt
+++ b/world/map/npc/003-1/stranger.txt
@@ -29,9 +29,9 @@
     goto L_Close;
 
 L_Items:
-    if (countitem("IngotIron") < @IRONINGOT) goto L_No_Item;
+    if (countitem("IronIngot") < @IRONINGOT) goto L_No_Item;
     if (countitem("PinkAntenna") < @PINKANTENNA) goto L_No_Item;
-    delitem "IngotIron", @IRONINGOT;
+    delitem "IronIngot", @IRONINGOT;
     delitem "PinkAntenna", @PINKANTENNA;
     getexp @EXP, 0;
     set FLAGS, FLAGS | FLAG_TOWEL_HELPED;
@@ -225,7 +225,7 @@ L_Right_Answer_Hard:
     mes "\"There you are! A towel is really the most important item for a hitchhiker to have.\"";
     next;
     mes "\"Please take this.\""; // no full inventory check, this is done before the game
-    getitem "GreyWarpTowel", 1;
+    getitem "HitchhikersTowel", 1;
     set FLAGS, FLAGS | FLAG_TOWEL_COMPLETED;
     next;
 
@@ -247,7 +247,7 @@ L_No_Event:
     mes "\"And it really comes in handy that I have my towel with me. A towel is about the most massively useful thing an inte- ahm, a person can have.\"";
     next;
     mes "\"You can read more about that in my favourite book, 'The Hitchhiker's Guide to the Galaxy'.\"";
-    if (countitem("GreyWarpTowel") > 0)
+    if (countitem("HitchhikersTowel") > 0)
         menu
             "Thanks for the advice.",-,
             "I have my towel with me too.",L_Dye;
@@ -308,15 +308,15 @@ L_Red:
     mes "[Stranger]";
     mes "\"Ok, I'll need two bags of Ruby Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderRed") < 2) goto L_No_Powder;
-    delitem "GemPowderRed", 2;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("RubyPowder") < 2) goto L_No_Powder;
+    delitem "RubyPowder", 2;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "RedWarpTowel", 1;
+    getitem "RedHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -327,15 +327,15 @@ L_Yellow:
     mes "[Stranger]";
     mes "\"Ok, I'll need two bags of Topaz Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderYellow") < 2) goto L_No_Powder;
-    delitem "GemPowderYellow", 2;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("TopazPowder") < 2) goto L_No_Powder;
+    delitem "TopazPowder", 2;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "YellowWarpTowel", 1;
+    getitem "YellowHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -347,15 +347,15 @@ L_White:
     mes "[Stranger]";
     mes "\"Ok, I'll need two bags of Diamond Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderWhite") < 2) goto L_No_Powder;
-    delitem "GemPowderWhite", 2;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("DiamondPowder") < 2) goto L_No_Powder;
+    delitem "DiamondPowder", 2;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "WhiteWarpTowel", 1;
+    getitem "WhiteHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -366,15 +366,15 @@ L_Blue:
     mes "[Stranger]";
     mes "\"Ok, I'll need two bags of Sapphire Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderBlue") < 2) goto L_No_Powder;
-    delitem "GemPowderBlue", 2;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("SapphirePowder") < 2) goto L_No_Powder;
+    delitem "SapphirePowder", 2;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "BlueWarpTowel", 1;
+    getitem "BlueHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -385,15 +385,15 @@ L_Green:
     mes "[Stranger]";
     mes "\"Ok, I'll need two bags of Emerald Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderGreen") < 2) goto L_No_Powder;
-    delitem "GemPowderGreen", 2;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("EmeraldPowder") < 2) goto L_No_Powder;
+    delitem "EmeraldPowder", 2;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "GreenWarpTowel", 1;
+    getitem "GreenHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -404,15 +404,15 @@ L_Purple:
     mes "[Stranger]";
     mes "\"Ok, I'll need two bags of Amethyst Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderPurple") < 2) goto L_No_Powder;
-    delitem "GemPowderPurple", 2;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("AmethystPowder") < 2) goto L_No_Powder;
+    delitem "AmethystPowder", 2;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "PurpleWarpTowel", 1;
+    getitem "PurpleHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -423,17 +423,17 @@ L_Orange:
     mes "[Stranger]";
     mes "\"Ok, I'll need one bag of Ruby Powder, one bag of Topaz Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderRed") < 1) goto L_No_Powder;
-    if (countitem("GemPowderYellow") < 1) goto L_No_Powder;
-    delitem "GemPowderRed", 1;
-    delitem "GemPowderYellow", 1;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("RubyPowder") < 1) goto L_No_Powder;
+    if (countitem("TopazPowder") < 1) goto L_No_Powder;
+    delitem "RubyPowder", 1;
+    delitem "TopazPowder", 1;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "OrangeWarpTowel", 1;
+    getitem "OrangeHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -444,17 +444,17 @@ L_Pink:
     mes "[Stranger]";
     mes "\"Ok, I'll need one bag of Ruby Powder, one bag of Diamond Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderRed") < 1) goto L_No_Powder;
-    if (countitem("GemPowderWhite") < 1) goto L_No_Powder;
-    delitem "GemPowderRed", 1;
-    delitem "GemPowderWhite", 1;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("RubyPowder") < 1) goto L_No_Powder;
+    if (countitem("DiamondPowder") < 1) goto L_No_Powder;
+    delitem "RubyPowder", 1;
+    delitem "DiamondPowder", 1;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "PinkWarpTowel", 1;
+    getitem "PinkHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -465,17 +465,17 @@ L_Lime:
     mes "[Stranger]";
     mes "\"Ok, I'll need one bag of Emerald Powder, one bag of Topaz Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderGreen") < 1) goto L_No_Powder;
-    if (countitem("GemPowderYellow") < 1) goto L_No_Powder;
-    delitem "GemPowderGreen", 1;
-    delitem "GemPowderYellow", 1;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("EmeraldPowder") < 1) goto L_No_Powder;
+    if (countitem("TopazPowder") < 1) goto L_No_Powder;
+    delitem "EmeraldPowder", 1;
+    delitem "TopazPowder", 1;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "LimeWarpTowel", 1;
+    getitem "LimeHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";
@@ -486,17 +486,17 @@ L_Teal:
     mes "[Stranger]";
     mes "\"Ok, I'll need one bag of Emerald Powder, one bag of Sapphire Powder and a bottle of water for that.\"";
     next;
-    if (countitem("GreyWarpTowel") < 1) goto L_No_Towel;
+    if (countitem("HitchhikersTowel") < 1) goto L_No_Towel;
     getinventorylist;
-    if ((countitem("GreyWarpTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
+    if ((countitem("HitchhikersTowel") > 1) && (@inventorylist_count == 100)) goto L_Full_Inv;
     if (countitem("BottleOfWater") < 1) goto L_No_Water;
-    if (countitem("GemPowderGreen") < 1) goto L_No_Powder;
-    if (countitem("GemPowderBlue") < 1) goto L_No_Powder;
-    delitem "GemPowderGreen", 1;
-    delitem "GemPowderBlue", 1;
-    delitem "GreyWarpTowel", 1;
+    if (countitem("EmeraldPowder") < 1) goto L_No_Powder;
+    if (countitem("SapphirePowder") < 1) goto L_No_Powder;
+    delitem "EmeraldPowder", 1;
+    delitem "SapphirePowder", 1;
+    delitem "HitchhikersTowel", 1;
     delitem "BottleOfWater", 1;
-    getitem "TealWarpTowel", 1;
+    getitem "TealHitchhikersTowel", 1;
     mes "He takes your towel, the water and the gem powder, then he turns away and does something you can't see. After a few minutes, he turns to you again.";
     next;
     mes "[Stranger]";