From ba8a38c2f4a79c3f216991570a8ab1a2594c297d Mon Sep 17 00:00:00 2001 From: Hanmac Date: Wed, 9 Jan 2019 08:11:59 +0100 Subject: [PATCH] CloneRewrite --- .../src/main/java/forge/ai/GameState.java | 2 +- .../main/java/forge/ai/ability/CloneAi.java | 31 +- .../java/forge/ai/ability/ManifestAi.java | 2 +- .../java/forge/ai/simulation/GameCopier.java | 2 +- .../main/java/forge/card/CardStateName.java | 6 +- .../src/main/java/forge/game/GameAction.java | 12 +- .../ability/effects/ChangeZoneAllEffect.java | 2 +- .../ability/effects/ChangeZoneEffect.java | 32 +-- .../game/ability/effects/CloneEffect.java | 261 +---------------- .../ability/effects/CopyPermanentEffect.java | 8 +- .../forge/game/ability/effects/DigEffect.java | 3 +- .../effects/PlayLandVariantEffect.java | 4 +- .../src/main/java/forge/game/card/Card.java | 240 ++++++++++++---- .../java/forge/game/card/CardCloneStates.java | 54 ++++ .../java/forge/game/card/CardFactory.java | 269 ++++++++++++++++-- .../java/forge/game/card/CardFactoryUtil.java | 8 +- .../main/java/forge/game/card/CardUtil.java | 4 +- .../main/java/forge/game/card/CardView.java | 12 +- .../java/forge/game/cost/CostAdjustment.java | 3 +- .../forge/trackable/TrackableProperty.java | 11 +- .../main/java/forge/gui/CardDetailPanel.java | 3 +- .../forge/screens/match/views/VStack.java | 3 +- .../ai/simulation/GameSimulatorTest.java | 95 +++++++ .../src/forge/card/CardImageRenderer.java | 4 +- .../src/forge/card/CardRenderer.java | 4 +- .../src/forge/screens/match/views/VStack.java | 3 +- forge-gui/res/cardsfolder/c/cytoshape.txt | 4 +- .../java/forge/match/AbstractGuiGame.java | 4 +- 28 files changed, 675 insertions(+), 411 deletions(-) create mode 100644 forge-game/src/main/java/forge/game/card/CardCloneStates.java diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java index 9891b166767..8d5ea58fb29 100644 --- a/forge-ai/src/main/java/forge/ai/GameState.java +++ b/forge-ai/src/main/java/forge/ai/GameState.java @@ -1142,7 +1142,7 @@ public abstract class GameState { } else if (info.startsWith("SummonSick")) { c.setSickness(true); } else if (info.startsWith("FaceDown")) { - c.setState(CardStateName.FaceDown, true); + c.turnFaceDown(true); if (info.endsWith("Manifested")) { c.setManifested(true); } diff --git a/forge-ai/src/main/java/forge/ai/ability/CloneAi.java b/forge-ai/src/main/java/forge/ai/ability/CloneAi.java index 6d2618ee7f0..546f9f7dae5 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CloneAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/CloneAi.java @@ -12,7 +12,6 @@ import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; import forge.game.spellability.SpellAbility; -import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import java.util.List; @@ -21,7 +20,6 @@ public class CloneAi extends SpellAbilityAi { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { - final TargetRestrictions tgt = sa.getTargetRestrictions(); final Card source = sa.getHostCard(); final Game game = source.getGame(); @@ -59,7 +57,7 @@ public class CloneAi extends SpellAbilityAi { return false; } - if (null == tgt) { + if (!sa.usesTargeting()) { final List defined = AbilityUtils.getDefinedCards(source, sa.getParam("Defined"), sa); boolean bFlag = false; @@ -131,7 +129,7 @@ public class CloneAi extends SpellAbilityAi { *

* cloneTgtAI. *

- * + * * @param sa * a {@link forge.game.spellability.SpellAbility} object. * @return a boolean. @@ -155,7 +153,7 @@ public class CloneAi extends SpellAbilityAi { // a good target return false; } - + /* (non-Javadoc) * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String) */ @@ -178,7 +176,7 @@ public class CloneAi extends SpellAbilityAi { /* * (non-Javadoc) - * + * * @see forge.ai.SpellAbilityAi#chooseSingleCard(forge.game.player.Player, * forge.game.spellability.SpellAbility, java.lang.Iterable, boolean, * forge.game.player.Player) @@ -186,9 +184,13 @@ public class CloneAi extends SpellAbilityAi { @Override protected Card chooseSingleCard(Player ai, SpellAbility sa, Iterable options, boolean isOptional, Player targetedPlayer) { + final Card host = sa.getHostCard(); final Player ctrl = host.getController(); + final Card cloneTarget = getCloneTarget(sa); + final boolean isOpp = cloneTarget.getController().isOpponentOf(sa.getActivatingPlayer()); + final boolean isVesuva = "Vesuva".equals(host.getName()); final String filter = !isVesuva ? "Permanent.YouDontCtrl,Permanent.nonLegendary" @@ -198,7 +200,8 @@ public class CloneAi extends SpellAbilityAi { if (!newOptions.isEmpty()) { options = newOptions; } - Card choice = ComputerUtilCard.getBestAI(options); + Card choice = isOpp ? ComputerUtilCard.getWorstAI(options) : ComputerUtilCard.getBestAI(options); + if (isVesuva && "Vesuva".equals(choice.getName())) { choice = null; } @@ -206,4 +209,18 @@ public class CloneAi extends SpellAbilityAi { return choice; } + protected Card getCloneTarget(final SpellAbility sa) { + final Card host = sa.getHostCard(); + Card tgtCard = host; + if (sa.hasParam("CloneTarget")) { + final List cloneTargets = AbilityUtils.getDefinedCards(host, sa.getParam("CloneTarget"), sa); + if (!cloneTargets.isEmpty()) { + tgtCard = cloneTargets.get(0); + } + } else if (sa.hasParam("Choices") && sa.usesTargeting()) { + tgtCard = sa.getTargets().getFirstTargetedCard(); + } + + return tgtCard; + } } diff --git a/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java b/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java index 94a878c8afe..5318120d847 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java @@ -104,7 +104,7 @@ public class ManifestAi extends SpellAbilityAi { // check to ensure that there are no replacement effects that prevent creatures ETBing from library // (e.g. Grafdigger's Cage) Card topCopy = CardUtil.getLKICopy(library.getFirst()); - topCopy.setState(CardStateName.FaceDown, false); + topCopy.turnFaceDownNoUpdate(); topCopy.setManifested(true); final Map repParams = Maps.newHashMap(); diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java index 2ab4d392c64..6df721eec65 100644 --- a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java +++ b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java @@ -305,7 +305,7 @@ public class GameCopier { if (c.isFaceDown()) { boolean isCreature = newCard.isCreature(); boolean hasManaCost = !newCard.getManaCost().isNoCost(); - newCard.setState(CardStateName.FaceDown, true); + newCard.turnFaceDown(true); if (c.isManifested()) { newCard.setManifested(true); // TODO: Should be able to copy other abilities... diff --git a/forge-core/src/main/java/forge/card/CardStateName.java b/forge-core/src/main/java/forge/card/CardStateName.java index fef6020ddac..36deb396504 100644 --- a/forge-core/src/main/java/forge/card/CardStateName.java +++ b/forge-core/src/main/java/forge/card/CardStateName.java @@ -5,13 +5,13 @@ public enum CardStateName { Original, FaceDown, Flipped, - Cloner, Transformed, Meld, - Cloned, LeftSplit, RightSplit, - OriginalText; // backup state for cards like Volrath's Shapeshifter + OriginalText, // backup state for cards like Volrath's Shapeshifter + + ; /** * TODO: Write javadoc for this method. diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index ffa159ca135..6785c5bf3b4 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -194,17 +194,7 @@ public class GameAction { if (!c.isToken()) { if (c.isCloned()) { - c.switchStates(CardStateName.Original, CardStateName.Cloner, false); - c.setState(CardStateName.Original, false); - c.clearStates(CardStateName.Cloner, false); - if (c.isFlipCard()) { - c.clearStates(CardStateName.Flipped, false); - } - if (c.getStates().contains(CardStateName.OriginalText)) { - c.clearStates(CardStateName.OriginalText, false); - c.removeSVar("GainingTextFrom"); - c.removeSVar("GainingTextFromTimestamp"); - } + c.removeCloneStates(); c.updateStateForView(); } else if (c.getStates().contains(CardStateName.OriginalText)) { // Volrath's Shapeshifter diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java index dac590fefe5..f45f78a0d93 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java @@ -178,7 +178,7 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect { movedCard.setExiledWith(host); } if (sa.hasParam("ExileFaceDown")) { - movedCard.setState(CardStateName.FaceDown, true); + movedCard.turnFaceDown(true); } if (sa.hasParam("Tapped")) { movedCard.setTapped(true); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index 1f17e125d87..4ceccd9f372 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -542,7 +542,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { movedCard.updateStateForView(); } if (sa.hasParam("FaceDown")) { - movedCard.setState(CardStateName.FaceDown, true); + movedCard.turnFaceDown(true); } if (sa.hasParam("Attacking")) { // What should they attack? @@ -592,7 +592,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { } if (sa.hasParam("ExileFaceDown")) { - movedCard.setState(CardStateName.FaceDown, true); + movedCard.turnFaceDown(true); } if (sa.hasParam("TrackDiscarded")) { @@ -1050,24 +1050,22 @@ public class ChangeZoneEffect extends SpellAbilityEffect { } // need to be facedown before it hits the battlefield in case of Replacement Effects or Trigger if (sa.hasParam("FaceDown") && ZoneType.Battlefield.equals(destination)) { - c.setState(CardStateName.FaceDown, true); + c.turnFaceDown(true); // set New Pt doesn't work because this values need to be copyable for clone effects - if (sa.hasParam("FaceDownPower") || sa.hasParam("FaceDownToughness")) { - if (sa.hasParam("FaceDownPower")) { - c.setBasePower(AbilityUtils.calculateAmount( - source, sa.getParam("FaceDownPower"), sa)); - } - if (sa.hasParam("FaceDownToughness")) { - c.setBaseToughness(AbilityUtils.calculateAmount( - source, sa.getParam("FaceDownToughness"), sa)); - } + if (sa.hasParam("FaceDownPower")) { + c.setBasePower(AbilityUtils.calculateAmount( + source, sa.getParam("FaceDownPower"), sa)); + } + if (sa.hasParam("FaceDownToughness")) { + c.setBaseToughness(AbilityUtils.calculateAmount( + source, sa.getParam("FaceDownToughness"), sa)); } if (sa.hasParam("FaceDownAddType")) { - CardType t = new CardType(c.getCurrentState().getType()); - t.addAll(Arrays.asList(sa.getParam("FaceDownAddType").split(","))); - c.getCurrentState().setType(t); + for (String type : sa.getParam("FaceDownAddType").split(",")) { + c.addType(type); + } } if (sa.hasParam("FaceDownPower") || sa.hasParam("FaceDownToughness") @@ -1091,7 +1089,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { // need to do that again? if (sa.hasParam("FaceDown") && !ZoneType.Battlefield.equals(destination)) { - movedCard.setState(CardStateName.FaceDown, true); + movedCard.turnFaceDown(true); } movedCard.setTimestamp(ts); } @@ -1105,7 +1103,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { movedCard.setExiledWith(host); } if (sa.hasParam("ExileFaceDown")) { - movedCard.setState(CardStateName.FaceDown, true); + movedCard.turnFaceDown(true); } } else { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java index ea0cc83331a..693297aab7a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java @@ -1,26 +1,16 @@ package forge.game.ability.effects; import forge.GameCommand; -import forge.card.CardStateName; -import forge.card.MagicColor; -import forge.card.mana.ManaCost; import forge.game.Game; -import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.*; import forge.game.event.GameEventCardStatsChanged; import forge.game.player.Player; -import forge.game.replacement.ReplacementEffect; import forge.game.spellability.SpellAbility; -import forge.game.staticability.StaticAbility; -import forge.game.trigger.Trigger; -import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; -import java.util.Arrays; import java.util.List; -import java.util.Map; public class CloneEffect extends SpellAbilityEffect { // TODO update this method @@ -57,7 +47,6 @@ public class CloneEffect extends SpellAbilityEffect { final Card host = sa.getHostCard(); final Player activator = sa.getActivatingPlayer(); Card tgtCard = host; - final Map origSVars = host.getSVars(); final Game game = activator.getGame(); // find cloning source i.e. thing to be copied @@ -91,9 +80,14 @@ public class CloneEffect extends SpellAbilityEffect { } // find target of cloning i.e. card becoming a clone - final List cloneTargets = AbilityUtils.getDefinedCards(host, sa.getParam("CloneTarget"), sa); - if (!cloneTargets.isEmpty()) { - tgtCard = cloneTargets.get(0); + if (sa.hasParam("CloneTarget")) { + final List cloneTargets = AbilityUtils.getDefinedCards(host, sa.getParam("CloneTarget"), sa); + if (!cloneTargets.isEmpty()) { + tgtCard = cloneTargets.get(0); + game.getTriggerHandler().clearInstrinsicActiveTriggers(tgtCard, null); + } + } else if (sa.hasParam("Choices") && sa.usesTargeting()) { + tgtCard = sa.getTargets().getFirstTargetedCard(); game.getTriggerHandler().clearInstrinsicActiveTriggers(tgtCard, null); } @@ -103,96 +97,12 @@ public class CloneEffect extends SpellAbilityEffect { } } - // determine the image to be used for the clone - String imageFileName = cardToCopy.getGame().getRules().canCloneUseTargetsImage() ? tgtCard.getImageKey() : cardToCopy.getImageKey(); - if (sa.hasParam("ImageSource")) { // Allow the image to be stipulated by using a defined card source - List cloneImgSources = AbilityUtils.getDefinedCards(host, sa.getParam("ImageSource"), sa); - if (!cloneImgSources.isEmpty()) { - imageFileName = cloneImgSources.get(0).getImageKey(); - } - } + final Long ts = game.getNextTimestamp(); + tgtCard.addCloneState(CardFactory.getCloneStates(cardToCopy, tgtCard, sa), ts); - final boolean keepName = sa.hasParam("KeepName"); - final String newName = sa.getParamOrDefault("NewName", null); - final String originalName = tgtCard.getName(); - final boolean copyingSelf = (tgtCard == cardToCopy); - final boolean isTransformed = cardToCopy.getCurrentStateName() == CardStateName.Transformed || cardToCopy.getCurrentStateName() == CardStateName.Meld || cardToCopy.getCurrentStateName() == CardStateName.Flipped; - final CardStateName origState = isTransformed || cardToCopy.isFaceDown() ? CardStateName.Original : cardToCopy.getCurrentStateName(); - - if (!copyingSelf) { - if (tgtCard.isCloned()) { // cloning again - tgtCard.switchStates(CardStateName.Cloner, origState, false); - tgtCard.setState(origState, false); - tgtCard.clearStates(CardStateName.Cloner, false); - } - // add "Cloner" state to clone - tgtCard.addAlternateState(CardStateName.Cloner, false); - tgtCard.switchStates(origState, CardStateName.Cloner, false); - tgtCard.setState(origState, false); - } else { - //copy Original state to Cloned - tgtCard.addAlternateState(CardStateName.Cloned, false); - tgtCard.switchStates(origState, CardStateName.Cloned, false); - if (tgtCard.isFlipCard()) { - tgtCard.setState(CardStateName.Original, false); - } - } - - CardFactory.copyCopiableCharacteristics(cardToCopy, tgtCard); - - // add extra abilities as granted by the copy effect - addExtraCharacteristics(tgtCard, sa, origSVars); - - // set the host card for copied replacement effects - // needed for copied xPaid ETB effects (for the copy, xPaid = 0) - for (final ReplacementEffect rep : tgtCard.getReplacementEffects()) { - final SpellAbility newSa = rep.getOverridingAbility(); - if (newSa != null) { - newSa.setOriginalHost(cardToCopy); - } - } - - // set the host card for copied spellabilities - for (final SpellAbility newSa : tgtCard.getSpellAbilities()) { - newSa.setOriginalHost(cardToCopy); - } - - // restore name if it should be unchanged - // this should only be used for Sakashima the Impostor Avatar - if (keepName) { - tgtCard.setName(originalName); - } - if (newName != null) { - tgtCard.setName(newName); - } - - // If target is a flip card, also set characteristics of the flipped - // state. - if (cardToCopy.isFlipCard()) { - final CardState flippedState = tgtCard.getState(CardStateName.Flipped); - if (keepName) { - flippedState.setName(originalName); - } - if (newName != null) { - tgtCard.setName(newName); - } - //keep the Clone card image for the cloned card - flippedState.setImageKey(imageFileName); - } - - //Clean up copy of cloned state - if (copyingSelf) { - tgtCard.clearStates(CardStateName.Cloned, false); - } - - //game.getTriggerHandler().registerActiveTrigger(tgtCard, false); - - //keep the Clone card image for the cloned card - if (cardToCopy.isFlipCard() && tgtCard.getCurrentStateName() != CardStateName.Flipped) { - //for a flip card that isn't flipped, load the original image - tgtCard.setImageKey(cardToCopy.getImageKey(CardStateName.Original)); - } else { - tgtCard.setImageKey(imageFileName); + // set ETB tapped of clone + if (sa.hasParam("IntoPlayTapped")) { + tgtCard.setTapped(true); } tgtCard.updateStateForView(); @@ -213,10 +123,7 @@ public class CloneEffect extends SpellAbilityEffect { @Override public void run() { - if (cloneCard.isCloned()) { - cloneCard.setState(CardStateName.Cloner, false); - cloneCard.switchStates(CardStateName.Cloner, origState, false); - cloneCard.clearStates(CardStateName.Cloner, false); + if (cloneCard.removeCloneState(ts)) { cloneCard.updateStateForView(); game.fireEvent(new GameEventCardStatsChanged(cloneCard)); } @@ -237,144 +144,4 @@ public class CloneEffect extends SpellAbilityEffect { game.fireEvent(new GameEventCardStatsChanged(tgtCard)); } // cloneResolve - private static void addExtraCharacteristics(final Card tgtCard, final SpellAbility sa, final Map origSVars) { - // additional types to clone - if (sa.hasParam("AddTypes")) { - for (final String type : Arrays.asList(sa.getParam("AddTypes").split(","))) { - tgtCard.addType(type); - } - } - - // triggers to add to clone - if (sa.hasParam("AddTriggers")) { - for (final String s : Arrays.asList(sa.getParam("AddTriggers").split(","))) { - if (origSVars.containsKey(s)) { - final String actualTrigger = origSVars.get(s); - final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, tgtCard, true); - tgtCard.addTrigger(parsedTrigger); - } - } - } - - // SVars to add to clone - if (sa.hasParam("AddSVars")) { - for (final String s : Arrays.asList(sa.getParam("AddSVars").split(","))) { - if (origSVars.containsKey(s)) { - final String actualsVar = origSVars.get(s); - tgtCard.setSVar(s, actualsVar); - } - } - } - - // abilities to add to clone - if (sa.hasParam("AddAbilities")) { - for (final String s : Arrays.asList(sa.getParam("AddAbilities").split(","))) { - if (origSVars.containsKey(s)) { - final String actualAbility = origSVars.get(s); - final SpellAbility grantedAbility = AbilityFactory.getAbility(actualAbility, tgtCard); - tgtCard.addSpellAbility(grantedAbility); - } - } - } - - // keywords to add to clone - - if (sa.hasParam("AddKeywords")) { - final List keywords = Arrays.asList(sa.getParam("AddKeywords").split(" & ")); - // allow SVar substitution for keywords - for (int i = 0; i < keywords.size(); i++) { - String k = keywords.get(i); - if (origSVars.containsKey(k)) { - keywords.add("\"" + k + "\""); - keywords.remove(k); - } - k = keywords.get(i); - - tgtCard.addIntrinsicKeyword(k); - } - } - - // set ETB tapped of clone - if (sa.hasParam("IntoPlayTapped")) { - tgtCard.setTapped(true); - } - - // set power of clone - if (sa.hasParam("SetPower")) { - String rhs = sa.getParam("SetPower"); - int power = Integer.MAX_VALUE; - try { - power = Integer.parseInt(rhs); - } catch (final NumberFormatException e) { - power = CardFactoryUtil.xCount(tgtCard, tgtCard.getSVar(rhs)); - } - for (StaticAbility sta : tgtCard.getStaticAbilities()) { - Map params = sta.getMapParams(); - if (params.containsKey("CharacteristicDefining") && params.containsKey("SetPower")) - tgtCard.removeStaticAbility(sta); - } - tgtCard.setBasePower(power); - } - - // set toughness of clone - if (sa.hasParam("SetToughness")) { - String rhs = sa.getParam("SetToughness"); - int toughness = Integer.MAX_VALUE; - try { - toughness = Integer.parseInt(rhs); - } catch (final NumberFormatException e) { - toughness = CardFactoryUtil.xCount(tgtCard, tgtCard.getSVar(rhs)); - } - for (StaticAbility sta : tgtCard.getStaticAbilities()) { - Map params = sta.getMapParams(); - if (params.containsKey("CharacteristicDefining") && params.containsKey("SetToughness")) - tgtCard.removeStaticAbility(sta); - } - tgtCard.setBaseToughness(toughness); - } - - // colors to be added or changed to - String shortColors = ""; - if (sa.hasParam("Colors")) { - final String colors = sa.getParam("Colors"); - if (colors.equals("ChosenColor")) { - shortColors = CardUtil.getShortColorsString(tgtCard.getChosenColors()); - } else { - shortColors = CardUtil.getShortColorsString(Arrays.asList(colors.split(","))); - } - } - if (sa.hasParam("OverwriteColors")) { - tgtCard.setColor(shortColors); - } else { - // TODO: this actually doesn't work for some reason (and fiddling with timestamps doesn't seem to fix it). - // No cards currently use this, but if some ever do, this code will require tweaking. - tgtCard.addColor(shortColors, true, tgtCard.getTimestamp()); - } - - if (sa.hasParam("Embalm") && tgtCard.isEmbalmed()) { - tgtCard.addType("Zombie"); - tgtCard.setColor(MagicColor.WHITE); - tgtCard.setManaCost(ManaCost.NO_COST); - } - if (sa.hasParam("Eternalize") && tgtCard.isEternalized()) { - tgtCard.addType("Zombie"); - tgtCard.setColor(MagicColor.BLACK); - tgtCard.setManaCost(ManaCost.NO_COST); - tgtCard.setBasePower(4); - tgtCard.setBaseToughness(4); - } - - if (sa.hasParam("GainThisAbility")) { - SpellAbility root = sa.getRootAbility(); - - if (root.isTrigger() && root.getTrigger() != null) { - tgtCard.addTrigger(root.getTrigger().copy(tgtCard, false)); - } else if (root.isReplacementAbility()) { - tgtCard.addReplacementEffect(root.getReplacementEffect().copy(tgtCard, false)); - } else { - tgtCard.addSpellAbility(root.copy(tgtCard, false)); - } - } - } - } diff --git a/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java index a0e9cf35eb0..b8772a74298 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java @@ -27,8 +27,6 @@ import forge.game.event.GameEventCombatChanged; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.staticability.StaticAbility; -import forge.game.trigger.Trigger; -import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.Aggregates; @@ -262,7 +260,7 @@ public class CopyPermanentEffect extends SpellAbilityEffect { final List keywords = Lists.newArrayList(); final List types = Lists.newArrayList(); final List svars = Lists.newArrayList(); - final List triggers = Lists.newArrayList(); + //final List triggers = Lists.newArrayList(); boolean asNonLegendary = false; if (sa.hasParam("Keywords")) { @@ -277,9 +275,11 @@ public class CopyPermanentEffect extends SpellAbilityEffect { if (sa.hasParam("AddSVars")) { svars.addAll(Arrays.asList(sa.getParam("AddSVars").split(" & "))); } + /* if (sa.hasParam("Triggers")) { triggers.addAll(Arrays.asList(sa.getParam("Triggers").split(" & "))); } + //*/ final Card copy = CardFactory.copyCopiableCharacteristics(original, sa.getActivatingPlayer()); copy.setToken(true); @@ -312,11 +312,13 @@ public class CopyPermanentEffect extends SpellAbilityEffect { } copy.setSVar(name, actualsVar); } + /* for (final String s : triggers) { final String actualTrigger = host.getSVar(s); final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, copy, true); copy.addTrigger(parsedTrigger); } + //*/ // set power of clone if (sa.hasParam("SetPower")) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java index c1b9dca94da..9e5448cd3a8 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java @@ -1,6 +1,5 @@ package forge.game.ability.effects; -import forge.card.CardStateName; import forge.game.Game; import forge.game.GameActionUtil; import forge.game.ability.AbilityUtils; @@ -318,7 +317,7 @@ public class DigEffect extends SpellAbilityEffect { } if (sa.hasParam("ExileFaceDown")) { - c.setState(CardStateName.FaceDown, true); + c.turnFaceDown(true); } if (sa.hasParam("Imprint")) { host.addImprintedCard(c); diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java index 72085b71795..df65ba34109 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java @@ -70,8 +70,8 @@ public class PlayLandVariantEffect extends SpellAbilityEffect { } final String imageFileName = game.getRules().canCloneUseTargetsImage() ? source.getImageKey() : random.getImageKey(); - source.addAlternateState(CardStateName.Cloner, false); - source.switchStates(CardStateName.Original, CardStateName.Cloner, false); + //source.addAlternateState(CardStateName.Cloner, false); + //source.switchStates(CardStateName.Original, CardStateName.Cloner, false); source.setState(CardStateName.Original, false); source.updateStateForView(); final CardStateName stateToCopy = random.getCurrentStateName(); diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index e28a56cd997..740d74b99fb 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -88,7 +88,6 @@ public class Card extends GameEntity implements Comparable { private final Map states = Maps.newEnumMap(CardStateName.class); private CardState currentState; private CardStateName currentStateName = CardStateName.Original; - private CardStateName preFaceDownState = CardStateName.Original; private ZoneType castFrom = null; private SpellAbility castSA = null; @@ -119,6 +118,7 @@ public class Card extends GameEntity implements Comparable { private final Map changedCardTypes = Maps.newTreeMap(); private final Map changedCardKeywords = Maps.newTreeMap(); private final Map changedCardColors = Maps.newTreeMap(); + private final NavigableMap clonedStates = Maps.newTreeMap(); // changes that say "replace each instance of one [color,type] by another - timestamp is the key of maps private final CardChangedWords changedTextColors = new CardChangedWords(); @@ -170,6 +170,11 @@ public class Card extends GameEntity implements Comparable { private boolean madness = false; private boolean madnessWithoutCast = false; + private boolean flipped = false; + private boolean facedown = false; + // set for transform and meld, needed for clone effects + private boolean backside = false; + private boolean phasedOut = false; private boolean directlyPhasedOut = true; @@ -302,25 +307,10 @@ public class Card extends GameEntity implements Comparable { } public boolean changeToState(final CardStateName state) { - CardStateName cur = currentStateName; - - if (!setState(state, true)) { - return false; + if (hasState(state)) { + return setState(state, true); } - - if ((cur == CardStateName.Original && state == CardStateName.Transformed) - || (cur == CardStateName.Transformed && state == CardStateName.Original)) { - - // Clear old dfc trigger from the trigger handler - getGame().getTriggerHandler().clearInstrinsicActiveTriggers(this, null); - getGame().getTriggerHandler().registerActiveTrigger(this, false); - Map runParams = Maps.newHashMap(); - runParams.put("Transformer", this); - getGame().getTriggerHandler().runTrigger(TriggerType.Transformed, runParams, false); - this.incrementTransformedTimestamp(); - } - - return true; + return false; } public long getTransformedTimestamp() { return transformedTimestamp; } @@ -366,23 +356,55 @@ public class Card extends GameEntity implements Comparable { return null; } public CardState getState(final CardStateName state) { + CardCloneStates clStates = getLastClonedState(); + if (clStates == null) { + return getOriginalState(state); + } else { + return clStates.get(state); + } + } + + public boolean hasState(final CardStateName state) { + if (state == CardStateName.FaceDown) { + return true; + } + CardCloneStates clStates = getLastClonedState(); + if (clStates == null) { + return states.containsKey(state); + } else { + return clStates.containsKey(state); + } + } + + public CardState getOriginalState(final CardStateName state) { if (!states.containsKey(state) && state == CardStateName.FaceDown) { states.put(CardStateName.FaceDown, CardUtil.getFaceDownCharacteristic(this)); } return states.get(state); } + public boolean setState(final CardStateName state, boolean updateView) { - if (!states.containsKey(state)) { - if (state == CardStateName.FaceDown) { - // The face-down state is created lazily only when needed. - states.put(CardStateName.FaceDown, CardUtil.getFaceDownCharacteristic(this)); - } else { - System.out.println(getName() + " tried to switch to non-existant state \"" + state + "\"!"); - return false; // Nonexistant state. + return setState(state, updateView, false); + } + public boolean setState(final CardStateName state, boolean updateView, boolean forceUpdate) { + CardCloneStates cloneStates = getLastClonedState(); + + if (cloneStates == null) { + if (!states.containsKey(state)) { + if (state == CardStateName.FaceDown) { + // The face-down state is created lazily only when needed. + states.put(CardStateName.FaceDown, CardUtil.getFaceDownCharacteristic(this)); + } else { + System.out.println(getName() + " tried to switch to non-existant state \"" + state + "\"!"); + return false; // Nonexistant state. + } } + } else if (!cloneStates.containsKey(state)) { + throw new RuntimeException(getName() + " tried to switch to non-existant cloned state \"" + state + "\"!"); + //return false; // Nonexistant state. } - if (state.equals(currentStateName)) { + if (state.equals(currentStateName) && !forceUpdate) { return false; } @@ -392,7 +414,7 @@ public class Card extends GameEntity implements Comparable { } currentStateName = state; - currentState = states.get(state); + currentState = cloneStates == null ? states.get(state) : cloneStates.get(state); // update the host for static abilities for (StaticAbility sa : currentState.getStaticAbilities()) { @@ -432,6 +454,14 @@ public class Card extends GameEntity implements Comparable { return currentStateName; } + // use by CopyPermament + public void setStates(Map map) { + states.clear(); + states.putAll(map); + } + + // was only used for Clone Effects + @Deprecated public void switchStates(final CardStateName from, final CardStateName to, boolean updateView) { final CardState tmp = states.get(from); states.put(from, states.get(to)); @@ -445,7 +475,7 @@ public class Card extends GameEntity implements Comparable { } public final void addAlternateState(final CardStateName state, final boolean updateView) { - states.put(state, new CardState(view.createAlternateState(state), this)); + states.put(state, new CardState(this, state)); if (updateView) { view.updateState(this); } @@ -483,10 +513,6 @@ public class Card extends GameEntity implements Comparable { currentState.getView().updateType(currentState); } - public void setPreFaceDownState(CardStateName preCharacteristic) { - preFaceDownState = preCharacteristic; - } - public boolean changeCardState(final String mode, final String customState) { if (mode == null) return changeToState(CardStateName.smartValueOf(customState)); @@ -501,26 +527,51 @@ public class Card extends GameEntity implements Comparable { return false; } - CardStateName destState = oldState == CardStateName.Transformed ? CardStateName.Original : CardStateName.Transformed; + backside = !backside; - return changeToState(destState); + boolean result = changeToState(backside ? CardStateName.Transformed : CardStateName.Original); + + // do the Transform trigger there, it can also happen if the resulting state doesn't change + + // Clear old dfc trigger from the trigger handler + getGame().getTriggerHandler().clearInstrinsicActiveTriggers(this, null); + getGame().getTriggerHandler().registerActiveTrigger(this, false); + Map runParams = Maps.newHashMap(); + runParams.put("Transformer", this); + getGame().getTriggerHandler().runTrigger(TriggerType.Transformed, runParams, false); + incrementTransformedTimestamp(); + + return result; } else if (mode.equals("Flip") && isFlipCard()) { - CardStateName destState = oldState == CardStateName.Flipped ? CardStateName.Original : CardStateName.Flipped; - return changeToState(destState); + // 709.4. Flipping a permanent is a one-way process. + if (isFlipped()) { + return false; + } + + flipped = true; + + // a facedown card does flip but the state doesn't change + if (isFaceDown()) { + return false; + } + + return changeToState(CardStateName.Flipped); } else if (mode.equals("TurnFace")) { - if (oldState == CardStateName.Original) { + if (oldState == CardStateName.Original || oldState == CardStateName.Flipped) { // Reset cloned state if Vesuvan Shapeshifter + /* if (isCloned() && getState(CardStateName.Cloner).getName().equals("Vesuvan Shapeshifter")) { switchStates(CardStateName.Cloner, CardStateName.Original, false); setState(CardStateName.Original, false); clearStates(CardStateName.Cloner, false); } + //*/ return turnFaceDown(); - } else if (oldState == CardStateName.FaceDown) { + } else if (isFaceDown()) { return turnFaceUp(); } - } else if (mode.equals("Meld") && hasAlternateState()) { + } else if (mode.equals("Meld") && isMeldable()) { return changeToState(CardStateName.Meld); } return false; @@ -543,7 +594,6 @@ public class Card extends GameEntity implements Comparable { setController(p, game.getNextTimestamp()); // Mark this card as "manifested" - setPreFaceDownState(CardStateName.Original); setManifested(true); Card c = game.getAction().moveToPlay(this, p, sa); @@ -564,14 +614,14 @@ public class Card extends GameEntity implements Comparable { public boolean turnFaceDown(boolean override) { if (override || (!isDoubleFaced() && !isMeldable())) { - preFaceDownState = currentStateName; + facedown = true; return setState(CardStateName.FaceDown, true); } return false; } public boolean turnFaceDownNoUpdate() { - preFaceDownState = currentStateName; + facedown = true; return setState(CardStateName.FaceDown, false); } @@ -580,16 +630,22 @@ public class Card extends GameEntity implements Comparable { } public boolean turnFaceUp(boolean manifestPaid, boolean runTriggers) { - if (currentStateName == CardStateName.FaceDown) { - if (manifestPaid && this.isManifested() && !this.getRules().getType().isCreature()) { + if (isFaceDown()) { + if (manifestPaid && isManifested() && !getRules().getType().isCreature()) { // If we've manifested a non-creature and we're demanifesting disallow it // Unless this creature also has a Morph ability - return false; } - boolean result = setState(preFaceDownState, true); + boolean result; + if (isFlipped() && isFlipCard()) { + result = setState(CardStateName.Flipped, true); + } else { + result = setState(CardStateName.Original, true); + } + + facedown = false; // need to run faceup commands, currently // it does cleanup the modified facedown state if (result) { @@ -619,10 +675,15 @@ public class Card extends GameEntity implements Comparable { return false; } - CardStateName oldState = getCurrentStateName(); - CardStateName destState = oldState == CardStateName.Transformed ? CardStateName.Original : CardStateName.Transformed; + CardStateName destState = backside ? CardStateName.Original : CardStateName.Transformed; - if (isInPlay() && !getState(destState).getType().isPermanent()) { + // below only when in play + if (!isInPlay()) { + return true; + } + + // use Original State for the transform check + if (!getOriginalState(destState).getType().isPermanent()) { return false; } @@ -653,8 +714,7 @@ public class Card extends GameEntity implements Comparable { } public final boolean isInAlternateState() { - return currentStateName != CardStateName.Original - && currentStateName != CardStateName.Cloned; + return currentStateName != CardStateName.Original; } public final boolean hasAlternateState() { @@ -675,23 +735,27 @@ public class Card extends GameEntity implements Comparable { } public final boolean isDoubleFaced() { - return states.containsKey(CardStateName.Transformed); + return getRules() != null && getRules().getSplitType() == CardSplitType.Transform; } public final boolean isMeldable() { - return states.containsKey(CardStateName.Meld); + return getRules() != null && getRules().getSplitType() == CardSplitType.Meld; } public final boolean isFlipCard() { - return states.containsKey(CardStateName.Flipped); + return hasState(CardStateName.Flipped); } public final boolean isSplitCard() { - return states.containsKey(CardStateName.LeftSplit); + return getRules() != null && getRules().getSplitType() == CardSplitType.Split; + } + + public final boolean isBackSide() { + return backside; } public boolean isCloned() { - return states.containsKey(CardStateName.Cloner); + return !clonedStates.isEmpty(); } public static List getStorableSVars() { @@ -2396,7 +2460,20 @@ public class Card extends GameEntity implements Comparable { } public final boolean isFaceDown() { - return currentStateName == CardStateName.FaceDown; + //return currentStateName == CardStateName.FaceDown; + return facedown; + } + + public final void setFaceDown(boolean value) { + facedown = value; + } + + public final boolean isFlipped() { + return flipped; + } + + public final void setFlipped(boolean value) { + flipped = value; } public final void setCanCounter(final boolean b) { @@ -2900,11 +2977,9 @@ public class Card extends GameEntity implements Comparable { public final void setColor(final String color) { currentState.setColor(color); - currentState.getView().updateColors(this); } public final void setColor(final byte color) { currentState.setColor(color); - currentState.getView().updateColors(this); } public final ColorSet determineColor() { @@ -2977,6 +3052,51 @@ public class Card extends GameEntity implements Comparable { return getLatestPT().getRight(); } + public final void addCloneState(CardCloneStates states, final long timestamp) { + clonedStates.put(timestamp, states); + updateCloneState(true); + } + + public final boolean removeCloneState(final long timestamp) { + if (clonedStates.remove(timestamp) != null) { + updateCloneState(true); + return true; + } + return false; + } + + public final Card getCloner() { + CardCloneStates clStates = getLastClonedState(); + if (clStates == null) { + return null; + } + return clStates.getHost(); + } + + public final void removeCloneStates() { + clonedStates.clear(); + } + + private final void updateCloneState(final boolean updateView) { + if (isFaceDown()) { + setState(CardStateName.FaceDown, updateView, true); + } else if (isFlipped() && hasState(CardStateName.Flipped)) { + setState(CardStateName.Flipped, updateView, true); + } else if (backside && isDoubleFaced()) { + setState(CardStateName.Transformed, updateView, true); + } else if (backside && isMeldable()) { + setState(CardStateName.Meld, updateView, true); + } else { + setState(CardStateName.Original, updateView, true); + } + } + + private final CardCloneStates getLastClonedState() { + if (clonedStates.isEmpty()) { + return null; + } + return clonedStates.lastEntry().getValue(); + } /** * * Get the latest set Power and Toughness of this Card. diff --git a/forge-game/src/main/java/forge/game/card/CardCloneStates.java b/forge-game/src/main/java/forge/game/card/CardCloneStates.java new file mode 100644 index 00000000000..c6227a67d07 --- /dev/null +++ b/forge-game/src/main/java/forge/game/card/CardCloneStates.java @@ -0,0 +1,54 @@ +package forge.game.card; + +import java.util.Map; + +import com.google.common.collect.ForwardingMap; +import com.google.common.collect.Maps; + +import forge.card.CardStateName; +import forge.game.spellability.SpellAbility; + +public class CardCloneStates extends ForwardingMap { + + private Map dataMap = Maps.newEnumMap(CardStateName.class); + + private Card origin = null; + private SpellAbility sa = null; + + public CardCloneStates(Card origin, SpellAbility sa) { + super(); + this.origin = origin; + this.sa = sa; + } + + public Card getOrigin() { + return origin; + } + + public SpellAbility getSource() { + return sa; + } + + public Card getHost() { + return sa.getHostCard(); + } + + @Override + protected Map delegate() { + return dataMap; + } + + public CardState get(CardStateName key) { + if (dataMap.containsKey(key)) { + return super.get(key); + } + CardState original = super.get(CardStateName.Original); + // need to copy it so the view has the right state name + CardState result = new CardState(original.getCard(), key); + result.copyFrom(original, false); + dataMap.put(key, result); + return result; + } + + +} diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index 82db7497427..428b217f766 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -6,19 +6,22 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ package forge.game.card; import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; + +import forge.ImageKeys; import forge.StaticData; import forge.card.*; import forge.card.mana.ManaCost; @@ -27,15 +30,19 @@ import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.cost.Cost; import forge.game.player.Player; +import forge.game.replacement.ReplacementEffect; import forge.game.replacement.ReplacementHandler; import forge.game.spellability.*; +import forge.game.staticability.StaticAbility; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.trigger.WrappedAbility; import forge.game.zone.ZoneType; import forge.item.IPaperCard; import forge.item.PaperCard; +import forge.util.TextUtil; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -44,7 +51,7 @@ import java.util.Map.Entry; *

* AbstractCardFactory class. *

- * + * * TODO The map field contains Card instances that have not gone through * getCard2, and thus lack abilities. However, when a new Card is requested via * getCard, it is this map's values that serve as the templates for the values @@ -54,7 +61,7 @@ import java.util.Map.Entry; * only one or the other. We may experiment in the future with using * allCard-type values for the map instead of the less complete ones that exist * there today. - * + * * @author Forge * @version $Id$ */ @@ -63,7 +70,7 @@ public class CardFactory { *

* copyCard. *

- * + * * @param in * a {@link forge.game.card.Card} object. * @return a {@link forge.game.card.Card} object. @@ -71,7 +78,7 @@ public class CardFactory { public final static Card copyCard(final Card in, boolean assignNewId) { Card out; if (!(in.isToken() || in.getCopiedPermanent() != null)) { - out = assignNewId ? getCard(in.getPaperCard(), in.getOwner(), in.getGame()) + out = assignNewId ? getCard(in.getPaperCard(), in.getOwner(), in.getGame()) : getCard(in.getPaperCard(), in.getOwner(), in.getId(), in.getGame()); } else { // token out = CardFactory.copyStats(in, in.getController(), assignNewId); @@ -101,6 +108,7 @@ public class CardFactory { out.addImprintedCard(o); } out.setCommander(in.isCommander()); + //out.setFaceDown(in.isFaceDown()); return out; @@ -110,16 +118,16 @@ public class CardFactory { *

* copyCardWithChangedStats *

- * + * * This method copies the card together with certain temporarily changed stats of the card * (namely, changed color, changed types, changed keywords). - * + * * copyCardWithChangedStats must NOT be used for ordinary card copy operations because * according to MTG rules the changed text (including keywords, types) is not copied over * to cards cloned by another card. However, this method is useful, for example, for certain * triggers that demand the latest information about the changes to the card which is lost * when the card changes its zone after GameAction::changeZone is called. - * + * * @param in * a {@link forge.game.card.Card} object. * @param assignNewId @@ -128,7 +136,7 @@ public class CardFactory { */ public static final Card copyCardWithChangedStats(final Card in, boolean assignNewId) { Card out = copyCard(in, assignNewId); - + // Copy changed color, type, keyword arrays (useful for some triggers that require // information about the latest state of the card as it left the battlefield) out.setChangedCardColors(in.getChangedCardColors()); @@ -197,7 +205,7 @@ public class CardFactory { * creates a copy of the Spell/ability `sa`, and puts it on the stack. * if sa is a spell, that spell's host is also copied. *

- * + * * @param source * a {@link forge.game.card.Card} object. The card doing the copying. * @param original @@ -297,7 +305,7 @@ public class CardFactory { c.setRarity(cp.getRarity()); c.setState(CardStateName.Original, false); } - + return c; } @@ -357,7 +365,7 @@ public class CardFactory { StringBuilder saSB = new StringBuilder(); saSB.append("AB$ RollPlanarDice | Cost$ X | SorcerySpeed$ True | AnyPlayer$ True | ActivationZone$ Command | "); - saSB.append("SpellDescription$ Roll the planar dice. X is equal to the amount of times the planar die has been rolled this turn."); + saSB.append("SpellDescription$ Roll the planar dice. X is equal to the amount of times the planar die has been rolled this turn."); card.setSVar("RolledWalk", "DB$ Planeswalk | Cost$ 0"); Trigger planesWalkTrigger = TriggerHandler.parseTrigger(triggerSB.toString(), card, true); @@ -389,7 +397,7 @@ public class CardFactory { if (st == CardSplitType.Split) { card.addAlternateState(CardStateName.LeftSplit, false); card.setState(CardStateName.LeftSplit, false); - } + } readCardFace(card, rules.getMainPart()); @@ -402,7 +410,7 @@ public class CardFactory { readCardFace(card, StaticData.instance().getCommonCards().getRules(rules.getMeldWith()).getOtherPart()); } } - + if (card.isInAlternateState()) { card.setState(CardStateName.Original, false); } @@ -434,7 +442,7 @@ public class CardFactory { for (String r : face.getReplacements()) c.addReplacementEffect(ReplacementHandler.parseReplacement(r, c, true)); for (String s : face.getStaticAbilities()) c.addStaticAbility(s); for (String t : face.getTriggers()) c.addTrigger(TriggerHandler.parseTrigger(t, c, true)); - + for (Entry v : face.getVariables()) c.setSVar(v.getKey(), v.getValue()); // keywords not before variables @@ -463,7 +471,7 @@ public class CardFactory { // SpellPermanent only for Original State if (c.getCurrentStateName() == CardStateName.Original) { - // this is the "default" spell for permanents like creatures and artifacts + // this is the "default" spell for permanents like creatures and artifacts if (c.isPermanent() && !c.isAura() && !c.isLand()) { c.addSpellAbility(new SpellPermanent(c)); } @@ -484,7 +492,7 @@ public class CardFactory { final Card c = new Card(id, from.getPaperCard(), from.getGame()); c.setOwner(newOwner); c.setSetCode(from.getSetCode()); - + copyCopiableCharacteristics(from, c); return c; } @@ -492,7 +500,7 @@ public class CardFactory { /** * Copy the copiable characteristics of one card to another, taking the * states of both cards into account. - * + * * @param from the {@link Card} to copy from. * @param to the {@link Card} to copy to. */ @@ -532,10 +540,10 @@ public class CardFactory { * This amounts to making a full copy of the card, including the current * state. *

- * + * * @param in * the {@link forge.game.card.Card} to be copied. - * @param newOwner + * @param newOwner * the {@link forge.game.player.Player} to be the owner of the newly * created Card. * @return a new {@link forge.game.card.Card}. @@ -546,24 +554,24 @@ public class CardFactory { id = newOwner == null ? 0 : newOwner.getGame().nextCardId(); } final Card c = new Card(id, in.getPaperCard(), in.getGame()); - + c.setOwner(newOwner); c.setSetCode(in.getSetCode()); - + for (final CardStateName state : in.getStates()) { CardFactory.copyState(in, state, c, state); } - + c.setState(in.getCurrentStateName(), false); c.setRules(in.getRules()); - + return c; } // copyStats() /** * Copy characteristics of a particular state of one card to those of a * (possibly different) state of another. - * + * * @param from * the {@link Card} to copy from. * @param fromState @@ -600,7 +608,7 @@ public class CardFactory { } to.setDescription(from.getOriginalDescription()); to.setStackDescription(from.getOriginalStackDescription()); - + if (from.getSubAbility() != null) { to.setSubAbility((AbilitySub) from.getSubAbility().copy(host, p, lki)); } @@ -638,7 +646,7 @@ public class CardFactory { /** * Copy triggered ability - * + * * return a wrapped ability */ public static SpellAbility getCopiedTriggeredAbility(final SpellAbility sa) { @@ -687,5 +695,210 @@ public class CardFactory { return wrapperAbility; } + public static CardCloneStates getCloneStates(final Card in, final Card out, final SpellAbility sa) { + final Card host = sa.getHostCard(); + final Map origSVars = host.getSVars(); + final List types = Lists.newArrayList(); + final List keywords = Lists.newArrayList(); + List creatureTypes = null; + final CardCloneStates result = new CardCloneStates(in, sa); + + final String newName = sa.getParamOrDefault("NewName", null); + String shortColors = ""; + + if (sa.hasParam("AddTypes")) { + types.addAll(Arrays.asList(sa.getParam("AddTypes").split(","))); + } + + if (sa.hasParam("AddKeywords")) { + keywords.addAll(Arrays.asList(sa.getParam("AddKeywords").split(" & "))); + } + + if (sa.hasParam("SetColor")) { + shortColors = CardUtil.getShortColorsString(Arrays.asList(sa.getParam("SetColor").split(","))); + } + + if (sa.hasParam("SetCreatureTypes")) { + creatureTypes = ImmutableList.copyOf(sa.getParam("SetCreatureTypes").split(" ")); + } + + // TODO handle Volrath's Shapeshifter + + if (in.isFaceDown()) { + // if something is cloning a facedown card, it only clones the + // facedown state into original + final CardState ret = new CardState(out, CardStateName.Original); + ret.copyFrom(in.getState(CardStateName.FaceDown), false); + result.put(CardStateName.Original, ret); + } else if (in.isFlipCard()) { + // if something is cloning a flip card, copy both original and + // flipped state + final CardState ret1 = new CardState(out, CardStateName.Original); + ret1.copyFrom(in.getState(CardStateName.Original), false); + result.put(CardStateName.Original, ret1); + + final CardState ret2 = new CardState(out, CardStateName.Flipped); + ret2.copyFrom(in.getState(CardStateName.Flipped), false); + result.put(CardStateName.Flipped, ret2); + } else { + // in all other cases just copy the current state to original + final CardState ret = new CardState(out, CardStateName.Original); + ret.copyFrom(in.getCurrentState(), false); + result.put(CardStateName.Original, ret); + } + + // update all states, both for flip cards + for (Map.Entry e : result.entrySet()) { + final CardState originalState = out.getState(e.getKey()); + final CardState state = e.getValue(); + // update the names for the states + if (sa.hasParam("KeepName")) { + state.setName(originalState.getName()); + } else if (newName != null) { + state.setName(newName); + } + + state.setColor(shortColors); + + if (sa.hasParam("NonLegendary")) { + state.removeType(CardType.Supertype.Legendary); + } + + for (final String type : types) { + state.addType(type); + } + + if (creatureTypes != null) { + state.setCreatureTypes(creatureTypes); + } + + state.addIntrinsicKeywords(keywords); + + if (sa.hasParam("SetPower")) { + state.setBasePower(Integer.parseInt(sa.getParam("SetPower"))); + } + if (sa.hasParam("SetToughness")) { + state.setBaseToughness(Integer.parseInt(sa.getParam("SetToughness"))); + } + + + // triggers to add to clone + if (sa.hasParam("AddTriggers")) { + for (final String s : Arrays.asList(sa.getParam("AddTriggers").split(","))) { + if (origSVars.containsKey(s)) { + final String actualTrigger = origSVars.get(s); + final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, out, true); + state.addTrigger(parsedTrigger); + } + } + } + + // SVars to add to clone + if (sa.hasParam("AddSVars")) { + for (final String s : Arrays.asList(sa.getParam("AddSVars").split(","))) { + if (origSVars.containsKey(s)) { + final String actualsVar = origSVars.get(s); + state.setSVar(s, actualsVar); + } + } + } + + + if (sa.hasParam("GainThisAbility")) { + SpellAbility root = sa.getRootAbility(); + + if (root.isTrigger() && root.getTrigger() != null) { + state.addTrigger(root.getTrigger().copy(out, false)); + } else if (root.isReplacementAbility()) { + state.addReplacementEffect(root.getReplacementEffect().copy(out, false)); + } else { + state.addSpellAbility(root.copy(out, false)); + } + } + + // Special Rules for Embalm and Eternalize + if (sa.hasParam("Embalm") && out.isEmbalmed()) { + state.addType("Zombie"); + state.setColor(MagicColor.WHITE); + state.setManaCost(ManaCost.NO_COST); + + String name = TextUtil.fastReplace( + TextUtil.fastReplace(state.getName(), ",", ""), + " ", "_").toLowerCase(); + state.setImageKey(ImageKeys.getTokenKey("embalm_" + name)); + } + + if (sa.hasParam("Eternalize") && out.isEternalized()) { + state.addType("Zombie"); + state.setColor(MagicColor.BLACK); + state.setManaCost(ManaCost.NO_COST); + state.setBasePower(4); + state.setBaseToughness(4); + + String name = TextUtil.fastReplace( + TextUtil.fastReplace(state.getName(), ",", ""), + " ", "_").toLowerCase(); + state.setImageKey(ImageKeys.getTokenKey("eternalize_" + name)); + } + + // set the host card for copied replacement effects + // needed for copied xPaid ETB effects (for the copy, xPaid = 0) + for (final ReplacementEffect rep : state.getReplacementEffects()) { + final SpellAbility newSa = rep.getOverridingAbility(); + if (newSa != null) { + newSa.setOriginalHost(in); + } + } + + // set the host card for copied spellabilities + for (final SpellAbility newSa : state.getSpellAbilities()) { + newSa.setOriginalHost(in); + } + + // remove some characteristic static abilties + for (StaticAbility sta : state.getStaticAbilities()) { + if (!sta.hasParam("CharacteristicDefining")) { + continue; + } + + if (sa.hasParam("SetPower") || sa.hasParam("Eternalize")) { + if (sta.hasParam("SetPower")) + state.removeStaticAbility(sta); + } + if (sa.hasParam("SetToughness") || sa.hasParam("Eternalize")) { + if (sta.hasParam("SetToughness")) + state.removeStaticAbility(sta); + } + if (sa.hasParam("SetCreatureTypes")) { + // currently only Changeling and similar should be affected by that + // other cards using AddType$ ChosenType should not + if (sta.hasParam("AddType") && "AllCreatureTypes".equals(sta.getParam("AddType"))) { + state.removeStaticAbility(sta); + } + } + if (sa.hasParam("SetColor") || sa.hasParam("Embalm") || sa.hasParam("Eternalize")) { + if (sta.hasParam("SetColor")) { + state.removeStaticAbility(sta); + } + } + } + + // remove some keywords + if (sa.hasParam("SetCreatureTypes")) { + state.removeIntrinsicKeyword("Changeling"); + } + if (sa.hasParam("SetColor") || sa.hasParam("Embalm") || sa.hasParam("Eternalize")) { + state.removeIntrinsicKeyword("Devoid"); + } + + for (SpellAbility ab : state.getSpellAbilities()) { + ab.getRestrictions().resetTurnActivations(); + } + } + + // Dont copy the facedown state, make new one + result.put(CardStateName.FaceDown, CardUtil.getFaceDownCharacteristic(out)); + return result; + } } // end class AbstractCardFactory diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 92febed99fc..3d69ca554b3 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -101,16 +101,18 @@ public class CardFactoryUtil { @Override public void resolve() { - Card c = hostCard.getGame().getAction().moveToPlay(hostCard, this); - c.setPreFaceDownState(CardStateName.Original); + hostCard.getGame().getAction().moveToPlay(hostCard, this); + //c.setPreFaceDownState(CardStateName.Original); } @Override public boolean canPlay() { CardStateName stateBackup = hostCard.getCurrentStateName(); - hostCard.setState(CardStateName.FaceDown, false); + boolean face = hostCard.isFaceDown(); + hostCard.turnFaceDownNoUpdate(); boolean success = super.canPlay(); hostCard.setState(stateBackup, false); + hostCard.setFaceDown(face); return success; } }; diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java index 972e9e2ec30..03f11ffaded 100644 --- a/forge-game/src/main/java/forge/game/card/CardUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardUtil.java @@ -229,10 +229,12 @@ public final class CardUtil { newCopy.getCurrentState().copyFrom(in.getState(in.getCurrentStateName()), true); + /* if (in.isCloned()) { newCopy.addAlternateState(CardStateName.Cloner, false); newCopy.getState(CardStateName.Cloner).copyFrom(in.getState(CardStateName.Cloner), true); } + //*/ newCopy.setType(new CardType(in.getType())); newCopy.setToken(in.isToken()); @@ -327,7 +329,7 @@ public final class CardUtil { final CardType type = new CardType(); type.add("Creature"); - final CardState ret = new CardState(c.getView().createAlternateState(CardStateName.FaceDown), c); + final CardState ret = new CardState(c, CardStateName.FaceDown); ret.setBasePower(2); ret.setBaseToughness(2); diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java index 4da63486f80..7120fa84372 100644 --- a/forge-game/src/main/java/forge/game/card/CardView.java +++ b/forge-game/src/main/java/forge/game/card/CardView.java @@ -113,7 +113,7 @@ public class CardView extends GameEntityView { } public boolean isFaceDown() { - return getCurrentState().getState() == CardStateName.FaceDown; + return get(TrackableProperty.Facedown);// getCurrentState().getState() == CardStateName.FaceDown; } public boolean isFlipCard() { @@ -121,16 +121,18 @@ public class CardView extends GameEntityView { } public boolean isFlipped() { - return getCurrentState().getState() == CardStateName.Flipped; + return get(TrackableProperty.Flipped); // getCurrentState().getState() == CardStateName.Flipped; } public boolean isSplitCard() { return get(TrackableProperty.SplitCard); } + /* public boolean isTransformed() { return getCurrentState().getState() == CardStateName.Transformed; } + //*/ public boolean isAttacking() { return get(TrackableProperty.Attacking); @@ -627,7 +629,9 @@ public class CardView extends GameEntityView { set(TrackableProperty.SplitCard, isSplitCard); set(TrackableProperty.FlipCard, c.isFlipCard()); - CardStateView cloner = CardView.getState(c, CardStateName.Cloner); + final Card cloner = c.getCloner(); + + //CardStateView cloner = CardView.getState(c, CardStateName.Cloner); set(TrackableProperty.Cloner, cloner == null ? null : cloner.getName() + " (" + cloner.getId() + ")"); CardState currentState = c.getCurrentState(); @@ -699,7 +703,7 @@ public class CardView extends GameEntityView { if (name.isEmpty()) { CardStateView alternate = getAlternateState(); if (alternate != null) { - if (this.getCurrentState().getState() == CardStateName.FaceDown) { + if (isFaceDown()) { return "Face-down card (H" + getHiddenId() + ")"; } else { return getAlternateState().getName() + " (" + getId() + ")"; diff --git a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java index b1d671b8660..f28a7e2a768 100644 --- a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java +++ b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java @@ -42,7 +42,7 @@ public class CostAdjustment { boolean isStateChangeToFaceDown = false; if (sa.isSpell() && ((Spell) sa).isCastFaceDown()) { // Turn face down to apply cost modifiers correctly - host.setState(CardStateName.FaceDown, false); + host.turnFaceDownNoUpdate(); isStateChangeToFaceDown = true; } // isSpell @@ -83,6 +83,7 @@ public class CostAdjustment { // Reset card state (if changed) if (isStateChangeToFaceDown) { host.setState(CardStateName.Original, false); + host.setFaceDown(false); } return result; } diff --git a/forge-game/src/main/java/forge/trackable/TrackableProperty.java b/forge-game/src/main/java/forge/trackable/TrackableProperty.java index 53672257efb..4e07fcad648 100644 --- a/forge-game/src/main/java/forge/trackable/TrackableProperty.java +++ b/forge-game/src/main/java/forge/trackable/TrackableProperty.java @@ -16,13 +16,20 @@ public enum TrackableProperty { CurrentPlane(TrackableTypes.StringType), PlanarPlayer(TrackableTypes.PlayerViewType), - //Card + //Card Owner(TrackableTypes.PlayerViewType), Controller(TrackableTypes.PlayerViewType), Zone(TrackableTypes.EnumType(ZoneType.class)), + + Flipped(TrackableTypes.BooleanType), + Facedown(TrackableTypes.BooleanType), + + //TODO? + Cloner(TrackableTypes.StringType), Cloned(TrackableTypes.BooleanType), FlipCard(TrackableTypes.BooleanType), SplitCard(TrackableTypes.BooleanType), + Attacking(TrackableTypes.BooleanType), Blocking(TrackableTypes.BooleanType), PhasedOut(TrackableTypes.BooleanType), @@ -47,7 +54,7 @@ public enum TrackableProperty { EncodedCards(TrackableTypes.CardViewCollectionType), GainControlTargets(TrackableTypes.CardViewCollectionType), CloneOrigin(TrackableTypes.CardViewType), - Cloner(TrackableTypes.StringType), + ImprintedCards(TrackableTypes.CardViewCollectionType), HauntedBy(TrackableTypes.CardViewCollectionType), Haunting(TrackableTypes.CardViewType), diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java index 4909b00b285..4e39f65c276 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java @@ -34,7 +34,6 @@ import forge.card.CardDetailUtil; import forge.card.CardDetailUtil.DetailColors; import forge.card.CardEdition; import forge.card.CardRarity; -import forge.card.CardStateName; import forge.game.GameView; import forge.game.card.Card; import forge.game.card.CardView; @@ -244,7 +243,7 @@ public class CardDetailPanel extends SkinnedPanel { setInfoLabel.setBorder(BorderFactory.createLineBorder(foreColor)); } - if (state.getState() == CardStateName.FaceDown) { + if (card.isFaceDown()) { updateBorder(state, false); // TODO: HACK! A temporary measure until the morphs still leaking color can be fixed properly. } else { updateBorder(state, mayView); diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java index 40a447be764..c8e567f880e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java @@ -38,7 +38,6 @@ import net.miginfocom.swing.MigLayout; import forge.CachedCardImage; import forge.card.CardDetailUtil; import forge.card.CardDetailUtil.DetailColors; -import forge.card.CardStateName; import forge.game.GameView; import forge.game.card.CardView.CardStateView; import forge.game.spellability.StackItemView; @@ -257,7 +256,7 @@ public class VStack implements IVDoc { // TODO: A hacky workaround is currently used to make the game not leak the color information for Morph cards. final CardStateView curState = item.getSourceCard().getCurrentState(); - final boolean isFaceDown = curState.getState() == CardStateName.FaceDown; + final boolean isFaceDown = item.getSourceCard().isFaceDown(); final DetailColors color = isFaceDown ? CardDetailUtil.DetailColors.FACE_DOWN : CardDetailUtil.getBorderColor(curState, true); // otherwise doesn't work correctly for face down Morphs setBackground(new Color(color.r, color.g, color.b)); setForeground(FSkin.getHighContrastColor(getBackground())); diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java index 0d15d62f5f4..7080e9427b0 100644 --- a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java +++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java @@ -1696,4 +1696,99 @@ public class GameSimulatorTest extends SimulationTestCase { // One cards drawn assertTrue(simGame.getPlayers().get(0).getZone(ZoneType.Hand).size() == 1); } + + + public void testCloneTransform() { + Game game = initAndCreateGame(); + Player p = game.getPlayers().get(0); + Player p2 = game.getPlayers().get(1); + game.getPhaseHandler().devModeSet(PhaseType.MAIN1, p); + + final String outLawName = "Kruin Outlaw"; + final String hillGiantName = "Elite Vanguard"; + final String terrorName = "Terror of Kruin Pass"; + + Card outlaw = addCard(outLawName, p2); + Card giant = addCard(hillGiantName, p); + + assertFalse(outlaw.isCloned()); + assertTrue(outlaw.isDoubleFaced()); + assertTrue(outlaw.hasState(CardStateName.Transformed)); + assertTrue(outlaw.canTransform()); + assertFalse(outlaw.isBackSide()); + + assertFalse(giant.isDoubleFaced()); + assertFalse(giant.canTransform()); + + addCard("Forest", p); + addCard("Forest", p); + addCard("Forest", p); + addCard("Forest", p); + addCard("Island", p); + + Card cytoCard = addCardToZone("Cytoshape", p, ZoneType.Hand); + SpellAbility cytoSA = cytoCard.getFirstSpellAbility(); + + Card moonmist = addCardToZone("Moonmist", p, ZoneType.Hand); + SpellAbility moonmistSA = moonmist.getFirstSpellAbility(); + + cytoSA.getTargets().add(outlaw); + + GameSimulator sim = createSimulator(game, p); + int score = sim.simulateSpellAbility(cytoSA).value; + + assertTrue(score > 0); + + Game simGame = sim.getSimulatedGameState(); + + assertTrue(countCardsWithName(simGame, outLawName) == 0); + assertTrue(countCardsWithName(simGame, hillGiantName) == 2); + assertTrue(countCardsWithName(simGame, terrorName) == 0); + + Card clonedOutLaw = (Card)sim.getGameCopier().find(outlaw); + + assertTrue(clonedOutLaw.isCloned()); + assertTrue(clonedOutLaw.isDoubleFaced()); + assertFalse(clonedOutLaw.hasState(CardStateName.Transformed)); + assertTrue(clonedOutLaw.canTransform()); + assertFalse(clonedOutLaw.isBackSide()); + + assertTrue(clonedOutLaw.getName().equals(hillGiantName)); + + assertTrue(clonedOutLaw.isDoubleFaced()); + + score = sim.simulateSpellAbility(moonmistSA).value; + assertTrue(score > 0); + + simGame = sim.getSimulatedGameState(); + + assertTrue(countCardsWithName(simGame, outLawName) == 0); + assertTrue(countCardsWithName(simGame, hillGiantName) == 2); + assertTrue(countCardsWithName(simGame, terrorName) == 0); + + Card transformOutLaw = (Card)sim.getGameCopier().find(outlaw); + + assertTrue(transformOutLaw.isCloned()); + assertTrue(transformOutLaw.isDoubleFaced()); + assertFalse(transformOutLaw.hasState(CardStateName.Transformed)); + assertTrue(transformOutLaw.canTransform()); + assertTrue(transformOutLaw.isBackSide()); + + assertTrue(transformOutLaw.getName().equals(hillGiantName)); + + // need to clean up the clone state + simGame.getPhaseHandler().devAdvanceToPhase(PhaseType.CLEANUP); + + assertTrue(countCardsWithName(simGame, outLawName) == 0); + assertTrue(countCardsWithName(simGame, hillGiantName) == 1); + assertTrue(countCardsWithName(simGame, terrorName) == 1); + + assertFalse(transformOutLaw.isCloned()); + assertTrue(transformOutLaw.isDoubleFaced()); + assertTrue(transformOutLaw.hasState(CardStateName.Transformed)); + assertTrue(transformOutLaw.canTransform()); + assertTrue(transformOutLaw.isBackSide()); + + assertTrue(transformOutLaw.getName().equals(terrorName)); + } } diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index ed41f40d96c..19d47ce7057 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -85,7 +85,7 @@ public class CardImageRenderer { //determine colors for borders final List borderColors; - final boolean isFaceDown = card.getCurrentState().getState() == CardStateName.FaceDown; + final boolean isFaceDown = card.isFaceDown(); if (isFaceDown) { borderColors = ImmutableList.of(DetailColors.FACE_DOWN); } @@ -371,7 +371,7 @@ public class CardImageRenderer { //determine colors for borders final List borderColors; - final boolean isFaceDown = card.getCurrentState().getState() == CardStateName.FaceDown; + final boolean isFaceDown = card.isFaceDown(); if (isFaceDown) { borderColors = ImmutableList.of(DetailColors.FACE_DOWN); } diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index 5e34e757ca9..c393b17b522 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -213,7 +213,7 @@ public class CardRenderer { return cardArt; } - public static FImageComplex getAftermathSecondCardArt(String imageKey) { + public static FImageComplex getAftermathSecondCardArt(final String imageKey) { FImageComplex cardArt = cardArtCache.get("Aftermath_second_"+imageKey); if (cardArt == null) { Texture image = new CachedCardImage(imageKey) { @@ -439,7 +439,7 @@ public class CardRenderer { // TODO: A hacky workaround is currently used to make the game not leak the color information for Morph cards. final CardStateView details = card.getCurrentState(); - final boolean isFaceDown = details.getState() == CardStateName.FaceDown; + final boolean isFaceDown = card.isFaceDown(); final DetailColors borderColor = isFaceDown ? CardDetailUtil.DetailColors.FACE_DOWN : CardDetailUtil.getBorderColor(details, canShow); // canShow doesn't work here for face down Morphs Color color = FSkinColor.fromRGB(borderColor.r, borderColor.g, borderColor.b); color = FSkinColor.tintColor(Color.WHITE, color, CardRenderer.PT_BOX_TINT); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java index 8e73b88a83f..c5822607825 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java @@ -242,8 +242,7 @@ public class VStack extends FDropDown { } // TODO: A hacky workaround is currently used to make the game not leak the color information for Morph cards. - final CardStateView curState = card.getCurrentState(); - final boolean isFaceDown = curState.getState() == CardStateName.FaceDown; + final boolean isFaceDown = card.isFaceDown(); final DetailColors color = isFaceDown ? CardDetailUtil.DetailColors.FACE_DOWN : CardDetailUtil.getBorderColor(card.getCurrentState(), true); // otherwise doesn't work correctly for face down Morphs backColor = FSkinColor.fromRGB(color.r, color.g, color.b); foreColor = FSkinColor.getHighContrastColor(backColor); diff --git a/forge-gui/res/cardsfolder/c/cytoshape.txt b/forge-gui/res/cardsfolder/c/cytoshape.txt index 68b6a7f92d6..ffc4844319b 100644 --- a/forge-gui/res/cardsfolder/c/cytoshape.txt +++ b/forge-gui/res/cardsfolder/c/cytoshape.txt @@ -1,9 +1,7 @@ Name:Cytoshape ManaCost:1 G U Types:Instant -A:SP$ ChooseCard | Cost$ 1 G U | Defined$ You | Amount$ 1 | Choices$ Creature.nonLegendary | Mandatory$ True | SubAbility$ Pump4Tgt | RememberChosen$ True | AILogic$ Clone | SpellDescription$ Choose a nonlegendary creature on the battlefield. Target creature becomes a copy of that creature until end of turn. -SVar:Pump4Tgt:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Choose target creature | AILogic$ Pump | SubAbility$ ShapeTgt | StackDescription$ None -SVar:ShapeTgt:DB$ Clone | Defined$ Remembered | CloneTarget$ ParentTarget | Duration$ UntilEndOfTurn +A:SP$ Clone | Cost$ 1 G U | Choices$ Creature.nonLegendary | ChoiceTitle$ Choose a nonlegendary creature to copy | ValidTgts$ Creature | TgtPrompt$ Choose target creature to become a copy | Duration$ UntilEndOfTurn | StackDescription$ SpellDescription | SpellDescription$ Choose a nonlegendary creature on the battlefield. Target creature becomes a copy of that creature until end of turn. AI:RemoveDeck:All SVar:Picture:http://www.wizards.com/global/images/magic/general/cytoshape.jpg Oracle:Choose a nonlegendary creature on the battlefield. Target creature becomes a copy of that creature until end of turn. diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java index ed4a467e112..f9e0bb75419 100644 --- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java @@ -19,7 +19,6 @@ import com.google.common.collect.Sets; import forge.FThreads; import forge.assets.FSkinProp; -import forge.card.CardStateName; import forge.game.GameView; import forge.game.card.CardView; import forge.game.card.CardView.CardStateView; @@ -178,8 +177,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { switch (altState.getState()) { case Original: - final CardStateView currentState = cv.getCurrentState(); - if (currentState.getState() == CardStateName.FaceDown) { + if (cv.isFaceDown()) { return getCurrentPlayer() == null || cv.canFaceDownBeShownToAny(getLocalPlayers()); } return true; //original can always be shown if not a face down that can't be shown