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

18
Mage.Common/src/main/java/mage/view/CardView.java
View file

@ -10,6 +10,7 @@ import mage.abilities.SpellAbility;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.effects.Effect;
import mage.abilities.effects.Effects;
import mage.abilities.icon.CardIcon;
import mage.abilities.keyword.AftermathAbility;
import mage.cards.*;
import mage.cards.mock.MockCard;
@ -118,6 +119,7 @@ public class CardView extends SimpleCardView {
protected boolean canAttack;
protected boolean canBlock;
protected boolean inViewerOnly;
protected List<CardIcon> cardIcons = new ArrayList<>(); // additional icons to render
protected Card originalCard = null;
@ -138,7 +140,7 @@ public class CardView extends SimpleCardView {
this(card, null, false);
this.id = simpleCardView.getId();
this.isPlayable = simpleCardView.isPlayable;
this.playableStats = simpleCardView.playableStats.copy();
this.isChoosable = simpleCardView.isChoosable;
this.isSelected = simpleCardView.isSelected;
}
@ -148,7 +150,7 @@ public class CardView extends SimpleCardView {
this.id = cardId;
}
public CardView(CardView cardView) {
public CardView(final CardView cardView) {
super(cardView);
// generetate new ID (TODO: why new ID?)
@ -222,6 +224,9 @@ public class CardView extends SimpleCardView {
this.canBlock = cardView.canBlock;
this.inViewerOnly = cardView.inViewerOnly;
this.originalCard = cardView.originalCard == null ? null : cardView.originalCard.copy();
if (cardView.cardIcons != null) {
cardView.cardIcons.forEach(icon -> this.cardIcons.add(icon.copy()));
}
}
/**
@ -408,6 +413,11 @@ public class CardView extends SimpleCardView {
controlledByOwner = false;
}
}
// card icons for permanents on battlefield
permanent.getAbilities(game).forEach(ability -> {
this.cardIcons.addAll(ability.getIcons());
});
} else {
if (card.isCopy()) {
this.mageObjectType = MageObjectType.COPY_CARD;
@ -1134,4 +1144,8 @@ public class CardView extends SimpleCardView {
public Card getOriginalCard() {
return this.originalCard;
}
public List<CardIcon> getCardIcons() {
return this.cardIcons;
}
}