Add idle checks which exclude you from receiving boss points in all fights

8 files changed, 40 insertions, 14 deletions

diff --git a/npc/027-6/general_krukan.txt b/npc/027-6/general_krukan.txt
index 1491e80f..54d2b442 100644
--- a/npc/027-6/general_krukan.txt
+++ b/npc/027-6/general_krukan.txt
@@ -194,6 +194,8 @@ OnReward:
     @bonus = (BaseLevel/4);
     DailyQuestBonus = DailyQuestBonus + @bonus;
     message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ;
+    if (checkidle() > MAX_IDLE)
+        goto L_End;
     BOSS_POINTS = BOSS_POINTS + 25;
     message strcharinfo(0), "You gain 25 Boss Points giving you a total of " + BOSS_POINTS + ".";
     goto L_End;
diff --git a/npc/027-7/general_razha.txt b/npc/027-7/general_razha.txt
index ceb024b0..7522e1f3 100644
--- a/npc/027-7/general_razha.txt
+++ b/npc/027-7/general_razha.txt
@@ -198,6 +198,8 @@ OnReward:
     @bonus = (BaseLevel/2);
     DailyQuestBonus = DailyQuestBonus + @bonus;
     message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ;
+    if (checkidle() > MAX_IDLE)
+        goto L_End;
     BOSS_POINTS = BOSS_POINTS + 50;
     message strcharinfo(0), "You gain 50 Boss Points giving you a total of " + BOSS_POINTS + ".";
     goto L_End;
diff --git a/npc/027-8/general_terogan.txt b/npc/027-8/general_terogan.txt
index e9619b0a..9cbca92e 100644
--- a/npc/027-8/general_terogan.txt
+++ b/npc/027-8/general_terogan.txt
@@ -263,6 +263,8 @@ OnReward:
     @bonus = (BaseLevel/2);
     DailyQuestBonus = DailyQuestBonus + @bonus;
     message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained." ;
+    if (checkidle() > MAX_IDLE)
+        goto L_End;
     BOSS_POINTS = BOSS_POINTS + 75;
     message strcharinfo(0), "You gain 75 Boss Points giving you a total of " + BOSS_POINTS + ".";
     goto L_End;
diff --git a/npc/029-3/parua.txt b/npc/029-3/parua.txt
index 4f282feb..b449ba0d 100644
--- a/npc/029-3/parua.txt
+++ b/npc/029-3/parua.txt
@@ -411,6 +411,8 @@ L_IdleCheckPassed:
 OnReward:
     if (ispcdead())
         end;
+    if (checkidle() > MAX_IDLE)
+        goto L_End;
     BOSS_POINTS = BOSS_POINTS + 100;
     message strcharinfo(0), "You gain 100 Boss Points giving you a total of " + BOSS_POINTS + ".";
     goto L_CleanUp_Player;
diff --git a/npc/031-4/cindyCave.txt b/npc/031-4/cindyCave.txt
index c748d4ce..9e0be802 100644
--- a/npc/031-4/cindyCave.txt
+++ b/npc/031-4/cindyCave.txt
@@ -217,6 +217,8 @@ OnReward:
         goto L_End;
     setq(KaizeiQuest_Cindy, 3);
     message strcharinfo(0), "Cindy looks relieved and as if she wants to talk with you.";
+    if (checkidle() > MAX_IDLE)
+        goto L_End;
     BOSS_POINTS = BOSS_POINTS + 70;
     message strcharinfo(0), "You gain 70 Boss Points giving you a total of " + BOSS_POINTS + ".";
     goto L_End;
diff --git a/npc/052-2/partyroom.txt b/npc/052-2/partyroom.txt
index 12d5b119..4be15155 100644
--- a/npc/052-2/partyroom.txt
+++ b/npc/052-2/partyroom.txt
@@ -231,6 +231,8 @@ OnDeath:
     end;
 
 OnBP:
+    if (checkidle() > MAX_IDLE)
+        end;
     BOSS_POINTS = BOSS_POINTS + $@illia_bp;
     message strcharinfo(0), "You gain " + $@illia_bp + " Boss Points giving you a total of " + BOSS_POINTS + ".";
     end;
diff --git a/npc/099-5/boss.txt b/npc/099-5/boss.txt
index 23f51314..c5048dfc 100644
--- a/npc/099-5/boss.txt
+++ b/npc/099-5/boss.txt
@@ -164,6 +164,8 @@ OnMTDispose:
     end;
 
 OnMTReward50:
+    if (checkidle() > MAX_IDLE || ispcdead())
+        goto OnMTMusicOff;
     @dd5_share = 10000*@dd5_score/$@DD5_PTS;
     if (!@dd5_share)
         end;
@@ -174,6 +176,8 @@ OnMTReward50:
     goto OnMTMusicOff;
 
 OnMTReward40:
+    if (checkidle() > MAX_IDLE || ispcdead())
+        goto OnMTMusicOff;
     @dd5_share = 10000*@dd5_score/$@DD5_PTS;
     if (!@dd5_share)
         end;
@@ -184,6 +188,8 @@ OnMTReward40:
     goto OnMTMusicOff;
 
 OnMTReward51:
+    if (checkidle() > MAX_IDLE || ispcdead())
+        goto OnMTMusicOff;
     @dd5_share = 10000*@dd5_score/$@DD5_PTS;
     if (!@dd5_share)
         end;
@@ -194,6 +200,8 @@ OnMTReward51:
     goto OnMTMusicOff;
 
 OnMTReward41:
+    if (checkidle() > MAX_IDLE || ispcdead())
+        goto OnMTMusicOff;
     @dd5_share = 10000*@dd5_score/$@DD5_PTS;
     if (!@dd5_share)
         end;
@@ -204,13 +212,15 @@ OnMTReward41:
     goto OnMTMusicOff;
 
 OnMTReward52:
-    @dd5_share = 10000*@dd5_score/$@DD5_PTS;
-    if (!@dd5_share)
-        end;
-    getexp @dd5_share*250, @dd5_share*5/2;
-    Zeny = Zeny + (@dd5_share*5);
-    BOSS_POINTS = BOSS_POINTS + @dd5_share/80;
-    message strcharinfo(0), "Gained "+(@dd5_share/80)+" boss points!";
+    if (checkidle() < MAX_IDLE) {
+        @dd5_share = 10000*@dd5_score/$@DD5_PTS;
+        if (!@dd5_share)
+            end;
+        getexp @dd5_share*250, @dd5_share*5/2;
+        Zeny = Zeny + (@dd5_share*5);
+        BOSS_POINTS = BOSS_POINTS + @dd5_share/80;
+        message strcharinfo(0), "Gained "+(@dd5_share/80)+" boss points!";
+    }
     changemusic "099-5","ghoulish-fun.ogg";
     mapmask 1; // Reset map mask for you
 
@@ -224,13 +234,15 @@ OnMTReward52:
     goto OnEpilogue1;
 
 OnMTReward42:
-    @dd5_share = 10000*@dd5_score/$@DD5_PTS;
-    if (!@dd5_share)
-        end;
-    getexp @dd5_share*50, @dd5_share;
-    Zeny = Zeny + @dd5_share;
-    BOSS_POINTS = BOSS_POINTS + @dd5_share/100;
-    message strcharinfo(0), "Gained "+(@dd5_share/100)+" boss points!";
+    if (checkidle() < MAX_IDLE) {
+        @dd5_share = 10000*@dd5_score/$@DD5_PTS;
+        if (!@dd5_share)
+            end;
+        getexp @dd5_share*50, @dd5_share;
+        Zeny = Zeny + @dd5_share;
+        BOSS_POINTS = BOSS_POINTS + @dd5_share/100;
+        message strcharinfo(0), "Gained "+(@dd5_share/100)+" boss points!";
+    }
     changemusic "099-4","ghoulish-fun.ogg";
 
     // Warp to 099-5 or dispose dead bodies
diff --git a/npc/annuals/xmas/core.txt b/npc/annuals/xmas/core.txt
index 2abeefce..d1ba0b19 100644
--- a/npc/annuals/xmas/core.txt
+++ b/npc/annuals/xmas/core.txt
@@ -130,6 +130,8 @@ function	script	XmasMainXpBpReward	{
     goto L_LevelingReward;
 
 L_EndGameReward:
+    if (checkidle() > MAX_IDLE)
+        return;
     @xmas_bp_reward = 100 + rand(@xmas_reward, 2 * @xmas_reward);
     BOSS_POINTS = BOSS_POINTS + @xmas_bp_reward;
     message strcharinfo(0), "You gain " + @xmas_bp_reward + " Bosspoints, giving you a total of " + BOSS_POINTS + ".";