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

Add support for tapping the topmost card of a stack to activate the card behind if the card on top has no remaining actions (same as mobile game already supports)

Browse Source
This commit is contained in:
drdev
2014-11-26 20:22:48 +00:00
parent 74c579c286
commit 7c7163b511
12 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
View File

@@ -108,8 +108,8 @@ public enum CPrompt implements ICDoc {
MatchUtil.getHumanController().selectPlayer(playerView, triggerEvent);
}
public void selectCard(final CardView cardView, final List<CardView> otherCardViewsToSelect, final ITriggerEvent triggerEvent) {
MatchUtil.getHumanController().selectCard(cardView, otherCardViewsToSelect, triggerEvent);
public boolean selectCard(final CardView cardView, final List<CardView> otherCardViewsToSelect, final ITriggerEvent triggerEvent) {
return MatchUtil.getHumanController().selectCard(cardView, otherCardViewsToSelect, triggerEvent);
}
public void selectAbility(final SpellAbility sa) {

49
forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
View File

@@ -32,6 +32,7 @@ import forge.game.card.CardView;
import forge.game.card.CardView.CardStateView;
import forge.game.player.PlayerView;
import forge.game.zone.ZoneType;
import forge.match.MatchUtil;
import forge.screens.match.CMatchUI;
import forge.screens.match.controllers.CPrompt;
import forge.toolbox.FScrollPane;
@@ -530,22 +531,46 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
}
private void selectCard(final CardPanel panel, final MouseEvent evt) {
//on left double-click or Shift+left, select all other cards in stack if any
selectCard(panel, new MouseTriggerEvent(evt),
evt.getButton() == 1 && (evt.isShiftDown() || evt.getClickCount() == 2));
}
private boolean selectCard(final CardPanel panel, final MouseTriggerEvent triggerEvent, final boolean selectOtherCardsInStack) {
List<CardView> otherCardViewsToSelect = null;
if (evt.getButton() == 1 && (evt.isShiftDown() || evt.getClickCount() == 2)) {
//on left double-click or Shift+left, select all other cards in stack if any
List<CardPanel> stack = panel.getStack();
List<CardPanel> stack = panel.getStack();
if (selectOtherCardsInStack) {
if (stack != null) {
stack = new ArrayList<CardPanel>(stack);
stack.remove(panel);
if (stack.size() > 0) {
otherCardViewsToSelect = new ArrayList<CardView>();
for (CardPanel p : stack) {
for (CardPanel p : stack) {
if (p != panel && p.getCard() != null) {
if (otherCardViewsToSelect == null) {
otherCardViewsToSelect = new ArrayList<CardView>();
}
otherCardViewsToSelect.add(p.getCard());
}
}
}
}
CPrompt.SINGLETON_INSTANCE.selectCard(panel.getCard(), otherCardViewsToSelect, new MouseTriggerEvent(evt));
if (CPrompt.SINGLETON_INSTANCE.selectCard(panel.getCard(), otherCardViewsToSelect, triggerEvent)) {
return true;
}
//if panel can't do anything with card selection, try selecting previous panel in stack
if (stack != null) {
int index = stack.indexOf(panel);
if (index < stack.size() - 1 && selectCard(stack.get(index + 1), triggerEvent, selectOtherCardsInStack)) {
return true;
}
}
//as a last resort try to select attached panels not in stack
for (CardPanel p : panel.getAttachedPanels()) {
if (p.getStack() != stack) { //ensure same panel not checked more than once
if (selectCard(p, triggerEvent, selectOtherCardsInStack)) {
return true;
}
}
}
MatchUtil.getController().flashIncorrectAction();
return false;
}
public void setupPlayZone() {
@@ -839,6 +864,12 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
return false;
}
@Override
public void add(final int index, final CardPanel panel) {
super.add(index, panel);
panel.setStack(this);
}
private void addAttachedPanels(final CardPanel panel) {
for (final CardPanel attachedPanel : panel.getAttachedPanels()) {
if (panel.getCard() != null && super.add(attachedPanel)) {