summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-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
5 files changed, 40 insertions, 1 deletions
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"