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: 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() {

7
Mage.Common/src/main/java/mage/view/CardsView.java
View file

@ -1,7 +1,5 @@
package mage.view;
import java.util.*;
import java.util.stream.Collectors;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.Effect;
@ -17,6 +15,9 @@ import mage.target.targetpointer.TargetPointer;
import mage.util.GameLog;
import org.apache.log4j.Logger;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author BetaSteward_at_googlemail.com
*/
@ -124,7 +125,7 @@ public class CardsView extends LinkedHashMap<UUID, CardView> {
abilityView = new AbilityView(ability, sourceObject.getName(), sourceCardView);
}
if (!ability.getTargets().isEmpty()) {
abilityView.setTargets(ability.getTargets());
abilityView.addTargets(ability.getTargets(), ability.getEffects(), ability, game);
} else {
List<UUID> abilityTargets = new ArrayList<>();
for (Effect effect : ability.getEffects()) {

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

@ -4,6 +4,8 @@ import mage.MageObject;
import mage.abilities.Mode;
import mage.abilities.Modes;
import mage.abilities.effects.Effect;
import mage.abilities.hint.Hint;
import mage.abilities.hint.HintUtils;
import mage.cards.Card;
import mage.constants.AbilityType;
import mage.constants.CardType;
@ -17,8 +19,6 @@ import mage.util.GameLog;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.abilities.hint.Hint;
import mage.abilities.hint.HintUtils;
/**
* @author BetaSteward_at_googlemail.com
@ -78,7 +78,7 @@ public class StackAbilityView extends CardView {
for (UUID modeId : ability.getModes().getSelectedModes()) {
Mode mode = ability.getModes().get(modeId);
if (!mode.getTargets().isEmpty()) {
setTargets(mode.getTargets());
addTargets(mode.getTargets(), mode.getEffects(), ability, game);
} else {
List<UUID> targetList = new ArrayList<>();
for (Effect effect : mode.getEffects()) {
@ -102,13 +102,13 @@ public class StackAbilityView extends CardView {
}
}
}
}
}
}
if (!names.isEmpty()) {
getRules().add("<i>Related objects: " + names.toString() + "</i>");
}
// show for modal ability, which mode was choosen
if (ability.isModal()) {
Modes modes = ability.getModes();
@ -117,7 +117,7 @@ public class StackAbilityView extends CardView {
this.rules.add("<span color='green'><i>Chosen mode: " + mode.getEffects().getText(mode) + "</i></span>");
}
}
if (HintUtils.ABILITY_HINTS_ENABLE) {
List<String> abilityHints = new ArrayList<>();
for (Hint hint : ability.getHints()) {