Fixes some sintax errors in clauquer.txt, add message when you start a fight and eliminate the use of a permanent variable in the barrier in 025-1.

2 files changed, 39 insertions, 13 deletions

diff --git a/npc/025-4/battlecaves.txt b/npc/025-4/battlecaves.txt
index 3587c769..a307877b 100644
--- a/npc/025-4/battlecaves.txt
+++ b/npc/025-4/battlecaves.txt
@@ -2,13 +2,16 @@
 
 025-4.gat,41,91,0	script	#StartCaveFight1	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave1 == 1) goto L_Summon;
+    if ($@battlecave1 == 1) goto L_Start;
     end;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
     percentheal -100, 0;
     end;
+
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";    
     
 L_Summon:
     set $@cave1_loop, $@cave1_loop + 1;
@@ -80,7 +83,7 @@ L_Done:
 
 025-4.gat,110,90,0	script	#StartCaveFight2	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave2 == 1) goto L_Summon;
+    if ($@battlecave2 == 1) goto L_Start;
     end;
     
 L_Cheat:
@@ -88,6 +91,9 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";   
+
 L_Summon:
     set $@cave2_loop, $@cave2_loop + 1;
     areamonster "025-4.gat",97, 62, 126, 96,"",$@CAVE2_MONSTERS_IDS[$@cave2_loop],$@CAVE2_MONSTERS_QTY[$@cave2_loop],"#StartCaveFight2::OnMonsterDeath";
@@ -156,7 +162,7 @@ L_Done:
 // ------------------------------------    Cave 3    --------------------------------------
 025-4.gat,168,111,0	script	#StartCaveFight3	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave3 == 1) goto L_Summon;
+    if ($@battlecave3 == 1) goto L_Start;
     end;
     
 L_Cheat:
@@ -164,6 +170,9 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";   
+
 L_Summon:
     set $@cave3_loop, $@cave3_loop + 1;
     areamonster "025-4.gat",150, 84, 177, 117,"",$@CAVE3_MONSTERS_IDS[$@cave3_loop],$@CAVE3_MONSTERS_QTY[$@cave3_loop],"#StartCaveFight3::OnMonsterDeath";
@@ -232,7 +241,7 @@ L_Done:
 // ---------------------------    Cave 4    --------------------------------
 025-4.gat,32,150,0	script	#StartCaveFight4	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave4 == 1) goto L_Summon;
+    if ($@battlecave4 == 1) goto L_Start;
     end;
     
 L_Cheat:
@@ -240,6 +249,9 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";   
+
 L_Summon:
     set $@cave4_loop, $@cave4_loop + 1;
     areamonster "025-4.gat",28, 124, 57, 156,"",$@CAVE4_MONSTERS_IDS[$@cave4_loop],$@CAVE4_MONSTERS_QTY[$@cave4_loop],"#StartCaveFight4::OnMonsterDeath";
@@ -309,7 +321,7 @@ L_Done:
 
 025-4.gat,100,154,0	script	#StartCaveFight5	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave5 == 1) goto L_Summon;
+    if ($@battlecave5 == 1) goto L_Start;
     end;
     
 L_Cheat:
@@ -317,6 +329,9 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";   
+
 L_Summon:
     set $@cave5_loop, $@cave5_loop + 1;
     areamonster "025-4.gat",91, 131, 124, 160,"",$@CAVE5_MONSTERS_IDS[$@cave5_loop],$@CAVE5_MONSTERS_QTY[$@cave5_loop],"#StartCaveFight5::OnMonsterDeath";
@@ -386,7 +401,7 @@ L_Done:
 
 025-4.gat,159,168,0	script	#StartCaveFight6	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave6 == 1) goto L_Summon;
+    if ($@battlecave6 == 1) goto L_Start;
     end;
     
 L_Cheat:
@@ -394,6 +409,9 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";   
+
 L_Summon:
     set $@cave6_loop, $@cave6_loop + 1;
     areamonster "025-4.gat",153, 143, 178, 174,"",$@CAVE6_MONSTERS_IDS[$@cave6_loop],$@CAVE6_MONSTERS_QTY[$@cave6_loop],"#StartCaveFight6::OnMonsterDeath";
