Merge pull request #447 from mekolat/gwendolyn

Celestia quest

18 files changed, 362 insertions, 3 deletions

diff --git a/world/map/data/009-8.wlk b/world/map/data/009-8.wlk
new file mode 100644
index 00000000..838fcfe2
--- /dev/null
+++ b/world/map/data/009-8.wlk
diff --git a/world/map/data/016-2.wlk b/world/map/data/016-2.wlk
new file mode 100644
index 00000000..6db17215
--- /dev/null
+++ b/world/map/data/016-2.wlk
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index c303fb65..50a7b029 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -23,6 +23,7 @@
 009-5#009-5.wlk#
 009-6#009-6.wlk#
 009-7#009-7.wlk#
+009-8#009-8.wlk#
 010-1#010-1.wlk#
 010-2#010-2.wlk#
 011-1#011-1.wlk#
@@ -40,6 +41,7 @@
 015-1#015-1.wlk#
 015-3#015-3.wlk#
 016-1#016-1.wlk#
+016-2#016-2.wlk#
 017-1#017-1.wlk#
 017-2#017-2.wlk#
 017-3#017-3.wlk#
diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt
index 16934102..7aefbc31 100644
--- a/world/map/db/item_db_generic.txt
+++ b/world/map/db/item_db_generic.txt
@@ -49,7 +49,6 @@
 672,    WhiteTulip,                     3,      80,         20,         1,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 673,    PinkTulip,                      3,      80,         20,         1,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 674,    OrangeTulip,                    3,      80,         20,         1,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
-677,    HeartNecklace,                  3,      2500,       1000,       10,         0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 680,    MauveHerb,                      3,      2,          1,          1,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 681,    CobaltHerb,                     3,      2,          1,          1,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
 682,    GambogeHerb,                    3,      2,          1,          1,          0,      0,      0,      0,      0,      0,      0,          0,      0,      0,      {},                                                                     {}
diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt
index 0f5c589f..7e1f499f 100644
--- a/world/map/db/item_db_trinket.txt
+++ b/world/map/db/item_db_trinket.txt
@@ -18,3 +18,4 @@
 4012,   TopazRing,                      5,      5000,       2500,       1,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     {bonus bAgi, 1;}
 4013,   AmethystRing,                   5,      5000,       2500,       1,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     {bonus bDex, 1;}
 4014,   SimpleRing,                     5,      100000,     2500,       1,          0,      0,      0,      0,      0,      2,      128,        0,      0,      0,      {},                                                                     {}
+677,    HeartNecklace,                  5,      2500,       0,          10,         0,      0,      0,      0,      0,      2,      8,          0,      0,      0,      {},                                                                     {}
diff --git a/world/map/db/quest-log.txt b/world/map/db/quest-log.txt
index 131dd2f6..37e137f3 100644
--- a/world/map/db/quest-log.txt
+++ b/world/map/db/quest-log.txt
@@ -26,3 +26,5 @@
 18,QL_ANWAR,QUEST_NorthTulimshar,3,4
 19,QL_KYLIAN,QUEST_NorthTulimshar,5,4
 20,QL_TERRANITE_ARMOR,QUEST_NorthTulimshar,6,4
