External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert card scanner changes

Browse source
This commit is contained in:
jmlundeen 2025-11-28 10:27:51 -06:00
parent 0fc8d0871c
commit 97738afb9e
3 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/main/java/mage/cards/RateCard.java
View file

@ -61,7 +61,7 @@ public final class RateCard {
public static void bootstrapCardsAndRatings() { public static void bootstrapCardsAndRatings() {
// preload cards and ratings // preload cards and ratings
log.info("Loading cards and rating..."); log.info("Loading cards and rating...");
List<Card> cards = CardScanner.getAllCards(false, true, true); List<Card> cards = CardScanner.getAllCards(false);
for (Card card : cards) { for (Card card : cards) {
RateCard.rateCard(card, null); RateCard.rateCard(card, null);
} }

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

@ -329,7 +329,7 @@ public class VerifyCardDataTest {
checkWrongAbilitiesTextStart(); checkWrongAbilitiesTextStart();
int cardIndex = 0; int cardIndex = 0;
List<Card> allCards = CardScanner.getAllCards(true, true, false); List<Card> allCards = CardScanner.getAllCards();
for (Card card : allCards) { for (Card card : allCards) {
cardIndex++; cardIndex++;
if (card instanceof CardWithHalves) { if (card instanceof CardWithHalves) {

20
Mage/src/main/java/mage/cards/repository/CardScanner.java
View file

@ -3,7 +3,10 @@ package mage.cards.repository;
import mage.cards.*; import mage.cards.*;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.util.*; import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
/** /**
* @author North * @author North
@ -80,28 +83,17 @@ public final class CardScanner {
} }
public static List<Card> getAllCards() { public static List<Card> getAllCards() {
return getAllCards(true, true, true); return getAllCards(true);
} }
public static List<Card> getAllCards(boolean ignoreCustomSets, boolean uniqueByName, boolean uniqueBySet) { public static List<Card> getAllCards(boolean ignoreCustomSets) {
Set<String> uniqueCardNames = new HashSet<>();
Collection<ExpansionSet> sets = Sets.getInstance().values(); Collection<ExpansionSet> sets = Sets.getInstance().values();
List<Card> cards = new ArrayList<>(); List<Card> cards = new ArrayList<>();
for (ExpansionSet set : sets) { for (ExpansionSet set : sets) {
if (ignoreCustomSets && set.getSetType().isCustomSet()) { if (ignoreCustomSets && set.getSetType().isCustomSet()) {
continue; continue;
} }
if (uniqueBySet) {
uniqueCardNames.clear();
}
for (ExpansionSet.SetCardInfo setInfo : set.getSetCardInfo()) { for (ExpansionSet.SetCardInfo setInfo : set.getSetCardInfo()) {
if (uniqueByName) {
String cardName = setInfo.getName();
if (uniqueCardNames.contains(cardName)) {
continue;
}
uniqueCardNames.add(cardName);
}
cards.add(CardImpl.createCard(setInfo.getCardClass(), new CardSetInfo(setInfo.getName(), set.getCode(), cards.add(CardImpl.createCard(setInfo.getCardClass(), new CardSetInfo(setInfo.getName(), set.getCode(),
setInfo.getCardNumber(), setInfo.getRarity(), setInfo.getGraphicInfo()))); setInfo.getCardNumber(), setInfo.getRarity(), setInfo.getGraphicInfo())));
} }