Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* GUI: new reworked GUI and card render engine, card icons and dozens of other fixes (see full list in related PR);

Browse source
This commit is contained in:
Oleg Agafonov 2021-01-30 16:38:55 +04:00
parent df98cc3e62
commit a1da5ef437
304 changed files with 7266 additions and 5093 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage.Client/src/main/java/mage/client/util/gui/ArrowUtil.java
View file

@ -1,6 +1,6 @@
package mage.client.util.gui;
import mage.cards.MagePermanent;
import mage.cards.MageCard;
import mage.cards.action.TransferData;
import mage.client.MageFrame;
import mage.client.game.PlayAreaPanel;
@ -12,7 +12,7 @@ import java.awt.*;
import java.util.UUID;
/**
* @author noxx
* @author noxx, JayDi85
*/
public final class ArrowUtil {
@ -25,9 +25,9 @@ public final class ArrowUtil {
me.translate(-parentPoint.x, -parentPoint.y);
UUID uuid = data.getCard().getPairedCard();
for (PlayAreaPanel pa : MageFrame.getGamePlayers(data.getGameId()).values()) {
MagePermanent permanent = pa.getBattlefieldPanel().getPermanents().get(uuid);
MageCard permanent = pa.getBattlefieldPanel().getPermanentPanels().get(uuid);
if (permanent != null) {
Point target = permanent.getLocationOnScreen();
Point target = permanent.getCardLocationOnScreen().getCardPoint();
target.translate(-parentPoint.x, -parentPoint.y);
ArrowBuilder.getBuilder().addArrow(data.getGameId(), (int) me.getX() + 35, (int) me.getY(), (int) target.getX() + 40, (int) target.getY() + 10, Color.green, ArrowBuilder.Type.PAIRED);
}
@ -41,9 +41,9 @@ public final class ArrowUtil {
me.translate(-parentPoint.x, -parentPoint.y);
for (PlayAreaPanel pa : MageFrame.getGamePlayers(data.getGameId()).values()) {
for (UUID uuid : data.getCard().getBandedCards()) {
MagePermanent permanent = pa.getBattlefieldPanel().getPermanents().get(uuid);
MageCard permanent = pa.getBattlefieldPanel().getPermanentPanels().get(uuid);
if (permanent != null) {
Point target = permanent.getLocationOnScreen();
Point target = permanent.getCardLocationOnScreen().getCardPoint();
target.translate(-parentPoint.x, -parentPoint.y);
ArrowBuilder.getBuilder().addArrow(data.getGameId(), (int) me.getX() + 55, (int) me.getY() + 25, (int) target.getX() + 60, (int) target.getY() + 35, Color.yellow, ArrowBuilder.Type.BANDED);
}
@ -77,9 +77,9 @@ public final class ArrowUtil {
me.translate(-parentPoint.x, -parentPoint.y);
UUID uuid = data.getCard().getParentId();
for (PlayAreaPanel pa : MageFrame.getGamePlayers(data.getGameId()).values()) {
MagePermanent permanent = pa.getBattlefieldPanel().getPermanents().get(uuid);
MageCard permanent = pa.getBattlefieldPanel().getPermanentPanels().get(uuid);
if (permanent != null) {
Point source = permanent.getLocationOnScreen();
Point source = permanent.getCardLocationOnScreen().getCardPoint();
source.translate(-parentPoint.x, -parentPoint.y);
ArrowBuilder.getBuilder().addArrow(data.getGameId(), (int) source.getX() + 40, (int) source.getY() + 10, (int) me.getX() + 35, (int) me.getY() + 20, Color.blue, ArrowBuilder.Type.SOURCE);
}
@ -106,9 +106,9 @@ public final class ArrowUtil {
}
for (PlayAreaPanel panel : MageFrame.getGamePlayers(data.getGameId()).values()) {
MagePermanent permanent = panel.getBattlefieldPanel().getPermanents().get(uuid);
MageCard permanent = panel.getBattlefieldPanel().getPermanentPanels().get(uuid);
if (permanent != null) {
Point target = permanent.getLocationOnScreen();
Point target = permanent.getCardLocationOnScreen().getCardPoint();
target.translate(-parentPoint.x, -parentPoint.y);
ArrowBuilder.getBuilder().addArrow(data.getGameId(), (int) me.getX() + 35, (int) me.getY(), (int) target.getX() + 40, (int) target.getY() + 10, Color.red, ArrowBuilder.Type.TARGET);
continue;