Merge pull request #1684 from Smokexyz/refine-update

Enriched refine chance correction

2 files changed, 374 insertions, 125 deletions

diff --git a/db/pre-re/refine_db.conf b/db/pre-re/refine_db.conf
index 0d59c8faa..dd3bcdb41 100644
--- a/db/pre-re/refine_db.conf
+++ b/db/pre-re/refine_db.conf
@@ -30,19 +30,22 @@
 /**************************************************************************
  ************* Entry structure ********************************************
  **************************************************************************
-Armors/WeaponLevel1~4: { // Specifies weapon level or armor type
-			- For armors, values of 100 add 1 armor defense.
-			- For weapons, values of 100 add 1 ATK.
-	StatsPerLevel: value              (int) // This value is applied for ever level.
-	RandomBonusStartLevel: level      (int) // This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
-	RandomBonusValue: value           (int) // A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past.
-	                                        //   Random bonus start level. This is only applied for weapons, and not displayed client-side.
-	Rates: { // Per level configuration of the refine rates.
-		Lv1~10: { // Level of refine
-			Chance: value     (int, optional, defaults to 100) // Chance of successful refine (100 = 100%)
-			Bonus: value      (int, optional, defaults to 0)   // Bonus for this level of refine
-		}
-		// Note: Refine levels that use default values need not be listed. (Example: Lv1: Chance: 100 Bonus: 0)
+Armors/WeaponLevel1~4: {                                       // Specifies weapon level or armor type.
+															   // - For armors, values of 100 add 1 armor defense.
+															   // - For weapons, values of 100 add 1 ATK.
+	StatsPerLevel: (int)                                       // This value is applied for ever level.
+	RandomBonusStartLevel: (int)                               // This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
+															   // - RandomBonusStartLevel is only applied for weapons, and not displayed client-side.
+	RandomBonusValue: (int)                                    // A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past.
+	Rates: {                                                   // Per level configuration of the refine rates.
+		Lv1~10: {                                              // Lv1 ~ Lv10.
+			NormalChance: (int)                                // (optional, defaults to 100) Chance of successful refine using normal ores (100 = 100%).
+			EnrichedChance: (int)                              // (optional, defaults to 100 for weapons below refine level 10, otherwise 0.) Chance of successful refine using enriched ores (100 = 100%).
+			EventNormalChance: (int)                           // (optional, defaults to 100) Chance of successful refine using normal ores (100 = 100%) during a refine event.
+			EventEnrichedChance: (int)                         // (optional, defaults to 100 for weapons below refine level 10, otherwise 0.) Chance of successful refine using enriched ores (100 = 100%) during a refine event.
+			Bonus: (int)                                       // (optional, defaults to 0) Bonus (Armor) for this level of refine.
+		}
+		// Note: Refine levels that use default values need not be listed. (Example: Lv1: { NormalChance: 100 Bonus: 0 })
 	}
 }
 **************************************************************************/
@@ -53,22 +56,40 @@ Armors: {
 	RandomBonusValue: 0
 	Rates: {
 		Lv5: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv6: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 80
 		}
 		Lv7: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 80
 		}
 		Lv8: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 60
 		}
 		Lv9: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 50
 		}
 		Lv10: {
-			Chance: 10
+			NormalChance: 9
+			EnrichedChance: 20
+			EventNormalChance: 9
+			EventEnrichedChance: 35
 		}
 	}
 }
@@ -78,13 +99,22 @@ WeaponLevel1: {
 	RandomBonusValue: 300
 	Rates: {
 		Lv8: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv9: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 85
 		}
 		Lv10: {
-			Chance: 20
+			NormalChance: 19
+			EnrichedChance: 30
+			EventNormalChance: 19
+			EventEnrichedChance: 55
 		}
 	}
 }
@@ -94,16 +124,28 @@ WeaponLevel2: {
 	RandomBonusValue: 500
 	Rates: {
 		Lv7: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv8: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 85
 		}
 		Lv9: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 60
 		}
 		Lv10: {
-			Chance: 20
+			NormalChance: 19
+			EnrichedChance: 30
+			EventNormalChance: 19
+			EventEnrichedChance: 45
 		}
 	}
 }
