initial commit for magic v3

Fix Druid Tree and add hug to TMW

4 files changed, 27 insertions, 92 deletions

diff --git a/world/map/npc/001-2/government_building.txt b/world/map/npc/001-2/government_building.txt
index 51b43a8c..03c3eaf7 100644
--- a/world/map/npc/001-2/government_building.txt
+++ b/world/map/npc/001-2/government_building.txt
@@ -6,7 +6,7 @@
     mes "[Estard]";
     mes "\"Hello. What can I do for you?\"";
     next;
-    if (getpartnerid2())
+    if (PARTNER)
         goto L_main_married;
 
     menu
@@ -35,7 +35,7 @@ L_marry_do:
     callsub S_give_rings;
     mes "";
     mes "[Estard]";
-    mes "\"Here are your rings. In order to marry each other, you both must stand within one of the designated areas (like that small rug over there in the corner), wear your rings, and say 'marry (your partner's name).'\"";
+    mes "\"Here are your rings. In order to marry each other, you both must stand within one of the designated areas (like that small rug over there in the corner), wear your rings, and say '#marry (your partner's name).'\"";
     close;
 
 L_marry_too_young:
@@ -93,8 +93,8 @@ L_do_divorce:
     if (Zeny < @divorce_cost)
         goto L_not_enough_money;
 
-    if (divorce())
-        goto L_divorce_done;
+    set PARTNER, 0, PARTNER; // divorce the partner first, which will also divorce the rid if succesful
+    if (PARTNER < 1) goto L_divorce_done;
 
     mes "";
     mes "[Estard]";
diff --git a/world/map/npc/001-2/pauline.txt b/world/map/npc/001-2/pauline.txt
index 4fbd5a5f..93608a10 100644
--- a/world/map/npc/001-2/pauline.txt
+++ b/world/map/npc/001-2/pauline.txt
@@ -92,7 +92,7 @@ L_Spells:
 L_Next1:
     mes "[Pauline]";
     mes "\"Well I could only read the invocations. So I don't exactly know what kind of ingredients you are going to need.\"";
-    mes "\"The first one for the mouboo was " + getspellinvocation("summon-mouboo") + " and the one for the pinkie was " + getspellinvocation("summon-pinkie") +".\"";
+    mes "\"The first one for the mouboo was " + ("summon-mouboo") + " and the one for the pinkie was " + ("summon-pinkie") +".\"";
     next;
     mes "\"For the pinkie spell my suggestion is to try similar ingredients to the other Astral spells. Try a root and some item typical for pinkies.\"";
     mes "\"The mouboo spell might be more complicated. From what I could translate, one of the spell components is crafted by magic.\"";
@@ -157,7 +157,7 @@ L_Next4:
     goto L_DidNotWorkMouboo;
 
 L_DidNotWorkMouboo:
-    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-mouboo") + ".";
+    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + ("summon-mouboo") + ".";
     mes "Nothing happens.";
     mes "[Pauline]";
     mes "\"It seems you did not tell me the correct ingredients. Come back when you find the correct ones.\"";
@@ -174,7 +174,7 @@ L_Pass2Mouboo:
     goto L_DidNotWorkMouboo;
 
 L_TrySpellMouboo:
-    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-mouboo") + ".";
+    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + ("summon-mouboo") + ".";
     monster "001-1", 55,68, "Good", 1028, 1;
     mes "[Pauline]";
     mes "\"It worked!\"";
@@ -220,7 +220,7 @@ L_Next5:
     goto L_DidNotWorkPinkie;
 
 L_DidNotWorkPinkie:
-    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-pinkie") + ".";
+    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + ("summon-pinkie") + ".";
     mes "Nothing happens.";
     mes "[Pauline]";
     mes "\"It seems you did not tell me the correct ingredients. Come back when you find the correct ones.\"";
@@ -237,7 +237,7 @@ L_Pass2Pinkie:
     goto L_DidNotWorkPinkie;
 
 L_TrySpellPinkie:
