Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Updated implementation of Unpredictable Cyclone (#6423)

Browse source 
* updated implementation of Unpredictable Cyclone, refactored drawCard method

* fixed another small implementation error

* added test for Unpredictable Cyclone

* updated Unpredictable Cyclone test
This commit is contained in:
Evan Kranzler 2020-04-16 08:04:21 -04:00 • committed by GitHub
parent 80b7f8493b
commit 378dfbf89a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
279 changed files with 465 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java
View file

@ -1,18 +1,13 @@
package mage.abilities.keyword;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.CyclingDiscardCost;
import mage.abilities.costs.mana.ManaCost;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
import mage.target.common.TargetCardInLibrary;
/**
@ -24,7 +19,7 @@ public class CyclingAbility extends ActivatedAbilityImpl {
private final String text;
public CyclingAbility(Cost cost) {
super(Zone.HAND, new CyclingDrawEffect(), cost);
super(Zone.HAND, new DrawCardSourceControllerEffect(1), cost);
this.addCost(new CyclingDiscardCost());
this.cost = cost;
this.text = "Cycling";
@ -60,37 +55,3 @@ public class CyclingAbility extends ActivatedAbilityImpl {
return rule.toString();
}
}
class CyclingDrawEffect extends OneShotEffect {
CyclingDrawEffect() {
super(Outcome.Benefit);
staticText = "draw a card";
}
private CyclingDrawEffect(final CyclingDrawEffect effect) {
super(effect);
}
@Override
public CyclingDrawEffect copy() {
return new CyclingDrawEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getSourceId());
if (player == null) {
return false;
}
GameEvent event = GameEvent.getEvent(
GameEvent.EventType.CYCLE_DRAW, source.getSourceId(),
source.getSourceId(), source.getControllerId()
);
if (game.replaceEvent(event)) {
return true;
}
player.drawCards(1, game);
return true;
}
}