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

Some rework of Spell Rupture and CounterUnlessPaysEffect.

Browse source
This commit is contained in:
LevelX2 2013-03-30 01:55:17 +01:00
parent 5a68ba33da
commit 4212e5cfb6
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Mage.Sets/src/mage/sets/gatecrash/SpellRupture.java
View file

@ -31,6 +31,7 @@ import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.costs.mana.GenericManaCost;
@ -39,9 +40,7 @@ import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import mage.game.stack.StackObject;
import mage.players.Player;
import mage.target.TargetSpell;
@ -94,25 +93,21 @@ class SpellRuptureCounterUnlessPaysEffect extends OneShotEffect<SpellRuptureCoun
if (spell != null) {
Player player = game.getPlayer(spell.getControllerId());
Player controller = game.getPlayer(source.getControllerId());
int amount = new greatestPowerCountCreatureYouControl().calculate(game, source);
if (player != null && controller != null) {
if (amount > 0) {
GenericManaCost cost = new GenericManaCost(amount);
if (!cost.pay(source, game, spell.getControllerId(), spell.getControllerId(), false)) {
StackObject stackObject = game.getStack().getStackObject(source.getFirstTarget());
if (stackObject != null && !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER, source.getFirstTarget(), source.getSourceId(), stackObject.getControllerId()))) {
game.informPlayers("Spell Rupture: cost wasn't payed - countering " + stackObject.getName());
if (stackObject instanceof Spell) {
game.rememberLKI(source.getFirstTarget(), Constants.Zone.STACK, (Spell) stackObject);
}
game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game);
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COUNTERED, source.getFirstTarget(), source.getSourceId(), stackObject.getControllerId()));
return true;
}
return false;
MageObject sourceObject = game.getObject(source.getSourceId());
if (player != null && controller != null && sourceObject != null) {
int amount = new greatestPowerCountCreatureYouControl().calculate(game, source);
GenericManaCost cost = new GenericManaCost(amount);
StringBuilder sb = new StringBuilder("Pay {").append(amount).append("}? (otherwise ").append(spell.getName()).append(" will be countered)");
if (player.chooseUse(Constants.Outcome.Benefit, sb.toString(), game)) {
cost.pay(source, game, source.getSourceId(), player.getId(), false);
}
if (!cost.isPaid()) {
if (game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game)) {
game.informPlayers(new StringBuilder(sourceObject.getName()).append(": cost wasn't payed - countering ").append(spell.getName()).toString());
return true;
}
}
}
}
return false;

2
Mage/src/mage/abilities/effects/common/CounterUnlessPaysEffect.java
View file

@ -84,7 +84,7 @@ public class CounterUnlessPaysEffect extends OneShotEffect<CounterUnlessPaysEffe
costToPay = new GenericManaCost(genericMana.calculate(game, source));
}
costToPay.clearPaid();
if (!costToPay.pay(source, game, spell.getControllerId(), spell.getControllerId(), false)) {
if (!costToPay.pay(source, game, spell.getSourceId(), spell.getControllerId(), false)) {
return game.getStack().counter(source.getFirstTarget(), source.getSourceId(), game);
}
}