Cindy quest: removing debug parts

Shanon: adjusting date

3 files changed, 3 insertions, 81 deletions

diff --git a/npc/010-2_Dimonds_Cove/dimonds.txt b/npc/010-2_Dimonds_Cove/dimonds.txt
index 820d3303..629f6571 100644
--- a/npc/010-2_Dimonds_Cove/dimonds.txt
+++ b/npc/010-2_Dimonds_Cove/dimonds.txt
@@ -40,8 +40,7 @@
 
 010-2.gat,35,35,0	script	Shannon	193,{
 	set @month, 1;
-//TODO: set start_day correct after testing
-	set @start_day, 10;
+	set @start_day, 24;
 	set @end_day, 26;
 	if (gettime(6) != @month) goto no_event; 
 	if (gettime(5) < @start_day) goto no_event; 
diff --git a/npc/031-1_NivalisPort/angelaOutside.txt b/npc/031-1_NivalisPort/angelaOutside.txt
index d5775f2e..98523903 100644
--- a/npc/031-1_NivalisPort/angelaOutside.txt
+++ b/npc/031-1_NivalisPort/angelaOutside.txt
@@ -109,83 +109,6 @@ S_Update_Mask:
         return;
 }
 
-031-1.gat,80,25,0	script	Debug	154, {
-
-//TODO: remove DEBUG
-
-	set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
-	set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
-
-	set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
-
-	mes "This menu is for debugging and will be removed";
-	menu
-		"close", L_close,
-		"reset quest", -,
-		"skip yeti battle", yeti, 
-		"magic", magic;
-	set @rescue_Cindy, 0;
-	callsub S_Update_Mask;
-	mes "quest variable is now " + @rescue_Cindy;
-	close;
-
-yeti: 
-	set @rescue_Cindy, 2;
-	callsub S_Update_Mask;
-		mes "quest variable is now " + @rescue_Cindy;
-	close;
-	
-L_close:
-	close;
-
-magic:
-		// Set up SkillUp function general magic
-        set @SUP_id, SKILL_MAGIC;
-        set @SUP_name$, "Magic";
-
-		set @SUP_xp, 5000;
-        set @SUP_lvl, 2;
-        callfunc "SkillUp";
-
-        // Set up SkillUp function war magic
-        set @SUP_id, SKILL_MAGIC_WAR;
-        set @SUP_name$, "War Magic";
-
-		set @SUP_xp, 5000;
-        set @SUP_lvl, 2;
-        callfunc "SkillUp";
-
-        // Set up SkillUp function life magic
-        set @SUP_id, SKILL_MAGIC_LIFE;
-        set @SUP_name$, "Life Magic";
-
-		set @SUP_xp, 5000;
-        set @SUP_lvl, 2;
-        callfunc "SkillUp";
-
-        // Set up SkillUp function life magic
-        set @SUP_id, SKILL_MAGIC_NATURE;
-        set @SUP_name$, "Nature Magic";
-
-		set @SUP_xp, 5000;
-        set @SUP_lvl, 2;
-        callfunc "SkillUp";
-
-	mes "Lightning invocation: " + getspellinvocation("lightning-strike");
-	mes "Flare-dart invocation: " + getspellinvocation("flare-dart");
-	mes "Lesser-heal invocation: " + getspellinvocation("lesser-heal");
-	mes "Lay-on-hands invocation: " + getspellinvocation("lay-on-hands");
-	mes "protect: " + getspellinvocation("protect");
-	close;
-
-S_Update_Mask:
-        set QUEST_Nivalis_state,
-        	(QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
-                | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
-        return;
-}
-
-
 
 
 
diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt
index 3b106c3f..1a374f90 100644
--- a/npc/031-3_Cave/cindyCave.txt
+++ b/npc/031-3_Cave/cindyCave.txt
@@ -2,8 +2,8 @@
 // reviewed by: 
 // state0: Cindy is totally scared and does nothing helpful
 // state1: you are able to open the cage
-// state2 and greater: Cindy is saved, she asks you to visit them
-//
+// state2: Cindy is saved, she gives you a reward (wizard hat or wooden staff)
+// state3: and greater: Cindy is saved, she asks you to visit them
 
 031-3.gat,122,52,0	script	Cindy	198, {
 	if ($@FIGHT_YETI_STATUS != 0) goto L_Yeti;