github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 17:00:13 -09:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2015-04-30 17:16:41 +02:00
commit 442b12503a
6 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java
View file

@ -28,6 +28,7 @@
package mage.sets.dragonsoftarkir; package mage.sets.dragonsoftarkir;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.costs.common.RevealTargetFromHandCost;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
@ -38,7 +39,7 @@ import mage.constants.AbilityType;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.filter.common.FilterCreatureCard; import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -53,7 +54,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
*/ */
public class DraconicRoar extends CardImpl { public class DraconicRoar extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)"); private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
static { static {
filter.add(new SubtypePredicate("Dragon")); filter.add(new SubtypePredicate("Dragon"));

5
Mage.Sets/src/mage/sets/dragonsoftarkir/FoulTongueInvocation.java
View file

@ -28,6 +28,7 @@
package mage.sets.dragonsoftarkir; package mage.sets.dragonsoftarkir;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.costs.common.RevealTargetFromHandCost;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
@ -38,7 +39,7 @@ import mage.constants.AbilityType;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.filter.common.FilterCreatureCard; import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
@ -53,7 +54,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
*/ */
public class FoulTongueInvocation extends CardImpl { public class FoulTongueInvocation extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)"); private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
static { static {
filter.add(new SubtypePredicate("Dragon")); filter.add(new SubtypePredicate("Dragon"));

5
Mage.Sets/src/mage/sets/dragonsoftarkir/OratorOfOjutai.java
View file

@ -28,6 +28,7 @@
package mage.sets.dragonsoftarkir; package mage.sets.dragonsoftarkir;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@ -43,7 +44,7 @@ import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreatureCard; import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -57,7 +58,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
*/ */
public class OratorOfOjutai extends CardImpl { public class OratorOfOjutai extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)"); private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
static { static {
filter.add(new SubtypePredicate("Dragon")); filter.add(new SubtypePredicate("Dragon"));

5
Mage.Sets/src/mage/sets/dragonsoftarkir/SilumgarsScorn.java
View file

@ -28,6 +28,7 @@
package mage.sets.dragonsoftarkir; package mage.sets.dragonsoftarkir;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.costs.Cost; import mage.abilities.costs.Cost;
import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.costs.common.RevealTargetFromHandCost;
@ -39,7 +40,7 @@ import mage.constants.AbilityType;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.filter.common.FilterCreatureCard; import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.stack.StackObject; import mage.game.stack.StackObject;
@ -54,7 +55,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
*/ */
public class SilumgarsScorn extends CardImpl { public class SilumgarsScorn extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)"); private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
static { static {
filter.add(new SubtypePredicate("Dragon")); filter.add(new SubtypePredicate("Dragon"));

5
Mage.Sets/src/mage/sets/gameday/ScaleguardSentinels.java
View file

@ -28,6 +28,7 @@
package mage.sets.gameday; package mage.sets.gameday;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.EntersBattlefieldAbility;
@ -40,7 +41,7 @@ import mage.constants.AbilityType;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreatureCard; import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -54,7 +55,7 @@ import mage.watchers.common.DragonOnTheBattlefieldWhileSpellWasCastWatcher;
*/ */
public class ScaleguardSentinels extends CardImpl { public class ScaleguardSentinels extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("a Dragon card from your hand (you don't have to)"); private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)");
static { static {
filter.add(new SubtypePredicate("Dragon")); filter.add(new SubtypePredicate("Dragon"));

5
Mage/src/mage/watchers/common/DragonOnTheBattlefieldWhileSpellWasCastWatcher.java
View file

@ -30,10 +30,11 @@ package mage.watchers.common;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import mage.abilities.costs.Cost; import mage.abilities.costs.Cost;
import mage.abilities.costs.common.RevealTargetFromHandCost; import mage.abilities.costs.common.RevealTargetFromHandCost;
import mage.constants.WatcherScope; import mage.constants.WatcherScope;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.FilterPermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.stack.Spell; import mage.game.stack.Spell;
@ -45,7 +46,7 @@ import mage.watchers.Watcher;
*/ */
public class DragonOnTheBattlefieldWhileSpellWasCastWatcher extends Watcher { public class DragonOnTheBattlefieldWhileSpellWasCastWatcher extends Watcher {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon", "Dragons"); private static final FilterPermanent filter = new FilterPermanent("Dragon", "Dragons");
private final Set<UUID> castWithDragonOnTheBattlefield = new HashSet<>(); private final Set<UUID> castWithDragonOnTheBattlefield = new HashSet<>();