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

Fixed some tokens image

Browse source
This commit is contained in:
Oleg Agafonov 2020-06-25 09:52:54 +04:00
parent dea739ecb0
commit aeef4e1193
5 changed files with 28 additions and 59 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

@ -373,7 +373,7 @@
|Generate|TOK:C16|Worm||
|Generate|TOK:C16|Zombie||
|Generate|TOK:C17|Bat||
|Generate|TOK:C17|Cat||
|Generate|TOK:C17|Cat|||CatToken|
|Generate|TOK:C17|Cat Dragon|||WasitoraCatDragonToken|
|Generate|TOK:C17|Cat Warrior||
|Generate|TOK:C17|Dragon|1||DragonToken|

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

@ -4,21 +4,13 @@ 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 {
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", "C19", "IKO"));
}
public BeastToken() {
this(null, 0);
}
@ -29,7 +21,6 @@ public final class BeastToken extends TokenImpl {
public BeastToken(String setCode, int tokenType) {
super("Beast", "3/3 green Beast creature token");
availableImageSetCodes = tokenImageSets;
setOriginalExpansionSetCode(setCode);
cardType.add(CardType.CREATURE);
color.setGreen(true);
@ -37,11 +28,13 @@ public final class BeastToken extends TokenImpl {
power = new MageInt(3);
toughness = new MageInt(3);
availableImageSetCodes = Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01", "C19", "IKO");
}
@Override
public void setExpansionSetCodeForImage(String code) {
super.setExpansionSetCodeForImage(code);
if (getOriginalExpansionSetCode().equals("M15")) {
this.setTokenType(2);
}

27
Mage/src/main/java/mage/game/permanent/token/CatToken.java
View file

@ -1,43 +1,25 @@
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.Arrays;
/**
*
* @author LoneFox
*/
public final class CatToken extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15", "C17"));
}
public CatToken() {
this(null, 0);
}
public CatToken(String setCode) {
this(setCode, 0);
}
public CatToken(String setCode, int tokenType) {
super("Cat", "2/2 white Cat creature token");
availableImageSetCodes = tokenImageSets;
setOriginalExpansionSetCode(setCode);
cardType.add(CardType.CREATURE);
color.setWhite(true);
subtype.add(SubType.CAT);
power = new MageInt(2);
toughness = new MageInt(2);
availableImageSetCodes = Arrays.asList("MBP", "C14", "C15", "C17", "C18", "M13", "M14", "MBS", "SOM");
}
public CatToken(final CatToken token) {
@ -47,5 +29,4 @@ public final class CatToken extends TokenImpl {
public CatToken copy() {
return new CatToken(this);
}
}

15
Mage/src/main/java/mage/game/permanent/token/CatToken2.java
View file

@ -1,5 +1,3 @@
package mage.game.permanent.token;
import mage.MageInt;
@ -7,26 +5,25 @@ import mage.abilities.keyword.LifelinkAbility;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.Arrays;
/**
*
* @author fireshoes
*/
public final class CatToken2 extends TokenImpl {
public CatToken2() {
this((String)null);
}
public CatToken2(String setCode) {
super("Cat", "1/1 white Cat creature token with lifelink");
setOriginalExpansionSetCode("AKH");
cardType.add(CardType.CREATURE);
color.setWhite(true);
subtype.add(SubType.CAT);
power = new MageInt(1);
toughness = new MageInt(1);
addAbility(LifelinkAbility.getInstance());
availableImageSetCodes = Arrays.asList("AKH", "M19", "IKO");
}
public CatToken2(final CatToken2 token) {
super(token);
}
@ -34,5 +31,5 @@ public final class CatToken2 extends TokenImpl {
public CatToken2 copy() {
return new CatToken2(this);
}
}

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

@ -5,24 +5,15 @@ import mage.abilities.keyword.HasteAbility;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* @author magenoxx
*/
public final class ElementalTokenWithHaste extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C20", "MBP", "OGW", "SOK", "MRD"));
}
public ElementalTokenWithHaste() {
super("Elemental", "3/1 red Elemental creature token with haste");
availableImageSetCodes = tokenImageSets;
cardType.add(CardType.CREATURE);
color.setRed(true);
subtype.add(SubType.ELEMENTAL);
@ -30,6 +21,21 @@ public final class ElementalTokenWithHaste extends TokenImpl {
toughness = new MageInt(1);
this.addAbility(HasteAbility.getInstance());
availableImageSetCodes = Arrays.asList("C20", "MBP", "OGW", "SOK", "MRD");
}
public ElementalTokenWithHaste(final ElementalTokenWithHaste token) {
super(token);
}
public ElementalTokenWithHaste copy() {
return new ElementalTokenWithHaste(this);
}
@Override
public void setExpansionSetCodeForImage(String code) {
super.setExpansionSetCodeForImage(code);
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("OGW")) {
setTokenType(2);
}
@ -40,12 +46,4 @@ public final class ElementalTokenWithHaste extends TokenImpl {
setTokenType(1);
}
}
public ElementalTokenWithHaste(final ElementalTokenWithHaste token) {
super(token);
}
public ElementalTokenWithHaste copy() {
return new ElementalTokenWithHaste(this);
}
}