015-8 Ancient Hideout. It is not accessible per-se (yet).

The boss map is still missing.

10 files changed, 106 insertions, 78 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 23113cd3e..ed721cbe1 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -92,6 +92,7 @@ map_list: (
     "015-5",
     "015-6",
     "015-7",
+    "015-8",
     "016-1",
     "016-6",
     "016-7",
diff --git a/db/map_index.txt b/db/map_index.txt
index 67da6753e..536219ad8 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -89,79 +89,80 @@
 015-5 89
 015-6 90
 015-7 91
-016-1 92
-016-6 93
-016-7 94
-017-1 95
-017-2-1 96
-017-2-2 97
-017-2 98
-017-3 99
-017-4 100
-017-5 101
-017-6 102
-017-7 103
-017-8 104
-018-1-1 105
-018-1 106
-018-2-1 107
-018-2-2 108
-018-2-3 109
-018-2-4 110
-018-2-5 111
-018-2 112
-018-3 113
-018-4-1 114
-018-4-2 115
-018-4 116
-018-5-0 117
-018-5-1 118
-018-5-2 119
-018-5-3 120
-018-5-boss 121
-018-5 122
-019-1-1 123
-019-1 124
-019-2 125
-019-3 126
-019-4-1 127
-019-4 128
-020-1 129
-020-2 130
-020-3 131
-020-4 132
-020-5 133
-020-6 134
-020-7-1 135
-020-7-2 136
-020-7 137
-021-1 138
-021-2 139
-021-3 140
-021-4 141
-022-1 142
-023-1 143
-023-2 144
-024-1 145
-024-10 146
-024-11 147
-024-12 148
-024-13 149
-024-14 150
-024-15 151
-024-2 152
-024-3 153
-024-4 154
-024-5 155
-024-6 156
-024-7 157
-024-8 158
-024-9 159
-boss 160
-botcheck 161
-guilds 162
-sec_pri 163
-soren-2 164
-soren 165
-test 166
-testbg 167
+015-8 92
+016-1 93
+016-6 94
+016-7 95
+017-1 96
+017-2-1 97
+017-2-2 98
+017-2 99
+017-3 100
+017-4 101
+017-5 102
+017-6 103
+017-7 104
+017-8 105
+018-1-1 106
+018-1 107
+018-2-1 108
+018-2-2 109
+018-2-3 110
+018-2-4 111
+018-2-5 112
+018-2 113
+018-3 114
+018-4-1 115
+018-4-2 116
+018-4 117
+018-5-0 118
+018-5-1 119
+018-5-2 120
+018-5-3 121
+018-5-boss 122
+018-5 123
+019-1-1 124
+019-1 125
+019-2 126
+019-3 127
+019-4-1 128
+019-4 129
+020-1 130
+020-2 131
+020-3 132
+020-4 133
+020-5 134
+020-6 135
+020-7-1 136
+020-7-2 137
+020-7 138
+021-1 139
+021-2 140
+021-3 141
+021-4 142
+022-1 143
+023-1 144
+023-2 145
+024-1 146
+024-10 147
+024-11 148
+024-12 149
+024-13 150
+024-14 151
+024-15 152
+024-2 153
+024-3 154
+024-4 155
+024-5 156
+024-6 157
+024-7 158
+024-8 159
+024-9 160
+boss 161
+botcheck 162
+guilds 163
+sec_pri 164
+soren-2 165
+soren 166
+test 167
+testbg 168
diff --git a/maps/re/015-8.mcache b/maps/re/015-8.mcache
new file mode 100644
index 000000000..eb778d7c1
--- /dev/null
+++ b/maps/re/015-8.mcache
diff --git a/npc/007-1/treasure.txt b/npc/007-1/treasure.txt
index fdc985da3..9a3bc273f 100644
--- a/npc/007-1/treasure.txt
+++ b/npc/007-1/treasure.txt
@@ -8,7 +8,7 @@
 
     .@regen_time=200;
     fishing(2, CommonCarp, RustyKnife,
-               ScorpionStinger, FatesPotion, GrassCarp); // begin or continue fishing (AlchemyBlueprintA)
+               ScorpionStinger, FatesPotion, GrassCarp); // begin or continue fishing (AlchemyBlueprintA, EquipmentBlueprintA) TODO
     close;
 
 OnInit:
