From b60a0ac0060c68294f36c19e54013116ce7390b2 Mon Sep 17 00:00:00 2001 From: igoudt Date: Fri, 18 Aug 2017 11:35:24 +0200 Subject: [PATCH 1/7] add shuffle to Manipulate Fate --- Mage.Sets/src/mage/cards/m/ManipulateFate.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/m/ManipulateFate.java b/Mage.Sets/src/mage/cards/m/ManipulateFate.java index e39a5166267..fa5187dc472 100644 --- a/Mage.Sets/src/mage/cards/m/ManipulateFate.java +++ b/Mage.Sets/src/mage/cards/m/ManipulateFate.java @@ -27,8 +27,6 @@ */ package mage.cards.m; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.SearchEffect; @@ -43,6 +41,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.List; +import java.util.UUID; + /** * * @author emerald000 @@ -100,6 +101,7 @@ class ManipulateFateEffect extends SearchEffect { } return true; } + player.shuffleLibrary(source, game); return false; } From 881822d404eab1aaba982d4a2813143d4d5dad9f Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 18 Aug 2017 10:31:24 -0500 Subject: [PATCH 2/7] - Fixed cost of Scalelord Reckoner. --- Mage.Sets/src/mage/cards/s/ScalelordReckoner.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java b/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java index 4426c44be61..5cb1ec0c8cd 100644 --- a/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java +++ b/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java @@ -55,7 +55,7 @@ import mage.target.TargetPermanent; public class ScalelordReckoner extends CardImpl { public ScalelordReckoner(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); this.subtype.add("Dragon"); this.power = new MageInt(4); @@ -111,7 +111,6 @@ class ScalelardReckonerTriggeredAbility extends TriggeredAbilityImpl { if (creature != null && filter.match(creature, getSourceId(), getControllerId(), game)) { FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent that player controls"); filter.add(new ControllerIdPredicate(event.getPlayerId())); - // filter.setMessage("nonland permanent controlled by " + game.getPlayer(event.getTargetId()).getLogName()); this.getTargets().clear(); this.addTarget(new TargetPermanent(filter)); return true; From a439f30c21e22bc0963f2fd9235bb5a9745918aa Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 19 Aug 2017 07:46:47 +0200 Subject: [PATCH 3/7] Fixed a bug that falsely ended players tournaments. --- Mage/src/main/java/mage/game/match/MatchImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Mage/src/main/java/mage/game/match/MatchImpl.java b/Mage/src/main/java/mage/game/match/MatchImpl.java index d764837f9b2..961996df324 100644 --- a/Mage/src/main/java/mage/game/match/MatchImpl.java +++ b/Mage/src/main/java/mage/game/match/MatchImpl.java @@ -168,13 +168,8 @@ public abstract class MatchImpl implements Match { MatchPlayer matchWinner = null; for (MatchPlayer matchPlayer : players) { if (!matchPlayer.hasQuit()) { - if (matchPlayer.getDeck() == null) { - logger.error("MatchPlayer's deck was null - matchId " + this.getId() + " - " + matchPlayer.getName()); - matchPlayer.setQuit(true); - } else { - activePlayers++; - matchWinner = matchPlayer; - } + activePlayers++; + matchWinner = matchPlayer; } if (matchPlayer.getWins() >= options.getWinsNeeded()) { matchPlayer.setMatchWinner(true); From d7ee6db9237a1cc9eb5c2d8fa9aab299541f53a0 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 19 Aug 2017 07:47:13 +0200 Subject: [PATCH 4/7] Fixed condition for deck manipulation report. --- Mage.Server/src/main/java/mage/server/TableController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 7e0130e6448..71a5e9deb4d 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -428,7 +428,7 @@ public class TableController { } Deck deck = Deck.load(deckList, false, false); validDeck = updateDeck(userId, playerId, deck); - if (!validDeck) { + if (!validDeck && getTableState() == TableState.SIDEBOARDING) { logger.warn(" userId: " + userId + " - Modified deck card list!"); } } From fc31753695566b6a7714b9ef8ad7cd2204760a0c Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 19 Aug 2017 16:08:19 +1000 Subject: [PATCH 5/7] PD implement.. --- Mage.Client/src/main/java/mage/client/table/TablesPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index 4e14af92622..4c50b6c8b34 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -560,7 +560,7 @@ public class TablesPanel extends javax.swing.JPanel { formatFilterList.add(RowFilter.regexFilter("^Constructed - Vintage", TableTableModel.COLUMN_DECK_TYPE)); } if (btnFormatCommander.isSelected()) { - formatFilterList.add(RowFilter.regexFilter("^Commander|^Duel Commander", TableTableModel.COLUMN_DECK_TYPE)); + formatFilterList.add(RowFilter.regexFilter("^Commander|^Duel Commander|^Penny Dreadful Commander", TableTableModel.COLUMN_DECK_TYPE)); } if (btnFormatTinyLeader.isSelected()) { formatFilterList.add(RowFilter.regexFilter("^Tiny", TableTableModel.COLUMN_DECK_TYPE)); From 09511cc151acc4fe863053f78eeed8dab284fb0e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 19 Aug 2017 08:41:05 +0200 Subject: [PATCH 6/7] * Assembled Alphas - Fixed that the triggered ability did not work. --- Mage.Sets/src/mage/cards/a/AssembledAlphas.java | 5 ++++- .../common/BlocksOrBecomesBlockedTriggeredAbility.java | 8 ++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AssembledAlphas.java b/Mage.Sets/src/mage/cards/a/AssembledAlphas.java index 1d6ed99c2de..0e27429caab 100644 --- a/Mage.Sets/src/mage/cards/a/AssembledAlphas.java +++ b/Mage.Sets/src/mage/cards/a/AssembledAlphas.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; +import mage.filter.StaticFilters; /** * @@ -52,7 +53,9 @@ public class AssembledAlphas extends CardImpl { this.toughness = new MageInt(5); // Whenever Assembled Alphas blocks or becomes blocked by a creature, Assembled Alphas deals 3 damage to that creature and 3 damage to that creature's controller. - Ability ability = new BlocksOrBecomesBlockedTriggeredAbility(new DamageTargetEffect(3, true, "that creature"), false); + Ability ability = new BlocksOrBecomesBlockedTriggeredAbility( + new DamageTargetEffect(3, true, "that creature"), StaticFilters.FILTER_PERMANENT_CREATURE, false, null, true); + Effect effect = new DamageTargetControllerEffect(3); effect.setText("and 3 damage to that creature's controller"); ability.addEffect(effect); diff --git a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java index 94b871001da..dc0262bab61 100644 --- a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java @@ -85,9 +85,7 @@ public class BlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl Permanent blocked = game.getPermanent(event.getTargetId()); if (blocked != null && filter.match(blocked, game)) { if (setTargetPointer) { - for (Effect effect : this.getEffects()) { - effect.setTargetPointer(new FixedTarget(event.getTargetId())); - } + this.getEffects().setTargetPointer(new FixedTarget(event.getTargetId())); } return true; } @@ -96,9 +94,7 @@ public class BlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl Permanent blocker = game.getPermanent(event.getSourceId()); if (blocker != null && filter.match(blocker, game)) { if (setTargetPointer) { - for (Effect effect : this.getEffects()) { - effect.setTargetPointer(new FixedTarget(event.getSourceId())); - } + this.getEffects().setTargetPointer(new FixedTarget(event.getSourceId())); } return true; } From 484d4a688f31da7b7141a2b508cca7f0944a02a2 Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 19 Aug 2017 22:33:11 +1000 Subject: [PATCH 7/7] Implement Kess, Dissident Mage (C17) --- .../src/mage/cards/k/KessDissidentMage.java | 263 ++++++++++++++++++ Mage.Sets/src/mage/sets/Commander2017.java | 1 + 2 files changed, 264 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/k/KessDissidentMage.java diff --git a/Mage.Sets/src/mage/cards/k/KessDissidentMage.java b/Mage.Sets/src/mage/cards/k/KessDissidentMage.java new file mode 100644 index 00000000000..936b0be89e0 --- /dev/null +++ b/Mage.Sets/src/mage/cards/k/KessDissidentMage.java @@ -0,0 +1,263 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.cards.k; + +import java.util.Optional; +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.AsThoughEffectImpl; +import mage.abilities.effects.ContinuousEffect; +import mage.abilities.effects.ContinuousEffectImpl; +import mage.abilities.effects.ReplacementEffectImpl; +import mage.abilities.keyword.FlashbackAbility; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.Card; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.AsThoughEffectType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.SubLayer; +import mage.constants.SuperType; +import mage.constants.WatcherScope; +import mage.constants.Zone; +import mage.filter.FilterCard; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.ZoneChangeEvent; +import mage.game.stack.Spell; +import mage.game.stack.StackObject; +import mage.players.Player; +import mage.target.targetpointer.FixedTarget; +import mage.watchers.Watcher; + +/** + * + * @author spjspj + */ +public class KessDissidentMage extends CardImpl { + + public KessDissidentMage(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{B}{R}"); + + addSuperType(SuperType.LEGENDARY); + this.subtype.add("Human"); + this.subtype.add("Wizard"); + this.power = new MageInt(3); + this.toughness = new MageInt(4); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + // During each of your turns, you may cast an instant or sorcery card from your graveyard. If a card cast this way would be put into your graveyard this turn, exile it instead. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KessDissidentMageContinuousEffect()), new KessDissidentMageWatcher()); + } + + public KessDissidentMage(final KessDissidentMage card) { + super(card); + } + + @Override + public KessDissidentMage copy() { + return new KessDissidentMage(this); + } +} + +class KessDissidentMageContinuousEffect extends ContinuousEffectImpl { + + private static final FilterCard filter = new FilterCard("Instant or sorcery spell"); + + static { + filter.add(Predicates.or( + new CardTypePredicate(CardType.INSTANT), + new CardTypePredicate(CardType.SORCERY) + )); + } + + KessDissidentMageContinuousEffect() { + super(Duration.WhileOnBattlefield, Layer.PlayerEffects, SubLayer.NA, Outcome.Benefit); + staticText = "During each of your turns, you may cast an instant or sorcery card from your graveyard. If a card cast this way would be put into your graveyard this turn, exile it instead"; + } + + KessDissidentMageContinuousEffect(final KessDissidentMageContinuousEffect effect) { + super(effect); + } + + @Override + public KessDissidentMageContinuousEffect copy() { + return new KessDissidentMageContinuousEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(source.getControllerId()); + if (player != null) { + if (!game.getActivePlayerId().equals(player.getId())) { + return false; + } + for (Card card : player.getGraveyard().getCards(filter, game)) { + ContinuousEffect effect = new KessDissidentMageCastFromGraveyardEffect(); + effect.setTargetPointer(new FixedTarget(card.getId())); + game.addEffect(effect, source); + effect = new KessDissidentMageReplacementEffect(card.getId()); + game.addEffect(effect, source); + } + return true; + } + return false; + } +} + +class KessDissidentMageCastFromGraveyardEffect extends AsThoughEffectImpl { + + KessDissidentMageCastFromGraveyardEffect() { + super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit); + staticText = "You may cast an instant or sorcery card from your graveyard"; + } + + KessDissidentMageCastFromGraveyardEffect(final KessDissidentMageCastFromGraveyardEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + return true; + } + + @Override + public KessDissidentMageCastFromGraveyardEffect copy() { + return new KessDissidentMageCastFromGraveyardEffect(this); + } + + @Override + public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { + if (objectId.equals(getTargetPointer().getFirst(game, source))) { + if (affectedControllerId.equals(source.getControllerId())) { + if (game.getActivePlayerId().equals(source.getControllerId())) { + KessDissidentMageWatcher watcher = (KessDissidentMageWatcher) game.getState().getWatchers().get(KessDissidentMageWatcher.class.getSimpleName(), source.getSourceId()); + + StackObject stackObject = game.getStack().getStackObject(source.getId()); + if (!(source instanceof FlashbackAbility)) { + return !watcher.isAbilityUsed(); + } + } + } + } + return false; + } +} + +class KessDissidentMageReplacementEffect extends ReplacementEffectImpl { + + private final UUID cardId; + + KessDissidentMageReplacementEffect(UUID cardId) { + super(Duration.EndOfTurn, Outcome.Exile); + this.cardId = cardId; + staticText = "If a card cast this way would be put into your graveyard this turn, exile it instead"; + } + + KessDissidentMageReplacementEffect(final KessDissidentMageReplacementEffect effect) { + super(effect); + this.cardId = effect.cardId; + } + + @Override + public KessDissidentMageReplacementEffect copy() { + return new KessDissidentMageReplacementEffect(this); + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + Player controller = game.getPlayer(source.getControllerId()); + Card card = game.getCard(this.cardId); + if (controller != null && card != null) { + controller.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.STACK, true); + return true; + } + return false; + } + + @Override + public boolean checksEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.ZONE_CHANGE; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + ZoneChangeEvent zEvent = (ZoneChangeEvent) event; + return zEvent.getToZone() == Zone.GRAVEYARD + && zEvent.getTargetId().equals(this.cardId); + } +} + +class KessDissidentMageWatcher extends Watcher { + + boolean abilityUsed = false; + + KessDissidentMageWatcher() { + super("KessDissidentMageWatcher", WatcherScope.CARD); + } + + KessDissidentMageWatcher(final KessDissidentMageWatcher watcher) { + super(watcher); + this.abilityUsed = watcher.abilityUsed; + } + + @Override + public void watch(GameEvent event, Game game) { + if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.GRAVEYARD) { + Spell spell = (Spell) game.getObject(event.getTargetId()); + if (spell.isInstant() || spell.isSorcery()) { + Optional source = game.getAbility(event.getSourceId(), event.getSourceId()); + abilityUsed = true; + } + } + } + + @Override + public KessDissidentMageWatcher copy() { + return new KessDissidentMageWatcher(this); + } + + @Override + public void reset() { + super.reset(); + abilityUsed = false; + } + + public boolean isAbilityUsed() { + return abilityUsed; + } +} diff --git a/Mage.Sets/src/mage/sets/Commander2017.java b/Mage.Sets/src/mage/sets/Commander2017.java index 249e21e68d3..bcf1aa4dd99 100644 --- a/Mage.Sets/src/mage/sets/Commander2017.java +++ b/Mage.Sets/src/mage/sets/Commander2017.java @@ -67,6 +67,7 @@ public class Commander2017 extends ExpansionSet { cards.add(new SetCardInfo("Hungry Lynx", 31, Rarity.RARE, mage.cards.h.HungryLynx.class)); cards.add(new SetCardInfo("Inalla, Archmage Ritualist", 38, Rarity.MYTHIC, mage.cards.i.InallaArchmageRitualist.class)); cards.add(new SetCardInfo("Izzet Chemister", 26, Rarity.RARE, mage.cards.i.IzzetChemister.class)); + cards.add(new SetCardInfo("Kess, Dissident Mage", 39, Rarity.MYTHIC, mage.cards.k.KessDissidentMage.class)); cards.add(new SetCardInfo("Kheru Mind-Eater", 17, Rarity.RARE, mage.cards.k.KheruMindEater.class)); cards.add(new SetCardInfo("Kindred Boon", 5, Rarity.RARE, mage.cards.k.KindredBoon.class)); cards.add(new SetCardInfo("Kindred Charge", 27, Rarity.RARE, mage.cards.k.KindredCharge.class));