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

CloneRewrite

Browse Source
This commit is contained in:
Hanmac
2019-01-09 08:11:59 +01:00
parent 744a6a42e8
commit ba8a38c2f4
28 changed files with 675 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
View File

@@ -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);

3
forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java
View File

@@ -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<CStack> {
// 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()));

95
forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
View File

@@ -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));
}
}