github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-28 19:19:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge

Browse source
This commit is contained in:
Oleg Agafonov 2018-10-03 22:43:13 +04:00
parent 6bb478c342
commit 8fd6eb6313
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,18 +5,17 @@ import mage.constants.Rarity;
import mage.constants.SetType; import mage.constants.SetType;
/** /**
*
* @author TheElk801 * @author TheElk801
*/ */
public final class Battlebond extends ExpansionSet { public final class Battlebond extends ExpansionSet {
private static final Battlebond instance = new Battlebond(); private static final Battlebond instance = new Battlebond();
public static Battlebond getInstance() { public static Battlebond getInstance() {
return instance; return instance;
} }
private Battlebond() { private Battlebond() {
super("Battlebond", "BBD", ExpansionSet.buildDate(2018, 6, 8), SetType.SUPPLEMENTAL); super("Battlebond", "BBD", ExpansionSet.buildDate(2018, 6, 8), SetType.SUPPLEMENTAL);
this.blockName = "Battlebond"; this.blockName = "Battlebond";
@ -28,7 +27,7 @@ public final class Battlebond extends ExpansionSet {
this.numBoosterUncommon = 3; this.numBoosterUncommon = 3;
this.numBoosterRare = 1; this.numBoosterRare = 1;
this.ratioBoosterMythic = 8; this.ratioBoosterMythic = 8;
cards.add(new SetCardInfo("Aim High", 189, Rarity.UNCOMMON, mage.cards.a.AimHigh.class)); 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("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)); cards.add(new SetCardInfo("Angelic Chorus", 87, Rarity.RARE, mage.cards.a.AngelicChorus.class));
@ -286,5 +285,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'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)); cards.add(new SetCardInfo("Zndrsplt, Eye of Wisdom", 5, Rarity.RARE, mage.cards.z.ZndrspltEyeOfWisdom.class));
} }
} }

2
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -277,7 +277,7 @@ public class VerifyCardDataTest {
printMessages(list, true); printMessages(list, true);
} }
private String extractShortClass(Class<? extends TokenImpl> tokenClass) { private String extractShortClass(Class<? extends Object> tokenClass) {
String origin = tokenClass.getName(); String origin = tokenClass.getName();
if (origin.contains("$")) { if (origin.contains("$")) {
// inner classes, example: mage.cards.f.FigureOfDestiny$FigureOfDestinyToken3 // inner classes, example: mage.cards.f.FigureOfDestiny$FigureOfDestinyToken3