From 2b52787d755d39a6c19305267b30726fdf7436ed Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 29 Jul 2024 00:14:52 -0300
Subject: I changed my mind, use the Trapper Hat for LoF Gambler (also the
 cheapest). Funky Hat is now on St. Patrick Gold Pot Lucky Prize.

The Lucky Prize has from 0% to 5% chance depending on how green you are.
So the maximum chance you have is 25% per year to get at least 1 copy.
(And I assume someone will get 2~3 copies in the same year for the giggles).
---
 npc/014-5/events.txt  | 37 +++++++++++++++++++++++++++++--------
 npc/017-3/gambler.txt |  4 ++--
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/npc/014-5/events.txt b/npc/014-5/events.txt
index c6d6b678b..be98240a8 100644
--- a/npc/014-5/events.txt
+++ b/npc/014-5/events.txt
@@ -35,6 +35,9 @@
         case 6:
             mesn "%%K";
             break;
+        case 10: // Lucky Prize
+            mesn "%%M";
+            break;
         default:
             mesn "%%@";
             break;
@@ -80,19 +83,30 @@
 		// SPINNING! Set that you can't spin again.
 		#PATRICK_DAY=gettime(GETTIME_DAYOFMONTH);
 
-		// Each green accessory raises boost gauge in 25. Full set raises in further 25.
-		// Hat, Shirt, Pants, Boots and Gloves. Max boost gauge from dye is 150 atm.
-		.@boost=0;
-		if (getequipcardid(EQI_HEAD_TOP, 0) == GreenDye)
+		// Each green accessory raises boost gauge in 25.
+		// Hat, Shirt, Pants, Boots and Gloves.
+		.@boost=0; .@lucky=0;
+		if (getequipcardid(EQI_HEAD_TOP, 0) == GreenDye) {
 			.@boost+=25;
-		if (getequipcardid(EQI_HEAD_MID, 0) == GreenDye)
+            .@lucky+=1;
+        }
+		if (getequipcardid(EQI_HEAD_MID, 0) == GreenDye) {
 			.@boost+=25;
-		if (getequipcardid(EQI_HEAD_LOW, 0) == GreenDye)
+            .@lucky+=1;
+        }
+		if (getequipcardid(EQI_HEAD_LOW, 0) == GreenDye) {
 			.@boost+=25;
-		if (getequipcardid(EQI_SHOES, 0) == GreenDye)
+            .@lucky+=1;
+        }
+		if (getequipcardid(EQI_SHOES, 0) == GreenDye) {
 			.@boost+=25;
-		if (getequipcardid(EQI_GARMENT, 0) == GreenDye)
+            .@lucky+=1;
+        }
+		if (getequipcardid(EQI_GARMENT, 0) == GreenDye) {
 			.@boost+=25;
+            .@lucky+=1;
+        }
+        // Full set raises in further 25. Max boost gauge from dye is 150 atm.
 		if (.@boost >= 125)
 			.@boost+=25;
 
@@ -136,6 +150,10 @@
 		else
 			.@v=0;
 
+        // Lucky override! \o/
+        if (rand2(100) < .@lucky)
+            .@v = 10;
+
 		// Tell players what they spinned, and lower rarity on next tries
 		symbol(.@v);
 		#PATRICK_CTRL+=.@v+(.@v/2);
@@ -169,6 +187,9 @@
 				getitem GoldenApple, 1;
 				Zeny=Zeny+rand(70, .@boost+10);
 				break;
+            case 10: // Lucky Prize!
+                getitem FunkyHat, 1;
+                mesc l("You got the rare, Lucky Prize!"), 2;
 		}
 		next;
 		mesn;
diff --git a/npc/017-3/gambler.txt b/npc/017-3/gambler.txt
index 48f0a606c..4aee4501f 100644
--- a/npc/017-3/gambler.txt
+++ b/npc/017-3/gambler.txt
@@ -49,7 +49,7 @@ L_Info:
     next;
     mesc l("Winning Strike Prizes:");
     mesc l("Every %d sequences, you'll get a %s!", 10, getitemlink(StrangeCoin));
-    mesc l("If you get %d sequence, you'll get a %s!", 15, getitemlink(FunkyHat));
+    mesc l("If you get %d sequence, you'll get a %s!", 15, getitemlink(TrapperHat));
     mesc l("If you get %d sequence, you'll get a %s!", 30, getitemlink(BronzeGift));
     mesc l("If you get %d sequence, you'll get a %s!", 50, getitemlink(SilverGift));
     //mesc l("If you get %d sequence, you'll get a %s!", 50, getitemlink(GoldenGift));
@@ -122,7 +122,7 @@ L_Sequence:
     if (@streak % 10 == 0)
         getitem StrangeCoin, 1;
     if (@streak == 15)
-        getitem FunkyHat, 1;
+        getitem TrapperHat, 1;
     if (@streak == 30)
         getitem BronzeGift, 1;
     if (@streak == 50)
-- 
cgit v1.2.3-70-g09d2