Some more "ItemName" conversions

5 files changed, 89 insertions, 111 deletions

diff --git a/npc/009-2_Hurnscald/alan.txt b/npc/009-2_Hurnscald/alan.txt
index 6d8a1770..6dc9da67 100644
--- a/npc/009-2_Hurnscald/alan.txt
+++ b/npc/009-2_Hurnscald/alan.txt
@@ -134,7 +134,7 @@ L_State_3_try:
 	mes "\"Hmmm... looks ok, but is it strong enough?\"";
 	mes "Alan bends the log over his knee.";
 	next;
-	delitem 569, 1;
+	delitem "RawLog", 1;
 	set @Temp1, rand(20);
 	if (@Temp1 == 0) goto L_State_3_success;
 	mes "The log breaks with a loud crack";
@@ -177,7 +177,7 @@ L_State_4_pay:
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_State_4_TooMany;
 	set zeny, zeny - 10000;
-	getitem 545, 1;
+	getitem "ForestBow", 1;
 	set @Q_status, 5;
         callsub S_Update_Var;
 	mes "[Alan]";
diff --git a/npc/009-2_Hurnscald/kfahr.txt b/npc/009-2_Hurnscald/kfahr.txt
index f24d2071..ba6cc02b 100644
--- a/npc/009-2_Hurnscald/kfahr.txt
+++ b/npc/009-2_Hurnscald/kfahr.txt
@@ -24,21 +24,13 @@
 	set @QS_STINGER_QUEST, 6;
 	set @QS_STINGER_QUEST_DONE, 7;
 
-	set @BEER, 539;
-
-	set @BLACK_STINGER, 709;
 	set @BLACK_STINGERS_NR, 10;
-	set @MUSHROOM, 566;
 	set @MUSHROOMS_NR, 10;
-	set @SNAKE_SKIN, 641;
 	set @SNAKE_SKINS_NR, 10;
 
 	set @KNIFE_QUEST_XP, 50000;
 	set @STINGER_QUEST_XP, 80000;
 
-	set @BONE_KNIFE, 570;
-	set @GOLDEN_STINGER, 706;
-
 	set @Q_MASK, NIBBLE_2_MASK;
 	set @Q_SHIFT, NIBBLE_2_SHIFT;
 
@@ -783,10 +775,10 @@ L_knife_quest_check:
 	close;
 
 L_knife_quest_completecheck:
-	if (countitem(@BLACK_STINGER) < @BLACK_STINGERS_NR)
+	if (countitem("BlackScorpionStinger") < @BLACK_STINGERS_NR)
 		goto L_knife_quest_missing_stingers;
 
-	if (countitem(@MUSHROOM) < @MUSHROOMS_NR)
+	if (countitem("SmallMushroom") < @MUSHROOMS_NR)
 		goto L_knife_quest_missing_mushrooms;
 
 
@@ -810,10 +802,10 @@ L_knife_quest_completecheck:
 	mes "I had the nomads make me a few of them, and I hardly use them nowadays, so I think I can part with this one.";
 	next;
 
-	if (countitem(@BLACK_STINGER) < @BLACK_STINGERS_NR)
+	if (countitem("BlackScorpionStinger") < @BLACK_STINGERS_NR)
 		goto L_knife_quest_missing_stingers_2;
 
-	if (countitem(@MUSHROOM) < @MUSHROOMS_NR)
+	if (countitem("SmallMushroom") < @MUSHROOMS_NR)
 		goto L_knife_quest_missing_mushrooms_2;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_Knife_TooMany;
@@ -827,10 +819,10 @@ L_knife_quest_completecheck:
 	set @Q_status, @QS_KNIFE_QUEST_DONE;
 	callsub L_Update_Var;
 
-	delitem @BLACK_STINGER, @BLACK_STINGERS_NR;
-	delitem @MUSHROOM, @MUSHROOMS_NR;
+	delitem "BlackScorpionStinger", @BLACK_STINGERS_NR;
+	delitem "SmallMushroom", @MUSHROOMS_NR;
 	getexp @KNIFE_QUEST_XP, 0;
