Some more "ItemName" conversions

10 files changed, 287 insertions, 357 deletions

diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt
index 84dc15d9..71c0a901 100644
--- a/npc/009-1_Hurnscald/jack.txt
+++ b/npc/009-1_Hurnscald/jack.txt
@@ -15,9 +15,7 @@
 
 // Lumberjack
 009-1.gat,40,45,0	script	Jack	141, {
-	set @RAWLOG, 569;
 	set @RAWLOGS_AMOUNT, 40;
-	set @WOODENSHIELD, 602;
 	set @SHIELD_COST, 5000;
 	set @QUEST_SHIELD_EXP, 2500;
 
@@ -181,15 +179,15 @@ L_Shield_state_2:
 	mes "\"Let's see if you have enough of everything.\"";
 	next;
 
-	if (countitem(@RAWLOG) < @RAWLOGS_AMOUNT) goto L_Not_enough_logs;
+	if (countitem("RawLog") < @RAWLOGS_AMOUNT) goto L_Not_enough_logs;
 	if (zeny < @SHIELD_COST) goto L_Not_enough_money;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 
-	delitem @RAWLOG, @RAWLOGS_AMOUNT;
+	delitem "RawLog", @RAWLOGS_AMOUNT;
 	set zeny, zeny - @SHIELD_COST;
 	getexp @QUEST_SHIELD_EXP, 0;
-	getitem @WOODENSHIELD, 1;
+	getitem "WoodenShield", 1;
 
 	set @Q_Woodenshield, 3;
         callsub S_Update_Mask;
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;
diff --git a/npc/010-2_Dimonds_Cove/doug.txt b/npc/010-2_Dimonds_Cove/doug.txt
index 49bb349c..146e2ffd 100644
--- a/npc/010-2_Dimonds_Cove/doug.txt
+++ b/npc/010-2_Dimonds_Cove/doug.txt
@@ -1,7 +1,7 @@
 010-2.gat,68,87,0	script	Doug	113,{
 	if(CaveSnakeLamp == 1) goto L_State2;
 	if(CaveSnakeLamp == 2) goto L_Done;
-	set @TEMP,rand(4);
+	set @TEMP, rand(4);
 	if(@TEMP == 0) goto L_0;
 	if(@TEMP == 1) goto L_1;
 	if(@TEMP == 2) goto L_2;
@@ -38,7 +38,7 @@ L_Question:
 
 L_Sure:
 	set CaveSnakeLamp, 1;
-	set @TEMP,rand(4);
+	set @TEMP, rand(4);
 	if(@TEMP == 0) goto J_0;
 	if(@TEMP == 1) goto J_1;
 	if(@TEMP == 2) goto J_2;
@@ -74,13 +74,13 @@ L_Go:
 	close;
 
 L_State2:
-	if(countitem(612) >= 40) goto L_Have;
+	if(countitem("CaveSnakeLamp") >= 40) goto L_Have;
 	mes "[Doug]";
 	mes "\"Please help me collect 40 [Cave Snake Lamps]!\"";
 	close;
 
 L_Have:
-	delitem 612, 40;
+	delitem "CaveSnakeLamp", 40;
 	mes "[Doug]";
 	mes "\"Cool! Now I can make this light!\"";
 	next;
diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt
index 77336fb6..f2350a4c 100644
--- a/npc/010-2_Dimonds_Cove/loratay.txt
+++ b/npc/010-2_Dimonds_Cove/loratay.txt
@@ -1,9 +1,5 @@
 010-2.gat,85,85,0	script	Lora Tay	151,{
 
-        set @COTTON, 660;
-        set @SILK_COCOON, 718;
-
-        set @SILK_ROBE, 720;
         set @ROBE_COCOONS_NR, 150; // must be multiple of ten
         set @ROBE_ZENY, 10000;
 
@@ -244,7 +240,7 @@ L_main_menu:
 L_desert_hat:
         mes "[Lora Tay the Seamstress]";
         mes "The seamstress sighs.";
-        mes "\"One of these days it would be nice to have an actual challenge... yes, of course I can make a desert hat.  A cotton headband, three pieces of cotton cloth.  Hmm.  And let's add 300 GP to that.\"";
+        mes "\"One of these days it would be nice to have an actual challenge... yes, of course I can make a desert hat.  A [Cotton headband], three pieces of [cotton cloth].  Hmm.  And let's add 300 GP to that.\"";
         next;
 
         set @default_choice$, "Never mind.";
@@ -262,13 +258,13 @@ L_desert_hat:
 
         if (countitem(@item) < 1)
         	goto L_desert_hat_noheadband;
-        if (countitem(@COTTON) < 3)
+        if (countitem("CottonCloth") < 3)
         	goto L_desert_hat_nocotton;
         if (zeny < 300)
         	goto L_desert_hat_nogp;
 
         delitem @item, 1;
-        delitem @COTTON, 3;
+        delitem "CottonCloth", 3;
         set zeny, zeny - 300;
         getitem @genitem, 1;
         mes "[Lora Tay the Seamstress]";
@@ -350,7 +346,7 @@ L_trim_nozeny:
 
 L_lengthen:
         mes "[Lora Tay the Seamstress]";
-        mes "\"Naturally, I will need a piece of cotton to sew onto it; I must also charge you some... hmm... does 500 GP sound reasonable?  Yes, I think I shall charge that.\"";
+        mes "\"Naturally, I will need a piece of [cotton cloth] to sew onto it; I must also charge you some... hmm... does 500 GP sound reasonable?  Yes, I think I shall charge that.\"";
         mes "\"Now, let me see.  What is it that you want lengthened?\"";
         next;
 
@@ -372,10 +368,10 @@ L_lengthen:
 
         if (@genitem == 0) goto L_lengthen_impossible;
         if (zeny < 500) goto L_lengthen_nozeny;
-        if (countitem (@COTTON) < 1) goto L_lengthen_nocotton;
+        if (countitem ("CottonCloth") < 1) goto L_lengthen_nocotton;
 
         delitem @delitem, 1;
-        delitem @COTTON, 1;
+        delitem "CottonCloth", 1;
         getitem @genitem, 1;
         set zeny, zeny - 500;
         mes "[Lora Tay the Seamstress]";
@@ -422,18 +418,18 @@ L_tanktop:
 
 L_tanktop_menu:
         menu "I think I would like something else.", L_main_menu,
-             "A tank top, please (6 cotton)", L_tanktop_long,
-             "A short tank top, please (5 cotton)", L_tanktop_short,
+             "A tank top, please (6 [cotton cloth])", L_tanktop_long,
+             "A short tank top, please (5 [cotton cloth])", L_tanktop_short,
              "Goodbye for now.", L_end;
 
 L_tanktop_short:
-        if (countitem (@COTTON) < 5) goto L_tanktop_insufficient_cloth;
+        if (countitem ("CottonCloth") < 5) goto L_tanktop_insufficient_cloth;
         if (zeny < 1000) goto L_tanktop_insufficient_zeny;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@COTTON) > 5) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("CottonCloth") > 5) goto L_TooMany;
         set zeny, zeny - 1000;
