refactor: improved cards hints support for combined triggers like OrT…

…riggeredAbility
magefree · Jan 22, 2025 · 3f79ffa · 3f79ffa
1 parent 29bab5f
commit 3f79ffa
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 0 deletions.
diff --git a/...src/main/java/mage/abilities/common/delayed/UntilYourNextTurnDelayedTriggeredAbility.java b/...src/main/java/mage/abilities/common/delayed/UntilYourNextTurnDelayedTriggeredAbility.java
@@ -8,13 +8,15 @@
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.Effects;
+import mage.abilities.hint.Hint;
 import mage.constants.Duration;
 import mage.constants.EffectType;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.util.CardUtil;
 import mage.watchers.Watcher;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -86,6 +88,13 @@ public void addWatcher(Watcher watcher) {
         ability.addWatcher(watcher);
     }
 
+    @Override
+    public List<Hint> getHints() {
+        List<Hint> res = new ArrayList<>(super.getHints());
+        res.addAll(ability.getHints());
+        return res;
+    }
+
     @Override
     public Effects getEffects(Game game, EffectType effectType) {
         return ability.getEffects(game, effectType);

diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java
@@ -7,13 +7,15 @@
 import mage.abilities.condition.Condition;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.Effects;
+import mage.abilities.hint.Hint;
 import mage.constants.EffectType;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.util.CardUtil;
 import mage.watchers.Watcher;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -111,6 +113,13 @@ public void addWatcher(Watcher watcher) {
         ability.addWatcher(watcher);
     }
 
+    @Override
+    public List<Hint> getHints() {
+        List<Hint> res = new ArrayList<>(super.getHints());
+        res.addAll(ability.getHints());
+        return res;
+    }
+
     @Override
     public Effects getEffects(Game game, EffectType effectType) {
         return ability.getEffects(game, effectType);

diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java
@@ -8,12 +8,14 @@
 import mage.abilities.condition.Condition;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.Effects;
+import mage.abilities.hint.Hint;
 import mage.constants.EffectType;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.util.CardUtil;
 import mage.watchers.Watcher;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -106,6 +108,13 @@ public void addWatcher(Watcher watcher) {
         ability.addWatcher(watcher);
     }
 
+    @Override
+    public List<Hint> getHints() {
+        List<Hint> res = new ArrayList<>(super.getHints());
+        res.addAll(ability.getHints());
+        return res;
+    }
+
     @Override
     public Effects getEffects(Game game, EffectType effectType) {
         return ability.getEffects(game, effectType);

diff --git a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java
@@ -5,6 +5,7 @@
 import mage.abilities.TriggeredAbility;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
+import mage.abilities.hint.Hint;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -126,6 +127,13 @@ public void addWatcher(Watcher watcher) {
         }
     }
 
+    @Override
+    public List<Hint> getHints() {
+        List<Hint> res = new ArrayList<>(super.getHints());
+        this.triggeredAbilities.forEach(a -> res.addAll(a.getHints()));
+        return res;
+    }
+
     @Override
     public boolean isInUseableZone(Game game, MageObject sourceObject, GameEvent event) {
         boolean res = false;