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

Fixed Past in Flames TimingRule

Browse source 
Fixed All is Dust to take into account the range of influence
minor changes to all other files
This commit is contained in:
North 2012-02-28 21:49:36 +02:00
parent c2df049383
commit 5c7c0a4086
5 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/innistrad/DoomedTraveler.java
View file

@ -34,7 +34,6 @@ import mage.MageInt;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.CardImpl;
import mage.game.permanent.token.SpiritToken;
import mage.game.permanent.token.SpiritWhiteToken;
/**

3
Mage.Sets/src/mage/sets/innistrad/PastInFlames.java
View file

@ -28,7 +28,6 @@
package mage.sets.innistrad;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Layer;
@ -61,7 +60,7 @@ public class PastInFlames extends CardImpl<PastInFlames> {
this.getSpellAbility().addEffect(new PastInFlamesEffect());
// Flashback {4}{R}
this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{R}"), Constants.TimingRule.INSTANT));
this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{R}"), TimingRule.SORCERY));
}

13
Mage.Sets/src/mage/sets/riseoftheeldrazi/AllIsDust.java
View file

@ -25,11 +25,10 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.riseoftheeldrazi;
import java.util.List;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
@ -38,8 +37,6 @@ import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.players.PlayerList;
/**
* @author Loki
@ -62,10 +59,10 @@ public class AllIsDust extends CardImpl<AllIsDust> {
public AllIsDust copy() {
return new AllIsDust(this);
}
}
class AllIsDustEffect extends OneShotEffect<AllIsDustEffect> {
AllIsDustEffect() {
super(Constants.Outcome.DestroyPermanent);
staticText = "Each player sacrifices all colored permanents he or she controls";
@ -77,7 +74,8 @@ class AllIsDustEffect extends OneShotEffect<AllIsDustEffect> {
@Override
public boolean apply(Game game, Ability source) {
for (Permanent p : game.getBattlefield().getAllActivePermanents()) {
List<Permanent> permanents = game.getBattlefield().getAllActivePermanents(source.getControllerId());
for (Permanent p : permanents) {
if (!p.getColor().isColorless()) {
p.sacrifice(source.getSourceId(), game);
}
@ -90,5 +88,4 @@ class AllIsDustEffect extends OneShotEffect<AllIsDustEffect> {
public AllIsDustEffect copy() {
return new AllIsDustEffect(this);
}
}
}

7
Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokLifestaff.java
View file

@ -28,19 +28,15 @@
package mage.sets.scarsofmirrodin;
import java.util.UUID;
import mage.Constants.AttachmentType;
import mage.Constants.CardType;
import mage.Constants.Outcome;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.Ability;
import mage.abilities.common.DiesAttachedTriggeredAbility;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.effects.common.continious.BoostEquippedEffect;
import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
import mage.abilities.keyword.EquipAbility;
import mage.cards.CardImpl;
@ -55,8 +51,11 @@ public class SylvokLifestaff extends CardImpl<SylvokLifestaff> {
this.expansionSetCode = "SOM";
this.subtype.add("Equipment");
// Equipped creature gets +1/+0.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0)));
// Whenever equipped creature dies, you gain 3 life.
this.addAbility(new DiesAttachedTriggeredAbility(new GainLifeEffect(3), "equipped creature"));
// // Equip {1}
this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1)));
}

2
Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
View file

@ -42,6 +42,6 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl<DiesAttac
@Override
public String getRule() {
return "When " + attachedDescription + " dies," + super.getRule();
return "When " + attachedDescription + " dies, " + super.getRule();
}
}