github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/magefree/mage

Browse source
This commit is contained in:
magenoxx 2014-08-06 10:27:54 +04:00
commit bb8aae0124
6 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java
View file

@ -118,7 +118,7 @@ class ChasmSkulkerSquidToken extends Token {
public ChasmSkulkerSquidToken() { public ChasmSkulkerSquidToken() {
super("Squid", "1/1 blue Squid creature token with islandwalk"); super("Squid", "1/1 blue Squid creature token with islandwalk");
this.setOriginalExpansionSetCode("MMA"); this.setOriginalExpansionSetCode("M15");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
color.setBlue(true); color.setBlue(true);
subtype.add("Squid"); subtype.add("Squid");

2
Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java
View file

@ -74,7 +74,7 @@ class CoralBarrierSquidToken extends Token {
public CoralBarrierSquidToken() { public CoralBarrierSquidToken() {
super("Squid", "1/1 blue Squid creature token with islandwalk"); super("Squid", "1/1 blue Squid creature token with islandwalk");
this.setOriginalExpansionSetCode("MMA"); this.setOriginalExpansionSetCode("M15");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
color.setBlue(true); color.setBlue(true);
subtype.add("Squid"); subtype.add("Squid");

2
Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java
View file

@ -50,7 +50,7 @@ public class FeralIncarnation extends CardImpl {
// Convoke // Convoke
this.addAbility(new ConvokeAbility()); this.addAbility(new ConvokeAbility());
// Put three 3/3 green Beast creature tokens onto the battlefield. // Put three 3/3 green Beast creature tokens onto the battlefield.
this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken("M15"), 3)); this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken("M15", 1), 3));
} }
public FeralIncarnation(final FeralIncarnation card) { public FeralIncarnation(final FeralIncarnation card) {

1
Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java
View file

@ -149,6 +149,7 @@ class GarrukApexPredatorBeastToken extends Token {
public GarrukApexPredatorBeastToken() { public GarrukApexPredatorBeastToken() {
super("Beast", "3/3 black Beast creature token with deathtouch"); super("Beast", "3/3 black Beast creature token with deathtouch");
setOriginalExpansionSetCode("M15"); setOriginalExpansionSetCode("M15");
setTokenType(2);
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
color.setBlack(true); color.setBlack(true);
subtype.add("Beast"); subtype.add("Beast");

1
Mage.Sets/src/mage/sets/magic2015/SliverHive.java
View file

@ -130,6 +130,7 @@ class SliverToken extends Token {
SliverToken() { SliverToken() {
super("Sliver", "1/1 colorless Sliver creature token"); super("Sliver", "1/1 colorless Sliver creature token");
setOriginalExpansionSetCode("M15");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
subtype.add("Sliver"); subtype.add("Sliver");
power = new MageInt(1); power = new MageInt(1);

8
Mage/src/mage/game/permanent/token/BeastToken.java
View file

@ -41,10 +41,16 @@ public class BeastToken extends Token {
public BeastToken() { public BeastToken() {
this("LRW"); this("LRW");
} }
public BeastToken(String setCode) { public BeastToken(String setCode) {
this(setCode, Integer.MIN_VALUE);
}
public BeastToken(String setCode, int tokenType) {
super("Beast", "3/3 green Beast creature token"); super("Beast", "3/3 green Beast creature token");
setOriginalExpansionSetCode(setCode); setOriginalExpansionSetCode(setCode);
if (tokenType != Integer.MIN_VALUE) {
setTokenType(tokenType);
}
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
color = ObjectColor.GREEN; color = ObjectColor.GREEN;
subtype.add("Beast"); subtype.add("Beast");