@@ -113,19 +155,34 @@ WeaponLevel3: {
 	RandomBonusValue: 800
 	Rates: {
 		Lv6: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv7: {
-			Chance: 50
+			NormalChance: 50
+			EnrichedChance: 80
+			EventNormalChance: 50
+			EventEnrichedChance: 90
 		}
 		Lv8: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 70
 		}
 		Lv9: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 60
 		}
 		Lv10: {
-			Chance: 20
+			NormalChance: 19
+			EnrichedChance: 30
+			EventNormalChance: 19
+			EventEnrichedChance: 45
 		}
 	}
 }
@@ -135,22 +192,40 @@ WeaponLevel4: {
 	RandomBonusValue: 1300
 	Rates: {
 		Lv5: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv6: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 80
 		}
 		Lv7: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 80
 		}
 		Lv8: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 60
 		}
 		Lv9: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 50
 		}
 		Lv10: {
-			Chance: 10
+			NormalChance: 9
+			EnrichedChance: 20
+			EventNormalChance: 9
+			EventEnrichedChance: 35
 		}
 	}
 }
diff --git a/db/re/refine_db.conf b/db/re/refine_db.conf
index 927e2d6bf..4974e0033 100644
--- a/db/re/refine_db.conf
+++ b/db/re/refine_db.conf
@@ -30,22 +30,24 @@
 /**************************************************************************
  ************* Entry structure ********************************************
  **************************************************************************
-Armors/WeaponLevel1~4: { // Specifies weapon level or armor type
-			- For armors, values of 100 add 1 armor defense.
-			- For weapons, values of 100 add 1 ATK&MATK.
-	StatsPerLevel: value              (int) // This value is applied for ever level.
-	RandomBonusStartLevel: level      (int) // This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
-	RandomBonusValue: value           (int) // A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past.
-	                                        //   Random bonus start level. This is only applied for weapons, and not displayed client-side.
-	Rates: { // Per level configuration of the refine rates.
-		Lv1~10: { // Level of refine
-			Chance: value     (int, optional, defaults to 100) // Chance of successful refine (100 = 100%)
-			Bonus: value      (int, optional, defaults to 0)   // Bonus for this level of refine
-		}
-		// Note: Refine levels that use default values need not be listed. (Example: Lv1: Chance: 100 Bonus: 0)
+Armors/WeaponLevel1~4: {                                       // Specifies weapon level or armor type.
+															   // - For armors, values of 100 add 1 armor defense.
+															   // - For weapons, values of 100 add 1 ATK & MATK.
+	StatsPerLevel: (int)                                       // This value is applied for ever level.
+	RandomBonusStartLevel: (int)                               // This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
+															   // - RandomBonusStartLevel is only applied for weapons, and not displayed client-side.
+	RandomBonusValue: (int)                                    // A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past.
+	Rates: {                                                   // Per level configuration of the refine rates.
+		Lv1~20: {                                              // Lv1 ~ Lv20.
+			NormalChance: (int)                                // (optional, defaults to 100) Chance of successful refine using normal ores (100 = 100%).
+			EnrichedChance: (int)                              // (optional, defaults to 100 for weapons below refine level 20, otherwise 0.) Chance of successful refine using enriched ores (100 = 100%).
+			EventNormalChance: (int)                           // (optional, defaults to 100) Chance of successful refine using normal ores (100 = 100%) during a refine event.
+			EventEnrichedChance: (int)                         // (optional, defaults to 100 for weapons below refine level 10, otherwise 0.) Chance of successful refine using enriched ores (100 = 100%) during a refine event.
+			Bonus: (int)                                       // (optional, defaults to 0) Bonus (Armor) for this level of refine.
+		}
+		// Note: Refine levels that use default values need not be listed. (Example: Lv1: { NormalChance: 100 Bonus: 0 })
 	}
 }
-// A note about renewal Armors, there may or may not be another bonus, according to iRO wiki: Every upgrade gives floor[( 3 + current upgrade ) / 4]
 **************************************************************************/
 
 Armors: {
@@ -66,67 +68,105 @@ Armors: {
 			Bonus: 100
 		}
 		Lv5: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 			Bonus: 200
 		}
 		Lv6: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 80
 			Bonus: 200
 		}
 		Lv7: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 80
 			Bonus: 200
 		}
 		Lv8: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 60
 			Bonus: 200
 		}
 		Lv9: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 50
 			Bonus: 300
 		}
 		Lv10: {
-			Chance: 10
+			NormalChance: 9
+			EnrichedChance: 20
+			EventNormalChance: 9
+			EventEnrichedChance: 35
 			Bonus: 300
 		}
 		Lv11: {
-			Chance: 8
+			NormalChance: 8
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 			Bonus: 300
 		}
 		Lv12: {
-			Chance: 8
+			NormalChance: 8
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 			Bonus: 300
 		}
 		Lv13: {
-			Chance: 8
+			NormalChance: 8
+			EventNormalChance: 16
+			EventEnrichedChance: 16
 			Bonus: 400
 		}
 		Lv14: {
-			Chance: 8
+			NormalChance: 8
+			EventNormalChance: 16
+			EventEnrichedChance: 16
 			Bonus: 400
 		}
 		Lv15: {
-			Chance: 7
+			NormalChance: 7
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 400
 		}
 		Lv16: {
-			Chance: 7
+			NormalChance: 7
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 400
 		}
 		Lv17: {
-			Chance: 7
+			NormalChance: 7
+			EventNormalChance: 14
+			EventEnrichedChance: 14
 			Bonus: 500
 		}
 		Lv18: {
-			Chance: 7
+			NormalChance: 7
+			EventNormalChance: 14
+			EventEnrichedChance: 14
 			Bonus: 500
 		}
 		Lv19: {
-			Chance: 5
+			NormalChance: 5
+			EventNormalChance: 10
+			EventEnrichedChance: 10
 			Bonus: 500
 		}
 		Lv20: {
-			Chance: 5
+			NormalChance: 5
+			EventNormalChance: 10
+			EventEnrichedChance: 10
 			Bonus: 500
 		}
 	}