-        delitem @COTTON, 5;
-        getitem 689, 1;
+        delitem "CottonCloth", 5;
+        getitem "WhiteShortTankTop", 1;
         mes "[Lora Tay the Seamstress]";
         mes "You watch as Lora sews the pieces of cloth together, then flattens the seams and ends with some odd liquid.";
         mes "Amazingly, the result looks like a single piece of cloth.";
@@ -443,13 +439,13 @@ L_tanktop_short:
         goto L_tanktop_menu;
 
 L_tanktop_long:
-        if (countitem (@COTTON) < 6) goto L_tanktop_insufficient_cloth;
+        if (countitem ("CottonCloth") < 6) goto L_tanktop_insufficient_cloth;
         if (zeny < 1000) goto L_tanktop_insufficient_zeny;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@COTTON) > 6) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("CottonCloth") > 6) goto L_TooMany;
         set zeny, zeny - 1000;
-        delitem @COTTON, 6;
-        getitem 688, 1;
+        delitem "CottonCloth", 6;
+        getitem "WhiteTankTop", 1;
         mes "[Lora Tay the Seamstress]";
         mes "After combining your pieces of cloth into one-- miraculously making the seams and stitches vanish-- the seamstress cuts out all that doesn't belong into a tank top, then folds and stabilises the edges with additional seam lines.";
         mes "\"There you are.  Don't worry, I have trimmed it to match your size perfectly.\"";
@@ -458,7 +454,7 @@ L_tanktop_long:
 
 L_tanktop_insufficient_cloth:
         mes "[Lora Tay the Seamstress]";
-        mes "\"No, no, no, count again-- how much cloth did I say I needed?  That's not enough.\"";
+        mes "\"No, no, no, count again-- how much [cotton cloth] did I say I needed?  That's not enough.\"";
         next;
         goto L_tanktop_menu;
 
@@ -482,7 +478,7 @@ L_robe:
         mes "\"A robe?  Well, as long as you're not asking me to make it out of cotton...\"";
         next;
 
-        if (countitem(@SILK_COCOON) == 0)
+        if (countitem("SilkCocoon") == 0)
         	goto L_robe_nosilk;
 
 L_robe_menu:
@@ -494,7 +490,7 @@ L_robe_menu:
 
         mes "[Lora Tay the Seamstress]";
         mes "The seamstress stares at you as if you had gone out of your mind.";
-        mes "\"And what precisely do you expect me to do with silk cocoons?  String them together in some baubly chain?  Somehow remove the thread and spin and weave it so that some random person can have their robe?\"";
+        mes "\"And what precisely do you expect me to do with [silk cocoons]?  String them together in some baubly chain?  Somehow remove the thread and spin and weave it so that some random person can have their robe?\"";
         next;
 
         menu "Will you trade cocoons for sheets?", -,
@@ -517,18 +513,18 @@ L_robe_menu:
         menu "I'm not interested.", L_main_menu,
              "Very well then, here you are.", -;
 
-        if (countitem(@SILK_COCOON) < @ROBE_COCOONS_NR)
+        if (countitem("SilkCocoon") < @ROBE_COCOONS_NR)
 		goto L_robe_missing_cocoons;
 
         if (zeny < @ROBE_ZENY)
 		goto L_robe_missing_zeny;
 
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@SILK_COCOON) > @ROBE_COCOONS_NR) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("SilkCocoon") > @ROBE_COCOONS_NR) goto L_TooMany;
 
         set zeny, zeny - @ROBE_ZENY;
-        delitem @SILK_COCOON, @ROBE_COCOONS_NR;
-        getitem @SILK_ROBE, 1;
+        delitem "SilkCocoon", @ROBE_COCOONS_NR;
+        getitem "SilkRobe", 1;
         mes "[Lora Tay the Seamstress]";
         mes "The seamstress puts your cocoons and GP away, takes your measurements and pulls out several silk sheets.  She asks you to stretch out your arms, then pins the silk sheets in place all over your body.";
         next;
