From 6e8950ffdcd6693fac9391b2b3ec4db6201f0d74 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 6 Jan 2022 14:59:39 -0300
Subject: Golbarez: Improve rewards with more milestones

---
 npc/019-4-1/chief.txt    | 33 ++++++++++++++++++++++++++++-----
 npc/019-4-1/golbarez.txt |  3 ++-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/npc/019-4-1/chief.txt b/npc/019-4-1/chief.txt
index 4e449e21e..b5904b9b1 100644
--- a/npc/019-4-1/chief.txt
+++ b/npc/019-4-1/chief.txt
@@ -110,8 +110,17 @@ L_Reward:
     .@bp_total=.@q2/15000; // Price of an Ancient Blueprint
     .@bp_rank=0;
 
-    // Event: Good
-    if ($XMAS_MONEY >= 750000) {
+    // Event: Great (1.5 Mi)
+    if ($XMAS_MONEY >= 1500000) {
+        if (.@mc_boxc)
+            getitem MercBoxC, .@mc_boxb;
+        if (.@mc_boxb)
+            getitem MercBoxB, .@mc_boxb;
+        if (.@mc_boxa)
+            getitem MercBoxA, .@mc_boxa+2;
+        .@bp_rank=4;
+    // Event: Good (750k)
+    } else if ($XMAS_MONEY >= 750000) {
         if (.@mc_boxc)
             getitem MercBoxC, .@mc_boxb;
         if (.@mc_boxb)
@@ -119,19 +128,20 @@ L_Reward:
         if (.@mc_boxa)
             getitem MercBoxA, .@mc_boxa+1;
         .@bp_rank=3;
-    // Event: Average
+    // Event: Average (250k)
     } else if ($XMAS_MONEY >= 250000) {
         if (.@mc_boxb)
             getitem MercBoxB, .@mc_boxb;
         if (.@mc_boxa)
             getitem MercBoxA, .@mc_boxa;
         .@bp_rank=2;
-    // Event: Bad (must aid players)
+    // Event: Bad (must aid players - 100k)
     } else if ($XMAS_MONEY >= 100000) {
         if (.@q2 >= 10000)
             getitem MercBoxA, .@mc_boxa+1;
         .@bp_rank=1;
     }
+    // Event: Terrible (< 100k: No rewards)
 
     // Blueprints control
     // Event: Horrible
@@ -162,7 +172,7 @@ L_Reward:
         }
     }
     // Event: Good
-    else if (.@bp_rank >= 3 && .@bp_total) {
+    else if (.@bp_rank <= 3 && .@bp_total) {
         .@bp=.@bp_total/6;
         getitem AlchemyBlueprintA, limit(1, .@bp, 10);
         getitem EquipmentBlueprintA, limit(1, .@bp, 10);
@@ -174,6 +184,19 @@ L_Reward:
             getitem AncientBlueprint, 2;
         }
     }
+    // Event: Great
+    else if (.@bp_rank >= 4 && .@bp_total) {
+        .@bp=.@bp_total/6;
+        getitem AlchemyBlueprintB, limit(1, .@bp, 10);
+        getitem EquipmentBlueprintB, limit(1, .@bp, 10);
+        getitem AlchemyBlueprintC, limit(1, .@bp, 5);
+        getitem EquipmentBlueprintC, limit(1, .@bp, 5);
+        if (.@bp) {
+            getitem AlchemyBlueprintD, limit(1, .@bp, 3);
+            getitem EquipmentBlueprintD, limit(1, .@bp, 3);
+            getitem AncientBlueprint, 3;
+        }
+    }
 
     // MVP Awards
     if ((.@q2*100)/$XMAS_MONEY >= 80) { // 80% contribution
diff --git a/npc/019-4-1/golbarez.txt b/npc/019-4-1/golbarez.txt
index b84983daf..11750648f 100644
--- a/npc/019-4-1/golbarez.txt
+++ b/npc/019-4-1/golbarez.txt
@@ -14,7 +14,7 @@
 
 L_OutOfSeason:
     mesn;
-    if (rand(1,2) == 1)
+    if (any(true, false))
         mesq l("AAH! You scared me!");
     else
         mesq l("Land Of Fire is a place so warm... Although this workshop is a better place to break time and space during Christmas.");
@@ -51,6 +51,7 @@ L_Main:
     mesn;
     mesq l("Thanks for your patronage! The rewards will be available with @@, in case I do find the paradise!", "Christmas Chief");
     mesc l("Thus far, you've sponsored Golbarez in %d %% from total.", .@ratio);
+    mesc l("Note: No rares will be given if Golbarez doesn't get enough GP to find the paradise, but Strange Coins will still be given.");
     close;
 
 OnInit:
-- 
cgit v1.2.3-60-g2f50