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

[AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards.

Browse source
This commit is contained in:
fireshoes 2017-03-28 22:25:29 -05:00
parent adc3b2ccac
commit 55b433ae36
6400 changed files with 19315 additions and 14351 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage.Common/src/mage/utils/CardUtil.java
View file

@ -49,14 +49,6 @@ public final class CardUtil {
return card.getCardTypes().contains(type);
}
public static boolean isBasicLand(Card card) {
return card.getSupertype().contains("Basic");
}
public static boolean isLand(Card card) {
return card.getCardType().contains(CardType.LAND);
}
public static int getColorIdentitySortValue(List<String> manaCost, ObjectColor originalColor, List<String> rules) {
ObjectColor color = new ObjectColor(originalColor);
for (String rule : rules) {

3
Mage.Common/src/mage/view/AbilityView.java
View file

@ -31,6 +31,7 @@ package mage.view;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.constants.CardType;
import mage.constants.SuperType;
import java.util.ArrayList;
import java.util.EnumSet;
@ -57,7 +58,7 @@ public class AbilityView extends CardView {
this.loyalty = "";
this.cardTypes = EnumSet.noneOf(CardType.class);
this.subTypes = new ArrayList<>();
this.superTypes = new ArrayList<>();
this.superTypes =EnumSet.noneOf(SuperType.class);
this.color = new ObjectColor();
this.manaCost = ability.getManaCosts().getSymbols();
}

22
Mage.Common/src/mage/view/CardView.java
View file

@ -27,8 +27,6 @@
*/
package mage.view;
import java.util.*;
import mage.MageObject;
import mage.ObjectColor;
import mage.abilities.Mode;
@ -37,11 +35,7 @@ import mage.abilities.costs.mana.ManaCosts;
import mage.cards.Card;
import mage.cards.FrameStyle;
import mage.cards.SplitCard;
import mage.constants.AbilityType;
import mage.constants.CardType;
import mage.constants.MageObjectType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.constants.*;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.designations.Designation;
@ -55,6 +49,8 @@ import mage.game.stack.StackAbility;
import mage.target.Target;
import mage.target.Targets;
import java.util.*;
/**
* @author BetaSteward_at_googlemail.com
*/
@ -72,7 +68,7 @@ public class CardView extends SimpleCardView {
protected String startingLoyalty;
protected EnumSet<CardType> cardTypes;
protected List<String> subTypes;
protected List<String> superTypes;
protected EnumSet<SuperType> superTypes;
protected ObjectColor color;
protected ObjectColor frameColor;
protected FrameStyle frameStyle;
@ -349,7 +345,7 @@ public class CardView extends SimpleCardView {
this.toughness = Integer.toString(card.getToughness().getValue());
this.cardTypes = card.getCardType();
this.subTypes = card.getSubtype(game);
this.superTypes = card.getSupertype();
this.superTypes = card.getSuperType();
this.color = card.getColor(game);
this.transformable = card.isTransformable();
this.flipCard = card.isFlipCard();
@ -436,7 +432,7 @@ public class CardView extends SimpleCardView {
}
this.cardTypes = object.getCardType();
this.subTypes = object.getSubtype(null);
this.superTypes = object.getSupertype();
this.superTypes = object.getSuperType();
this.color = object.getColor(null);
this.manaCost = object.getManaCost().getSymbols();
this.convertedManaCost = object.getManaCost().convertedManaCost();
@ -520,7 +516,7 @@ public class CardView extends SimpleCardView {
this.startingLoyalty = "";
this.cardTypes = EnumSet.noneOf(CardType.class);
this.subTypes = new ArrayList<>();
this.superTypes = new ArrayList<>();
this.superTypes = EnumSet.noneOf(SuperType.class);
this.color = new ObjectColor();
this.frameColor = new ObjectColor();
this.frameStyle = FrameStyle.M15_NORMAL;
@ -567,7 +563,7 @@ public class CardView extends SimpleCardView {
this.startingLoyalty = "";
this.cardTypes = token.getCardType();
this.subTypes = token.getSubtype(null);
this.superTypes = token.getSupertype();
this.superTypes = token.getSuperType();
this.color = token.getColor(null);
this.frameColor = token.getFrameColor(null);
this.frameStyle = token.getFrameStyle();
@ -647,7 +643,7 @@ public class CardView extends SimpleCardView {
return subTypes;
}
public List<String> getSuperTypes() {
public EnumSet<SuperType> getSuperTypes() {
return superTypes;
}

4
Mage.Common/src/mage/view/StackAbilityView.java
View file

@ -65,12 +65,12 @@ public class StackAbilityView extends CardView {
this.cardTypes = ability.getCardType();
this.subTypes = ability.getSubtype(game);
this.superTypes = ability.getSupertype();
this.superTypes = ability.getSuperType();
this.color = ability.getColor(game);
this.manaCost = ability.getManaCost().getSymbols();
this.cardTypes = ability.getCardType();
this.subTypes = ability.getSubtype(game);
this.superTypes = ability.getSupertype();
this.superTypes = ability.getSuperType();
this.color = ability.getColor(game);
this.manaCost = ability.getManaCost().getSymbols();
this.power = ability.getPower().toString();