@@ -137,47 +177,76 @@ WeaponLevel1: {
 	RandomBonusValue: 300
 	Rates: {
 		Lv8: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv9: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 85
 		}
 		Lv10: {
-			Chance: 20
+			NormalChance: 19
+			EnrichedChance: 30
+			EventNormalChance: 19
+			EventEnrichedChance: 55
 		}
 		Lv11: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 40
+			EventEnrichedChance: 40
 		}
 		Lv12: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 40
+			EventEnrichedChance: 40
 		}
 		Lv13: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 35
+			EventEnrichedChance: 35
 		}
 		Lv14: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 35
+			EventEnrichedChance: 35
 		}
 		Lv15: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 30
+			EventEnrichedChance: 30
 		}
 		Lv16: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 30
+			EventEnrichedChance: 30
 			Bonus: 300
 		}
 		Lv17: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 			Bonus: 300
 		}
 		Lv18: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 			Bonus: 300
 		}
 		Lv19: {
-			Chance: 15
+			NormalChance: 15
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 300
 		}
 		Lv20: {
-			Chance: 15
+			NormalChance: 15
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 300
 		}
 	}
@@ -188,50 +257,82 @@ WeaponLevel2: {
 	RandomBonusValue: 500
 	Rates: {
 		Lv7: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv8: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 85
 		}
 		Lv9: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 60
 		}
 		Lv10: {
-			Chance: 20
+			NormalChance: 19
+			EnrichedChance: 30
+			EventNormalChance: 19
+			EventEnrichedChance: 45
 		}
 		Lv11: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 40
+			EventEnrichedChance: 40
 		}
 		Lv12: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 40
+			EventEnrichedChance: 40
 		}
 		Lv13: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 35
+			EventEnrichedChance: 35
 		}
 		Lv14: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 35
+			EventEnrichedChance: 35
 		}
 		Lv15: {
-			Chance:18
+			NormalChance:18
+			EventNormalChance: 30
+			EventEnrichedChance: 30
 		}
 		Lv16: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 30
+			EventEnrichedChance: 30
 			Bonus: 600
 		}
 		Lv17: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 			Bonus: 600
 		}
 		Lv18: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 			Bonus: 600
 		}
 		Lv19: {
-			Chance: 15
+			NormalChance: 15
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 600
 		}
 		Lv20: {
-			Chance: 15
+			NormalChance: 15
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 600
 		}
 	}