@@ -551,7 +547,7 @@ L_robe_menu:
 
 L_robe_missing_cocoons:
         mes "[Lora Tay the Seamstress]";
-        mes "\"" + @ROBE_COCOONS_NR + " cocoons is what I said, not " + countitem(@SILK_COCOON) + ".";
+        mes "\"" + @ROBE_COCOONS_NR + " cocoons is what I said, not " + countitem("SilkCocoon") + ".";
         mes @ROBE_COCOONS_NR + " is " + (@ROBE_COCOONS_NR / 10) + " as many times as you have fingers, in case that helps.\"";
         next;
         goto L_main_menu;
diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index a15884cc..da890e7d 100644
--- a/npc/011-1_Woodland/alchemist.txt
+++ b/npc/011-1_Woodland/alchemist.txt
@@ -14,20 +14,6 @@
         set @Q_status, (QUEST_Forestbow_state & @Q_MASK) >> @Q_SHIFT;
         // End of Setzer quest/monster oil quest participation
 
-	set @RED, 683;
-	set @YELLOW, 682;
-	set @BLUE, 681;
-	set @MAUVE, 680;
-	set @PETAL, 565;
-	set @PEARL, 700;
-	set @WATER, 541;
-	set @ASH, 701;
-	set @MANAPOTION, 705;
-	set @ORE, 640;
-	set @MAGGOTSLIME, 505;
-        set @SULPHUR, 703;
-        set @IRONPOWDER, 704;
-
 	set @QUEST_CAN_GET_DYE_HERE, 2;
 	set @QUEST_HAS_SOLVED_DYE_PUZZLE, 3;
 	set @QUEST_GUESS_BASE, 4;
@@ -153,18 +139,18 @@ L_iron_powder:
 		"Never mind.", L_abort,
 		"Here you are!", -;
 
-        if (countitem(@ORE) < 1)
+        if (countitem("IronOre") < 1)
 		goto L_iron_powder_noore;
         if (zeny < 100)
 		goto L_iron_powder_nozeny;
 	getinventorylist;
 	if (@inventorylist_count == 100
-            && countitem(@ORE) > 1
-            && countitem(@IRONPOWDER) < 1)
+            && countitem("IronOre") > 1
+            && countitem("IronPowder") < 1)
 		goto L_iron_powder_full;
-        delitem @ORE, 1;
+        delitem "IronOre", 1;
         set zeny, zeny - 100;
-        getitem @IRONPOWDER, 4;
+        getitem "IronPowder", 4;
 	mes "[Rauk the Alchemist]";
         mes "Rauk places your chunk of ore in a strange glass container, then pours a steaming yellow liquid over it.  Before your eyes, the ore dissolves.";
         next;
@@ -203,18 +189,18 @@ L_sulphur:
 		"No, I won't!", L_abort,
 		"Here you are!", -;
 
-	if (countitem(@ASH) < 3) goto L_sulphur_noash;
-	if (countitem(@MAUVE) < 3) goto L_sulphur_nomauve;
+	if (countitem("PileOfAsh") < 3) goto L_sulphur_noash;
+	if (countitem("MauveHerb") < 3) goto L_sulphur_nomauve;
 	getinventorylist;
 	if (@inventorylist_count == 100
-            && countitem(@SULPHUR) == 0
-            && countitem(@ASH) > 3
-            && countitem(@MAUVE) > 3)
+            && countitem("SulphurPowder") == 0
+            && countitem("PileOfAsh") > 3
+            && countitem("MauveHerb") > 3)
 		goto L_sulphur_nospace;
 
-        delitem @ASH, 3;
-        delitem @MAUVE, 3;
-        getitem @SULPHUR, 12;
+        delitem "PileOfAsh", 3;
+        delitem "MauveHerb", 3;
+        getitem "SulphurPowder", 12;
 	mes "[Rauk the Alchemist]";
         mes "You watch Rauk burn the mauve leaves in the midst of the ashes.  He then dissolves the result and pours it through a filter, finally heating up the residual liquid.";
         next;
@@ -258,26 +244,26 @@ L_mana_potion:
 	goto L_main_menu;
 
 L_get_mana_potion:
-	if(countitem(@MAUVE) < 30) goto L_mana_potion_lacking;
-	if(countitem(@YELLOW) < 20) goto L_mana_potion_lacking;
-	if(countitem(@ASH) < 5) goto L_mana_potion_lacking;
-	if(countitem(@PEARL) < 1) goto L_mana_potion_lacking;
-	if(countitem(@WATER) < 1) goto L_mana_potion_lacking;
+	if(countitem("MauveHerb") < 30) goto L_mana_potion_lacking;
+	if(countitem("GambogeHerb") < 20) goto L_mana_potion_lacking;
+	if(countitem("PileOfAsh") < 5) goto L_mana_potion_lacking;
+	if(countitem("Pearl") < 1) goto L_mana_potion_lacking;
+	if(countitem("BottleOfWater") < 1) goto L_mana_potion_lacking;
 	getinventorylist;
 	if ((@inventorylist_count == 100)
-            && (countitem(@MAUVE) > 30)
-            && (countitem(@ASH) > 5)
-            && (countitem(@PEARL) > 1)
-            && (countitem(@WATER) > 1)
-            && (countitem(@MANAPOTION) < 1))
+            && (countitem("MauveHerb") > 30)
+            && (countitem("PileOfAsh") > 5)
+            && (countitem("Pearl") > 1)
+            && (countitem("BottleOfWater") > 1)
+            && (countitem("ManaPotion") < 1))
         	goto L_mana_potion_toomuch;
 