@@ -463,13 +481,16 @@ L_Done:
 
 025-4.gat,39,215,0	script	#StartCaveFight7	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave7 == 1) goto L_Summon;
+    if ($@battlecave7 == 1) goto L_Start;
     end;
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
     percentheal -100, 0;
     end;
+
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";   
     
 L_Summon:
     set $@cave7_loop, $@cave7_loop + 1;
@@ -540,7 +561,7 @@ L_Done:
 
 025-4.gat,105,210,0	script	#StartCaveFight8	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave8 == 1) goto L_Summon;
+    if ($@battlecave8 == 1) goto L_Start;
     end;
     
 L_Cheat:
@@ -548,6 +569,9 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";   
+
 L_Summon:
     set $@cave8_loop, $@cave8_loop + 1;
     areamonster "025-4.gat",90, 193, 119, 216,"",$@CAVE8_MONSTERS_IDS[$@cave8_loop],$@CAVE8_MONSTERS_QTY[$@cave8_loop],"#StartCaveFight8::OnMonsterDeath";
@@ -617,7 +641,7 @@ L_Done:
 
 025-4.gat,157,220,0	script	#StartCaveFight9	111,{
     if (Rossy_Quest < 15) goto L_Cheat;
-    if ($@battlecave9 == 1) goto L_Summon;
+    if ($@battlecave9 == 1) goto L_Start;
     end;
     
 L_Cheat:
@@ -625,6 +649,9 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
+L_Start:
+    message strcharinfo(0), "You opened the chest and found a tiny key. At the same time, some monsters appear from nowhere.";   
+
 L_Summon:
     set $@cave9_loop, $@cave9_loop + 1;
     areamonster "025-4.gat",144, 192, 173, 226,"",$@CAVE9_MONSTERS_IDS[$@cave9_loop],$@CAVE9_MONSTERS_QTY[$@cave9_loop],"#StartCaveFight9::OnMonsterDeath";
@@ -701,7 +728,6 @@ L_Done:
 
 L_Found:
     message strcharinfo(0), "You found a golden key inside the chest.";
-    goto L_Summon;
 
 L_Summon:
     set $@cave10_loop, $@cave10_loop + 1;
diff --git a/npc/025-4/clauquer.txt b/npc/025-4/clauquer.txt
index e0b6c623..8796c1d7 100644
--- a/npc/025-4/clauquer.txt
+++ b/npc/025-4/clauquer.txt
@@ -17,7 +17,7 @@ L_Help:
   mes "[Clauquer]";
   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.", -,
+    "Of course not.", -;
   next;
   mes "[Clauquer]";
   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.\"";
@@ -32,9 +32,9 @@ L_Help:
     "Please go on.", -;
 L_Advice:
   mes "[Clauquer]";
-  mes "\"I advise you to be mentally prepared for this rescue operation. A fey nature spirit creature kidnapped the little girl and is planning to replace her with a changeling."
+  mes "\"I advise you to be mentally prepared for this rescue operation. A fey nature spirit creature kidnapped the little girl and is planning to replace her with a changeling.\"";
   next;
-  mes "The old tales of hurnscald say this spirit always change his offspring with beautiful and smart human childs, to use them as servants. And his offspring usually forgets about its own origin, growing up in a human family. But they are usually "people" with really bad temper, the kind of people who does terrible things in this world..."
+  mes "\"The old tales of hurnscald say this spirit always change his offspring with beautiful and smart human childs, to use them as servants. And his offspring usually forgets about its own origin, growing up in a human family. But they are usually 'people' with really bad temper, the kind of people who does terrible things in this world...\"";
   next;
   mes "However, the girl you are looking for is mentally too strong, and the spirit is having problems to create a changeling identical to her. So it locked her in one of those terrible caves, trying to scare the poor girl and make his task easier. As you can see, scary story.\"";
   next;