Make Maps

11 files changed, 93 insertions, 74 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 8dc586ab8..2fd93dd95 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -125,6 +125,7 @@ map_list: (
     "018-5-1",
     "018-5-2",
     "018-5-3",
+    "018-5-4",
     "018-5-boss",
     "018-5",
     "018-6-0",
diff --git a/db/map_index.txt b/db/map_index.txt
index 49f91ffde..e573c84d6 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -122,76 +122,77 @@
 018-5-1 122
 018-5-2 123
 018-5-3 124
-018-5-boss 125
-018-5 126
-018-6-0 127
-018-6-1 128
-018-6-2 129
-018-6-3 130
-019-1-1 131
-019-1 132
-019-2 133
-019-3 134
-019-4-1 135
-019-4 136
-020-1 137
-020-2 138
-020-3 139
-020-4 140
-020-5 141
-020-6 142
-020-7-1 143
-020-7-2 144
-020-7 145
-021-1 146
-021-2 147
-021-3 148
-021-4 149
-022-1 150
-023-1 151
-023-2 152
-023-3-1 153
-023-3-2 154
-023-3 155
-024-1 156
-024-10 157
-024-11 158
-024-12 159
-024-13 160
-024-14 161
-024-15 162
-024-16 163
-024-2 164
-024-3 165
-024-4 166
-024-5 167
-024-6 168
-024-7 169
-024-8 170
-024-9 171
-025-2-1 172
-025-2 173
-boss 174
-botcheck 175
-guilds 176
-maze0 177
-maze1 178
-maze10 179
-maze11 180
-maze12 181
-maze13 182
-maze14 183
-maze15 184
-maze2 185
-maze3 186
-maze4 187
-maze5 188
-maze6 189
-maze7 190
-maze8 191
-maze9 192
-sec_pri 193
-soren-2 194
-soren 195
-test 196
-testbg 197
+018-5-4 125
+018-5-boss 126
+018-5 127
+018-6-0 128
+018-6-1 129
+018-6-2 130
+018-6-3 131
+019-1-1 132
+019-1 133
+019-2 134
+019-3 135
+019-4-1 136
+019-4 137
+020-1 138
+020-2 139
+020-3 140
+020-4 141
+020-5 142
+020-6 143
+020-7-1 144
+020-7-2 145
+020-7 146
+021-1 147
+021-2 148
+021-3 149
+021-4 150
+022-1 151
+023-1 152
+023-2 153
+023-3-1 154
+023-3-2 155
+023-3 156
+024-1 157
+024-10 158
+024-11 159
+024-12 160
+024-13 161
+024-14 162
+024-15 163
+024-16 164
+024-2 165
+024-3 166
+024-4 167
+024-5 168
+024-6 169
+024-7 170
+024-8 171
+024-9 172
+025-2-1 173
+025-2 174
+boss 175
+botcheck 176
+guilds 177
+maze0 178
+maze1 179
+maze10 180
+maze11 181
+maze12 182
+maze13 183
+maze14 184
+maze15 185
+maze2 186
+maze3 187
+maze4 188
+maze5 189
+maze6 190
+maze7 191
+maze8 192
+maze9 193
+sec_pri 194
+soren-2 195
+soren 196
+test 197
+testbg 198
diff --git a/maps/re/014-4.mcache b/maps/re/014-4.mcache
index 4e70fdb4e..ae4e65bbd 100644
--- a/maps/re/014-4.mcache
+++ b/maps/re/014-4.mcache
diff --git a/maps/re/018-5-4.mcache b/maps/re/018-5-4.mcache
new file mode 100644
index 000000000..01dffb4ab
--- /dev/null
+++ b/maps/re/018-5-4.mcache
diff --git a/maps/re/018-5.mcache b/maps/re/018-5.mcache
index 3fde2e0ed..89e333992 100644
--- a/maps/re/018-5.mcache
+++ b/maps/re/018-5.mcache
diff --git a/npc/014-4/_mobs.txt b/npc/014-4/_mobs.txt
index 99b6ac683..4f3abd81d 100644
--- a/npc/014-4/_mobs.txt
+++ b/npc/014-4/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 014-4: Thunderhill mobs
 014-4,134,85,26,22	monster	Centaur	1139,3,90000,80000
-014-4,61,38,43,23	monster	Mana Piou	1155,7,30000,30000
+014-4,61,38,43,23	monster	Mana Piou	1155,7,25000,5000
 014-4,130,68,24,52	monster	Forest Mushroom	1060,10,60000,45000
 014-4,70,77,53,13	monster	Living Potato	1181,5,60000,45000
 014-4,20,26,4,20	monster	Bluepar	1177,4,30000,30000
diff --git a/npc/018-5-4/_import.txt b/npc/018-5-4/_import.txt
new file mode 100644
index 000000000..345b87573
--- /dev/null
+++ b/npc/018-5-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 018-5-4: Duck Island
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-5-4/_mobs.txt",
+"npc/018-5-4/_warps.txt",
diff --git a/npc/018-5-4/_mobs.txt b/npc/018-5-4/_mobs.txt
new file mode 100644
index 000000000..4db4efe18
--- /dev/null
+++ b/npc/018-5-4/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-5-4: Duck Island mobs
+018-5-4,39,70,16,8	monster	Mana Piou	1155,8,35000,270000
+018-5-4,49,56,12,9	monster	Vicious Squirrel	1187,8,35000,120000
+018-5-4,35,29,9,6	monster	Piou	1002,6,200000,35000
+018-5-4,46,50,26,30	monster	Duck	1029,23,200000,35000
+018-5-4,63,50,7,6	monster	Piou	1002,6,200000,35000
+018-5-4,44,58,5,5	monster	Forest Piou	1202,4,35000,120000
diff --git a/npc/018-5-4/_warps.txt b/npc/018-5-4/_warps.txt
new file mode 100644
index 000000000..e4997c9b7
--- /dev/null
+++ b/npc/018-5-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-5-4: Duck Island warps
+018-5-4,35,44,0	warp	#018-5-4_35_44	0,0,018-5,110,47
diff --git a/npc/018-5/_warps.txt b/npc/018-5/_warps.txt
index c222ada9b..9c17fdb94 100644
--- a/npc/018-5/_warps.txt
+++ b/npc/018-5/_warps.txt
@@ -5,3 +5,4 @@
 018-5,83,48,0	warp	#018-5_83_48	0,0,018-5-3,32,46
 018-5,60,146,0	warp	#018-5_60_146	0,0,018-5-1,36,98
 018-5,114,54,0	warp	#018-5_114_54	0,0,018-5-2,32,46
+018-5,110,46,0	warp	#018-5_110_46	0,0,018-5-4,35,43
diff --git a/npc/_import.txt b/npc/_import.txt
index c87435375..7be3e9868 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -124,6 +124,7 @@
 @include "npc/018-5-1/_import.txt"
 @include "npc/018-5-2/_import.txt"
 @include "npc/018-5-3/_import.txt"
+@include "npc/018-5-4/_import.txt"
 @include "npc/018-5-boss/_import.txt"
 @include "npc/018-5/_import.txt"
 @include "npc/018-6-0/_import.txt"