Implement the second tier summoning magic (Astral and Dark)

Kalakarenk, Kalboo, Kalgina, Kalrenk, Halhiss and Helorp.
Update Sagatha, Pauline and Waric on the way.

1 files changed, 63 insertions, 104 deletions

diff --git a/npc/001-2/pauline.txt b/npc/001-2/pauline.txt
index 9ec35396..992a371a 100644
--- a/npc/001-2/pauline.txt
+++ b/npc/001-2/pauline.txt
@@ -16,14 +16,14 @@
 
     if (getskilllv(SKILL_MAGIC_ASTRAL) > 0)
         goto L_Magic;
-    mes "[Pauline]";
+    mesn;
     mes "\"I've mastered several schools of magic and fought the Yeti in Kaizei.\"";
     next;
     mes "\"The path of magic is a long and difficult one.\"";
     goto L_close;
 
 L_Magic:
-    mes "[Pauline]";
+    mesn;
     mes "\"Ah. I see you are skilled in the Art of Astral Magic.\"";
     mes "\"Who taught you?\"";
     menu
@@ -38,7 +38,7 @@ L_Next:
         "No, thanks.", L_close;
 
 L_Sagatha:
-    mes "[Pauline]";
+    mesn;
     mes "\"Ah, that Witch!\"";
     mes "\"Very well.\"";
     next;
@@ -49,7 +49,7 @@ L_Sagatha:
         "No.", L_close;
 
 L_Back:
-    mes "[Pauline]";
+    mesn;
     mes "\"So, you're back. Are you ready to share knowledge now?\"";
     menu
         "Yes.", L_Spells,
@@ -58,7 +58,7 @@ L_Back:
 L_Spells:
     @pauline_state = 1;
     callsub S_Update_Mask;
-    mes "[Pauline]";
+    mesn;
     mes "\"Okay.\"";
     mes "\"Not long ago I discovered some new caves near Tulimshar. In an abandond chamber I found some paintings on the wall.\"";
     next;
@@ -73,22 +73,22 @@ L_Spells:
         "No, tell me more.", L_Next1;
 
 L_Next1:
-    mes "[Pauline]";
+    mesn;
     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 " + get(.invocation$, "smmouboo") + " and the one for the pinkie was " + get(.invocation$, "smpinkie") +".\"";
+    mesq l("\"The first one for the mouboo was %s and the one for the pinkie was %s.", b("Kalboo"), b("Kalgina"));
     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.\"";
     next;
     mes "\"When you find the right ingredients, come back and bring them to me to try those spells out.\"";
     next;
-    mes "\"Goodbye.\"";
+    mesq l("Goodbye.");
     @pauline_state = 2;
     callsub S_Update_Mask;
     goto L_close;
 
 L_Ingredients:
-    mes "[Pauline]";
+    mesn;
     mes "\"Hello, have you found out what ingredients to use yet?\"";
     menu
         "Yes.", L_KnowIngredientsMouboo,
@@ -105,149 +105,108 @@ L_KnowIngredientsMouboo:
         "No.", L_ComeBackLater;
 
 L_Next3:
-    cleararray @items$, "", getarraysize(@items$);
-    cleararray @item_names$, "", getarraysize(@item_names$);
-    setarray @items$, "AlizarinHerb", "GambogeHerb", "SilkCocoon", "PinkAntenna", "MaggotSlime", "BugLeg", "GrassSeeds", "ReedBundle", "RoastedAcorn", "Candy", "Milk", "BottleOfWater", "ChickenLeg", "Steak", "Root", "RawLog", "Beer", "CactusDrink", "MoubooFigurine", "Acorn", "Iten", "WarpedLog";
-    setarray @item_names$, "Alizarin Herb", "Gamboge Herb", "Silk Cocoon", "Pink Antenna", "Maggot Slime", "Bug Leg", "Grass Seeds", "Reed Bundle", "Roasted Acorn", "Candy", "Milk", "Bottle of Water", "Chicken Leg", "Steak", "Root", "Raw Log", "Beer", "Cactus Drink", "Mouboo Figurine", "Acorn", "Iten", "Warped Log";
-    mes "\"Then tell me the ingredients for the mouboo summoning spell and give them to me. Start with the first ingredient and then tell me the second one separately.\"";
+    mesq l("Then tell me the ingredients for the mouboo summoning spell and give them to me. Start with the first ingredient and then tell me the second one separately.");
+    mes "##B" + l("Drag and drop an item from your inventory.") + "##b";
     next;
