Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

5 files changed, 190 insertions, 0 deletions

diff --git a/npc/031-2/_import.txt b/npc/031-2/_import.txt
new file mode 100644
index 00000000..5b0af12f
--- /dev/null
+++ b/npc/031-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 031-2: Angela's House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/031-2/_warps.txt",
+"npc/031-2/angelaHouse.txt",
+"npc/031-2/cindyHouse.txt",
+"npc/031-2/mapflags.txt",
diff --git a/npc/031-2/_warps.txt b/npc/031-2/_warps.txt
new file mode 100644
index 00000000..6483c178
--- /dev/null
+++ b/npc/031-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 031-2: Angela's House warps
+031-2,23,30,0	warp	#031-2_23_30	0,0,031-1,95,81
+031-2,73,30,0	warp	#031-2_73_30	0,0,031-1,90,116
diff --git a/npc/031-2/angelaHouse.txt b/npc/031-2/angelaHouse.txt
new file mode 100644
index 00000000..695e0e77
--- /dev/null
+++ b/npc/031-2/angelaHouse.txt
@@ -0,0 +1,136 @@
+
+031-2,29,28,0	script	Angela#house	NPC196,{
+    .@q= getq(KaizeiQuest_Cindy);
+    if (.@q > 4) goto L_Hello_Again;
+    if (.@q == 4) goto L_Reward;
+
+    mes "...";
+    goto L_close;
+
+L_Reward:
+    mes "[Angela]";
+    mes "\"Hello " + strcharinfo(0) + ", thank you again. I'm so glad Cindy is back home safe.\"";
+    next;
+    mes "\"As I told you, my husband is an adventurer. He is on one of his travels, so he couldn't rescue Cindy himself.\"";
+    next;
+    mes "\"I want to give you one of his treasures. Beside all the junk he brings, there are some very valuable things.\"";
+    next;
+    mes "\"This item is called the Rock Knife. When you wield it, you feel as robust as a rock.\"";
+
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Full_Inv;
+    getitem RockKnife, 1;
+    setq(KaizeiQuest_Cindy, 5);
+
+    next;
+    mes "\"I hope this will be useful for you.\"";
+    next;
+    mes "\"I am so glad Cindy is safe. But there is still another problem. The Yetis took away all the white and yellow present boxes we wanted to bring to Santa!\"";
+    next;
+    mes "\"Usually, Yetis are very shy - I wonder why they did that. There is something strange going on.\"";
+    next;
+    mes "\"May I ask you for help again? I'll give you a small reward for every 3 boxes of one color you bring me.\"";
+    goto L_close;
+
+L_Full_Inv:
+    mes "\"Oh, it seems you carry so much stuff - I will keep it for you until you can take it.\"";
+    goto L_close;
+
+L_Hello_Again:
+    mes "[Angela]";
+    mes "\"Hello! Good to see you again. Please warm yourself.\"";
+    next;
+    menu
+        "I just wanted to say hello.",L_Hello,
+        "I have some yellow present boxes.",L_Yellow,
+        "I have some white present boxes.",L_White;
+
+L_Yellow:
+    @dq_level = 70;
+    @dq_cost = 32;
+    @dq_count = 3;
+    @dq_name$ = "YellowPresentBox";
+    @dq_friendly_name$ = "yellow present box";
+    @dq_money = 5300;
+    @dq_exp = 1300;
+
+    callfunc "DailyQuest";
+    next;
+    if (@dq_return == 4)
+        mes "\"Santa will be glad to have them back.\"";
+    goto L_close;
+
+L_White:
+    @dq_level = 80;
+    @dq_cost = 64;
+    @dq_count = 3;
+    @dq_name$ = "WhitePresentBox";
+    @dq_friendly_name$ = "white present box";
+    @dq_money = 10800;
+    @dq_exp = 2800;
+
+    callfunc "DailyQuest";
+    next;
+    if (@dq_return == 4)
+        mesq l("You are a great help!");
+    goto L_close;
+
+L_close:
+    @dq_level = 0;
+    @dq_cost = 0;
+    @dq_count = 0;
+    @dq_name$ = "";
+    @dq_friendly_name$ = "";
+    @dq_money = 0;
+    @dq_exp = 0;
+    @dq_return = 0;
+    close;
+
+L_Hello:
+    if (getvaultid() && get_nibble(##03_TMWQUEST, 0) <= 3) goto L_VaultQuest;
+    closeclientdialog;
+    close;
+
+L_VaultQuest:
+    mes "";
+    mesn;
+    mesq l("Actually, there is one thing bugging me during this whole ordeal.");
+    next;
+    mesn;
+    mesq l("Yetis used to be very shy. Since the Great Quake, they became aggressive.");
+    next;
+    mesn;
+    mesq l("...So why would they kidnap Cindy?? %%i");
+    next;
+    mesn;
+    mesq l("I figured out, maybe one of the sages could help. Would you mind asking them?");
+    next;
+    select
+        l("I'll be back later."),
+        rif(get_nibble(##03_TMWQUEST, 0) == 0, l("Sure, I'll ask them.")),
+        rif(get_nibble(##03_TMWQUEST, 0) == 3, l("[Tell her the truth]")),
+        rif(get_nibble(##03_TMWQUEST, 0) == 3, l("[Make up an excuse]"));
+    mes "";
+    switch (@menu) {
+    case 2:
+        mesn;
+        mesq l("Wonderful! Please be careful out there.");
+        set_nibble(##03_TMWQUEST, 0, 1);
+        break;
+    case 3:
+        mesc l("%s faints.", strnpcinfo(1));
+        next;
+        // FALL-THROUGH
+    case 4:
+        mesn;
+        mesq l("Thanks for informing me. I'm sure Nikolai and the sages will do something about it, then.");
+        next;
+        mesn;
+        mesq l("I'm afraid I don't have anything of value to reward you with, but some %s which my husband was saving for a quest or other. You can have them. Cindy is more important than a quest.", getitemlink(TreasureKey));
+        set_nibble(##03_TMWQUEST, 0, 4);
+        getitem TreasureKey, rand2(15, 25);
+        break;
+    }
+    close;
+}
diff --git a/npc/031-2/cindyHouse.txt b/npc/031-2/cindyHouse.txt
new file mode 100644
index 00000000..798d4037
--- /dev/null
+++ b/npc/031-2/cindyHouse.txt
@@ -0,0 +1,43 @@
+
+031-2,27,26,0	script	Cindy#house	NPC197,{
+    if (getq(KaizeiQuest_Cindy) > 3) goto L_Happy_Random;
+
+    mes "...";
+    goto L_close;
+
+L_Happy_Random:
+    getinventorylist;
+    @candy = rand(50);
+    if (@inventorylist_count < 100 && @candy == 42)
+        goto L_Candy;
+
+    setarray @quote_Cindy$, "Thank you so much for rescuing me!",
+    "My mother made really tasty cookies yesterday. But I already ate them all...",
+    "I want to go ice skating tomorrow. That will be fun!",
+    "I wonder when Daddy will come home next time. He always brings exciting stuff!",
+    strcharinfo(0) + "! You're my hero!",
+    "My mother is so upset about the Yetis - they are very very shy usually. You have to be lucky to see one. I wonder what's wrong with them.",
+    "When I'm a little older, I want to travel like you and my father. I want to see every place on the world!",
+    "Did you ever meet Santa? He's very kind! He always gives me some candy when we go to see him.",
+    strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!";
+    @random = rand(9);
+    if (@random != 5)
+        emotion EMOTE_HAPPY, strcharinfo(0);
+    @quote$ = "\"" + @quote_Cindy$[@random] + "\"";
+    mes "[Cindy]";
+    mes @quote$;
+    goto L_close;
+
+L_Candy:
+    mes "[Cindy]";
+    mes "\"Santa gave me some candy! Please, take that!\"";
+    getitem "Candy", 1;
+    goto L_close;
+
+L_close:
+    @candy = 0;
+    @inventorylist_count = 0;
+    @random = 0;
+    @quote$ = "";
+    close;
+}
diff --git a/npc/031-2/mapflags.txt b/npc/031-2/mapflags.txt
new file mode 100644
index 00000000..935a1eb9
--- /dev/null
+++ b/npc/031-2/mapflags.txt
@@ -0,0 +1 @@
+//031-2	mapflag	resave	020-1,52,118