Merge self-fork from mekolat/magic-v3

Magic v3 spells

4 files changed, 25 insertions, 53 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 ea3b78bf..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;
@@ -233,7 +231,7 @@ L_MakeSelf:
     goto L_MakeSelf_yes;
 
 L_MakeSelf_yes:
-    mes "\"Oh, but of course!  You are powerful enough to make your own lifestones, using the enchantment '" + getspellinvocation("enchant-lifestone") + "'. This will consume a bug leg or a maggot slime or one of each of the four healing herbs, though.\"";
+    mes "\"Oh, but of course!  You are powerful enough to make your own lifestones, using the enchantment '" + get(.invocation$, "enchant-lifestone") + "'. This will consume a bug leg or a maggot slime or one of each of the four healing herbs, though.\"";
     goto L_Close;
 
 L_MakeSelf_no:
@@ -265,15 +263,15 @@ L_T_Initial:
     next;
     mes "[Elanore the Healer]";
     mes "\"To heal someone, first locate the injury. As a beginner, you have to touch the wound; with practice, it will be enough to think about it. Hold the lifestone in one hand, touching the wound with the other.\"";
-    mes "\"Then say, '" + getspellinvocation("lesser-heal") + "', followed by the name of the one you wish to heal.\"";
+    mes "\"Then say, '" + get(.invocation$, "lesser-heal") + "', followed by the name of the one you wish to heal.\"";
     next;
     mes "[Elanore the Healer]";
     mes "\"You might want to write that down, actually. In fact, you might want to make sure to keep notes of all spells you hear, for you never know if you will hear them again!\"";
-    mes "\"The invocation was '" + getspellinvocation("lesser-heal") + "'.\"";
+    mes "\"The invocation was '" + get(.invocation$, "lesser-heal") + "'.\"";
     next;
     mes "[Elanore the Healer]";
     mes "\"This will only cure cuts and bruises, though, and it will take some time to take effect. It will be useless to mend broken bones or more severe injuries!\"";
-    mes "\"To heal yourself, it's enough to just say '" + getspellinvocation("lesser-heal") + "' by itself.\"";
+    mes "\"To heal yourself, it's enough to just say '" + get(.invocation$, "lesser-heal") + "' by itself.\"";
     next;
     mes "[Elanore the Healer]";
     mes "\"Let me give you a lifestone to get started with.\"";
@@ -344,7 +342,7 @@ L_T_ChkAdvToLOH:
     mes "\"I will now teach you how to heal by laying on your hands. The technique is similar to the spell I taught you at the beginning, but this time you transfer your own health instead of drawing health from a lifestone.\"";
     next;
     mes "[Elanore the Healer]";
-    mes "\"First, lay your hand on the person you wish to heal. You needn't touch the injury itself, though you have to touch the skin until you are a little more experienced. Then, medidate on the word '" + getspellinvocation("lay-on-hands") + "'\"";
+    mes "\"First, lay your hand on the person you wish to heal. You needn't touch the injury itself, though you have to touch the skin until you are a little more experienced. Then, medidate on the word '" + get(.invocation$, "lay-on-hands") + "'\"";
     next;
     mes "[Elanore the Healer]";
     mes "\"This will let your own life force flow into the person you are healing. If you are badly injured yourself, you will not be able to do this.\"";
@@ -500,11 +498,11 @@ L_T_CurePosion:
     next;
     mes "[Elanore the Healer]";
     mes "\"If you would like to cure someone who is poisoned, first rub a Gamboge leaf between your hands. Your hands must be covered in Gamboge liquid for this to work.\"";
-    mes "\"Speak the invocation, `" + getspellinvocation("cure-poison") + "'.\"";
+    mes "\"Speak the invocation, `" + get(.invocation$, "cure-poison") + "'.\"";
     mes "\"Next, you either touch the poisoned person with your hands, or speak their name. You have to be close for this to work, though.\"";
     next;
     mes "[Elanore the Healer]";
-    mes "\"Once again, the invocation is `" + getspellinvocation("cure-poison") + "'.\"";
+    mes "\"Once again, the invocation is `" + get(.invocation$, "cure-poison") + "'.\"";
     mes "\"Come back again soon; there is another spell I would like to teach you.\"";
     next;
     set @Q_status, @STATUS_LEARNED_CURE_POISON;