Merge self-fork from mekolat/magic-v3

Magic v3 spells

3 files changed, 16 insertions, 52 deletions

diff --git a/world/map/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt
index ddd3a0cd..72d1a275 100644
--- a/world/map/npc/026-1/_import.txt
+++ b/world/map/npc/026-1/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 026-1
 npc: npc/026-1/_mobs.txt
+npc: npc/026-1/_nodes.txt
 npc: npc/026-1/_warps.txt
 npc: npc/026-1/mapflags.txt
 npc: npc/026-1/sign.txt
diff --git a/world/map/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt
index a99c4bab..9f4d8325 100644
--- a/world/map/npc/026-1/_mobs.txt
+++ b/world/map/npc/026-1/_mobs.txt
@@ -1,55 +1,14 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Swamp mobs
 
-026-1,0,0,0,0|monster|Wisp|1040,34,120000ms,40000ms,Mob026-1::On1040
-026-1,0,0,0,0|monster|Spectre|1042,34,120000ms,40000ms,Mob026-1::On1042
-026-1,0,0,0,0|monster|Poltergeist|1047,34,120000ms,40000ms,Mob026-1::On1047
-026-1,0,0,0,0|monster|Silkworm|1035,10,300000ms,60000ms,Mob026-1::On1035
-026-1,0,0,0,0|monster|Scorpion|1003,15,300000ms,30000ms,Mob026-1::On1003
-026-1,0,0,0,0|monster|LogHead|1025,8,300000ms,40000ms,Mob026-1::On1025
-026-1,46,74,35,26|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
-026-1,88,36,35,26|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
-026-1,35,36,18,16|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
-026-1,66,33,73,17|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034
-026-1,60,76,61,31|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034
-
-
-026-1,0,0,0|script|Mob026-1|32767
-{
-    end;
-
-On1003:
-    set @mobID, 1003;
-    callfunc "MobPoints";
-    end;
-
-On1025:
-    set @mobID, 1025;
-    callfunc "MobPoints";
-    end;
-
-On1034:
-    set @mobID, 1034;
-    callfunc "MobPoints";
-    end;
-
-On1035:
-    set @mobID, 1035;
-    callfunc "MobPoints";
-    end;
-
-On1040:
-    set @mobID, 1040;
-    callfunc "MobPoints";
-    end;
-
-On1042:
-    set @mobID, 1042;
-    callfunc "MobPoints";
-    end;
-
-On1047:
-    set @mobID, 1047;
-    callfunc "MobPoints";
-    end;
-}
+026-1,0,0,0,0|monster|Wisp|1040,34,120000ms,40000ms
+026-1,0,0,0,0|monster|Spectre|1042,34,120000ms,40000ms
+026-1,0,0,0,0|monster|Poltergeist|1047,34,120000ms,40000ms
+026-1,0,0,0,0|monster|Silkworm|1035,10,300000ms,60000ms
+026-1,0,0,0,0|monster|Scorpion|1003,15,300000ms,30000ms
+026-1,0,0,0,0|monster|LogHead|1025,8,300000ms,40000ms
+026-1,46,74,35,26|monster|GrassSnake|1034,2,100000ms,50000ms
+026-1,88,36,35,26|monster|GrassSnake|1034,2,100000ms,50000ms
+026-1,35,36,18,16|monster|GrassSnake|1034,2,100000ms,50000ms
+026-1,66,33,73,17|monster|GrassSnake|1034,4,100000ms,50000ms
+026-1,60,76,61,31|monster|GrassSnake|1034,4,100000ms,50000ms
diff --git a/world/map/npc/026-1/_nodes.txt b/world/map/npc/026-1/_nodes.txt
new file mode 100644
index 00000000..47e3199f
--- /dev/null
+++ b/world/map/npc/026-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Swamp nodes
+
+// (no nodes)