summaryrefslogtreecommitdiff
path: root/world/map/npc/002-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/002-1')
-rw-r--r--world/map/npc/002-1/_import.txt1
-rw-r--r--world/map/npc/002-1/_mobs.txt57
-rw-r--r--world/map/npc/002-1/_nodes.txt4
-rw-r--r--world/map/npc/002-1/elanore.txt2
4 files changed, 18 insertions, 46 deletions
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index 66366b6c..1e4e50cf 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -2,6 +2,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
map: 002-1
npc: npc/002-1/_mobs.txt
+npc: npc/002-1/_nodes.txt
npc: npc/002-1/_warps.txt
npc: npc/002-1/anwar.txt
npc: npc/002-1/bard.txt
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index 19933fab..63282a48 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -1,47 +1,16 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar South mobs
-002-1,93,62,24,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1,112,62,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1,108,73,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1,62,28,3,15|monster|Maggot|1002,6,100000ms,30000ms,Mob002-1::On1002
-002-1,74,96,24,33|monster|Scorpion|1003,12,100000ms,30000ms,Mob002-1::On1003
-002-1,113,114,10,7|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1,43,61,10,70|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
-002-1,70,92,49,19|monster|Scorpion|1003,10,100000ms,30000ms,Mob002-1::On1003
-002-1,40,93,19,20|monster|RedScorpion|1004,10,100000ms,30000ms,Mob002-1::On1004
-002-1,42,40,8,29|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
-002-1,33,75,9,40|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
-002-1,99,62,37,9|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
-002-1,73,105,20,21|monster|FireGoblin|1011,6,100000ms,30000ms,Mob002-1::On1011
-
-
-002-1,0,0,0|script|Mob002-1|32767
-{
- end;
-
-On1002:
- set @mobID, 1002;
- callfunc "MobPoints";
- end;
-
-On1003:
- set @mobID, 1003;
- callfunc "MobPoints";
- end;
-
-On1004:
- set @mobID, 1004;
- callfunc "MobPoints";
- end;
-
-On1011:
- set @mobID, 1011;
- callfunc "MobPoints";
- end;
-
-On1033:
- set @mobID, 1033;
- callfunc "MobPoints";
- end;
-}
+002-1,93,62,24,9|monster|Maggot|1002,11,100000ms,30000ms
+002-1,112,62,11,9|monster|Maggot|1002,11,100000ms,30000ms
+002-1,108,73,11,9|monster|Maggot|1002,11,100000ms,30000ms
+002-1,62,28,3,15|monster|Maggot|1002,6,100000ms,30000ms
+002-1,74,96,24,33|monster|Scorpion|1003,12,100000ms,30000ms
+002-1,113,114,10,7|monster|Maggot|1002,11,100000ms,30000ms
+002-1,43,61,10,70|monster|Scorpion|1003,6,100000ms,30000ms
+002-1,70,92,49,19|monster|Scorpion|1003,10,100000ms,30000ms
+002-1,40,93,19,20|monster|RedScorpion|1004,10,100000ms,30000ms
+002-1,42,40,8,29|monster|SeaSlime|1033,8,100000ms,30000ms
+002-1,33,75,9,40|monster|SeaSlime|1033,8,100000ms,30000ms
+002-1,99,62,37,9|monster|Scorpion|1003,6,100000ms,30000ms
+002-1,73,105,20,21|monster|FireGoblin|1011,6,100000ms,30000ms
diff --git a/world/map/npc/002-1/_nodes.txt b/world/map/npc/002-1/_nodes.txt
new file mode 100644
index 00000000..7e192e45
--- /dev/null
+++ b/world/map/npc/002-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar South nodes
+
+// (no nodes)
diff --git a/world/map/npc/002-1/elanore.txt b/world/map/npc/002-1/elanore.txt
index e936447e..b235c5b4 100644
--- a/world/map/npc/002-1/elanore.txt
+++ b/world/map/npc/002-1/elanore.txt
@@ -19,8 +19,6 @@ function|script|ElanoreFix
function|script|elanore_decrease_exp
{
- if (attachrid(@killerrid) == 0)
- goto L_Return;
set @Q_heal_exp, MAGIC_EXPERIENCE >> 24;
if (@Q_heal_exp < 8) goto L_OnPcKillWipe;
set @Q_heal_exp, @Q_heal_exp - 8;