From 1ae642d89182776959fd0f3e104356e6aa284e93 Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Sun, 20 Jan 2019 13:09:36 -0500
Subject: expand the fluffy kill leaderboard

---
 world/map/db/const-quest.txt                | 2 +-
 world/map/npc/033-1/kimarr.txt              | 6 ++++++
 world/map/npc/magic/level2-lay-on-hands.txt | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'world')

diff --git a/world/map/db/const-quest.txt b/world/map/db/const-quest.txt
index 78136c00..128fbfa9 100644
--- a/world/map/db/const-quest.txt
+++ b/world/map/db/const-quest.txt
@@ -146,7 +146,7 @@ OPT_BANK_GOTSHADE 4
 
 // Currently used by the fluffy hunt (033-1).
 // starts counting with 0
-MAX_HIGH_SCORES 4
+MAX_HIGH_SCORES 14
 
 // Launcher/Ammo Types
 AMMO_NONE  0
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index cbe2b289..a0da1a9f 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -422,6 +422,12 @@ L_ShowNextRecord:
         goto L_Close;
     mes (@loop + 1) + " - " + $Record_Fluffy_Name$[@loop] + " - " + $Record_Fluffy_Kills[@loop] + " Fluffies killed at " + $Record_Fluffy_Date$[@loop];
     set @loop, @loop + 1;
+    if (MAX_HIGH_SCORES > 4 && (@loop % 5) == 0 && $Record_Fluffy_Kills[@loop] > 0)
+        goto L_NextShowNextRecord;
+    goto L_ShowNextRecord;
+
+L_NextShowNextRecord:
+    next;
     goto L_ShowNextRecord;
 
 L_Close:
diff --git a/world/map/npc/magic/level2-lay-on-hands.txt b/world/map/npc/magic/level2-lay-on-hands.txt
index de959c96..819f0ea2 100644
--- a/world/map/npc/magic/level2-lay-on-hands.txt
+++ b/world/map/npc/magic/level2-lay-on-hands.txt
@@ -43,7 +43,7 @@ L_Pay:
 
     set .@thp, get(Hp, @target_id);
     if (.@thp < 1) end;
-    set Hp, .@thp + @heal_value, @target_id;
+    set Hp, max(.@thp, .@thp + @heal_value), @target_id;
     end;
 
 L_Mouboo:
-- 
cgit v1.2.3-60-g2f50