external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

PlayLandVariantEffect: update for CloneState

Browse Source
This commit is contained in:
Hanmac
2019-01-13 15:03:25 +01:00
parent 3b2114755c
commit b5d1c3ec74
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-game/src/main/java/forge/game/ability/effects/PlayLandVariantEffect.java
View File

@@ -7,7 +7,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import forge.StaticData; import forge.StaticData;
import forge.card.CardRulesPredicates; import forge.card.CardRulesPredicates;
import forge.card.CardStateName;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.game.Game; import forge.game.Game;
@@ -49,8 +48,10 @@ public class PlayLandVariantEffect extends SpellAbilityEffect {
for (byte i = 0; i < MagicColor.WUBRG.length; i++) { for (byte i = 0; i < MagicColor.WUBRG.length; i++) {
if (color.hasAnyColor(MagicColor.WUBRG[i])) { if (color.hasAnyColor(MagicColor.WUBRG[i])) {
landNames.add(MagicColor.Constant.BASIC_LANDS.get(i)); landNames.add(MagicColor.Constant.BASIC_LANDS.get(i));
landNames.add(MagicColor.Constant.SNOW_LANDS.get(i));
} }
} }
final Predicate<PaperCard> cp = Predicates.compose(new Predicate<String>() { final Predicate<PaperCard> cp = Predicates.compose(new Predicate<String>() {
@Override @Override
public boolean apply(final String name) { public boolean apply(final String name) {
@@ -69,14 +70,8 @@ public class PlayLandVariantEffect extends SpellAbilityEffect {
random = CardFactory.getCard(ran, activator, game); random = CardFactory.getCard(ran, activator, game);
} }
final String imageFileName = game.getRules().canCloneUseTargetsImage() ? source.getImageKey() : random.getImageKey(); source.addCloneState(CardFactory.getCloneStates(random, source, sa), game.getNextTimestamp());
//source.addAlternateState(CardStateName.Cloner, false);
//source.switchStates(CardStateName.Original, CardStateName.Cloner, false);
source.setState(CardStateName.Original, false);
source.updateStateForView(); source.updateStateForView();
final CardStateName stateToCopy = random.getCurrentStateName();
CardFactory.copyState(random, stateToCopy, source, source.getCurrentStateName());
source.setImageKey(imageFileName);
source.setController(activator, 0); source.setController(activator, 0);
game.getAction().moveTo(activator.getZone(ZoneType.Battlefield), source, sa); game.getAction().moveTo(activator.getZone(ZoneType.Battlefield), source, sa);