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.

3 files changed, 72 insertions, 71 deletions

diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt
index b597541f..0ec3f86a 100644
--- a/npc/013-3_Cave/barrier.txt
+++ b/npc/013-3_Cave/barrier.txt
@@ -1,7 +1,7 @@
 //
 
-//013-3.gat,71,21,0	script	#DemonMineBarrier1	0,1,1,{
-013-3.gat,71,21,0	script	#DemonMineBarrier1	127,1,1,{
+//013-3.gat,71,21,0	script	#DemonMineBarrier1#_M	0,1,1,{
+013-3.gat,71,21,0	script	#DemonMineBarrier1#_M	127,1,1,{
 	if (QUEST_demon_mines >= 2) close;
 
 	if (QUEST_demon_mines == 1 && countitem(1198) >= 1) goto L_Has_Jack_O_Soul;
@@ -14,6 +14,6 @@
 L_Has_Jack_O_Soul:
 	mes "The barrier around the opening allows you passage.";
 	set QUEST_demon_mines, 2;
-	delitem 1198, 1;
+	delitem "JackOSoul", 1;
 	close;
 }
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt
index 0da8bab9..2e292e50 100644
--- a/npc/013-3_Cave/mask_chest.txt
+++ b/npc/013-3_Cave/mask_chest.txt
@@ -4,80 +4,81 @@
 	if (QUEST_demon_mines < 2) goto L_This_shouldn_t_happen;
 	if (QUEST_demon_mines == 3) goto L_Finished;
 
-	if (countitem(505) == 0) goto L_No_maggot_slime;
-	if (countitem(566) == 0) goto L_No_mushroom;
-	if (countitem(565) == 0) goto L_No_petal;
+	if (countitem("MaggotSlime") == 0) goto L_No_maggot_slime;
+	if (countitem("SmallMushroom") == 0) goto L_No_mushroom;
+	if (countitem("Petal") == 0) goto L_No_petal;
 
-	if (countitem(700) == 0) goto L_No_pearl;
-	if (countitem(613) == 0) goto L_No_hard_spike;
-	if (countitem(569) == 0) goto L_No_raw_log;
+	if (countitem("Pearl") == 0) goto L_No_pearl;
+	if (countitem("HardSpike") == 0) goto L_No_hard_spike;
+	if (countitem("RawLog") == 0) goto L_No_raw_log;
 
-	if (countitem(614) == 0) goto L_No_pink_antenna;
-	if (countitem(710) == 0 || countitem(711) == 0 || countitem(712) == 0 || countitem(713) == 0) goto L_No_tongues;
-	if (countitem(537) == 0) goto L_No_treasure_key;
+	if (countitem("PinkAntenna") == 0) goto L_No_pink_antenna;
+	if (countitem("SnakeTongue") == 0 || countitem("MountainSnakeTongue") == 0 || countitem("GrassSnakeTongue") == 0 || countitem("CaveSnakeTongue") == 0) goto L_No_tongues;
+	if (countitem("TreasureKey") == 0) goto L_No_treasure_key;
 
-	if (countitem(701) == 0) goto L_No_ash;
-	if (countitem(680) == 0 || countitem(681) == 0 || countitem(682) == 0 || countitem(683) == 0) goto L_No_herbs;
-	if (countitem(518) == 0) goto L_No_bug_leg;
+	if (countitem("PileOfAsh") == 0) goto L_No_ash;
+	if (countitem("MauveHerb") == 0 || countitem("CobaltHerb") == 0 || countitem("GambogeHerb") == 0 || countitem("AlizarinHerb") == 0) goto L_No_herbs;
+	if (countitem("BugLeg") == 0) goto L_No_bug_leg;
 
-	if (countitem(612) == 0) goto L_No_lamp;
-	if (countitem(640) == 0) goto L_No_iron_ore;
-	if (countitem(507) == 0 || countitem(517) == 0 || countitem(709) == 0) goto L_No_stingers;
+	if (countitem("CaveSnakeLamp") == 0) goto L_No_lamp;
+	if (countitem("IronOre") == 0) goto L_No_iron_ore;
+	if (countitem("ScorpionStinger") == 0 || countitem("RedScorpionStinger") == 0 || countitem("BlackScorpionStinger") == 0) goto L_No_stingers;
 
-	if (countitem(718) == 0) goto L_No_silk;
-	if (countitem(611) == 0) goto L_No_fur;
-	if (countitem(631) == 0) goto L_No_dark_crystal;
+	if (countitem("SilkCocoon") == 0) goto L_No_silk;
+	if (countitem("WhiteFur") == 0) goto L_No_fur;
+	if (countitem("DarkCrystal") == 0) goto L_No_dark_crystal;
 
