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

Removed duplicate minotaur token class. Closes #8947

Browse source
This commit is contained in:
PurpleCrowbar 2022-06-07 01:58:39 +01:00
parent 16bb0ebfc1
commit e418ab04be
4 changed files with 17 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/resources/card-pictures-tok.txt
View file

@ -693,7 +693,7 @@
|Generate|TOK:ISD|Zombie|2||ZombieToken| |Generate|TOK:ISD|Zombie|2||ZombieToken|
|Generate|TOK:ISD|Zombie|3||ZombieToken| |Generate|TOK:ISD|Zombie|3||ZombieToken|
|Generate|TOK:JOU|Hydra|||HydraBroodmasterToken| |Generate|TOK:JOU|Hydra|||HydraBroodmasterToken|
|Generate|TOK:JOU|Minotaur|||FlurryOfHornsMinotaurToken| |Generate|TOK:JOU|Minotaur|||MinotaurToken|
|Generate|TOK:JOU|Snake|||PharikaSnakeToken| |Generate|TOK:JOU|Snake|||PharikaSnakeToken|
|Generate|TOK:JOU|Sphinx|||HourOfNeedSphinxToken| |Generate|TOK:JOU|Sphinx|||HourOfNeedSphinxToken|
|Generate|TOK:JOU|Spider|||RenownedWeaverSpiderToken| |Generate|TOK:JOU|Spider|||RenownedWeaverSpiderToken|

4
Mage.Sets/src/mage/cards/f/FlurryOfHorns.java
View file

@ -6,7 +6,7 @@ import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.game.permanent.token.FlurryOfHornsMinotaurToken; import mage.game.permanent.token.MinotaurToken;
/** /**
* *
@ -18,7 +18,7 @@ public final class FlurryOfHorns extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}");
// Create two 2/3 red Minotaur creature tokens with haste. // Create two 2/3 red Minotaur creature tokens with haste.
this.getSpellAbility().addEffect(new CreateTokenEffect(new FlurryOfHornsMinotaurToken(), 2)); this.getSpellAbility().addEffect(new CreateTokenEffect(new MinotaurToken(true), 2));
} }
private FlurryOfHorns(final FlurryOfHorns card) { private FlurryOfHorns(final FlurryOfHorns card) {

34
Mage/src/main/java/mage/game/permanent/token/FlurryOfHornsMinotaurToken.java
View file

@ -1,34 +0,0 @@
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.keyword.HasteAbility;
/**
*
* @author spjspj
*/
public final class FlurryOfHornsMinotaurToken extends TokenImpl {
public FlurryOfHornsMinotaurToken() {
super("Minotaur Token", "2/3 red Minotaur creature tokens with haste");
this.setOriginalExpansionSetCode("JOU");
cardType.add(CardType.CREATURE);
color.setColor(ObjectColor.RED);
subtype.add(SubType.MINOTAUR);
power = new MageInt(2);
toughness = new MageInt(3);
addAbility(HasteAbility.getInstance());
}
public FlurryOfHornsMinotaurToken(final FlurryOfHornsMinotaurToken token) {
super(token);
}
public FlurryOfHornsMinotaurToken copy() {
return new FlurryOfHornsMinotaurToken(this);
}
}

14
Mage/src/main/java/mage/game/permanent/token/MinotaurToken.java
View file

@ -2,14 +2,26 @@ package mage.game.permanent.token;
import mage.MageInt; import mage.MageInt;
import mage.ObjectColor; import mage.ObjectColor;
import mage.abilities.keyword.HasteAbility;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import java.util.Arrays;
/** /**
* @author TheElk801 * @author TheElk801
*/ */
public final class MinotaurToken extends TokenImpl { public final class MinotaurToken extends TokenImpl {
public MinotaurToken(boolean withHaste) {
this();
if (withHaste) {
addAbility(HasteAbility.getInstance());
this.description = "2/3 red Minotaur creature tokens with haste";
}
}
public MinotaurToken() { public MinotaurToken() {
super("Minotaur Token", "2/3 red Minotaur creature token"); super("Minotaur Token", "2/3 red Minotaur creature token");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
@ -17,6 +29,8 @@ public final class MinotaurToken extends TokenImpl {
subtype.add(SubType.MINOTAUR); subtype.add(SubType.MINOTAUR);
power = new MageInt(2); power = new MageInt(2);
toughness = new MageInt(3); toughness = new MageInt(3);
availableImageSetCodes = Arrays.asList("JOU");
} }
private MinotaurToken(final MinotaurToken token) { private MinotaurToken(final MinotaurToken token) {