Accept 018-2-4 submission

8 files changed, 46 insertions, 31 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 81cbd23da..62cd3fe03 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -97,6 +97,7 @@ map_list: (
     "018-2-1",
     "018-2-2",
     "018-2-3",
+    "018-2-4",
     "018-2",
     "018-3-1",
     "018-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 9aacc7e07..fee59eb4b 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -94,32 +94,33 @@
 018-2-1 94
 018-2-2 95
 018-2-3 96
-018-2 97
-018-3-1 98
-018-3 99
-018-4-1 100
-018-4-2 101
-018-4 102
-018-5 103
-019-1-1 104
-019-1 105
-019-2 106
-019-3 107
-019-4-1 108
-019-4 109
-020-1 110
-021-1 111
-021-2 112
-021-3 113
-021-4 114
-022-1 115
-023-1 116
-023-2 117
-024-1 118
-boss 119
-botcheck 120
-sec_pri 121
-soren-2 122
-soren 123
-test 124
-testbg 125
+018-2-4 97
+018-2 98
+018-3-1 99
+018-3 100
+018-4-1 101
+018-4-2 102
+018-4 103
+018-5 104
+019-1-1 105
+019-1 106
+019-2 107
+019-3 108
+019-4-1 109
+019-4 110
+020-1 111
+021-1 112
+021-2 113
+021-3 114
+021-4 115
+022-1 116
+023-1 117
+023-2 118
+024-1 119
+boss 120
+botcheck 121
+sec_pri 122
+soren-2 123
+soren 124
+test 125
+testbg 126
diff --git a/maps/re/018-2-4.mcache b/maps/re/018-2-4.mcache
new file mode 100644
index 000000000..ba11231bd
--- /dev/null
+++ b/maps/re/018-2-4.mcache
diff --git a/npc/018-2-1/dustman.txt b/npc/018-2-1/dustman.txt
index 7393ee174..666c0e5b1 100644
--- a/npc/018-2-1/dustman.txt
+++ b/npc/018-2-1/dustman.txt
@@ -84,7 +84,7 @@
             select
                 l("The Loyalists"),
                 l("The Wildlife");
-            setq LoFQuest_HH, 1, 0, @menu;
+            setq LoFQuest_HH, 1, 0, (@menu-1);
         }
     }
     close;
diff --git a/npc/018-2-1/warps.txt b/npc/018-2-1/warps.txt
index d543197c1..c7f85edfb 100644
--- a/npc/018-2-1/warps.txt
+++ b/npc/018-2-1/warps.txt
@@ -1,7 +1,8 @@
 // Map 018-2-1: Heroes' Hold - Castle manual warps
 // LoFQuest_HH
+// Field 1
 //   1- Accepted
-//   2 - Master Finished
+//   2- Master Finished
 //
 // Field 2
 //  BITWISE:
@@ -15,6 +16,10 @@
 //    128 - Saulc's Madness
 //    256 - The Mouboo Realm
 //    512 - The Moubootaur Dungeon
+// 
+// Field 3
+//   0- The Loyalists
+//   1- The Wildlife
 
 018-2-1,26,27,0	script	#018-2-1_26_27	NPC_HIDDEN,2,0,{
     end;
diff --git a/npc/018-2-4/_import.txt b/npc/018-2-4/_import.txt
new file mode 100644
index 000000000..b42778120
--- /dev/null
+++ b/npc/018-2-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 018-2-4: Heroes' Hold - Exchange Hall
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-2-4/_warps.txt",
diff --git a/npc/018-2-4/_warps.txt b/npc/018-2-4/_warps.txt
new file mode 100644
index 000000000..92ff8cce4
--- /dev/null
+++ b/npc/018-2-4/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-2-4: Heroes' Hold - Exchange Hall warps
+018-2-4,24,55,0	warp	#018-2-4_24_55	2,0,018-2-1,26,25
+018-2-4,24,34,0	warp	#018-2-4_24_34	2,0,018-2-1,26,25
diff --git a/npc/_import.txt b/npc/_import.txt
index a32f08df6..f7bcc8809 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -96,6 +96,7 @@
 @include "npc/018-2-1/_import.txt"
 @include "npc/018-2-2/_import.txt"
 @include "npc/018-2-3/_import.txt"
+@include "npc/018-2-4/_import.txt"
 @include "npc/018-2/_import.txt"
 @include "npc/018-3-1/_import.txt"
 @include "npc/018-3/_import.txt"