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

changed ninjutsu ability cost to mana string

Browse source
This commit is contained in:
Evan Kranzler 2021-12-27 21:43:45 -05:00
parent a6fcaab698
commit e8bc3d01ad
19 changed files with 36 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Mage/src/main/java/mage/abilities/keyword/NinjutsuAbility.java
View file

@ -4,7 +4,7 @@ import mage.abilities.Ability;
import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.CostImpl;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.Cards;
@ -18,7 +18,6 @@ import mage.game.Game;
import mage.game.command.CommandObject;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetControlledPermanent;
import mage.util.CardUtil;
@ -46,28 +45,22 @@ import java.util.UUID;
public class NinjutsuAbility extends ActivatedAbilityImpl {
private final boolean commander;
private static final FilterControlledCreaturePermanent filter =
new FilterControlledCreaturePermanent("unblocked attacker you control");
static {
filter.add(UnblockedPredicate.instance);
}
/**
* @param manaCost ninjutsu mana cost
* @param manaString ninjutsu mana cost
*/
public NinjutsuAbility(ManaCost manaCost) {
this(manaCost, false);
public NinjutsuAbility(String manaString) {
this(new ManaCostsImpl<>(manaString), false);
}
public NinjutsuAbility(ManaCost manaCost, boolean commander) {
super(commander ? Zone.ALL : Zone.HAND, new NinjutsuEffect(), manaCost);
public NinjutsuAbility(Cost cost, boolean commander) {
super(commander ? Zone.ALL : Zone.HAND, new NinjutsuEffect(), cost);
this.addCost(new RevealNinjutsuCardCost(commander));
this.addCost(new ReturnAttackerToHandTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)));
this.addCost(new ReturnAttackerToHandTargetCost());
this.commander = commander;
}
public NinjutsuAbility(NinjutsuAbility ability) {
private NinjutsuAbility(final NinjutsuAbility ability) {
super(ability);
this.commander = ability.commander;
}
@ -135,11 +128,17 @@ class NinjutsuEffect extends OneShotEffect {
class ReturnAttackerToHandTargetCost extends CostImpl {
private UUID defendingPlayerId;
private static final FilterControlledCreaturePermanent filter =
new FilterControlledCreaturePermanent("unblocked attacker you control");
public ReturnAttackerToHandTargetCost(TargetControlledPermanent target) {
this.addTarget(target);
this.defendingPlayerId = null;
static {
filter.add(UnblockedPredicate.instance);
}
private UUID defendingPlayerId = null;
public ReturnAttackerToHandTargetCost() {
this.addTarget(new TargetControlledPermanent(filter));
this.text = "Return an unblocked attacker you control to hand";
}