Force players to use Waterfall. Regenerate maps. Fix file location.

1 files changed, 17 insertions, 8 deletions

diff --git a/npc/015-3-3/boss.txt b/npc/015-3-3/boss.txt
index eab30c194..09e4459e8 100644
--- a/npc/015-3-3/boss.txt
+++ b/npc/015-3-3/boss.txt
@@ -6,17 +6,17 @@
 
 015-3-3,100,67,0	script	Pirate Treasure Chest	NPC_CHEST,{
     /* Boss Showdown incomplete */
-    if (getq(HurnscaldQuest_PirateCave) < 6) {
+    if (getq(HurnscaldQuest_PirateCave) < 7) {
         warp "015-3-2", 24, 62;
         end;
     }
     /* Treasure Chest logic */
-    if (getq(HurnscaldQuest_PirateCave) == 6) {
+    if (getq(HurnscaldQuest_PirateCave) == 7) {
         // You'll always get the maximum prize the first time
     	TreasureBox(99999);
         Zeny+=rand2(5700, 6200);
         getexp 1000, 320;
-        compareandsetq HurnscaldQuest_PirateCave, 6, 7;
+        compareandsetq HurnscaldQuest_PirateCave, 7, 8;
     } else {
     	TreasureBox(100); // 1% extra chance
     }
@@ -31,7 +31,7 @@ OnInit:
 015-3-3,100,62,0	script	#Marley	NPC_HIDDEN,2,0,{
     end;
 OnTouch:
-    if (getq(HurnscaldQuest_PirateCave) >= 6) end;
+    if (getq(HurnscaldQuest_PirateCave) >= 7) end;
     slide 70, 50;
     if (mobcount("015-3-3", "#Marley::OnWin")) end;
     // Cutscene + Boss!
@@ -48,14 +48,23 @@ OnTouch:
     // Spawn the boss!
     monster("015-3-3", 69, 54, strmobinfo(1, Marley), Marley, 1, "#Marley::OnWin");
     // And the reinforcements...
-    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Thug), Thug, 7);
-    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Swashbuckler), Swashbuckler, 7);
-    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Grenadier), Grenadier, 7);
+    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Thug), Thug, 4);
+    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Swashbuckler), Swashbuckler, 4);
+    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Grenadier), Grenadier, 4);
+    initnpctimer;
+    end;
+
+// Extra reinforcements if Marley still alive
+OnTimer30000:
+    if (!mobcount("015-3-3", "#Marley::OnWin")) end;
+    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Thug), Thug, 3);
+    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Swashbuckler), Swashbuckler, 3);
+    areamonster("015-3-3", 62, 47, 81, 57, strmobinfo(1, Grenadier), Grenadier, 3);
     end;
 
 OnWin:
     dispbottom l("Marley : You... thief... *grumble*");
-    compareandsetq HurnscaldQuest_PirateCave, 5, 6;
+    compareandsetq HurnscaldQuest_PirateCave, 6, 7;
     end;
 }