Eliminates the use of some permanent variables, adjust reset npc and review the whole quest.

3 files changed, 34 insertions, 57 deletions

diff --git a/npc/025-4/battlecaves.txt b/npc/025-4/battlecaves.txt
index 3b63203e..3587c769 100644
--- a/npc/025-4/battlecaves.txt
+++ b/npc/025-4/battlecaves.txt
@@ -694,15 +694,14 @@ L_Done:
 
 025-4.gat,157,42,0	script	#StartBossCaveFight	111,{
     if (Rossy_Quest == 16) goto L_Found;
-    if ($@battlebosscave == 1 && cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9 && Rossy_Quest == 15) goto L_Summon;
+    if ($@battlebosscave == 1 && cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9 && Rossy_Quest == 15) goto L_Found;
     message strcharinfo(0), "You shouldn't be here, you cheater.";
     percentheal -100, 0;
     end;
 
 L_Found:
-    message strcharinfo(0), "You found a golden key.";
-    set Killed_Boss, 1;
-    end;
+    message strcharinfo(0), "You found a golden key inside the chest.";
+    goto L_Summon;
 
 L_Summon:
     set $@cave10_loop, $@cave10_loop + 1;
@@ -769,7 +768,7 @@ OnBossDeath:
     set $@cave10start, 0;
     set $@cave10fighter$, "";
     set $@cave10fighterdeaths$, 0;
-    message strcharinfo(0), "What a harsh battle! Oh, a golden key, it might open the chest!";
+    message strcharinfo(0), "What a harsh battle! I should have peace to use that golden key now.";
     set Rossy_Quest, 16;
     end;
 
@@ -791,12 +790,12 @@ onInit:
 
 025-4.gat,157,48,0	script	#CheckCaveFightBoss	127,1,1,{
     if (Rossy_Quest >= 17) goto L_Done;
-    if (Killed_Boss == 1) goto L_Done;
+    if (Rossy_Quest == 17) goto L_Julia;
     message strcharinfo(0), "Evil forces make you stop, you need to defeat them first before getting out.";
     end;
 
-L_Killed:
-    message strcharinfo(0), "The little girl seems so close, you can't let her stay here.";
+L_Julia:
+    message strcharinfo(0), "I shoudn't get out. Julia is still in danger.";
     end;
 
 L_Done:
@@ -807,10 +806,14 @@ L_Done:
 // ---------------------  Julia Cave Checker Outside  ----------------------------
 
 025-4.gat,157,24,0	script	#CheckJuliaCaveOutside	127,1,1,{
-    if (Killed_Boss == 1) goto L_Done;
+    if ($@wave_cave10 != 0) goto L_Focus;
     message strcharinfo(0), "As you try to walk through, you bump into an invisible door. You might need a key to open it.";
     end;
 
+L_Focus:
+    message strcharinfo(0), "I can't use the key while there are monsters around... I should defeat them first.";
+    end;
+
 L_Done:
     warp "025-4.gat", 93, 33;
     end;
@@ -819,10 +822,8 @@ L_Done:
 // ---------------------  Julia Cave Checker Inside  ----------------------------
 
 025-4.gat,93,35,0	script	#CheckJuliaCaveInside	127,1,1,{
-    if (Rossy_Quest >= 17 && Killed_Boss == 1) goto L_Done;
-    if (Rossy_Quest >= 17 && Killed_Boss == 0) goto L_Cheat2;
-    if (Rossy_Quest == 16 && Killed_Boss == 1) goto L_Save;
-    if (Rossy_Quest == 16 && Killed_Boss == 0) goto L_Cheat3;
+    if (Rossy_Quest >= 17) goto L_Done;
+    if (Rossy_Quest == 16) goto L_Save;
     if (Rossy_Quest <= 15) goto L_Cheat;
     end;
 
@@ -831,16 +832,6 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
-L_Cheat2:
-    message strcharinfo(0), "You saved Julia without having killed the boss? Is that even possible?";
-    percentheal -100, 0;
-    end;
-
-L_Cheat3:
-    message strcharinfo(0), "You can save Julia without killing the boss? Cheating isn't fair.";
-    percentheal -100, 0;
-    end;
-
 L_Done:
     warp "025-4.gat", 157, 26;
     end;
