From 9fbdede64b930f65331525bbaffbc15e6f59fbae Mon Sep 17 00:00:00 2001 From: xenohedron Date: Tue, 28 Nov 2023 17:53:23 -0500 Subject: [PATCH] text cleanup: additional combat phase --- Mage.Sets/src/mage/cards/b/Bloodthirster.java | 2 +- Mage.Sets/src/mage/cards/c/CombatCelebrant.java | 2 +- Mage.Sets/src/mage/cards/p/PortRazer.java | 2 +- .../effects/common/AdditionalCombatPhaseEffect.java | 7 +------ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/Bloodthirster.java b/Mage.Sets/src/mage/cards/b/Bloodthirster.java index e857da60d88..102a885d7a8 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodthirster.java +++ b/Mage.Sets/src/mage/cards/b/Bloodthirster.java @@ -42,7 +42,7 @@ public final class Bloodthirster extends CardImpl { // Whenever Bloodthirster deals combat damage to a player, untap it. After this combat phase, there is an additional combat phase. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new UntapSourceEffect().setText("untap it"), false, true); - ability.addEffect(new AdditionalCombatPhaseEffect("After this combat phase, there is an additional combat phase")); + ability.addEffect(new AdditionalCombatPhaseEffect().setText("After this combat phase, there is an additional combat phase")); this.addAbility(ability); // Bloodthirster can't attack a player it has already attacked this turn. diff --git a/Mage.Sets/src/mage/cards/c/CombatCelebrant.java b/Mage.Sets/src/mage/cards/c/CombatCelebrant.java index 2bd7d6f0b39..d1d11864e08 100644 --- a/Mage.Sets/src/mage/cards/c/CombatCelebrant.java +++ b/Mage.Sets/src/mage/cards/c/CombatCelebrant.java @@ -28,7 +28,7 @@ public final class CombatCelebrant extends CardImpl { // If Combat Celebrant hasn't been exerted this turn, you may exert it as it attacks. When you do, untap all other creatures you control and after this phase, there is an additional combat phase. BecomesExertSourceTriggeredAbility ability = new BecomesExertSourceTriggeredAbility(new UntapAllControllerEffect(StaticFilters.FILTER_PERMANENT_CREATURES, null, false)); - ability.addEffect(new AdditionalCombatPhaseEffect("and after this phase, there is an additional combat phase")); + ability.addEffect(new AdditionalCombatPhaseEffect().concatBy("and")); this.addAbility(new ExertAbility(ability, true)); } diff --git a/Mage.Sets/src/mage/cards/p/PortRazer.java b/Mage.Sets/src/mage/cards/p/PortRazer.java index 34dbf574d17..66056455c93 100644 --- a/Mage.Sets/src/mage/cards/p/PortRazer.java +++ b/Mage.Sets/src/mage/cards/p/PortRazer.java @@ -42,7 +42,7 @@ public final class PortRazer extends CardImpl { ), false ); ability.addEffect(new AdditionalCombatPhaseEffect() - .setText("After this phase, there is an additional combat phase.")); + .setText("After this combat phase, there is an additional combat phase.")); this.addAbility(ability); // Port Razer can't attack a player it has already attacked this turn. diff --git a/Mage/src/main/java/mage/abilities/effects/common/AdditionalCombatPhaseEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AdditionalCombatPhaseEffect.java index b99bec68056..23163ca9c79 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AdditionalCombatPhaseEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AdditionalCombatPhaseEffect.java @@ -11,12 +11,7 @@ public class AdditionalCombatPhaseEffect extends OneShotEffect { public AdditionalCombatPhaseEffect() { super(Outcome.Benefit); - staticText = "After this phase, there is an additional combat phase"; - } - - public AdditionalCombatPhaseEffect(String staticText) { - this(); - this.staticText = staticText; + staticText = "after this phase, there is an additional combat phase"; } protected AdditionalCombatPhaseEffect(final AdditionalCombatPhaseEffect effect) {