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

updated creature types

Browse source
This commit is contained in:
Evan Kranzler 2020-04-13 18:27:58 -04:00
parent 576c5e0ca6
commit ee7d271cb4
8 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage.Sets/src/mage/cards/b/BatteringKrasis.java
View file

@ -1,5 +1,3 @@
package mage.cards.b; package mage.cards.b;
import mage.MageInt; import mage.MageInt;
@ -13,28 +11,25 @@ import mage.constants.SubType;
import java.util.UUID; import java.util.UUID;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public final class BatteringKrasis extends CardImpl { public final class BatteringKrasis extends CardImpl {
public BatteringKrasis (UUID ownerId, CardSetInfo setInfo) { public BatteringKrasis(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
this.subtype.add(SubType.FISH, SubType.BEAST); this.subtype.add(SubType.SHARK, SubType.BEAST);
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Trample // Trample
this.addAbility(TrampleAbility.getInstance()); this.addAbility(TrampleAbility.getInstance());
// Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.) // Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)
this.addAbility(new EvolveAbility()); this.addAbility(new EvolveAbility());
} }
public BatteringKrasis (final BatteringKrasis card) { private BatteringKrasis(final BatteringKrasis card) {
super(card); super(card);
} }

1
Mage.Sets/src/mage/cards/c/ChickenALaKing.java
View file

@ -39,6 +39,7 @@ public final class ChickenALaKing extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
this.subtype.add(SubType.BIRD); this.subtype.add(SubType.BIRD);
this.subtype.add(SubType.NOBLE);
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(2); this.toughness = new MageInt(2);

1
Mage.Sets/src/mage/cards/d/DryadOfTheIlysianGrove.java
View file

@ -21,6 +21,7 @@ public final class DryadOfTheIlysianGrove extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{2}{G}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{2}{G}");
this.subtype.add(SubType.NYMPH); this.subtype.add(SubType.NYMPH);
this.subtype.add(SubType.DRYAD);
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(4); this.toughness = new MageInt(4);

16
Mage.Sets/src/mage/cards/g/GiantShark.java
View file

@ -1,7 +1,5 @@
package mage.cards.g; package mage.cards.g;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility; import mage.abilities.common.BlocksOrBecomesBlockedTriggeredAbility;
@ -14,19 +12,15 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
import mage.abilities.keyword.TrampleAbility; import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.*;
import mage.constants.ComparisonType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate;
import java.util.UUID;
/** /**
*
* @author KholdFuzion & L_J * @author KholdFuzion & L_J
*
*/ */
public final class GiantShark extends CardImpl { public final class GiantShark extends CardImpl {
@ -39,8 +33,8 @@ public final class GiantShark extends CardImpl {
} }
public GiantShark(UUID ownerId, CardSetInfo setInfo) { public GiantShark(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}");
this.subtype.add(SubType.FISH); this.subtype.add(SubType.SHARK);
this.power = new MageInt(4); this.power = new MageInt(4);
this.toughness = new MageInt(4); this.toughness = new MageInt(4);

14
Mage.Sets/src/mage/cards/h/HammerheadShark.java
View file

@ -1,7 +1,5 @@
package mage.cards.h; package mage.cards.h;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent; import mage.abilities.effects.common.combat.CantAttackUnlessDefenderControllsPermanent;
@ -12,23 +10,25 @@ import mage.constants.SubType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import java.util.UUID;
/** /**
*
* @author fireshoes * @author fireshoes
*/ */
public final class HammerheadShark extends CardImpl { public final class HammerheadShark extends CardImpl {
public HammerheadShark(UUID ownerId, CardSetInfo setInfo) { public HammerheadShark(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}");
this.subtype.add(SubType.FISH); this.subtype.add(SubType.SHARK);
this.power = new MageInt(2); this.power = new MageInt(2);
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// Hammerhead Shark can't attack unless defending player controls an Island. // Hammerhead Shark can't attack unless defending player controls an Island.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND,"an Island")))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessDefenderControllsPermanent(new FilterLandPermanent(SubType.ISLAND, "an Island"))));
} }
public HammerheadShark(final HammerheadShark card) { private HammerheadShark(final HammerheadShark card) {
super(card); super(card);
} }

11
Mage.Sets/src/mage/cards/s/Shambleshark.java
View file

@ -1,7 +1,5 @@
package mage.cards.s; package mage.cards.s;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.keyword.EvolveAbility; import mage.abilities.keyword.EvolveAbility;
import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlashAbility;
@ -10,15 +8,16 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import java.util.UUID;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public final class Shambleshark extends CardImpl { public final class Shambleshark extends CardImpl {
public Shambleshark(UUID ownerId, CardSetInfo setInfo) { public Shambleshark(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{U}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{U}");
this.subtype.add(SubType.FISH); this.subtype.add(SubType.SHARK);
this.subtype.add(SubType.CRAB); this.subtype.add(SubType.CRAB);
this.power = new MageInt(2); this.power = new MageInt(2);
@ -30,7 +29,7 @@ public final class Shambleshark extends CardImpl {
this.addAbility(new EvolveAbility()); this.addAbility(new EvolveAbility());
} }
public Shambleshark(final Shambleshark card) { private Shambleshark(final Shambleshark card) {
super(card); super(card);
} }

2
Mage.Sets/src/mage/cards/s/Sharktocrab.java
View file

@ -22,7 +22,7 @@ public final class Sharktocrab extends CardImpl {
public Sharktocrab(UUID ownerId, CardSetInfo setInfo) { public Sharktocrab(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}");
this.subtype.add(SubType.FISH); this.subtype.add(SubType.SHARK);
this.subtype.add(SubType.OCTOPUS); this.subtype.add(SubType.OCTOPUS);
this.subtype.add(SubType.CRAB); this.subtype.add(SubType.CRAB);
this.power = new MageInt(4); this.power = new MageInt(4);

5
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -121,6 +121,11 @@ public class VerifyCardDataTest {
// subtype // subtype
skipListCreate(SKIP_LIST_SUBTYPE); skipListCreate(SKIP_LIST_SUBTYPE);
skipListAddName(SKIP_LIST_SUBTYPE, "UGL", "Miss Demeanor"); skipListAddName(SKIP_LIST_SUBTYPE, "UGL", "Miss Demeanor");
// the following are temporary
skipListAddName(SKIP_LIST_SUBTYPE, "THB", "Dryad of the Ilysian Grove");
skipListAddName(SKIP_LIST_SUBTYPE, "UGL", "Chicken a la King");
subtypesToIgnore.add("Shark");
subtypesToIgnore.add("Fish");
// number // number
skipListCreate(SKIP_LIST_NUMBER); skipListCreate(SKIP_LIST_NUMBER);