From 4dcf37e00705598db5af658d802ff52bc664d0cb Mon Sep 17 00:00:00 2001 From: xenohedron <12538125+xenohedron@users.noreply.github.com> Date: Tue, 18 Nov 2025 20:50:21 -0500 Subject: [PATCH] fix text generation in new damage effect classes --- .../effects/common/DamageTargetAndAllControlledEffect.java | 2 +- .../abilities/effects/common/DamageTargetAndSelfEffect.java | 4 ++-- .../effects/common/DamageTargetAndTargetControllerEffect.java | 4 ++-- .../abilities/effects/common/DamageTargetAndTargetEffect.java | 4 ++-- .../abilities/effects/common/DamageTargetAndYouEffect.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java index b62896f7e90..c9c9dbc0f93 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java @@ -74,7 +74,7 @@ public class DamageTargetAndAllControlledEffect extends OneShotEffect { return staticText; } String description = getTargetPointer().describeTargets(mode.getTargets(), "that player"); - return "{this} deals " + firstAmount + "damage to " + description + + return "{this} deals " + firstAmount + " damage to " + description + " and " + secondAmount + " damage to each " + filter.getMessage() + " that player" + (description.contains("planeswalker") ? " or that planeswalker's controller" : "") + diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndSelfEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndSelfEffect.java index ea7bc7c38ea..5ba9fd27c9a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndSelfEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndSelfEffect.java @@ -70,8 +70,8 @@ public class DamageTargetAndSelfEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - return "{this} deals " + firstAmount + "damage to " + + return "{this} deals " + firstAmount + " damage to " + getTargetPointer().describeTargets(mode.getTargets(), "that creature") + - " and " + secondAmount + "damage to itself"; + " and " + secondAmount + " damage to itself"; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndTargetControllerEffect.java index 50f4bbda6ec..0fe2b18aa26 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndTargetControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndTargetControllerEffect.java @@ -62,8 +62,8 @@ public class DamageTargetAndTargetControllerEffect extends OneShotEffect { return staticText; } String description = getTargetPointer().describeTargets(mode.getTargets(), "that creature"); - return "{this} deals " + firstAmount + "damage to " + description + - " and " + secondAmount + "damage to that " + + return "{this} deals " + firstAmount + " damage to " + description + + " and " + secondAmount + " damage to that " + (description.contains(" or ") ? "permanent's" : "creature's") + " controller"; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndTargetEffect.java index 55a951b8085..c5f81072b7d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndTargetEffect.java @@ -66,7 +66,7 @@ public class DamageTargetAndTargetEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - return "{this} deals " + firstAmount + "damage to " + mode.getTargets().getByTag(1).getDescription() + - " and " + secondAmount + "damage to " + mode.getTargets().getByTag(2).getDescription(); + return "{this} deals " + firstAmount + " damage to " + mode.getTargets().getByTag(1).getDescription() + + " and " + secondAmount + " damage to " + mode.getTargets().getByTag(2).getDescription(); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndYouEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndYouEffect.java index b1e874e845e..390d3ff6273 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndYouEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndYouEffect.java @@ -70,8 +70,8 @@ public class DamageTargetAndYouEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - return "{this} deals " + firstAmount + "damage to " + + return "{this} deals " + firstAmount + " damage to " + getTargetPointer().describeTargets(mode.getTargets(), "that creature") + - " and " + secondAmount + "damage to you"; + " and " + secondAmount + " damage to you"; } }