- 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).

This commit is contained in:
Agetian
2013-05-29 07:00:19 +00:00
parent 12c115ca49
commit 716a5d33e1

View File

@@ -127,7 +127,9 @@ public enum TargetingOverlay {
Card c = activePanel.getCard(); Card c = activePanel.getCard();
Card enchanting = c.getEnchantingCard(); Card enchanting = c.getEnchantingCard();
Card equipping = c.getEquippingCard();
List<Card> enchantedBy = c.getEnchantedBy(); List<Card> enchantedBy = c.getEnchantedBy();
List<Card> equippedBy = c.getEquippedBy();
Card paired = c.getPairedWith(); Card paired = c.getPairedWith();
if (null != enchanting) { 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) { if (null != enchantedBy) {
for (Card enc : enchantedBy) { for (Card enc : enchantedBy) {
if (!enc.getController().equals(c.getController())) { 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) { if (null != paired) {
arcs.add(new Point[] { arcs.add(new Point[] {
endpoints.get(paired.getUniqueNumber()), endpoints.get(paired.getUniqueNumber()),