Simplified the battles a bit for the chars level 50. Changed beginning of the quest: you need to give the cherris you found for Rossy and give them to Olana instead of bottles of water.

4 files changed, 19 insertions, 20 deletions

diff --git a/data/025-4.wlk b/data/025-4.wlk
index 9dc8a4e1..00b9fa66 100644
--- a/data/025-4.wlk
+++ b/data/025-4.wlk
diff --git a/npc/009-2/olana.txt b/npc/009-2/olana.txt
index 820fab7b..b0471a3f 100644
--- a/npc/009-2/olana.txt
+++ b/npc/009-2/olana.txt
@@ -41,29 +41,29 @@ L_Help:
   mes "[Olana]";
   mes "\"Oh yes? Is Rossy alright? That's good. I'm relieved. I hope she'll find Julia soon.\"";
   next;
-  mes "\"Oh by the way, I would need your help myself too. My water supply ran out and I can't go down the stairs anymore, my knees hurt a lot.\"";
+  mes "\"Oh by the way, I would need your help myself too. I think Rossy colected some cherries while she was in the woods, could you bring me them please?.\"";
   menu
-    "Sure I can help you, how much water do you need?", L_Set,
+    "Sure, I'll be back with cherries.", L_Set,
     "Sorry, I'm too busy.", L_No;
 
 L_Set:
   mes "[Olana]";
   set Rossy_Quest, 3;
-  mes "\"I'd like the size of a [Bottle of Water] and I would need about 5 of those. Please, bring them to me.\"";
+  mes "\"I'd like 10 Cherries.\"";
   close;
 
 L_Get:
   mes "[Olana]";
-  mes "\"Please, get 5 containers of water for me, around the size of a [Bottle of Water].\"";
+  mes "\"Please, get 10 cherries for me.\"";
   close;
 
 L_See:
-  if(countitem("bottleofwater") < 5) goto L_Get;
+  if(countitem("cherry") < 10) goto L_Get;
   mes "[Olana]";
   set Rossy_Quest, 4;
   mes "\"You got them for me! Thank you! Here you are... a small reward from me for your precious help!\"";
-  delitem "bottleofwater", 5;
-  getexp 500, 0;
+  delitem "cherry", 10;
+  getexp 1000, 0;
   set zeny, zeny + 1000;
   goto L_Task;
 
diff --git a/npc/025-1/rossy.txt b/npc/025-1/rossy.txt
index 3b13b573..7d6d2d3b 100644
--- a/npc/025-1/rossy.txt
+++ b/npc/025-1/rossy.txt
@@ -50,13 +50,12 @@ L_Check:
   if(countitem("Cherry") < 10) goto L_Get;
   mes "[Rossy]";
   set Rossy_Quest, 2;
-  delitem "Cherry", 10;
   getexp 2000, 0;
-  mes "\"I can't believe my eyes, you got them all! Thanks a lot!\"";
+  mes "\"I can't believe my eyes, you got them all! Please give them to my mother when she will ask for them.\"";
   next;
   menu
     "No problem, I'm in a hurry, bye.", -,
-    "I'm always here to help, do you need anything else?", L_Done;
+    "Certainly, I'm always here to help, do you need anything else?", L_Done;
   mes "[Rossy]";
   mes "\"I might need your help later. Bye.\"";
 
diff --git a/npc/025-4/battlecaves.txt b/npc/025-4/battlecaves.txt
index 10e17a75..3b63203e 100644
--- a/npc/025-4/battlecaves.txt
+++ b/npc/025-4/battlecaves.txt
@@ -56,7 +56,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE1_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE1_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE1_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE1_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -134,7 +134,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE2_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE2_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE2_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE2_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -210,7 +210,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE3_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE3_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE3_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE3_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -286,7 +286,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE4_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE4_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE4_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE4_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -363,7 +363,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE5_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE5_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE5_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE5_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -440,7 +440,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE6_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE6_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE6_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE6_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -517,7 +517,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE7_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE7_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE7_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE7_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -594,7 +594,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE8_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE8_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE8_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE8_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -671,7 +671,7 @@ onInit:
 // Monsters IDs to be spawned.
     setarray $@CAVE9_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE9_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE9_MONSTERS_QTY[1], 3, 2, 2, 2;
 // Number of waves.
     set $@CAVE9_WAVES, 3;
 // Maximum time (in seconds) for the player to finish the fight.
@@ -778,7 +778,7 @@ onInit:
 // Monsters IDs to be spawned. before the boss.
     setarray $@CAVE10_MONSTERS_IDS[1], 1050, 1051, 1083, 1084;
 // Number of monsters of each ID.
-    setarray $@CAVE10_MONSTERS_QTY[1], 4, 2, 3, 2;
+    setarray $@CAVE10_MONSTERS_QTY[1], 3, 2, 2, 2;
 // ID of the boss monster.
     set $@BOSS, 1086;
 // Number of waves. before the boss.