Rebuild map data and improve some quests from Nivalis

8 files changed, 61 insertions, 0 deletions

diff --git a/maps/re/000-0-0.mcache b/maps/re/000-0-0.mcache
index e8ee2369d..ad91f870a 100644
--- a/maps/re/000-0-0.mcache
+++ b/maps/re/000-0-0.mcache
diff --git a/maps/re/013-1.mcache b/maps/re/013-1.mcache
index 5164aec53..d0bfa1d64 100644
--- a/maps/re/013-1.mcache
+++ b/maps/re/013-1.mcache
diff --git a/maps/re/014-3.mcache b/maps/re/014-3.mcache
index 166e49010..4c76e284e 100644
--- a/maps/re/014-3.mcache
+++ b/maps/re/014-3.mcache
diff --git a/npc/012-7/celestia.txt b/npc/012-7/celestia.txt
index 71b4d0b51..4c1b8aa2b 100644
--- a/npc/012-7/celestia.txt
+++ b/npc/012-7/celestia.txt
@@ -25,6 +25,7 @@
         rif(.@q2 == 1, l("I have some sweeties for the Tea Party!")), L_TeaCheck,
         rif(.@q2 >= 2, l("Tea party! I want to participate.")), L_TeaParty,
         rif(.@q1 == 0, l("There are Monster Attacks every month, how do you have time for tea parties?!")), L_MainQuest,
+        rif(.@q1 && CINDY_PLAYER_STRUCK && getq(NivalisQuest_Well) < 2, l("I found switches which only a Yeti may flip...")), L_OtherQuest,
         rif(.@q1 >= 6, l("I want to try convincing the Yeti King again.")), L_MainQuestCore;
 
 L_Coffee:
@@ -227,6 +228,32 @@ L_QuestionTea:
     close;
 // end: Gumi Script
 
+L_OtherQuest:
+    mesn strcharinfo(0);
+    mesq l("Basically, I need to find a friendly Yeti. Do they exist?");
+    next;
+    mesn;
+    mesq l("Of course. The adviser of the Yeti King, for instance, is very friendly.");
+    next;
+    mesn;
+    mesq l("But he have lots of enemies... It would not surprise me to find him struck somewhere.");
+    next;
+    mesn;
+    mesq l("He usually guards a central position on the caves... He could help you, if he is there.");
+    next;
+    mesn;
+    mesq l("Otherwise, his enemies might have bested him, but I doubt any Yeti would dare to kill him.");
+    next;
+    mesn;
+    mesq l("Wasn't there something on the Holy Bible? About a young boy trapped by his brothers somewhere because envy?");
+    mesc l("If you don't want to look at the Bible, you can try to solve the following riddle:");
+    mesc l("\"When you're thristy, you may look for me. I'm often in desert areas, but this time, the winter has come.\""), 3;
+    CINDY_PLAYER_STRUCK=false;
+    next;
+    clear;
+    mesn l("Quest Tip");
+    mesc l("\"When you're thristy, you may look for me. I'm often in desert areas, but this time, the winter has come.\""), 3;
+    close;
 
 OnInit:
     .@npcId = getnpcid(.name$);
diff --git a/npc/019-2/angela.txt b/npc/019-2/angela.txt
index ec93bbb09..c9905c343 100644
--- a/npc/019-2/angela.txt
+++ b/npc/019-2/angela.txt
@@ -42,6 +42,24 @@
     if (getq(NivalisQuest_Cindy) == 0) goto L_Start;
     mesn;
     mesq l("Please find my lovely daughter!");
+    if (getq(NivalisQuest_Cindy) == 1 && getq(NivalisQuest_Well) < 2 && @yetiagro) {
+        next;
+        select
+            l("I will, don't worry."),
+            l("She isn't on that cave.");
+        mes "";
+        if (@menu == 2) {
+            mesn;
+            mesq l("Do you have mental issues? I mean, of course there is a secret passage there!");
+            next;
+            mesn;
+            mesq l("I think the switches may open it, but I couldn't flip them.");
+            next;
+            mesn;
+            mesq l("I guess you'll need an Yeti for that, but those on the cave are murderous.");
+            CINDY_PLAYER_STRUCK=true;
+        }
+    }
     close;
 
 L_Safe:
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
index d297b38d2..036f67fba 100644
--- a/npc/020-1/_import.txt
+++ b/npc/020-1/_import.txt
@@ -7,3 +7,4 @@
 "npc/020-1/siege.txt",
 "npc/020-1/town.txt",
 "npc/020-1/wateranimation.txt",
+"npc/020-1/well.txt",
diff --git a/npc/020-1/well.txt b/npc/020-1/well.txt
new file mode 100644
index 000000000..2eb72ce51
--- /dev/null
+++ b/npc/020-1/well.txt
@@ -0,0 +1,14 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Annoy players
+
+020-1,99,83,0	script	#NivalisWell	NPC_NO_SPRITE,{
+    npctalkonce l("This well is dry. They must take water outside the town.");
+    end;
+
+OnInit:
+    .distance=3;
+	end;
+}
diff --git a/npc/021-1/yeti.txt b/npc/021-1/yeti.txt
index b32735f76..cf92d6f0e 100644
--- a/npc/021-1/yeti.txt
+++ b/npc/021-1/yeti.txt
@@ -12,6 +12,7 @@
     if (.@n < 2)
         goto L_NoQuest;
 
+    CINDY_PLAYER_STRUCK=false;
     // Alright, now we need to cycle Cindy quest to decide if this NPC will have
     // a special behavior or not.
     .@q=getq(NivalisQuest_Cindy);