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

* Some minor changes.

Browse source
This commit is contained in:
LevelX2 2017-12-26 10:59:28 +01:00
parent 3a8afb9418
commit 8228cee30c
4 changed files with 73 additions and 22 deletions
Mage.Sets/src/mage/cards/c
Curfew.java
Mage/src/main/java/mage/filter
StaticFilters.java
Utils
known-sets.txtmtg-cards-data.txt

26
Mage.Sets/src/mage/cards/c/Curfew.java
View file

@ -27,7 +27,6 @@
*/
package mage.cards.c;
import java.util.List;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.Effect;
@ -37,7 +36,7 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -50,7 +49,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
public class Curfew extends CardImpl {
public Curfew(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{U}");
// Each player returns a creature he or she controls to its owner's hand.
this.getSpellAbility().addEffect(new CurfewEffect());
@ -66,7 +65,7 @@ public class Curfew extends CardImpl {
}
}
class CurfewEffect extends OneShotEffect{
class CurfewEffect extends OneShotEffect {
public CurfewEffect() {
super(Outcome.ReturnToHand);
@ -78,27 +77,20 @@ class CurfewEffect extends OneShotEffect{
game.informPlayers("Each player returns a creature he or she controls to its owner's hand");
for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) {
Player player = game.getPlayer(playerId);
if (player != null) {
FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(1, 1, filter, true);
List<Permanent> liste = game.getBattlefield().getActivePermanents(filter, playerId, game);
if(!liste.isEmpty()){
player.choose(Outcome.ReturnToHand, target, source.getSourceId(), game);
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
permanent.moveToZone(Zone.HAND, source.getSourceId(), game, false);
}
if (player != null && game.getBattlefield().countAll(StaticFilters.FILTER_PERMANENT_CREATURE, playerId, game) > 0) {
TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_CREATURE, true);
player.choose(Outcome.ReturnToHand, target, source.getSourceId(), game);
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
player.moveCards(permanent, Zone.HAND, source, game);
}
}
}
return true;
}
@Override
public Effect copy() {
return new CurfewEffect();
}
}

4
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -50,8 +50,8 @@ public final class StaticFilters {
public static final FilterPermanent FILTER_OPPONENTS_PERMANENT_ARTIFACT = new FilterPermanent("artifact an opponent controls");
public static final FilterPermanent FILTER_OPPONENTS_PERMANENT_ARTIFACT_OR_CREATURE = new FilterPermanent("artifact or creature an opponent controls");
public static final FilterPermanent FILTER_CONTROLLED_CREATURE = new FilterControlledCreaturePermanent();
public static final FilterPermanent FILTER_CONTROLLED_A_CREATURE = new FilterControlledCreaturePermanent("a creature you control");
public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_CREATURE = new FilterControlledCreaturePermanent();
public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_A_CREATURE = new FilterControlledCreaturePermanent("a creature you control");
public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_ANOTHER_CREATURE = new FilterControlledCreaturePermanent("another creature");
public static final FilterControlledPermanent FILTER_CONTROLLED_PERMANENT_NON_LAND = new FilterControlledPermanent("nonland permanent");
public static final FilterLandPermanent FILTER_LAND = new FilterLandPermanent();

2
Utils/known-sets.txt
View file

@ -51,7 +51,7 @@ Duel Decks: Izzet vs. Golgari|IzzetVsGolgari|
Duel Decks: Jace vs. Chandra|JaceVsChandra|
Duel Decks: Jace vs. Vraska|JaceVsVraska|
Duel Decks: Knights vs. Dragons|KnightsVsDragons|
Duel Decks: Merfolk vs Goblins|MerfolkVsGoblins|
Duel Decks: Merfolk vs. Goblins|MerfolkVsGoblins|
Duel Decks: Mind vs. Might|MindVsMight|
Duel Decks: Nissa vs. Ob Nixilis|NissaVsObNixilis|
Duel Decks: Phyrexia vs. the Coalition|PhyrexiaVsTheCoalition|

63
Utils/mtg-cards-data.txt
View file

@ -32127,7 +32127,7 @@ Aven of Enduring Hope|Hour of Devastation|5|C|{4}{W}|Creature - Bird Cleric|3|3|
Crested Sunmare|Hour of Devastation|6|M|{3}{W}{W}|Creature - Horse|5|5|Other Horses you control have indestructible.$At the beginning of each end step, if you gained life this turn, create a 5/5 white Horse creature token.|
Dauntless Aven|Hour of Devastation|7|C|{2}{W}|Creature - Bird Warrior|2|1|Flying$Whenever Dauntless Aven attacks, untap target creature you control.|
Desert's Hold|Hour of Devastation|8|U|{2}{W}|Enchantment - Aura|||Enchant creature$When Desert's Hold enters the battlefield, if you control a Desert or there is a Desert card in your graveyard, you gain 3 life.$Enchanted creature can't attack or block, and its activated abilities can't be activated.|
Disposal Mummy|Hour of Devastation|9|C|{2}{W}|Creature - Zombie Jackal|2|3|When Disposal Mummy enters the battlefield, exile target card from an opponent's graveyard.|
Disposal Mummy|Hour of Devastation|9|C|{2}{W}|Creature - Zombie Jackal|2|3|When Disposal Mummy enters the battlefield, exile target card from an opponent's graveyard.|
Djeru, With Eyes Open|Hour of Devastation|10|R|{3}{W}{W}|Legendary Creature - Human Warrior|4|3|Vigilance$When Djeru, With Eyes Open enters the battlefield, you may search your library for a planeswalker card, reveal it, put it into your hand, then shuffle your library.$If a source would deal damage to a planeswalker you control, prevent 1 of that damage.|
Djeru's Renunciation|Hour of Devastation|11|C|{1}{W}|Instant|||Tap up to two target creatures.$Cycling {W} <i>({W}, Discard this card: Draw a card.)</i>|
Dutiful Servants|Hour of Devastation|12|C|{3}{W}|Creature - Zombie|2|5||
@ -32779,4 +32779,63 @@ Willing Test Subject|Unstable|126|C|{2}{G}|Creature- Spider Monkey Scientist|2|2
Garbage Elemental|Unstable|82|U|{4}{R}|Creature - Elemental|3|2|Battle cry <i>(Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)</i>$When Garbage Elemental enters the battlefield, roll two six-sided dice. Create a number of 1/1 red Goblin creature tokens equal to the difference between those results.|
Oddly Uneven|Unstable|15|R|{3}{W}{W}|Sorcery|||Choose one --$* Destroy each creature with an odd number of words in its name. (Hyphenated words are one word.)$* Destroy each creature with an even number of words in its name.|
capital offense|Unstable|52|C|{2}{B}{B}|Instant|||target creature gets -x/-x until end of turn, where x is the number of times a capital letter appears in its rules text. (ignore reminder text and flavor text.)
Very Cryptic Command|Unstable|49|R|{1}{U}{U}{U}|Instant|||Choose two - Return target permanent to its controller’s hand.; Draw two cards, then discard a card.; Change the target of target spell with a single target.; Turn over target nontoken creature.|
Very Cryptic Command|Unstable|49|R|{1}{U}{U}{U}|Instant|||Choose two - Return target permanent to its controller<65>s hand.; Draw two cards, then discard a card.; Change the target of target spell with a single target.; Turn over target nontoken creature.|
Master of Waves|Duel Decks: Merfolk vs. Goblins|1|M|{3}{U}|Creature - Merfolk Wizard|2|1|Protection from red$Elemental creatures you control get +1/+1.$When Master of Waves enters the battlefield, create a number of 1/0 blue Elemental creature tokens equal to your devotion to blue. <i>(Each {U} in the mana costs of permanents you control counts toward your devotion to blue.)</i>|
Merfolk Looter|Duel Decks: Merfolk vs. Goblins|10|U|{1}{U}|Creature - Merfolk Rogue|1|1|{tap}: Draw a card, then discard a card.|
Merfolk Sovereign|Duel Decks: Merfolk vs. Goblins|11|R|{1}{U}{U}|Creature - Merfolk|2|2|Other Merfolk creatures you control get +1/+1.${tap}: Target Merfolk creature can't be blocked this turn.|
Merfolk Wayfinder|Duel Decks: Merfolk vs. Goblins|12|U|{2}{U}|Creature - Merfolk Scout|1|2|Flying$When Merfolk Wayfinder enters the battlefield, reveal the top three cards of your library. Put all Island cards revealed this way into your hand and the rest on the bottom of your library in any order.|
Merrow Reejerey|Duel Decks: Merfolk vs. Goblins|13|U|{2}{U}|Creature - Merfolk Soldier|2|2|Other Merfolk creatures you control get +1/+1.$Whenever you cast a Merfolk spell, you may tap or untap target permanent.|
Mind Spring|Duel Decks: Merfolk vs. Goblins|14|R|{X}{U}{U}|Sorcery|||Draw X cards.|
Misdirection|Duel Decks: Merfolk vs. Goblins|15|R|{3}{U}{U}|Instant|||You may exile a blue card from your hand rather than pay Misdirection's mana cost.$Change the target of target spell with a single target.|
Rootwater Hunter|Duel Decks: Merfolk vs. Goblins|16|U|{2}{U}|Creature - Merfolk|1|1|{tap}: Rootwater Hunter deals 1 damage to target creature or player.|
Scroll Thief|Duel Decks: Merfolk vs. Goblins|17|C|{2}{U}|Creature - Merfolk Rogue|1|3|Whenever Scroll Thief deals combat damage to a player, draw a card.|
Streambed Aquitects|Duel Decks: Merfolk vs. Goblins|18|C|{1}{U}{U}|Creature - Merfolk Scout|2|3|{tap}: Target Merfolk creature gets +1/+1 and gains islandwalk until end of turn. <i>(It can't be blocked as long as defending player controls an Island.)</i>${tap}: Target land becomes an Island until end of turn.|
Tidal Courier|Duel Decks: Merfolk vs. Goblins|19|U|{3}{U}|Creature - Merfolk|1|2|When Tidal Courier enters the battlefield, reveal the top four cards of your library. Put all Merfolk cards revealed this way into your hand and the rest on the bottom of your library in any order.${3}{U}: Tidal Courier gains flying until end of turn.|
Aquitect's Will|Duel Decks: Merfolk vs. Goblins|2|C|{U}|Tribal Sorcery - Merfolk|||Put a flood counter on target land. That land is an Island in addition to its other types for as long as it has a flood counter on it. If you control a Merfolk, draw a card.|
Tidal Warrior|Duel Decks: Merfolk vs. Goblins|20|C|{U}|Creature - Merfolk Warrior|1|1|{tap}: Target land becomes an Island until end of turn.|
Tidal Wave|Duel Decks: Merfolk vs. Goblins|21|C|{2}{U}|Instant|||Create a 5/5 blue Wall creature token with defender. Sacrifice it at the beginning of the next end step.|
Tidebinder Mage|Duel Decks: Merfolk vs. Goblins|22|R|{U}{U}|Creature - Merfolk Wizard|2|2|When Tidebinder Mage enters the battlefield, tap target red or green creature an opponent controls. That creature doesn't untap during its controller's untap step for as long as you control Tidebinder Mage.|
Triton Tactics|Duel Decks: Merfolk vs. Goblins|23|U|{U}|Instant|||Up to two target creatures each get +0/+3 until end of turn. Untap those creatures. At this turn's next end of combat, tap each creature that was blocked by one of those creatures this turn and it doesn't untap during its controller's next untap step.|
Wake Thrasher|Duel Decks: Merfolk vs. Goblins|24|R|{2}{U}|Creature - Merfolk Soldier|1|1|Whenever a permanent you control becomes untapped, Wake Thrasher gets +1/+1 until end of turn.|
Cold-Eyed Selkie|Duel Decks: Merfolk vs. Goblins|25|R|{1}{GU}{GU}|Creature - Merfolk Rogue|1|1|Islandwalk <i>(This creature can't be blocked as long as defending player controls an Island.)</i>$Whenever Cold-Eyed Selkie deals combat damage to a player, you may draw that many cards.|
Blighted Cataract|Duel Decks: Merfolk vs. Goblins|26|U||Land|||{tap}: Add {C} to your mana pool.${5}{U}, {tap}, Sacrifice Blighted Cataract: Draw two cards.|
Lonely Sandbar|Duel Decks: Merfolk vs. Goblins|27|C||Land|||Lonely Sandbar enters the battlefield tapped.${tap}: Add {U} to your mana pool.$Cycling {U} <i>({U}, Discard this card: Draw a card.)</i>|
Island|Duel Decks: Merfolk vs. Goblins|28|L||Basic Land - Island||||
Island|Duel Decks: Merfolk vs. Goblins|29|L||Basic Land - Island||||
Claustrophobia|Duel Decks: Merfolk vs. Goblins|3|C|{1}{U}{U}|Enchantment - Aura|||Enchant creature$When Claustrophobia enters the battlefield, tap enchanted creature.$Enchanted creature doesn't untap during its controller's untap step.|
Warren Instigator|Duel Decks: Merfolk vs. Goblins|32|M|{R}{R}|Creature - Goblin Berserker|1|1|Double strike$Whenever Warren Instigator deals damage to an opponent, you may put a Goblin creature card from your hand onto the battlefield.|
Battle Squadron|Duel Decks: Merfolk vs. Goblins|33|U|{3}{R}{R}|Creature - Goblin|*|*|Flying$Battle Squadron's power and toughness are each equal to the number of creatures you control.|
Boggart Brute|Duel Decks: Merfolk vs. Goblins|34|C|{2}{R}|Creature - Goblin Warrior|3|2|Menace <i>(This creature can't be blocked except by two or more creatures.)</i>|
Brute Strength|Duel Decks: Merfolk vs. Goblins|35|C|{1}{R}|Instant|||Target creature gets +3/+1 and gains trample until end of turn.|
Cleaver Riot|Duel Decks: Merfolk vs. Goblins|36|U|{4}{R}|Sorcery|||Creatures you control gain double strike until end of turn. <i>(They deal both first-strike and regular combat damage.)</i>|
Ember Hauler|Duel Decks: Merfolk vs. Goblins|37|U|{R}{R}|Creature - Goblin|2|2|{1}, Sacrifice Ember Hauler: Ember Hauler deals 2 damage to target creature or player.|
Foundry Street Denizen|Duel Decks: Merfolk vs. Goblins|38|C|{R}|Creature - Goblin Warrior|1|1|Whenever another red creature enters the battlefield under your control, Foundry Street Denizen gets +1/+0 until end of turn.|
Gempalm Incinerator|Duel Decks: Merfolk vs. Goblins|39|U|{2}{R}|Creature - Goblin|2|1|Cycling {1}{R} <i>({1}{R}, Discard this card: Draw a card.)</i>$When you cycle Gempalm Incinerator, you may have it deal X damage to target creature, where X is the number of Goblins on the battlefield.|
Concentrate|Duel Decks: Merfolk vs. Goblins|4|U|{2}{U}{U}|Sorcery|||Draw three cards.|
Ghostfire|Duel Decks: Merfolk vs. Goblins|40|C|{2}{R}|Instant|||Ghostfire is colorless.$Ghostfire deals 3 damage to target creature or player.|
Goblin Chieftain|Duel Decks: Merfolk vs. Goblins|41|R|{1}{R}{R}|Creature - Goblin|2|2|Haste <i>(This creature can attack and {tap} as soon as it comes under your control.)</i>$Other Goblin creatures you control get +1/+1 and have haste.|
Goblin Diplomats|Duel Decks: Merfolk vs. Goblins|42|R|{1}{R}|Creature - Goblin|2|1|{tap}: Each creature attacks this turn if able.|
Goblin Glory Chaser|Duel Decks: Merfolk vs. Goblins|43|U|{R}|Creature - Goblin Warrior|1|1|Renown 1 <i>(When this creature deals combat damage to a player, if it isn't renowned, put a +1/+1 counter on it and it becomes renowned.)</i>$As long as Goblin Glory Chaser is renowned, it has menace. <i>(It can't be blocked except by two or more creatures.)</i>|
Goblin Goon|Duel Decks: Merfolk vs. Goblins|44|R|{3}{R}|Creature - Goblin Mutant|6|6|Goblin Goon can't attack unless you control more creatures than defending player.$Goblin Goon can't block unless you control more creatures than attacking player.|
Goblin Grenade|Duel Decks: Merfolk vs. Goblins|45|U|{R}|Sorcery|||As an additional cost to cast Goblin Grenade, sacrifice a Goblin.$Goblin Grenade deals 5 damage to target creature or player.|
Goblin Rabblemaster|Duel Decks: Merfolk vs. Goblins|46|R|{2}{R}|Creature - Goblin Warrior|2|2|Other Goblin creatures you control attack each combat if able.$At the beginning of combat on your turn, create a 1/1 red Goblin creature token with haste.$Whenever Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin.|
Goblin Razerunners|Duel Decks: Merfolk vs. Goblins|47|R|{2}{R}{R}|Creature - Goblin Warrior|3|4|{1}{R}, Sacrifice a land: Put a +1/+1 counter on Goblin Razerunners.$At the beginning of your end step, you may have Goblin Razerunners deal damage equal to the number of +1/+1 counters on it to target player.|
Goblin Ringleader|Duel Decks: Merfolk vs. Goblins|48|U|{3}{R}|Creature - Goblin|2|2|Haste$When Goblin Ringleader enters the battlefield, reveal the top four cards of your library. Put all Goblin cards revealed this way into your hand and the rest on the bottom of your library in any order.|
Goblin Tunneler|Duel Decks: Merfolk vs. Goblins|49|C|{1}{R}|Creature - Goblin Rogue|1|1|{tap}: Target creature with power 2 or less can't be blocked this turn.|
Engulf the Shore|Duel Decks: Merfolk vs. Goblins|5|R|{3}{U}|Instant|||Return to their owners' hands all creatures with toughness less than or equal to the number of Islands you control.|
Goblin Wardriver|Duel Decks: Merfolk vs. Goblins|50|U|{R}{R}|Creature - Goblin Warrior|2|2|Battle cry <i>(Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)</i>|
Hordeling Outburst|Duel Decks: Merfolk vs. Goblins|51|U|{1}{R}{R}|Sorcery|||Create three 1/1 red Goblin creature tokens.|
Krenko, Mob Boss|Duel Decks: Merfolk vs. Goblins|52|R|{2}{R}{R}|Legendary Creature - Goblin Warrior|3|3|{tap}: Create X 1/1 red Goblin creature tokens, where X is the number of Goblins you control.|
Krenko's Command|Duel Decks: Merfolk vs. Goblins|53|C|{1}{R}|Sorcery|||Create two 1/1 red Goblin creature tokens.|
Relentless Assault|Duel Decks: Merfolk vs. Goblins|54|R|{2}{R}{R}|Sorcery|||Untap all creatures that attacked this turn. After this main phase, there is an additional combat phase followed by an additional main phase.|
Tarfire|Duel Decks: Merfolk vs. Goblins|55|C|{R}|Tribal Instant - Goblin|||Tarfire deals 2 damage to target creature or player.|
Brittle Effigy|Duel Decks: Merfolk vs. Goblins|56|R|{1}|Artifact|||{4}, {tap}, Exile Brittle Effigy: Exile target creature.|
Goblin Charbelcher|Duel Decks: Merfolk vs. Goblins|57|R|{4}|Artifact|||{3}, {tap}: Reveal cards from the top of your library until you reveal a land card. Goblin Charbelcher deals damage equal to the number of nonland cards revealed this way to target creature or player. If the revealed land card was a Mountain, Goblin Charbelcher deals double that damage instead. Put the revealed cards on the bottom of your library in any order.|
Blighted Gorge|Duel Decks: Merfolk vs. Goblins|58|U||Land|||{tap}: Add {C} to your mana pool.${4}{R}, {tap}, Sacrifice Blighted Gorge: Blighted Gorge deals 2 damage to target creature or player.|
Forgotten Cave|Duel Decks: Merfolk vs. Goblins|59|C||Land|||Forgotten Cave enters the battlefield tapped.${tap}: Add {R} to your mana pool.$Cycling {R} <i>({R}, Discard this card: Draw a card.)</i>|
Essence Scatter|Duel Decks: Merfolk vs. Goblins|6|C|{1}{U}|Instant|||Counter target creature spell.|
Mountain|Duel Decks: Merfolk vs. Goblins|60|L||Basic Land - Mountain||||
Mountain|Duel Decks: Merfolk vs. Goblins|61|L||Basic Land - Mountain||||
Harbinger of the Tides|Duel Decks: Merfolk vs. Goblins|7|R|{U}{U}|Creature - Merfolk Wizard|2|2|You may cast Harbinger of the Tides as though it had flash if you pay {2} more to cast it. <i>(You may cast it any time you could cast an instant.)</i>$When Harbinger of the Tides enters the battlefield, you may return target tapped creature an opponent controls to its owner's hand.|
Inkfathom Divers|Duel Decks: Merfolk vs. Goblins|8|C|{3}{U}{U}|Creature - Merfolk Soldier|3|3|Islandwalk <i>(This creature can't be blocked as long as defending player controls an Island.)</i>$When Inkfathom Divers enters the battlefield, look at the top four cards of your library, then put them back in any order.|
Master of the Pearl Trident|Duel Decks: Merfolk vs. Goblins|9|R|{U}{U}|Creature - Merfolk|2|2|Other Merfolk creatures you control get +1/+1 and have islandwalk. <i>(They can't be blocked as long as defending player controls an Island.)</i>|