-        delitem @MAUVE, 30;
-        delitem @YELLOW, 20;
-        delitem @ASH, 5;
-        delitem @PEARL, 1;
-        delitem @WATER, 1;
-        getitem @MANAPOTION, 1;
+        delitem "MauveHerb", 30;
+        delitem "GambogeHerb", 20;
+        delitem "PileOfAsh", 5;
+        delitem "Pearl", 1;
+        delitem "BottleOfWater", 1;
+        getitem "ManaPotion", 1;
 
 	mes "[Rauk the Alchemist]";
         mes "Rauk grinds the leaves, then crushes the pearl.  Taking out a small charcoal oven, he heats up your water bottle and dissolves first the pearl powder, then the ashes.";
@@ -303,38 +289,38 @@ L_mana_potion_toomuch:
 
 L_mana_potion_lacking:
 	mes "[Rauk the Alchemist]";
-        mes "\"Sorry, but I need one pearl, one bottle of water, 30 mauve leaves, 20 gamboge leaves, and five piles of volcanic ash.\"";
+        mes "\"Sorry, but I need one [pearl], one [bottle of water], 30 [mauve leaves], 20 [gamboge leaves], and five piles of [volcanic ash].\"";
         next;
         goto L_main_menu;
 
 L_iron:
-  	if(countitem(566) < 20) goto L_no_iron;
+  	if(countitem("SmallMushroom") < 20) goto L_no_iron;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(566) > 20) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("SmallMushroom") > 20) goto L_TooMany;
 	mes "[Rauk the Alchemist]";
 	mes "\"Great! You brought me exactly what I need!";
 	mes "Here is your Iron potion.\"";
-	delitem 566,20;
-	getitem 567,1;
+	delitem "SmallMushroom", 20;
+	getitem "IronPotion", 1;
 	close;
 
 L_concentration:
-	if(countitem(565) < 20) goto L_no_concentration;
+	if(countitem("Petal") < 20) goto L_no_concentration;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(565) > 20) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("Petal") > 20) goto L_TooMany;
 	mes "[Rauk the Alchemist]";
 	mes "\"Great! You brought me exactly what I need!";
 	mes "Here is your Concentration potion.\"";
-	delitem 565,20;
-	getitem 568,1;
+	delitem "Petal", 20;
+	getitem "ConcentrationPotion", 1;
 	close;
 
 L_no_iron:
-	mes "\"You have to bring me 20 small mushrooms.\"";
+	mes "\"You have to bring me 20 [small mushrooms].\"";
 	close;
 	
 L_no_concentration:
-	mes "\"You have to bring me 20 petals.\"";
+	mes "\"You have to bring me 20 [petals].\"";
 	close;
 
 L_dyeing_intro:
@@ -464,11 +450,11 @@ L_ok:
 	goto L_pick_colour;
 
 L_red:
-	if (countitem(@RED) < 10) goto L_red_fail;
+	if (countitem("AlizarinHerb") < 10) goto L_red_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@RED) > 10) goto L_TooMany;
-	delitem @RED, 10;
-	getitem 690, 1;
+	if (@inventorylist_count == 100 && countitem("AlizarinHerb") > 10) goto L_TooMany;
+	delitem "AlizarinHerb", 10;
+	getitem "RedDye", 1;
 	goto L_ok;
 
 L_red_fail:
@@ -484,11 +470,11 @@ L_d_red:
 	goto L_intermediate;
 
 L_yellow:
-	if (countitem(@YELLOW) < 10) goto L_yellow_fail;
+	if (countitem("GambogeHerb") < 10) goto L_yellow_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@YELLOW) > 10) goto L_TooMany;
-	delitem @YELLOW, 10;
-	getitem 693, 1;
+	if (@inventorylist_count == 100 && countitem("GambogeHerb") > 10) goto L_TooMany;
+	delitem "GambogeHerb", 10;
+	getitem "YellowDye", 1;
 	goto L_ok;
 
 L_yellow_fail:
@@ -504,11 +490,11 @@ L_d_yellow:
 	goto L_intermediate;
 
 L_light_blue:
-	if (countitem(@BLUE) < 10) goto L_light_blue_fail;
+	if (countitem("CobaltHerb") < 10) goto L_light_blue_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@BLUE) > 10) goto L_TooMany;
-	delitem @BLUE, 10;
-	getitem 694, 1;
+	if (@inventorylist_count == 100 && countitem("CobaltHerb") > 10) goto L_TooMany;
+	delitem "CobaltHerb", 10;
+	getitem "LightBlueDye", 1;
 	goto L_ok;
 
 L_light_blue_fail:
@@ -524,15 +510,15 @@ L_d_light_blue:
 	goto L_intermediate;
 
 L_green:
-	if (countitem(@BLUE) < 20) goto L_green_fail;
-	if (countitem(@YELLOW) < 20) goto L_green_fail;
+	if (countitem("CobaltHerb") < 20) goto L_green_fail;
+	if (countitem("GambogeHerb") < 20) goto L_green_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@BLUE) > 20 && countitem(@YELLOW) > 20) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("CobaltHerb") > 20 && countitem("GambogeHerb") > 20) goto L_TooMany;
 	if (zeny < 1000) goto L_green_fail;
-	delitem @BLUE, 20;
-	delitem @YELLOW, 20;
+	delitem "CobaltHerb", 20;
+	delitem "GambogeHerb", 20;
 	set zeny, zeny - 1000;
-	getitem 691, 1;
+	getitem "GreenDye", 1;
 	goto L_ok;
 
 L_green_fail:
