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

* Amulet of Vigor - improved combo support for multi triggers (now you can see triggered land name and chooses stack order, see #6918);

Mage/src/main/java/mage/target/targetpointer/FirstTargetPointer.java

@@ -1,10 +1,5 @@
 package mage.target.targetpointer;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.cards.Card;
@@ -12,7 +7,9 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
-public class FirstTargetPointer implements TargetPointer {
+import java.util.*;
+
+public class FirstTargetPointer extends TargetPointerImpl {
 
     private Map<UUID, Integer> zoneChangeCounter = new HashMap<>();
 
@@ -21,11 +18,14 @@ public class FirstTargetPointer implements TargetPointer {
     }
 
     public FirstTargetPointer() {
+        super();
     }
 
-    public FirstTargetPointer(FirstTargetPointer firstTargetPointer) {
+    public FirstTargetPointer(final FirstTargetPointer targetPointer) {
+        super(targetPointer);
+
         this.zoneChangeCounter = new HashMap<>();
-        for (Map.Entry<UUID, Integer> entry : firstTargetPointer.zoneChangeCounter.entrySet()) {
+        for (Map.Entry<UUID, Integer> entry : targetPointer.zoneChangeCounter.entrySet()) {
             this.zoneChangeCounter.put(entry.getKey(), entry.getValue());
         }
     }
@@ -81,7 +81,7 @@ public class FirstTargetPointer implements TargetPointer {
     }
 
     @Override
-    public TargetPointer copy() {
+    public FirstTargetPointer copy() {
         return new FirstTargetPointer(this);
     }
 

Mage/src/main/java/mage/target/targetpointer/FixedTarget.java

@@ -1,9 +1,5 @@
 package mage.target.targetpointer;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
 import mage.MageObject;
 import mage.MageObjectReference;
 import mage.abilities.Ability;
@@ -12,7 +8,12 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
-public class FixedTarget implements TargetPointer {
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+public class FixedTarget extends TargetPointerImpl {
 
     private final UUID targetId;
     private int zoneChangeCounter;
@@ -29,6 +30,7 @@ public class FixedTarget implements TargetPointer {
      * @param target
      */
     public FixedTarget(UUID target) {
+        super();
         this.targetId = target;
         this.initialized = false;
     }
@@ -45,6 +47,7 @@ public class FixedTarget implements TargetPointer {
      * @param game
      */
     public FixedTarget(Card card, Game game) {
+        super();
         this.targetId = card.getId();
         this.zoneChangeCounter = card.getZoneChangeCounter(game);
         this.initialized = true;
@@ -71,6 +74,7 @@ public class FixedTarget implements TargetPointer {
      * @param zoneChangeCounter
      */
     public FixedTarget(UUID targetId, int zoneChangeCounter) {
+        super();
         this.targetId = targetId;
         this.initialized = true;
         this.zoneChangeCounter = zoneChangeCounter;
@@ -83,15 +87,18 @@ public class FixedTarget implements TargetPointer {
      * @param game
      */
     public FixedTarget(UUID targetId, Game game) {
+        super();
         this.targetId = targetId;
         this.initialized = true;
         this.zoneChangeCounter = game.getState().getZoneChangeCounter(targetId);
     }
 
-    public FixedTarget(final FixedTarget fixedTarget) {
-        this.targetId = fixedTarget.targetId;
-        this.zoneChangeCounter = fixedTarget.zoneChangeCounter;
-        this.initialized = fixedTarget.initialized;
+    public FixedTarget(final FixedTarget targetPointer) {
+        super(targetPointer);
+
+        this.targetId = targetPointer.targetId;
+        this.zoneChangeCounter = targetPointer.zoneChangeCounter;
+        this.initialized = targetPointer.initialized;
     }
 
     @Override
@@ -142,7 +149,7 @@ public class FixedTarget implements TargetPointer {
     }
 
     @Override
-    public TargetPointer copy() {
+    public FixedTarget copy() {
         return new FixedTarget(this);
     }
 
@@ -173,5 +180,4 @@ public class FixedTarget implements TargetPointer {
         }
         return null;
     }
-
 }

Mage/src/main/java/mage/target/targetpointer/FixedTargets.java

@@ -5,10 +5,6 @@
  */
 package mage.target.targetpointer;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
 import mage.MageObject;
 import mage.MageObjectReference;
 import mage.abilities.Ability;
@@ -18,10 +14,15 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
 /**
  * @author LevelX2
  */
-public class FixedTargets implements TargetPointer {
+public class FixedTargets extends TargetPointerImpl {
 
     final ArrayList<MageObjectReference> targets = new ArrayList<>();
     final ArrayList<UUID> targetsNotInitialized = new ArrayList<>();
@@ -29,11 +30,15 @@ public class FixedTargets implements TargetPointer {
     private boolean initialized;
 
     public FixedTargets(UUID targetId) {
+        super();
+
         targetsNotInitialized.add(targetId);
         this.initialized = false;
     }
 
     public FixedTargets(Cards cards, Game game) {
+        super();
+
         for (UUID targetId : cards) {
             MageObjectReference mor = new MageObjectReference(targetId, game);
             targets.add(mor);
@@ -42,6 +47,8 @@ public class FixedTargets implements TargetPointer {
     }
 
     public FixedTargets(List<Permanent> permanents, Game game) {
+        super();
+
         for (Permanent permanent : permanents) {
             MageObjectReference mor = new MageObjectReference(permanent.getId(), permanent.getZoneChangeCounter(game), game);
             targets.add(mor);
@@ -50,6 +57,8 @@ public class FixedTargets implements TargetPointer {
     }
 
     public FixedTargets(Set<Card> cards, Game game) {
+        super();
+
         for (Card card : cards) {
             MageObjectReference mor = new MageObjectReference(card.getId(), card.getZoneChangeCounter(game), game);
             targets.add(mor);
@@ -57,10 +66,12 @@ public class FixedTargets implements TargetPointer {
         this.initialized = true;
     }
 
-    private FixedTargets(final FixedTargets fixedTargets) {
-        this.targets.addAll(fixedTargets.targets);
-        this.targetsNotInitialized.addAll(fixedTargets.targetsNotInitialized);
-        this.initialized = fixedTargets.initialized;
+    private FixedTargets(final FixedTargets targetPointer) {
+        super(targetPointer);
+
+        this.targets.addAll(targetPointer.targets);
+        this.targetsNotInitialized.addAll(targetPointer.targetsNotInitialized);
+        this.initialized = targetPointer.initialized;
     }
 
     @Override
@@ -97,7 +108,7 @@ public class FixedTargets implements TargetPointer {
     }
 
     @Override
-    public TargetPointer copy() {
+    public FixedTargets copy() {
         return new FixedTargets(this);
     }
 

Mage/src/main/java/mage/target/targetpointer/SecondTargetPointer.java

@@ -1,6 +1,5 @@
 package mage.target.targetpointer;
 
-import java.util.*;
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.cards.Card;
@@ -8,7 +7,9 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
-public class SecondTargetPointer implements TargetPointer {
+import java.util.*;
+
+public class SecondTargetPointer extends TargetPointerImpl {
 
     private Map<UUID, Integer> zoneChangeCounter = new HashMap<>();
 
@@ -17,11 +18,14 @@ public class SecondTargetPointer implements TargetPointer {
     }
 
     public SecondTargetPointer() {
+        super();
     }
 
-    public SecondTargetPointer(SecondTargetPointer firstTargetPointer) {
+    public SecondTargetPointer(final SecondTargetPointer targetPointer) {
+        super(targetPointer);
+
         this.zoneChangeCounter = new HashMap<>();
-        for (Map.Entry<UUID, Integer> entry : firstTargetPointer.zoneChangeCounter.entrySet()) {
+        for (Map.Entry<UUID, Integer> entry : targetPointer.zoneChangeCounter.entrySet()) {
             this.zoneChangeCounter.put(entry.getKey(), entry.getValue());
         }
     }
@@ -71,7 +75,7 @@ public class SecondTargetPointer implements TargetPointer {
     }
 
     @Override
-    public TargetPointer copy() {
+    public SecondTargetPointer copy() {
         return new SecondTargetPointer(this);
     }
 

Mage/src/main/java/mage/target/targetpointer/TargetPointer.java

@@ -1,13 +1,15 @@
 package mage.target.targetpointer;
 
+import mage.abilities.Ability;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.util.Copyable;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.UUID;
-import mage.abilities.Ability;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
 
-public interface TargetPointer extends Serializable {
+public interface TargetPointer extends Serializable, Copyable<TargetPointer> {
 
     void init(Game game, Ability source);
 
@@ -34,4 +36,14 @@ public interface TargetPointer extends Serializable {
      * @return permanent
      */
     Permanent getFirstTargetPermanentOrLKI(Game game, Ability source);
+
+    /**
+     * Store text to target pointer (usefull to keep data for specific trigger, e.g. selected target name for rules)
+     *
+     * @param key
+     * @param value
+     */
+    TargetPointer withData(String key, String value);
+
+    String getData(String key);
 }

Mage/src/main/java/mage/target/targetpointer/TargetPointerImpl.java

@@ -0,0 +1,33 @@
+package mage.target.targetpointer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author JayDi85
+ */
+public abstract class TargetPointerImpl implements TargetPointer {
+
+    // Store custom data here. Use it to keep unique values for ability instances on stack (example: Gruul Ragebeast)
+    Map<String, String> data = new HashMap<>();
+
+    public TargetPointerImpl() {
+        super();
+    }
+
+    public TargetPointerImpl(final TargetPointerImpl targetPointer) {
+        super();
+        this.data.putAll(targetPointer.data);
+    }
+
+    @Override
+    public String getData(String key) {
+        return this.data.getOrDefault(key, "");
+    }
+
+    @Override
+    public TargetPointer withData(String key, String value) {
+        this.data.put(key, value);
+        return this;
+    }
+}

Mage/src/main/java/mage/target/targetpointer/ThirdTargetPointer.java

@@ -5,11 +5,6 @@
  */
 package mage.target.targetpointer;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.cards.Card;
@@ -17,11 +12,12 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
+import java.util.*;
+
 /**
- *
  * @author LevelX2
  */
-public class ThirdTargetPointer implements TargetPointer {
+public class ThirdTargetPointer extends TargetPointerImpl {
 
     private Map<UUID, Integer> zoneChangeCounter = new HashMap<>();
 
@@ -30,9 +26,12 @@ public class ThirdTargetPointer implements TargetPointer {
     }
 
     public ThirdTargetPointer() {
+        super();
     }
 
-    public ThirdTargetPointer(ThirdTargetPointer targetPointer) {
+    public ThirdTargetPointer(final ThirdTargetPointer targetPointer) {
+        super(targetPointer);
+
         this.zoneChangeCounter = new HashMap<>();
         for (Map.Entry<UUID, Integer> entry : targetPointer.zoneChangeCounter.entrySet()) {
             this.zoneChangeCounter.put(entry.getKey(), entry.getValue());
@@ -84,7 +83,7 @@ public class ThirdTargetPointer implements TargetPointer {
     }
 
     @Override
-    public TargetPointer copy() {
+    public ThirdTargetPointer copy() {
         return new ThirdTargetPointer(this);
     }