summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt73
-rw-r--r--maps/re/029-9.mcachebin0 -> 243 bytes
-rw-r--r--npc/029-0/mobs.txt3
-rw-r--r--npc/029-0/warps.txt11
-rw-r--r--npc/029-9/_import.txt3
-rw-r--r--npc/029-9/_warps.txt23
-rw-r--r--npc/_import.txt1
8 files changed, 78 insertions, 37 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index ba32ae519..18d7c6c7b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -219,6 +219,7 @@ map_list: (
"029-6",
"029-7",
"029-8",
+ "029-9",
"042-0",
"042-1",
"042-10",
diff --git a/db/map_index.txt b/db/map_index.txt
index 645846835..57250f993 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -216,39 +216,40 @@
029-6 216
029-7 217
029-8 218
-042-0 219
-042-1 220
-042-10 221
-042-11 222
-042-2 223
-042-3 224
-042-4 225
-042-5 226
-042-6 227
-042-7 228
-042-8 229
-042-9 230
-boss 231
-botcheck 232
-guilds 233
-maze0 234
-maze1 235
-maze10 236
-maze11 237
-maze12 238
-maze13 239
-maze14 240
-maze15 241
-maze2 242
-maze3 243
-maze4 244
-maze5 245
-maze6 246
-maze7 247
-maze8 248
-maze9 249
-sec_pri 250
-soren-2 251
-soren 252
-test 253
-testbg 254
+029-9 219
+042-0 220
+042-1 221
+042-10 222
+042-11 223
+042-2 224
+042-3 225
+042-4 226
+042-5 227
+042-6 228
+042-7 229
+042-8 230
+042-9 231
+boss 232
+botcheck 233
+guilds 234
+maze0 235
+maze1 236
+maze10 237
+maze11 238
+maze12 239
+maze13 240
+maze14 241
+maze15 242
+maze2 243
+maze3 244
+maze4 245
+maze5 246
+maze6 247
+maze7 248
+maze8 249
+maze9 250
+sec_pri 251
+soren-2 252
+soren 253
+test 254
+testbg 255
diff --git a/maps/re/029-9.mcache b/maps/re/029-9.mcache
new file mode 100644
index 000000000..e143ca170
--- /dev/null
+++ b/maps/re/029-9.mcache
Binary files differ
diff --git a/npc/029-0/mobs.txt b/npc/029-0/mobs.txt
index b549d97f4..dec79d9a6 100644
--- a/npc/029-0/mobs.txt
+++ b/npc/029-0/mobs.txt
@@ -61,7 +61,8 @@ function SFsetup2 {
areamonster("029-2", 20, 42, 32, 70, strmobinfo(1, Centaur), Centaur, 15, .e2$);
areamonster("029-2", 39, 42, 51, 70, strmobinfo(1, TerraniteProtector), TerraniteProtector, 15, .e2$);
areamonster("029-2", 32, 42, 40, 70, strmobinfo(1, GoboBear), GoboBear, 13, .e2$);
- areamonster("029-2", 20, 20, 35, 70, strmobinfo(1, Moonshroom), TerraniteProtector, 5, .e2$);
+ areamonster("029-2", 20, 20, 35, 70, strmobinfo(1, Moonshroom), Moonshroom, 5, .e2$);
+ areamonster("029-2", 20, 20, 35, 70, strmobinfo(1, RobinBandit), RobinBandit, 5, .e2$);
// MAP BOSS
monster("029-2", 46, 68, "Level Boss", YetiKing, 1, .e2$);
return;
diff --git a/npc/029-0/warps.txt b/npc/029-0/warps.txt
index ac16f880d..be349b2e3 100644
--- a/npc/029-0/warps.txt
+++ b/npc/029-0/warps.txt
@@ -114,5 +114,16 @@ OnInit:
end;
}
+029-8,174,77,0 script #298to299 NPC_HIDDEN,1,0,{
+ end;
+OnTouch:
+ if (FiresOfSteam_Warp(9)) goto L_Warp;
+ // Additional conditions here (TODO)
+ // Fallthrough
+L_Warp:
+ warp "029-9", 96, 48;
+ end;
+}
+029-9 mapflag zone SuperMMO
diff --git a/npc/029-9/_import.txt b/npc/029-9/_import.txt
new file mode 100644
index 000000000..56bea8092
--- /dev/null
+++ b/npc/029-9/_import.txt
@@ -0,0 +1,3 @@
+// Map 029-9: Woodland mining camp
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/029-9/_warps.txt",
diff --git a/npc/029-9/_warps.txt b/npc/029-9/_warps.txt
new file mode 100644
index 000000000..0cba23ec7
--- /dev/null
+++ b/npc/029-9/_warps.txt
@@ -0,0 +1,23 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 029-9: Woodland mining camp warps
+029-9,97,49,0 warp #029-9_97_49 5,0,029-8,174,78
+029-9,103,48,0 script #029-9_103_48 NPC_HIDDEN,1,0,{
+ end;
+OnTouch:
+ slide 136,40; end;
+}
+029-9,91,26,0 script #029-9_91_26 NPC_HIDDEN,1,0,{
+ end;
+OnTouch:
+ slide 34,24; end;
+}
+029-9,34,23,0 script #029-9_34_23 NPC_HIDDEN,1,0,{
+ end;
+OnTouch:
+ slide 90,25; end;
+}
+029-9,137,41,0 script #029-9_137_41 NPC_HIDDEN,1,0,{
+ end;
+OnTouch:
+ slide 102,47; end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 809906ea0..24bbad735 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -218,6 +218,7 @@
@include "npc/029-6/_import.txt"
@include "npc/029-7/_import.txt"
@include "npc/029-8/_import.txt"
+@include "npc/029-9/_import.txt"
@include "npc/042-0/_import.txt"
@include "npc/042-1/_import.txt"
@include "npc/042-10/_import.txt"