External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Additional token fixes for #6032:

Browse source 
- fixed wrong Elemental token images in BFZ's cards (Omnath, Locus of Rage and Seed Guardian);
 - fixed wrong Elemental token image in OGW's cards (Chandra Flamecaller);
 - removed unnecessary tokens from AKH, HOU and EMN (card duplicates);
 - fixed missing Goblin token in DOM;
 - fixed missing Bird Illusion token in GRN;
 - fixed same Zombie token in C19;
This commit is contained in:
Oleg Agafonov 2019-11-28 23:42:39 +04:00
parent fc08491ad6
commit 236cb46125
19 changed files with 112 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java
View file

@ -1,4 +1,3 @@
package mage.game.command.emblems;
import mage.abilities.Ability;
@ -15,13 +14,12 @@ import mage.game.command.Emblem;
import mage.game.events.GameEvent;
/**
*
* @author spjspj
*/
public final class GideonOfTheTrialsEmblem extends Emblem {
public GideonOfTheTrialsEmblem() {
this.setName("Emblem - Gideon");
this.setName("Emblem Gideon");
Ability ability = new SimpleStaticAbility(Zone.COMMAND, new GideonOfTheTrialsCantLoseEffect());
this.getAbilities().add(ability);
}
@ -53,9 +51,7 @@ class GideonOfTheTrialsCantLoseEffect extends ContinuousRuleModifyingEffectImpl
public boolean applies(GameEvent event, Ability source, Game game) {
if ((event.getType() == GameEvent.EventType.WINS && game.getOpponents(source.getControllerId()).contains(event.getPlayerId()))
|| (event.getType() == GameEvent.EventType.LOSES && event.getPlayerId().equals(source.getControllerId()))) {
if (game.getBattlefield().contains(filter, source.getControllerId(), 1, game)) {
return true;
}
return game.getBattlefield().contains(filter, source.getControllerId(), 1, game);
}
return false;
}

4
Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java
View file

@ -24,6 +24,10 @@ public final class AkoumStonewakerElementalToken extends TokenImpl {
this.addAbility(HasteAbility.getInstance());
availableImageSetCodes.addAll(Arrays.asList("BFZ", "MH1"));
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BFZ")) {
setTokenType(2);
}
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MH1")) {
setTokenType(2);
}

11
Mage/src/main/java/mage/game/permanent/token/BeastToken.java
View file

