From b8b017066283c780d86e0245da7f74acf578df00 Mon Sep 17 00:00:00 2001 From: spjspj Date: Mon, 18 Sep 2017 00:38:02 +1000 Subject: [PATCH 1/3] Add Tokens to card-pictures-tok for viewer. --- Mage.Client/src/main/resources/card-pictures-tok.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index c172c971f31..2bad012c0a2 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1096,6 +1096,16 @@ |Generate|TOK:WWK|Snake|||SnakeToken| |Generate|TOK:WWK|Soldier Ally|||JoinTheRanksSoldierToken| |Generate|TOK:WWK|Wolf|||WolfToken| +|Generate|TOK:XLN|Dinosaur|||DinosaurToken| +|Generate|TOK:XLN|Illusion|||JaceCunningCastawayIllusionToken| +|Generate|TOK:XLN|Merfolk|||MerfolkHexproofToken| +|Generate|TOK:XLN|Pirate|||PirateToken| +|Generate|TOK:XLN|Plant|||DefenderPlantToken| +|Generate|TOK:XLN|Treasure|1||TreasureToken| +|Generate|TOK:XLN|Treasure|2||TreasureToken| +|Generate|TOK:XLN|Treasure|3||TreasureToken| +|Generate|TOK:XLN|Treasure|4||TreasureToken| +|Generate|TOK:XLN|Vampire|||IxalanVampireToken| |Generate|TOK:ZEN|Angel|||AngelToken| |Generate|TOK:ZEN|Beast|||BeastToken2| |Generate|TOK:ZEN|Bird|||BirdToken| From c6fe18d3986dfc9921093cb6993dda95fd1b6494 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 17 Sep 2017 22:32:40 +0200 Subject: [PATCH 2/3] * Tunnel Vision - Reworked card movement. --- Mage.Sets/src/mage/cards/t/TunnelVision.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Mage.Sets/src/mage/cards/t/TunnelVision.java b/Mage.Sets/src/mage/cards/t/TunnelVision.java index 03ef8cd3b83..9c1b33d6984 100644 --- a/Mage.Sets/src/mage/cards/t/TunnelVision.java +++ b/Mage.Sets/src/mage/cards/t/TunnelVision.java @@ -27,6 +27,8 @@ */ package mage.cards.t; +import java.util.HashSet; +import java.util.Set; import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; @@ -51,10 +53,10 @@ import mage.target.TargetPlayer; public class TunnelVision extends CardImpl { public TunnelVision(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{U}"); - // Name a card. Target player reveals cards from the top of his or her library until the named card is revealed. - // If it is, that player puts the rest of the revealed cards into his or her graveyard and puts the named card on top of his or her library. + // Name a card. Target player reveals cards from the top of his or her library until the named card is revealed. + // If it is, that player puts the rest of the revealed cards into his or her graveyard and puts the named card on top of his or her library. // Otherwise, the player shuffles his or her library. this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.ALL)); this.getSpellAbility().addEffect(new TunnelVisionEffect()); @@ -74,7 +76,7 @@ public class TunnelVision extends CardImpl { class TunnelVisionEffect extends OneShotEffect { public TunnelVisionEffect() { - super(Outcome.Damage); + super(Outcome.Benefit); this.staticText = "Target player reveals cards from the top of his or her library until the named card is revealed. If it is, that player puts the rest of the revealed cards into his or her graveyard and puts the named card on top of his or her library. Otherwise, the player shuffles his or her library."; } @@ -90,16 +92,16 @@ class TunnelVisionEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { MageObject sourceObject = game.getObject(source.getSourceId()); - Player targetPlayer = game.getPlayer(source.getFirstTarget()); + Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); String cardName = (String) game.getState().getValue(source.getSourceId().toString() + NameACardEffect.INFO_KEY); if (sourceObject == null || targetPlayer == null || cardName == null || cardName.isEmpty()) { return false; } Cards cardsToReveal = new CardsImpl(); - Cards cardsToBury = new CardsImpl(); + Set cardsToBury = new HashSet<>(); Card namedCard = null; - + // reveal until named card found // if named card found, put all revealed cards in grave and put named card on top of library // if named card not found, shuffle library @@ -117,15 +119,15 @@ class TunnelVisionEffect extends OneShotEffect { } } } - + targetPlayer.revealCards(sourceObject.getIdName(), cardsToReveal, game); if (namedCardFound) { targetPlayer.moveCards(cardsToBury, Zone.GRAVEYARD, source, game); targetPlayer.moveCards(namedCard, Zone.LIBRARY, source, game); } else { + targetPlayer.getLibrary().addAll(cardsToBury, game); targetPlayer.shuffleLibrary(source, game); } - return true; } } From 1d5105c0bde58024223dfe24c7f3a7d9aaea40a1 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 17 Sep 2017 23:11:38 +0200 Subject: [PATCH 3/3] Xmage 1.4.26V5 --- Mage.Common/src/main/java/mage/utils/MageVersion.java | 2 +- Mage/src/main/java/mage/cards/repository/CardRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java index e0c0a9435a3..5238bd4f7c5 100644 --- a/Mage.Common/src/main/java/mage/utils/MageVersion.java +++ b/Mage.Common/src/main/java/mage/utils/MageVersion.java @@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable { public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_PATCH = 26; - public final static String MAGE_VERSION_MINOR_PATCH = "V4"; + public final static String MAGE_VERSION_MINOR_PATCH = "V5"; public final static String MAGE_VERSION_INFO = ""; private final int major; diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index 36a866cf23a..87239f4c121 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -58,7 +58,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 51; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 91; + private static final long CARD_CONTENT_VERSION = 92; private Dao cardDao; private Set classNames;