Merge self-fork from mekolat/magic-v3

Magic v3 spells

3 files changed, 32 insertions, 98 deletions

diff --git a/world/map/npc/018-1/_import.txt b/world/map/npc/018-1/_import.txt
index 087fe43e..bf00cad9 100644
--- a/world/map/npc/018-1/_import.txt
+++ b/world/map/npc/018-1/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 018-1
 npc: npc/018-1/_mobs.txt
+npc: npc/018-1/_nodes.txt
 npc: npc/018-1/_warps.txt
 npc: npc/018-1/flowerpentagram3.txt
 npc: npc/018-1/mapflags.txt
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index 942a6d09..ced34aa9 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -1,101 +1,30 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Woodland Mining Camp mobs
 
-018-1,136,79,9,41|monster|SeaSlime|1033,10,100000ms,30000ms,Mob018-1::On1033
-018-1,108,87,53,25|monster|ManaBug|1131,10,100000ms,30000ms,Mob018-1::On1131
-018-1,116,44,6,7|monster|SeaSlime|1033,3,100000ms,30000ms,Mob018-1::On1033
-018-1,119,56,13,6|monster|PinkFlower|1014,2,100000ms,30000ms,Mob018-1::On1014
-018-1,175,28,17,19|monster|JackO|1022,1,180000ms,120000ms,Mob018-1::On1022
-018-1,78,59,3,1|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-1::On1007
-018-1,57,63,14,7|monster|Silkworm|1035,2,100000ms,30000ms,Mob018-1::On1035
-018-1,43,63,31,28|monster|Bat|1017,10,100000ms,30000ms,Mob018-1::On1017
-018-1,134,39,18,10|monster|GrassSnake|1034,4,100000ms,50000ms,Mob018-1::On1034
-018-1,124,42,9,11|monster|GrassSnake|1034,2,100000ms,50000ms,Mob018-1::On1034
-018-1,124,19,22,9|monster|GrassSnake|1034,3,100000ms,50000ms,Mob018-1::On1034
-018-1,122,29,19,9|monster|GrassSnake|1034,2,100000ms,50000ms,Mob018-1::On1034
-018-1,149,45,10,8|monster|Bat|1017,5,100000ms,30000ms,Mob018-1::On1017
-018-1,169,47,20,10|monster|RedSlime|1008,4,120000ms,30000ms,Mob018-1::On1008
-018-1,136,49,13,8|monster|Bat|1017,4,100000ms,30000ms,Mob018-1::On1017
-018-1,166,49,13,9|monster|CloverPatch|1037,1,100000ms,30000ms,Mob018-1::On1037
-018-1,111,62,5,2|monster|Silkworm|1035,1,60000ms,30000ms,Mob018-1::On1035
-018-1,117,50,4,3|monster|SeaSlime|1033,1,120000ms,60000ms,Mob018-1::On1033
-018-1,96,47,18,11|monster|RedSlime|1008,3,100000ms,50000ms,Mob018-1::On1008
-018-1,106,52,15,6|monster|CobaltPlant|1030,1,240000ms,120000ms,Mob018-1::On1030
-018-1,78,55,37,6|monster|RedSlime|1008,7,100000ms,50000ms,Mob018-1::On1008
-018-1,145,24,10,9|monster|RedSlime|1008,3,100000ms,50000ms,Mob018-1::On1008
-018-1,68,89,14,17|monster|Bat|1017,3,100000ms,50000ms,Mob018-1::On1017
-018-1,160,31,11,18|monster|RedSlime|1008,5,100000ms,50000ms,Mob018-1::On1008
-018-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob018-1::On1037
-018-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob018-1::On1055
-018-1,134,80,14,39|monster|Maggot|1002,15,30ms,0ms,Mob018-1::On1002
-
-
-018-1,0,0,0|script|Mob018-1|32767
-{
-    end;
-
-On1002:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    end;
-
-On1007:
-    set @mobID, 1007;
-    callfunc "MobPoints";
-    end;
-
-On1008:
-    set @mobID, 1008;
-    callfunc "MobPoints";
-    end;
-
-On1014:
-    set @mobID, 1014;
-    callfunc "MobPoints";
-    end;
-
-On1017:
-    set @mobID, 1017;
-    callfunc "MobPoints";
-    end;
-
-On1022:
-    set @mobID, 1022;
-    callfunc "MobPoints";
-    end;
-
-On1030:
-    set @mobID, 1030;
-    callfunc "MobPoints";
-    end;
-
-On1033:
-    set @mobID, 1033;
-    callfunc "MobPoints";
-    end;
-
-On1034:
-    set @mobID, 1034;
-    callfunc "MobPoints";
-    end;
-
-On1035:
-    set @mobID, 1035;
-    callfunc "MobPoints";
-    end;
-
-On1037:
-    set @mobID, 1037;
-    callfunc "MobPoints";
-    end;
-
-On1055:
-    set @mobID, 1055;
-    callfunc "MobPoints";
-    end;
-
-On1131:
-    set @mobID, 1131;
-    callfunc "MobPoints";
-    end;
-}
+018-1,136,79,9,41|monster|SeaSlime|1033,10,100000ms,30000ms
+018-1,108,87,53,25|monster|ManaBug|1131,10,100000ms,30000ms
+018-1,116,44,6,7|monster|SeaSlime|1033,3,100000ms,30000ms
+018-1,119,56,13,6|monster|PinkFlower|1014,2,100000ms,30000ms
+018-1,175,28,17,19|monster|JackO|1022,1,180000ms,120000ms
+018-1,78,59,3,1|monster|YellowSlime|1007,1,100000ms,30000ms
+018-1,57,63,14,7|monster|Silkworm|1035,2,100000ms,30000ms
+018-1,43,63,31,28|monster|Bat|1017,10,100000ms,30000ms
+018-1,134,39,18,10|monster|GrassSnake|1034,4,100000ms,50000ms
+018-1,124,42,9,11|monster|GrassSnake|1034,2,100000ms,50000ms
+018-1,124,19,22,9|monster|GrassSnake|1034,3,100000ms,50000ms
+018-1,122,29,19,9|monster|GrassSnake|1034,2,100000ms,50000ms
+018-1,149,45,10,8|monster|Bat|1017,5,100000ms,30000ms
+018-1,169,47,20,10|monster|RedSlime|1008,4,120000ms,30000ms
+018-1,136,49,13,8|monster|Bat|1017,4,100000ms,30000ms
+018-1,166,49,13,9|monster|CloverPatch|1037,1,100000ms,30000ms
+018-1,111,62,5,2|monster|Silkworm|1035,1,60000ms,30000ms
+018-1,117,50,4,3|monster|SeaSlime|1033,1,120000ms,60000ms
+018-1,96,47,18,11|monster|RedSlime|1008,3,100000ms,50000ms
+018-1,106,52,15,6|monster|CobaltPlant|1030,1,240000ms,120000ms
+018-1,78,55,37,6|monster|RedSlime|1008,7,100000ms,50000ms
+018-1,145,24,10,9|monster|RedSlime|1008,3,100000ms,50000ms
+018-1,68,89,14,17|monster|Bat|1017,3,100000ms,50000ms
+018-1,160,31,11,18|monster|RedSlime|1008,5,100000ms,50000ms
+018-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms
+018-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms
+018-1,134,80,14,39|monster|Maggot|1002,15,30ms,0ms
diff --git a/world/map/npc/018-1/_nodes.txt b/world/map/npc/018-1/_nodes.txt
new file mode 100644
index 00000000..9ac98a33
--- /dev/null
+++ b/world/map/npc/018-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Woodland Mining Camp nodes
+
+// (no nodes)