diff --git a/npc/012-4/wyara.txt b/npc/012-4/wyara.txt
index 0c371ee91..478b236dc 100644
--- a/npc/012-4/wyara.txt
+++ b/npc/012-4/wyara.txt
@@ -241,6 +241,7 @@ L_SaggyMain:
     next;
     mesn;
     mesq l("Good, this must mean that Sagratha managed to flee in time.");
+    // mesc l("She must have hidden to the secret cave nearby....");
     // TODO
     //setq1 HurnscaldQuest_Sagratha, 3;
     //setq3 HurnscaldQuest_Sagratha, 0;
diff --git a/npc/014-5-1/objects.txt b/npc/014-5-1/objects.txt
index 55d7d395f..ed3520924 100644
--- a/npc/014-5-1/objects.txt
+++ b/npc/014-5-1/objects.txt
@@ -24,8 +24,19 @@ OnInit:
         next;
         mesn;
         mesc l("Thinking well... There's something behind it! A secret window!");
-        if (getq(HurnscaldQuest_Sagratha) <= 2)
+        if (getq(HurnscaldQuest_Sagratha) <= 2) {
             setq3 HurnscaldQuest_Sagratha, 1;
+        } else {
+            next;
+            mesn l("Secret Window");
+            mesc l("Enter though the window to the secret caves?");
+            next;
+            if (askyesno() == ASK_YES) {
+                warp "015-8", 99, 178;
+                closeclientdialog;
+                end;
+            }
+        }
         next;
         mesn l("Secret Window");
         mesc l("The window appears to be unlocked. It might have been open some time ago.");
diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt
index defaa2959..d28f19a1f 100644
--- a/npc/014-5/sagratha.txt
+++ b/npc/014-5/sagratha.txt
@@ -131,6 +131,8 @@ L_Open:
     } else {
 		.@inst = instance_create("Sagratha House "+getcharid(0), getcharid(3), IOT_CHAR);
         instance_attachmap("014-5-1", .@inst, false, .@mapn$);
+        //instance_attachmap("015-8", .@inst, false, .@mapn$);
+        //instance_attachmap("015-8-1", .@inst, false, .@mapn$);
         // 20 minutes (1200s) inside, or 5 minutes (300s) outside
 		instance_set_timeout(1200, 30, .@inst);
 		instance_init(.@inst);
diff --git a/npc/015-8/_import.txt b/npc/015-8/_import.txt
new file mode 100644
index 000000000..f2d5e9e92
--- /dev/null
+++ b/npc/015-8/_import.txt
@@ -0,0 +1,3 @@
+// Map 015-8: Ancient Hideout
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-8/_mobs.txt",
diff --git a/npc/015-8/_mobs.txt b/npc/015-8/_mobs.txt
new file mode 100644
index 000000000..a7e57ad05
--- /dev/null
+++ b/npc/015-8/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-8: Ancient Hideout mobs
+015-8,99,99,69,81	monster	Mouboo	1023,32,20000,20000
+015-8,114,95,51,69	monster	Robin Bandit	1153,16,20000,20000
+015-8,89,140,62,30	monster	Angry Yellow Slime	1198,12,20000,20000
+015-8,97,57,62,46	monster	Old Snake	1199,12,20000,20000
+015-8,67,94,34,79	monster	Red Slime	1092,16,20000,20000
+015-8,100,56,48,36	monster	Vampire Bat	1063,14,30000,22000
diff --git a/npc/_import.txt b/npc/_import.txt
index 959b7a3a3..938dd2f5d 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -91,6 +91,7 @@
 @include "npc/015-5/_import.txt"
 @include "npc/015-6/_import.txt"
 @include "npc/015-7/_import.txt"
+@include "npc/015-8/_import.txt"
 @include "npc/016-1/_import.txt"
 @include "npc/016-6/_import.txt"
 @include "npc/016-7/_import.txt"