+// 21 => assassin quest
+22,QL_CELESTIA,QUEST_Hurnscald,2,8
diff --git a/world/map/npc/009-8/_import.txt b/world/map/npc/009-8/_import.txt
new file mode 100644
index 00000000..315f39b2
--- /dev/null
+++ b/world/map/npc/009-8/_import.txt
@@ -0,0 +1,8 @@
+// Map 009-8: Chez Celestia
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-8
+npc: npc/009-8/_mobs.txt
+npc: npc/009-8/_nodes.txt
+npc: npc/009-8/_warps.txt
+npc: npc/009-8/celestia.txt
+npc: npc/009-8/mapflags.txt
diff --git a/world/map/npc/009-8/_mobs.txt b/world/map/npc/009-8/_mobs.txt
new file mode 100644
index 00000000..af8e2169
--- /dev/null
+++ b/world/map/npc/009-8/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Chez Celestia mobs
+
diff --git a/world/map/npc/009-8/_nodes.txt b/world/map/npc/009-8/_nodes.txt
new file mode 100644
index 00000000..0dd108da
--- /dev/null
+++ b/world/map/npc/009-8/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Chez Celestia nodes
+
+// (no nodes)
diff --git a/world/map/npc/009-8/_warps.txt b/world/map/npc/009-8/_warps.txt
new file mode 100644
index 00000000..ff75c4ab
--- /dev/null
+++ b/world/map/npc/009-8/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Chez Celestia warps
+
+009-8,26,22|warp|-1,-1,009-1,74,50
+009-8,22,34|warp|-1,-1,009-1,72,54
diff --git a/world/map/npc/009-8/celestia.txt b/world/map/npc/009-8/celestia.txt
new file mode 100644
index 00000000..8b2ee06a
--- /dev/null
+++ b/world/map/npc/009-8/celestia.txt
@@ -0,0 +1,306 @@
+// celestia quest
+// allocation: 8 bit (byte) => QL_CELESTIA (id 22)
+// uses 3rd byte of QUEST_Hurnscald (16th bit to 23th bit)
+// (0000 0000) (0000 0000) (XXXX XXXX) (0000 000-)
+// could stretch to use 7 more bits to the right if need be
+//
+// QL_CELESTIA states:
+// 000  can not do the easy quest
+// 001  can do the easy quest (show quest marker)
+// 002  got the easy quest (show in quest log)
+// 003  completed the easy quest, can not do the adv quest
+// 004  can do the adv quest, scared celestia (show quest marker)
+// 005  got the adv quest (show in quest log)
+// 006  killed 1 yeti
+//  [...]
+// 205  killed 200 yetis
+// 206  got reward
+
+009-8,31,23,0|script|Celestia|144
+{
+    callfunc "CelestiaState";
+    if (getequipid(equip_head) == 4027) // check if yeti mask (4027) is equipped
+        goto L_YetiMask;
+    if (getequipid(equip_head) == 647) // check if Developer's Cap (647) is equipped
+        goto L_Debug;
+    if (QL_CELESTIA == 2) // check if the player has the easy quest
+        goto L_ExplainEasy;
+    if (QL_CELESTIA >= 5 && QL_CELESTIA < 206) // check if the player has the adv quest
+        goto L_ExplainAdv;
+    if (QL_CELESTIA > 1) // the player finished a quest or both
+        goto L_ThankYou;
+    goto L_Intro; // if all checks fail go to L_Intro (first meeting)
+
+L_YetiMask:
+    mes "Celestia is clearly alarmed upon seeing you."; // send message to dialog window
+    next; // require the player to press the "next" button in the dialog window
+    mes "Before you have a chance to speak, she screams,"; // every use of "mes" creates a new line
+    mes "##B\"YETI IN MY HOUSE!\"##b"; // here we created a new line to add emphasis (and ##B to make bold)
+    mes "as she jumps back a few feet.";
+    next;
+    mes "You catch a glimpse of a black bow while some kind of dark mist quickly overcomes you.";
+    next;
+    mes "You feel a sharp pain in your heart and everything fades into darkness.";
+    heal -Hp, 0; // set the current hp to 0 (kill the player)
+    set @scared_celestia, 1; // set a temporary variable (resets on log out) in the player scope (variable is stored in the player, not in the npc)
+    close; // terminate the script and require the player to press the "close" button
+
+L_Intro:
+    mes "\"Hi, my name is Celestia.\"";
+    next;
+    mes "\"I used to be a great adventurer who's hunted thousands of yeti single-handedly, though, since I moved to Hurnscald I've been hosting tea parties instead.\"";
+    next;
+    goto L_MainMenu;
+
+L_MainMenu:
+    mes "\"Are you here for this afternoon's tea party?\"";
+    if (QL_CELESTIA == 1) // check if the player can do the easy quest
+        goto L_EasyQuestMenu; // go to a special menu that has one more option to start the easy quest
+    if (QL_CELESTIA == 4) // check if the player can do the quest
+        goto L_AdvQuestMenu; // go to a special menu that has one more option to start the adv quest
+    menu // else we just show a boring menu
+        "Party! Of course I came out for the party!", L_CameForParty,
+        "I'm sorry, life is much too serious for tea.", L_SrsBsns,
+        "(Walk away)", L_InstaClose;
+
+L_EasyQuestMenu:
+    menu // here we display a special menu
+        "Party! Of course I came out for the party!", L_CameForParty,
+        "I'm sorry, life is much too serious for tea.", L_SrsBsns,
+        "Is there anything that I can do to help?", L_OfferHelp, // <= this will start the first quest
+        "(Walk away)", L_InstaClose;
+
+L_AdvQuestMenu:
+    menu // here we display a special menu
+        "Party! Of course I came out for the party!", L_CameForParty,
+        "I'm sorry, life is much too serious for tea.", L_SrsBsns,
+        "I heard you were looking for help from experienced adventurers...", L_Scared, // <= this will start the adv quest
+        "(Walk away)", L_InstaClose;
+
+L_CameForParty:
+    mes "\"Wonderful, I am happy to have you over.";
+    mes "Lets get things started with some puerh tea.\"";
+    next;
+    mes "Celestia hands you a cup filled with some type of tea that is unlike anything you have seen before.";
+    mes "It has a very dark color and an unusual aroma reminiscent of a moist forest.";
+    next;
+    mes "For a moment you wonder if Celestia might have gotten confused and tossed in a handful of forest dirt into the teapot.";
+    mes "You ponder whether or not it would be wise to drink it.";
+    menu
+        "(Drink the tea, hoping for the best)", L_DrinkTea,
+        "Uh are you sure this is fit to drink?", L_QuestionTea;
+
+L_DrinkTea:
+    mes "To your pleasant surprise the tea is actually quite good.";
+    next;
+    mes "Despite its initial dubious fragrance, the tea comes off as very smooth and mellow with a bit of natural sweetness and a touch of an earthy forest like flavour, but in a very good way.";
+    next;
+    mes "Clearly an exotic tea, with a refined flavor fit for a refined woman such as Celestia.";
+    close;
+
+L_QuestionTea:
+    mes "\"Yes, did you really think I was some kind of monster that would try to poison you in my own house?\"";
+    mes "##a(it would be way too messy anyway)##0";
+    next;
+    mes "Celestia then picks up the cup of tea and drinks it in front of you to demonstrate that it is not only harmless but also quite delectable.";
+    close;
+
+L_SrsBsns:
+    mes "\"Have it your way.\"";
+    close;
+
+L_OfferHelp:
+    mes "\"Yes there is.\"";
+    next;
+    mes "\"I am a bit frustrated by the lack of a decent grocery store in Hurnscald, and there is only so much that I can get from Hinnak and Oscar.\"";
+    next;
+    mes "\"This poses a problem as the few items that I am not able to pick up locally are required for the tea parties that I host.\"";
+    next;
+    set QL_CELESTIA, 2; // set state to "got the easy quest"
+    goto L_ExplainEasy;
+
+L_ExplainEasy:
+    npcaction 9; // clear npc dialog to make room for the item list
+    mes "\"Please go out and find these items and I will make it more than worth your time and effort.\"";
+    mes; // send a blank line (line break)
+    mes "  %%E  100 ["+ getitemlink("ChocolateBar") +"]"; // use getitemlink to display a click-able item link in the dialog
+    mes "  %%E  50 ["+ getitemlink("GingerBreadMan") +"]";
+    next;
+    mes "\"I really hope you can find a reliable provider for these items before it forces me to put an end to my tea parties.\"";
+    if (countitem("ChocolateBar") >= 100 && countitem("GingerBreadMan") >= 50) // check if the player has the items
+        menu // if yes then allow the player to give them
+            "I have the grocery order of Chocolate Bars and Ginger Bread Men for you.", L_GiveGroceries,
+            "I will come back later.", L_InstaClose;
+    close;
+
+L_GiveGroceries:
+    mes "Celestia smiles.";
+    next;
+    mes "\"Wonderful, I am so glad you were able to track them down.";
+    mes "That will be enough to keep me in supply for some time.\"";
+    next;
+    mes "\"Here, take this Beret.";
+    mes "I hope it looks better on you than it does on me, as it does not go well with my fine dresses.\"";
+    next;
+    mes "Celestia also hands you a heavy pouch filled with gold pieces.";
+    mes;
+    mes "["+getitemlink("Beret")+"]";
+    mes "[20,000 GP]";
+    mes "[20,000 EXP]";
+    delitem "ChocolateBar", 100; // remove chocolate bars
+    delitem "GingerBreadMan", 50; // remove ginger bread men
+    getitem "Beret", 1; // give beret
+    getexp 20000, 0; // XXX is this amount reasonable?
+    set Zeny, Zeny + 10000; // XXX is this amount reasonable?
+    set QL_CELESTIA, 3; // set the state to "completed easy quest"
+    close;
+
+L_ThankYou:
+    mes "\"Welcome back %%1\"";
+    next;
+    goto L_MainMenu;
+
+L_Scared:
+    mes "Celestia takes a close look at you and seems to be satisfied.";
+    next;
+    mes "\"Wonderful, I am glad you came out.";
+    mes "I am really concerned about the growing yeti threat.";
+    mes "There simply does not seem to be enough yeti hunters out there to keep their population from growing.\"";
+    next;
+    mes "\"To the point that a few days ago a yeti somehow managed to get inside my house, and I have never heard of one moving this far south before.\"";
+    next;
+    menu
+        "A Yeti in your house, did you kill it?", L_YetiHouse,
+        "A Yeti in your house, are you alright?", L_YetiHouse;
+
+L_YetiHouse:
+    mes "Seemingly out of nowhere Celestia pulls a black bow and a fistful of arrows from her dress.";
+    mes "\"Don't worry about me, I am able to protect myself.";
+    mes "The real concern is the safety of the children of Hurnscald, as yeti tend to prefer children.\"";
+    next;
+    mes "\"It is scary to think about how many children that yeti could have run into before stumbling into my house to meet its doom.";
+    mes "If one yeti has already made it this far south it is only a matter of time before more will follow.\"";
+    next;
+    mes "\"What disturbs me the most is that Hurnscald is a favorite trading post for adventurers, yet none of them did anything when the yeti entered town.\"";
+    next;
+    mes "\"Since they are not concerned about keeping Hurnscald safe I am taking matters into my own hands and recruiting more yeti hunters.\"";
+    next;
+    set QL_CELESTIA, 5; // set state to "got advanced quest";
+    goto L_ExplainAdv;
+
+L_ExplainAdv:
+    mes "\"Please, for the sake of the children of Hurnscald go out and ##Bslay at least 200 yetis##b to help knock down their growing numbers.\"";
+    if (QL_CELESTIA == 205) // check if the player killed 200 yetis
+        menu
+            "I have returned from the great yeti hunt.", L_YetiComplete;
+    if (QL_CELESTIA > 5) // check if at least 1 yeti killed
+        menu
+            "About those yetis...", L_Encourage;
+    close;
+
+L_YetiComplete:
+    mes "\"You are my hero!\"";
+    next;
+    mes "\"Here, take it. This [@@677|family heirloom@@] has been passed from mother to daughter for countless generations now.\"";
+    next;
+    mes "\"It pains me to let it go, as it is the only remaining trinket of my late mother, but you have proven yourself worthy of it.\"";
+    next;
+    menu
+        "Thank you, I will cherish it dearly.", L_AcceptTrinket,
+        "This token is too important, you should keep it.", L_RefuseTrinket;
+
+L_AcceptTrinket:
+    mes "\"May our path cross again.\"";
+    mes;
+    mes "["+getitemlink("HeartNecklace")+"]";
+    getitem "HeartNecklace", 1;
+    set QL_CELESTIA, 206;
+    close;
+
+L_RefuseTrinket:
+    mes "\"Really?\"";
+    next;
+    mes "\"Please at least accept this humble payment for your trouble.\"";
+    next;
+    mes "\"May out path cross again.\"";
+    mes;
+    mes "[150,000 GP]";
+    set Zeny, Zeny + 150000;
+    set QL_CELESTIA, 206;
+    close;
+
+L_Encourage:
+    mes "\"You are doing great so far.";
+    mes "Keep it up and I know you will be able to make a difference in the growing Yeti threat.\"";
+    close;
+
+L_InstaClose:
+    close;
+
+
+
+////////////// BORING DEBUG STUFF BELOW ////////////////
+L_Debug:
+    npcaction 9;
+    mes "state: " + QL_CELESTIA;
+    mes "scared: " + @scared_celestia;
+    mes "---";
+    mes "000 can not do easy quest";
+    mes "001 can do easy quest";
+    mes "002 has gotten easy quest";
+    mes "003 completed easy quest";
+    mes "004 can do adv quest";
+    mes "005 got adv quest";
+    mes "006 killed 1 yeti";
+    mes "[...]";
+    mes "205 killed 200 yeti";
+    mes "206 got adv quest reward";
+    mes "---";
+    if (debug)
+        menu
+            "restart|reset quest", L_ResetState,
+            "toggle|toggle scared", L_ToggleScared,
+            // TODO set state to [...]
+            "edit|set state manually", L_SetState,
+            "close", L_InstaClose;
+    close;
+
+L_ToggleScared:
+    set @scared_celestia, !(@scared_celestia);
+    goto L_Debug;
+
+L_ResetState:
+    set QL_CELESTIA, 0;
+    set @scared_celestia, 0;
+    npcaction 5; // force close dialog
+    warp "009-1", 72, 48;
+    end;
+
+L_SetState:
+    input @cel_state;
+    if (@cel_state >= 0 && @cel_state < 256)
+        set QL_CELESTIA, @cel_state;
+    goto L_Debug;
+}
+
+function|script|CelestiaState
+{
+    if (BaseLevel >= 40 && QL_CELESTIA == 0) // if the player is at least level 40
+        set QL_CELESTIA, 1; // show the quest marker
+    if (BaseLevel >= 90 && QL_CELESTIA == 3 && @scared_celestia) // check if level >= 90, if scared celestia and if easy quest done
+        set QL_CELESTIA, 4; // show the quest marker for the secret advanced quest
+    return;
+}
+
+009-1,74,50,0|script|Celestia Door|32767,0,0
+{
+    warp "009-8", 26, 23;
+    callfunc "CelestiaState";
+    end;
+}
+009-1,72,54,0|script|Celestia BackDoor|32767,0,0
+{
+    warp "009-8", 23, 34;
+    callfunc "CelestiaState";
+    end;
+}
diff --git a/world/map/npc/009-8/mapflags.txt b/world/map/npc/009-8/mapflags.txt
new file mode 100644
index 00000000..2883b7a4
--- /dev/null
+++ b/world/map/npc/009-8/mapflags.txt
@@ -0,0 +1,2 @@
+009-8|mapflag|town
+009-8|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/016-2/_import.txt b/world/map/npc/016-2/_import.txt
new file mode 100644
index 00000000..14046995
--- /dev/null
+++ b/world/map/npc/016-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 016-2: Gwendolyn's
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 016-2
+npc: npc/016-2/_mobs.txt
+npc: npc/016-2/_nodes.txt
+npc: npc/016-2/_warps.txt
diff --git a/world/map/npc/016-2/_mobs.txt b/world/map/npc/016-2/_mobs.txt
new file mode 100644
index 00000000..069b9d46
--- /dev/null
+++ b/world/map/npc/016-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Gwendolyn's mobs
+
diff --git a/world/map/npc/016-2/_nodes.txt b/world/map/npc/016-2/_nodes.txt
new file mode 100644
index 00000000..71dc557d
--- /dev/null
+++ b/world/map/npc/016-2/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Gwendolyn's nodes
+
+// (no nodes)
diff --git a/world/map/npc/016-2/_warps.txt b/world/map/npc/016-2/_warps.txt
new file mode 100644
index 00000000..f72f8b85
--- /dev/null
+++ b/world/map/npc/016-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Gwendolyn's warps
+
+016-2,28,32|warp|-1,-1,016-1,84,54
+016-2,26,22|warp|-1,-1,016-1,84,49
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index a0c07173..3d4c89e2 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -25,6 +25,7 @@ import: npc/009-4/_import.txt
 import: npc/009-5/_import.txt
 import: npc/009-6/_import.txt
 import: npc/009-7/_import.txt
