mirror of
https://github.com/correl/mage.git
synced 2025-01-11 19:13:02 +00:00
Moved FromSetPredicate to its own file, mage.filter.predicate.mageobject.FromSetPredicate
This commit is contained in:
parent
c4d1150e32
commit
0e10ea0c84
2 changed files with 54 additions and 37 deletions
|
@ -52,13 +52,10 @@ import mage.game.events.GameEvent;
|
|||
import mage.game.permanent.Permanent;
|
||||
import mage.game.stack.Spell;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.List;
|
||||
import mage.MageObject;
|
||||
import mage.target.Target;
|
||||
import mage.abilities.Modes;
|
||||
import mage.filter.predicate.ObjectPlayer;
|
||||
import mage.filter.predicate.ObjectPlayerPredicate;
|
||||
import mage.filter.predicate.mageobject.FromSetPredicate;
|
||||
import mage.target.TargetPermanent;
|
||||
import mage.util.SpellTargetAddress;
|
||||
|
||||
|
@ -208,10 +205,9 @@ class InkTreaderNephilimEffect extends OneShotEffect {
|
|||
}
|
||||
}
|
||||
while (targetable.size() > 0) {
|
||||
TargetPermanent target = new TargetPermanent(0, 1,
|
||||
new FilterPermanentFromSet("creature that spell could target ("+Integer.toString(targetable.size())+" remaining)",
|
||||
targetable.keySet()),
|
||||
true);
|
||||
FilterPermanent filter = new FilterPermanent("creature that spell could target ("+Integer.toString(targetable.size())+" remaining)");
|
||||
filter.add(new FromSetPredicate(targetable.keySet()));
|
||||
TargetPermanent target = new TargetPermanent(0, 1, filter, true);
|
||||
if (target.possibleTargets(controller, game).size() > 1
|
||||
&& target.canChoose(source.getSourceId(), controller, game)) {
|
||||
game.getPlayer(controller).choose(Outcome.Neutral, target, source.getId(), game);
|
||||
|
@ -243,32 +239,3 @@ class InkTreaderNephilimEffect extends OneShotEffect {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
class FromSetPredicate<T extends ObjectPlayer<MageObject>> implements ObjectPlayerPredicate<T> {
|
||||
protected Set<UUID> set;
|
||||
|
||||
public FromSetPredicate(Set<UUID> set) {
|
||||
this.set = set;
|
||||
}
|
||||
|
||||
public boolean apply(T input, Game game) {
|
||||
return set.contains(input.getObject().getId());
|
||||
}
|
||||
}
|
||||
|
||||
class FilterPermanentFromSet extends FilterPermanent {
|
||||
public FilterPermanentFromSet(Set<UUID> set) {
|
||||
super();
|
||||
this.extraPredicates.add(new FromSetPredicate(set));
|
||||
}
|
||||
|
||||
public FilterPermanentFromSet(String name, Set<UUID> set) {
|
||||
super(name);
|
||||
this.extraPredicates.add(new FromSetPredicate(set));
|
||||
}
|
||||
|
||||
public FilterPermanentFromSet(String subtype, String name, Set<UUID> set) {
|
||||
super(subtype, name);
|
||||
this.extraPredicates.add(new FromSetPredicate(set));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification, are
|
||||
* permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
* conditions and the following disclaimer.
|
||||
*
|
||||
* 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
|
||||
* provided with the distribution.
|
||||
*
|
||||
* 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
|
||||
* 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
|
||||
* 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
|
||||
* 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
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* 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
|
||||
* or implied, of BetaSteward_at_googlemail.com.
|
||||
*/
|
||||
package mage.filter.predicate.mageobject;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import mage.MageObject;
|
||||
import mage.filter.predicate.ObjectPlayer;
|
||||
import mage.filter.predicate.ObjectPlayerPredicate;
|
||||
import mage.game.Game;
|
||||
|
||||
/**
|
||||
* @author duncancmt
|
||||
*/
|
||||
public class FromSetPredicate<T extends ObjectPlayer<MageObject>> implements ObjectPlayerPredicate<T> {
|
||||
protected Set<UUID> set;
|
||||
|
||||
public FromSetPredicate(Set<UUID> set) {
|
||||
this.set = set;
|
||||
}
|
||||
|
||||
public boolean apply(T input, Game game) {
|
||||
return set.contains(input.getObject().getId());
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue