Add demon mask quest, remove some old files, etc

6 files changed, 232 insertions, 9 deletions

diff --git a/npc/013-3_Cave/_import.txt b/npc/013-3_Cave/_import.txt
index 87e36072..79b734a4 100644
--- a/npc/013-3_Cave/_import.txt
+++ b/npc/013-3_Cave/_import.txt
@@ -2,8 +2,6 @@ map: 013-3.gat
 npc: npc/013-3_Cave/_mobs.txt
 npc: npc/013-3_Cave/_warps.txt
 npc: npc/013-3_Cave/barrier.txt
-npc: npc/013-3_Cave/bookcase.txt
 npc: npc/013-3_Cave/mask_chest.txt
 npc: npc/013-3_Cave/misc.txt
 npc: npc/013-3_Cave/sword_chest.txt
-npc: npc/013-3_Cave/bookcase.txt
diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt
index 4c3e8330..b89dc170 100644
--- a/npc/013-3_Cave/_mobs.txt
+++ b/npc/013-3_Cave/_mobs.txt
@@ -1,7 +1,86 @@
 // 013-3 Cave mobs
 
+013-3.gat,28,89,16,52	monster	Cave Snake	1021,10,0,0,Mob013-3::On1021
+013-3.gat,61,22,2,2	monster	Fire Skull	1023,3,0,0,Mob013-3::On1023
+013-3.gat,81,22,2,2	monster	Poison Skull	1024,3,0,0,Mob013-3::On1024
+013-3.gat,109,31,6,22	monster	Black Scorpion	1009,20,0,0,Mob013-3::On1009
+013-3.gat,119,84,27,38	monster	Spider	1012,20,0,0,Mob013-3::On1012
+013-3.gat,176,23,5,6	monster	Spider	1012,10,0,0,Mob013-3::On1012
+013-3.gat,82,75,2,2	monster	Fire skull	1023,1,0,0,Mob013-3::On1023
+013-3.gat,142,37,2,2	monster	Poison skull	1024,1,0,0,Mob013-3::On1024
+013-3.gat,79,134,21,16	monster	Scorpion	1003,5,0,0,Mob013-3::On1003
+013-3.gat,71,169,38,17	monster	Red scorpion	1004,5,0,0,Mob013-3::On1004
+013-3.gat,64,85,9,21	monster	Black scorpion	1009,10,0,0,Mob013-3::On1009
+013-3.gat,81,92,3,20	monster	Black scorpion	1009,10,0,0,Mob013-3::On1009
+013-3.gat,162,84,33,37	monster	Snake	1010,30,0,0,Mob013-3::On1010
+013-3.gat,162,85,33,37	monster	Spider	1012,30,0,0,Mob013-3::On1012
+013-3.gat,172,77,18,25	monster	Black scorpion	1009,15,0,0,Mob013-3::On1009
+013-3.gat,145,36,20,15	monster	Red slime	1008,25,0,0,Mob013-3::On1008
+013-3.gat,167,37,23,11	monster	Snake	1010,20,0,0,Mob013-3::On1010
+013-3.gat,165,25,16,11	monster	Black scorpion	1009,15,0,0,Mob013-3::On1009
+013-3.gat,71,39,2,3	monster	Cave snake	1021,2,0,0,Mob013-3::On1021
+013-3.gat,159,102,3,5	monster	Yellow slime	1007,2,0,0,Mob013-3::On1007
+013-3.gat,67,22,2,2	monster	Maggot	1002,2,0,0,Mob013-3::On1002
+013-3.gat,75,22,2,2	monster	Maggot	1002,2,0,0,Mob013-3::On1002
+013-3.gat,76,39,7,4	monster	Black scorpion	1009,8,0,0,Mob013-3::On1009
+013-3.gat,65,39,7,4	monster	Red slime	1008,8,0,0,Mob013-3::On1008
 
 
 013-3.gat,0,0,0	script	Mob013-3	-1,{
+On1002:
+	set @mobID, 1002;
+	callfunc "MobPoints";
+	break;
+
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
+On1004:
+	set @mobID, 1004;
+	callfunc "MobPoints";
+	break;
+
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
+On1008:
+	set @mobID, 1008;
+	callfunc "MobPoints";
+	break;
+
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+On1010:
+	set @mobID, 1010;
+	callfunc "MobPoints";
+	break;
+
+On1012:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
+On1021:
+	set @mobID, 1021;
+	callfunc "MobPoints";
+	break;
+
+On1023:
+	set @mobID, 1023;
+	callfunc "MobPoints";
+	break;
+
+On1024:
+	set @mobID, 1024;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/013-3_Cave/_warps.txt b/npc/013-3_Cave/_warps.txt
index 404ada8c..d28235eb 100644
--- a/npc/013-3_Cave/_warps.txt
+++ b/npc/013-3_Cave/_warps.txt
@@ -1,7 +1,7 @@
 // 013-3 Cave warps
 
 013-3.gat,28,20	warp	hiddenExit	-1,-1,013-1.gat,126,102
-013-3.gat,34,63	warp	toOutside	-1,-1,013-1.gat,125,104
+013-3.gat,34,63	warp	toOutside	-1,-1,013-1.gat,125,102
 013-3.gat,36,96	warp	toCave	-1,-1,013-3.gat,79,126
 013-3.gat,79,125	warp	toCave	-1,-1,013-3.gat,35,96
 013-3.gat,22,115	warp	toOutside	-1,-1,018-1.gat,115,41
@@ -12,7 +12,7 @@
 013-3.gat,177,91	warp	toOutside	-1,-1,018-1.gat,177,21
 013-3.gat,178,44	warp	toCave	-1,-1,018-3.gat,97,70
 013-3.gat,169,45	warp	toCave	-1,-1,018-3.gat,27,55
-013-3.gat,152,28	warp	toCave	-1,-1,018-3.gat,134,62
+013-3.gat,152,28	warp	toCave	-1,-1,018-3.gat,134,60
 013-3.gat,123,104	warp	toCave	-1,-1,018-3.gat,172,22
 013-3.gat,147,104	warp	toCave	-1,-1,018-3.gat,177,22
 013-3.gat,158,66	warp	toCave	-1,-1,018-3.gat,27,90
@@ -21,9 +21,9 @@
 013-3.gat,67,51	warp	toCave	-1,-1,018-3.gat,90,51
 013-3.gat,71,20	warp	toCave	-1,-1,013-3.gat,28,40
 013-3.gat,28,41	warp	toCave	-1,-1,013-3.gat,71,21
-013-3.gat,71,42	warp	toCave	-1,-1,013-3.gat,198,21
+013-3.gat,71,42	warp	toCave	-1,-1,013-3.gat,109,21
 013-3.gat,109,20	warp	toCave	-1,-1,013-3.gat,71,41
 013-3.gat,111,42	warp	toCave	-1,-1,018-3.gat,71,123
-013-3.gat,62,100	warp	toCave	-1,-1,018-1.gat,174,86
+013-3.gat,62,100	warp	toCave	-1,-1,018-3.gat,174,86
 013-3.gat,68,97	warp	toCave	-1,-1,018-3.gat,102,70
 013-3.gat,160,102	warp	toCave	-1,-1,009-3.gat,117,20
diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt
index 635ab234..90d10ce5 100644
--- a/npc/013-3_Cave/barrier.txt
+++ b/npc/013-3_Cave/barrier.txt
@@ -5,9 +5,9 @@
 
 	if (QUEST_demon_mines == 1 && countitem(1198) >= 1) goto L_Has_Jack_O_Soul;
 
-	mes "The barrier around the opening pushes you bach as you approach.";
+	mes "A barrier around the opening pushes you back as you approach.";
 
-	warp "013-3.gat", 71, 38;
+	warp "013-3.gat", 71, 25;
 	close;
 
 L_Has_Jack_O_Soul:
diff --git a/npc/013-3_Cave/bookcase.txt b/npc/013-3_Cave/bookcase.txt
deleted file mode 100644
index e69de29b..00000000
--- a/npc/013-3_Cave/bookcase.txt
+++ /dev/null
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt
index 5d474107..0dbbf415 100644
--- a/npc/013-3_Cave/mask_chest.txt
+++ b/npc/013-3_Cave/mask_chest.txt
@@ -1,5 +1,151 @@
 //
 
 013-3.gat,28,27,0	script	Chest#DemonMask	111,{
-	mes "WIP";
+	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(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(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(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(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(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(541) == 0) goto L_No_water;
+
+	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 630, 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;
+
+	mes "You managed to preform the ritual and open the chest.";
+	getitem 679, 1;
+	mes "You found a demon mask inside.";
+	set QUEST_demon_mines, 3;
+	close;
+
+L_No_maggot_slime:
+	mes "You do not have any maggot slime.";
+	close;
+
+L_No_mushroom:
+	mes "You do not have a mushroom, neither big, nor small.";
+	close;
+
+L_No_petal:
+	mes "You can't seem to find that petal you had.";
+	close;
+
+L_No_pearl:
+	mes "You do not have a pearl, let alone one from the sea.";
+	close;
+
+L_No_hard_spike:
+	mes "You weren't able to find a hard spike in the stuff you brought.";
+	close;
+
+L_No_raw_log:
+	mes "You don't have any wood.";
+	close;
+
+L_No_pink_antenna:
+	mes "You aren't carrying any antenna.";
+	close;
+
+L_No_tongues:
+	mes "You don't four different snake tongues.";
+	close;
+
+L_No_treasure_key:
+	mes "No treasure chest key, no opening ritual.";
+	close;
+
+L_No_ash:
+	mes "You still need a pile of ash.";
+	close;
+
+L_No_herbs:
+	mes "Four different herbs are needed to get this thing open.";
+	close;
+
+L_No_bug_leg:
+	mes "You do not have part of a bug on you. That is rather odd considering what you went through to get here.";
+	close;
+
+L_No_lamp:
+	mes "You do not have a lamp. Yet, somehow, you were able to get this far into this dark cave.";
+	close;
+
+L_No_iron_ore:
+	mes "\"Rock and metal, as one.\" You don't seem to have anything that fits the bill.";
+	close;
+
+L_No_stingers:
+	mes "Three scorpion deaths are still missing.";
+	close;
+
+L_No_silk:
+	mes "You could not find the womb for a butterfly among your stuff.";
+	close;
+
+L_No_fur:
+	mes "You wonder how you can carry the \"gentle caress of a creature without blemish.\" But you need it to get this thing open.";
+	close;
+
+L_No_dark_crystal:
+	mes "A piece of darkness is missing.";
+	close;
+
+L_No_water:
+	mes "Just one bottle of water and you can start the ritual.";
+	close;
+
+L_This_shouldn_t_happen:
+	warp "013-3.gat", 71, 25;
+	// You need to go through the barrier to get to the chest, so this shouldn't happen. So just warp them like the barrier does.
+	close;
+
+L_Finished:
+        mes "[Chest]";
+        mes "You already opened this chest.";
+        close;
 }