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

Removed duplicate trample haste elemental token class

Browse source
This commit is contained in:
PurpleCrowbar 2022-06-08 22:55:44 +01:00
parent 0429b6083c
commit 4a2167627e
6 changed files with 15 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -277,7 +277,7 @@
|Generate|TOK:BFZ|Eldrazi Scion|3||EldraziScionToken|
|Generate|TOK:BFZ|Eldrazi|||EldraziToken|
|Generate|TOK:BFZ|Elemental|1||OmnathElementalToken|
|Generate|TOK:BFZ|Elemental|2||AkoumStonewakerElementalToken|
|Generate|TOK:BFZ|Elemental|2||Elemental31TrampleHasteToken|
|Generate|TOK:BFZ|Knight Ally|||KnightAllyToken|
|Generate|TOK:BFZ|Kor Ally|||KorAllyToken|
|Generate|TOK:BFZ|Octopus|||OctopusToken|
@ -556,7 +556,7 @@
|Generate|TOK:DOM|Cleric|||BelzenlokClericToken|
|Generate|TOK:DOM|Construct|||KarnConstructToken|
|Generate|TOK:DOM|Demon|||BelzenlokDemonToken|
|Generate|TOK:DOM|Elemental|||ValdukElementalToken|
|Generate|TOK:DOM|Elemental|||Elemental31TrampleHasteToken|
|Generate|TOK:DOM|Goblin|||GoblinToken|
|Generate|TOK:DOM|Karox Bladewing|||KaroxBladewingDragonToken|
|Generate|TOK:DOM|Knight|1||KnightToken|
@ -1180,7 +1180,7 @@
|Generate|TOK:MH1|Bird|||BirdToken|
|Generate|TOK:MH1|Construct|||KarnConstructToken|
|Generate|TOK:MH1|Elemental|1||RedElementalToken|
|Generate|TOK:MH1|Elemental|2||AkoumStonewakerElementalToken|
|Generate|TOK:MH1|Elemental|2||Elemental31TrampleHasteToken|
|Generate|TOK:MH1|Elephant|||ElephantToken|
|Generate|TOK:MH1|Goblin|||GoblinToken|
|Generate|TOK:MH1|Golem|||GolemToken|

4
Mage.Sets/src/mage/cards/a/AkoumStonewaker.java
View file

@ -15,7 +15,7 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.game.Game;
import mage.game.permanent.token.AkoumStonewakerElementalToken;
import mage.game.permanent.token.Elemental31TrampleHasteToken;
/**
*
@ -65,7 +65,7 @@ class AkoumStonewakerEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
CreateTokenEffect effect = new CreateTokenEffect(new AkoumStonewakerElementalToken());
CreateTokenEffect effect = new CreateTokenEffect(new Elemental31TrampleHasteToken());
if (effect.apply(game, source)) {
effect.exileTokensCreatedAtNextEndStep(game, source);
return true;

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

@ -18,7 +18,7 @@ import mage.filter.common.FilterOwnedCard;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.AkoumStonewakerElementalToken;
import mage.game.permanent.token.Elemental31TrampleHasteToken;
import mage.game.permanent.token.Token;
import mage.target.common.TargetCardInHand;
import mage.target.targetpointer.FixedTargets;
@ -81,7 +81,7 @@ class ForceOfRageEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Token token = new AkoumStonewakerElementalToken();
Token token = new Elemental31TrampleHasteToken();
token.putOntoBattlefield(2, game, source, source.getControllerId());
List<Permanent> permanentList = new ArrayList();
for (UUID permId : token.getLastAddedTokenIds()) {

4
Mage.Sets/src/mage/cards/v/ValdukKeeperOfTheFlame.java
View file

@ -18,7 +18,7 @@ import mage.constants.SuperType;
import mage.constants.TargetController;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.ValdukElementalToken;
import mage.game.permanent.token.Elemental31TrampleHasteToken;
/**
*
@ -73,7 +73,7 @@ class ValdukKeeperOfTheFlameEffect extends OneShotEffect {
int value = eamount.calculate(game, source, this);
AuraAttachedCount aamount = new AuraAttachedCount();
value += aamount.calculate(game, source, this);
CreateTokenEffect effect = new CreateTokenEffect(new ValdukElementalToken(), value);
CreateTokenEffect effect = new CreateTokenEffect(new Elemental31TrampleHasteToken(), value);
if (effect.apply(game, source)) {
effect.exileTokensCreatedAtNextEndStep(game, source);
return true;

12
Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java → Mage/src/main/java/mage/game/permanent/token/Elemental31TrampleHasteToken.java
View file

@ -11,9 +11,9 @@ import java.util.Arrays;
/**
* @author spjspj
*/
public final class AkoumStonewakerElementalToken extends TokenImpl {
public final class Elemental31TrampleHasteToken extends TokenImpl {
public AkoumStonewakerElementalToken() {
public Elemental31TrampleHasteToken() {
super("Elemental Token", "3/1 red Elemental creature token with trample and haste");
cardType.add(CardType.CREATURE);
color.setRed(true);
@ -22,7 +22,7 @@ public final class AkoumStonewakerElementalToken extends TokenImpl {
toughness = new MageInt(1);
this.addAbility(TrampleAbility.getInstance());
this.addAbility(HasteAbility.getInstance());
availableImageSetCodes.addAll(Arrays.asList("BFZ", "MH1"));
availableImageSetCodes.addAll(Arrays.asList("BFZ", "MH1", "DOM"));
}
@Override
@ -38,12 +38,12 @@ public final class AkoumStonewakerElementalToken extends TokenImpl {
}
}
public AkoumStonewakerElementalToken(final AkoumStonewakerElementalToken token) {
public Elemental31TrampleHasteToken(final Elemental31TrampleHasteToken token) {
super(token);
}
public AkoumStonewakerElementalToken copy() {
return new AkoumStonewakerElementalToken(this);
public Elemental31TrampleHasteToken copy() {
return new Elemental31TrampleHasteToken(this);
}
}

49
Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java
View file

@ -1,49 +0,0 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
import mage.abilities.keyword.HasteAbility;
import mage.abilities.keyword.TrampleAbility;
/**
*
* @author spjspj
*/
public final class ValdukElementalToken extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DOM"));
}
public ValdukElementalToken() {
this("DOM");
}
public ValdukElementalToken(String setCode) {
super("Elemental Token", "3/1 red Elemental creature token with trample and haste");
availableImageSetCodes = tokenImageSets;
cardType.add(CardType.CREATURE);
color.setRed(true);
subtype.add(SubType.ELEMENTAL);
power = new MageInt(3);
toughness = new MageInt(1);
this.addAbility(TrampleAbility.getInstance());
this.addAbility(HasteAbility.getInstance());
this.setOriginalExpansionSetCode("DOM");
this.setTokenType(1);
}
public ValdukElementalToken(final ValdukElementalToken token) {
super(token);
}
public ValdukElementalToken copy() {
return new ValdukElementalToken(this);
}
}