mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 12:18:00 +00:00
- Targeting Overlay: in the "card mouseover" mode, during the order of blockers declaration, the targeting overlay will first show all the blockers for the card for which the order of blockers is declared, and will also show individual arrows for each blocker when the blocker is selected in the blocker order list.
This commit is contained in:
@@ -61,6 +61,7 @@ import forge.game.player.Player;
|
|||||||
import forge.game.zone.PlayerZone;
|
import forge.game.zone.PlayerZone;
|
||||||
import forge.game.zone.ZoneType;
|
import forge.game.zone.ZoneType;
|
||||||
import forge.gui.GuiChoose;
|
import forge.gui.GuiChoose;
|
||||||
|
import forge.gui.GuiUtils;
|
||||||
import forge.gui.framework.EDocID;
|
import forge.gui.framework.EDocID;
|
||||||
import forge.gui.framework.SDisplayUtil;
|
import forge.gui.framework.SDisplayUtil;
|
||||||
import forge.gui.match.views.VCombat;
|
import forge.gui.match.views.VCombat;
|
||||||
@@ -437,6 +438,7 @@ public class CombatUtil {
|
|||||||
|
|
||||||
List<Card> orderedBlockers = null;
|
List<Card> orderedBlockers = null;
|
||||||
if (player.isHuman()) {
|
if (player.isHuman()) {
|
||||||
|
GuiUtils.setPanelSelection(attacker);
|
||||||
List<Card> ordered = GuiChoose.getOrderChoices("Choose Blocking Order", "Damaged First", 0, blockers, null, attacker);
|
List<Card> ordered = GuiChoose.getOrderChoices("Choose Blocking Order", "Damaged First", 0, blockers, null, attacker);
|
||||||
|
|
||||||
orderedBlockers = new ArrayList<Card>();
|
orderedBlockers = new ArrayList<Card>();
|
||||||
|
|||||||
@@ -89,11 +89,11 @@ public enum TargetingOverlay {
|
|||||||
activePanel = null;
|
activePanel = null;
|
||||||
for (CField f : CMatchUI.SINGLETON_INSTANCE.getFieldControls()) {
|
for (CField f : CMatchUI.SINGLETON_INSTANCE.getFieldControls()) {
|
||||||
cardPanels.addAll(f.getView().getTabletop().getCardPanels());
|
cardPanels.addAll(f.getView().getTabletop().getCardPanels());
|
||||||
}
|
List<CardPanel> cPanel = f.getView().getTabletop().getCardPanels();
|
||||||
for (VField f : fields) {
|
for (CardPanel c : cPanel) {
|
||||||
if (f.getTabletop().getCardFromMouseOverPanel() != null) {
|
if (c.isSelected()) {
|
||||||
activePanel = f.getTabletop().getMouseOverPanel();
|
activePanel = c;
|
||||||
break;
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -279,6 +279,17 @@ public class CardPanel extends JPanel implements CardContainer {
|
|||||||
this.repaint();
|
this.repaint();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* isSelected.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @return a boolean.
|
||||||
|
*/
|
||||||
|
public final boolean isSelected() {
|
||||||
|
return this.isSelected;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* Setter for the field <code>showCastingCost</code>.
|
* Setter for the field <code>showCastingCost</code>.
|
||||||
|
|||||||
Reference in New Issue
Block a user