github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 09:16:26 -09:00
Code Issues Projects Releases Packages Wiki Activity

[HOU] Nimble Obstructionist - Fixed that the Cycle ability blocked the game if no valid target to counter is on the stack (fixes +3615).

Browse source
This commit is contained in:
LevelX2 2017-07-08 18:42:50 +02:00
parent 16e7e3a346
commit 28cfbad76a
1 changed files with 126 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

250
Mage/src/main/java/mage/target/common/TargetActivatedOrTriggeredAbility.java
View file

@ -1,124 +1,126 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.target.common;
package mage.target.common;
import java.util.Set;
import java.util.Set; import java.util.UUID;
import java.util.UUID; import java.util.stream.Collectors;
import java.util.stream.Collectors; import mage.abilities.Ability;
import mage.abilities.Ability; import mage.constants.AbilityType;
import mage.constants.AbilityType; import mage.constants.Zone;
import mage.constants.Zone; import mage.filter.Filter;
import mage.filter.Filter; import mage.filter.FilterStackObject;
import mage.filter.FilterStackObject; import mage.game.Game;
import mage.game.Game; import mage.game.stack.StackObject;
import mage.game.stack.StackObject; import mage.target.TargetObject;
import mage.target.TargetObject;
public class TargetActivatedOrTriggeredAbility extends TargetObject {
protected final FilterStackObject filter;
public class TargetActivatedOrTriggeredAbility extends TargetObject {
public TargetActivatedOrTriggeredAbility() {
protected final FilterStackObject filter; this(new FilterStackObject());
}
public TargetActivatedOrTriggeredAbility() {
this(new FilterStackObject()); public TargetActivatedOrTriggeredAbility(FilterStackObject filter) {
} this.minNumberOfTargets = 1;
this.maxNumberOfTargets = 1;
public TargetActivatedOrTriggeredAbility(FilterStackObject filter) { this.zone = Zone.STACK;
this.minNumberOfTargets = 1; this.targetName = filter.getMessage();
this.maxNumberOfTargets = 1; this.filter = filter;
this.zone = Zone.STACK; }
this.targetName = filter.getMessage();
this.filter = filter; public TargetActivatedOrTriggeredAbility(final TargetActivatedOrTriggeredAbility target) {
} super(target);
this.filter = target.filter.copy();
public TargetActivatedOrTriggeredAbility(final TargetActivatedOrTriggeredAbility target) { }
super(target);
this.filter = target.filter.copy(); @Override
} public boolean canTarget(UUID id, Ability source, Game game) {
// rule 114.4. A spell or ability on the stack is an illegal target for itself.
if (source != null && source.getId().equals(id)) {
@Override return false;
public boolean canTarget(UUID id, Ability source, Game game) { }
// rule 114.4. A spell or ability on the stack is an illegal target for itself.
if (source != null && source.getId().equals(id)) { StackObject stackObject = game.getStack().getStackObject(id);
return false; return isActivatedOrTriggeredAbility(stackObject) && filter.match(stackObject, source.getSourceId(), source.getControllerId(), game);
} }
StackObject stackObject = game.getStack().getStackObject(id); @Override
return isActivatedOrTriggeredAbility(stackObject) && filter.match(stackObject, source.getSourceId(), source.getControllerId(), game); public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
} for (StackObject stackObject : game.getStack()) {
if (isActivatedOrTriggeredAbility(stackObject)
@Override && filter.match(stackObject, sourceId, sourceControllerId, game)) {
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) { return true;
return canChoose(sourceControllerId, game); }
} }
return false;
@Override }
public boolean canChoose(UUID sourceControllerId, Game game) {
return game.getStack() @Override
.stream() public boolean canChoose(UUID sourceControllerId, Game game) {
.anyMatch(TargetActivatedOrTriggeredAbility::isActivatedOrTriggeredAbility); return game.getStack()
} .stream()
.anyMatch(TargetActivatedOrTriggeredAbility::isActivatedOrTriggeredAbility);
@Override }
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
return possibleTargets(sourceControllerId, game); @Override
} public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
return possibleTargets(sourceControllerId, game);
@Override }
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
return game.getStack().stream() @Override
.filter(TargetActivatedOrTriggeredAbility::isActivatedOrTriggeredAbility) public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
.map(stackObject -> stackObject.getStackAbility().getId()) return game.getStack().stream()
.collect(Collectors.toSet()); .filter(TargetActivatedOrTriggeredAbility::isActivatedOrTriggeredAbility)
} .map(stackObject -> stackObject.getStackAbility().getId())
.collect(Collectors.toSet());
@Override }
public TargetActivatedOrTriggeredAbility copy() {
return new TargetActivatedOrTriggeredAbility(this); @Override
} public TargetActivatedOrTriggeredAbility copy() {
return new TargetActivatedOrTriggeredAbility(this);
@Override }
public Filter getFilter() {
return filter; @Override
} public Filter getFilter() {
return filter;
static boolean isActivatedOrTriggeredAbility(StackObject stackObject) { }
if (stackObject == null) {
return false; static boolean isActivatedOrTriggeredAbility(StackObject stackObject) {
} if (stackObject == null) {
if (stackObject instanceof Ability) { return false;
Ability ability = (Ability) stackObject; }
return ability.getAbilityType() == AbilityType.TRIGGERED if (stackObject instanceof Ability) {
|| ability.getAbilityType() == AbilityType.ACTIVATED; Ability ability = (Ability) stackObject;
} return ability.getAbilityType() == AbilityType.TRIGGERED
return false; || ability.getAbilityType() == AbilityType.ACTIVATED;
} }
} return false;
}
}