github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed New Perspectives to use a CostModificationEffect.

Browse source 
Remove CyclingCost and WrapperCost that are now unused.
This commit is contained in:
emerald000 2017-05-13 18:53:35 -04:00
parent e5a69134c8
commit d5c75cd1b3
6 changed files with 37 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
Mage.Sets/src/mage/cards/n/NewPerspectives.java
View file

@ -29,25 +29,21 @@ package mage.cards.n;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.ActivatedAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition; import mage.abilities.costs.common.DiscardSourceCost;
import mage.abilities.condition.common.CardsInHandCondition;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.decorator.ConditionalReplacementEffect;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.cost.CostModificationEffectImpl;
import mage.abilities.keyword.CyclingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.ComparisonType; import mage.constants.CostModificationType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.events.CostEvent;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.players.Player; import mage.players.Player;
/** /**
@ -60,14 +56,10 @@ public class NewPerspectives extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{5}{U}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{5}{U}");
// When New Perspectives enters the battlefield, draw three cards. // When New Perspectives enters the battlefield, draw three cards.
this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(3), false)); this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(3)));
// As long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs. // As long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs.
Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN, 6); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NewPerspectivesCostModificationEffect()));
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD,
new ConditionalReplacementEffect(
new PerspectivesReplaceCylcingCosts(), condition));
this.addAbility(ability);
} }
public NewPerspectives(final NewPerspectives card) { public NewPerspectives(final NewPerspectives card) {
@ -80,48 +72,42 @@ public class NewPerspectives extends CardImpl {
} }
} }
class PerspectivesReplaceCylcingCosts extends ReplacementEffectImpl { class NewPerspectivesCostModificationEffect extends CostModificationEffectImpl {
public PerspectivesReplaceCylcingCosts() { NewPerspectivesCostModificationEffect() {
super(Duration.WhileOnBattlefield, Outcome.Benefit); super(Duration.Custom, Outcome.Benefit, CostModificationType.SET_COST);
staticText = "As long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs"; this.staticText = "As long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs";
} }
public PerspectivesReplaceCylcingCosts(final PerspectivesReplaceCylcingCosts effect) { NewPerspectivesCostModificationEffect(final NewPerspectivesCostModificationEffect effect) {
super(effect); super(effect);
} }
@Override @Override
public PerspectivesReplaceCylcingCosts copy() { public boolean applies(Ability abilityToModify, Ability source, Game game) {
return new PerspectivesReplaceCylcingCosts(this); Player controller = game.getPlayer(abilityToModify.getControllerId());
return controller != null
&& controller.getId().equals(source.getControllerId())
&& abilityToModify instanceof CyclingAbility
&& controller.getHand().size() >= 7;
} }
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source, Ability abilityToModify) {
Player controller = game.getPlayer(abilityToModify.getControllerId());
if (controller != null) {
if ((abilityToModify instanceof ActivatedAbility && ((ActivatedAbility) abilityToModify).isCheckPlayableMode()) || controller.chooseUse(Outcome.PlayForFree, "Pay {0} to cycle?", source, game)) {
abilityToModify.getCosts().clear();
abilityToModify.getManaCostsToPay().clear();
abilityToModify.getCosts().add(new DiscardSourceCost());
}
return true; return true;
} }
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
if (event.getType() == EventType.CAN_PAY_CYCLE_COST) {
((CostEvent) event).setCost(new ManaCostsImpl<>("{0}"));
return false;
}
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && controller.chooseUse(outcome, "Pay {0} rather than normal cycling costs?", source, game)) {
((CostEvent) event).setCost(new ManaCostsImpl<>("{0}"));
}
return false; return false;
} }
@Override @Override
public boolean checksEventType(GameEvent event, Game game) { public NewPerspectivesCostModificationEffect copy() {
return event.getType() == EventType.PAY_CYCLE_COST || event.getType() == EventType.CAN_PAY_CYCLE_COST; return new NewPerspectivesCostModificationEffect(this);
} }
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
return event.getPlayerId().equals(source.getControllerId());
}
} }

41
Mage/src/main/java/mage/abilities/costs/WrapperCost.java
View file

@ -1,41 +0,0 @@
/*
* Copyright 2017 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.abilities.costs;
import java.io.Serializable;
/**
* Some Cost act like wrappers hiding real costs inside
*
* @author noxx
*/
public interface WrapperCost extends Serializable {
Cost getOriginalCost();
}

119
Mage/src/main/java/mage/abilities/costs/common/CyclingCost.java
View file

