github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Alhammarret's Archive - Fixed that the double draw effect did not work in steps of the controller's turn before the draw step.

Browse source
This commit is contained in:
LevelX2 2015-12-31 09:08:27 +01:00
parent 523a5328a2
commit 8bab182f8a
3 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/dragonsmaze/NotionThief.java
View file

@ -121,7 +121,7 @@ class NotionThiefReplacementEffect extends ReplacementEffectImpl {
return true; return true;
} }
} else { } else {
// not an opponents players draw step, always replace draw // not an opponents players draw step, always replace the draw
return true; return true;
} }
} }

23
Mage.Sets/src/mage/sets/magicorigins/AlhammarretsArchive.java
View file

@ -35,6 +35,7 @@ import mage.cards.CardImpl;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.PhaseStep;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
@ -46,7 +47,6 @@ import mage.watchers.common.CardsDrawnDuringDrawStepWatcher;
* *
* @author fireshoes * @author fireshoes
*/ */
public class AlhammarretsArchive extends CardImpl { public class AlhammarretsArchive extends CardImpl {
public AlhammarretsArchive(UUID ownerId) { public AlhammarretsArchive(UUID ownerId) {
@ -56,7 +56,7 @@ public class AlhammarretsArchive extends CardImpl {
// If you would gain life, you gain twice that much life instead. // If you would gain life, you gain twice that much life instead.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveEffect())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveEffect()));
// If you draw a card except the first one you draw in each of your draw steps, draw two cards instead. // If you draw a card except the first one you draw in each of your draw steps, draw two cards instead.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveReplacementEffect()), new CardsDrawnDuringDrawStepWatcher()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AlhammarretsArchiveReplacementEffect()), new CardsDrawnDuringDrawStepWatcher());
} }
@ -138,24 +138,23 @@ class AlhammarretsArchiveReplacementEffect extends ReplacementEffectImpl {
} }
return true; return true;
} }
@Override @Override
public boolean checksEventType(GameEvent event, Game game) { public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DRAW_CARD; return event.getType() == GameEvent.EventType.DRAW_CARD;
} }
@Override @Override
public boolean applies(GameEvent event, Ability source, Game game) { public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getPlayerId().equals(source.getControllerId())) { if (game.getActivePlayerId().equals(event.getPlayerId()) && game.getPhase().getStep().getType().equals(PhaseStep.DRAW)) {
if (game.getActivePlayerId().equals(event.getPlayerId())) { CardsDrawnDuringDrawStepWatcher watcher = (CardsDrawnDuringDrawStepWatcher) game.getState().getWatchers().get("CardsDrawnDuringDrawStep");
CardsDrawnDuringDrawStepWatcher watcher = (CardsDrawnDuringDrawStepWatcher) game.getState().getWatchers().get("CardsDrawnDuringDrawStep"); if (watcher != null && watcher.getAmountCardsDrawn(event.getPlayerId()) > 0) {
if (watcher != null && watcher.getAmountCardsDrawn(event.getPlayerId()) > 0) {
return true;
}
} else {
return true; return true;
} }
} else {
return true;
} }
return false; return false;
} }
} }

12
Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java
View file

@ -25,19 +25,17 @@
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.sets.mirrodin; package mage.sets.mirrodin;
import java.util.UUID; import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
/** /**
@ -46,15 +44,17 @@ import mage.constants.Zone;
*/ */
public class TowerOfFortunes extends CardImpl { public class TowerOfFortunes extends CardImpl {
public TowerOfFortunes (UUID ownerId) { public TowerOfFortunes(UUID ownerId) {
super(ownerId, 267, "Tower of Fortunes", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); super(ownerId, 267, "Tower of Fortunes", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}");
this.expansionSetCode = "MRD"; this.expansionSetCode = "MRD";
// {8}, {T} : Draw four cards.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(4), new GenericManaCost(8)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(4), new GenericManaCost(8));
ability.addCost(new TapSourceCost()); ability.addCost(new TapSourceCost());
this.addAbility(ability); this.addAbility(ability);
} }
public TowerOfFortunes (final TowerOfFortunes card) { public TowerOfFortunes(final TowerOfFortunes card) {
super(card); super(card);
} }