From a1b624f3ee8355e64ae6e306770bfcdfaec73e9f Mon Sep 17 00:00:00 2001 From: drdev Date: Thu, 13 Mar 2014 00:37:18 +0000 Subject: [PATCH] Support using zoom view for InputAttack --- .../screens/match/input/InputAttack.java | 144 +++++++++++------- forge-m-base/src/forge/toolbox/VCardZoom.java | 9 +- 2 files changed, 94 insertions(+), 59 deletions(-) diff --git a/forge-m-base/src/forge/screens/match/input/InputAttack.java b/forge-m-base/src/forge/screens/match/input/InputAttack.java index 0676eff2629..0cfdec1e18b 100644 --- a/forge-m-base/src/forge/screens/match/input/InputAttack.java +++ b/forge-m-base/src/forge/screens/match/input/InputAttack.java @@ -30,7 +30,9 @@ import forge.game.player.Player; import forge.game.zone.ZoneType; import forge.screens.match.FControl; import forge.screens.match.events.UiEventAttackerDeclared; +import forge.toolbox.VCardZoom.ZoomController; +import java.util.ArrayList; import java.util.List; /** @@ -120,74 +122,100 @@ public class InputAttack extends InputSyncronizedBase { } } + public enum Option { + DECLARE_AS_ATTACKER("Declare as Attacker"), + REMOVE_FROM_COMBAT("Remove from Combat"), + CHOOSE_AS_DEFENDER("Choose as Defender"), + ACTIVATE_BAND("Activate Band"), + JOIN_BAND("Join Band"); + + private String text; + + private Option(String text0) { + text = text0; + } + + public String toString() { + return text; + } + } + /** {@inheritDoc} */ @Override protected final void onCardSelected(final Card card, final List orderedCardOptions) { - final List att = combat.getAttackers(); - if (/*triggerEvent.getButton() == 3 && */att.contains(card) && !card.hasKeyword("CARDNAME attacks each turn if able.") - && !card.hasStartOfKeyword("CARDNAME attacks specific player each combat if able")) { - // TODO Is there no way to attacks each turn cards to attack Planeswalkers? - combat.removeFromCombat(card); - FControl.setUsedToPay(card, false); - showCombat(); - // When removing an attacker clear the attacking band - this.activateBand(null); + FControl.getView().getCardZoom().show(FControl.getView().getPrompt().getMessage(), + card, orderedCardOptions, new ZoomController