-	getitem @BONE_KNIFE, 1;
+	getitem "BoneKnife", 1;
         next;
 
 	goto L_main_menu;
@@ -843,9 +835,9 @@ L_Knife_TooMany:
 L_knife_quest_missing_stingers:
 	mes "[Kfahr the Warrior]";
 	mes "\"No, no... I said " + @BLACK_STINGERS_NR + " black scorpion stingers.";
-	if (countitem(@BLACK_STINGER))
-		mes "You will need " + (@BLACK_STINGERS_NR - (countitem (@BLACK_STINGER))) + " more of those.\"";
-	if (countitem(@BLACK_STINGER) == 0)
+	if (countitem("BlackScorpionStinger"))
+		mes "You will need " + (@BLACK_STINGERS_NR - (countitem ("BlackScorpionStinger"))) + " more of those.\"";
+	if (countitem("BlackScorpionStinger") == 0)
 		mes "You didn't bring even a single one!\"";
 	next;
 	close;
@@ -853,9 +845,9 @@ L_knife_quest_missing_stingers:
 L_knife_quest_missing_stingers_2:
 	mes "[Kfahr the Warrior]";
 	mes "\"You just had " + @BLACK_STINGERS_NR + " black scorpion stingers. What happened to them?";
-	if (countitem(@BLACK_STINGER))
-		mes "You will need " + (@BLACK_STINGERS_NR - (countitem (@BLACK_STINGER))) + " more of those.\"";
-	if (countitem(@BLACK_STINGER) == 0)
+	if (countitem("BlackScorpionStinger"))
+		mes "You will need " + (@BLACK_STINGERS_NR - (countitem ("BlackScorpionStinger"))) + " more of those.\"";
+	if (countitem("BlackScorpionStinger") == 0)
 		mes "You didn't bring even a single one!\"";
 	next;
 	close;
@@ -863,9 +855,9 @@ L_knife_quest_missing_stingers_2:
 L_knife_quest_missing_mushrooms:
 	mes "[Kfahr the Warrior]";
 	mes "\"No, no... I said " + @MUSHROOMS_NR + " small mushrooms.";
-	if (countitem(@MUSHROOM))
-		mes "You will need " + (@MUSHROOMS_NR - (countitem (@MUSHROOM))) + " more of those.\"";
-	if (countitem(@MUSHROOM) == 0)
+	if (countitem("SmallMushroom"))
+		mes "You will need " + (@MUSHROOMS_NR - (countitem ("SmallMushroom"))) + " more of those.\"";
+	if (countitem("SmallMushroom") == 0)
 		mes "You didn't bring me even a single little mushroom!\"";
 	next;
 	close;
@@ -873,9 +865,9 @@ L_knife_quest_missing_mushrooms:
 L_knife_quest_missing_mushrooms_2:
 	mes "[Kfahr the Warrior]";
 	mes "\"You just had " + @MUSHROOMS_NR + " small mushrooms. What happened to them?";
-	if (countitem(@MUSHROOM))
-		mes "You will need " + (@MUSHROOMS_NR - (countitem (@MUSHROOM))) + " more of those.\"";
-	if (countitem(@MUSHROOM) == 0)
+	if (countitem("SmallMushroom"))
+		mes "You will need " + (@MUSHROOMS_NR - (countitem ("SmallMushroom"))) + " more of those.\"";
+	if (countitem("SmallMushroom") == 0)
 		mes "You didn't bring me even a single little mushroom!\"";
 	next;
 	close;
@@ -893,13 +885,13 @@ L_stinger_quest_check:
 
 
 L_snakeskins_completecheck:
-	if (countitem(@SNAKE_SKIN) < @SNAKE_SKINS_NR)
+	if (countitem("SnakeSkin") < @SNAKE_SKINS_NR)
 		goto L_snakeskins_missing;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_SnakeSkins_TooMany;
 
-	delitem @SNAKE_SKIN, @SNAKE_SKINS_NR;
-	getitem @GOLDEN_STINGER, 1;
+	delitem "SnakeSkin", @SNAKE_SKINS_NR;
+	getitem "GoldenScorpionStinger", 1;
 
 	set @Q_status, @QS_STINGER_QUEST_DONE;
 	callsub L_Update_Var;
