Candor Battle can now be solo'ed, but it'll be harder =)

1 files changed, 11 insertions, 3 deletions

diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt
index 4006259ce..8c4b2267c 100644
--- a/npc/006-1/crazyfefe.txt
+++ b/npc/006-1/crazyfefe.txt
@@ -122,7 +122,8 @@ function Challenge {
     if ($EVENT$ != "Candor") {
         mesn;
         mesq l("Very well, but for a fee of @@ GP. There's no free lunch, after all!", .price);
-        mesc l("A minimum of %d players at the time of start is required!", 2), 1;
+        //mesc l("A minimum of %d players at the time of start is required!", 2), 1;
+        mesc l("If at any moment in the fight there's less than %d players in the room, a severe penalty will be applied, so watch out!", 3), 1;
 
         // Not enough money? We end here.
         if (Zeny < .price)
@@ -206,7 +207,7 @@ function Challenge {
 }
 
 function StartFight {
-    if (getmapusers("006-1") < 2 && !$@GM_OVERRIDE) {
+    if (getmapusers("006-1") < 1 && !$@GM_OVERRIDE) {
         mapannounce("006-1", "Oh noes! There's not enough players. Fight aborted, no refunds!", bc_map);
         CleanUp();
     }
@@ -242,7 +243,7 @@ function CaveLogic {
     // Victory conditions: Too few players are alive OR twenty minutes went on.
     // WARNING, dead players still in cave are counted, we might never finish the fight.
     // And a GM might be called to ban everyone inside.
-    if ($@FEFE_CAVE_PLAYER_COUNT <= 1 && !$@GM_OVERRIDE || gettimetick(2) >= $@FEFE_DELAY - 300) {
+    if ($@FEFE_CAVE_PLAYER_COUNT < 1 && !$@GM_OVERRIDE || gettimetick(2) >= $@FEFE_DELAY - 300) {
         CleanUp();
     }
 
@@ -251,6 +252,13 @@ function CaveLogic {
     areatimer "006-1", 20, 20, 70, 60, 10, "Crazyfefe::OnSumLevel";
     sleep(15);
 
+    // Penalty for being below the player count thresholds
+    // It merely assumes you *are* within the threshold
+    if ($@FEFE_CAVE_PLAYER_COUNT < 2)
+        $@FEFE_DIFFICULTY *= 3;
+    else if ($@FEFE_CAVE_PLAYER_COUNT < 3)
+        $@FEFE_DIFFICULTY *= 2;
+
     // New wave condition: All mobs dead, or 90 seconds have passed
     if (mobcount("006-1", "Crazyfefe::OnPetDeath") <= 0 || .wtime >= 90)
         NextRound();