From 2f45bd7aa3109731edc73316c10338d605734995 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 15 Jun 2019 18:45:37 -0300
Subject: Rewrite how Mercenary Boxsets are handled (for easier maintenance)

---
 db/re/item_db.conf | 78 +++---------------------------------------------------
 1 file changed, 3 insertions(+), 75 deletions(-)

(limited to 'db')

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index e1295d5ea..bb19dab99 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -12624,31 +12624,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		.@seed=rand(0, 10000)-BaseLevel-readparam(bLuk);
-
-		// 0.5%
-		if (.@seed < 50) {
-			setarray .@r, MercCard_AndreiSakar, MercCard_Woody, MercCard_Lilanna, MercCard_Xanthem;
-			.@n=rand(getarraysize(.@r));
-		// 2.0%
-		} else if (.@seed < 250) {
-			setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne, MercCard_DragonStar;
-			.@n=rand(getarraysize(.@r));
-		// 10.0%
-		} else if (.@seed < 1250) {
-			setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable, MercCard_Arthur;
-			.@n=rand(getarraysize(.@r));
-		// 25.0%
-		} else if (.@seed < 3750) {
-			setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure, MercCard_EarthWitch;
-			.@n=rand(getarraysize(.@r));
-		// 62.5%
-		} else {
-			setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_Rosa;
-			.@n=rand(getarraysize(.@r));
-		}
-
-		getitem .@r[.@n], 1;
+        callfunc "merc_boxset", 50, 250, 1250, 3750, 6250;
 	">
 },
 {
@@ -12669,31 +12645,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		.@seed=rand(0, 10000)-BaseLevel-readparam(bLuk);
-
-		// 1.0%
-		if (.@seed < 100) {
-			setarray .@r, MercCard_AndreiSakar, MercCard_Woody, MercCard_Lilanna, MercCard_Xanthem;
-			.@n=rand(getarraysize(.@r));
-		// 5.0%
-		} else if (.@seed < 600) {
-			setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne, MercCard_DragonStar;
-			.@n=rand(getarraysize(.@r));
-		// 20.0%
-		} else if (.@seed < 2100) {
-			setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable, MercCard_Arthur;
-			.@n=rand(getarraysize(.@r));
-		// 35.0%
-		} else if (.@seed < 5600) {
-			setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure, MercCard_EarthWitch;
-			.@n=rand(getarraysize(.@r));
-		// 44.0%
-		} else {
-			setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_Rosa;
-			.@n=rand(getarraysize(.@r));
-		}
-
-		getitem .@r[.@n], 1;
+        callfunc "merc_boxset", 100, 600, 2100, 5600, 4400;
 	">
 },
 {
@@ -12714,31 +12666,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		.@seed=rand(0, 10000)-BaseLevel-readparam(bLuk);
-
-		// 2.0%
-		if (.@seed < 200) {
-			setarray .@r, MercCard_AndreiSakar, MercCard_Woody, MercCard_Lilanna, MercCard_Xanthem;
-			.@n=rand(getarraysize(.@r));
-		// 10.0%
-		} else if (.@seed < 1200) {
-			setarray .@r, MercCard_Aisen, MercCard_Msawis, MercCard_Swezanne, MercCard_DragonStar;
-			.@n=rand(getarraysize(.@r));
-		// 30.0%
-		} else if (.@seed < 4200) {
-			setarray .@r, MercCard_Saulc, MercCard_Crazyfefe, MercCard_LawnCable, MercCard_Arthur;
-			.@n=rand(getarraysize(.@r));
-		// 50.0%
-		} else if (.@seed < 9200) {
-			setarray .@r, MercCard_Pookie, MercCard_Jesusalva, MercCard_Demure, MercCard_EarthWitch;
-			.@n=rand(getarraysize(.@r));
-		// 8.0%
-		} else {
-			setarray .@r, MercCard_Apane, MercCard_Soren, MercCard_GonzoDark, MercCard_Rosa;
-			.@n=rand(getarraysize(.@r));
-		}
-
-		getitem .@r[.@n], 1;
+        callfunc "merc_boxset", 200, 1200, 4200, 9200, 800;
 	">
 },
 
-- 
cgit v1.2.3-60-g2f50