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

Commit large scale CardView refactoring to support head-to-head better, handle hidden and face down cards better, and reduce flickering of P/T and other attributes

Browse Source
This commit is contained in:
drdev
2014-10-01 14:15:25 +00:00
parent b12ca2f1dc
commit 4978e34262
23 changed files with 267 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/ImageKeys.java
View File

@@ -12,8 +12,9 @@ public class ImageKeys {
public static final String BOOSTERBOX_PREFIX = "x:";
public static final String PRECON_PREFIX = "p:";
public static final String TOURNAMENTPACK_PREFIX = "o:";
public static final String MORPH_IMAGE = "morph";
public static final String HIDDEN_CARD = TOKEN_PREFIX + MORPH_IMAGE;
public static final String BACKFACE_POSTFIX = "$alt";

23
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -71,6 +71,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
private final Deque<SpellAbilityStackInstance> stack = new LinkedBlockingDeque<SpellAbilityStackInstance>();
private final Stack<SpellAbilityStackInstance> frozenStack = new Stack<SpellAbilityStackInstance>();
private final Stack<SpellAbility> undoStack = new Stack<SpellAbility>();
private Player undoStackOwner;
private boolean frozen = false;
private boolean bResolving = false;
@@ -126,7 +127,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
this.thisTurnCast.clear();
this.curResolvingCard = null;
this.frozenStack.clear();
this.undoStack.clear();
this.clearUndoStack();
}
/**
@@ -239,8 +240,8 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
*
* @return a boolean.
*/
public final boolean canUndo() {
return !undoStack.isEmpty();
public final boolean canUndo(Player player) {
return undoStackOwner == player;
}
/**
@@ -256,6 +257,9 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
SpellAbility sa = undoStack.pop();
sa.undo();
sa.getActivatingPlayer().getManaPool().refundManaPaid(sa);
if (undoStack.isEmpty()) {
undoStackOwner = null;
}
return true;
}
@@ -265,7 +269,9 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
* </p>
*/
public final void clearUndoStack() {
if (undoStackOwner == null) { return; }
undoStack.clear();
undoStackOwner = null;
}
/**
@@ -289,13 +295,16 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
System.out.println(source.getName() + " - activatingPlayer not set before adding to stack.");
}
//either push onto or clear undo stack based on whether
//spell/ability is undoable and activator is the Gui player
if (sp.isUndoable() && activator.getController().isGuiPlayer()) {
//either push onto or clear undo stack based on whether spell/ability is undoable
if (sp.isUndoable()) {
if (undoStackOwner != activator) {
clearUndoStack(); //clear if undo stack owner changes
undoStackOwner = activator;
}
undoStack.push(sp);
}
else {
undoStack.clear();
clearUndoStack();
}
if (sp.isManaAbility()) { // Mana Abilities go straight through