Some more "ItemName" conversions

1 files changed, 27 insertions, 35 deletions

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;