From daf87e26ad5a96d6f751ea439e04227ed51933a5 Mon Sep 17 00:00:00 2001 From: Jetz72 Date: Mon, 10 Mar 2025 09:31:35 -0500 Subject: [PATCH] Fix importing "Ice Tunnel"; Max Speed being flipped instead of transformed (#7138) --- .../src/main/java/forge/deck/DeckRecognizer.java | 6 ++---- forge-game/src/main/java/forge/game/player/Player.java | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java index d33fd0fb71e..3b77b0375a4 100644 --- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java +++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java @@ -671,11 +671,9 @@ public class DeckRecognizer { // ok so the card has been found - let's see if there's any restriction on the set return checkAndSetCardToken(pc, edition, cardCount, deckSecFromCardLine, currentDeckSection, true); - // On the off chance we accidentally interpreted part of the card's name as a set code, e.g. "Tyrranax Rex" - if (data.isMTGCard(cardName + " " + setCode)) - continue; // UNKNOWN card as in the Counterspell|FEM case - return Token.UnknownCard(cardName, setCode, cardCount); + unknownCardToken = Token.UnknownCard(cardName, setCode, cardCount); + continue; } // ok so we can simply ignore everything but card name - as set code does not exist // At this stage, we know the card name exists in the DB so a Card MUST be found diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 8f8a6e3b837..f87eeddf695 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -1981,9 +1981,9 @@ public class Player extends GameEntity implements Comparable { speedEffect.setOwner(this); speedEffect.setGamePieceType(GamePieceType.EFFECT); - speedEffect.addAlternateState(CardStateName.Flipped, false); + speedEffect.addAlternateState(CardStateName.Transformed, false); CardState speedFront = speedEffect.getState(CardStateName.Original); - CardState speedBack = speedEffect.getState(CardStateName.Flipped); + CardState speedBack = speedEffect.getState(CardStateName.Transformed); speedFront.setImageKey("t:speed"); speedFront.setName("Start Your Engines!"); @@ -2007,7 +2007,7 @@ public class Player extends GameEntity implements Comparable { speedEffect.updateStateForView(); if(this.maxSpeed()) - speedEffect.setState(CardStateName.Flipped, true); + speedEffect.setState(CardStateName.Transformed, true); final PlayerZone com = getZone(ZoneType.Command); com.add(speedEffect); @@ -2023,8 +2023,8 @@ public class Player extends GameEntity implements Comparable { String label = this.maxSpeed() ? localizer.getMessage("lblMaxSpeed") : localizer.getMessage("lblSpeed", this.speed); speedEffect.setOverlayText(label); if(maxSpeed() && speedEffect.getCurrentStateName() == CardStateName.Original) - speedEffect.setState(CardStateName.Flipped, true); - else if(!maxSpeed() && speedEffect.getCurrentStateName() == CardStateName.Flipped) + speedEffect.setState(CardStateName.Transformed, true); + else if(!maxSpeed() && speedEffect.getCurrentStateName() == CardStateName.Transformed) speedEffect.setState(CardStateName.Original, true); }