External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixed Stifle rule text and some other minor things related to TragetActivatedAbility.

Browse source
This commit is contained in:
LevelX2 2018-02-24 01:00:23 +01:00
parent cdbe1b0ad9
commit 9a95e49ac9
7 changed files with 80 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Mage/src/main/java/mage/filter/predicate/ability/ArtifactSourcePredicate.java Normal file
View file

@ -0,0 +1,51 @@
/*
* 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.ability;
import mage.MageObject;
import mage.abilities.Ability;
import mage.filter.predicate.Predicate;
import mage.game.Game;
/**
*
* @author LevelX2
*/
public class ArtifactSourcePredicate implements Predicate<Ability> {
@Override
public boolean apply(Ability input, Game game) {
MageObject sourceObject = input.getSourceObject(game);
return sourceObject != null && sourceObject.isArtifact();
}
@Override
public String toString() {
return "Source(Artifact)";
}
}

2
Mage/src/main/java/mage/target/common/TargetActivatedAbility.java
View file

@ -57,7 +57,7 @@ public class TargetActivatedAbility extends TargetObject {
this.minNumberOfTargets = 1;
this.maxNumberOfTargets = 1;
this.zone = Zone.STACK;
this.targetName = "activated ability";
this.targetName = filter.getMessage();
this.filter = filter;
}

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

@ -44,7 +44,7 @@ public class TargetActivatedOrTriggeredAbility extends TargetObject {
protected final FilterStackObject filter;
public TargetActivatedOrTriggeredAbility() {
this(new FilterStackObject());
this(new FilterStackObject("activated or triggered ability"));
}
public TargetActivatedOrTriggeredAbility(FilterStackObject filter) {