External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 04:39:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixed wrong card numbers of some Fifthedition cards. Smoke, Stasis, SeaSerpent, Tsunami, Spirit Link, Mind Warp, Recall, Flare.

Browse source
This commit is contained in:
LevelX2 2015-08-23 23:23:31 +02:00
parent b6eab4977a
commit 8b02e6805f
9 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/fifthedition/Flare.java
View file

@ -44,13 +44,13 @@ import mage.target.common.TargetCreatureOrPlayer;
public class Flare extends CardImpl {
public Flare(UUID ownerId) {
super(ownerId, 11, "Flare", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}");
super(ownerId, 230, "Flare", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}");
this.expansionSetCode = "5ED";
// Flare deals 1 damage to target creature or player.
this.getSpellAbility().addEffect(new DamageTargetEffect(1));
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
// Draw a card at the beginning of the next turn's upkeep.
this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(1)), false));
}

2
Mage.Sets/src/mage/sets/fifthedition/MindWarp.java
View file

@ -37,7 +37,7 @@ public class MindWarp extends mage.sets.iceage.MindWarp {
public MindWarp(UUID ownerId) {
super(ownerId);
this.cardNumber = 14;
this.cardNumber = 39;
this.expansionSetCode = "5ED";
}

2
Mage.Sets/src/mage/sets/fifthedition/Recall.java
View file

@ -50,7 +50,7 @@ import mage.target.common.TargetCardInYourGraveyard;
public class Recall extends CardImpl {
public Recall(UUID ownerId) {
super(ownerId, 93, "Recall", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{X}{U}");
super(ownerId, 115, "Recall", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{X}{U}");
this.expansionSetCode = "5ED";
// Discard X cards, then return a card from your graveyard to your hand for each card discarded this way.

6
Mage.Sets/src/mage/sets/fifthedition/SeaSerpent.java
View file

@ -31,14 +31,14 @@ import java.util.UUID;
/**
*
* @author KholdFuzion
* @author KholdFuzion
*
*/
public class SeaSerpent extends mage.sets.limitedalpha.SeaSerpent {
public SeaSerpent(UUID ownerId) {
super(ownerId);
this.cardNumber = 52;
this.cardNumber = 118;
this.expansionSetCode = "5ED";
}

6
Mage.Sets/src/mage/sets/fifthedition/Smoke.java
View file

@ -31,14 +31,14 @@ import java.util.UUID;
/**
*
* @author KholdFuzion
* @author KholdFuzion
*
*/
public class Smoke extends mage.sets.limitedalpha.Smoke {
public Smoke(UUID ownerId) {
super(ownerId);
this.cardNumber = 64;
this.cardNumber = 268;
this.expansionSetCode = "5ED";
}

2
Mage.Sets/src/mage/sets/fifthedition/SpiritLink.java
View file

@ -37,7 +37,7 @@ public class SpiritLink extends mage.sets.seventhedition.SpiritLink {
public SpiritLink(UUID ownerId) {
super(ownerId);
this.cardNumber = 288;
this.cardNumber = 340;
this.expansionSetCode = "5ED";
}

15
Mage.Sets/src/mage/sets/fifthedition/Stasis.java
View file

@ -28,8 +28,6 @@
package mage.sets.fifthedition;
import java.util.UUID;
import mage.constants.*;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
@ -37,6 +35,12 @@ import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
@ -48,10 +52,9 @@ import mage.players.Player;
public class Stasis extends CardImpl {
public Stasis(UUID ownerId) {
super(ownerId, 28, "Stasis", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}");
super(ownerId, 127, "Stasis", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}");
this.expansionSetCode = "5ED";
// Players skip their untap steps.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapStepEffect()));
@ -89,8 +92,8 @@ class SkipUntapStepEffect extends ContinuousRuleModifyingEffectImpl {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
Player controller = game.getPlayer(source.getControllerId());
return event.getType() == GameEvent.EventType.UNTAP_STEP
&& controller != null
return event.getType() == GameEvent.EventType.UNTAP_STEP
&& controller != null
&& controller.getInRange().contains(event.getPlayerId());
}
}

2
Mage.Sets/src/mage/sets/fifthedition/Tsunami.java
View file

@ -37,7 +37,7 @@ public class Tsunami extends mage.sets.fourthedition.Tsunami {
public Tsunami(UUID ownerId) {
super(ownerId);
this.cardNumber = 52;
this.cardNumber = 196;
this.expansionSetCode = "5ED";
}