+import: npc/009-8/_import.txt
 import: npc/010-1/_import.txt
 import: npc/010-2/_import.txt
 import: npc/011-1/_import.txt
@@ -42,6 +43,7 @@ import: npc/014-3/_import.txt
 import: npc/015-1/_import.txt
 import: npc/015-3/_import.txt
 import: npc/016-1/_import.txt
+import: npc/016-2/_import.txt
 import: npc/017-1/_import.txt
 import: npc/017-2/_import.txt
 import: npc/017-3/_import.txt
diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt
index d60c68b6..72b5ac23 100644
--- a/world/map/npc/functions/mob_points.txt
+++ b/world/map/npc/functions/mob_points.txt
@@ -184,14 +184,21 @@ L_NatureKarma:
         set @value, 3;
 
     if (@value == 0)
-        goto L_Return;
+        goto L_Celestia;
 
     callfunc "QuestSagathaAnnoy";
-    goto L_Return;
+    goto L_Celestia;
 
 L_good:
     set @value, 1;
     callfunc "QuestSagathaHappy";
+    goto L_Celestia;
+
+L_Celestia:
+    if (QL_CELESTIA < 5 || QL_CELESTIA >= 205 || @mobID != 1072) goto L_Return;
+    set QL_CELESTIA, QL_CELESTIA + 1;
+    if (QL_CELESTIA == 205)
+        message strcharinfo(0), "Yeti : ##3This should be enough yetis killed to please Celestia.";
     goto L_Return;
 
 L_Return: