Some more "ItemName" conversions

1 files changed, 55 insertions, 83 deletions

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;