diff --git a/npc/025-4/clauquer.txt b/npc/025-4/clauquer.txt
index e39e27d7..0fe3c910 100644
--- a/npc/025-4/clauquer.txt
+++ b/npc/025-4/clauquer.txt
@@ -4,7 +4,6 @@
   if (Rossy_Quest == 15) goto L_Hmmm;
   if (Rossy_Quest == 14) goto L_Help;
   if (Rossy_Quest <= 13) goto L_Huh;
-  if (Clauquer_Enough == 1) goto L_End;
 
 L_Help:
   mes "[Clauquer]";
@@ -16,59 +15,46 @@ L_Help:
     "I'm not lost and I don't need help, bye.", L_No;
   next;
   mes "[Clauquer]";
-  mes "\"How do I kow you're looking for her? Well because I saw her. I also heard her, she screamed and still screams like hell. Moreover I don't think you will come in these caves just for fun!\"";
+  mes "\"How do I know you're looking for her? Well, because I saw her. I also heard her, she screamed and still screams like hell. Moreover, I don't think you would enter these caves just for fun!\"";
   menu
     "Of course not.", -,
   next;
   mes "[Clauquer]";
-  mes "\"I can see that you need help to be able to save the little girl. First of all, you should know that these little caves contain horrible blood thursty earth monsters. They are coming from nowhere and you can't escape while they are still alive. Watch out because if you take too much time, you will die due to the smell of the caves. You will try to come out of the aceve, crawling and whe you'll be outside, the normal air will kill you. So you better be quick.\"";
+  mes "\"I can see that you really want to save the little girl. First of all, you should know that these little caves contain horrible blood thirsty earth monsters. They come from nowhere and you can't escape while they are still alive. And if you take too much time, you will die due to the foul air in the caves and the monsters will move your body outside, to the entrance of the cave. So you better be quick.\"";
   next;
-  mes "\"In these caves, or you die, or they die, that is the only rule. When the monsters of a cave will be dead, you'll quickly come out of the cave because of its smell. Don't worry, you'll have time to look in each chest of each caves. Why chests? Well because you have a hidden cave which is locked by several lockets on an invisible door. I don't exactly know the number of lockets but that might turn around 10.\"";
+  mes "\"The girl is trapped in a place inside one of these caves, protected by a door with 9 different locks. You have to find the key for each one of these locks in the different caves around here. They are inside some chests. The problem is, once you try to open the chest, the monsters I told you about will surround you.\"";
   next;
-  mes "\"When you'll enter the locked cave, you'll be in front of numerous monsters. But watch out, the last one is more dangerous than the other ones. As you will see him, you will be frightened to death. Don't worry, I can give you some advices.\"";
-  menu
-    "Please go on.", -,
-    "Sounds dangerous, but I know enough now.", L_Enough;
+  mes "\"In these caves, either you die, or they die. This is the only rule. When you kill all the monsters in a cave, make sure you get out immediatelly, because of the air. Don't worry, They only appear when you open the chests.\"";
+  next;
+  mes "\"When you enter the cave in which the girl is locked, you'll be in front of numerous monsters. But watch out, the last one is more dangerous than the other ones. When you see it you will be frightened to death. Don't worry, I can give you some advices.\"";
   next;
+  menu
+    "Please go on.", -;
+L_Advice:
   mes "[Clauquer]";
-  mes "\"I advice you to be mentally prepared for this rescue operation. A fey nature spirit creature kidnapped the little girl to change it into a changling. However the changling has been killed along the way to the caves. In fact no, he tried to take the girl's appearence but she was mentally too strong for the changling. That is why the fey element is waiting for another fresh changling, stronger than the previous one. As you can see, scary story.\"";
+  mes "\"I advise you to be mentally prepared for this rescue operation. A fey nature spirit creature kidnapped the little girl to change it into a changling. However the changling has been killed along the way to the caves. In fact no, he tried to take the girl's appearence but she was mentally too strong for the changling. That is why the fey element is waiting for another fresh changling, stronger than the previous one. As you can see, scary story.\"";
   next;
