summaryrefslogtreecommitdiff
path: root/world/map/npc/006-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/006-1')
-rw-r--r--world/map/npc/006-1/_import.txt1
-rw-r--r--world/map/npc/006-1/_mobs.txt73
-rw-r--r--world/map/npc/006-1/_nodes.txt4
-rw-r--r--world/map/npc/006-1/spirit.txt4
-rw-r--r--world/map/npc/006-1/tree.txt6
5 files changed, 28 insertions, 60 deletions
diff --git a/world/map/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index 0885c461..44f1375d 100644
--- a/world/map/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
@@ -2,6 +2,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
map: 006-1
npc: npc/006-1/_mobs.txt
+npc: npc/006-1/_nodes.txt
npc: npc/006-1/_warps.txt
npc: npc/006-1/mapflags.txt
npc: npc/006-1/mika.txt
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index 2288ec92..c18464c8 100644
--- a/world/map/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
@@ -1,55 +1,24 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mountains mobs
-006-1,49,52,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
-006-1,53,36,16,13|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026
-006-1,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
-006-1,113,41,12,37|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1,113,51,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1,86,46,29,5|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1,105,73,21,14|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1,73,102,8,13|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
-006-1,104,100,11,15|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1,82,72,25,16|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1,95,114,17,4|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
-006-1,57,119,18,2|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
-006-1,33,97,27,33|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003
-006-1,58,49,3,3|monster|GreenSlime|1005,3,100000ms,30000ms,Mob006-1::On1005
-006-1,34,50,5,4|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-006-1,96,92,20,48|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-006-1,35,97,28,29|monster|Maggot|1002,20,100000ms,30000ms,Mob006-1::On1002
-006-1,28,73,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
-006-1,33,59,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
-006-1,37,73,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
-006-1,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-
-
-006-1,0,0,0|script|Mob006-1|32767
-{
- end;
-
-On1002:
- set @mobID, 1002;
- callfunc "MobPoints";
- end;
-
-On1003:
- set @mobID, 1003;
- callfunc "MobPoints";
- end;
-
-On1005:
- set @mobID, 1005;
- callfunc "MobPoints";
- end;
-
-On1010:
- set @mobID, 1010;
- callfunc "MobPoints";
- end;
-
-On1026:
- set @mobID, 1026;
- callfunc "MobPoints";
- end;
-}
+006-1,49,52,7,3|monster|Snake|1010,1,100000ms,30000ms
+006-1,53,36,16,13|monster|MountainSnake|1026,3,150000ms,10000ms
+006-1,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms
+006-1,113,41,12,37|monster|MountainSnake|1026,8,15000ms,75000ms
+006-1,113,51,6,3|monster|MountainSnake|1026,3,15000ms,75000ms
+006-1,86,46,29,5|monster|MountainSnake|1026,3,15000ms,75000ms
+006-1,105,73,21,14|monster|MountainSnake|1026,3,15000ms,75000ms
+006-1,73,102,8,13|monster|MountainSnake|1026,4,15000ms,75000ms
+006-1,104,100,11,15|monster|MountainSnake|1026,8,15000ms,75000ms
+006-1,82,72,25,16|monster|MountainSnake|1026,8,15000ms,75000ms
+006-1,95,114,17,4|monster|MountainSnake|1026,5,15000ms,75000ms
+006-1,57,119,18,2|monster|MountainSnake|1026,4,15000ms,75000ms
+006-1,33,97,27,33|monster|Scorpion|1003,10,100000ms,30000ms
+006-1,58,49,3,3|monster|GreenSlime|1005,3,100000ms,30000ms
+006-1,34,50,5,4|monster|Snake|1010,2,40000ms,50000ms
+006-1,96,92,20,48|monster|Snake|1010,2,40000ms,50000ms
+006-1,35,97,28,29|monster|Maggot|1002,20,100000ms,30000ms
+006-1,28,73,3,2|monster|GreenSlime|1005,2,100000ms,30000ms
+006-1,33,59,3,2|monster|GreenSlime|1005,2,100000ms,30000ms
+006-1,37,73,7,3|monster|Snake|1010,1,100000ms,30000ms
+006-1,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms
diff --git a/world/map/npc/006-1/_nodes.txt b/world/map/npc/006-1/_nodes.txt
new file mode 100644
index 00000000..e53e7619
--- /dev/null
+++ b/world/map/npc/006-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Desert Mountains nodes
+
+// (no nodes)
diff --git a/world/map/npc/006-1/spirit.txt b/world/map/npc/006-1/spirit.txt
index 8c7155fa..68e1bbe7 100644
--- a/world/map/npc/006-1/spirit.txt
+++ b/world/map/npc/006-1/spirit.txt
@@ -178,7 +178,7 @@ L_Next5:
mes "\"Kekeke... excellent! Yes, here goes your first spell, the flying backpack! If you are overloaded, it will take the load off your shoulders.\"";
next;
mes "[Earth Spirit]";
- mes "\"Take a cocoon, living or dead, and suffuse it in magic. Whisper '" + getspellinvocation("flying-backpack") + "', and feel it float!\"";
+ mes "\"Take a cocoon, living or dead, and suffuse it in magic. Whisper '" + get(.invocation$, "flying-backpack") + "', and feel it float!\"";
goto L_Q_magic_finish;
L_Q_magic_3:
@@ -196,7 +196,7 @@ L_Next6:
mes "\"Yeees, good! This one is a protection spell, making your skin harder. You need a hard spike for it, though. Hold that spike in your hands, and focus on it.\"";
next;
mes "[Earth Spirit]";
- mes "\"Next, say '" + getspellinvocation("protect") + "', and feel your skin grow rigid! Very useful against stings and stabs and pokes and pricks and that sort of stuff.\"";
+ mes "\"Next, say '" + get(.invocation$, "protect") + "', and feel your skin grow rigid! Very useful against stings and stabs and pokes and pricks and that sort of stuff.\"";
goto L_Q_magic_finish;
L_Q_magic_4:
diff --git a/world/map/npc/006-1/tree.txt b/world/map/npc/006-1/tree.txt
index 6740312e..57209d24 100644
--- a/world/map/npc/006-1/tree.txt
+++ b/world/map/npc/006-1/tree.txt
@@ -160,9 +160,3 @@ L_Close:
callfunc "QuestTreeTouch";
close;
}
-
-006-1,83,59,0|script|#DruidTree1#_M|400
-{
- callfunc "QuestTreeTouch";
- close;
-}