From 686807b0d2e73e9d1d190374617d798a6630f27f Mon Sep 17 00:00:00 2001 From: Agetian Date: Sat, 8 Feb 2014 20:03:01 +0000 Subject: [PATCH] - A closer approximation of foil chance in booster (16.67% for 1:6 ratio instead of just 16%). --- forge-core/src/main/java/forge/card/BoosterGenerator.java | 2 +- forge-core/src/main/java/forge/card/CardEdition.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-core/src/main/java/forge/card/BoosterGenerator.java b/forge-core/src/main/java/forge/card/BoosterGenerator.java index bda9a164316..db37eaa0212 100644 --- a/forge-core/src/main/java/forge/card/BoosterGenerator.java +++ b/forge-core/src/main/java/forge/card/BoosterGenerator.java @@ -70,7 +70,7 @@ public class BoosterGenerator { List sheetsUsed = new ArrayList(); CardEdition edition = StaticData.instance().getEditions().get(template.getEdition()); - boolean hasFoil = edition != null && MyRandom.getRandom().nextInt(100) <= edition.getFoilChanceInBooster() && edition.getFoilType() != FoilType.NOT_SUPPORTED; + boolean hasFoil = edition != null && MyRandom.getRandom().nextInt(10000) <= edition.getFoilChanceInBooster() && edition.getFoilType() != FoilType.NOT_SUPPORTED; // FoilChanceInBooster is given with 1/10000th precision for a closer 1:6 (16.67%) approximation. String foilSlot = !hasFoil ? null : edition.getFoilAlwaysInCommonSlot() ? BoosterSlots.COMMON : Aggregates.random(template.getSlots()).getKey(); for(Pair slot : template.getSlots()) { diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java index a418cc1aa7a..48688b0e61e 100644 --- a/forge-core/src/main/java/forge/card/CardEdition.java +++ b/forge-core/src/main/java/forge/card/CardEdition.java @@ -297,7 +297,7 @@ public final class CardEdition implements Comparable { // immutable res.foilType = FoilType.NOT_SUPPORTED; break; } - res.foilChanceInBooster = section.getInt("FoilChanceInBooster", 16); + res.foilChanceInBooster = section.getInt("FoilChanceInBooster", 1667); res.foilAlwaysInCommonSlot = section.getBoolean("FoilAlwaysInCommonSlot", false); return res;