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

* GUI: added additional target arrows to stack objects (now you can see triggered or affected permanents and another related links, see #6918);

Browse source 
* Amulet of Vigor - improved combo support for multi triggers (now you can see triggered land name and chooses stack order, see #6918);
This commit is contained in:
Oleg Agafonov 2020-12-17 03:05:58 +04:00
parent 9c56ff90d3
commit a0a1dcb39f
12 changed files with 177 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,8 @@ import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.SpellAbility;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.effects.Effect;
import mage.abilities.effects.Effects;
import mage.abilities.keyword.AftermathAbility;
import mage.cards.*;
import mage.cards.mock.MockCard;
@ -474,7 +476,7 @@ public class CardView extends SimpleCardView {
for (UUID modeId : spellAbility.getModes().getSelectedModes()) {
Mode mode = spellAbility.getModes().get(modeId);
if (!mode.getTargets().isEmpty()) {
setTargets(mode.getTargets());
addTargets(mode.getTargets(), mode.getEffects(), spellAbility, game);
}
}
}
@ -722,17 +724,31 @@ public class CardView extends SimpleCardView {
this.tokenSetCode = token.getOriginalExpansionSetCode();
}
protected final void setTargets(Targets targets) {
protected final void addTargets(Targets targets, Effects effects, Ability source, Game game) {
if (this.targets == null) {
this.targets = new ArrayList<>();
}
// need only unique targets for arrow drawning
Set<UUID> newTargets = new HashSet<>();
// fronormal targets
for (Target target : targets) {
if (target.isChosen()) {
for (UUID targetUUID : target.getTargets()) {
if (this.targets == null) {
this.targets = new ArrayList<>();
}
this.targets.add(targetUUID);
}
newTargets.addAll(target.getTargets());
}
}
// from targetPointers (can be same as normal targets)
List<UUID> fromPointers = effects.stream()
.map(Effect::getTargetPointer)
.filter(Objects::nonNull)
.map(p -> p.getTargets(game, source))
.flatMap(Collection::stream)
.collect(Collectors.toList());
newTargets.addAll(fromPointers);
this.targets.addAll(newTargets);
}
public String getName() {