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

Removed duplicate haste elemental token class

Browse source
This commit is contained in:
PurpleCrowbar 2022-06-08 00:42:41 +01:00
parent b853633190
commit 8407e23d3f
5 changed files with 14 additions and 43 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

@ -990,7 +990,7 @@
|Generate|TOK:SCG|Goblin|||GoblinToken| |Generate|TOK:SCG|Goblin|||GoblinToken|
|Generate|TOK:SCG|Soldier|||SoldierToken| |Generate|TOK:SCG|Soldier|||SoldierToken|
|Generate|TOK:SHM|Elemental|1||DinOfTheFireherdToken| |Generate|TOK:SHM|Elemental|1||DinOfTheFireherdToken|
|Generate|TOK:SHM|Elemental|2||ElementalMasteryElementalToken| |Generate|TOK:SHM|Elemental|2||Elemental11HasteToken|
|Generate|TOK:SHM|Elf Warrior|1||ElfWarriorToken| |Generate|TOK:SHM|Elf Warrior|1||ElfWarriorToken|
|Generate|TOK:SHM|Elf Warrior|2||GreenWhiteElfWarriorToken| |Generate|TOK:SHM|Elf Warrior|2||GreenWhiteElfWarriorToken|
|Generate|TOK:SHM|Faerie Rogue|||OonaQueenFaerieRogueToken| |Generate|TOK:SHM|Faerie Rogue|||OonaQueenFaerieRogueToken|

4
Mage.Sets/src/mage/cards/e/ElementalMastery.java
View file

@ -20,7 +20,7 @@ import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.game.permanent.token.ElementalMasteryElementalToken; import mage.game.permanent.token.Elemental11HasteToken;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -78,7 +78,7 @@ class ElementalMasteryEffect extends OneShotEffect {
if (creatureAttached != null) { if (creatureAttached != null) {
int power = creatureAttached.getPower().getValue(); int power = creatureAttached.getPower().getValue();
if (power > 0) { if (power > 0) {
CreateTokenEffect effect = new CreateTokenEffect(new ElementalMasteryElementalToken(), power); CreateTokenEffect effect = new CreateTokenEffect(new Elemental11HasteToken(), power);
effect.apply(game, source); effect.apply(game, source);
effect.exileTokensCreatedAtNextEndStep(game, source); effect.exileTokensCreatedAtNextEndStep(game, source);
return true; return true;

4
Mage.Sets/src/mage/cards/t/TemptWithVengeance.java
View file

@ -9,7 +9,7 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.token.TemptWithVengeanceElementalToken; import mage.game.permanent.token.Elemental11HasteToken;
import mage.game.permanent.token.Token; import mage.game.permanent.token.Token;
import mage.players.Player; import mage.players.Player;
@ -58,7 +58,7 @@ class TemptWithVengeanceEffect extends OneShotEffect {
int xValue = source.getManaCostsToPay().getX(); int xValue = source.getManaCostsToPay().getX();
if (controller != null && xValue > 0) { if (controller != null && xValue > 0) {
Token tokenCopy = new TemptWithVengeanceElementalToken(); Token tokenCopy = new Elemental11HasteToken();
tokenCopy.putOntoBattlefield(xValue, game, source, source.getControllerId(), false, false); tokenCopy.putOntoBattlefield(xValue, game, source, source.getControllerId(), false, false);
int opponentsAddedTokens = 0; int opponentsAddedTokens = 0;

14
Mage/src/main/java/mage/game/permanent/token/ElementalMasteryElementalToken.java → Mage/src/main/java/mage/game/permanent/token/Elemental11HasteToken.java
View file

@ -6,13 +6,15 @@ 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 spjspj * @author spjspj
*/ */
public final class ElementalMasteryElementalToken extends TokenImpl { public final class Elemental11HasteToken extends TokenImpl {
public ElementalMasteryElementalToken() { public Elemental11HasteToken() {
super("Elemental Token", "1/1 red Elemental creature token with haste"); super("Elemental Token", "1/1 red Elemental creature token with haste");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
subtype.add(SubType.ELEMENTAL); subtype.add(SubType.ELEMENTAL);
@ -20,6 +22,8 @@ public final class ElementalMasteryElementalToken extends TokenImpl {
power = new MageInt(1); power = new MageInt(1);
toughness = new MageInt(1); toughness = new MageInt(1);
addAbility(HasteAbility.getInstance()); addAbility(HasteAbility.getInstance());
availableImageSetCodes = Arrays.asList("SHM");
} }
@Override @Override
@ -31,11 +35,11 @@ public final class ElementalMasteryElementalToken extends TokenImpl {
} }
} }
public ElementalMasteryElementalToken(final ElementalMasteryElementalToken token) { public Elemental11HasteToken(final Elemental11HasteToken token) {
super(token); super(token);
} }
public ElementalMasteryElementalToken copy() { public Elemental11HasteToken copy() {
return new ElementalMasteryElementalToken(this); return new Elemental11HasteToken(this);
} }
} }

33
Mage/src/main/java/mage/game/permanent/token/TemptWithVengeanceElementalToken.java
View file

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