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

Removed duplicate squid token class for #8996 (#9020)

Browse source
This commit is contained in:
PurpleCrowbar 2022-05-28 03:38:15 +01:00 committed by GitHub
parent ece7ea45bf
commit 74a16d179f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -361,7 +361,7 @@
|Generate|TOK:C16|Soldier|||SoldierToken|
|Generate|TOK:C16|Spirit|1||SpiritToken|
|Generate|TOK:C16|Spirit|2||SpiritWhiteToken|
|Generate|TOK:C16|Squid|||ChasmSkulkerSquidToken|
|Generate|TOK:C16|Squid|||SquidToken|
|Generate|TOK:C16|Thopter|||ThopterToken|
|Generate|TOK:C16|Worm|||WormHarvestToken|
|Generate|TOK:C16|Zombie|||ZombieToken|
@ -834,7 +834,7 @@
|Generate|TOK:M15|Sliver|||SliverToken|
|Generate|TOK:M15|Soldier|||SoldierToken|
|Generate|TOK:M15|Spirit|||SpiritWhiteToken|
|Generate|TOK:M15|Squid|||ChasmSkulkerSquidToken|
|Generate|TOK:M15|Squid|||SquidToken|
|Generate|TOK:M15|Treefolk Warrior|||KalonianTwingroveTreefolkWarriorToken|
|Generate|TOK:M15|Zombie|||ZombieToken|
|Generate|TOK:MBS|Cat|||CatToken|

4
Mage.Sets/src/mage/cards/c/ChasmSkulker.java
View file

@ -18,7 +18,7 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.ChasmSkulkerSquidToken;
import mage.game.permanent.token.SquidToken;
import mage.players.Player;
/**
@ -76,7 +76,7 @@ class ChasmSkulkerEffect extends OneShotEffect {
if (permanent != null) {
int counters = permanent.getCounters(game).getCount(CounterType.P1P1);
if (counters > 0) {
return new CreateTokenEffect(new ChasmSkulkerSquidToken(), counters).apply(game, source);
return new CreateTokenEffect(new SquidToken(), counters).apply(game, source);
}
return true;
}

4
Mage.Sets/src/mage/cards/c/CoralBarrier.java
View file

@ -10,7 +10,7 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.game.permanent.token.CoralBarrierSquidToken;
import mage.game.permanent.token.SquidToken;
/**
*
@ -28,7 +28,7 @@ public final class CoralBarrier extends CardImpl {
// Defender
this.addAbility(DefenderAbility.getInstance());
// When Coral Barrier enters the battlefield, create a 1/1 blue Squid creature token with islandwalk.
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new CoralBarrierSquidToken()), false));
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SquidToken()), false));
}

33
Mage/src/main/java/mage/game/permanent/token/CoralBarrierSquidToken.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.IslandwalkAbility;
/**
*
* @author spjspj
*/
public final class CoralBarrierSquidToken extends TokenImpl {
public CoralBarrierSquidToken() {
super("Squid Token", "1/1 blue Squid creature token with islandwalk");
this.setOriginalExpansionSetCode("M15");
cardType.add(CardType.CREATURE);
color.setBlue(true);
subtype.add(SubType.SQUID);
power = new MageInt(1);
toughness = new MageInt(1);
this.addAbility(new IslandwalkAbility());
}
public CoralBarrierSquidToken(final CoralBarrierSquidToken token) {
super(token);
}
public CoralBarrierSquidToken copy() {
return new CoralBarrierSquidToken(this);
}
}

16
Mage/src/main/java/mage/game/permanent/token/ChasmSkulkerSquidToken.java → Mage/src/main/java/mage/game/permanent/token/SquidToken.java
View file

@ -5,16 +5,16 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
import mage.abilities.keyword.IslandwalkAbility;
import java.util.Arrays;
/**
*
* @author spjspj
*/
public final class ChasmSkulkerSquidToken extends TokenImpl {
public final class SquidToken extends TokenImpl {
public ChasmSkulkerSquidToken() {
super("Squid Token", "1/1 blue Squid creature token with islandwalk");
this.setOriginalExpansionSetCode("M15");
public SquidToken() {
super("Squid Token", "1/1 blue Squid creature token with Islandwalk");
cardType.add(CardType.CREATURE);
color.setBlue(true);
subtype.add(SubType.SQUID);
@ -22,13 +22,15 @@ public final class ChasmSkulkerSquidToken extends TokenImpl {
toughness = new MageInt(1);
this.addAbility(new IslandwalkAbility());
availableImageSetCodes = Arrays.asList("M15", "C16");
}
public ChasmSkulkerSquidToken(final ChasmSkulkerSquidToken token) {
private SquidToken(final SquidToken token) {
super(token);
}
public ChasmSkulkerSquidToken copy() {
return new ChasmSkulkerSquidToken(this);
public SquidToken copy() {
return new SquidToken(this);
}
}