Merge self-fork from mekolat/magic-v3

Magic v3 spells

3 files changed, 69 insertions, 110 deletions

diff --git a/world/map/npc/012-4/_import.txt b/world/map/npc/012-4/_import.txt
index 6dc69dad..ecf5657f 100644
--- a/world/map/npc/012-4/_import.txt
+++ b/world/map/npc/012-4/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 012-4
 npc: npc/012-4/_mobs.txt
+npc: npc/012-4/_nodes.txt
 npc: npc/012-4/_warps.txt
 npc: npc/012-4/mapflags.txt
 npc: npc/012-4/pvpflag.txt
diff --git a/world/map/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt
index e1a4a259..142ec427 100644
--- a/world/map/npc/012-4/_mobs.txt
+++ b/world/map/npc/012-4/_mobs.txt
@@ -1,113 +1,67 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Terranite Cave mobs
 
-012-4,217,45,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
-012-4,223,30,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
-012-4,239,48,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
-012-4,197,39,7,8|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
-012-4,210,35,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,241,38,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,237,59,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,226,73,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,209,94,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,263,29,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,274,48,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,267,70,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,259,79,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,274,79,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,268,91,24,15|monster|Moggun|1061,10,100000ms,30000ms,Mob012-4::On1061
-012-4,209,146,69,55|monster|Spider|1012,50,100000ms,30000ms,Mob012-4::On1012
-012-4,254,163,19,46|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4,167,175,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4,148,176,17,22|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
-012-4,131,88,17,22|monster|RedSlime|1008,15,100000ms,30000ms,Mob012-4::On1008
-012-4,140,131,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4,42,128,17,9|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4,64,62,25,30|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
-012-4,69,89,17,21|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4,34,45,17,33|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
-012-4,64,36,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4,100,115,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4,90,137,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4,59,113,14,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
-012-4,42,176,15,13|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
-012-4,120,177,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
-012-4,287,180,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
-012-4,340,175,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4,390,156,69,54|monster|Spider|1012,40,100000ms,30000ms,Mob012-4::On1012
-012-4,358,37,20,22|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
-012-4,481,110,19,24|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
-012-4,435,114,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4,477,82,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
-012-4,354,106,19,46|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4,342,139,17,22|monster|RedSlime|1008,15,100000ms,30000ms,Mob012-4::On1008
-012-4,389,81,33,15|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
-012-4,409,35,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,413,73,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,395,63,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,314,182,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,409,121,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,456,99,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,133,153,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,153,98,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,126,65,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,81,180,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,61,159,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,271,157,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,270,182,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,322,141,17,22|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
-012-4,451,111,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,422,50,11,32|monster|Spider|1012,10,100000ms,30000ms,Mob012-4::On1012
-012-4,380,40,14,22|monster|Spider|1012,10,100000ms,30000ms,Mob012-4::On1012
-012-4,124,49,9,24|monster|Terranite|1062,1,100000ms,30000ms,Mob012-4::On1062
-012-4,80,110,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,42,142,20,11|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4,41,159,11,20|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
-012-4,95,180,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4,91,180,23,10|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
-
-
-012-4,0,0,0|script|Mob012-4|32767
-{
-    end;
-
-On1007:
-    set @mobID, 1007;
-    callfunc "MobPoints";
-    end;
-
-On1008:
-    set @mobID, 1008;
-    callfunc "MobPoints";
-    end;
-
-On1012:
-    set @mobID, 1012;
-    callfunc "MobPoints";
-    end;
-
-On1017:
-    set @mobID, 1017;
-    callfunc "MobPoints";
-    end;
-
-On1043:
-    set @mobID, 1043;
-    callfunc "MobPoints";
-    end;
-
-On1044:
-    set @mobID, 1044;
-    callfunc "MobPoints";
-    end;
-
-On1061:
-    set @mobID, 1061;
-    callfunc "MobPoints";
-    end;
-
-On1062:
-    set @mobID, 1062;
-    callfunc "MobPoints";
-    end;
-}
+012-4,217,45,12,3|monster|Moggun|1061,3,100000ms,30000ms
+012-4,223,30,12,3|monster|Moggun|1061,3,100000ms,30000ms
+012-4,239,48,12,3|monster|Moggun|1061,3,100000ms,30000ms
+012-4,197,39,7,8|monster|Moggun|1061,3,100000ms,30000ms
+012-4,210,35,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,241,38,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,237,59,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,226,73,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,209,94,9,5|monster|Bat|1017,5,100000ms,30000ms
+012-4,263,29,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,274,48,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,267,70,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,259,79,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,274,79,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,268,91,24,15|monster|Moggun|1061,10,100000ms,30000ms
+012-4,209,146,69,55|monster|Spider|1012,50,100000ms,30000ms
+012-4,254,163,19,46|monster|YellowSlime|1007,10,100000ms,30000ms
+012-4,167,175,17,22|monster|YellowSlime|1007,10,100000ms,30000ms
+012-4,148,176,17,22|monster|RedSlime|1008,20,100000ms,30000ms
+012-4,131,88,17,22|monster|RedSlime|1008,15,100000ms,30000ms
+012-4,140,131,17,22|monster|YellowSlime|1007,10,100000ms,30000ms
+012-4,42,128,17,9|monster|YellowSlime|1007,10,100000ms,30000ms
+012-4,64,62,25,30|monster|Spider|1012,20,100000ms,30000ms
+012-4,69,89,17,21|monster|YellowSlime|1007,10,100000ms,30000ms
+012-4,34,45,17,33|monster|Terranite|1062,3,100000ms,30000ms
+012-4,64,36,24,17|monster|Skeleton|1043,3,100000ms,30000ms
+012-4,100,115,24,17|monster|Skeleton|1043,3,100000ms,30000ms
+012-4,90,137,17,22|monster|YellowSlime|1007,10,100000ms,30000ms
+012-4,59,113,14,17|monster|LadySkeleton|1044,3,100000ms,30000ms
+012-4,42,176,15,13|monster|Terranite|1062,3,100000ms,30000ms
+012-4,120,177,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms
+012-4,287,180,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms
+012-4,340,175,24,17|monster|Skeleton|1043,3,100000ms,30000ms
+012-4,390,156,69,54|monster|Spider|1012,40,100000ms,30000ms
+012-4,358,37,20,22|monster|Terranite|1062,3,100000ms,30000ms
+012-4,481,110,19,24|monster|Terranite|1062,3,100000ms,30000ms
+012-4,435,114,24,17|monster|Skeleton|1043,3,100000ms,30000ms
+012-4,477,82,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms
+012-4,354,106,19,46|monster|YellowSlime|1007,10,100000ms,30000ms
+012-4,342,139,17,22|monster|RedSlime|1008,15,100000ms,30000ms
+012-4,389,81,33,15|monster|RedSlime|1008,20,100000ms,30000ms
+012-4,409,35,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,413,73,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,395,63,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,314,182,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,409,121,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,456,99,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,133,153,9,5|monster|Bat|1017,5,100000ms,30000ms
+012-4,153,98,9,5|monster|Bat|1017,5,100000ms,30000ms
+012-4,126,65,9,5|monster|Bat|1017,5,100000ms,30000ms
+012-4,81,180,9,5|monster|Bat|1017,5,100000ms,30000ms
+012-4,61,159,9,5|monster|Bat|1017,5,100000ms,30000ms
+012-4,271,157,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,270,182,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,322,141,17,22|monster|RedSlime|1008,20,100000ms,30000ms
+012-4,451,111,7,8|monster|Bat|1017,5,100000ms,30000ms
+012-4,422,50,11,32|monster|Spider|1012,10,100000ms,30000ms
+012-4,380,40,14,22|monster|Spider|1012,10,100000ms,30000ms
+012-4,124,49,9,24|monster|Terranite|1062,1,100000ms,30000ms
+012-4,80,110,9,5|monster|Bat|1017,5,100000ms,30000ms
+012-4,42,142,20,11|monster|Skeleton|1043,3,100000ms,30000ms
+012-4,41,159,11,20|monster|Spider|1012,20,100000ms,30000ms
+012-4,95,180,9,5|monster|Bat|1017,5,100000ms,30000ms
+012-4,91,180,23,10|monster|Spider|1012,20,100000ms,30000ms
diff --git a/world/map/npc/012-4/_nodes.txt b/world/map/npc/012-4/_nodes.txt
new file mode 100644
index 00000000..2c9229b2
--- /dev/null
+++ b/world/map/npc/012-4/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Terranite Cave nodes
+
+// (no nodes)