-  mes "\"Oh, I advice you to use battle potions for every single battle, I'm thinking of Concentration and Iron Potions. You might want to take some food with you, you might be hungry in battle. I would personally take some water, I'm always thirsty. Don't be afraid to take too much of each, the battles take time to end.\"";
+  mes "\"Oh, I advise you to use battle potions for every single battle, I'm thinking of Concentration and Iron Potions. You might want to take some food with you, you might be hungry in battle. I would personally take some water, I'm always thirsty. Don't be afraid to take too much of each, the battles take time to end.\"";
   next;
-  mes "\"I think you're now ready to explore these caves and fight. May god be with you.\"";
-  set Rossy_Quest, 15;
-  close;
-
-L_Enough:
-  mes "[Clauquer]";
-  mes "\"Enough? No, you don't even know the fun part yet. I know you'll come back soon.\"";
-  set Clauquer_Enough, 1;
+  mes "\"I think you're now ready to explore these caves and fight.\"";
+  if (Rossy_Quest == 14) set Rossy_Quest, 15;
   close;
 
 L_End:
-
   mes "[Clauquer]";
   mes "\"I see you came back because you didn't know enough of these caves... Well, well...\"";
   next;
-  mes "\"I advice you to be mentally prepared for this rescue operation. A fey nature spirit creature kidnapped the little girl to change it into a changling. However the changling has been killed along the way to the caves. In fact no, he tried to take the girl's appearence but she was mentally too strong for the changling. That is why the fey element is waiting for another fresh changling, stronger than the previous one. As you can see, scary story.\"";
-  next;
-  mes "\"Oh, I advice you to use battle potions for every single battle, I'm thinking of Concentration and Iron Potions. You might want to take some food with you, you might be hungry in battle. I would personally take some water, I'm always thirsty. Don't be afraid to take too much of each, the battles take time to end.\"";
-  next;
-  mes "\"I think you're now ready to explore these caves and fight. May god be with you.\"";
-  set Rossy_Quest, 15;
-  close;
+  goto L_Advice;
 
 L_Hmmm:
-  if (Clauquer_Talk == 1) goto L_Huh;
   mes "[Clauquer]";
-  mes "\"You already know everythng about these caves. You don't need me anymore to find the little girl.\"";
+  mes "\"You already know everything about these caves. You don't need me anymore to find the little girl.\"";
   menu
     "But please, I really need your help!", -,
     "You're right, I don't need your help!", L_No;
   next;
-  mes "\"I don't repeat myself. Bye.\"";
-  set Clauquer_Talk, 1;
-  close;
+  mes "\"Ok, if you insist... But I can only repeat what I already said.\"";
+  goto L_Advice;
 
 L_Huh:
   mes "[Clauquer]";
diff --git a/npc/025-4/julia.txt b/npc/025-4/julia.txt
index ad0c8a1a..8c7b3ce4 100644
--- a/npc/025-4/julia.txt
+++ b/npc/025-4/julia.txt
@@ -6,7 +6,7 @@
 
 L_Done:
   mes "[Julia]";
-  mes "I heard some battle noises few minutes ago and I presume you are here to save me!";
+  mes "I heard some battle noises a few minutes ago and I presume you are here to save me!";
   next;
   menu
     "Of course I'm here to save you, Rossy sent me here!", -;
@@ -16,12 +16,12 @@ L_Done:
   getitem "BlackBoots", 1;
   getexp 5000, 0;
   set Rossy_Quest, 17;
-  mes "I'm out of here now, come out from this horrible cave.";
+  mes "I'm out of here now, let's get out of this horrible cave.";
   close;
 
 L_End:
   mes "[Julia]";
-  mes "Come out from this horrible cave.";
+  mes "Let's get out of this horrible cave.";
   close;
 
 L_Hmmm: