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, 16 insertions, 16 deletions

diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index 043705dd..fbffd3e8 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -47,11 +47,11 @@ L_Check:
     mes "[Nicholas]";
     mes "\"Let me take a look at how much you have...\"";
     next;
-    if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) )
+    if ( (countitem("IronIngot")<3) || (countitem("Coal") < 6) )
         goto L_NoItem;
-    if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+    if ( (countitem("IronIngot")<6) || (countitem("Coal") < 12) )
         goto L_StageA;
-    if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+    if ( (countitem("IronIngot")<9) || (countitem("Coal") < 18) )
         goto L_StageB;
     goto L_StageC;
 
@@ -111,13 +111,13 @@ L_main_menu:
 
 L_main_menu_post_setzer:
 
-    if ( (countitem("IngotIron")<3) || (countitem("Coal") <6) )
+    if ( (countitem("IronIngot")<3) || (countitem("Coal") <6) )
         goto L_no_more_helmets;
     set @choice$[@choices_nr], "Knight's Helmet (3 Iron Ingots & 6 Coal).";
     set @choice_idx[@choices_nr], @CHOICE_KNIGHT;
     set @choices_nr, 1 + @choices_nr;
 
-    if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+    if ( (countitem("IronIngot")<6) || (countitem("Coal") < 12) )
         goto L_no_more_helmets;
     set @choice$[@choices_nr], "Crusade Helmet (6 Iron Ingots & 12 Coal).";
     set @choice_idx[@choices_nr], @CHOICE_CRUSADE;
@@ -127,7 +127,7 @@ L_main_menu_post_setzer:
     set @choice_idx[@choices_nr], @CHOICE_SHIELD;
     set @choices_nr, 1 + @choices_nr;
 
-    if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+    if ( (countitem("IronIngot")<9) || (countitem("Coal") < 18) )
         goto L_no_more_helmets;
     set @choice$[@choices_nr], "Warlord Helmet (9 Iron Ingots & 18 Coal).";
     set @choice_idx[@choices_nr], @CHOICE_WARLORD;
@@ -182,39 +182,39 @@ L_NoMoney:
 L_YesKnight:
     if (zeny < 10000)
         goto L_NoMoney;
-    if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) )
+    if ( (countitem("IronIngot")<3) || (countitem("Coal") < 6) )
         goto L_NoItem;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_TooMany;
     set zeny, zeny - 10000;
-    delitem "IngotIron", 3;
+    delitem "IronIngot", 3;
     delitem "Coal", 6;
     getitem "KnightsHelmet", 1;
     goto L_Done;
 
 L_YesCrusade:
     if (zeny < 10000) goto L_NoMoney;
-    if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) )
+    if ( (countitem("IronIngot")<6) || (countitem("Coal") < 12) )
         goto L_NoItem;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_TooMany;
     set zeny, zeny-10000;
-    delitem "IngotIron", 6;
+    delitem "IronIngot", 6;
     delitem "Coal", 12;
     getitem "CrusadeHelmet", 1;
     goto L_Done;
 
 L_YesWarlord:
     if (zeny < 10000) goto L_NoMoney;
-    if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) )
+    if ( (countitem("IronIngot")<9) || (countitem("Coal") < 18) )
         goto L_NoItem;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_TooMany;
     set zeny, zeny-10000;
-    delitem "IngotIron", 9;
+    delitem "IronIngot", 9;
     delitem "Coal", 18;
     getitem "WarlordHelmet", 1;
     goto L_Done;
@@ -247,7 +247,7 @@ L_YesShield:
         goto L_ShieldNoZeny;
     if (countitem("InfantryHelmet") < 2)
         goto L_ShieldNoInfantry;
-    if (countitem("IngotIron") < 6)
+    if (countitem("IronIngot") < 6)
         goto L_ShieldNoIngot;
     if (countitem("Coal") < 12)
         goto L_ShieldNoCoal;
@@ -262,7 +262,7 @@ L_YesShield:
     delitem "InfantryHelmet", 1;
     delitem "InfantryHelmet", 1;
     delitem "LeatherPatch", 1;
-    delitem "IngotIron", 6;
+    delitem "IronIngot", 6;
     delitem "Coal", 12;
     set zeny, zeny - 20000;
 
@@ -334,7 +334,7 @@ L_SetzerQuest:
         "HOW much?  Nevermind then!", L_Pass;
     if (zeny < 50000)
         goto L_SetzerNoZeny;
-    if ( (countitem("IngotIron") < 3) || (countitem("Coal") < 6) )
+    if ( (countitem("IronIngot") < 3) || (countitem("Coal") < 6) )
         goto L_SetzerNoIngot;
     if (countitem("MonsterOilPotion") < 1)
         goto L_SetzerNoMonsterOil;
@@ -345,7 +345,7 @@ L_SetzerQuest:
     mes "[Nicholas]";
     mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer.  As you watch, it turns thinner and flatter.  Finally he pours the monster oil over it, heats the metal up again and douses it in water.";
     set zeny, zeny - 50000;
-    delitem "IngotIron", 3;
+    delitem "IronIngot", 3;
     delitem "Coal", 6;
     delitem "MonsterOilPotion", 1;
     delitem "ShortSword", 1;