-    callfunc "DynamicItemMenu$";
-    @pauline_ingredient1$ = @item$;
-    mes "Next ingredient.";
-    callfunc "DynamicItemMenu$";
-    @pauline_ingredient2$ = @item$;
-    if (@pauline_ingredient1$ == "")
-        goto L_Wrong;
-    if (@pauline_ingredient2$ == "")
+    .@it1 = requestitem();
+    mes l("Next ingredient.");
+    mes "##B" + l("Drag and drop an item from your inventory.") + "##b";
+    .@it2 = requestitem();
+
+    if (.@it1 < 1 || .@it2 < 1)
         goto L_Wrong;
-    if (countitem(@pauline_ingredient1$) < 1)
-        goto L_NotEnough;
-    if (countitem(@pauline_ingredient2$) < 1)
+    if (countitem(.@it1) < 1 || countitem(.@it2) < 1)
         goto L_NotEnough;
-    mes "\"Do you want to give me these items?\"";
+    mesq l("Do you want to give me these items?");
     menu
-        "No.", L_ComeBackLater,
-        "Yes.", L_Next4;
+        l("No."), L_ComeBackLater,
+        l("Yes."), L_Next4;
 
 L_Next4:
-    delitem @pauline_ingredient1$, 1;
-    delitem @pauline_ingredient2$, 1;
-    mes "\"Okay let me try this.\"";
-    if (@pauline_ingredient1$ == "Root")
-        goto L_Pass1Mouboo;
-    if (@pauline_ingredient1$ == "MoubooFigurine")
-        goto L_Pass2Mouboo;
-    goto L_DidNotWorkMouboo;
-
-L_DidNotWorkMouboo:
-    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + get(.invocation$, "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.\"";
-    goto L_close;
-
-L_Pass1Mouboo:
-    if (@pauline_ingredient2$ == "MoubooFigurine")
+    delitem .@it1, 1;
+    delitem .@it2, 1;
+    mesq l("Okay let me try this.");
+    if ((.@it1 == Root && .@it2 == MoubooFigurine) ||
+        (.@it1 == MoubooFigurine && .@it2 == Root))
         goto L_TrySpellMouboo;
-    goto L_DidNotWorkMouboo;
 
-L_Pass2Mouboo:
-    if (@pauline_ingredient2$ == "Root")
-        goto L_TrySpellMouboo;
-    goto L_DidNotWorkMouboo;
+    mesc l("The Witch takes %s and %s and put them togheter calling %s.", getitemlink(.@it1), getitemlink(.@it2), b("kalboo"));
+    mesc l("Nothing happens.");
+    mesn;
+    mesq l("It seems you did not tell me the correct ingredients. Come back when you find the correct ones.");
+    goto L_close;
 
 L_TrySpellMouboo:
-    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + get(.invocation$, "summon-mouboo") + ".";
-    monster "001-1", 55,68, "Good", 1028, 1;
-    mes "[Pauline]";
-    mes "\"It worked!\"";
+    mesc l("The Witch takes %s and %s and put them togheter calling %s.", getitemlink(.@it1), getitemlink(.@it2), b("kalboo"));
+    monster "001-1", 55,68, "Good", Mouboo, 1;
+    mesn;
+    mesq l("It worked!");
     @pauline_state = 3;
     callsub S_Update_Mask;
     getexp @pauline_REWARD, 0;
     goto L_close;
 
 L_KnowIngredientsPinkie:
-    cleararray @items$, "", getarraysize(@items$);
-    cleararray @item_names$, "", getarraysize(@item_names$);
-    setarray @items$, "AlizarinHerb", "GambogeHerb", "SilkCocoon", "PinkAntenna", "MaggotSlime", "BugLeg", "GrassSeeds", "ReedBundle", "RoastedAcorn", "Candy", "Milk", "BottleOfWater", "ChickenLeg", "Steak", "Root", "RawLog", "Beer", "CactusDrink", "MoubooFigurine", "Acorn", "Iten", "WarpedLog";
-    setarray @item_names$, "Alizarin Herb", "Gamboge Herb", "Silk Cocoon", "Pink Antenna", "Maggot Slime", "Bug Leg", "Grass Seeds", "Reed Bundle", "Roasted Acorn", "Candy", "Milk", "Bottle of Water", "Chicken Leg", "Steak", "Root", "Raw Log", "Beer", "Cactus Drink", "Mouboo Figurine", "Acorn", "Iten", "Warped Log";
-    mes "[Pauline]";
-    mes "\"Now give me the ingredients for the pinkie spell.\"";
+    mes "##B" + l("Drag and drop an item from your inventory.") + "##b";
     next;
-    callfunc "DynamicItemMenu$";
-    @pauline_ingredient1$ = @item$;
-    mes "Next ingredient.";
-    callfunc "DynamicItemMenu$";
-    @pauline_ingredient2$ = @item$;
-    if (@pauline_ingredient1$ == "")
-        goto L_Wrong;
-    if (@pauline_ingredient2$ == "")
+    .@it1 = requestitem();
+    mes l("Next ingredient.");
+    mes "##B" + l("Drag and drop an item from your inventory.") + "##b";
+    .@it2 = requestitem();
+
+    if (.@it1 < 1 || .@it2 < 1)
         goto L_Wrong;
-    if (countitem(@pauline_ingredient1$) < 1)
-        goto L_NotEnough;
-    if (countitem(@pauline_ingredient2$) < 1)
+    if (countitem(.@it1) < 1 || countitem(.@it2) < 1)
         goto L_NotEnough;
-    mes "\"Do you want to give me these items?\"";
+    mesq l("Do you want to give me these items?");
     menu
         "No.", L_ComeBackLater,
         "Yes.", L_Next5;
 
 L_Next5:
-    delitem @pauline_ingredient1$, 1;
-    delitem @pauline_ingredient2$, 1;
-    mes "\"Okay, let me try this.\"";
-    if (@pauline_ingredient1$ == "Root")
-        goto L_Pass1Pinkie;
-    if (@pauline_ingredient1$ == "PinkAntenna")
-        goto L_Pass2Pinkie;
-    goto L_DidNotWorkPinkie;
-
-L_DidNotWorkPinkie:
-    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + get(.invocation$, "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.\"";
-    goto L_close;
-
-L_Pass1Pinkie:
-    if (@pauline_ingredient2$ == "PinkAntenna")
+    delitem .@it1, 1;
+    delitem .@it2, 1;
+    mesq l("Okay let me try this.");
+    if ((.@it1 == Root && .@it2 == PinkAntenna) ||
+        (.@it1 == PinkAntenna && .@it2 == Root))
         goto L_TrySpellPinkie;
-    goto L_DidNotWorkPinkie;
 
-L_Pass2Pinkie:
-    if (@pauline_ingredient2$ == "Root")
-        goto L_TrySpellPinkie;
-    goto L_DidNotWorkPinkie;
+    mesc l("The Witch takes %s and %s and put them togheter calling %s.", getitemlink(.@it1), getitemlink(.@it2), b("kalgina"));
+    mesc l("Nothing happens.");
+    mesn;
+    mesq l("It seems you did not tell me the correct ingredients. Come back when you find the correct ones.");
+    goto L_close;
+
 
 L_TrySpellPinkie:
-    mes "The Witch takes " + @pauline_ingredient1$ + " and " + @pauline_ingredient2$ + " and puts them together calling " + get(.invocation$, "summon-pinkie") + ".";
-    monster "001-1", 54,68, "Good", 1018, 1;
-    mes "[Pauline]";
-    mes "\"It worked!\"";
+    mesc l("The Witch takes %s and %s and put them togheter calling %s.", getitemlink(.@it1), getitemlink(.@it2), b("kalgina"));
+    monster "001-1", 54,68, "Good", Pinkie, 1;
+    mesn;
+    mesq l("It worked!");
     @pauline_state = 4;
     callsub S_Update_Mask;
     getexp @pauline_REWARD, 0;
     goto L_close;
 
 L_MoreMagic:
-    mes "[Pauline]";
+    mesn;
     mes "\"Thanks for telling me the ingredients. As soon as I find out more about those wall paintings I will let you know.\"";
     goto L_close;
 
 L_Wrong:
     mes "The Witch looks at you and snorts.";
-    mes "[Pauline]";
+    mesn;
     mes "\"You told me the wrong ingredients. Come back as soon as you know the correct ones.\"";
     goto L_close;
 
 L_NotEnough:
-    mes "[Pauline]";
+    mesn;
     mes "\"Hey, you don't have this with you!\"";
     mes "\"Come back when you have the right ingredients.\"";
     goto L_close;
 
 L_ComeBackLater:
-    mes "[Pauline]";
+    mesn;
     mes "\"Then come back later.\"";
     goto L_close;