@@ -553,17 +539,17 @@ L_d_green:
 	goto L_intermediate;
 
 L_orange:
-	if (countitem(@RED) < 10) goto L_orange_fail;
-	if (countitem(@YELLOW) < 10) goto L_orange_fail;
-	if (countitem(@ORE) < 2) goto L_orange_fail;
+	if (countitem("AlizarinHerb") < 10) goto L_orange_fail;
+	if (countitem("GambogeHerb") < 10) goto L_orange_fail;
+	if (countitem("IronOre") < 2) goto L_orange_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@RED) > 10 && countitem(@YELLOW) > 10 && countitem(@ORE) > 2) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("AlizarinHerb") > 10 && countitem("GambogeHerb") > 10 && countitem("IronOre") > 2) goto L_TooMany;
 	if (zeny < 1000) goto L_orange_fail;
-	delitem @RED, 10;
-	delitem @YELLOW, 10;
-	delitem @ORE, 2;
+	delitem "AlizarinHerb", 10;
+	delitem "GambogeHerb", 10;
+	delitem "IronOre", 2;
 	set zeny, zeny - 1000;
-	getitem 697, 1;
+	getitem "OrangeDye", 1;
 	goto L_ok;
 
 L_orange_fail:
@@ -580,15 +566,15 @@ L_d_orange:
 	goto L_intermediate;
 
 L_pink:
-	if (countitem(@RED) < 10) goto L_pink_fail;
-	if (countitem(@PETAL) < 6) goto L_pink_fail;
+	if (countitem("AlizarinHerb") < 10) goto L_pink_fail;
+	if (countitem("Petal") < 6) goto L_pink_fail;
 	if (zeny < 1000) goto L_pink_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@RED) > 10 && countitem(@PETAL) > 6) goto L_TooMany;
-	delitem @RED, 10;
-	delitem @PETAL, 6;
+	if (@inventorylist_count == 100 && countitem("AlizarinHerb") > 10 && countitem("Petal") > 6) goto L_TooMany;
+	delitem "AlizarinHerb", 10;
+	delitem "Petal", 6;
 	set zeny, zeny - 1000;
-	getitem 695, 1;
+	getitem "PinkDye", 1;
 	goto L_ok;
 
 L_pink_fail:
@@ -605,17 +591,17 @@ L_d_pink:
 	goto L_intermediate;
 
 L_dark_blue:
-	if (countitem(@BLUE) < 100) goto L_dark_blue_fail;
-	if (countitem(@MAUVE) < 50) goto L_dark_blue_fail;
-	if (countitem(@PEARL) < 1) goto L_dark_blue_fail;
+	if (countitem("CobaltHerb") < 100) goto L_dark_blue_fail;
+	if (countitem("MauveHerb") < 50) goto L_dark_blue_fail;
+	if (countitem("Pearl") < 1) goto L_dark_blue_fail;
 	if (zeny < 10000) goto L_dark_blue_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@BLUE) > 100 && countitem(@MAUVE) > 50 && countitem(@PEARL) > 1) goto L_TooMany;
-	delitem @BLUE, 100;
-	delitem @MAUVE, 50;
-	delitem @PEARL, 1;
+	if (@inventorylist_count == 100 && countitem("CobaltHerb") > 100 && countitem("MauveHerb") > 50 && countitem("Pearl") > 1) goto L_TooMany;
+	delitem "CobaltHerb", 100;
+	delitem "MauveHerb", 50;
+	delitem "Pearl", 1;
 	set zeny, zeny - 10000;
-	getitem 692, 1;
+	getitem "DarkBlueDye", 1;
 	goto L_ok;
 
 L_dark_blue_fail:
@@ -633,19 +619,19 @@ L_d_dark_blue:
 	goto L_intermediate;
 
 L_purple:
-	if (countitem(@BLUE) < 100) goto L_purple_fail;
-	if (countitem(@RED) < 100) goto L_purple_fail;
-	if (countitem(@MAUVE) < 20) goto L_purple_fail;
-	if (countitem(@PEARL) < 1) goto L_purple_fail;
+	if (countitem("CobaltHerb") < 100) goto L_purple_fail;
+	if (countitem("AlizarinHerb") < 100) goto L_purple_fail;
+	if (countitem("MauveHerb") < 20) goto L_purple_fail;
+	if (countitem("Pearl") < 1) goto L_purple_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@BLUE) > 100 && countitem(@RED) > 100 && countitem(@MAUVE) > 20 && countitem(@PEARL) > 1) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("CobaltHerb") > 100 && countitem("AlizarinHerb") > 100 && countitem("MauveHerb") > 20 && countitem("Pearl") > 1) goto L_TooMany;
 	if (zeny < 40000) goto L_purple_fail;
-	delitem @BLUE, 100;
-	delitem @RED, 100;
-	delitem @MAUVE, 20;
-	delitem @PEARL, 1;
+	delitem "CobaltHerb", 100;
+	delitem "AlizarinHerb", 100;
+	delitem "MauveHerb", 20;
+	delitem "Pearl", 1;
 	set zeny, zeny - 40000;
-	getitem 698, 1;
+	getitem "PurpleDye", 1;
 	goto L_ok;
 
 L_purple_fail:
@@ -666,19 +652,19 @@ L_d_purple:
 	goto L_intermediate;
 
 L_black:
