From 716a5d33e13d919e41924445209af00cae61e514 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 29 May 2013 07:00:19 +0000 Subject: [PATCH] - Targeting Overlay: targeting arrows will now be shown for equipments equipping permanents currently under opponent's control (for those rare cases when e.g. an equipped creature gets Switcheroo'd for something else). --- .../forge/gui/match/TargetingOverlay.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/java/forge/gui/match/TargetingOverlay.java b/src/main/java/forge/gui/match/TargetingOverlay.java index 92d37de4fe0..e750a6701b3 100644 --- a/src/main/java/forge/gui/match/TargetingOverlay.java +++ b/src/main/java/forge/gui/match/TargetingOverlay.java @@ -127,7 +127,9 @@ public enum TargetingOverlay { Card c = activePanel.getCard(); Card enchanting = c.getEnchantingCard(); + Card equipping = c.getEquippingCard(); List enchantedBy = c.getEnchantedBy(); + List equippedBy = c.getEquippedBy(); Card paired = c.getPairedWith(); if (null != enchanting) { @@ -139,6 +141,15 @@ public enum TargetingOverlay { } } + if (null != equipping) { + if (!equipping.getController().equals(c.getController())) { + arcs.add(new Point[] { + endpoints.get(equipping.getUniqueNumber()), + endpoints.get(c.getUniqueNumber()) + }); + } + } + if (null != enchantedBy) { for (Card enc : enchantedBy) { if (!enc.getController().equals(c.getController())) { @@ -150,6 +161,17 @@ public enum TargetingOverlay { } } + if (null != equippedBy) { + for (Card eq : equippedBy) { + if (!eq.getController().equals(c.getController())) { + arcs.add(new Point[] { + endpoints.get(c.getUniqueNumber()), + endpoints.get(eq.getUniqueNumber()) + }); + } + } + } + if (null != paired) { arcs.add(new Point[] { endpoints.get(paired.getUniqueNumber()),