External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed issues with cards that goad multiple creatures at once (fixes #9007, fixes #8958)

Browse source
This commit is contained in:
Evan Kranzler 2022-05-31 18:11:15 -04:00
parent e22648a385
commit 80c9c33b78
7 changed files with 100 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Mage/src/main/java/mage/abilities/effects/common/combat/GoadAllEffect.java
View file

@ -1,26 +1,36 @@
package mage.abilities.effects.common.combat;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.Mode;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.filter.StaticFilters;
import mage.constants.SubLayer;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
/**
* @author TheElk801
*/
public class GoadAllEffect extends OneShotEffect {
public class GoadAllEffect extends ContinuousEffectImpl {
public GoadAllEffect() {
super(Outcome.Benefit);
staticText = "Goad all creatures you don't control. <i>(Until your next turn, those creatures attack each combat if able and attack a player other than you if able.)</i>";
private final FilterPermanent filter;
public GoadAllEffect(FilterPermanent filter) {
this(Duration.UntilYourNextTurn, filter);
}
public GoadAllEffect(final GoadAllEffect effect) {
public GoadAllEffect(Duration duration, FilterPermanent filter) {
super(duration, Layer.RulesEffects, SubLayer.NA, Outcome.Detriment);
this.filter = filter;
}
private GoadAllEffect(final GoadAllEffect effect) {
super(effect);
this.filter = effect.filter;
}
@Override
@ -28,15 +38,43 @@ public class GoadAllEffect extends OneShotEffect {
return new GoadAllEffect(this);
}
@Override
public void init(Ability source, Game game) {
super.init(source, game);
if (this.affectedObjectsSet) {
game.getBattlefield()
.getActivePermanents(
filter, source.getControllerId(), source, game
).stream()
.map(permanent -> new MageObjectReference(permanent, game))
.forEach(this.affectedObjectList::add);
}
}
@Override
public boolean apply(Game game, Ability source) {
for (Permanent creature : game.getBattlefield().getActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), game)) {
if (!creature.isControlledBy(source.getControllerId())) {
Effect effect = new GoadTargetEffect();
effect.setTargetPointer(new FixedTarget(creature, game));
effect.apply(game, source);
if (this.affectedObjectsSet) {
this.affectedObjectList.removeIf(mor -> !mor.zoneCounterIsCurrent(game));
if (affectedObjectList.isEmpty()) {
discard();
return false;
}
for (MageObjectReference mor : this.affectedObjectList) {
mor.getPermanent(game).addGoadingPlayer(source.getControllerId());
}
return true;
}
for (Permanent creature : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game)) {
creature.addGoadingPlayer(source.getControllerId());
}
return true;
}
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return "Goad all " + filter.getMessage() + ". <i>(Until your next turn, those creatures attack each combat if able and attack a player other than you if able.)</i>";
}
}

20
Mage/src/main/java/mage/abilities/effects/common/combat/GoadTargetEffect.java
View file

@ -11,6 +11,8 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.UUID;
/**
* @author TheElk801
*/
@ -39,20 +41,24 @@ public class GoadTargetEffect extends ContinuousEffectImpl {
@Override
public void init(Ability source, Game game) {
super.init(source, game);
Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source));
Player controller = game.getPlayer(source.getControllerId());
if (targetCreature != null && controller != null) {
game.informPlayers(controller.getLogName() + " is goading " + targetCreature.getLogName());
if (controller == null) {
return;
}
for (UUID targetId : getTargetPointer().getTargets(game, source)) {
Permanent targetCreature = game.getPermanent(targetId);
if (targetCreature != null) {
game.informPlayers(controller.getLogName() + " is goading " + targetCreature.getLogName());
}
}
}
@Override
public boolean apply(Game game, Ability source) {
Permanent targetCreature = game.getPermanent(getTargetPointer().getFirst(game, source));
if (targetCreature == null) {
return false;
for (UUID targetId : getTargetPointer().getTargets(game, source)) {
Permanent targetCreature = game.getPermanent(targetId);
targetCreature.addGoadingPlayer(source.getControllerId());
}
targetCreature.addGoadingPlayer(source.getControllerId());
return true;
}