-	if (countitem(@BLUE) < 40) goto L_black_fail;
-	if (countitem(@RED) < 40) goto L_black_fail;
-	if (countitem(@YELLOW) < 40) goto L_black_fail;
-	if (countitem(@MAUVE) < 40) goto L_black_fail;
+	if (countitem("CobaltHerb") < 40) goto L_black_fail;
+	if (countitem("AlizarinHerb") < 40) goto L_black_fail;
+	if (countitem("GambogeHerb") < 40) goto L_black_fail;
+	if (countitem("MauveHerb") < 40) goto L_black_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@BLUE) > 40 && countitem(@RED) > 40 && countitem(@YELLOW) > 40 && countitem(@MAUVE) > 40) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("CobaltHerb") > 40 && countitem("AlizarinHerb") > 40 && countitem("GambogeHerb") > 40 && countitem("MauveHerb") > 40) goto L_TooMany;
 	if (zeny < 20000) goto L_black_fail;
-	delitem @BLUE, 40;
-	delitem @RED, 40;
-	delitem @YELLOW, 40;
-	delitem @MAUVE, 40;
+	delitem "CobaltHerb", 40;
+	delitem "AlizarinHerb", 40;
+	delitem "GambogeHerb", 40;
+	delitem "MauveHerb", 40;
 	set zeny, zeny - 20000;
-	getitem 696, 1;
+	getitem "BlackDye", 1;
 	goto L_ok;
 
 L_black_fail:
@@ -700,19 +686,19 @@ L_d_black:
 L_dark_green:
 	if (QUEST_clothdyer_knowsdye != @QUEST_HAS_SOLVED_DYE_PUZZLE)
 		goto L_d_dark_green;
-	if (countitem(@BLUE) < 10) goto L_dark_green_fail;
-	if (countitem(@YELLOW) < 10) goto L_dark_green_fail;
-	if (countitem(@MAUVE) < 10) goto L_dark_green_fail;
-	if (countitem(@MAGGOTSLIME) < 1) goto L_dark_green_fail;
+	if (countitem("CobaltHerb") < 10) goto L_dark_green_fail;
+	if (countitem("GambogeHerb") < 10) goto L_dark_green_fail;
+	if (countitem("MauveHerb") < 10) goto L_dark_green_fail;
+	if (countitem("MaggotSlime") < 1) goto L_dark_green_fail;
 	if (zeny < 1000) goto L_dark_green_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(@BLUE) > 10 && countitem(@YELLOW) > 10 && countitem(@MAUVE) > 10 && countitem(@MAGGOTSLIME) > 1) goto L_TooMany;
-	delitem @BLUE, 10;
-	delitem @MAUVE, 10;
-	delitem @YELLOW, 10;
-	delitem @MAGGOTSLIME, 1;
+	if (@inventorylist_count == 100 && countitem("CobaltHerb") > 10 && countitem("GambogeHerb") > 10 && countitem("MauveHerb") > 10 && countitem("MaggotSlime") > 1) goto L_TooMany;
+	delitem "CobaltHerb", 10;
+	delitem "MauveHerb", 10;
+	delitem "GambogeHerb", 10;
+	delitem "MaggotSlime", 1;
 	set zeny, zeny - 1000;
-	getitem 699, 1;
+	getitem "DarkGreenDye", 1;
 	goto L_ok;
 
 L_dark_green_fail:
@@ -791,9 +777,9 @@ L_dark_green_q_explain:
 		"I don't have time for this.", L_intermediate;
 
 L_dark_green_q_guess_0:
-	if (countitem(@MAGGOTSLIME) < 1)
+	if (countitem("MaggotSlime") < 1)
 		goto L_dark_green_q_noslime;
-	delitem @MAGGOTSLIME, 1;
+	delitem "MaggotSlime", 1;
 
 	mes "[Rauk the Alchemist]";
 	mes "Rauk fills your maggot slime into a small bottle and picks a glass bottle from within his robe.";
diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index da41c63a..15e2c797 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -3,34 +3,6 @@
 
 011-1.gat,50,68,0	script	Auldsbel#_M	168,{
 
- 	set @RED, 683;
-	set @YELLOW, 682;
-	set @BLUE, 681;
-	set @MAUVE, 680;
-	set @PETAL, 565;
-	set @PEARL, 700;
-        set @WOOD, 569;
-	set @BOTTLE_WATER, 541;
-        set @MANA_POTION, 705;
-        set @SMALL_HEALING_POTION, 685;
-        set @MEDIUM_HEALING_POTION, 686;
-        set @IRON_POTION, 567;
-        set @CONCENTRATION_POTION, 568;
-        set @COCOON, 718;
-        set @STINGER, 507;
-        set @RED_STINGER, 517;
-        set @BLACK_STINGER, 709;
-        set @SNAKE_TONGUE, 710;
-        set @CAVE_SNAKE_TONGUE, 713;
-        set @MOUNTAIN_SNAKE_TONGUE, 711;
-        set @GRASS_SNAKE_TONGUE, 712;
-        set @MAGGOT_SLIME, 505;
-	set @ASH, 701;
-        set @SULPHUR, 703;
-        set @IRONPOWDER, 704;
-        set @MOUBOO_FIGURINE, 728;
-        set @BUGLEG, 518;
-
         set @mexp, MAGIC_EXPERIENCE & 65535;
 
         set @Q_STATUS_INITIAL, 0;
@@ -234,17 +206,17 @@ L_sulphur:
 L_sulphur_buy:
 	if (zeny < @cost)
 		goto L_sulphur_nozeny;