-    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + getspellinvocation("summon-pinkie") + ".";
+    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + ("summon-pinkie") + ".";
     monster "001-1", 54,68, "Good", 1018, 1;
     mes "[Pauline]";
     mes "\"It worked!\"";
diff --git a/world/map/npc/001-2/tondar.txt b/world/map/npc/001-2/tondar.txt
index ba4c0fff..d7fd3531 100644
--- a/world/map/npc/001-2/tondar.txt
+++ b/world/map/npc/001-2/tondar.txt
@@ -41,7 +41,7 @@ L_askspell:
 
 L_spell:
     mes "[Tondar]";
-    mes "\"Well, all right; this one can't do much harm. Press your hands together and say `" + getspellinvocation("ask-magic-exp") + "'.\"";
+    mes "\"Well, all right; this one can't do much harm. Press your hands together and say `" + get(.invocation$, "spell-experience") + "'.\"";
     mes "\"This will release a steady flow of magic within you. Focus and try to control it; it is a good meditative practice.\"";
     close;
 
diff --git a/world/map/npc/001-2/wizards.txt b/world/map/npc/001-2/wizards.txt
index 37efa8bd..ef538489 100644
--- a/world/map/npc/001-2/wizards.txt
+++ b/world/map/npc/001-2/wizards.txt
@@ -1,90 +1,25 @@
 // Council of Ruling Wizards Room
 
-// manaseed
-001-2,104,19,0|script|Desert Mana Seed#_M|166
+-|script|Magic Council|32767
 {
-    mes "Strangely, you feel nothing – as if its membrane is closed to you.";
+    explode .@n, strnpcinfo(0), "#";
+    if   (.@n[1] == 9) mes "The arch wizard seems to be busy.";
+    elif (.@n[1])      mes "The wizard seems to ignore you.";
+    else               mes "Strangely, you feel nothing – as if its membrane is closed to you.";
     next;
     mes "Perhaps you should come back later.";
     close;
-}
-
-// 
-001-2,99,22,0|script|Wizard#1|355
-{
-    mes "The wizard seems to ignore you.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
-}
-
-//
-001-2,92,24,0|script|Wizard#2|356
-{
-    mes "The wizard seems to ignore you.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
-}
-
-//
-001-2,92,30,0|script|Wizard#3|357
-{
-    mes "The wizard seems to ignore you.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
-}
-
-//
-001-2,99,32,0|script|Wizard#4|358
-{
-    mes "The wizard seems to ignore you.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
-}
-
-//
-001-2,110,22,0|script|Wizard#5|359
-{
-    mes "The wizard seems to ignore you.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
-}
-
-//
-001-2,117,24,0|script|Wizard#6|360
-{
-    mes "The wizard seems to ignore you.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
-}
-
-//
-001-2,117,30,0|script|Wizard#7|361
-{
-    mes "The wizard seems to ignore you.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
-}
 
-//
-001-2,110,32,0|script|Wizard#8|362
-{
-    mes "The wizard seems to ignore you.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
-}
-//
-001-2,104,27,0|script|Arch-Wizard#9|354
-{
-    mes "The arch wizard seems to be busy.";
-    next;
-    mes "Perhaps you should come back later.";
-    close;
+OnInit:
+    set .@void, puppet("001-2", 104, 19, "Desert Mana Seed#_M", 166);
+    set .@void, puppet("001-2", 99,  22, "Wizard#1",            355);
+    set .@void, puppet("001-2", 92,  24, "Wizard#2",            356);
+    set .@void, puppet("001-2", 92,  30, "Wizard#3",            357);
+    set .@void, puppet("001-2", 99,  32, "Wizard#4",            358);
+    set .@void, puppet("001-2", 110, 22, "Wizard#5",            359);
+    set .@void, puppet("001-2", 117, 24, "Wizard#6",            360);
+    set .@void, puppet("001-2", 117, 30, "Wizard#7",            361);
+    set .@void, puppet("001-2", 110, 32, "Wizard#8",            362);
+    set .@void, puppet("001-2", 104, 27, "Arch-Wizard#9",       354);
+    end;
 }