External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 12:49:39 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Counterbalance, Hisako, Minamp Sensai - Fixed that converted mana comparison of spilt cards did not work correctly.

Browse source
This commit is contained in:
LevelX2 2014-08-17 01:12:41 +02:00
parent bff01090b5
commit 821398211b
8 changed files with 177 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage.Sets/src/mage/sets/championsofkamigawa/HisokaMinamoSensei.java
View file

@ -48,6 +48,7 @@ import mage.game.stack.Spell;
import mage.players.Player;
import mage.target.TargetSpell;
import mage.target.common.TargetCardInHand;
import mage.util.CardUtil;
/**
* @author LevelX
@ -85,7 +86,7 @@ public class HisokaMinamoSensei extends CardImpl {
class HisokaMinamoSenseiDiscardTargetCost extends CostImpl {
protected int convertedManaCosts = 0;
protected Card card = null;
public HisokaMinamoSenseiDiscardTargetCost(TargetCardInHand target) {
this.addTarget(target);
@ -101,11 +102,10 @@ class HisokaMinamoSenseiDiscardTargetCost extends CostImpl {
if (targets.choose(Outcome.Discard, controllerId, sourceId, game)) {
Player player = game.getPlayer(controllerId);
for (UUID targetId: targets.get(0).getTargets()) {
Card card = player.getHand().get(targetId, game);
card = player.getHand().get(targetId, game);
if (card == null) {
return false;
}
convertedManaCosts = card.getManaCost().convertedManaCost();
paid |= player.discard(card, null, game);
}
@ -123,8 +123,8 @@ class HisokaMinamoSenseiDiscardTargetCost extends CostImpl {
return new HisokaMinamoSenseiDiscardTargetCost(this);
}
public int getConvertedCosts() {
return convertedManaCosts;
public Card getDiscardedCard() {
return card;
}
}
@ -144,7 +144,7 @@ class HisokaMinamoSenseiCounterEffect extends OneShotEffect {
Spell spell = game.getStack().getSpell(targetPointer.getFirst(game, source));
if (spell != null) {
HisokaMinamoSenseiDiscardTargetCost cost = (HisokaMinamoSenseiDiscardTargetCost) source.getCosts().get(0);
if (cost != null && cost.getConvertedCosts() == spell.getConvertedManaCost()) {
if (cost != null && CardUtil.convertedManaCostsIsEqual(cost.getDiscardedCard(), spell)) {
return game.getStack().counter(targetPointer.getFirst(game, source), source.getSourceId(), game);
}
}

5
Mage.Sets/src/mage/sets/coldsnap/Counterbalance.java
View file

@ -44,6 +44,7 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import mage.players.Player;
import mage.util.CardUtil;
/**
*
@ -99,7 +100,7 @@ class CounterbalanceEffect extends OneShotEffect {
CardsImpl cards = new CardsImpl();
cards.add(topcard);
controller.revealCards(sourcePermanent.getName(), cards, game);
if (topcard.getManaCost().convertedManaCost() == spell.getConvertedManaCost()) {
if (CardUtil.convertedManaCostsIsEqual(topcard, spell)) {
return game.getStack().counter(spell.getId(), source.getSourceId(), game);
}
}
@ -108,4 +109,6 @@ class CounterbalanceEffect extends OneShotEffect {
}
return false;
}
}