Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

New common class CopyTargetStackAbilityEffect (#10525)

Browse source 
- Fix superfluous null check in Lithoform Engine
- Remove hardcoding of controlled abilities in TargetTriggeredAbility (used only in Strionic Resonator)
- EnchantmentSourcePredicate analogous to ArtifactSourcePredicate
This commit is contained in:
xenohedron 2023-06-25 22:20:41 -04:00 • committed by GitHub
parent 8d55419003
commit 231ab77bcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 137 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Mage/src/main/java/mage/target/common/TargetTriggeredAbility.java
View file

@ -1,32 +1,36 @@
package mage.target.common;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbility;
import mage.constants.AbilityType;
import mage.constants.Zone;
import mage.filter.Filter;
import mage.filter.FilterAbility;
import mage.filter.FilterStackObject;
import mage.game.Game;
import mage.game.stack.StackObject;
import mage.target.TargetObject;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
/**
* @author Styxo
*/
public class TargetTriggeredAbility extends TargetObject {
public TargetTriggeredAbility() {
protected final FilterStackObject filter;
public TargetTriggeredAbility(FilterStackObject filter) {
this.minNumberOfTargets = 1;
this.maxNumberOfTargets = 1;
this.zone = Zone.STACK;
this.targetName = "target triggered ability you control";
this.targetName = filter.getMessage();
this.filter = filter;
}
public TargetTriggeredAbility(final TargetTriggeredAbility target) {
super(target);
this.filter = target.filter.copy();
}
@Override
@ -37,28 +41,29 @@ public class TargetTriggeredAbility extends TargetObject {
}
StackObject stackObject = game.getStack().getStackObject(id);
return stackObject != null
&& stackObject.getStackAbility() instanceof TriggeredAbility
return isTriggeredAbility(stackObject)
&& source != null
&& stackObject.getStackAbility().isControlledBy(source.getControllerId());
&& filter.match(stackObject, source.getControllerId(), source, game);
}
@Override
public boolean canChoose(UUID sourceControllerId, Ability source, Game game) {
return canChoose(sourceControllerId, game);
}
@Override
public boolean canChoose(UUID sourceControllerId, Game game) {
for (StackObject stackObject : game.getStack()) {
if (stackObject.getStackAbility() instanceof TriggeredAbility
&& stackObject.getStackAbility().isControlledBy(sourceControllerId)) {
if (isTriggeredAbility(stackObject)
&& filter.match(stackObject, sourceControllerId, source, game)) {
return true;
}
}
return false;
}
@Override
public boolean canChoose(UUID sourceControllerId, Game game) {
return game.getStack()
.stream()
.anyMatch(TargetTriggeredAbility::isTriggeredAbility);
}
@Override
public Set<UUID> possibleTargets(UUID sourceControllerId, Ability source, Game game) {
return possibleTargets(sourceControllerId, game);
@ -66,14 +71,10 @@ public class TargetTriggeredAbility extends TargetObject {
@Override
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
Set<UUID> possibleTargets = new HashSet<>();
for (StackObject stackObject : game.getStack()) {
if (stackObject.getStackAbility() instanceof TriggeredAbility
&& stackObject.getStackAbility().isControlledBy(sourceControllerId)) {
possibleTargets.add(stackObject.getStackAbility().getId());
}
}
return possibleTargets;
return game.getStack().stream()
.filter(TargetTriggeredAbility::isTriggeredAbility)
.map(stackObject -> stackObject.getStackAbility().getId())
.collect(Collectors.toSet());
}
@Override
@ -83,7 +84,18 @@ public class TargetTriggeredAbility extends TargetObject {
@Override
public Filter getFilter() {
return new FilterAbility();
return filter;
}
static boolean isTriggeredAbility(StackObject stackObject) {
if (stackObject == null) {
return false;
}
if (stackObject instanceof Ability) {
Ability ability = (Ability) stackObject;
return ability.getAbilityType() == AbilityType.TRIGGERED;
}
return false;
}
}