Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Remove no longer needed CardCriteria workaround

Browse source
This commit is contained in:
Alex W. Jackson 2021-12-24 03:05:28 -05:00
parent b2b90c17fd
commit 881fdcaa08
11 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/sets/AetherRevolt.java
View file

@ -237,8 +237,7 @@ public final class AetherRevolt extends ExpansionSet {
protected List<CardInfo> findCardsByRarity(Rarity rarity) {
List<CardInfo> cardInfos = super.findCardsByRarity(rarity);
if (rarity == Rarity.SPECIAL) {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MPS")));
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() < 31);
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MPS").minCardNumber(31)));
}
return cardInfos;
}

3
Mage.Sets/src/mage/sets/Amonkhet.java
View file

@ -327,8 +327,7 @@ public final class Amonkhet extends ExpansionSet {
protected List<CardInfo> findCardsByRarity(Rarity rarity) {
List<CardInfo> cardInfos = super.findCardsByRarity(rarity);
if (rarity == Rarity.SPECIAL) {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MP2")));
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > 30);
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MP2").maxCardNumber(30)));
}
return cardInfos;
}

3
Mage.Sets/src/mage/sets/BattleForZendikar.java
View file

@ -340,8 +340,7 @@ public final class BattleForZendikar extends ExpansionSet {
// only the full-art basic lands are found in boosters
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumber().contains("a"));
} else if (rarity == Rarity.SPECIAL) {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("EXP")));
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > 25);
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("EXP").maxCardNumber(25)));
}
return cardInfos;
}

7
Mage.Sets/src/mage/sets/Dominaria.java
View file

@ -335,10 +335,9 @@ public final class Dominaria extends ExpansionSet {
.setCodes(this.code)
.rarities(rarity)
.supertypes(SuperType.LEGENDARY)
.types(CardType.CREATURE)));
cardInfos.removeIf(cardInfo -> (
cardInfo.getCardNumberAsInt() > maxCardNumberInBooster
|| nonSpecialLegends.contains(cardInfo.getName())));
.types(CardType.CREATURE)
.maxCardNumber(maxCardNumberInBooster)));
cardInfos.removeIf(cardInfo -> nonSpecialLegends.contains(cardInfo.getName()));
return cardInfos;
}

3
Mage.Sets/src/mage/sets/HourOfDevastation.java
View file

@ -249,8 +249,7 @@ public final class HourOfDevastation extends ExpansionSet {
protected List<CardInfo> findCardsByRarity(Rarity rarity) {
List<CardInfo> cardInfos = super.findCardsByRarity(rarity);
if (rarity == Rarity.SPECIAL) {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MP2")));
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() < 31);
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MP2").minCardNumber(31)));
}
return cardInfos;
}

3
Mage.Sets/src/mage/sets/Kaladesh.java
View file

@ -317,8 +317,7 @@ public final class Kaladesh extends ExpansionSet {
protected List<CardInfo> findCardsByRarity(Rarity rarity) {
List<CardInfo> cardInfos = super.findCardsByRarity(rarity);
if (rarity == Rarity.SPECIAL) {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MPS")));
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > 30);
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("MPS").maxCardNumber(30)));
}
return cardInfos;
}

12
Mage.Sets/src/mage/sets/ModernHorizons2.java
View file

@ -552,13 +552,11 @@ public final class ModernHorizons2 extends ExpansionSet {
@Override
protected List<CardInfo> findSpecialCardsByRarity(Rarity rarity) {
List<CardInfo> cardInfos = CardRepository
.instance
.findCards(new CardCriteria().setCodes(this.code).rarities(rarity));
cardInfos.removeIf(cardInfo -> (
cardInfo.getCardNumberAsInt() < 262
|| cardInfo.getCardNumberAsInt() > maxCardNumberInBooster));
return cardInfos;
return CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(rarity)
.minCardNumber(262)
.maxCardNumber(maxCardNumberInBooster));
}
@Override

3
Mage.Sets/src/mage/sets/OathOfTheGatewatch.java
View file

@ -229,8 +229,7 @@ public final class OathOfTheGatewatch extends ExpansionSet {
// only the full-art versions of Wastes are found in boosters
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumber().contains("a"));
} else if (rarity == Rarity.SPECIAL) {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("EXP")));
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() < 26);
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria().setCodes("EXP").minCardNumber(26)));
}
return cardInfos;
}

4
Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java
View file

@ -458,8 +458,8 @@ public final class StrixhavenSchoolOfMages extends ExpansionSet {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(rarity)
.subtypes(SubType.LESSON)));
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > maxCardNumberInBooster);
.subtypes(SubType.LESSON)
.maxCardNumber(maxCardNumberInBooster)));
}
return cardInfos;
}

4
Mage.Sets/src/mage/sets/WarOfTheSpark.java
View file

@ -355,8 +355,8 @@ public final class WarOfTheSpark extends ExpansionSet {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(rarity)
.types(CardType.PLANESWALKER)));
cardInfos.removeIf(cardInfo -> cardInfo.getCardNumberAsInt() > maxCardNumberInBooster);
.types(CardType.PLANESWALKER)
.maxCardNumber(maxCardNumberInBooster)));
return cardInfos;
}

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

@ -519,11 +519,11 @@ public abstract class ExpansionSet implements Serializable {
List<CardInfo> cardInfos = CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(rarity));
.rarities(rarity)
.maxCardNumber(maxCardNumberInBooster));
cardInfos.removeIf(next -> (
next.getCardNumberAsInt() > maxCardNumberInBooster
|| next.getCardNumber().contains("*")
next.getCardNumber().contains("*")
|| next.getCardNumber().contains("+")));
// special slot cards must not also appear in regular slots of their rarity
@ -557,7 +557,8 @@ public abstract class ExpansionSet implements Serializable {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(Rarity.COMMON)
.types(CardType.LAND)));
.types(CardType.LAND)
.maxCardNumber(maxCardNumberInBooster)));
}
// if set has special slot(s) for DFCs, they are special cards
@ -565,12 +566,12 @@ public abstract class ExpansionSet implements Serializable {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(rarity)
.doubleFaced(true)));
.doubleFaced(true)
.maxCardNumber(maxCardNumberInBooster)));
}
cardInfos.removeIf(next -> (
next.getCardNumberAsInt() > maxCardNumberInBooster
|| next.getCardNumber().contains("*")
next.getCardNumber().contains("*")
|| next.getCardNumber().contains("+")));
return cardInfos;