Merge branch 'master' of the testing branch

Conflicts:
	conf/magic.conf
	db/item_db.txt
	npc/013-3_Cave/barrier.txt

Eliminated conf/magic.conf.  Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.

1 files changed, 10 insertions, 10 deletions

diff --git a/npc/015-3/pot.txt b/npc/015-3/pot.txt
index 94039990..a965223d 100644
--- a/npc/015-3/pot.txt
+++ b/npc/015-3/pot.txt
@@ -20,14 +20,14 @@
     if (Katze >= 4) goto L_Finished;
 
 L_NeedsMilk:
-    if (countitem(527) > 0)
+    if (countitem("Milk") > 0)
         menu
             "Pour in some milk", L_GiveMilk,
             "Leave it alone", -;
     close;
 
 L_GiveMilk:
-    delitem 527, 1;
+    delitem "Milk", 1;
     set Katze, 1;
     set KatzeBeenOutside, 0;
     close;
@@ -40,29 +40,29 @@ L_NeedsFood:
     mes "The milk is gone!";
     next;
 
-    if (countitem(562) > 0 && countitem(676) > 0)
+    if (countitem("ChickenLeg") > 0 && countitem("Steak") > 0)
         menu
             "Put in a chicken leg", L_GiveChicken,
             "Put in a steak", L_GiveSteak,
             "Leave it alone", -;
-    if (countitem(562) > 0 && countitem(676) == 0)
+    if (countitem("ChickenLeg") > 0 && countitem("Steak") == 0)
         menu
             "Put in a chicken leg", L_GiveChicken,
             "Leave it alone", -;
-    if (countitem(562) == 0 && countitem(676) > 0)
+    if (countitem("ChickenLeg") == 0 && countitem("Steak") > 0)
         menu
             "Put in a steak", L_GiveSteak,
             "Leave it alone", -;
     close;
 
 L_GiveChicken:
-    delitem 562, 1;
+    delitem "ChickenLeg", 1;
     set Katze, 2;
     set KatzeBeenOutside, 0;
     close;
 
 L_GiveSteak:
-    delitem 676, 1;
+    delitem "Steak", 1;
     set Katze, 2;
     set KatzeBeenOutside, 0;
     close;
@@ -75,7 +75,7 @@ L_NeedsFur:
     mes "And it's empty!";
     next;
 
-    if (countitem(611) > 0)  // White Fur
+    if (countitem("WhiteFur") > 0)
         menu "Put a white fur next to the pot", L_GiveFur,
              "Leave it alone", -;
     close;
@@ -85,13 +85,13 @@ L_GiveFur:
     close;
 
 L_NeedsWood:
-    if (countitem(569) > 0)   // Raw log
+    if (countitem("RawLog") > 0)
         menu "Put a wooden log next to the pot", L_GiveWood,
              "Leave it alone", -;
     close;
 
 L_GiveWood:
-    delitem 569, 1;
+    delitem "RawLog", 1;
     set Katze, 4;
     set KatzeBeenOutside, 0;
     mes "You put the wooden log next to the pot. The cat eyes it suspiciously, but remains on her spot.";