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

Some fixes and minor changes.

Browse source
This commit is contained in:
LevelX2 2012-11-07 23:43:32 +01:00
parent e3ca906b05
commit 1d9df4a3bd
5 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/magic2010/ConsumeSpirit.java
View file

@ -79,7 +79,7 @@ class ConsumeSpiritEffect extends OneShotEffect<ConsumeSpiritEffect> {
public ConsumeSpiritEffect() { public ConsumeSpiritEffect() {
super(Constants.Outcome.Damage); super(Constants.Outcome.Damage);
staticText = "Consume Spirit deals X damage to target creature or player and you gain X life.Spend only black mana on X"; staticText = "Consume Spirit deals X damage to target creature or player and you gain X life. Spend only black mana on X";
} }
public ConsumeSpiritEffect(final ConsumeSpiritEffect effect) { public ConsumeSpiritEffect(final ConsumeSpiritEffect effect) {

2
Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java
View file

@ -103,6 +103,6 @@ class ChandrasPhoenixTriggeredAbility extends TriggeredAbilityImpl<ChandrasPhoen
@Override @Override
public String getRule() { public String getRule() {
return "Whenever an opponent is dealt damage by a red instant or sorcery spell you control or by a red planeswalker you control, return {this} from your graveyard to your hand"; return "Whenever an opponent is dealt damage by a red instant or sorcery spell you control or by a red planeswalker you control, return {this} from your graveyard to your hand.";
} }
} }

5
Mage.Sets/src/mage/sets/prophecy/LesserGargadon.java
View file

@ -32,8 +32,7 @@ import mage.Constants.CardType;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.common.AttacksOrBlocksTriggeredAbility;
import mage.abilities.effects.common.SacrificeEffect; import mage.abilities.effects.common.SacrificeControllerEffect;
import mage.abilities.effects.common.SacrificeTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
@ -53,7 +52,7 @@ public class LesserGargadon extends CardImpl<LesserGargadon> {
this.toughness = new MageInt(4); this.toughness = new MageInt(4);
// Whenever Lesser Gargadon attacks or blocks, sacrifice a land. // Whenever Lesser Gargadon attacks or blocks, sacrifice a land.
this.addAbility(new AttacksOrBlocksTriggeredAbility(new SacrificeEffect(new FilterLandPermanent(), 1, ""), false)); this.addAbility(new AttacksOrBlocksTriggeredAbility(new SacrificeControllerEffect(new FilterLandPermanent(), 1, ""), false));
} }
public LesserGargadon(final LesserGargadon card) { public LesserGargadon(final LesserGargadon card) {

14
Mage/src/mage/abilities/effects/common/SacrificeControllerEffect.java
View file

@ -41,22 +41,22 @@ import mage.target.targetpointer.FixedTarget;
public class SacrificeControllerEffect extends SacrificeEffect { public class SacrificeControllerEffect extends SacrificeEffect {
public SacrificeControllerEffect ( FilterPermanent filter, DynamicValue count, String preText ) { public SacrificeControllerEffect(FilterPermanent filter, DynamicValue count, String preText ) {
super(filter, count, preText); super(filter, count, preText);
} }
public SacrificeControllerEffect ( FilterPermanent filter, int count, String preText ) { public SacrificeControllerEffect(FilterPermanent filter, int count, String preText ) {
this(filter, new StaticValue(count), preText); this(filter, new StaticValue(count), preText);
} }
public SacrificeControllerEffect (final SacrificeControllerEffect effect ) { public SacrificeControllerEffect(final SacrificeControllerEffect effect ) {
super(effect); super(effect);
} }
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
this.targetPointer = new FixedTarget(source.getControllerId()); this.targetPointer = new FixedTarget(source.getControllerId());
return super.apply(game, source); return super.apply(game, source);
} }
@Override @Override

5
Mage/src/mage/abilities/keyword/OverloadAbility.java
View file

@ -34,11 +34,6 @@ import mage.abilities.effects.Effect;
import mage.cards.Card; import mage.cards.Card;
/**
*
*
*/
/** /**
* 702.94. Overload * 702.94. Overload
* *