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

Fix importing "Ice Tunnel"; Max Speed being flipped instead of transformed (#7138)

Browse Source
This commit is contained in:
Jetz72
2025-03-10 09:31:35 -05:00
committed by GitHub
parent 0c30c4e32c
commit daf87e26ad
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-core/src/main/java/forge/deck/DeckRecognizer.java
View File

@@ -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 // ok so the card has been found - let's see if there's any restriction on the set
return checkAndSetCardToken(pc, edition, cardCount, deckSecFromCardLine, return checkAndSetCardToken(pc, edition, cardCount, deckSecFromCardLine,
currentDeckSection, true); 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 // 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 // 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 // At this stage, we know the card name exists in the DB so a Card MUST be found

10
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -1981,9 +1981,9 @@ public class Player extends GameEntity implements Comparable<Player> {
speedEffect.setOwner(this); speedEffect.setOwner(this);
speedEffect.setGamePieceType(GamePieceType.EFFECT); speedEffect.setGamePieceType(GamePieceType.EFFECT);
speedEffect.addAlternateState(CardStateName.Flipped, false); speedEffect.addAlternateState(CardStateName.Transformed, false);
CardState speedFront = speedEffect.getState(CardStateName.Original); CardState speedFront = speedEffect.getState(CardStateName.Original);
CardState speedBack = speedEffect.getState(CardStateName.Flipped); CardState speedBack = speedEffect.getState(CardStateName.Transformed);
speedFront.setImageKey("t:speed"); speedFront.setImageKey("t:speed");
speedFront.setName("Start Your Engines!"); speedFront.setName("Start Your Engines!");
@@ -2007,7 +2007,7 @@ public class Player extends GameEntity implements Comparable<Player> {
speedEffect.updateStateForView(); speedEffect.updateStateForView();
if(this.maxSpeed()) if(this.maxSpeed())
speedEffect.setState(CardStateName.Flipped, true); speedEffect.setState(CardStateName.Transformed, true);
final PlayerZone com = getZone(ZoneType.Command); final PlayerZone com = getZone(ZoneType.Command);
com.add(speedEffect); com.add(speedEffect);
@@ -2023,8 +2023,8 @@ public class Player extends GameEntity implements Comparable<Player> {
String label = this.maxSpeed() ? localizer.getMessage("lblMaxSpeed") : localizer.getMessage("lblSpeed", this.speed); String label = this.maxSpeed() ? localizer.getMessage("lblMaxSpeed") : localizer.getMessage("lblSpeed", this.speed);
speedEffect.setOverlayText(label); speedEffect.setOverlayText(label);
if(maxSpeed() && speedEffect.getCurrentStateName() == CardStateName.Original) if(maxSpeed() && speedEffect.getCurrentStateName() == CardStateName.Original)
speedEffect.setState(CardStateName.Flipped, true); speedEffect.setState(CardStateName.Transformed, true);
else if(!maxSpeed() && speedEffect.getCurrentStateName() == CardStateName.Flipped) else if(!maxSpeed() && speedEffect.getCurrentStateName() == CardStateName.Transformed)
speedEffect.setState(CardStateName.Original, true); speedEffect.setState(CardStateName.Original, true);
} }