Display previously hidden clientversion message and refactor Patrick Gold Pot.

addresses #93 but might easily give 3~5 Golden Gifts.
I, uh, don't really like the whole logic, so I'm not closing the issue.

2 files changed, 21 insertions, 13 deletions

diff --git a/npc/014-5/events.txt b/npc/014-5/events.txt
index be98240a8..4ee1723c9 100644
--- a/npc/014-5/events.txt
+++ b/npc/014-5/events.txt
@@ -83,6 +83,16 @@
 		// SPINNING! Set that you can't spin again.
 		#PATRICK_DAY=gettime(GETTIME_DAYOFMONTH);
 
+		// Blv+Jlv gives a small boost. The "maximum" sum is 300, but we divide by 5
+		// So this grants a further boost of 4~60 depending on level.
+		.@boost+=rand2((BaseLevel+JobLevel))/5;
+
+        // Include Rebirth, up to 50 points
+        .@boost+=rand2(REBIRTH*10);
+
+		// The level bonus does not exceed 100, ever
+		.@boost=limit(0, .@boost, 100);
+
 		// Each green accessory raises boost gauge in 25.
 		// Hat, Shirt, Pants, Boots and Gloves.
 		.@boost=0; .@lucky=0;
@@ -110,25 +120,22 @@
 		if (.@boost >= 125)
 			.@boost+=25;
 
-		// Blv+Jlv gives a small boost. The "maximum" sum is 250, but we divide by 5
-		// So this grants a further boost of 4~50 depending on level.
-		.@boost+=(BaseLevel+JobLevel)/5;
-
-		// .@boost, right now, is a number from 0 to 200.
-		// Randomness factor can make that 20% higher, up to 240.
-		.@r=rand(0,20);
+		// .@boost, right now, is a number from 0 to 250.
+		// Randomness factor can make that 20% higher, up to 300.
+		.@r=rand2(0,20);
 		.@boost+=(.@boost*.@r/100);
-		// Then it may add or subtract 10 points from boost. Apply a cap to range 0~250.
+		// Then it may add or subtract 10 points from boost. Apply a cap to range 0~250
 		.@boost+=rand(-10, 10);
 
-		// Now, you can't get 5 Golden Apples straight, right?
-		// You lose boost as you get rewards. You lose boost the farther from
-		// event last day you are, too.
-		.@boost-=#PATRICK_CTRL;
+		// You lose boost the farther from event last day you are.
 		.@boost-=($@PATRICK_DAYMAX-#PATRICK_DAY);
 
 		// sanitize boost so it ranges from 0 to 250.
-		.@boost=max(0, .@boost);
+		.@boost=limit(0, .@boost, 250);
+
+		// Now, you can't get 5 Golden Apples straight, right?
+		// You lose boost as you get rewards. Effectively limits top prize to 2.
+		.@boost-=#PATRICK_CTRL;
 
 		// REFERENCE: At release time, max levels ingame were about 60/40.
 		// That would give 10~34 (not green) to 160~214 (fully green) boost value.
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 377d4162b..de3bfe99a 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -1451,6 +1451,7 @@ function	script	checkclientversion	{
     next;
     if (ClientVersion >= 24) mesc l("Compatibility Support mode enabled. Client may crash AT RANDOM, beware.");
     if (ClientVersion >= 24) mesc l("Crazy stuff can happen in overall. YOU HAVE BEEN WARNED TO UPDATE YOUR CLIENT.");
+    if (ClientVersion >= 24) next;
     if (ClientVersion >= 24) closeclientdialog;
     if (ClientVersion >= 24) return;
     mesc l("You won't be allowed to play this game until you have an updated client.");