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

Removed duplicate hellion token class

Browse source
This commit is contained in:
PurpleCrowbar 2022-06-07 01:49:10 +01:00
parent 4dde9592c8
commit 16bb0ebfc1
4 changed files with 14 additions and 35 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

@ -766,7 +766,7 @@
|Generate|TOK:M13|Drake|||DrakeToken|
|Generate|TOK:M13|Goat|||GoatToken|
|Generate|TOK:M13|Goblin|||GoblinToken|
|Generate|TOK:M13|Hellion|||HellionHasteToken|
|Generate|TOK:M13|Hellion|||HellionToken|
|Generate|TOK:M13|Saproling|||SaprolingToken|
|Generate|TOK:M13|Soldier|||SoldierToken|
|Generate|TOK:M13|Wurm|||WurmToken|

4
Mage.Sets/src/mage/cards/h/HellionCrucible.java
View file

@ -16,7 +16,7 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.permanent.token.HellionHasteToken;
import mage.game.permanent.token.HellionToken;
/**
*
@ -36,7 +36,7 @@ public final class HellionCrucible extends CardImpl {
this.addAbility(ability);
// {1}{R}, {tap}, Remove two pressure counters from Hellion Crucible and sacrifice it: Create a 4/4 red Hellion creature token with haste.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionHasteToken(), 1), new ManaCostsImpl<>("{1}{R}"));
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionToken(true), 1), new ManaCostsImpl<>("{1}{R}"));
ability.addCost(new TapSourceCost());
ability.addCost(new RemoveCountersSourceCost(CounterType.PRESSURE.createInstance(2)));
ability.addCost(new SacrificeSourceCost());

31
Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java
View file

@ -1,31 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.abilities.keyword.HasteAbility;
import mage.constants.CardType;
import mage.constants.SubType;
/**
*
* @author spjspj
*/
public final class HellionHasteToken extends TokenImpl {
public HellionHasteToken() {
super("Hellion Token", "4/4 red Hellion creature token with haste");
cardType.add(CardType.CREATURE);
color.setRed(true);
subtype.add(SubType.HELLION);
power = new MageInt(4);
toughness = new MageInt(4);
addAbility(HasteAbility.getInstance());
}
public HellionHasteToken(final HellionHasteToken token) {
super(token);
}
public HellionHasteToken copy() {
return new HellionHasteToken(this);
}
}

12
Mage/src/main/java/mage/game/permanent/token/HellionToken.java
View file

@ -2,6 +2,7 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.abilities.keyword.HasteAbility;
import mage.constants.CardType;
import mage.constants.SubType;
@ -13,6 +14,15 @@ import java.util.Arrays;
*/
public final class HellionToken extends TokenImpl {
public HellionToken(boolean withHaste) {
this();
if (withHaste) {
addAbility(HasteAbility.getInstance());
this.description = "4/4 red Hellion creature token with haste";
}
}
public HellionToken() {
super("Hellion Token", "4/4 red Hellion creature token");
cardType.add(CardType.CREATURE);
@ -21,7 +31,7 @@ public final class HellionToken extends TokenImpl {
power = new MageInt(4);
toughness = new MageInt(4);
availableImageSetCodes = Arrays.asList("ROE", "DDP", "PCA");
availableImageSetCodes = Arrays.asList("ROE", "DDP", "M13", "PCA");
}
public HellionToken(final HellionToken token) {