External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

reworked AttacksWithCreaturesTriggeredAbility implementation and text generation, fixed issues where it could trigger when nothing attacked

Browse source
This commit is contained in:
Evan Kranzler 2021-08-30 19:51:46 -04:00
parent 1843459e84
commit 600b4fe110
12 changed files with 49 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java
View file

@ -7,18 +7,15 @@ import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
import java.util.UUID;
/**
* @author Styxo
*/
public class AttacksWithCreaturesTriggeredAbility extends TriggeredAbilityImpl {
private FilterCreaturePermanent filter;
private int minAttackers;
private final FilterCreaturePermanent filter;
private final int minAttackers;
public AttacksWithCreaturesTriggeredAbility(Effect effect, int minAttackers) {
this(effect, minAttackers, StaticFilters.FILTER_PERMANENT_CREATURES);
@ -52,28 +49,26 @@ public class AttacksWithCreaturesTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (game.getCombat().getAttackingPlayerId().equals(getControllerId())) {
int attackerCount = 0;
for (UUID attackerId : game.getCombat().getAttackers()) {
Permanent attacker = game.getPermanent(attackerId);
if (filter.match(attacker, game)) {
attackerCount++;
}
}
return attackerCount >= minAttackers;
}
return false;
return isControlledBy(game.getCombat().getAttackingPlayerId())
&& game
.getCombat()
.getAttackers()
.stream()
.map(game::getPermanent)
.filter(permanent -> filter.match(permanent, sourceId, controllerId, game))
.mapToInt(x -> 1).sum() > minAttackers;
}
@Override
public String getTriggerPhrase() {
if (minAttackers == 0) {
if (minAttackers == 1) {
return "Whenever you attack, ";
}
StringBuilder sb = new StringBuilder("Whenever you attack with " + CardUtil.numberToText(minAttackers) + " or more ");
StringBuilder sb = new StringBuilder("Whenever you attack with ");
sb.append(CardUtil.numberToText(minAttackers));
sb.append(" or more ");
sb.append(filter.getMessage());
sb.append(", ");
return sb.toString();
}
}