@@ -242,53 +343,88 @@ WeaponLevel3: {
 	RandomBonusValue: 800
 	Rates: {
 		Lv6: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv7: {
-			Chance: 50
+			NormalChance: 50
+			EnrichedChance: 80
+			EventNormalChance: 50
+			EventEnrichedChance: 90
 		}
 		Lv8: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 70
 		}
 		Lv9: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 60
 		}
 		Lv10: {
-			Chance: 20
+			NormalChance: 19
+			EnrichedChance: 30
+			EventNormalChance: 19
+			EventEnrichedChance: 45
 		}
 		Lv11: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 40
+			EventEnrichedChance: 40
 		}
 		Lv12: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 40
+			EventEnrichedChance: 40
 		}
 		Lv13: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 35
+			EventEnrichedChance: 35
 		}
 		Lv14: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 35
+			EventEnrichedChance: 35
 		}
 		Lv15: {
-			Chance: 18
+			NormalChance: 18
+			EventNormalChance: 30
+			EventEnrichedChance: 30
 		}
 		Lv16: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 30
+			EventEnrichedChance: 30
 			Bonus: 900
 		}
 		Lv17: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 			Bonus: 900
 		}
 		Lv18: {
-			Chance: 17
+			NormalChance: 17
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 			Bonus: 900
 		}
 		Lv19: {
-			Chance: 15
+			NormalChance: 15
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 900
 		}
 		Lv20: {
-			Chance: 15
+			NormalChance: 15
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 900
 		}
 	}
@@ -299,56 +435,94 @@ WeaponLevel4: {
 	RandomBonusValue: 1400
 	Rates: {
 		Lv5: {
-			Chance: 60
+			NormalChance: 60
+			EnrichedChance: 90
+			EventNormalChance: 60
+			EventEnrichedChance: 95
 		}
 		Lv6: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 80
 		}
 		Lv7: {
-			Chance: 40
+			NormalChance: 40
+			EnrichedChance: 70
+			EventNormalChance: 40
+			EventEnrichedChance: 80
 		}
 		Lv8: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 60
 		}
 		Lv9: {
-			Chance: 20
+			NormalChance: 20
+			EnrichedChance: 40
+			EventNormalChance: 20
+			EventEnrichedChance: 50
 		}
 		Lv10: {
-			Chance: 10
+			NormalChance: 9
+			EnrichedChance: 20
+			EventNormalChance: 9
+			EventEnrichedChance: 35
 		}
 		Lv11: {
-			Chance: 8
+			NormalChance: 8
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 		}
 		Lv12: {
-			Chance: 8
+			NormalChance: 8
+			EventNormalChance: 20
+			EventEnrichedChance: 20
 		}
 		Lv13: {
-			Chance: 8
+			NormalChance: 8
+			EventNormalChance: 16
+			EventEnrichedChance: 16
 		}
 		Lv14: {
-			Chance: 8
+			NormalChance: 8
+			EventNormalChance: 16
+			EventEnrichedChance: 16
 		}
 		Lv15: {
-			Chance: 7
+			NormalChance: 7
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 		}
 		Lv16: {
-			Chance: 7
+			NormalChance: 7
+			EventNormalChance: 15
+			EventEnrichedChance: 15
 			Bonus: 1200
 		}
 		Lv17: {
-			Chance: 7
+			NormalChance: 7
+			EventNormalChance: 14
+			EventEnrichedChance: 14
 			Bonus: 1200
 		}
 		Lv18: {
-			Chance: 7
+			NormalChance: 7
+			EventNormalChance: 14
+			EventEnrichedChance: 14
 			Bonus: 1200
 		}
 		Lv19: {
-			Chance: 5
+			NormalChance: 5
+			EventNormalChance: 10
+			EventEnrichedChance: 10
 			Bonus: 1200
 		}
 		Lv20: {
-			Chance: 5
+			NormalChance: 5
+			EventNormalChance: 10
+			EventEnrichedChance: 10
 			Bonus: 1200
 		}
 	}