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

Merged up to current

Browse source
This commit is contained in:
Mark Langen 2016-09-01 15:44:14 -06:00
commit 463576dbd0
220 changed files with 68405 additions and 29458 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/cards/Card.java
View file

@ -65,6 +65,8 @@ public interface Card extends MageObject {
String getExpansionSetCode();
String getTokenSetCode();
String getTokenDescriptor();
void checkForCountersToAdd(Permanent permanent, Game game);

6
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -74,6 +74,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
protected String cardNumber;
public String expansionSetCode;
protected String tokenSetCode;
protected String tokenDescriptor;
protected Rarity rarity;
protected boolean canTransform;
protected Card secondSideCard;
@ -316,6 +317,11 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
public String getTokenSetCode() {
return tokenSetCode;
}
@Override
public String getTokenDescriptor() {
return tokenDescriptor;
}
@Override
public List<Mana> getMana() {