(regen mapcache, misc comments) prepare Celestia Quest

4 files changed, 88 insertions, 2 deletions

diff --git a/maps/re/012-7.mcache b/maps/re/012-7.mcache
index cf55f653d..febe7939b 100644
--- a/maps/re/012-7.mcache
+++ b/maps/re/012-7.mcache
diff --git a/npc/003-1-1/_import.txt b/npc/003-1-1/_import.txt
index 3face4e13..b87b04248 100644
--- a/npc/003-1-1/_import.txt
+++ b/npc/003-1-1/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-1-1/_mobs.txt",
 "npc/003-1-1/_warps.txt",
+"npc/003-1-1/yetiking.txt",
diff --git a/npc/003-1-1/yetiking.txt b/npc/003-1-1/yetiking.txt
new file mode 100644
index 000000000..01ffbb842
--- /dev/null
+++ b/npc/003-1-1/yetiking.txt
@@ -0,0 +1,84 @@
+// TMW2 Scripts
+// Author:
+//   Jesusalva
+// Description:
+//   Celestia Yeti King's quest. Designed so if you're with 4 players, all 4 can
+//   summon the Yeti King, helping you while doing the quest by themselves.
+
+// setnpcdisplay getarg(0), NPC_YETI_KING
+
+003-1-1,94,21,0	script	#YetiKingSummon	NPC_SUMMONING_CIRC,{
+    .@q=getq(HurnscaldQuest_Celestia);
+    if (.@q == 1) goto L_Summon;
+    end;
+
+L_Summon:
+    dispbottom l("Emoc otem itey gnik!"); // come to me yeti king, spelled backwards. Sorry.
+    initnpctimer;
+    end;
+
+L_Die:
+    percentheal(-100, -100);
+    npctalk3 l("You're playing with fire. Or ice. Or whatever.");
+    closedialog;
+    close;
+
+OnTimer1000:
+    setnpcdisplay getarg(0), NPC_YETI_KING;
+    end;
+
+OnTimer2000:
+    npctalk("Whom dares to disturb my slumber?!");
+    end;
+
+OnTimer5000:
+    if (getareausers("003-1-1", 5) < 2) {
+        npctalk("A lone adventurer? Pft. I'm back to my slumber!");
+        stopnpctimer;
+    } else {
+        npctalk("You're courageous to summon me, I'll give you that.");
+        areatimer 0, "006-1", 20, 20, 70, 60, 10, "#YetiKingSummon::OnSummonTalk";
+    }
+    end;
+
+OnSummonTalk:
+    .@q=getq(HurnscaldQuest_Celestia);
+    if (.@q != 1)
+        end;
+    mesn "Dah Yeti King!!";
+    mesq l("Why do you summon me? Speak.");
+    mes "";
+    select
+        l("I'm sorry, these words just came to my mind."),
+        l("Celestia asks for your help.");
+
+    mes "";
+
+    if (@menu == 1)
+        goto L_Die;
+
+    mesn "Dah Yeti King!!";
+    mesq l("Yeah yeah yeah, you're not the first one to come talking about that to me.");
+    next;
+    mesn "Dah Yeti King!!";
+    mesq l("My answer is a no, and it'll say like that. Don't test my patience any further.");
+    next;
+    select
+        l("You'll come with me!"),
+        l("I can prove you my worth!"),
+        l("Sorry! Sorry!");
+
+    mes "";
+    if (@menu == 1)
+        goto L_Die;
+    if (@menu == 2)
+        close;
+
+    mesq l("Unfinished script.");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+    end;
+}
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 845399f91..ab8ff4321 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -2,6 +2,8 @@
 // Author:
 //    Saulc
 //    Jesusalva
+// Notes:
+//    Also handle some PCLogin events: CheckClientVersion, and bank
 
 003-3,36,34,0	script	Malindou	NPC_LLOYD,{
     Banker(.name$, "Tulimshar", 15000);
@@ -14,8 +16,7 @@ OnInit:
 
 OnPCLoginEvent:
     checkclientversion;
-    if (#MerchantBank)
-    {
+    if (#MerchantBank) {
         BankVault += max(0, #MerchantBank);
         #MerchantBank = 0;
     }