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 Chandra Nalaar second ability dealing no damage because of loyalty variable cost.

Browse source 
Fixed DamageAllControlledTargetEffect static text generating.
This commit is contained in:
magenoxx 2011-09-22 17:53:54 +04:00
parent 2e525da50f
commit a6258cfc7e
2 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Mage.Sets/src/mage/sets/magic2010/ChandraNalaar.java
View file

@ -28,26 +28,30 @@
package mage.sets.magic2010;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.PayVariableLoyaltyCost;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effects;
import mage.abilities.effects.common.DamageAllControlledTargetEffect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.DamageXTargetEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.cards.CardImpl;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.target.TargetPlayer;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
* @author BetaSteward_at_googlemail.com, nantuko
*/
public class ChandraNalaar extends CardImpl<ChandraNalaar> {
@ -63,7 +67,7 @@ public class ChandraNalaar extends CardImpl<ChandraNalaar> {
ability1.addTarget(new TargetPlayer());
this.addAbility(ability1);
LoyaltyAbility ability2 = new LoyaltyAbility(new DamageXTargetEffect());
LoyaltyAbility ability2 = new LoyaltyAbility(new DamageTargetEffect(ChandraNalaarXValue.getDefault()));
ability2.addTarget(new TargetCreaturePermanent());
this.addAbility(ability2);
@ -85,3 +89,37 @@ public class ChandraNalaar extends CardImpl<ChandraNalaar> {
}
}
class ChandraNalaarXValue implements DynamicValue {
private static final ChandraNalaarXValue defaultValue = new ChandraNalaarXValue();
@Override
public int calculate(Game game, Ability sourceAbility) {
for (Cost cost : sourceAbility.getCosts()) {
if (cost instanceof PayVariableLoyaltyCost) {
return ((PayVariableLoyaltyCost)cost).getAmount();
}
}
return 0;
}
@Override
public DynamicValue clone() {
return defaultValue;
}
@Override
public String getMessage() {
return "";
}
@Override
public String toString() {
return "X";
}
public static ChandraNalaarXValue getDefault() {
return defaultValue;
}
}

8
Mage/src/mage/abilities/effects/common/DamageAllControlledTargetEffect.java
View file

@ -49,8 +49,7 @@ public class DamageAllControlledTargetEffect extends OneShotEffect<DamageAllCont
super(Outcome.Damage);
this.amount = amount;
this.filter = filter;
String message = "'{'source'}' deals {1} damage to each {2} controlled by target player";
staticText = MessageFormat.format(message, Integer.toString(amount), filter.getMessage());
getText();
}
public DamageAllControlledTargetEffect(final DamageAllControlledTargetEffect effect) {
@ -72,4 +71,9 @@ public class DamageAllControlledTargetEffect extends OneShotEffect<DamageAllCont
return true;
}
private void getText() {
StringBuilder sb = new StringBuilder("{this} deals ");
sb.append(amount).append(" damage to each ").append(filter.getMessage()).append(" controlled by target player");
staticText = sb.toString();
}
}