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

completed suggestions for IKO tokens

Browse source
This commit is contained in:
gp66 2020-05-03 12:52:51 -05:00
parent 8bea930a69
commit f3bde1dbab
6 changed files with 23 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java
View file

@ -358,7 +358,9 @@ public class ScryfallImageSupportTokens {
put("IKO/Dinosaur Beast", "https://api.scryfall.com/cards/tiko/11/en?format=image"); put("IKO/Dinosaur Beast", "https://api.scryfall.com/cards/tiko/11/en?format=image");
put("IKO/Dinosaur", "https://api.scryfall.com/cards/tiko/8/en?format=image"); put("IKO/Dinosaur", "https://api.scryfall.com/cards/tiko/8/en?format=image");
put("IKO/Feather", "https://api.scryfall.com/cards/tiko/9/en?format=image"); put("IKO/Feather", "https://api.scryfall.com/cards/tiko/9/en?format=image");
put("IKO/Human Soldier", "https://api.scryfall.com/cards/tiko/4/en?format=image"); put("IKO/Human Soldier/1", "https://api.scryfall.com/cards/tiko/3/en?format=image");
put("IKO/Human Soldier/2", "https://api.scryfall.com/cards/tiko/4/en?format=image");
put("IKO/Human Soldier/3", "https://api.scryfall.com/cards/tiko/5/en?format=image");
put("IKO/Kraken", "https://api.scryfall.com/cards/tiko/6/en?format=image"); put("IKO/Kraken", "https://api.scryfall.com/cards/tiko/6/en?format=image");
put("IKO/Shark", "https://api.scryfall.com/cards/tiko/7/en?format=image"); put("IKO/Shark", "https://api.scryfall.com/cards/tiko/7/en?format=image");

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

@ -1365,6 +1365,8 @@
|Generate|TOK:IKO|Dinosaur Beast|||DinosaurBeastToken| |Generate|TOK:IKO|Dinosaur Beast|||DinosaurBeastToken|
|Generate|TOK:IKO|Dinosaur|||DinosaurHasteToken| |Generate|TOK:IKO|Dinosaur|||DinosaurHasteToken|
|Generate|TOK:IKO|Feather|||FeatherToken| |Generate|TOK:IKO|Feather|||FeatherToken|
|Generate|TOK:IKO|Human Soldier|||HumanSoldierToken| |Generate|TOK:IKO|Human Soldier|1||HumanSoldierToken|
|Generate|TOK:IKO|Human Soldier|2||HumanSoldierToken|
|Generate|TOK:IKO|Human Soldier|3||HumanSoldierToken|
|Generate|TOK:IKO|Kraken|||KrakenToken| |Generate|TOK:IKO|Kraken|||KrakenToken|
|Generate|TOK:IKO|Shark|||SharkToken| |Generate|TOK:IKO|Shark|||SharkToken|

1
Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java
View file

@ -12,7 +12,6 @@ import mage.game.Game;
import mage.game.events.DamagedPlayerEvent; import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.game.permanent.token.BeastXToken;
import mage.game.permanent.token.DinosaurBeastToken; import mage.game.permanent.token.DinosaurBeastToken;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
import mage.watchers.Watcher; import mage.watchers.Watcher;

31
Mage/src/main/java/mage/game/permanent/token/BeastXToken.java
View file

@ -1,31 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.abilities.keyword.TrampleAbility;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author TheElk801
*/
public final class BeastXToken extends TokenImpl {
public BeastXToken(int xValue) {
super("Beast", "X/X green Beast creature token");
cardType.add(CardType.CREATURE);
color.setGreen(true);
subtype.add(SubType.BEAST);
power = new MageInt(xValue);
toughness = new MageInt(xValue);
addAbility(TrampleAbility.getInstance());
}
private BeastXToken(final BeastXToken token) {
super(token);
}
@Override
public BeastXToken copy() {
return new BeastXToken(this);
}
}

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

@ -1,13 +1,11 @@
package mage.game.permanent.token; package mage.game.permanent.token;
import mage.constants.CardType; import mage.MageInt;
import mage.MageInt; import mage.abilities.keyword.TrampleAbility;
import mage.abilities.keyword.TrampleAbility; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
/** /**
*
* @author TheElk801 * @author TheElk801
*/ */
public final class DinosaurBeastToken extends TokenImpl { public final class DinosaurBeastToken extends TokenImpl {
@ -23,10 +21,11 @@ public final class DinosaurBeastToken extends TokenImpl {
addAbility(TrampleAbility.getInstance()); addAbility(TrampleAbility.getInstance());
} }
public DinosaurBeastToken(final DinosaurBeastToken token) { private DinosaurBeastToken(final DinosaurBeastToken token) {
super(token); super(token);
} }
@Override
public DinosaurBeastToken copy() { public DinosaurBeastToken copy() {
return new DinosaurBeastToken(this); return new DinosaurBeastToken(this);
} }

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

@ -3,6 +3,7 @@ package mage.game.permanent.token;
import mage.MageInt; import mage.MageInt;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.util.RandomUtil;
public final class HumanSoldierToken extends TokenImpl { public final class HumanSoldierToken extends TokenImpl {
@ -16,6 +17,15 @@ public final class HumanSoldierToken extends TokenImpl {
toughness = new MageInt(1); toughness = new MageInt(1);
} }
@Override
public void setExpansionSetCodeForImage(String code) {
super.setExpansionSetCodeForImage(code);
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("IKO")) {
setTokenType(RandomUtil.nextInt(3) + 1); // 1...3
}
}
public HumanSoldierToken(final HumanSoldierToken token) { public HumanSoldierToken(final HumanSoldierToken token) {
super(token); super(token);
} }