@@ -917,9 +909,9 @@ L_snakeskins_completecheck:
 L_snakeskins_missing:
 	mes "[Kfahr the Warrior]";
 	mes "\"No, no... I said " + @SNAKE_SKINS_NR + " snake skins.";
-	if (countitem(@SNAKE_SKIN))
-		mes "You will need " + (@SNAKE_SKINS_NR - (countitem (@SNAKE_SKIN))) + " more of those.\"";
-	if (countitem(@SNAKE_SKIN) == 0)
+	if (countitem("SnakeSkin"))
+		mes "You will need " + (@SNAKE_SKINS_NR - (countitem ("SnakeSkin"))) + " more of those.\"";
+	if (countitem("SnakeSkin") == 0)
 		mes "You didn't bring even a single skin!\"";
 	next;
 	close;
@@ -930,7 +922,7 @@ L_SnakeSkins_TooMany:
 	close;
 
 L_give_beer:
-	if (countitem(@BEER) < 1)
+	if (countitem("Beer") < 1)
 		goto L_player_out_of_beer;
 
 	if (@has_beer)
@@ -948,7 +940,7 @@ L_give_beer:
 
 	set @mesg$, @beermessages$[@beer_count];
 
-	delitem @BEER, 1;
+	delitem "Beer", 1;
 
 	set @has_beer, 1;
 	set @beer_count, @beer_count + 1;
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 349593db..ea82bda8 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -13,14 +13,6 @@
 
 009-2.gat,185,55,0	script	Nicholas	135,{
 
-        set @IRON_ORE, 640;
-        set @INFANTRY, 638;
-        set @LEATHER_PATCH, 708;
-        set @SHORT_SWORD, 536;
-        set @MONSTER_OIL, 707;
-        set @SETZER, 571;
-	set @STEEL_SHIELD, 601;
-
         set @SETZER_XP, 100000;
         set @SHIELD_XP, 20000;
 
@@ -59,9 +51,9 @@ L_Check:
 	mes "[Nicholas]";
 	mes "\"Let me take at look at how much you have...\"";
 	next;
-	if(countitem(@IRON_ORE)<5) goto L_NoItem;
-	if(countitem(@IRON_ORE)<10) goto L_StageA;
-	if(countitem(@IRON_ORE)<15) goto L_StageB;
+	if(countitem("IronOre")<5) goto L_NoItem;
+	if(countitem("IronOre")<10) goto L_StageA;
+	if(countitem("IronOre")<15) goto L_StageB;
 	goto L_StageC;
 
 L_Info:
@@ -120,19 +112,19 @@ L_main_menu:
         set @choices_nr, 0;
         setarray @choice_idx, 0, 0, 0, 0, 0;
 
-	if (countitem(@SHORT_SWORD) < 1) goto L_main_menu_post_setzer;
+	if (countitem("ShortSword") < 1) goto L_main_menu_post_setzer;
 	set @choice$[@choices_nr], "Can you make my short sword better?";
 	set @choice_idx[@choices_nr], @CHOICE_SETZER;
 	set @choices_nr, 1 + @choices_nr;
 
 L_main_menu_post_setzer:
 
-	if (countitem(@IRON_ORE)<5) goto L_no_more_helmets;
+	if (countitem("IronOre")<5) goto L_no_more_helmets;
         set @choice$[@choices_nr], "Knight's Helmet. (5 Iron Ores)";
         set @choice_idx[@choices_nr], @CHOICE_KNIGHT;
         set @choices_nr, 1 + @choices_nr;
 
-	if (countitem(@IRON_ORE)<10) goto L_no_more_helmets;
+	if (countitem("IronOre")<10) goto L_no_more_helmets;
 
         set @choice$[@choices_nr], "Crusade Helmet. (10 Iron Ores)";
         set @choice_idx[@choices_nr], @CHOICE_CRUSADE;
@@ -142,7 +134,7 @@ L_main_menu_post_setzer:
         set @choice_idx[@choices_nr], @CHOICE_SHIELD;
         set @choices_nr, 1 + @choices_nr;
 
-	if (countitem(@IRON_ORE)<15) goto L_no_more_helmets;
+	if (countitem("IronOre")<15) goto L_no_more_helmets;
 
         set @choice$[@choices_nr], "Warlord Helmet. (15 Iron Ores)";
         set @choice_idx[@choices_nr], @CHOICE_WARLORD;
@@ -192,8 +184,8 @@ L_YesKnight:
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny - 10000;
-	delitem @IRON_ORE, 5;
-	getitem 637, 1;
+	delitem "IronOre", 5;
+	getitem "KnightsHelmet", 1;
 	goto L_Done;
 
 L_YesCrusade:
@@ -201,8 +193,8 @@ L_YesCrusade:
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-10000;
-	delitem @IRON_ORE,10;
-	getitem 639,1;
+	delitem "IronOre", 10;
+	getitem "CrusadeHelmet", 1;
 	goto L_Done;
 
 L_YesWarlord:
@@ -210,8 +202,8 @@ L_YesWarlord:
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-10000;
-	delitem @IRON_ORE,15;
-	getitem 636,1;
+	delitem "IronOre", 15;
+	getitem "WarlordHelmet", 1;
 	goto L_Done;
 
 L_YesShield:
@@ -223,8 +215,8 @@ L_YesShield:
         menu	"Sure, have a look!", -,
 		"No.", L_Pass;
 
-	if (countitem(@INFANTRY) == 1) goto L_MoreInfantry;
-        if (countitem(@INFANTRY) == 0) goto L_NoInfantry;
+	if (countitem("InfantryHelmet") == 1) goto L_MoreInfantry;
+        if (countitem("InfantryHelmet') == 0) goto L_NoInfantry;
 
         mes "[Nicholas]";
         mes "Nicholas pulls out two of your infantry helmets.";
@@ -241,9 +233,9 @@ L_YesShield:
         	"No way.", L_Pass;
 
 	if (zeny < 20000) goto L_ShieldNoZeny;
-	if (countitem(@INFANTRY) < 2) goto L_ShieldNoInfantry;
-	if (countitem(@IRON_ORE) < 10) goto L_ShieldNoOre;
-	if (countitem(@LEATHER_PATCH) < 1) goto L_ShieldNoLeatherPatch;
+	if (countitem("InfantryHelmet") < 2) goto L_ShieldNoInfantry;
+	if (countitem("IronOre") < 10) goto L_ShieldNoOre;
+	if (countitem("LeatherPatch") < 1) goto L_ShieldNoLeatherPatch;
 	// No inventory check needed, as infantry helms are removed, opening two slots
 
         mes "[Nicholas]";
@@ -251,10 +243,10 @@ L_YesShield:
         mes "You watch Nicholas melt the ore and helmets and form a shield out of the resulting iron.  He then cuts your leather patch apart and adds it to the handles.";
         mes "\"Here is your shield!\"";
 
-        delitem @INFANTRY, 1;
-        delitem @INFANTRY, 1;
-        delitem @LEATHER_PATCH, 1;
-        delitem @IRON_ORE, 10;
+        delitem "InfantryHelmet", 1;
+        delitem "InfantryHelmet", 1;
+        delitem "LeatherPatch", 1;
+        delitem "IronOre", 10;
         set zeny, zeny - 20000;
 
         if (@Q_SHIELD_status < @SHIELD_COMPLETED)
@@ -265,7 +257,7 @@ L_YesShield:
         set @Q_SHIELD_status, @SHIELD_COMPLETED; // get XP only once
         callsub L_Update_Var;
 
-        getitem @STEEL_SHIELD, 1;
+        getitem "SteelShield", 1;
         next;
         close;
 
@@ -330,20 +322,20 @@ L_SetzerQuest:
              "HOW much?  Never mind.", L_Pass;
 
 	if (zeny < 50000) goto L_SetzerNoZeny;
-	if (countitem(@IRON_ORE) < 5) goto L_SetzerNoOre;
-	if (countitem(@MONSTER_OIL) < 1) goto L_SetzerNoMonsterOil;
-	if (countitem(@SHORT_SWORD) < 1) goto L_SetzerNoSword;
+	if (countitem("IronOre") < 5) goto L_SetzerNoOre;
+	if (countitem("MonsterOilPotion") < 1) goto L_SetzerNoMonsterOil;
+	if (countitem("ShortSword") < 1) goto L_SetzerNoSword;
 	// No inventory check needed, as the short sword is removed, opening a slot
 
         mes "[Nicholas]";
         mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer.  Before your eyes it turns thinner and flatter.  Finally he pours the monster oil over it, heats it up again and douses it in water.";
 
         set zeny, zeny - 50000;
-        delitem @IRON_ORE, 5;
-        delitem @MONSTER_OIL, 1;
-        delitem @SHORT_SWORD, 1;
+        delitem "IronOre", 5;
+        delitem "MonsterOilPotion", 1;
+        delitem "ShortSword", 1;
 
-        getitem @SETZER, 1;
+        getitem "Setzer", 1;
         if (!(@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER))
 		mes "[" + @SETZER_XP + " experience points]";
         if (!(@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER))
diff --git a/npc/009-2_Hurnscald/waitress.txt b/npc/009-2_Hurnscald/waitress.txt
index bcf2f434..4bf018ee 100644
--- a/npc/009-2_Hurnscald/waitress.txt
+++ b/npc/009-2_Hurnscald/waitress.txt
@@ -3,8 +3,8 @@
 009-2.gat,60,52,0	script	Melinda	140,{
 	if (zeny < 180) goto L_NoMoney;
 	getinventorylist;
-	set @beerCount, countitem(539);
-	if (@inventorylist_count == 100 && beerCount < 0) goto L_TooMany;
+	set @beerCount, countitem("Beer");
+	if (@inventorylist_count == 100 && beerCount == 0) goto L_TooMany;
 
 	mes "[Melinda]";
 	mes "\"Hi sweety! Want a fresh beer for 170gp?\"";
@@ -19,24 +19,24 @@
 	mes "[Melinda]";
 	mes "Pff... nickel nurser!";
 	next;
-	set zeny,zeny-170;
-	getitem 539,1;
+	set zeny, zeny - 170;
+	getitem "Beer", 1;
 	close;
 
 L_5Tip:
 	mes "[Melinda]";
 	mes "\"Here you go, sweethearth!\"";
 	next;
-	set zeny,zeny-175;
-	getitem 539,1;
+	set zeny, zeny - 175;
+	getitem "Beer", 1;
 	close;
 
 L_10Tip:
 	mes "[Melinda]";
 	mes "\"Thank you, sweety! Want me to hear a secret?\"";
 	next;
-	set zeny,zeny-180;
-	getitem 539,1;
+	set zeny, zeny - 180;
+	getitem "Beer", 1;
 	menu
 		"What's it, darling?", -,
 		"Nah, I don't feel like chatting.", L_No;
diff --git a/npc/009-2_Hurnscald/wyara.txt b/npc/009-2_Hurnscald/wyara.txt
index d6ff9165..1cce5d90 100644
--- a/npc/009-2_Hurnscald/wyara.txt
+++ b/npc/009-2_Hurnscald/wyara.txt
@@ -12,12 +12,6 @@
         set @STATUS_PURIFY_TWICE, 3;
         set @STATUS_PURIFY_OVER, 4;
 
-	set @MAUVE, 680;
-	set @MAGGOTSLIME, 505;
-	set @BOTTLE_WATER, 541;
-	set @MANAPOTION, 705;
-        set @PURIFICATIONPOTION, 733;
-
 	set @has_magic, getskilllv(SKILL_MAGIC);
 
         if (@Q_status == @STATUS_PURIFY_ONCE)
@@ -123,18 +117,18 @@ L_manapotion_toomany:
         goto L_Main;
 
 L_make_manapotion:
-	if(countitem(@MAUVE) < 40) goto L_make_manapotion_lack;
-	if(countitem(@BOTTLE_WATER) < 1) goto L_make_manapotion_lack;
+	if(countitem("MauveHerb") < 40) goto L_make_manapotion_lack;
+	if(countitem("BottleOfWater") < 1) goto L_make_manapotion_lack;
 	getinventorylist;
 	if ((@inventorylist_count == 100)
-            && (countitem(@MAUVE) > 40)
-            && (countitem(@BOTTLE_WATER) > 100)
-            && (countitem(@MANAPOTION) < 1))
+            && (countitem("MauveHerb") > 40)
+            && (countitem("BottleOfWater") > 100)
+            && (countitem("ManaPotion") < 1))
         	goto L_manapotion_toomany;
 
-        delitem @MAUVE, 40;
-        delitem @BOTTLE_WATER, 1;
-        getitem @MANAPOTION, 1;
+        delitem "MauveHerb", 40;
+        delitem "BottleOfWater", 1;
+        getitem "ManaPotion", 1;
 
         mes "[Wyara the Witch]";
         mes "Wyara takes your mauve leaves, grinds them, and pours some of the resultant paste into her cauldron.  She then takes your bottle and sticks it into her brew, head-first.";
@@ -291,7 +285,7 @@ L_Magic_train:
         set @Q_status, @STATUS_PURIFY_EXPLAINED;
         callsub S_update_var;
 L_Magic_purify_explained:
-        if (countitem(@PURIFICATIONPOTION))
+        if (countitem("PurificationPotion"))
 		goto L_Magic_purify_doit;
 
         mes "[Wyara the Witch]";
@@ -304,17 +298,17 @@ L_Magic_purify_explained:
 		"Here they are.", -;
 
 	getinventorylist;
-	if ((@inventorylist_count == 100) && (countitem(@MAUVE) > 20) && (countitem(@MAGGOTSLIME) > 20))
+	if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
 		goto L_Magic_purify_nospace;
 
-        if (countitem(@MAUVE) < 20)
+        if (countitem("MauveHerb") < 20)
 		goto L_Magic_purify_lacking;
-        if (countitem(@MAGGOTSLIME) < 20)
+        if (countitem("MaggotSlime") < 20)
 		goto L_Magic_purify_lacking;
         
-	delitem @MAUVE, 20;
-	delitem @MAGGOTSLIME, 20;
-        getitem @PURIFICATIONPOTION, 1;
+	delitem "MauveHerb", 20;
+	delitem "MaggotSlime", 20;
+        getitem "PurificationPotion", 1;
         mes "[Wyara the Witch]";
         mes "\"Wyara grinds the leaves and mixes them with the slime, boils them, then speaks a brief incantation over them and hands you the result.\"";
         next;
@@ -343,7 +337,7 @@ L_Magic_purify_once:
         mes "\"You have purified the pond a little, but not enough, I think.  We'll need another potion.\"";
         next;
 
-        if (countitem(@PURIFICATIONPOTION))
+        if (countitem("PurificationPotion"))
 		goto L_Magic_purify_doit2;
 
         mes "[Wyara the Witch]";
@@ -355,17 +349,17 @@ L_Magic_purify_once:
 		"No way.", L_Main,
 		"Here you are.", -;
 	getinventorylist;
-	if ((@inventorylist_count == 100) && (countitem(@MAUVE) > 20) && (countitem(@MAGGOTSLIME) > 20))
+	if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
 		goto L_Magic_purify_nospace;
 
-        if (countitem(@MAUVE) < 20)
+        if (countitem("MauveHerb") < 20)
 		goto L_Magic_purify_lacking;
-        if (countitem(@MAGGOTSLIME) < 20)
+        if (countitem("MaggotSlime") < 20)
 		goto L_Magic_purify_lacking;
         
-	delitem @MAUVE, 20;
-	delitem @MAGGOTSLIME, 20;
-        getitem @PURIFICATIONPOTION, 1;
+	delitem "MauveHerb", 20;
+	delitem "MaggotSlime", 20;
+        getitem "PurificationPotion", 1;
         mes "[Wyara the Witch]";
         mes "\"Wyara brews another purification potion.\"";
         next;