-	if (countitem(@ASH) < 1)
+	if (countitem("PileOfAsh") < 1)
 		goto L_sulphur_noash;
 	getinventorylist;
 	if (@inventorylist_count == 100
-            && countitem(@SULPHUR) > 1
-            && countitem(@ASH) == 0)
+            && countitem("SulphurPowder") > 1
+            && countitem("PileOfAsh") == 0)
 		goto L_sulphur_noroom;
 
         set zeny, zeny - @cost;
-        delitem @ASH, 1;
-        getitem @SULPHUR, 5;
+        delitem "PileOfAsh", 1;
+        getitem "SulphurPowder", 5;
         mes "[Auldsbel the Wizard]";
         mes "\"I shall transmute it later.  Here, have five half-ounces from my own stock.\"";
         next;
@@ -631,29 +603,29 @@ L_make_mana_potion:
 
         if (zeny < 10000)
 		goto L_make_mana_potion_missing;
-        if (countitem(@YELLOW) < 10)
+        if (countitem("GambogeHerb") < 10)
 		goto L_make_mana_potion_missing;
-        if (countitem(@MAUVE) < 20)
+        if (countitem("MauveHerb") < 20)
 		goto L_make_mana_potion_missing;
-        if (countitem(@PEARL) < 1)
+        if (countitem("Pearl") < 1)
 		goto L_make_mana_potion_missing;
-        if (countitem(@BOTTLE_WATER) < 1)
+        if (countitem("BottleOfWater") < 1)
 		goto L_make_mana_potion_missing;
 	getinventorylist;
 	if (@inventorylist_count == 100
-            && countitem(@YELLOW) > 10
-            && countitem(@MAUVE) > 20
-            && countitem(@PEARL) > 1
-            && countitem(@BOTTLE_WATER) > 1
-            && countitem(@MANA_POTION) < 1)
+            && countitem("GambogeHerb") > 10
+            && countitem("MauveHerb") > 20
+            && countitem("Pearl") > 1
+            && countitem("BottleOfWater") > 1
+            && countitem("ManaPotion") < 1)
         	goto L_mana_potion_toomuch;
 
         set zeny, zeny - 10000;
-        delitem @YELLOW, 10;
-        delitem @MAUVE, 20;
-        delitem @PEARL, 1;
-        delitem @BOTTLE_WATER, 1;
-        getitem @MANA_POTION, 1;
+        delitem "GambogeHerb", 10;
+        delitem "MauveHerb", 20;
+        delitem "Pearl", 1;
+        delitem "BottleOfWater", 1;
+        getitem "ManaPotion", 1;
 
         mes "[Auldsbel the Wizard]";
         mes "Auldsbel pockets your GP and the pearl, then stuffs the leaves into the bottle.  Holding the bottle between his hands, he focusses briefly.  The water and leaves flash bright red, then the leaves dissolve.";
@@ -738,10 +710,10 @@ L_component_quest_0:
 		"I have them here.", -,
                 "Sure, I will look for them.", L_main_menu;
 
-        if (countitem (@MAUVE) < 20)
+        if (countitem ("MauveHerb") < 20)
 		goto L_component_quest_missing;
 
-        delitem @MAUVE, 20;
+        delitem "MauveHerb", 20;
         set zeny, zeny + 2500;
         mes "[Auldsbel the Wizard]";
         mes "\"Well done, my young friend!  Here are 2,500 GP to compensate you for your efforts.\"";
@@ -765,19 +737,19 @@ L_component_quest_1:
                 "I'm not your 'good " + @address$ + "'!", L_main_menu,
                 "I'll see what I can do.", L_main_menu;
 
-        if (countitem (@SMALL_HEALING_POTION) < 3)
+        if (countitem ("SmallHealingPotion") < 3)
 		goto L_component_quest_missing;
-        if (countitem (@MEDIUM_HEALING_POTION) < 3)
+        if (countitem ("MediumHealingPotion") < 3)
 		goto L_component_quest_missing;
-        if (countitem (@IRON_POTION) < 1)
+        if (countitem ("IronPotion") < 1)
 		goto L_component_quest_missing;
-        if (countitem (@CONCENTRATION_POTION) < 1)
+        if (countitem ("ConcentrationPotion") < 1)
 		goto L_component_quest_missing;
 
-        delitem @SMALL_HEALING_POTION, 3;
-        delitem @MEDIUM_HEALING_POTION, 3;
-        delitem @IRON_POTION, 1;
-        delitem @CONCENTRATION_POTION, 1;
+        delitem "SmallHealingPotion", 3;
+        delitem "MediumHealingPotion", 3;
+        delitem "IronPotion", 1;
+        delitem "ConcentrationPotion", 1;
         set zeny, zeny + 2500;
         mes "[Auldsbel the Wizard]";
         mes "\"Ah, excellent, excellent!  These are precisely what I needed.  Here are another 2,500 GP to compensate you for your efforts.\"";
@@ -802,10 +774,10 @@ L_component_quest_2:
 		"One hundred cocoons, here you are.", -,
                 "That's a lot; I'll see what I can do.", L_main_menu;
 
-        if (countitem (@COCOON) < 100)
+        if (countitem ("SilkCocoon") < 100)
 		goto L_component_quest_missing;
 
-        delitem @COCOON, 20;
+        delitem "SilkCocoon", 20;
         set zeny, zeny + 5000;
         mes "[Auldsbel the Wizard]";
         mes "\"Splendid, splendid!  Here are 5,000 GP for you.\"";
@@ -829,13 +801,13 @@ L_component_quest_3:
 		"Here are your stingers and slimes.", -,
                 "I will get back to you once I have them.", L_main_menu;
 