-	if (countitem(541) == 0) goto L_No_water;
+	if (countitem("BottleOfWater") == 0) goto L_No_water;
 
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(505) > 1 && countitem(518) > 1 && countitem(718) > 1
-					&& countitem(566) > 1 && countitem(565) > 1 && countitem(700) > 1
-					&& countitem(613) > 1 && countitem(569) > 1 && countitem(614) > 1
-					&& countitem(631) > 1 && countitem(640) > 1 && countitem(507) > 1
-					&& countitem(517) > 1 && countitem(709) > 1 && countitem(710) > 1
-					&& countitem(711) > 1 && countitem(712) > 1 && countitem(713) > 1
-					&& countitem(680) > 1 && countitem(681) > 1 && countitem(682) > 1
-					&& countitem(683) > 1 && countitem(537) > 1 && countitem(612) > 1
-					&& countitem(701) > 1 && countitem(541) > 1) goto L_TooMany;
-
-	delitem 505, 1;
-	delitem 518, 1;
-	delitem 718, 1;
-
-	delitem 566, 1;
-	delitem 565, 1;
-	delitem 700, 1;
-
-	delitem 613, 1;
-	delitem 569, 1;
-	delitem 614, 1;
-
-	delitem 631, 1;
-	delitem 640, 1;
-	delitem 507, 1;
-
-	delitem 517, 1;
-	delitem 709, 1;
-	delitem 710, 1;
-
-	delitem 711, 1;
-	delitem 712, 1;
-	delitem 713, 1;
-
-	delitem 680, 1;
-	delitem 681, 1;
-	delitem 682, 1;
-
-	delitem 683, 1;
-	delitem 537, 1;
-	delitem 612, 1;
-
-	delitem 701, 1;
-	delitem 541, 1;
+	if (@inventorylist_count == 100 && countitem("MaggotSlime") > 1 && countitem("BugLeg") > 1 && countitem("SilkCocoon") > 1
+					&& countitem("SmallMushroom") > 1 && countitem("Petal") > 1 && countitem("Pearl") > 1
+					&& countitem("HardSpike") > 1 && countitem("RawLog") > 1 && countitem("PinkAntenna") > 1
+					&& countitem("DarkCrystal") > 1 && countitem("IronOre") > 1 && countitem("ScorpionStinger") > 1
+					&& countitem("RedScorpionStinger") > 1 && countitem("BlackScorpionStinger") > 1 && countitem("SnakeTongue") > 1
+					&& countitem("MountainSnakeTongue") > 1 && countitem("GrassSnakeTongue") > 1 && countitem("CaveSnakeTongue") > 1
+					&& countitem("MauveHerb") > 1 && countitem("CobaltHerb") > 1 && countitem("GambogeHerb") > 1
+					&& countitem("AlizarinHerb") > 1 && countitem("TreasureKey") > 1 && countitem("CaveSnakeLamp") > 1
+					&& countitem("PileOfAsh") > 1 && countitem("WhiteFur") > 1 && countitem("BottleOfWater") > 1) goto L_TooMany;
+
+	delitem "MaggotSlime", 1;
+	delitem "BugLeg", 1;
+	delitem "SilkCocoon", 1;
+
+	delitem "SmallMushroom", 1;
+	delitem "Petal", 1;
+	delitem "Pearl", 1;
+
+	delitem "HardSpike", 1;
+	delitem "RawLog", 1;
+	delitem "PinkAntenna", 1;
+
+	delitem "DarkCrystal", 1;
+	delitem "IronOre", 1;
+	delitem "ScorpionStinger", 1;
+
+	delitem "RedScorpionStinger", 1;
+	delitem "BlackScorpionStinger", 1;
+	delitem "SnakeTongue", 1;
+
+	delitem "MountainSnakeTongue", 1;
+	delitem "GrassSnakeTongue", 1;
+	delitem "CaveSnakeTongue", 1;
+
+	delitem "MauveHerb", 1;
+	delitem "CobaltHerb", 1;
+	delitem "GambogeHerb", 1;
+
+	delitem "AlizarinHerb", 1;
+	delitem "TreasureKey", 1;
+	delitem "CaveSnakeLamp", 1;
+
+	delitem "WhiteFur", 1;
+	delitem "PileOfAsh", 1;
+	delitem "BottleOfWater", 1;
 
 	mes "You managed to preform the ritual and open the chest.";
-	getitem 679, 1;
+	getitem "DemonMask", 1;
 	mes "You found a demon mask inside.";
 	set QUEST_demon_mines, 3;
 	close;
diff --git a/npc/013-3_Cave/sword_chest.txt b/npc/013-3_Cave/sword_chest.txt
index c570bfcd..5d2c97b7 100644
--- a/npc/013-3_Cave/sword_chest.txt
+++ b/npc/013-3_Cave/sword_chest.txt
@@ -12,11 +12,11 @@
 	close;
 
 L_Yes:
-	if(countitem(537) < 10) goto L_Not_Enough;
+	if(countitem("TreasureKey") < 10) goto L_Not_Enough;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem(537) > 10) goto L_TooMany;
-	delitem 537, 10;
-	getitem 536, 1;
+	if (@inventorylist_count == 100 && countitem("TreasureKey") > 10) goto L_TooMany;
+	delitem "TreasureKey", 10;
+	getitem "ShortSword", 1;
 	mes "[Chest]";
 	mes "You opened it and found a short sword!";
 	set ChestQuest, ChestQuest | 2;