diff options
-rw-r--r-- | data/025-4.wlk | bin | 48004 -> 48004 bytes | |||
-rw-r--r-- | npc/025-4/Battlecaves.txt | 55 | ||||
-rw-r--r-- | npc/025-4/clauquer.txt | 5 |
3 files changed, 32 insertions, 28 deletions
diff --git a/data/025-4.wlk b/data/025-4.wlk Binary files differindex e7ea05df..9dc8a4e1 100644 --- a/data/025-4.wlk +++ b/data/025-4.wlk diff --git a/npc/025-4/Battlecaves.txt b/npc/025-4/Battlecaves.txt index 677aa913..f89b2a23 100644 --- a/npc/025-4/Battlecaves.txt +++ b/npc/025-4/Battlecaves.txt @@ -1,7 +1,7 @@ // ----------------------------------------------- Cave 1 --------------------------------------------------------- -025-4.gat,41,90,0 script #StartCaveFight1 111,{ +025-4.gat,41,91,0 script #StartCaveFight1 111,{ if (@battlecave1 == 1) goto L_StartFight; end; @@ -28,8 +28,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave1 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave1 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave1 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave1 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave1 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave1 != $@CAVE1_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE1); @@ -77,7 +77,7 @@ OnTimer5000: // ----------------------------------------------- Cave 2 --------------------------------------------------------- -025-4.gat,110,89,0 script #StartCaveFight2 111,{ +025-4.gat,110,90,0 script #StartCaveFight2 111,{ if (@battlecave2 == 1) goto L_StartFight; end; @@ -104,8 +104,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave2 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave2 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave2 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave2 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave2 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave2 != $@CAVE2_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE2); @@ -178,8 +178,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave3 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave3 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave3 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave3 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave3 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave3 != $@CAVE3_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE3); @@ -251,8 +251,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave4 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave4 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave4 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave4 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave4 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave4 != $@CAVE4_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE4); @@ -297,7 +297,7 @@ OnTimer5000: end; } // ----------------------------------------------- Cave 5 --------------------------------------------------------- -025-4.gat,100,152,0 script #StartCaveFight5 111,{ +025-4.gat,100,154,0 script #StartCaveFight5 111,{ if (@battlecave5 == 1) goto L_StartFight; end; @@ -324,8 +324,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave5 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave5 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave5 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave5 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave5 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave5 != $@CAVE5_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE5); @@ -397,8 +397,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave6 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave6 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave6 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave6 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave6 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave6 != $@CAVE6_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE6); @@ -443,7 +443,7 @@ OnTimer5000: end; } // ----------------------------------------------- Cave 7 --------------------------------------------------------- -025-4.gat,45,215,0 script #StartCaveFight7 111,{ +025-4.gat,39,215,0 script #StartCaveFight7 111,{ if (@battlecave7 == 1) goto L_StartFight; end; @@ -470,8 +470,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave7 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave7 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave7 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave7 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave7 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave7 != $@CAVE7_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE7); @@ -516,7 +516,7 @@ OnTimer5000: end; } // ----------------------------------------------- Cave 8 --------------------------------------------------------- -025-4.gat,103,210,0 script #StartCaveFight8 111,{ +025-4.gat,105,210,0 script #StartCaveFight8 111,{ if (@battlecave8 == 1) goto L_StartFight; end; @@ -543,8 +543,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave8 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave8 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave8 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave8 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave8 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave8 != $@CAVE8_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE8); @@ -616,8 +616,8 @@ L_Done: // Remember to adjust the number of conditionals according to the number of waves if ($@wave_cave9 == 1) message strcharinfo(0), "Oh no, more monsters?!"; - if ($@wave_cave9 == 2) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave9 == 3) message strcharinfo(0), "You feel strange, your feet starts trembling and some kind of force pulls you with an amazing force!"; + if ($@wave_cave9 == 2) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave9 == 3) message strcharinfo(0), "You feel strange, your feet start trembling and some kind of force pulls you with an amazing strengh!"; if ($@wave_cave9 != $@CAVE9_WAVES) goto L_Summon; set cavefights, (cavefights ^ BATTLE_CAVE9); @@ -695,9 +695,10 @@ L_Done: // Here you can define the messages to be shown for the players on the beginning of each wave. // Remember to adjust the number of conditionals according to the number of waves - if ($@wave_cave10 == 1) message strcharinfo(0), "I can't give up!"; - if ($@wave_cave10 == 3) message strcharinfo(0), "This is harder than I imagined!"; - if ($@wave_cave10 == 4) message strcharinfo(0), "Finally! It seems I have defeated all of them!"; + if ($@wave_cave10 == 1) message strcharinfo(0), "I can't give up now!"; + if ($@wave_cave10 == 1) message strcharinfo(0), "I feel I'm getting close to the end..."; + if ($@wave_cave10 == 3) message strcharinfo(0), "What? This is harder than I imagined!"; + if ($@wave_cave10 == 4) message strcharinfo(0), "Finally! It seems I have defeated all of them! Wait... what is that?!"; if ($@wave_cave10 != $@CAVE10_WAVES) goto L_Summon; set $@wave_cave10, 5; @@ -729,7 +730,7 @@ OnBossDeath: set $@cave10fighterdeaths$, 0; stopnpctimer; setnpctimer 0; - message strcharinfo(0), "Now I am sure I defeated all the monsters! Julia must be in a room acessible from this place..."; + message strcharinfo(0), "I am now sure I defeated all the monsters of these spooky caves! Julia must be in a room accessible from this place..."; set Rossy_Quest, 16; end; diff --git a/npc/025-4/clauquer.txt b/npc/025-4/clauquer.txt index 2a38bce7..d51606ae 100644 --- a/npc/025-4/clauquer.txt +++ b/npc/025-4/clauquer.txt @@ -3,6 +3,7 @@ // if (Rossy_Quest >= 15) goto L_Hmmm Character already talked to Clauquer up to the end of the conversation. // if (Rossy_Quest == 14) goto L_Help Character just entered the Main HAll and still needs to talk to Clauquer to be able to enter the Battle Caves. // if (Rossy_Quest <= 13) goto L_Huh Character is not supposed to be here, can be because of the use of GM powers. + if (Rossy_Quest >= 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Rescued; if (Rossy_Quest == 15) goto L_Hmmm; if (Rossy_Quest == 14) goto L_Help; @@ -63,6 +64,8 @@ L_No: L_Rescued: mes "[Clauquer]"; - mes "Put something here. He talks about you rescuing the girl."; + mes "Please put something here."; + next; + mes "*The man talks about you, rescuing the girl.*"; close; } |