External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GUI: fixed that abilities and triggers on the stack were not highlighted as valid target;

Browse source
This commit is contained in:
Oleg Agafonov 2020-12-24 21:43:17 +04:00
parent 6f34d514f9
commit b8b2dd2c9b
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/mage/client/cards/Cards.java
View file

@ -168,8 +168,13 @@
}
}
if (card instanceof StackAbilityView) {
// replace ability by original card
CardView tmp = ((StackAbilityView) card).getSourceCard();
tmp.overrideRules(card.getRules());
tmp.setChoosable(card.isChoosable());
tmp.setPlayable(card.isPlayable());
tmp.setPlayableAmount(card.getPlayableAmount());
tmp.setSelected(card.isSelected());
tmp.setIsAbility(true);
tmp.overrideTargets(card.getTargets());
tmp.overrideId(card.getId());

5
Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/StackDialog.java
View file

@ -112,8 +112,13 @@ public class StackDialog extends IDialogPanel {
for (CardView card : cards.values()) {
if (card instanceof StackAbilityView) {
// replace ability by original card
CardView tmp = ((StackAbilityView) card).getSourceCard();
tmp.overrideRules(card.getRules());
tmp.setChoosable(card.isChoosable());
tmp.setPlayable(card.isPlayable());
tmp.setPlayableAmount(card.getPlayableAmount());
tmp.setSelected(card.isSelected());
tmp.setIsAbility(true);
tmp.overrideTargets(card.getTargets());
tmp.overrideId(card.getId());

2
Mage.Common/src/main/java/mage/view/StackAbilityView.java
View file

@ -27,6 +27,8 @@ public class StackAbilityView extends CardView {
private static final long serialVersionUID = 1L;
// in GUI: that's view will be replaced by sourceCard, so don't forget to sync settings like
// selectable, chooseable, etc. Search by getSourceCard
private final CardView sourceCard;
public StackAbilityView(Game game, StackAbility ability, String sourceName, CardView sourceCard) {