Adjust the difficulty of the Ritual Cave. However, most current players will cheese it.

3 files changed, 23 insertions, 20 deletions

diff --git a/db/constants.conf b/db/constants.conf
index e13366cba..d5d98bd16 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2272,7 +2272,7 @@ constants_db: {
     FRAG_LADDER:        128
 
 	comment__: "Rossy Quest Constants"
-	ROSSY_INSTIME:      1200 // 20 minutes
+	ROSSY_INSTIME:      900  // 15 minutes
 	ROSSY_QUESTST:      7    // QUEST STate
 	ROSSY_PROLOGUE:     1
 	ROSSY_CAVE1:        2
diff --git a/npc/017-1/inspector.txt b/npc/017-1/inspector.txt
index de3e52fee..e6dc3c2a1 100644
--- a/npc/017-1/inspector.txt
+++ b/npc/017-1/inspector.txt
@@ -189,16 +189,6 @@ L_Arc4:
     mesc l("The inspector looks at you with a pale face.");
     mesq l("It's terrible... How could this happen?");
     next;
-    // FIXME TESTER BLOCK
-    if (!$@GM_OVERRIDE && !is_staff()) {
-        // You can come back to Inspector to begin the second part.
-        // Use Fairy Hat instead of Inspector Hat?
-        mes "";
-        mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
-        next;
-        goto L_Close;
-    }
-    // FIXME TESTER BLOCK
     select
         l("What happened?"),
         l("Uh, I better leave before I'm involved again.");
@@ -236,6 +226,16 @@ L_Hurry:
     goto L_Close;
 
 L_Finish:
+    // FIXME TESTER BLOCK
+    if (!$@GM_OVERRIDE && !is_staff()) {
+        // You can come back to Inspector to begin the second part.
+        // Use Fairy Hat instead of Inspector Hat?
+        mes "";
+        mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
+        next;
+        goto L_Close;
+    }
+    // FIXME TESTER BLOCK
     mesn;
     mesq l("I'm grateful for your help. Who knows what would have happened to Rossy without your intervention. So, did you find out who was behind the cheese theft?");
     next;
@@ -250,15 +250,15 @@ L_Finish:
     inventoryplace NPCEyes, 6; // FIXME
     mesn;
     mesq l("Here, you can have this uniform. The payment for your work is also here. Regards on a job well done, junior!");
-    //Zeny += 2000; // total 5kGP
-    //getexp 90000, 900;
+    Zeny += 2000; // total 5kGP
+    getexp 90000, 900;
     //getitem (NavyBlueShirt**, NavyBlueCottonTrousers, NavyBlueCottonGloves, NavyBlueCottonBoots, InspectorHat*, Kanabo)
     // *: SacredForestHat? BowlerHat? TopHat?
     // **: CottonChirt? VneckSweater? VneckJumper? ArtisTankTop <- no
-    // TODO: Reward
     // TODO: Add a way to acquire Murderer Crown lease, maybe rent it to #1 PvP
     // TODO: Send Medals (Gold, Silver, Bronze) on Olympics too, and give them stat
     // 3 gold, 3 silver and 4 bronze, for the whole top 10
+    setq LoFQuest_Inspector, 9, 0, 0;
     next;
     goto L_Close;
 
diff --git a/npc/018-8/ctrl.c b/npc/018-8/ctrl.c
index c2a78f30f..c68d0ce4e 100644
--- a/npc/018-8/ctrl.c
+++ b/npc/018-8/ctrl.c
@@ -149,8 +149,10 @@ function clauquerPrologue {
     }
     mesn;
     mesq l("Oh, and if you really plan to rescue the girl, I advise you to use potions for every single battle. You might want to take some food with you too. Don't be afraid to bring too much with you, these battles take time to end.");
-    if (REBIRTH || BaseLevel >= 90)
+    if (REBIRTH)
         mesc l("Clauquer clearly is not aware that you were reborn. These fights will likely be a breeze to someone so overpowered as you, but caution is never too much.");
+    else if (BaseLevel >= 90)
+        mesc l("Clauquer clearly is not aware of your level. These fights will likely be a breeze to someone so overpowered as you, but caution is never too much.");
     next;
     mesn;
     mesq l("I think you're now ready to explore these caves and fight. Good luck rescuing the girl!");
@@ -348,9 +350,10 @@ OnBeat:
 
 /* ****************************************** */
 OnTick1:
-    dispbottom l("Time remaining: %d minutes", 15);
-    addtimer2(300000, "#RossyQuest::OnTick2");
-    end;
+    //dispbottom l("Time remaining: %d minutes", 15);
+    //addtimer2(300000, "#RossyQuest::OnTick2");
+    //end;
+    //FALLTHROUGH;
 
 OnTick2:
     dispbottom l("Time remaining: %d minutes", 10);
@@ -500,8 +503,8 @@ function	script	RossyCave	{
         setunitdata(.@mob, UDT_MODE, .@bmod|4); // 4 = MD_AGGRESSIVE
         // Make it healthy
         .@bhp= getunitdata(.@mob, UDT_MAXHP);
-        setunitdata(.@mob, UDT_MAXHP,    .@bhp*11/10);
-        setunitdata(.@mob, UDT_HP,       .@bhp*11/10);
+        setunitdata(.@mob, UDT_MAXHP,    .@bhp*12/10);
+        setunitdata(.@mob, UDT_HP,       .@bhp*12/10);
     }
 
     // Spawn boss