github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-07 20:53:18 -10:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5053 from Sedictious/Battlebond_Boos

Browse source 
Fix Battlebond Partner distribution
This commit is contained in:
LevelX2 2018-08-15 08:09:03 +02:00 • committed by GitHub
commit fa13786fab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 128 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/sets/Battlebond.java
View file

@ -9,23 +9,26 @@ import mage.constants.SetType;
* @author TheElk801
*/
public final class Battlebond extends ExpansionSet {
private static final Battlebond instance = new Battlebond();
public static Battlebond getInstance() {
return instance;
}
private Battlebond() {
super("Battlebond", "BBD", ExpansionSet.buildDate(2018, 6, 8), SetType.SUPPLEMENTAL);
this.blockName = "Battlebond";
this.hasBasicLands = false;
this.hasBoosters = true;
this.hasPartnerMechanic = true;
this.numBoosterLands = 0;
this.numBoosterCommon = 11;
this.numBoosterUncommon = 3;
this.numBoosterRare = 1;
this.ratioBoosterMythic = 8;
cards.add(new SetCardInfo("Aim High", 189, Rarity.UNCOMMON, mage.cards.a.AimHigh.class));
cards.add(new SetCardInfo("Angel of Retribution", 86, Rarity.UNCOMMON, mage.cards.a.AngelOfRetribution.class));
cards.add(new SetCardInfo("Angelic Chorus", 87, Rarity.RARE, mage.cards.a.AngelicChorus.class));
@ -283,4 +286,5 @@ public final class Battlebond extends ExpansionSet {
cards.add(new SetCardInfo("Zndrsplt's Judgment", 43, Rarity.RARE, mage.cards.z.ZndrspltsJudgment.class));
cards.add(new SetCardInfo("Zndrsplt, Eye of Wisdom", 5, Rarity.RARE, mage.cards.z.ZndrspltEyeOfWisdom.class));
}
}

28
Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java
View file

@ -4,11 +4,14 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import mage.abilities.Ability;
import mage.abilities.keyword.PartnerWithAbility;
import mage.cards.Card;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardScanner;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.sets.*;
import static org.junit.Assert.assertFalse;
@ -29,11 +32,33 @@ public class BoosterGenerationTest extends MageTestBase {
public void setUp() {
CardScanner.scan();
}
private static final List<String> basics = Arrays.asList("Plains", "Island", "Swamp", "Mountain", "Forest");
@Test
public void testBattlebond(){
List<Card> booster = Battlebond.getInstance().createBooster();
boolean foundPartner = false;
String Partner = "";
for (Card card : booster){
for (Ability ability : card.getAbilities()){
if (ability instanceof PartnerWithAbility) {
if (foundPartner){
Assert.assertEquals(Partner, card.getName());
}
else{
foundPartner = true;
Partner = ((PartnerWithAbility) ability).getPartnerName();
}
}
}
}
}
@Test
public void testFateReforged() {
List<String> tapland = Arrays.asList(
"Bloodfell Caves", "Blossoming Sands", "Dismal Backwater", "Jungle Hollow", "Rugged Highlands",
"Scoured Barrens", "Swiftwater Cliffs", "Thornwood Falls", "Tranquil Cove", "Wind-Scarred Crag");
@ -45,7 +70,6 @@ public class BoosterGenerationTest extends MageTestBase {
|| contains(booster, basics, null));
// assertFalse(str(booster), contains(booster, basics, null));
}
@Test
public void testMastersEditionII() {
List<String> snowCoveredLand = Arrays.asList(

96
Mage/src/main/java/mage/cards/ExpansionSet.java
View file

@ -5,6 +5,7 @@ import mage.ObjectColor;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.abilities.Ability;
import mage.constants.Rarity;
import mage.constants.SetType;
import mage.util.CardUtil;
@ -13,6 +14,7 @@ import mage.util.RandomUtil;
import java.io.Serializable;
import java.util.*;
import java.util.stream.Collectors;
import mage.abilities.keyword.PartnerWithAbility;
/**
* @author BetaSteward_at_googlemail.com
@ -21,7 +23,8 @@ public abstract class ExpansionSet implements Serializable {
public final static CardGraphicInfo NON_FULL_USE_VARIOUS = new CardGraphicInfo(null, true);
public final static CardGraphicInfo FULL_ART_BFZ_VARIOUS = new CardGraphicInfo(FrameStyle.BFZ_FULL_ART_BASIC, true);
public class SetCardInfo implements Serializable {
private final String name;
@ -97,6 +100,7 @@ public abstract class ExpansionSet implements Serializable {
protected int numBoosterRare;
protected int numBoosterDoubleFaced; // -1 = include normally 0 = exclude 1-n = include explicit
protected int ratioBoosterMythic;
protected boolean hasPartnerMechanic = false;
protected boolean needsLegendCreature = false;
protected boolean validateBoosterColors = true;
@ -177,7 +181,36 @@ public abstract class ExpansionSet implements Serializable {
return theBooster;
}
protected int PartnerCheck(List<Card> booster, boolean partnerAllowed, int max, int i){
for (Ability ability:booster.get(booster.size() - 1).getAbilities()){
//Check if fetched card has the PartnerWithAbility
if (ability instanceof PartnerWithAbility) {
//Check if the pack already contains a partner pair
if (partnerAllowed){
//Added card always replaces an uncommon card
Card card = CardRepository.instance.findCard(((PartnerWithAbility) ability).getPartnerName()).getCard();
if (i<max){
booster.add(card);
}
else{
booster.set(0, card);
}
//2 return value indicates found partner
return 2;
}
else{
//If partner already exists, remove card and loop again
booster.remove(booster.size() - 1);
return 0;
}
}
}
return 1;
}
protected void addToBooster(List<Card> booster, List<CardInfo> cards) {
if (!cards.isEmpty()) {
CardInfo cardInfo = cards.remove(RandomUtil.nextInt(cards.size()));
@ -191,13 +224,21 @@ public abstract class ExpansionSet implements Serializable {
}
public List<Card> createBooster() {
for (int i = 0; i < 100; i++) {//don't want to somehow loop forever
List<Card> booster = tryBooster();
if (boosterIsValid(booster)) {
return booster;
}
}
//Battlebond packs alway contain both partners
if (hasPartnerMechanic){
List<Card> booster = createPartnerBooster();
return booster;
}
return tryBooster();
}
protected boolean boosterIsValid(List<Card> booster) {
@ -269,7 +310,60 @@ public abstract class ExpansionSet implements Serializable {
return true;
}
public List<Card> createPartnerBooster(){
List<Card> booster = new ArrayList<>();
boolean partnerAllowed = true;
List<CardInfo> uncommons = getCardsByRarity(Rarity.UNCOMMON);
for (int i = 0; i < numBoosterUncommon; i++) {
while (true){
addToBooster(booster, uncommons);
int check = PartnerCheck(booster, partnerAllowed, numBoosterUncommon - 1, i);
if (check == 1){break;}
if (check == 2){
partnerAllowed = false;
//Be sure to account for the added card
if (i != numBoosterUncommon - 1){i+=1;}
break;}
}
}
int numSpecialCommons = getNumberOfSpecialCommons();
int numCommonsToGenerate = numBoosterCommon - numSpecialCommons;
List<CardInfo> commons = getCardsByRarity(Rarity.COMMON);
for (int i = 0; i < numCommonsToGenerate; i++) {
addToBooster(booster, commons);
}
List<CardInfo> rares = getCardsByRarity(Rarity.RARE);
List<CardInfo> mythics = getCardsByRarity(Rarity.MYTHIC);
for (int i = 0; i < numBoosterRare; i++) {
if (ratioBoosterMythic > 0 && RandomUtil.nextInt(ratioBoosterMythic) == 0) {
while (true){
addToBooster(booster, mythics);
int check = PartnerCheck(booster, partnerAllowed, -1, 1);
if (check == 1){break;}
if (check == 2){partnerAllowed = false; break;}
}
}
else {
while (true){
addToBooster(booster, rares);
int check = PartnerCheck(booster, partnerAllowed, -1, 1);
if (check == 1){break;}
if (check == 2){partnerAllowed = false; break;}
}
}
}
return booster;
}
public List<Card> tryBooster() {
List<Card> booster = new ArrayList<>();
if (!hasBoosters) {