Finish conversion to "ItemName"

Some of the more complicated scripts (bleach/dye, for example) can't be
converted so easily.

1 files changed, 23 insertions, 23 deletions

diff --git a/npc/015-3/katze.txt b/npc/015-3/katze.txt
index c24a9f80..a3cc0626 100644
--- a/npc/015-3/katze.txt
+++ b/npc/015-3/katze.txt
@@ -70,17 +70,17 @@ L_NeedsFur:
     mes "\"Prrr. Meow, prrr...\"";
     next;
 
-    if (countitem(611) > 0)  // White Fur
+    if (countitem("WhiteFur") > 0)
         menu "Make funny movements with the fur near the ground", L_MoveFur,
              "Throw a stone at the cat", L_ThrowStone,
              "Leave the cat alone", -;
-    if (countitem(611) == 0)
+    if (countitem("WhiteFur") == 0)
         menu "Throw a stone at the cat", L_ThrowStone,
              "Leave the cat alone", -;
     close;
 
 L_MoveFur:
-    delitem 611, 1; // Cat takes the white fur
+    delitem "WhiteFur", 1;
     set Katze, 3;
     mes "The cat jumps at the fur! You quickly let go of it. The cat happily returns to its spot, carrying the fur in its mouth.";
     next;
@@ -93,7 +93,7 @@ L_NeedsWood:
     mes "\"Prrrr, now I'd like something to sharpen my claws on.\"";
     next;
 
-    if (countitem(569) > 0)   // Raw log
+    if (countitem("RawLog") > 0)
         menu "Want this piece of wood?", L_GiveWood,
              "Ok, see you later", -;
     close;
@@ -113,12 +113,12 @@ L_NeedsStuff:
     set Katze, 5;
     mes "[Katze]";
     mes "\"You've been really kind to me. I can make you something nice, but I will need";
-    mes "2 snake skins,";
-    mes "2 snake tongues,";
-    mes "2 maggot slimes,";
-    mes "2 white furs,";
-    mes "2 hard spikes and";
-    mes "2 tiny healing potions.\"";
+    mes "2 [snake skin]s,";
+    mes "2 [snake tongue]s,";
+    mes "2 [maggot slime]s,";
+    mes "2 [white fur]s,";
+    mes "2 [hard spike]s and";
+    mes "2 [tiny healing potion]s.\"";
     next;
     close;
 
@@ -152,12 +152,12 @@ L_Please:
     close;
 
 L_CatChecksStuff:
-    if (countitem(641) > 1 &&             // Snake skin
-        countitem(710) > 1 &&             // Snake tongue
-        countitem(505) > 1 &&             // Maggot slime
-        countitem(611) > 1 &&             // White fur
-        countitem(613) > 1 &&             // Hard spike
-        countitem(684) > 1)               // Tiny healing potion
+    if (countitem("SnakeSkin") > 1 &&
+        countitem("SnakeTongue") > 1 &&
+        countitem("MaggotSlime") > 1 &&
+        countitem("WhiteFur") > 1 &&
+        countitem("HardSpike") > 1 &&
+        countitem("TinyHealingPotion") > 1)
         goto L_GiveStuff;
     mes "[Katze]";
     mes "\"You don't seem to have everything yet. Come back later when you do.\"";
@@ -165,12 +165,12 @@ L_CatChecksStuff:
     close;
 
 L_GiveStuff:
-    delitem 641, 2;
-    delitem 710, 2;
-    delitem 505, 2;
-    delitem 611, 2;
-    delitem 613, 2;
-    delitem 684, 2;
+    delitem "SnakeSkin", 2;
+    delitem "SnakeTongue", 2;
+    delitem "MaggotSlime", 2;
+    delitem "WhiteFur", 2;
+    delitem "HardSpike", 2;
+    delitem "TinyHealingPotion", 2;
     set Katze, 6;
     set KatzeBeenOutside, 0;
     mes "[Katze]";
@@ -185,7 +185,7 @@ L_PreGainEars:
     close;
 
 L_GainEars:
-    getitem 1217, 1;    // Cat ears
+    getitem "CatEars", 1;
     set @xpval, 5000;
     getexp @xpval, 0;
     set Katze, 7;