Final patches (Groata Grotto)

9 files changed, 160 insertions, 152 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 6552b6d60..645e53ed7 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -64,6 +64,7 @@ map_list: (
     "006-3",
     "006-4-1",
     "006-4",
+    "006-5",
     "007-1",
     "008-0",
     "008-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index a5e18ca06..b481eb446 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -61,150 +61,151 @@
 006-3 61
 006-4-1 62
 006-4 63
-007-1 64
-008-0 65
-008-1 66
-008-2 67
-009-1 68
-009-2 69
-009-3 70
-009-4 71
-009-5 72
-009-6 73
-009-7 74
-010-1-1 75
-010-1 76
-010-2 77
-011-1 78
-011-2 79
-011-3 80
-012-1 81
-012-2 82
-012-3 83
-012-4 84
-012-5 85
-012-6 86
-012-7 87
-012-8 88
-013-1 89
-014-1 90
-014-2-1 91
-014-2 92
-014-3 93
-014-4 94
-014-5-1 95
-014-5 96
-015-1 97
-015-2 98
-015-3 99
-015-4 100
-015-5 101
-015-6 102
-015-7 103
-015-8-1 104
-015-8 105
-016-1 106
-016-6 107
-016-7 108
-017-1 109
-017-10 110
-017-2-1 111
-017-2-2 112
-017-2 113
-017-3 114
-017-4 115
-017-5 116
-017-6 117
-017-7 118
-017-8 119
-018-1-1 120
-018-1 121
-018-2-1 122
-018-2-2 123
-018-2-3 124
-018-2-4 125
-018-2-5 126
-018-2 127
-018-3 128
-018-4-1 129
-018-4-2 130
-018-4 131
-018-5-0 132
-018-5-1 133
-018-5-2 134
-018-5-3 135
-018-5-4 136
-018-5-boss 137
-018-5 138
-018-6-0 139
-018-6-1 140
-018-6-2 141
-018-6-3 142
-019-1-1 143
-019-1 144
-019-2 145
-019-3 146
-019-4-1 147
-019-4 148
-020-1 149
-020-2 150
-020-3 151
-020-4 152
-020-5 153
-020-6 154
-020-7-1 155
-020-7-2 156
-020-7 157
-021-1 158
-021-2 159
-021-3 160
-021-4 161
-022-1 162
-023-1 163
-023-2 164
-023-3-1 165
-023-3-2 166
-023-3 167
-024-1 168
-024-10 169
-024-11 170
-024-12 171
-024-13 172
-024-14 173
-024-15 174
-024-16 175
-024-2 176
-024-3 177
-024-4 178
-024-5 179
-024-6 180
-024-7 181
-024-8 182
-024-9 183
-025-2-1 184
-025-2 185
-027-1 186
-boss 187
-botcheck 188
-guilds 189
-maze0 190
-maze1 191
-maze10 192
-maze11 193
-maze12 194
-maze13 195
-maze14 196
-maze15 197
-maze2 198
-maze3 199
-maze4 200
-maze5 201
-maze6 202
-maze7 203
-maze8 204
-maze9 205
-sec_pri 206
-soren-2 207
-soren 208
-test 209
-testbg 210
+006-5 64
+007-1 65
+008-0 66
+008-1 67
+008-2 68
+009-1 69
+009-2 70
+009-3 71
+009-4 72
+009-5 73
+009-6 74
+009-7 75
+010-1-1 76
+010-1 77
+010-2 78
+011-1 79
+011-2 80
+011-3 81
+012-1 82
+012-2 83
+012-3 84
+012-4 85
+012-5 86
+012-6 87
+012-7 88
+012-8 89
+013-1 90
+014-1 91
+014-2-1 92
+014-2 93
+014-3 94
+014-4 95
+014-5-1 96
+014-5 97
+015-1 98
+015-2 99
+015-3 100
+015-4 101
+015-5 102
+015-6 103
+015-7 104
+015-8-1 105
+015-8 106
+016-1 107
+016-6 108
+016-7 109
+017-1 110
+017-10 111
+017-2-1 112
+017-2-2 113
+017-2 114
+017-3 115
+017-4 116
+017-5 117
+017-6 118
+017-7 119
+017-8 120
+018-1-1 121
+018-1 122
+018-2-1 123
+018-2-2 124
+018-2-3 125
+018-2-4 126
+018-2-5 127
+018-2 128
+018-3 129
+018-4-1 130
+018-4-2 131
+018-4 132
+018-5-0 133
+018-5-1 134
+018-5-2 135
+018-5-3 136
+018-5-4 137
+018-5-boss 138
+018-5 139
+018-6-0 140
+018-6-1 141
+018-6-2 142
+018-6-3 143
+019-1-1 144
+019-1 145
+019-2 146
+019-3 147
+019-4-1 148
+019-4 149
+020-1 150
+020-2 151
+020-3 152
+020-4 153
+020-5 154
+020-6 155
+020-7-1 156
+020-7-2 157
+020-7 158
+021-1 159
+021-2 160
+021-3 161
+021-4 162
+022-1 163
+023-1 164
+023-2 165
+023-3-1 166
+023-3-2 167
+023-3 168
+024-1 169
+024-10 170
+024-11 171
+024-12 172
+024-13 173
+024-14 174
+024-15 175
+024-16 176
+024-2 177
+024-3 178
+024-4 179
+024-5 180
+024-6 181
+024-7 182
+024-8 183
+024-9 184
+025-2-1 185
+025-2 186
+027-1 187
+boss 188
+botcheck 189
+guilds 190
+maze0 191
+maze1 192
+maze10 193
+maze11 194
+maze12 195
+maze13 196
+maze14 197
+maze15 198
+maze2 199
+maze3 200
+maze4 201
+maze5 202
+maze6 203
+maze7 204
+maze8 205
+maze9 206
+sec_pri 207
+soren-2 208
+soren 209
+test 210
+testbg 211
diff --git a/maps/re/006-5.mcache b/maps/re/006-5.mcache
new file mode 100644
index 000000000..6d09e2b6e
--- /dev/null
+++ b/maps/re/006-5.mcache
diff --git a/npc/006-3/_import.txt b/npc/006-3/_import.txt
index 95a6b5c5c..450a0a8ec 100644
--- a/npc/006-3/_import.txt
+++ b/npc/006-3/_import.txt
@@ -3,5 +3,5 @@
 "npc/006-3/_mobs.txt",
 "npc/006-3/_warps.txt",
 "npc/006-3/core.txt",
-"npc/006-3/piouisle.txt",
-"npc/006-3/warpcandorbattle.txt",
+"npc/006-3/grotto.txt",
+"npc/006-3/jaklab.txt",
diff --git a/npc/006-3/piouisle.txt b/npc/006-3/grotto.txt
index 0554c20bd..a58d8bffc 100644
--- a/npc/006-3/piouisle.txt
+++ b/npc/006-3/grotto.txt
@@ -17,8 +17,7 @@ OnInit:
     end;
 
 OnTouch:
-    //warp "006-2", 49, 53;
-    //dispbottom l("Please use the warp to the right");
-    dispbottom l("This area is not yet ready. Please use the portal to the right instead.");
+    warp "006-5", 49, 53;
+    //dispbottom l("This area is not yet ready. Please use the portal to the right instead.");
     end;
 }
diff --git a/npc/006-3/warpcandorbattle.txt b/npc/006-3/jaklab.txt
index f2d119048..f2d119048 100644
--- a/npc/006-3/warpcandorbattle.txt
+++ b/npc/006-3/jaklab.txt
diff --git a/npc/006-5/_import.txt b/npc/006-5/_import.txt
new file mode 100644
index 000000000..e0c3f4199
--- /dev/null
+++ b/npc/006-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 006-5: Groata Grotto
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-5/_warps.txt",
diff --git a/npc/006-5/_warps.txt b/npc/006-5/_warps.txt
new file mode 100644
index 000000000..b9d0bcfa3
--- /dev/null
+++ b/npc/006-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-5: Groata Grotto warps
+006-5,49,54,0	warp	#006-5_49_54	0,0,006-3,40,36
diff --git a/npc/_import.txt b/npc/_import.txt
index c2b4ac4dd..615cba83e 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -63,6 +63,7 @@
 @include "npc/006-3/_import.txt"
 @include "npc/006-4-1/_import.txt"
 @include "npc/006-4/_import.txt"
+@include "npc/006-5/_import.txt"
 @include "npc/007-1/_import.txt"
 @include "npc/008-0/_import.txt"
 @include "npc/008-1/_import.txt"