summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/002-2.wlkbin16388 -> 0 bytes
-rw-r--r--data/021-1.wlkbin19042 -> 0 bytes
-rw-r--r--data/test.wlkbin17412 -> 0 bytes
-rw-r--r--npc/003-1_Beach/_warps.txt3
-rw-r--r--npc/005-1_Snake_desert/_warps.txt2
-rw-r--r--npc/005-3_Snake_pit/_warps.txt2
-rw-r--r--npc/006-3_Desert_mountain_caves/_warps.txt1
-rw-r--r--npc/010-1_Woodland/_warps.txt2
-rw-r--r--npc/011-1_Woodland/_warps.txt2
-rw-r--r--npc/012-1_Woodland_Hills/_warps.txt1
-rw-r--r--npc/013-1_Woodland_hills/_warps.txt2
-rw-r--r--npc/013-3_Cave/_import.txt2
-rw-r--r--npc/013-3_Cave/_mobs.txt79
-rw-r--r--npc/013-3_Cave/_warps.txt8
-rw-r--r--npc/013-3_Cave/barrier.txt4
-rw-r--r--npc/013-3_Cave/bookcase.txt0
-rw-r--r--npc/013-3_Cave/mask_chest.txt148
-rw-r--r--npc/018-1_Woodland_mining_camp/_import.txt1
-rw-r--r--npc/018-1_Woodland_mining_camp/_mobs.txt1
-rw-r--r--npc/018-1_Woodland_mining_camp/_warps.txt2
-rw-r--r--npc/018-1_Woodland_mining_camp/monsters.txt39
-rw-r--r--npc/018-2_Woodland_minning_camp/_import.txt1
-rw-r--r--npc/018-2_Woodland_minning_camp/monsters.txt14
-rw-r--r--npc/018-3_Cave/_import.txt1
-rw-r--r--npc/018-3_Cave/_mobs.txt111
-rw-r--r--npc/018-3_Cave/_warps.txt4
-rw-r--r--npc/018-3_Cave/bookcase.txt64
-rw-r--r--npc/_import.txt1
28 files changed, 418 insertions, 77 deletions
diff --git a/data/002-2.wlk b/data/002-2.wlk
deleted file mode 100644
index 5abd252f..00000000
--- a/data/002-2.wlk
+++ /dev/null
Binary files differ
diff --git a/data/021-1.wlk b/data/021-1.wlk
deleted file mode 100644
index cd4428d7..00000000
--- a/data/021-1.wlk
+++ /dev/null
Binary files differ
diff --git a/data/test.wlk b/data/test.wlk
deleted file mode 100644
index 871a2267..00000000
--- a/data/test.wlk
+++ /dev/null
Binary files differ
diff --git a/npc/003-1_Beach/_warps.txt b/npc/003-1_Beach/_warps.txt
index 4c86e53f..e66a28e4 100644
--- a/npc/003-1_Beach/_warps.txt
+++ b/npc/003-1_Beach/_warps.txt
@@ -1,5 +1,4 @@
// 003-1 Beach warps
-003-1.gat,172,77 warp ToSandstorm -1,3,002-1.gat,37,109
+003-1.gat,172,77 warp ToSandstorm -1,3,002-1.gat,15,66
003-1.gat,20,23 warp ToWoodland 1,-1,007-1.gat,120,112
-003-1.gat,141,19 warp ToBeach 1,-1,004-1.gat,37,111
diff --git a/npc/005-1_Snake_desert/_warps.txt b/npc/005-1_Snake_desert/_warps.txt
index 734d38d4..f21bdf8a 100644
--- a/npc/005-1_Snake_desert/_warps.txt
+++ b/npc/005-1_Snake_desert/_warps.txt
@@ -2,7 +2,7 @@
005-1.gat,19,41 warp ToSandstorm -1,2,002-1.gat,106,78
005-1.gat,89,23 warp ToSnakeCave -1,-1,005-3.gat,52,34
-005-1.gat,71,75 warp ToSnakeCave -1,-1,005-3.gat,33,82
+005-1.gat,71,75 warp ToSnakeCave -1,-1,005-3.gat,33,83
005-1.gat,167,108 warp ToDesertMountains -1,-1,006-1.gat,20,33
005-1.gat,168,107 warp ToDesertMountains -1,-1,006-1.gat,21,32
005-1.gat,169,106 warp ToDesertMountains -1,-1,006-1.gat,22,31
diff --git a/npc/005-3_Snake_pit/_warps.txt b/npc/005-3_Snake_pit/_warps.txt
index b86421f3..95a1e419 100644
--- a/npc/005-3_Snake_pit/_warps.txt
+++ b/npc/005-3_Snake_pit/_warps.txt
@@ -1,4 +1,4 @@
// 005-3 Snake pit warps
005-3.gat,52,33 warp CaveExit -1,-1,005-1.gat,89,24
-005-3.gat,33,82 warp CaveExit -1,-1,005-1.gat,71,75
+005-3.gat,33,82 warp CaveExit -1,-1,005-1.gat,71,76
diff --git a/npc/006-3_Desert_mountain_caves/_warps.txt b/npc/006-3_Desert_mountain_caves/_warps.txt
index 25e7ee54..9c40defc 100644
--- a/npc/006-3_Desert_mountain_caves/_warps.txt
+++ b/npc/006-3_Desert_mountain_caves/_warps.txt
@@ -8,7 +8,6 @@
006-3.gat,122,24 warp CavesExit -1,-1,006-1.gat,122,25
006-3.gat,114,49 warp CavesExit -1,-1,006-1.gat,114,50
006-3.gat,104,44 warp CavesExit -1,-1,006-1.gat,104,45
-006-3.gat,77,44 warp CavesExit -1,-1,006-1.gat,77,45
006-3.gat,60,68 warp CavesExit -1,-1,006-1.gat,60,59
006-3.gat,92,63 warp CavesExit -1,-1,006-1.gat,92,64
006-3.gat,112,74 warp CavesExit -1,-1,006-1.gat,112,75
diff --git a/npc/010-1_Woodland/_warps.txt b/npc/010-1_Woodland/_warps.txt
index b02dc45c..1e27f550 100644
--- a/npc/010-1_Woodland/_warps.txt
+++ b/npc/010-1_Woodland/_warps.txt
@@ -3,5 +3,5 @@
010-1.gat,49,23 warp ToWoodland 0,-1,011-1.gat,46,99
010-1.gat,14,55 warp ToWoodland -1,0,015-1.gat,92,54
010-1.gat,36,94 warp ToDimondsCove -1,-1,010-2.gat,32,44
-010-1.gat,56,104 warp ToWoodland 1,-1,015-1.gat,56,21
+010-1.gat,56,104 warp ToWoodland 1,-1,016-1.gat,56,21
010-1.gat,131,54 warp ToWoodland -1,0,007-1.gat,25,53
diff --git a/npc/011-1_Woodland/_warps.txt b/npc/011-1_Woodland/_warps.txt
index 2cb1fd80..345ffbe2 100644
--- a/npc/011-1_Woodland/_warps.txt
+++ b/npc/011-1_Woodland/_warps.txt
@@ -1,7 +1,7 @@
// 011-1 Woodland warps
011-1.gat,58,92 warp ToCave -1,-1,011-3.gat,15,15
-011-1.gat,30,61 warp ToWoodland -1,1,014-1.gat,106,91
+011-1.gat,30,61 warp ToWoodland -1,1,014-1.gat,180,90
011-1.gat,49,104 warp ToWoodland 0,-1,010-1.gat,50,25
011-1.gat,125,62 warp ToWoodland -1,2,008-1.gat,27,61
011-1.gat,73,11 warp ToWoodlandHills 0,-1,012-1.gat,131,162
diff --git a/npc/012-1_Woodland_Hills/_warps.txt b/npc/012-1_Woodland_Hills/_warps.txt
index 6c4eaead..f8c58466 100644
--- a/npc/012-1_Woodland_Hills/_warps.txt
+++ b/npc/012-1_Woodland_Hills/_warps.txt
@@ -1,7 +1,6 @@
// 012-1 Woodland Hills warps
012-1.gat,51,39 warp ToCaves -1,-1,012-3.gat,370,45
-012-1.gat,147,67 warp ToCaves -1,-1,012-3.gat,474,103
012-1.gat,41,48 warp ToCaves -1,-1,012-3.gat,353,78
012-1.gat,44,88 warp ToCaves -1,-1,012-3.gat,354,187
012-1.gat,92,104 warp ToCaves -1,-1,012-3.gat,270,111
diff --git a/npc/013-1_Woodland_hills/_warps.txt b/npc/013-1_Woodland_hills/_warps.txt
index 6daa4447..b27c118c 100644
--- a/npc/013-1_Woodland_hills/_warps.txt
+++ b/npc/013-1_Woodland_hills/_warps.txt
@@ -1,6 +1,6 @@
// 013-1 Woodland hills warps
013-1.gat,125,103 warp toCave -1,-1,013-3.gat,34,64
-013-1.gat,20,76 warp ToWoodlandHills -1,2,012-1.gat,149,78
+013-1.gat,20,76 warp ToWoodlandHills -1,2,012-1.gat,148,60
013-1.gat,45,21 warp ToWoodland 1,-1,017-1.gat,46,104
013-1.gat,42,90 warp toHouse -1,-1,013-2.gat,63,41
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;
}
diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt
index c2131c51..9be2065c 100644
--- a/npc/018-1_Woodland_mining_camp/_import.txt
+++ b/npc/018-1_Woodland_mining_camp/_import.txt
@@ -2,4 +2,3 @@ map: 018-1.gat
npc: npc/018-1_Woodland_mining_camp/_mobs.txt
npc: npc/018-1_Woodland_mining_camp/_warps.txt
npc: npc/018-1_Woodland_mining_camp/miners.txt
-npc: npc/018-1_Woodland_mining_camp/monsters.txt
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
index df2cf445..1f6d4706 100644
--- a/npc/018-1_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -22,6 +22,7 @@
018-1.gat,78,55,37,6 monster Fire Goblin 1011,7,0,0,Mob018-1::On1011
018-1.gat,145,24,10,9 monster Green Slime 1005,3,0,0,Mob018-1::On1005
018-1.gat,68,89,14,17 monster Scorpion 1003,3,0,0,Mob018-1::On1003
+018-1.gat,160,31,11,18 monster Scorpion 1003,5,0,0,Mob018-1::On1003
018-1.gat,0,0,0 script Mob018-1 -1,{
diff --git a/npc/018-1_Woodland_mining_camp/_warps.txt b/npc/018-1_Woodland_mining_camp/_warps.txt
index c8d4c8d6..5d18916c 100644
--- a/npc/018-1_Woodland_mining_camp/_warps.txt
+++ b/npc/018-1_Woodland_mining_camp/_warps.txt
@@ -12,6 +12,6 @@
018-1.gat,153,46 warp toCave -1,-1,018-3.gat,146,160
018-1.gat,158,34 warp toCave -1,-1,018-3.gat,64,101
018-1.gat,162,44 warp toCave -1,-1,018-3.gat,29,164
-018-1.gat,177,20 warp toCave -1,-1,013-1.gat,177,90
+018-1.gat,177,20 warp toCave -1,-1,013-3.gat,177,90
018-1.gat,65,73 warp toIndoor -1,-1,018-2.gat,50,28
018-1.gat,79,98 warp toHurnscald 2,-1,008-1.gat,79,18
diff --git a/npc/018-1_Woodland_mining_camp/monsters.txt b/npc/018-1_Woodland_mining_camp/monsters.txt
deleted file mode 100644
index 04448cec..00000000
--- a/npc/018-1_Woodland_mining_camp/monsters.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// Map: 018-1
-// This is the Woodland Mines.
-//
-
-018-1.gat,0,0,0,0 monster LogHead 1025,5,500,600,Mob37::OnLogHead
-018-1.gat,136,77,20,35 monster SeaSlime 1033,5,1000,500,Mob37::OnSeaSlime
-018-1.gat,0,0,0,0 monster Bat 1017,2,4000,3000,Mob37::OnBat
-018-1.gat,79,59,0,0 monster YellowSlime 1007,1,120000,60000,Mob37::OnYellowSlime
-
-018-1.gat,57,63,4,4 monster SilkWorm 1035,2,60000,30000,Mob37::OnSilkWorm
-
-018-1.gat,0,0,0 script Mob37 -1,{
-OnLogHead:
- set @mobID, 1025;
- callfunc "MobPoints";
- break;
-
-OnSeaSlime:
- set @mobID, 1033;
- callfunc "MobPoints";
- break;
-
-OnBat:
- set @mobID, 1017;
- callfunc "MobPoints";
- break;
-
-OnYellowSlime:
- set @mobID, 1007;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt
index 2251a393..6b8cbc52 100644
--- a/npc/018-2_Woodland_minning_camp/_import.txt
+++ b/npc/018-2_Woodland_minning_camp/_import.txt
@@ -5,5 +5,4 @@ npc: npc/018-2_Woodland_minning_camp/angus.txt
npc: npc/018-2_Woodland_minning_camp/books.txt
npc: npc/018-2_Woodland_minning_camp/caul.txt
npc: npc/018-2_Woodland_minning_camp/miners.txt
-npc: npc/018-2_Woodland_minning_camp/monsters.txt
npc: npc/018-2_Woodland_minning_camp/receptionist.txt
diff --git a/npc/018-2_Woodland_minning_camp/monsters.txt b/npc/018-2_Woodland_minning_camp/monsters.txt
deleted file mode 100644
index dab70518..00000000
--- a/npc/018-2_Woodland_minning_camp/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 018-2
-// This is the Woodland Mines -- level 1.
-//
-
-018-2.gat,114,21,4,3 monster YellowSlime 1007,1,120000,60000,Mob38::OnYellowSlime
-
-018-2.gat,0,0,0 script Mob38 -1,{
-OnYellowSlime:
- set @mobID, 1007;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/npc/018-3_Cave/_import.txt b/npc/018-3_Cave/_import.txt
index 76f20bf9..cf5a8562 100644
--- a/npc/018-3_Cave/_import.txt
+++ b/npc/018-3_Cave/_import.txt
@@ -1,3 +1,4 @@
map: 018-3.gat
npc: npc/018-3_Cave/_mobs.txt
npc: npc/018-3_Cave/_warps.txt
+npc: npc/018-3_Cave/bookcase.txt
diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt
index f18b58ab..668d5902 100644
--- a/npc/018-3_Cave/_mobs.txt
+++ b/npc/018-3_Cave/_mobs.txt
@@ -1,7 +1,118 @@
// 018-3 Cave mobs
+018-3.gat,48,28,57,16 monster Silk Worm 1035,8,0,0,Mob018-3::On1035
+018-3.gat,48,28,56,17 monster Bat 1017,10,0,0,Mob018-3::On1017
+018-3.gat,35,62,31,15 monster Evil Mushroom 1013,10,0,0,Mob018-3::On1013
+018-3.gat,35,65,28,22 monster Spiky Mushroom 1019,15,0,0,Mob018-3::On1019
+018-3.gat,28,157,3,2 monster Flower 1014,1,0,0,Mob018-3::On1014
+018-3.gat,99,110,17,39 monster Yellow slime 1007,10,0,0,Mob018-3::On1007
+018-3.gat,137,140,2,1 monster Spider 1012,1,300000,120000,Mob018-3::On1012
+018-3.gat,102,172,131,13 monster Black scorpions 1009,20,0,0,Mob018-3::On1009
+018-3.gat,174,37,10,31 monster Yellow slime 1007,5,0,0,Mob018-3::On1007
+018-3.gat,135,148,10,6 monster Giant maggot 1006,2,0,0,Mob018-3::On1006
+018-3.gat,134,140,12,8 monster Maggot 1002,3,0,0,Mob018-3::On1002
+018-3.gat,34,142,30,48 monster Fire goblin 1011,4,0,0,Mob018-3::On1011
+018-3.gat,87,153,78,22 monster Snake 1010,10,0,0,Mob018-3::On1010
+018-3.gat,148,148,13,24 monster Bat 1017,3,0,0,Mob018-3::On1017
+018-3.gat,153,97,18,22 monster Yellow slime 1007,6,0,0,Mob018-3::On1007
+018-3.gat,81,77,27,21 monster Red slime 1008,15,0,0,Mob018-3::On1008
+018-3.gat,111,80,5,6 monster Black scorpions 1009,10,0,0,Mob018-3::On1009
+018-3.gat,175,122,5,40 monster Snake 1010,15,0,0,Mob018-3::On1010
+018-3.gat,98,75,1,2 monster Fire skull 1023,1,0,0,Mob018-3::On1023
+018-3.gat,100,75,1,2 monster Poison skull 2024,1,0,0,Mob018-3::On2024
+018-3.gat,171,95,15,19 monster Red scorpion 1004,5,0,0,Mob018-3::On1004
+018-3.gat,134,87,17,7 monster Red slime 1008,10,0,0,Mob018-3::On1008
+018-3.gat,59,95,11,8 monster Spider 1012,15,0,0,Mob018-3::On1012
+018-3.gat,77,92,23,7 monster Black scorpion 1009,15,0,0,Mob018-3::On1009
+018-3.gat,133,39,12,17 monster Spider 1012,10,0,0,Mob018-3::On1012
+018-3.gat,111,33,30,16 monster Mountain snake 1026,15,0,0,Mob018-3::On1026
018-3.gat,0,0,0 script Mob018-3 -1,{
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ break;
+
+On1004:
+ set @mobID, 1004;
+ callfunc "MobPoints";
+ break;
+
+On1006:
+ set @mobID, 1006;
+ 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;
+
+On1011:
+ set @mobID, 1011;
+ callfunc "MobPoints";
+ break;
+
+On1012:
+ set @mobID, 1012;
+ callfunc "MobPoints";
+ break;
+
+On1013:
+ set @mobID, 1013;
+ callfunc "MobPoints";
+ break;
+
+On1014:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ break;
+
+On1017:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ break;
+
+On1019:
+ set @mobID, 1019;
+ callfunc "MobPoints";
+ break;
+
+On1023:
+ set @mobID, 1023;
+ callfunc "MobPoints";
+ break;
+
+On1026:
+ set @mobID, 1026;
+ callfunc "MobPoints";
+ break;
+
+On1035:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ break;
+
+On2024:
+ set @mobID, 2024;
+ callfunc "MobPoints";
+ break;
+
end;
}
diff --git a/npc/018-3_Cave/_warps.txt b/npc/018-3_Cave/_warps.txt
index 9228c2d6..5d32cf8b 100644
--- a/npc/018-3_Cave/_warps.txt
+++ b/npc/018-3_Cave/_warps.txt
@@ -3,7 +3,7 @@
018-3.gat,100,131 warp toOutside 0,-1,018-1.gat,79,60
018-3.gat,44,37 warp toOutside -1,-1,018-1.gat,112,62
018-3.gat,49,98 warp toOutside -1,-1,018-1.gat,128,57
-018-3.gat,123,165 warp toOutside -1,-1,018-1.gat,98,43
+018-3.gat,123,165 warp toOutside -1,-1,018-1.gat,90,43
018-3.gat,70,104 warp toOutside -1,-1,018-1.gat,69,55
018-3.gat,50,88 warp toCave -1,-1,013-3.gat,69,142
018-3.gat,146,161 warp toOutside 0,-1,018-1.gat,153,47
@@ -19,5 +19,5 @@
018-3.gat,90,50 warp toCave -1,-1,013-3.gat,67,50
018-3.gat,71,122 warp toCave -1,-1,013-3.gat,111,41
018-3.gat,174,85 warp toCave -1,-1,013-3.gat,62,99
-018-3.gat,102,69 warp toCave -1,-1,013-3.gat,68,86
+018-3.gat,102,69 warp toCave -1,-1,013-3.gat,68,96
018-3.gat,179,179 warp toCave -1,-1,009-3.gat,157,31
diff --git a/npc/018-3_Cave/bookcase.txt b/npc/018-3_Cave/bookcase.txt
new file mode 100644
index 00000000..b2e14e41
--- /dev/null
+++ b/npc/018-3_Cave/bookcase.txt
@@ -0,0 +1,64 @@
+//
+
+018-3.gat,75,123,0 script #DemonMineBookcase1 127,{
+ if (QUEST_demon_mines == 0) goto L_Search;
+
+ mes "You see nothing different about the bookcase.";
+ mes "Do you want to search it again anyways?";
+ next;
+ menu
+ "Yes", L_Search,
+ "No", -;
+ close;
+
+L_Search:
+ mes "After searching the bookcase, you were able to find a few pasages that you can read.";
+ next;
+
+ mes "One of the describes an ancient barrier that guards a great treasure.";
+ mes "";
+ mes "To get trough it, you need to consume the soul of a great pumpkin ghost.";
+ next;
+
+ mes "Another passage describes a ritual needed to open a certain cursed chest.";
+ mes "";
+ mes "It looks like a lot of items will be needed.";
+ next;
+
+ mes "The slime of a maggot.";
+ mes "A mushroom, big or small.";
+ mes "The petal of a flower.";
+ next;
+
+ mes "A pearl from the sea.";
+ mes "A spike; the harder, the better.";
+ mes "Some raw wood. One log should do.";
+ next;
+
+ mes "An antenna. Preferably pink.";
+ mes "The tongues of four different snakes.";
+ mes "A key to a treasure chest.";
+ next;
+
+ mes "A pile of ash.";
+ mes "Four different herbs.";
+ mes "A bug, or part of one.";
+ next;
+
+ mes "A lamp for the dark.";
+ mes "Rock and metal, as one.";
+ mes "Three different deaths dealt by three different scorpions.";
+ next;
+
+ mes "The womb that gives birth to butterflies.";
+ mes "The gentle caress of a creature without blemish.";
+ mes "A single piece of darkness.";
+ next;
+
+ mes "And a bottle's worth of water.";
+ mes "";
+ mes "You begin to wonder if you read that list right.";
+ next;
+
+ set QUEST_demon_mines, 1;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 83d1389e..51db0dff 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,4 +1,3 @@
-import: npc/test/_import.txt
import: npc/001-1_Tulimshar/_import.txt
import: npc/001-2_Tulimshar/_import.txt
import: npc/001-3_Tulimshar_arena/_import.txt