@ -1,15 +1,14 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public final class BeastToken extends TokenImpl {
@ -17,7 +16,7 @@ public final class BeastToken extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01"));
tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01", "C19"));
}
public BeastToken() {

11
Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
View file

@ -1,15 +1,14 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
*
* @author LoneFox
*/
public final class BeastToken2 extends TokenImpl {
@ -17,7 +16,7 @@ public final class BeastToken2 extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL", "MM3", "CMA", "E01"));
tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL", "MM3", "CMA", "E01", "C19"));
}
public BeastToken2() {

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

@ -17,7 +17,7 @@ public final class CentaurToken extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("RTR", "MM3", "RNA"));
tokenImageSets.addAll(Arrays.asList("RTR", "MM3", "RNA", "C19"));
}
public CentaurToken() {

13
Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
View file

@ -1,16 +1,15 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.MageInt;
import mage.abilities.keyword.FlyingAbility;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
*
* @author LoneFox
*/
public final class DragonToken2 extends TokenImpl {
@ -18,11 +17,11 @@ public final class DragonToken2 extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("WWK", "10E", "BFZ", "C15", "CN2", "CMA"));
tokenImageSets.addAll(Arrays.asList("WWK", "10E", "BFZ", "C15", "CN2", "CMA", "C19"));
}
public DragonToken2() {
this((String)null);
this((String) null);
}
public DragonToken2(String setCode) {

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

@ -18,7 +18,7 @@ public final class HumanToken extends TokenImpl {
subtype.add(SubType.HUMAN);
power = new MageInt(1);
toughness = new MageInt(1);
availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA", "ELD"));
availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA", "ELD", "C19"));
}
public HumanToken(final HumanToken token) {

11
Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java
View file

@ -1,19 +1,17 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
/**
*
* @author spjspj
*/
public final class OmnathElementalToken extends TokenImpl {
public OmnathElementalToken() {
super("Elemental", "5/5 red and green Elemental creature token");
setTokenType(2);
setTokenType(1);
setOriginalExpansionSetCode("BFZ");
cardType.add(CardType.CREATURE);
subtype.add(SubType.ELEMENTAL);
@ -23,6 +21,7 @@ public final class OmnathElementalToken extends TokenImpl {
power = new MageInt(5);
toughness = new MageInt(5);
}
public OmnathElementalToken(final OmnathElementalToken token) {
super(token);
}
@ -30,5 +29,5 @@ public final class OmnathElementalToken extends TokenImpl {
public OmnathElementalToken copy() {
return new OmnathElementalToken(this);
}
}

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

@ -21,7 +21,7 @@ public final class RhinoToken extends TokenImpl {
toughness = new MageInt(4);
addAbility(TrampleAbility.getInstance());
availableImageSetCodes.addAll(Arrays.asList("DGM", "RTR", "MH1"));
availableImageSetCodes.addAll(Arrays.asList("DGM", "RTR", "MH1", "C19"));
}
public RhinoToken(final RhinoToken token) {

13
Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java
View file

@ -1,17 +1,15 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.util.RandomUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public final class SaprolingToken extends TokenImpl {
@ -39,7 +37,8 @@ public final class SaprolingToken extends TokenImpl {
"VMA", // 2 different token, one with DIFFERENT stats, "Saproling Burst" create different token, see https://scryfall.com/card/tvma/12
"E02",
"RIX",
"DOM" // 3 different token images
"DOM", // 3 different token images
"C19"
));
}

9
Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java
View file

@ -1,12 +1,10 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
/**
*
* @author spjspj
*/
public final class SeedGuardianToken extends TokenImpl {
@ -14,9 +12,10 @@ public final class SeedGuardianToken extends TokenImpl {
public SeedGuardianToken() {
this(1);
}
public SeedGuardianToken(int xValue) {
super("Elemental", "X/X green Elemental creature token");
setTokenType(2);
setTokenType(1);
setOriginalExpansionSetCode("OGW");
cardType.add(CardType.CREATURE);
color.setGreen(true);

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

@ -1,16 +1,14 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public final class SnakeToken extends TokenImpl {
@ -18,11 +16,11 @@ public final class SnakeToken extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2", "C15"));
tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2", "C15", "C19"));
}
public SnakeToken() {
this((String)null);
this((String) null);
}
public SnakeToken(String setCode) {

10
Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
View file

@ -1,12 +1,12 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author Loki
@ -16,7 +16,7 @@ public final class SpiritToken extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("CHK", "EMA", "C16"));
tokenImageSets.addAll(Arrays.asList("CHK", "EMA", "C16", "C19"));
}
public SpiritToken() {

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

@ -21,7 +21,7 @@ public final class TreasureToken extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("XLN", "RNA", "M20"));
tokenImageSets.addAll(Arrays.asList("XLN", "RNA", "M20", "C19"));
}
public TreasureToken() {

6
Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
View file

@ -18,7 +18,7 @@ public final class ZombieToken extends TokenImpl {
static {
tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "C16", "C17", "CNS",
"MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3", "AKH", "CMA", "E01", "RNA", "WAR", "MH1", "M20"));
"MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3", "AKH", "CMA", "E01", "RNA", "WAR", "MH1", "M20", "C19"));
}
public ZombieToken() {
@ -34,6 +34,7 @@ public final class ZombieToken extends TokenImpl {
@Override
public void setExpansionSetCodeForImage(String code) {
super.setExpansionSetCodeForImage(code);
if (getOriginalExpansionSetCode().equals("ISD")) {
this.setTokenType(RandomUtil.nextInt(3) + 1);
}
@ -43,6 +44,9 @@ public final class ZombieToken extends TokenImpl {
if (getOriginalExpansionSetCode().equals("EMN")) {
this.setTokenType(RandomUtil.nextInt(4) + 1);
}
if (getOriginalExpansionSetCode().equals("C19")) {
this.setTokenType(RandomUtil.nextInt(2) + 1);
}
}
public ZombieToken(final ZombieToken token) {