External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 19:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve rule generation for DealsDamageToAPlayerAllTriggeredAbility

Browse source
This commit is contained in:
PurpleCrowbar 2024-02-29 02:57:39 +00:00
parent f836ad8c61
commit 68bfe4fd6f
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/s/SophiaDoggedDetective.java
View file

@ -53,9 +53,7 @@ public final class SophiaDoggedDetective extends CardImpl {
this.addAbility(ability);
// Whenever a Dog you control deals combat damage to a player, create a Food token, then investigate.
ability = new DealsDamageToAPlayerAllTriggeredAbility(
new CreateTokenEffect(new FoodToken()), filter, false, SetTargetPointer.NONE, true
).setTriggerPhrase("Whenever a Dog you control deals combat damage to a player, ");
ability = new DealsDamageToAPlayerAllTriggeredAbility(new CreateTokenEffect(new FoodToken()), filter, false, SetTargetPointer.NONE, true);
ability.addEffect(new InvestigateEffect(false).concatBy(", then"));
this.addAbility(ability);
}

4
Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java
View file

@ -1,4 +1,3 @@
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
@ -12,6 +11,7 @@ import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil;
/**
* @author LevelX2
@ -43,7 +43,7 @@ public class DealsDamageToAPlayerAllTriggeredAbility extends TriggeredAbilityImp
this.onlyCombat = onlyCombat;
this.affectsDefendingPlayer = affectsDefendingPlayer;
this.targetController = targetController;
setTriggerPhrase("Whenever " + filter.getMessage() + " deals " + (onlyCombat ? "combat " : "") + "damage to "
setTriggerPhrase("Whenever " + CardUtil.addArticle(filter.getMessage()) + " deals " + (onlyCombat ? "combat " : "") + "damage to "
+ (targetController == TargetController.OPPONENT ? "an opponent" : "a player") + ", ");
}