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

[CON] Remove a duplicate token

Browse source
This commit is contained in:
Alex W. Jackson 2022-03-07 14:59:01 -05:00
parent 813e1816ea
commit baece6e241
4 changed files with 9 additions and 41 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

@ -506,7 +506,7 @@
|Generate|TOK:CNS|Wolf|||WolfToken| |Generate|TOK:CNS|Wolf|||WolfToken|
|Generate|TOK:CNS|Zombie|||ZombieToken| |Generate|TOK:CNS|Zombie|||ZombieToken|
|Generate|TOK:CON|Angel|||AngelToken| |Generate|TOK:CON|Angel|||AngelToken|
|Generate|TOK:CON|Elemental|||RakkaMarElementalToken| |Generate|TOK:CON|Elemental|||ElementalTokenWithHaste|
|Generate|TOK:CON|Saproling|||SaprolingToken| |Generate|TOK:CON|Saproling|||SaprolingToken|
|Generate|TOK:CON|Soldier|||SoldierToken| |Generate|TOK:CON|Soldier|||SoldierToken|
|Generate|TOK:CON|Zombie|||ZombieToken| |Generate|TOK:CON|Zombie|||ZombieToken|
@ -1050,7 +1050,7 @@
|Generate|TOK:RAV|Wolf|||VojaToken| |Generate|TOK:RAV|Wolf|||VojaToken|
|Generate|TOK:RAV|Faerie|||FaerieToken| |Generate|TOK:RAV|Faerie|||FaerieToken|
|Generate|TOK:RIX|Elemental|1||RekindlingPhoenixToken| |Generate|TOK:RIX|Elemental|1||RekindlingPhoenixToken|
|Generate|TOK:RIX|Elemental|2||TilonallisSummonerElementalToken| |Generate|TOK:RIX|Elemental|2||RedElementalToken|
|Generate|TOK:RIX|Golem|||GoldForgeGarrisonGolemToken| |Generate|TOK:RIX|Golem|||GoldForgeGarrisonGolemToken|
|Generate|TOK:RIX|Saproling|||SaprolingToken| |Generate|TOK:RIX|Saproling|||SaprolingToken|
|Generate|TOK:ROE|Dragon|||DragonToken2| |Generate|TOK:ROE|Dragon|||DragonToken2|
@ -1664,4 +1664,4 @@
|Generate|TOK:VOW|Wolf|1||WolfToken| |Generate|TOK:VOW|Wolf|1||WolfToken|
|Generate|TOK:VOW|Wolf|2||RedWolfToken| |Generate|TOK:VOW|Wolf|2||RedWolfToken|
|Generate|TOK:VOW|Zombie|1||ZombieToken| |Generate|TOK:VOW|Zombie|1||ZombieToken|
|Generate|TOK:VOW|Zombie|2||StitcherGeralfZombieToken| |Generate|TOK:VOW|Zombie|2||StitcherGeralfZombieToken|

12
Mage.Sets/src/mage/cards/r/RakkaMar.java
View file

@ -1,20 +1,19 @@
package mage.cards.r; package mage.cards.r;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ColoredManaCost;
import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.keyword.HasteAbility; import mage.abilities.keyword.HasteAbility;
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.constants.ColoredManaSymbol;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.SuperType; import mage.constants.SuperType;
import mage.constants.Zone; import mage.game.permanent.token.ElementalTokenWithHaste;
import mage.game.permanent.token.RakkaMarElementalToken;
import java.util.UUID; import java.util.UUID;
@ -34,9 +33,8 @@ public final class RakkaMar extends CardImpl {
this.addAbility(HasteAbility.getInstance()); this.addAbility(HasteAbility.getInstance());
Ability ability = new SimpleActivatedAbility( Ability ability = new SimpleActivatedAbility(
Zone.BATTLEFIELD, new CreateTokenEffect(new ElementalTokenWithHaste()),
new CreateTokenEffect(new RakkaMarElementalToken()), new ColoredManaCost(ColoredManaSymbol.R)
new ManaCostsImpl("{R}")
); );
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());
this.addAbility(ability); this.addAbility(ability);

2
Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
View file

@ -21,7 +21,7 @@ public final class ElementalTokenWithHaste extends TokenImpl {
toughness = new MageInt(1); toughness = new MageInt(1);
this.addAbility(HasteAbility.getInstance()); this.addAbility(HasteAbility.getInstance());
availableImageSetCodes = Arrays.asList("C20", "PMEI", "OGW", "SOK", "MRD"); availableImageSetCodes = Arrays.asList("C20", "PMEI", "OGW", "SOK", "MRD", "CON");
} }
public ElementalTokenWithHaste(final ElementalTokenWithHaste token) { public ElementalTokenWithHaste(final ElementalTokenWithHaste token) {

30
Mage/src/main/java/mage/game/permanent/token/RakkaMarElementalToken.java
View file

@ -1,30 +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 RakkaMarElementalToken extends TokenImpl {
public RakkaMarElementalToken() {
super("Elemental", "3/1 red Elemental creature token with haste");
cardType.add(CardType.CREATURE);
color.setRed(true);
subtype.add(SubType.ELEMENTAL);
power = new MageInt(3);
toughness = new MageInt(1);
addAbility(HasteAbility.getInstance());
}
public RakkaMarElementalToken(final RakkaMarElementalToken token) {
super(token);
}
public RakkaMarElementalToken copy() {
return new RakkaMarElementalToken(this);
}
}