Fix thousands of bugs

6 files changed, 15 insertions, 11 deletions

diff --git a/npc/019-2/angela.txt b/npc/019-2/angela.txt
index 9199fafcc..227094959 100644
--- a/npc/019-2/angela.txt
+++ b/npc/019-2/angela.txt
@@ -67,6 +67,7 @@ L_Start:
     select
         l("[Decline Quest]"),
         l("[Accept Quest]");
+    mes "";
     if (@menu == 1) {
         mesn strcharinfo(0);
         mesq lg("Sorry 'mam, I forgot courage on my other set of pants. This one doesn't have enough defense for it.");
@@ -82,14 +83,15 @@ L_Start:
     mesq l("I'll reward you and your friends in an appropriate way, but if you endanger her... Oh, my poor Cindy...");
     next;
     movecam rand(-20,20), rand(-20,20);
-    sleep2(50);
+    sleep2(80);
     movecam rand(-20,20), rand(-20,20);
-    sleep2(50);
+    sleep2(80);
     movecam rand(-20,20), rand(-20,20);
-    sleep2(50);
+    sleep2(80);
     movecam rand(-20,20), rand(-20,20);
-    sleep2(50);
+    sleep2(80);
     restorecam;
+    mes "";
     mesc l("[Quest Accepted]"), 1;
     mesc l("Rescue Cindy from the Ice Labyrinth and the evil Yetis. This is a global, multiplayer quest."), 1;
     channelmes("#world", strcharinfo(0) + " said to be brave enough to help Angela rescuing her daughter!");
diff --git a/npc/021-1/logic.txt b/npc/021-1/logic.txt
index 2e4434805..2c96be1c3 100644
--- a/npc/021-1/logic.txt
+++ b/npc/021-1/logic.txt
@@ -31,13 +31,15 @@ OnTouch:
     .@q=getq(NivalisQuest_Cindy);
     if (.@q < 3) end;
     if ($@CINDY_STATE > gettimetick(2)) goto L_Safe;
-    if ($@CINDY_STATE % 2 == 0) goto L_Blocked;
+    if ($@CINDY_STATE % 2 == 1) goto L_Blocked;
     if (CindySwitch_Check_211() == 5) {
         .@pos=rand(0,8);
-        if (.@q == 4)
+        if (.@q == 3) {
+            setq NivalisQuest_Cindy, 4;
             warp "021-1", .xp[.@pos], .yp[.@pos];
-        else
+        } else {
             warp "021-2", 80, 102;
+        }
     } else {
         switch (CindySwitch_Check_211()) {
             case 0:
diff --git a/npc/021-1/yeti.txt b/npc/021-1/yeti.txt
index c67568b7b..ea9f62ae1 100644
--- a/npc/021-1/yeti.txt
+++ b/npc/021-1/yeti.txt
@@ -95,7 +95,7 @@ L_Assigned:
 
 L_Report:
     mesn;
-    mesq l("Did you brought us a kind gift of good will, on the worth of 80 @@, to offer to our King?");
+    mesq l("Did you brought us a kind gift of good will, on the worth of 80 @@, to offer to our King?", getitemlink(MoubooSteak));
     next;
     select
         rif(countitem(MoubooSteak) >= 80, l("Yes, here they are.")), // Demure was here
diff --git a/npc/021-3/doors.txt b/npc/021-3/doors.txt
index f0a403f9d..f0405f5e1 100644
--- a/npc/021-3/doors.txt
+++ b/npc/021-3/doors.txt
@@ -7,7 +7,7 @@
 
 021-3,24,123,0	script	#0213_Logic	NPC_NO_SPRITE,1,0,{
     if ($@CINDY_STATE > gettimetick(2)) goto L_Safe;
-    if ($@CINDY_STATE % 2 == 0) goto L_Blocked;
+    if ($@CINDY_STATE % 2 == 1) goto L_Blocked;
     warp "021-4", 67, 28;
     end;
 
diff --git a/npc/021-4/doors.txt b/npc/021-4/doors.txt
index 690e70438..49e84cfb9 100644
--- a/npc/021-4/doors.txt
+++ b/npc/021-4/doors.txt
@@ -5,7 +5,7 @@
 //    Cave logic
 
 021-4,67,27,0	script	#Leave0214	NPC_NO_SPRITE,0,0,{
-    if ($@CINDY_STATE % 2 == 0 && $@CINDY_STATE < 150000) goto L_Blocked;
+    if ($@CINDY_STATE % 2 == 1 && $@CINDY_STATE < 150000) goto L_Blocked;
     warp "021-3", 24, 123;
     end;
 
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index 5617fe784..2a645ac4a 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -38,7 +38,7 @@ function	script	CindySwitch_Check_214	{
 //    Global Variable: $@CINDY_STATE
 
 021-4,66,49,0	script	Cindy#Outside	NPC_CINDY_CAGE,{
-    if (getq(NivalisQuest_Cindy) < 5)
+    if (getq(NivalisQuest_Cindy) < 4)
         goto L_Cheat;
     if ($@CINDY_STATE > 150000) goto L_Reset;
     if ($@CINDY_STATE % 2 == 0) goto L_Start;