From bccbb2ee8e67c01b3d87a640f9c86b2cb6a89399 Mon Sep 17 00:00:00 2001 From: Steven Knipe Date: Tue, 3 Jun 2025 20:09:21 -0700 Subject: [PATCH] Rename `DamagedPlayerControlsTargetAdjuster` to `ThatPlayerControlsTargetAdjuster` --- Mage.Sets/src/mage/cards/a/Aberrant.java | 4 ++-- .../src/mage/cards/a/AlelaCunningConqueror.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArmWithAether.java | 4 ++-- .../src/mage/cards/a/AshlingTheExtinguisher.java | 4 ++-- Mage.Sets/src/mage/cards/b/BlindZealot.java | 4 ++-- Mage.Sets/src/mage/cards/c/CausticWasps.java | 4 ++-- Mage.Sets/src/mage/cards/c/CommandoRaid.java | 4 ++-- Mage.Sets/src/mage/cards/d/DawningPurist.java | 4 ++-- Mage.Sets/src/mage/cards/d/DeluxeDragster.java | 4 ++-- Mage.Sets/src/mage/cards/d/DreadmawsIre.java | 4 ++-- Mage.Sets/src/mage/cards/e/EtrataTheSilencer.java | 4 ++-- Mage.Sets/src/mage/cards/h/HammerOfRuin.java | 4 ++-- Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java | 5 ++--- Mage.Sets/src/mage/cards/l/LatullasOrders.java | 4 ++-- Mage.Sets/src/mage/cards/l/LightwielderPaladin.java | 4 ++-- Mage.Sets/src/mage/cards/m/MistbladeShinobi.java | 4 ++-- Mage.Sets/src/mage/cards/m/MordantDragon.java | 5 ++--- Mage.Sets/src/mage/cards/p/ParapetThrasher.java | 4 ++-- Mage.Sets/src/mage/cards/p/PolisCrusher.java | 4 ++-- Mage.Sets/src/mage/cards/q/QuestingBeast.java | 4 ++-- Mage.Sets/src/mage/cards/r/RiptideEntrancer.java | 4 ++-- Mage.Sets/src/mage/cards/r/RustmouthOgre.java | 4 ++-- Mage.Sets/src/mage/cards/s/SchemaThief.java | 4 ++-- Mage.Sets/src/mage/cards/s/ScionOfCalamity.java | 4 ++-- Mage.Sets/src/mage/cards/s/ScionOfDarkness.java | 4 ++-- Mage.Sets/src/mage/cards/s/SigilOfSleep.java | 4 ++-- Mage.Sets/src/mage/cards/s/SkirkCommando.java | 4 ++-- Mage.Sets/src/mage/cards/s/Skullsnatcher.java | 4 ++-- Mage.Sets/src/mage/cards/s/SnappingThragg.java | 4 ++-- Mage.Sets/src/mage/cards/s/SparkMage.java | 4 ++-- Mage.Sets/src/mage/cards/s/SunderShaman.java | 4 ++-- Mage.Sets/src/mage/cards/t/ThroatSlitter.java | 4 ++-- Mage.Sets/src/mage/cards/t/TimeReaper.java | 4 ++-- .../src/mage/cards/t/TinybonesThePickpocket.java | 4 ++-- Mage.Sets/src/mage/cards/t/TrygonPredator.java | 4 ++-- Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java | 4 ++-- .../src/mage/cards/z/ZarethSanTheTrickster.java | 4 ++-- Mage.Sets/src/mage/cards/z/ZombieCannibal.java | 4 ++-- .../token/DragonMenaceAndStealArtifactToken.java | 4 ++-- ...r.java => ThatPlayerControlsTargetAdjuster.java} | 13 ++++++------- 40 files changed, 84 insertions(+), 87 deletions(-) rename Mage/src/main/java/mage/target/targetadjustment/{DamagedPlayerControlsTargetAdjuster.java => ThatPlayerControlsTargetAdjuster.java} (80%) diff --git a/Mage.Sets/src/mage/cards/a/Aberrant.java b/Mage.Sets/src/mage/cards/a/Aberrant.java index ea06d8710c0..dc2f62010a8 100644 --- a/Mage.Sets/src/mage/cards/a/Aberrant.java +++ b/Mage.Sets/src/mage/cards/a/Aberrant.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -42,7 +42,7 @@ public final class Aberrant extends CardImpl { Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), false, true); ability.withFlavorWord("Heavy Power Hammer"); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/AlelaCunningConqueror.java b/Mage.Sets/src/mage/cards/a/AlelaCunningConqueror.java index 35a70741ddc..64e623d1928 100644 --- a/Mage.Sets/src/mage/cards/a/AlelaCunningConqueror.java +++ b/Mage.Sets/src/mage/cards/a/AlelaCunningConqueror.java @@ -14,7 +14,7 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.FaerieRogueToken; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -48,7 +48,7 @@ public final class AlelaCunningConqueror extends CardImpl { Effect effect = new GoadTargetEffect().setText("goad target creature that player controls"); Ability ability = new OneOrMoreCombatDamagePlayerTriggeredAbility(Zone.BATTLEFIELD, effect, faerieFilter, SetTargetPointer.PLAYER, false); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/ArmWithAether.java b/Mage.Sets/src/mage/cards/a/ArmWithAether.java index 5c8eacb5aac..56864b7214a 100644 --- a/Mage.Sets/src/mage/cards/a/ArmWithAether.java +++ b/Mage.Sets/src/mage/cards/a/ArmWithAether.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -30,7 +30,7 @@ public final class ArmWithAether extends CardImpl { // Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new ReturnToHandTargetEffect(), false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); Effect effect = new GainAbilityControlledEffect(ability, Duration.EndOfTurn, new FilterCreaturePermanent()); effect.setText("Until end of turn, creatures you control gain \"Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand.\""); diff --git a/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java index 87c9ed6ce85..3b110555383 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java +++ b/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.target.common.TargetCreaturePermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -32,7 +32,7 @@ public final class AshlingTheExtinguisher extends CardImpl { Effect effect = new SacrificeTargetEffect().setText("choose target creature that player controls. The player sacrifices that creature"); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, false, true); ability.addTarget(new TargetCreaturePermanent()); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BlindZealot.java b/Mage.Sets/src/mage/cards/b/BlindZealot.java index 2d1cb8f963b..502ab8e6f1b 100644 --- a/Mage.Sets/src/mage/cards/b/BlindZealot.java +++ b/Mage.Sets/src/mage/cards/b/BlindZealot.java @@ -14,7 +14,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -39,7 +39,7 @@ public final class BlindZealot extends CardImpl { OneShotEffect effect = new DoIfCostPaid(new DestroyTargetEffect(), new SacrificeSourceCost()); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CausticWasps.java b/Mage.Sets/src/mage/cards/c/CausticWasps.java index b7b6fb7f341..cf2c5bf75e7 100644 --- a/Mage.Sets/src/mage/cards/c/CausticWasps.java +++ b/Mage.Sets/src/mage/cards/c/CausticWasps.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterArtifactPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -37,7 +37,7 @@ public final class CausticWasps extends CardImpl { // Whenever Caustic Wasps deals combat damage to a player, you may destroy target artifact that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/c/CommandoRaid.java b/Mage.Sets/src/mage/cards/c/CommandoRaid.java index be0b73f7b6c..c0d604217ac 100644 --- a/Mage.Sets/src/mage/cards/c/CommandoRaid.java +++ b/Mage.Sets/src/mage/cards/c/CommandoRaid.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -29,7 +29,7 @@ public final class CommandoRaid extends CardImpl { effect.setText("have it deal damage equal to its power to target creature that player controls."); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, true, true); ability.addTarget(new TargetCreaturePermanent()); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.getSpellAbility().addEffect(new GainAbilityTargetEffect( ability, Duration.EndOfTurn, diff --git a/Mage.Sets/src/mage/cards/d/DawningPurist.java b/Mage.Sets/src/mage/cards/d/DawningPurist.java index b41e8c8ecf2..25fa10758d7 100644 --- a/Mage.Sets/src/mage/cards/d/DawningPurist.java +++ b/Mage.Sets/src/mage/cards/d/DawningPurist.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterEnchantmentPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -36,7 +36,7 @@ public final class DawningPurist extends CardImpl { // Whenever Dawning Purist deals combat damage to a player, you may destroy target enchantment that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); // Morph {1}{W} diff --git a/Mage.Sets/src/mage/cards/d/DeluxeDragster.java b/Mage.Sets/src/mage/cards/d/DeluxeDragster.java index eba0ecfca95..b5100fa2b03 100644 --- a/Mage.Sets/src/mage/cards/d/DeluxeDragster.java +++ b/Mage.Sets/src/mage/cards/d/DeluxeDragster.java @@ -20,7 +20,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterInstantOrSorceryCard; import mage.filter.predicate.Predicates; import mage.target.common.TargetCardInGraveyard; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -54,7 +54,7 @@ public final class DeluxeDragster extends CardImpl { + ThatSpellGraveyardExileReplacementEffect.RULE_A); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, false, true); ability.addTarget(new TargetCardInGraveyard(filterCard)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); this.addAbility(ability); // Crew 2 diff --git a/Mage.Sets/src/mage/cards/d/DreadmawsIre.java b/Mage.Sets/src/mage/cards/d/DreadmawsIre.java index c5703f64d9d..01c34fc336b 100644 --- a/Mage.Sets/src/mage/cards/d/DreadmawsIre.java +++ b/Mage.Sets/src/mage/cards/d/DreadmawsIre.java @@ -15,7 +15,7 @@ import mage.constants.CardType; import mage.filter.common.FilterArtifactPermanent; import mage.target.TargetPermanent; import mage.target.common.TargetAttackingCreature; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -41,7 +41,7 @@ public final class DreadmawsIre extends CardImpl { effect.setText("have it deal damage equal to its power to target creature that player controls."); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.getSpellAbility().addEffect(new GainAbilityTargetEffect(ability) .setText("and \"Whenever this creature deals combat damage to a player, destroy target artifact that player controls.\"")); diff --git a/Mage.Sets/src/mage/cards/e/EtrataTheSilencer.java b/Mage.Sets/src/mage/cards/e/EtrataTheSilencer.java index 849f43f2213..58f5cad072c 100644 --- a/Mage.Sets/src/mage/cards/e/EtrataTheSilencer.java +++ b/Mage.Sets/src/mage/cards/e/EtrataTheSilencer.java @@ -18,7 +18,7 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -44,7 +44,7 @@ public final class EtrataTheSilencer extends CardImpl { // Whenever Etrata deals combat damage to a player, exile target creature that player controls and put a hit counter on that card. That player loses the game if they own three or more exiled card with hit counters on them. Etrata's owner shuffles Etrata into their library. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new EtrataTheSilencerEffect(), false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/h/HammerOfRuin.java b/Mage.Sets/src/mage/cards/h/HammerOfRuin.java index 85331db5be1..9ceb1aecafc 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfRuin.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfRuin.java @@ -16,7 +16,7 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -38,7 +38,7 @@ public final class HammerOfRuin extends CardImpl { // Whenever equipped creature deals combat damage to a player, you may destroy target Equipment that player controls. Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility(new DestroyTargetEffect(), "equipped creature", true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); // Equip {2} diff --git a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java index d9ae50f79ff..d2c6655563d 100644 --- a/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java +++ b/Mage.Sets/src/mage/cards/i/InkEyesServantOfOni.java @@ -13,10 +13,9 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -43,7 +42,7 @@ public final class InkEyesServantOfOni extends CardImpl { // Whenever Ink-Eyes, Servant of Oni deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), true, true); ability.addTarget(new TargetCardInGraveyard(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); this.addAbility(ability); // {1}{B}: Regenerate Ink-Eyes. diff --git a/Mage.Sets/src/mage/cards/l/LatullasOrders.java b/Mage.Sets/src/mage/cards/l/LatullasOrders.java index c3ca0307682..3e274506c02 100644 --- a/Mage.Sets/src/mage/cards/l/LatullasOrders.java +++ b/Mage.Sets/src/mage/cards/l/LatullasOrders.java @@ -15,7 +15,7 @@ import mage.constants.SubType; import mage.filter.common.FilterArtifactPermanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -45,7 +45,7 @@ public final class LatullasOrders extends CardImpl { new DestroyTargetEffect(), "enchanted creature", true, true ).setTriggerPhrase("Whenever enchanted creature deals combat damage to defending player, "); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LightwielderPaladin.java b/Mage.Sets/src/mage/cards/l/LightwielderPaladin.java index 00d395d0cbd..3203a1ebd15 100644 --- a/Mage.Sets/src/mage/cards/l/LightwielderPaladin.java +++ b/Mage.Sets/src/mage/cards/l/LightwielderPaladin.java @@ -15,7 +15,7 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -46,7 +46,7 @@ public final class LightwielderPaladin extends CardImpl { // Whenever Lightwielder Paladin deals combat damage to a player, you may exile target black or red permanent that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new ExileTargetEffect(), true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MistbladeShinobi.java b/Mage.Sets/src/mage/cards/m/MistbladeShinobi.java index 304042e182e..9959e14301a 100644 --- a/Mage.Sets/src/mage/cards/m/MistbladeShinobi.java +++ b/Mage.Sets/src/mage/cards/m/MistbladeShinobi.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.target.common.TargetCreaturePermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -38,7 +38,7 @@ public final class MistbladeShinobi extends CardImpl { // Whenever Mistblade Shinobi deals combat damage to a player, you may return target creature that player controls to its owner's hand. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new ReturnToHandTargetEffect(), true, true); ability.addTarget(new TargetCreaturePermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MordantDragon.java b/Mage.Sets/src/mage/cards/m/MordantDragon.java index d336d6a8a2f..634fc2d91ec 100644 --- a/Mage.Sets/src/mage/cards/m/MordantDragon.java +++ b/Mage.Sets/src/mage/cards/m/MordantDragon.java @@ -15,9 +15,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; -import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -45,7 +44,7 @@ public final class MordantDragon extends CardImpl { effect.setText("have it deal that much damage to target creature that player controls."); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, true, true); ability.addTarget(new TargetCreaturePermanent()); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/ParapetThrasher.java b/Mage.Sets/src/mage/cards/p/ParapetThrasher.java index 8fe9ba4b29e..48725cea523 100644 --- a/Mage.Sets/src/mage/cards/p/ParapetThrasher.java +++ b/Mage.Sets/src/mage/cards/p/ParapetThrasher.java @@ -22,7 +22,7 @@ import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.players.Player; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; /** * @@ -49,7 +49,7 @@ public final class ParapetThrasher extends CardImpl { filter, true, true, SetTargetPointer.PLAYER, false) .setTriggerPhrase("Whenever one or more Dragons you control deal combat damage to an opponent, "); ability.addTarget(new TargetPermanent(artifactFilter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); ability.setModeTag("destroy artifact"); ability.getModes().setLimitUsageByOnce(true); diff --git a/Mage.Sets/src/mage/cards/p/PolisCrusher.java b/Mage.Sets/src/mage/cards/p/PolisCrusher.java index 00b0f5d917c..1b615461828 100644 --- a/Mage.Sets/src/mage/cards/p/PolisCrusher.java +++ b/Mage.Sets/src/mage/cards/p/PolisCrusher.java @@ -17,7 +17,7 @@ import mage.filter.FilterCard; import mage.filter.common.FilterEnchantmentCard; import mage.filter.common.FilterEnchantmentPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -52,7 +52,7 @@ public final class PolisCrusher extends CardImpl { // Whenever Polis Crusher deals combat damage to a player, if Polis Crusher is monstrous, destroy target enchantment that player controls. TriggeredAbility ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), false, true); ability.addTarget(new TargetPermanent(filterPermanent)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, MonstrousCondition.instance, "Whenever {this} deals combat damage to a player, if {this} is monstrous, destroy target enchantment that player controls.")); diff --git a/Mage.Sets/src/mage/cards/q/QuestingBeast.java b/Mage.Sets/src/mage/cards/q/QuestingBeast.java index 5e8592460fa..87b9fa0c4a5 100644 --- a/Mage.Sets/src/mage/cards/q/QuestingBeast.java +++ b/Mage.Sets/src/mage/cards/q/QuestingBeast.java @@ -21,7 +21,7 @@ import mage.game.events.GameEvent; import mage.game.events.PreventDamageEvent; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -57,7 +57,7 @@ public final class QuestingBeast extends CardImpl { // Whenever Questing Beast deals combat damage to an opponent, it deals that much damage to target planeswalker that player controls. Ability ability = new DealsDamageToOpponentTriggeredAbility(new DamageTargetEffect(SavedDamageValue.MUCH), false, true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java b/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java index 66e9db86583..aa21c7f85de 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java +++ b/Mage.Sets/src/mage/cards/r/RiptideEntrancer.java @@ -16,7 +16,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -39,7 +39,7 @@ public final class RiptideEntrancer extends CardImpl { Effect effect = new DoIfCostPaid(new GainControlTargetEffect(Duration.WhileOnBattlefield), new SacrificeSourceCost()); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); // Morph {U}{U} diff --git a/Mage.Sets/src/mage/cards/r/RustmouthOgre.java b/Mage.Sets/src/mage/cards/r/RustmouthOgre.java index e2b48e23a17..4707d7ef988 100644 --- a/Mage.Sets/src/mage/cards/r/RustmouthOgre.java +++ b/Mage.Sets/src/mage/cards/r/RustmouthOgre.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterArtifactPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -33,7 +33,7 @@ public final class RustmouthOgre extends CardImpl { // Whenever Rustmouth Ogre deals combat damage to a player, you may destroy target artifact that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SchemaThief.java b/Mage.Sets/src/mage/cards/s/SchemaThief.java index c439e1bb4d1..6b1c81c4009 100644 --- a/Mage.Sets/src/mage/cards/s/SchemaThief.java +++ b/Mage.Sets/src/mage/cards/s/SchemaThief.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterArtifactPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -38,7 +38,7 @@ public final class SchemaThief extends CardImpl { // Whenever Schema Thief deals combat damage to a player, create a token that's a copy of target artifact that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new CreateTokenCopyTargetEffect(), false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScionOfCalamity.java b/Mage.Sets/src/mage/cards/s/ScionOfCalamity.java index f22ce9b6086..f4191d15b57 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfCalamity.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfCalamity.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -36,7 +36,7 @@ public final class ScionOfCalamity extends CardImpl { // Whenever Scion of Calamity deals combat damage to a player, destroy target artifact or enchantment that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScionOfDarkness.java b/Mage.Sets/src/mage/cards/s/ScionOfDarkness.java index 7f6fb900001..4340d3a8624 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfDarkness.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfDarkness.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInGraveyard; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -39,7 +39,7 @@ public final class ScionOfDarkness extends CardImpl { // Whenever Scion of Darkness deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), true, true); ability.addTarget(new TargetCardInGraveyard(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); this.addAbility(ability); // Cycling {3} diff --git a/Mage.Sets/src/mage/cards/s/SigilOfSleep.java b/Mage.Sets/src/mage/cards/s/SigilOfSleep.java index e2d93bd8223..7856263da01 100644 --- a/Mage.Sets/src/mage/cards/s/SigilOfSleep.java +++ b/Mage.Sets/src/mage/cards/s/SigilOfSleep.java @@ -14,7 +14,7 @@ import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -40,7 +40,7 @@ public final class SigilOfSleep extends CardImpl { Effect effect = new ReturnToHandTargetEffect(); ability = new DealsDamageToAPlayerAttachedTriggeredAbility(effect, "enchanted", false, true, false); ability.addTarget(new TargetCreaturePermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SkirkCommando.java b/Mage.Sets/src/mage/cards/s/SkirkCommando.java index 1dd7cbb1ddd..14dc245e0ab 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkCommando.java +++ b/Mage.Sets/src/mage/cards/s/SkirkCommando.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -35,7 +35,7 @@ public final class SkirkCommando extends CardImpl { //Whenever Skirk Commando deals combat damage to a player, you may have it deal 2 damage to target creature that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DamageTargetEffect(2), true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); //Morph {2}{R} (You may cast this card face down as a 2/2 creature for 3. Turn it face up any time for its morph cost.) diff --git a/Mage.Sets/src/mage/cards/s/Skullsnatcher.java b/Mage.Sets/src/mage/cards/s/Skullsnatcher.java index 8a9a5332f67..8a82f7a47a4 100644 --- a/Mage.Sets/src/mage/cards/s/Skullsnatcher.java +++ b/Mage.Sets/src/mage/cards/s/Skullsnatcher.java @@ -16,7 +16,7 @@ import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.UnblockedPredicate; import mage.target.common.TargetCardInGraveyard; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -47,7 +47,7 @@ public final class Skullsnatcher extends CardImpl { Effect effect = new ExileTargetEffect(null, "", Zone.GRAVEYARD); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, false, true); ability.addTarget(new TargetCardInGraveyard(0, 2, filterGraveyardCard)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SnappingThragg.java b/Mage.Sets/src/mage/cards/s/SnappingThragg.java index e5849354032..476f684aceb 100644 --- a/Mage.Sets/src/mage/cards/s/SnappingThragg.java +++ b/Mage.Sets/src/mage/cards/s/SnappingThragg.java @@ -13,7 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -35,7 +35,7 @@ public final class SnappingThragg extends CardImpl { // Whenever Snapping Thragg deals combat damage to a player, you may have it deal 3 damage to target creature that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DamageTargetEffect(3), true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); // Morph {4}{R}{R} diff --git a/Mage.Sets/src/mage/cards/s/SparkMage.java b/Mage.Sets/src/mage/cards/s/SparkMage.java index 8eabdbbd9f1..f3b5b2acdbb 100644 --- a/Mage.Sets/src/mage/cards/s/SparkMage.java +++ b/Mage.Sets/src/mage/cards/s/SparkMage.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -36,7 +36,7 @@ public final class SparkMage extends CardImpl { new DamageTargetEffect(1), true, true ).withRuleTextReplacement(false); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SunderShaman.java b/Mage.Sets/src/mage/cards/s/SunderShaman.java index 6921a07b61d..8c97e3746c0 100644 --- a/Mage.Sets/src/mage/cards/s/SunderShaman.java +++ b/Mage.Sets/src/mage/cards/s/SunderShaman.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -38,7 +38,7 @@ public final class SunderShaman extends CardImpl { // Whenever Sunder Shaman deals combat damage to a player, destroy target artifact or enchantment that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThroatSlitter.java b/Mage.Sets/src/mage/cards/t/ThroatSlitter.java index f887b058182..15c49b945eb 100644 --- a/Mage.Sets/src/mage/cards/t/ThroatSlitter.java +++ b/Mage.Sets/src/mage/cards/t/ThroatSlitter.java @@ -15,7 +15,7 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -45,7 +45,7 @@ public final class ThroatSlitter extends CardImpl { // Whenever Throat Slitter deals combat damage to a player, destroy target nonblack creature that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TimeReaper.java b/Mage.Sets/src/mage/cards/t/TimeReaper.java index d6a55ec7bcb..3d055d4bbef 100644 --- a/Mage.Sets/src/mage/cards/t/TimeReaper.java +++ b/Mage.Sets/src/mage/cards/t/TimeReaper.java @@ -15,7 +15,7 @@ import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.card.FaceDownPredicate; import mage.target.common.TargetCardInExile; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -49,7 +49,7 @@ public final class TimeReaper extends CardImpl { Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new PutOnLibraryTargetEffect(false), false, true); ability.addEffect(new GainLifeEffect(3).concatBy("If you do,")); //I don't think the move can fail? If there's no target then the trigger won't happen ability.addTarget(new TargetCardInExile(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); ability.withFlavorWord("Consume Anomaly"); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TinybonesThePickpocket.java b/Mage.Sets/src/mage/cards/t/TinybonesThePickpocket.java index 3a48422bda3..789c75a5332 100644 --- a/Mage.Sets/src/mage/cards/t/TinybonesThePickpocket.java +++ b/Mage.Sets/src/mage/cards/t/TinybonesThePickpocket.java @@ -16,7 +16,7 @@ import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; import mage.target.common.TargetCardInGraveyard; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -48,7 +48,7 @@ public final class TinybonesThePickpocket extends CardImpl { OneShotEffect effect = new MayCastTargetCardEffect(CastManaAdjustment.AS_THOUGH_ANY_MANA_TYPE, false); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, false, true); ability.addTarget(new TargetCardInGraveyard(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/TrygonPredator.java b/Mage.Sets/src/mage/cards/t/TrygonPredator.java index c3d22b61ee4..40cff196c1c 100644 --- a/Mage.Sets/src/mage/cards/t/TrygonPredator.java +++ b/Mage.Sets/src/mage/cards/t/TrygonPredator.java @@ -12,7 +12,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -36,7 +36,7 @@ public final class TrygonPredator extends CardImpl { // Whenever Trygon Predator deals combat damage to a player, you may destroy target artifact or enchantment that player controls. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DestroyTargetEffect(), true, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java b/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java index 15a2c841e0b..d4ccc426dc2 100644 --- a/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java +++ b/Mage.Sets/src/mage/cards/w/WrexialTheRisenDeep.java @@ -17,7 +17,7 @@ import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; import mage.target.common.TargetCardInGraveyard; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -50,7 +50,7 @@ public final class WrexialTheRisenDeep extends CardImpl { + ThatSpellGraveyardExileReplacementEffect.RULE_A); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, false, true); ability.addTarget(new TargetCardInGraveyard(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/z/ZarethSanTheTrickster.java b/Mage.Sets/src/mage/cards/z/ZarethSanTheTrickster.java index a40f80a5084..057fe6af878 100644 --- a/Mage.Sets/src/mage/cards/z/ZarethSanTheTrickster.java +++ b/Mage.Sets/src/mage/cards/z/ZarethSanTheTrickster.java @@ -22,7 +22,7 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetControlledPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -61,7 +61,7 @@ public final class ZarethSanTheTrickster extends CardImpl { // Whenever Zareth San deals combat damage to a player, you may put target permanent card from that player's graveyard onto the battlefield under your control. Ability ability2 = new DealsCombatDamageToAPlayerTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), true, true); ability2.addTarget(new TargetCardInGraveyard(filterCardGraveyard)); - ability2.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability2.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/z/ZombieCannibal.java b/Mage.Sets/src/mage/cards/z/ZombieCannibal.java index d2bac983887..ad8c8915e03 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieCannibal.java +++ b/Mage.Sets/src/mage/cards/z/ZombieCannibal.java @@ -12,7 +12,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInGraveyard; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; import java.util.UUID; @@ -34,7 +34,7 @@ public final class ZombieCannibal extends CardImpl { Effect effect = new ExileTargetEffect(null, "", Zone.GRAVEYARD); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect, true, true); ability.addTarget(new TargetCardInGraveyard(filterGraveyardCard)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster(true)); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster(true)); this.addAbility(ability); } diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonMenaceAndStealArtifactToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonMenaceAndStealArtifactToken.java index 09906bdad14..6b47dd7b914 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonMenaceAndStealArtifactToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonMenaceAndStealArtifactToken.java @@ -11,7 +11,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterArtifactPermanent; import mage.target.TargetPermanent; -import mage.target.targetadjustment.DamagedPlayerControlsTargetAdjuster; +import mage.target.targetadjustment.ThatPlayerControlsTargetAdjuster; public class DragonMenaceAndStealArtifactToken extends TokenImpl { @@ -31,7 +31,7 @@ public class DragonMenaceAndStealArtifactToken extends TokenImpl { Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new GainControlTargetEffect(Duration.EndOfGame), false, true); ability.addTarget(new TargetPermanent(filter)); - ability.setTargetAdjuster(new DamagedPlayerControlsTargetAdjuster()); + ability.setTargetAdjuster(new ThatPlayerControlsTargetAdjuster()); addAbility(ability); } diff --git a/Mage/src/main/java/mage/target/targetadjustment/DamagedPlayerControlsTargetAdjuster.java b/Mage/src/main/java/mage/target/targetadjustment/ThatPlayerControlsTargetAdjuster.java similarity index 80% rename from Mage/src/main/java/mage/target/targetadjustment/DamagedPlayerControlsTargetAdjuster.java rename to Mage/src/main/java/mage/target/targetadjustment/ThatPlayerControlsTargetAdjuster.java index 73694ca6d41..eacea107664 100644 --- a/Mage/src/main/java/mage/target/targetadjustment/DamagedPlayerControlsTargetAdjuster.java +++ b/Mage/src/main/java/mage/target/targetadjustment/ThatPlayerControlsTargetAdjuster.java @@ -1,7 +1,6 @@ package mage.target.targetadjustment; import mage.abilities.Ability; -import mage.abilities.common.OneOrMoreDamagePlayerTriggeredAbility; import mage.filter.Filter; import mage.filter.predicate.card.OwnerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -17,20 +16,20 @@ import java.util.UUID; /** * @author notgreat */ -public class DamagedPlayerControlsTargetAdjuster extends GenericTargetAdjuster { +public class ThatPlayerControlsTargetAdjuster extends GenericTargetAdjuster { private final boolean owner; /** * Use with {@link mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility} with setTargetPointer enabled, - * or {@link OneOrMoreDamagePlayerTriggeredAbility} with "SetTargetPointer.PLAYER" or similar. - * Adjusts the target to only target something the damaged player controls (or owns with alternative constructor) - * And then removes the effects' target pointer that the triggered ability set + * or {@link mage.abilities.common.OneOrMoreDamagePlayerTriggeredAbility} with "SetTargetPointer.PLAYER" or similar. + * Adjusts the target to only target something the damaged/attacked/etc. player controls (or owns with alternative constructor) + * And then removes the effects' target pointer that the triggered ability set, replacing it with the standard {@link FirstTargetPointer} */ - public DamagedPlayerControlsTargetAdjuster() { + public ThatPlayerControlsTargetAdjuster() { this(false); } - public DamagedPlayerControlsTargetAdjuster(boolean owner) { + public ThatPlayerControlsTargetAdjuster(boolean owner) { this.owner = owner; }