-        if (countitem (@RED_STINGER) < 25)
+        if (countitem ("RedScorpionStinger") < 25)
 		goto L_component_quest_missing;
-        if (countitem (@MAGGOT_SLIME) < 25)
+        if (countitem ("MaggotSlime") < 25)
 		goto L_component_quest_missing;
 
-        delitem @RED_STINGER, 25;
-        delitem @MAGGOT_SLIME, 25;
+        delitem "RedScorpionStinger", 25;
+        delitem "MaggotSlime", 25;
         set zeny, zeny + 5000;
         mes "[Auldsbel the Wizard]";
         mes "\"Good " + @address$ + "!  Another 5,000 GP for you.\"";
@@ -865,16 +837,16 @@ L_component_quest_4:
 		"Here are your tongues.", -,
                 "I will hunt some snakes for you.", L_main_menu;
 
-        if (countitem (@SNAKE_TONGUE) < 20)
+        if (countitem ("SnakeTongue") < 20)
 		goto L_component_quest_missing;
-        if (countitem (@CAVE_SNAKE_TONGUE) < 20)
+        if (countitem ("CaveSnakeTongue") < 20)
 		goto L_component_quest_missing;
-        if (countitem (@MOUNTAIN_SNAKE_TONGUE) < 20)
+        if (countitem ("MountainSnakeTongue") < 20)
 		goto L_component_quest_missing;
 
-        delitem @SNAKE_TONGUE, 20;
-        delitem @CAVE_SNAKE_TONGUE, 20;
-        delitem @MOUNTAIN_SNAKE_TONGUE, 20;
+        delitem "SnakeTongue", 20;
+        delitem "CaveSnakeTongue", 20;
+        delitem "MountainSnakeTongue", 20;
         set zeny, zeny + 8000;
         mes "[Auldsbel the Wizard]";
         mes "\"8,000 GP should cover your efforts, I think.\"";
@@ -908,10 +880,10 @@ L_component_quest_5:
 		"Here they are.", -,
                 "That's quite a challenge.", L_main_menu;
 
-        if (countitem (@GRASS_SNAKE_TONGUE) < 50)
+        if (countitem ("GrassSnakeTongue") < 50)
 		goto L_component_quest_missing;
 
-        delitem @GRASS_SNAKE_TONGUE, 50;
+        delitem "GrassSnakeTongue", 50;
         set zeny, zeny + 10000;
         mes "[Auldsbel the Wizard]";
         mes "\"Excellent!  Here are 10,000 GP for you, and now let's see how this goes.\"";
@@ -985,12 +957,12 @@ LL_initiation:
         mes "\"So, have you managed to transmute something?\"";
         next;
 
-        if (countitem(@MOUBOO_FIGURINE))
+        if (countitem("MoubooFigurine"))
         	menu
 			"Not yet.", -,
                         "How about this mouboo figurine?", LL_initiation_check;
 
-        if (!(countitem(@MOUBOO_FIGURINE)))
+        if (!(countitem("MoubooFigurine")))
         	menu
 			"Not yet.", -,
                         "What was the spell again?", LL_repeat_spell;
@@ -1006,9 +978,9 @@ LL_initiation_fail:
         goto L_main_menu;
 
 LL_initiation_check:
-        if (!(countitem(@MOUBOO_FIGURINE)))
+        if (!(countitem("MoubooFigurine")))
 		goto L_main_menu;
-        delitem @MOUBOO_FIGURINE, 1;
+        delitem "MoubooFigurine", 1;
 
         mes "[Auldsbel the Wizard]";
         mes "Auldsbel inspects your figurine.";
@@ -1061,10 +1033,10 @@ LL_student_start:
 		"Here you are.", -,
                 "I'll be back with them.", L_main_menu;
 
-        if (countitem(@BUGLEG) < 10)
+        if (countitem("BugLeg") < 10)
         	goto L_component_quest_missing;
 
-        delitem @BUGLEG, 10;
+        delitem "BugLeg", 10;
         getexp 1000, 0;
         set @Q_main_status, @Q_STATUS_STUDENT0;
         callsub S_update_var;
@@ -1106,10 +1078,10 @@ LL_student_0:
 		"Here you are.", -,
                 "I'll be back with them.", L_main_menu;
 
-        if (countitem(@MAUVE) < 20)
+        if (countitem("MauveHerb") < 20)
         	goto L_component_quest_missing;
 
-        delitem @MAUVE, 20;
+        delitem "MauveHerb", 20;
         getexp 1000, 0;
         set @Q_main_status, @Q_STATUS_STUDENT1;
         callsub S_update_var;
@@ -1141,10 +1113,10 @@ LL_student_1:
 		"Here you are.", -,
                 "I'll be back with them.", L_main_menu;
 
-        if (countitem(@STINGER) < 10)
+        if (countitem("ScorpionStinger") < 10)
         	goto L_component_quest_missing;
 
-        delitem @STINGER, 10;
+        delitem "ScorpionStinger", 10;
         getexp 1000, 0;
         set @Q_main_status, @Q_STATUS_STUDENT2;
         callsub S_update_var;
@@ -1176,10 +1148,10 @@ LL_student_2:
 		"Here you are.", -,
                 "I'll be back with them.", L_main_menu;
 
-        if (countitem(@WOOD) < 20)
+        if (countitem("RawLog") < 20)
         	goto L_component_quest_missing;
 
-        delitem @WOOD, 20;
+        delitem "RawLog", 20;
         getexp 1000, 0;
         set @Q_main_status, @Q_STATUS_STUDENT3;
         callsub S_update_var;