Merge self-fork from mekolat/magic-v3

Magic v3 spells

4 files changed, 12 insertions, 38 deletions

diff --git a/world/map/npc/029-1/_import.txt b/world/map/npc/029-1/_import.txt
index c2a6d2ed..b9e64749 100644
--- a/world/map/npc/029-1/_import.txt
+++ b/world/map/npc/029-1/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 029-1
 npc: npc/029-1/_mobs.txt
+npc: npc/029-1/_nodes.txt
 npc: npc/029-1/_warps.txt
 npc: npc/029-1/aahna.txt
 npc: npc/029-1/barrier.txt
diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt
index bad7d55a..4fb1734b 100644
--- a/world/map/npc/029-1/_mobs.txt
+++ b/world/map/npc/029-1/_mobs.txt
@@ -1,40 +1,9 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Candor Island mobs
 
-029-1,46,48,4,1|monster|CloverPatch|1037,1,10000ms,120000ms,Mob029-1::On1037
-029-1,73,93,14,13|monster|Maggot|1002,8,100000ms,30000ms,Mob029-1::On1002
-029-1,90,35,15,11|monster|TameScorpion|1046,16,100000ms,30000ms,Mob029-1::On1046
-029-1,93,100,21,18|monster|TameScorpion|1046,8,100000ms,30000ms,Mob029-1::On1046
-029-1,43,43,31,23|monster|Scorpion|1003,2,100000ms,30000ms,Mob029-1::On1003
-029-1,76,42,52,25|monster|ManaBug|1131,3,30ms,0ms,Mob029-1::On1131
-
-
-029-1,0,0,0|script|Mob029-1|32767
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1003:
-    set @mobID, 1003;
-    callfunc "MobPoints";
-    end;
-
-On1037:
-    set @mobID, 1037;
-    callfunc "MobPoints";
-    end;
-
-On1046:
-    set @mobID, 1046;
-    callfunc "MobPoints";
-    end;
-
-On1131:
-    set @mobID, 1131;
-    callfunc "MobPoints";
-    end;
-}
+029-1,46,48,4,1|monster|CloverPatch|1037,1,10000ms,120000ms
+029-1,73,93,14,13|monster|Maggot|1002,8,100000ms,30000ms
+029-1,90,35,15,11|monster|TameScorpion|1046,16,100000ms,30000ms
+029-1,93,100,21,18|monster|TameScorpion|1046,8,100000ms,30000ms
+029-1,43,43,31,23|monster|Scorpion|1003,2,100000ms,30000ms
+029-1,76,42,52,25|monster|ManaBug|1131,3,30ms,0ms
diff --git a/world/map/npc/029-1/_nodes.txt b/world/map/npc/029-1/_nodes.txt
new file mode 100644
index 00000000..cde06d82
--- /dev/null
+++ b/world/map/npc/029-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Candor Island nodes
+
+// (no nodes)
diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt
index e6c580ad..7414f78b 100644
--- a/world/map/npc/029-1/barrier.txt
+++ b/world/map/npc/029-1/barrier.txt
@@ -18,6 +18,6 @@ OnTalk:
     end;
 
 OnCommandTalk:
-    areatimer "029-1", 61, 61, 69, 73, 0, "#CandorAnnouncer::OnTalk";
+    areatimer 0, "029-1", 61, 61, 69, 73, 0, "#CandorAnnouncer::OnTalk";
     end;
 }