Ishi: Improve a bit prize handling. A tiny bit.

1 files changed, 48 insertions, 5 deletions

diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index e155d5c8d..fbc81292d 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -8,7 +8,7 @@
 
 003-1,97,97,0	script	Ishi	NPC_PLAYER_ARGAES,{
 
-    if (MPQUEST == 0) {
+    if (!MPQUEST) {
         mesn l("Ishi, the Rewards Master");
         mesq l("Hey, it seems like you didn't register as a Monster Hunting Quest participant yet! You can sign up with Aidan.");
         close;
@@ -44,7 +44,7 @@
         close;
     }
 
-    if (BaseLevel < 25) {
+    if (TotalBaseLevel() < 25) {
         setarray @Items,   Bread,
                             Candy,Orange,BugLeg,
                             CobaltHerb,GambogeHerb,
@@ -66,7 +66,7 @@
     array_push(@Rares, (JobLevel/3));
 
     // Additional Loot for level 45+
-    if (BaseLevel >= 45) {
+    if (TotalBaseLevel() >= 45) {
         array_push(@Items, IronOre);
         array_push(@Items, SilverOre);
         array_push(@Items, TinOre);
@@ -83,7 +83,7 @@
     }
 
     // Additional Loot for level 75+
-    if (BaseLevel >= 75) {
+    if (TotalBaseLevel() >= 75) {
         array_push(@Items, LeadOre);
         array_push(@Items, TitaniumOre);
         array_push(@Items, IridiumOre);
@@ -100,6 +100,49 @@
         array_push(@Rares, (JobLevel/9));
     }
 
+    // Additional Loot for level 150+
+    if (TotalBaseLevel() >= 150) {
+        array_push(@Items, PlatinumOre);
+        array_push(@Items, CursedAmmoBox);
+
+        array_push(@Rares, MercBoxB);
+        array_push(@Rares, 30);
+        array_push(@Rares, AlchemyBlueprintD);
+        array_push(@Rares, (JobLevel/15));
+        array_push(@Rares, EquipmentBlueprintD);
+        array_push(@Rares, (JobLevel/15));
+    }
+
+    // Additional Loot for level 300+
+    if (TotalBaseLevel() >= 300) {
+        array_push(@Items, ThornAmmoBox);
+
+        array_push(@Rares, MercBoxC);
+        array_push(@Rares, 20);
+        array_push(@Rares, AlchemyBlueprintE);
+        array_push(@Rares, (JobLevel/21));
+        array_push(@Rares, EquipmentBlueprintE);
+        array_push(@Rares, (JobLevel/21));
+    }
+
+    // Remove some useless Loot for level 500+
+    if (TotalBaseLevel() >= 500) {
+        array_remove(@Items, Plushroom);
+        array_remove(@Items, Candy);
+        array_remove(@Items, BugLeg);
+        array_remove(@Items, PiouLegs);
+        array_remove(@Items, RustyKnife);
+
+        array_push(@Rares, MercBoxD);
+        array_push(@Rares, 10);
+    }
+
+    // Just an excuse
+    if (TotalBaseLevel() >= 700) {
+        array_push(@Rares, MercBoxE);
+        array_push(@Rares, 5);
+    }
+
     mesn l("Ishi, the Rewards Master");
     // Highlight the amount of monster points in bold for better visibility since players will probably exchange monster points a lot
     mesq l("Welcome! I see you have ##B%d Monster Points##b. Would you like to exchange some of those for items?", Mobpt);
@@ -146,7 +189,7 @@ L_Items:
         .@lucked=0;
         .@reward=0;
 
-        if (BaseLevel > 25) {
+        if (TotalBaseLevel() > 25) {
             //debugmes "Testing rares";
             @lucky = rand(10000) + 1;
             for (.@b = 0; .@b < getarraysize(@Rares); .@b=.@b+2) {