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

Fix Plasm Capture giving double mana in the next pre-combat main phase.

Browse source 
Additionally, remove special PlasmCaptureManaEffect in favor of the generic AddManaInAnyCombinationEffect, improving mana selection.
This commit is contained in:
Tosh94 2019-12-08 16:48:23 +01:00
parent 9748136723
commit 01ad151934
1 changed files with 2 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
Mage.Sets/src/mage/cards/p/PlasmCapture.java
View file

@ -2,21 +2,18 @@
package mage.cards.p; package mage.cards.p;
import java.util.UUID; import java.util.UUID;
import mage.Mana;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.delayed.AtTheBeginOfMainPhaseDelayedTriggeredAbility; import mage.abilities.common.delayed.AtTheBeginOfMainPhaseDelayedTriggeredAbility;
import mage.abilities.common.delayed.AtTheBeginOfMainPhaseDelayedTriggeredAbility.PhaseSelection; import mage.abilities.common.delayed.AtTheBeginOfMainPhaseDelayedTriggeredAbility.PhaseSelection;
import mage.abilities.effects.mana.AddManaInAnyCombinationEffect;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.ManaEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.choices.ChoiceColor;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.game.Game; import mage.game.Game;
import mage.game.stack.Spell; import mage.game.stack.Spell;
import mage.players.Player;
import mage.target.TargetSpell; import mage.target.TargetSpell;
/** /**
@ -67,64 +64,10 @@ class PlasmCaptureCounterEffect extends OneShotEffect {
// mana gets added also if counter is not successful // mana gets added also if counter is not successful
int mana = spell.getConvertedManaCost(); int mana = spell.getConvertedManaCost();
AtTheBeginOfMainPhaseDelayedTriggeredAbility delayedAbility AtTheBeginOfMainPhaseDelayedTriggeredAbility delayedAbility
= new AtTheBeginOfMainPhaseDelayedTriggeredAbility(new PlasmCaptureManaEffect(mana), false, TargetController.YOU, PhaseSelection.NEXT_PRECOMBAT_MAIN); = new AtTheBeginOfMainPhaseDelayedTriggeredAbility(new AddManaInAnyCombinationEffect(mana), false, TargetController.YOU, PhaseSelection.NEXT_PRECOMBAT_MAIN);
game.addDelayedTriggeredAbility(delayedAbility, source); game.addDelayedTriggeredAbility(delayedAbility, source);
return true; return true;
} }
return false; return false;
} }
} }
class PlasmCaptureManaEffect extends ManaEffect {
int amountOfMana;
public PlasmCaptureManaEffect(int amountOfMana) {
super();
this.amountOfMana = amountOfMana;
this.staticText = "add X mana in any combination of colors, where X is that spell's converted mana cost";
}
public PlasmCaptureManaEffect(final PlasmCaptureManaEffect effect) {
super(effect);
this.amountOfMana = effect.amountOfMana;
}
@Override
public PlasmCaptureManaEffect copy() {
return new PlasmCaptureManaEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
controller.getManaPool().addMana(getMana(game, source), game, source);
return true;
}
return false;
}
@Override
public Mana produceMana(boolean netMana, Game game, Ability source) {
if (netMana) {
return new Mana(0, 0, 0, 0, 0, 0, amountOfMana, 0);
}
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
Mana mana = new Mana();
for (int i = 0; i < amountOfMana; i++) {
ChoiceColor choiceColor = new ChoiceColor();
if (!player.choose(Outcome.Benefit, choiceColor, game)) {
return null;
}
choiceColor.increaseMana(mana);
}
player.getManaPool().addMana(mana, game, source);
return mana;
}
return null;
}
}