github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[filters] replaced Paired filter with predicate

Browse source
This commit is contained in:
North 2012-07-21 21:52:37 +03:00
parent 40ddfcc432
commit c8617c0a55
2 changed files with 18 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
Mage/src/mage/filter/common/FilterNotPairedControlledCreaturePermanent.java
View file

@ -1,81 +0,0 @@
/*
* 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.common;
import mage.game.Game;
import mage.game.permanent.Permanent;
import java.util.UUID;
/**
*
* @author noxx
*/
public class FilterNotPairedControlledCreaturePermanent extends FilterControlledCreaturePermanent {
public FilterNotPairedControlledCreaturePermanent() {
this("not paired creature you control");
}
public FilterNotPairedControlledCreaturePermanent(String name) {
super(name);
}
public FilterNotPairedControlledCreaturePermanent(final FilterNotPairedControlledCreaturePermanent filter) {
super(filter);
}
@Override
public boolean match(Permanent permanent, Game game) {
if (!super.match(permanent, game))
return notFilter;
if (permanent.getPairedCard() != null)
return notFilter;
return !notFilter;
}
@Override
public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
if (!super.match(permanent, sourceId, playerId, game))
return notFilter;
if (permanent.getPairedCard() != null)
return notFilter;
return !notFilter;
}
@Override
public FilterNotPairedControlledCreaturePermanent copy() {
return new FilterNotPairedControlledCreaturePermanent(this);
}
}

20
Mage/src/mage/watchers/common/SoulbondWatcher.java
View file

@ -33,7 +33,9 @@ import mage.Constants.WatcherScope;
import mage.abilities.keyword.SoulbondAbility;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.filter.common.FilterNotPairedControlledCreaturePermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -50,10 +52,11 @@ import mage.watchers.WatcherImpl;
*/
public class SoulbondWatcher extends WatcherImpl<SoulbondWatcher> {
private static final FilterNotPairedControlledCreaturePermanent filter = new FilterNotPairedControlledCreaturePermanent("another not paired creature you control");
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another not paired creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(Predicates.not(new PairedPredicate()));
}
public SoulbondWatcher() {
@ -125,3 +128,16 @@ public class SoulbondWatcher extends WatcherImpl<SoulbondWatcher> {
return new SoulbondWatcher(this);
}
}
class PairedPredicate implements Predicate<Permanent> {
@Override
public boolean apply(Permanent input, Game game) {
return input.getPairedCard() != null;
}
@Override
public String toString() {
return "Paired";
}
}