6 files changed, 15 insertions, 45 deletions
diff --git a/world/map/npc/001-1/_import.txt b/world/map/npc/001-1/_import.txt
index 9b7ca66f..3122724c 100644
--- a/world/map/npc/001-1/_import.txt
+++ b/world/map/npc/001-1/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 001-1
 npc: npc/001-1/_mobs.txt
+npc: npc/001-1/_nodes.txt
 npc: npc/001-1/_warps.txt
 npc: npc/001-1/adrian.txt
 npc: npc/001-1/ched.txt
diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index 6fc46da5..ebc1b007 100644
--- a/world/map/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
@@ -1,29 +1,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Tulimshar Port mobs
 
-001-1,32,59,10,11|monster|GreenSlime|1005,8,100000ms,30000ms,Mob001-1::On1005
-001-1,45,100,10,11|monster|GreenSlime|1005,8,100000ms,30000ms,Mob001-1::On1005
-001-1,37,75,8,34|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033
-001-1,86,84,65,55|monster|Maggot|1002,11,100000ms,30000ms,Mob001-1::On1002
-001-1,86,84,65,55|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033
-
-
-001-1,0,0,0|script|Mob001-1|32767
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1005:
-    set @mobID, 1005;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-}
+001-1,32,59,10,11|monster|GreenSlime|1005,8,100000ms,30000ms
+001-1,45,100,10,11|monster|GreenSlime|1005,8,100000ms,30000ms
+001-1,37,75,8,34|monster|SeaSlime|1033,8,100000ms,30000ms
+001-1,86,84,65,55|monster|Maggot|1002,11,100000ms,30000ms
+001-1,86,84,65,55|monster|SeaSlime|1033,8,100000ms,30000ms
diff --git a/world/map/npc/001-1/_nodes.txt b/world/map/npc/001-1/_nodes.txt
new file mode 100644
index 00000000..8d82cc96
--- /dev/null
+++ b/world/map/npc/001-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Port nodes
+
+// (no nodes)
diff --git a/world/map/npc/001-1/ched.txt b/world/map/npc/001-1/ched.txt
index ddfddd95..1710ff1e 100644
--- a/world/map/npc/001-1/ched.txt
+++ b/world/map/npc/001-1/ched.txt
@@ -3,23 +3,9 @@
 001-1,43,48,0|script|Ched|113
 {
     mes "[Ched]";
-    mes "\"I'm trying to get a spell to work, but I'm having some trouble.\"";
-    mes "\"It's supposed to combine two potions, but I can't seem to figure out which two to combine...\"";
+    mes "\"I'm trying to get work on my Alchemy homework, but I'm having some trouble.\"";
+    mes "\"I'm supposed to combine two potions to create a " + getitemlink("ConcentrationPotion") + ", but I can't seem to figure out which two to combine...\"";
     next;
-    menu
-        "Good luck with that.", L_Done,
-        "What spell is it?", L_Next;
-
-L_Next:
-    mes "";
-    mes "[Ched]";
-    mes "\"Well, I don't remember what it's called... I took it out of 'Timbleweed's Advanced Transmutations,' but it seems awfully hard to cast.\"";
-    next;
-    mes "\"If you want to try it, the invocation is '" + getspellinvocation("merge-concentration-potions") + ".' I just can't get the hang of it though.\"";
-    next;
-    mes "\"Maybe I should go back to practicing '" + getspellinvocation("detect-magic") + "' until I can cast it properly.\" %%6";
-    goto L_Done;
-
-L_Done:
+    mes "\"Maybe I should go back to practicing '" + get(.invocation$, "detect-magic") + "' until I can make potions properly.\" %%6";
     close;
 }
diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 5ad738a9..83718566 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -78,7 +78,7 @@ L_keepword:
 L_giveword:
     mes "[Aisha]";
     mes "Aisha looks around as she leans in and hushes you to silence. After a few seconds, she whispers to you:";
-    mes "\"I like you, so I'll tell you the bad word. But you can't tell anyone else about it! The bad word is '" + getspellinvocation("aggravate") + ".'\"";
+    mes "\"I like you, so I'll tell you the bad word. But you can't tell anyone else about it! The bad word is '" + get(.invocation$, "spell-aggravate") + ".'\"";
     next;
 
     mes "[Aisha]";
diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt
index 0167510e..df25a13e 100644
--- a/world/map/npc/001-1/guards.txt
+++ b/world/map/npc/001-1/guards.txt
@@ -91,6 +91,6 @@ L_message:
     mes "[Ryan the Town Guard]";
     mes "\" Watch out for Black Scorpions. They are extremely dangerous!\"";
     next;
-    mes "\"Whenever one approaches the town gate, Ekinu has me run around shouting '" + getspellinvocation("aggravate") + ".'  Somehow, this distracts it so Ekinu can kill it.\"";
+    mes "\"Whenever one approaches the town gate, Ekinu has me run around shouting '" + $@SPELL_AGGRAVATE$ + ".'  Somehow, this distracts it so Ekinu can kill it.\"";
     close;
 }