4 files changed, 18 insertions, 69 deletions
diff --git a/world/map/npc/015-1/_import.txt b/world/map/npc/015-1/_import.txt
index 6085f2a3..a376d93a 100644
--- a/world/map/npc/015-1/_import.txt
+++ b/world/map/npc/015-1/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 015-1
 npc: npc/015-1/_mobs.txt
+npc: npc/015-1/_nodes.txt
 npc: npc/015-1/_warps.txt
 npc: npc/015-1/alice.txt
 npc: npc/015-1/barrier.txt
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index cad191f2..e012a95c 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -1,69 +1,13 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Woodland mobs
 
-015-1,0,0,0,0|monster|CloverPatch|1037,2,100000ms,1000ms,Mob015-1::On1037
-015-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob015-1::On1055
-015-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob015-1::On1038
-015-1,0,0,0,0|monster|LogHead|1025,40,0ms,0ms,Mob015-1::On1025
-015-1,0,0,0,0|monster|SpikyMushroom|1019,20,0ms,0ms,Mob015-1::On1019
-015-1,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob015-1::On1014
-015-1,0,0,0,0|monster|GambogePlant|1031,5,0ms,0ms,Mob015-1::On1031
-015-1,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms,Mob015-1::On1032
-015-1,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms,Mob015-1::On1035
-015-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob015-1::On1029
-
-
-015-1,0,0,0|script|Mob015-1|32767
-{
-    end;
-
-On1014:
-    set @mobID, 1014;
-    callfunc "MobPoints";
-    end;
-
-On1019:
-    set @mobID, 1019;
-    callfunc "MobPoints";
-    end;
-
-On1025:
-    set @mobID, 1025;
-    callfunc "MobPoints";
-    end;
-
-On1029:
-    set @mobID, 1029;
-    callfunc "MobPoints";
-    end;
-
-On1031:
-    set @mobID, 1031;
-    callfunc "MobPoints";
-    end;
-
-On1032:
-    set @mobID, 1032;
-    callfunc "MobPoints";
-    end;
-
-On1035:
-    set @mobID, 1035;
-    callfunc "MobPoints";
-    end;
-
-On1037:
-    set @mobID, 1037;
-    callfunc "MobPoints";
-    end;
-
-On1038:
-    set @mobID, 1038;
-    callfunc "MobPoints";
-    end;
-
-On1055:
-    set @mobID, 1055;
-    callfunc "MobPoints";
-    end;
-}
+015-1,0,0,0,0|monster|CloverPatch|1037,2,100000ms,1000ms
+015-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms
+015-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms
+015-1,0,0,0,0|monster|LogHead|1025,40,0ms,0ms
+015-1,0,0,0,0|monster|SpikyMushroom|1019,20,0ms,0ms
+015-1,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms
+015-1,0,0,0,0|monster|GambogePlant|1031,5,0ms,0ms
+015-1,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms
+015-1,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms
+015-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms
diff --git a/world/map/npc/015-1/_nodes.txt b/world/map/npc/015-1/_nodes.txt
new file mode 100644
index 00000000..12c08221
--- /dev/null
+++ b/world/map/npc/015-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Woodland nodes
+
+// (no nodes)
diff --git a/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt
index 239de752..be23e23a 100644
--- a/world/map/npc/015-1/sword.txt
+++ b/world/map/npc/015-1/sword.txt
@@ -109,7 +109,7 @@ L_Initial_ok:
     mes "\"Oh, my apologies – that was a little overly dramatic. But I do not get to talk to thy kin anymore all that often.\"";
     next;
     mes "[Mystic Sword]";
-    mes "\"For the flare dart spell throw a handful of sulphur powder up into the air, and say, '" + getspellinvocation("flare-dart") + "'.\"";
+    mes "\"For the flare dart spell throw a handful of sulphur powder up into the air, and say, '" + get(.invocation$, "flare-dart") + "'.\"";
     set @Q_status, @STATUS_LEARNED_FLAREDART;
     callsub S_update_var;
     next;
@@ -257,7 +257,7 @@ L_Next3:
     callsub S_update_var;
     next;
     mes "[Mystic Sword]";
-    mes "\"Speak '" + getspellinvocation("magic-knuckles") + "' and take a glass of beer and drink it, without ever taking it off thy lips. This will harden and enchant thy fists, turning them into powerful weapons.\"";
+    mes "\"Speak '" + get(.invocation$, "magic-knuckles") + "' and take a glass of beer and drink it, without ever taking it off thy lips. This will harden and enchant thy fists, turning them into powerful weapons.\"";
     close;
 
 L_L2_almost_done:
@@ -297,7 +297,7 @@ L_Next4:
     callsub S_update_var;
     next;
     mes "[Mystic Sword]";
-    mes "\"This powder thou shalst need to cast the lightning spell. Throw it up into the air and shout '" + getspellinvocation("lightning-strike") +  "', and smite thine enemies with lightning.\"";
+    mes "\"This powder thou shalst need to cast the lightning spell. Throw it up into the air and shout '" + get(.invocation$, "lightning-strike") +  "', and smite thine enemies with lightning.\"";
     next;
     goto L_Farewell;