From 3b4964ba4a547062951e5f1924faefdfa92dcfdb Mon Sep 17 00:00:00 2001 From: Krazy Date: Tue, 22 Apr 2014 03:34:37 +0000 Subject: [PATCH] Updated the ante rarity code. Previously, it would add both Rare and MythicRare rarities to the pool of choices, but it considers both interchangeable. This led to a large increase of Rare and MythicRare cards being chosen. The game now adds only one. --- forge-game/src/main/java/forge/game/Game.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java index b183f41002f..bfaea491e08 100644 --- a/forge-game/src/main/java/forge/game/Game.java +++ b/forge-game/src/main/java/forge/game/Game.java @@ -632,6 +632,8 @@ public class Game { if (validRarities.contains(CardRarity.Special)) { onePlayerHasTimeShifted = false; } + + System.out.println(validRarities.size()); CardRarity anteRarity = validRarities.get(new Random().nextInt(validRarities.size())); @@ -697,8 +699,10 @@ public class Game { Set rarities = new HashSet<>(); for (Card card : cards) { if (card.getRarity() == CardRarity.Rare || card.getRarity() == CardRarity.MythicRare) { + //Since both rare and mythic rare are considered the same, adding both rarities + //massively increases the odds chances of the game picking rare cards to ante. + //This is a little unfair, so we add just one of the two. rarities.add(CardRarity.Rare); - rarities.add(CardRarity.MythicRare); } else { rarities.add(card.getRarity()); }