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

Fixed #220 (Sinister Possession) and fixed #219 (pay text of DoIfCostPaid).

Browse source
This commit is contained in:
LevelX2 2013-05-09 10:40:22 +02:00
parent 9709778f52
commit e7024c1088
3 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Mage.Sets/src/mage/sets/dragonsmaze/SinisterPossession.java
View file

@ -41,6 +41,7 @@ import mage.abilities.effects.common.AttachEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
@ -55,6 +56,7 @@ public class SinisterPossession extends CardImpl<SinisterPossession> {
public SinisterPossession(UUID ownerId) {
super(ownerId, 29, "Sinister Possession", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{B}");
this.subtype.add("Aura");
this.expansionSetCode = "DGM";
this.color.setBlack(true);
@ -66,7 +68,7 @@ public class SinisterPossession extends CardImpl<SinisterPossession> {
this.addAbility(ability);
// Whenever enchanted creature attacks or blocks, it's controller loses 2 life.
this.addAbility(new AttacksOrBlocksEnchantedTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeAttachedEffect(2)));
this.addAbility(new AttacksOrBlocksEnchantedTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeControllerAttachedEffect(2)));
}
public SinisterPossession(final SinisterPossession card) {
@ -79,37 +81,48 @@ public class SinisterPossession extends CardImpl<SinisterPossession> {
}
}
class LoseLifeAttachedEffect extends OneShotEffect<LoseLifeAttachedEffect> {
class LoseLifeControllerAttachedEffect extends OneShotEffect<LoseLifeControllerAttachedEffect> {
protected DynamicValue amount;
public LoseLifeAttachedEffect(int amount) {
public LoseLifeControllerAttachedEffect(int amount) {
this(new StaticValue(amount));
}
public LoseLifeAttachedEffect(DynamicValue amount) {
public LoseLifeControllerAttachedEffect(DynamicValue amount) {
super(Outcome.Damage);
this.amount = amount;
setText();
}
public LoseLifeAttachedEffect(final LoseLifeAttachedEffect effect) {
public LoseLifeControllerAttachedEffect(final LoseLifeControllerAttachedEffect effect) {
super(effect);
this.amount = effect.amount.copy();
}
@Override
public LoseLifeAttachedEffect copy() {
return new LoseLifeAttachedEffect(this);
public LoseLifeControllerAttachedEffect copy() {
return new LoseLifeControllerAttachedEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
player.loseLife(amount.calculate(game, source), game);
return true;
Permanent enchantment = game.getPermanent(source.getSourceId());
if (enchantment == null) {
enchantment = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD);
}
if (enchantment != null && enchantment.getAttachedTo() != null) {
Permanent creature = game.getPermanent(enchantment.getAttachedTo());
if (creature == null) {
creature = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD);
}
if (creature != null) {
Player player = game.getPlayer(creature.getControllerId());
if (player != null) {
player.loseLife(amount.calculate(game, source), game);
return true;
}
}
}
return false;
}
@ -124,6 +137,4 @@ class LoseLifeAttachedEffect extends OneShotEffect<LoseLifeAttachedEffect> {
}
staticText = sb.toString();
}
}

9
Mage/src/mage/abilities/effects/common/DoIfCostPaid.java
View file

@ -1,12 +1,14 @@
package mage.abilities.effects.common;
import mage.Constants;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.costs.Cost;
import mage.abilities.effects.OneShotEffect;
import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
public class DoIfCostPaid extends OneShotEffect<DoIfCostPaid> {
private OneShotEffect executingEffect;
@ -27,8 +29,11 @@ public class DoIfCostPaid extends OneShotEffect<DoIfCostPaid> {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
if (player.chooseUse(executingEffect.getOutcome(), "Pay " + cost.getText() + " and " + executingEffect.getText(source.getModes().getMode()), game)) {
MageObject mageObject = game.getObject(source.getSourceId());
if (player != null && mageObject != null) {
String message = new StringBuilder("Pay ").append(cost.getText()).append(" and ").append(executingEffect.getText(source.getModes().getMode())).toString();
message = CardUtil.replaceSourceName(message, mageObject.getName());
if (player.chooseUse(executingEffect.getOutcome(), message, game)) {
cost.clearPaid();
if (cost.pay(source, game, source.getId(), source.getControllerId(), false)) {
executingEffect.setTargetPointer(this.targetPointer);

7
Mage/src/mage/util/CardUtil.java
View file

@ -32,6 +32,7 @@ import java.util.Iterator;
import mage.Constants;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.SpellAbility;
import mage.abilities.costs.AlternativeCost;
import mage.abilities.costs.AlternativeCostImpl;
@ -341,6 +342,12 @@ public class CardUtil {
return number;
}
public static String replaceSourceName(String message, String sourceName) {
message = message.replace("{this}", sourceName);
message = message.replace("{source}", sourceName);
return message;
}
public static boolean checkNumeric(String s) {
for(int i = 0; i < s.length(); i++) {
if(!Character.isDigit(s.charAt(i))) {