@ -1,119 +0,0 @@
/*
* Copyright 2017 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.abilities.costs.common;
import mage.abilities.Ability;
import mage.abilities.costs.Cost;
import mage.abilities.costs.WrapperCost;
import mage.game.Game;
import mage.game.events.CostEvent;
import mage.game.events.GameEvent;
import mage.target.Targets;
import java.util.UUID;
/**
* Cycling Cost to interact with cards like 'New Perspectives'
*/
public class CyclingCost implements Cost, WrapperCost {
protected Cost cost;
public CyclingCost(Cost cost) {
this.cost = cost;
}
public CyclingCost(final CyclingCost cost) {
this.cost = cost.cost.copy();
}
@Override
public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana) {
return pay(ability, game, sourceId, controllerId, noMana, cost);
}
@Override
public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) {
CostEvent costEvent = new CostEvent(GameEvent.EventType.CAN_PAY_CYCLE_COST, sourceId, sourceId, controllerId, cost);
game.replaceEvent(costEvent);
return cost.canPay(ability, sourceId, controllerId, game) || costEvent.getCost().canPay(ability, sourceId, controllerId, game);
}
@Override
public boolean pay(Ability ability, Game game, UUID sourceId, UUID controllerId, boolean noMana, Cost costToPay) {
CostEvent costEvent = new CostEvent(GameEvent.EventType.PAY_CYCLE_COST, sourceId, sourceId, controllerId, cost);
game.replaceEvent(costEvent);
cost = costEvent.getCost();
return cost.pay(ability, game, sourceId, controllerId, noMana, cost);
}
@Override
public String getText() {
return cost.getText();
}
@Override
public void setText(String text) {
cost.setText(text);
}
@Override
public Targets getTargets() {
return cost.getTargets();
}
@Override
public boolean isPaid() {
return cost.isPaid();
}
@Override
public void clearPaid() {
cost.clearPaid();
}
@Override
public void setPaid() {
cost.setPaid();
}
@Override
public UUID getId() {
return cost.getId();
}
@Override
public Cost copy() {
return new CyclingCost(this);
}
@Override
public Cost getOriginalCost() {
return this.cost;
}
}

11
Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java
View file

@ -27,21 +27,14 @@
*/ */
package mage.abilities.keyword; package mage.abilities.keyword;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbilityImpl; import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.costs.Cost; import mage.abilities.costs.Cost;
import mage.abilities.costs.common.CyclingCost;
import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.common.DiscardSourceCost;
import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCost;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.events.CostEvent;
import mage.game.events.GameEvent;
import mage.target.Targets;
import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInLibrary;
/** /**
@ -54,14 +47,14 @@ public class CyclingAbility extends ActivatedAbilityImpl {
private final String text; private final String text;
public CyclingAbility(Cost cost) { public CyclingAbility(Cost cost) {
super(Zone.HAND, new DrawCardSourceControllerEffect(1), new CyclingCost(cost)); super(Zone.HAND, new DrawCardSourceControllerEffect(1), cost);
this.addCost(new DiscardSourceCost()); this.addCost(new DiscardSourceCost());
this.cost = cost; this.cost = cost;
this.text = "Cycling"; this.text = "Cycling";
} }
public CyclingAbility(Cost cost, FilterCard filter, String text) { public CyclingAbility(Cost cost, FilterCard filter, String text) {
super(Zone.HAND, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new CyclingCost(cost)); super(Zone.HAND, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), cost);
this.addCost(new DiscardSourceCost()); this.addCost(new DiscardSourceCost());
this.cost = cost; this.cost = cost;
this.text = text; this.text = text;

1
Mage/src/main/java/mage/game/events/GameEvent.java
View file

@ -95,7 +95,6 @@ public class GameEvent implements Serializable {
DISCARD_CARD, DISCARD_CARD,
DISCARDED_CARD, DISCARDED_CARD,
CYCLE_CARD, CYCLED_CARD, CYCLE_CARD, CYCLED_CARD,
PAY_CYCLE_COST, CAN_PAY_CYCLE_COST,
CLASH, CLASHED, CLASH, CLASHED,
DAMAGE_PLAYER, DAMAGE_PLAYER,
/* DAMAGED_PLAYER /* DAMAGED_PLAYER

6
Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java
View file

@ -31,7 +31,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.UUID; import java.util.UUID;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.Cards; import mage.cards.Cards;
import mage.cards.CardsImpl; import mage.cards.CardsImpl;
@ -62,9 +61,7 @@ public class CardsCycledOrDiscardedThisTurnWatcher extends Watcher {
@Override @Override
public void watch(GameEvent event, Game game) { public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.PAY_CYCLE_COST if (event.getType() == GameEvent.EventType.DISCARDED_CARD && event.getPlayerId() != null) {
|| event.getType() == GameEvent.EventType.DISCARDED_CARD) {
if (event.getPlayerId() != null) {
Card card = game.getCard(event.getTargetId()); Card card = game.getCard(event.getTargetId());
if (card != null) { if (card != null) {
Cards c = getCardsCycledOrDiscardedThisTurn(event.getPlayerId()); Cards c = getCardsCycledOrDiscardedThisTurn(event.getPlayerId());
@ -73,7 +70,6 @@ public class CardsCycledOrDiscardedThisTurnWatcher extends Watcher {
} }
} }
} }
}
public Cards getCardsCycledOrDiscardedThisTurn(UUID playerId) { public Cards getCardsCycledOrDiscardedThisTurn(UUID playerId) {
return cycledOrDiscardedCardsThisTurn.getOrDefault(playerId, new CardsImpl()); return cycledOrDiscardedCardsThisTurn.getOrDefault(playerId, new CardsImpl());