External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tests: added verify checks for wrong set's settings like parent set and block name (temporary disabled)

Browse source
This commit is contained in:
Oleg Agafonov 2023-04-07 03:41:10 +04:00
parent 59d2b59a4f
commit 8f748b0f2c
4 changed files with 53 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,13 +104,13 @@ public abstract class ExpansionSet implements Serializable {
protected String name;
protected String code;
protected Date releaseDate;
protected ExpansionSet parentSet;
protected ExpansionSet parentSet; // used to search additional lands and reprints for booster
protected SetType setType;
// TODO: 03.10.2018, hasBasicLands can be removed someday -- it's uses to optimize lands search in deck generation and lands adding (search all available lands from sets)
protected boolean hasBasicLands = true;
protected String blockName;
protected String blockName; // used to group sets in some GUI dialogs like choose set dialog
protected boolean hasBoosters = false;
protected int numBoosterSpecial;
@ -539,6 +539,7 @@ public abstract class ExpansionSet implements Serializable {
List<String> needSets = new ArrayList<>();
needSets.add(this.code);
if (this.parentSet != null) {
// TODO: is it ok to put all parent's cards to booster instead lands only?
needSets.add(this.parentSet.code);
}
List<CardInfo> cardInfos = CardRepository.instance.findCards(new CardCriteria()

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

@ -6,6 +6,7 @@ import org.apache.log4j.Logger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
/**
* @author North
@ -38,7 +39,7 @@ public final class CardScanner {
setsToAdd.add(new ExpansionInfo(set));
} else if (!expansionInfo.name.equals(set.getName())
|| !expansionInfo.code.equals(set.getCode())
|| (expansionInfo.blockName == null ? set.getBlockName() != null : !expansionInfo.blockName.equals(set.getBlockName()))
|| !(Objects.equals(expansionInfo.blockName, set.getBlockName()))
|| !expansionInfo.releaseDate.equals(set.getReleaseDate())
|| expansionInfo.type != set.getSetType()
|| expansionInfo.boosters != set.hasBoosters()