Relintai/mtg-forge-ios
1
0
Fork 0
mirror of https://github.com/Relintai/mtg-forge-ios.git synced 2024-12-21 07:16:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Some fixes for AF Explore.

Browse Source 
git-svn-id: http://svn.slightlymagic.net/forge/trunk@35754 269b9781-a132-4a9b-9d4e-f004f1b56b58
This commit is contained in:
Agetian 2017-09-25 07:18:37 +00:00
parent 8e84353902
commit 90b6ec4154
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java
View File

@ -1,11 +1,7 @@
package forge.game.ability.effects; package forge.game.ability.effects;
import java.util.List;
import java.util.Map;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.SpellAbilityEffect; import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card; import forge.game.card.Card;
@ -17,6 +13,9 @@ import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import java.util.List;
import java.util.Map;
public class ExploreEffect extends SpellAbilityEffect { public class ExploreEffect extends SpellAbilityEffect {
@ -47,7 +46,7 @@ public class ExploreEffect extends SpellAbilityEffect {
boolean revealedLand = false; boolean revealedLand = false;
CardCollection top = pl.getTopXCardsFromLibrary(1); CardCollection top = pl.getTopXCardsFromLibrary(1);
if (!top.isEmpty()) { if (!top.isEmpty()) {
pl.getController().reveal(top, ZoneType.Library, pl, "Revealed for Explore"); game.getAction().reveal(top, pl, false, "Revealed for Explore - ");
final Card r = top.getFirst(); final Card r = top.getFirst();
if (r.isLand()) { if (r.isLand()) {
game.getAction().moveTo(ZoneType.Hand, r, sa); game.getAction().moveTo(ZoneType.Hand, r, sa);
@ -56,13 +55,13 @@ public class ExploreEffect extends SpellAbilityEffect {
// TODO find better way to choose optional send away // TODO find better way to choose optional send away
final Card choosen = pc.chooseSingleCardForZoneChange( final Card choosen = pc.chooseSingleCardForZoneChange(
ZoneType.Graveyard, Lists.newArrayList(ZoneType.Library), sa, top, null, ZoneType.Graveyard, Lists.newArrayList(ZoneType.Library), sa, top, null,
"send to graveyard?", true, pl); "Put this card in your graveyard?", true, pl);
if (choosen != null) { if (choosen != null) {
game.getAction().moveTo(ZoneType.Graveyard, choosen, sa); game.getAction().moveTo(ZoneType.Graveyard, choosen, sa);
} }
} }
} }
if (revealedLand) { if (!revealedLand) {
// TODO need to check if card didn't blick while that was happening, // TODO need to check if card didn't blick while that was happening,
// probably need strictlySelf in the Defined // probably need strictlySelf in the Defined
if (game.getZoneOf(c).is(ZoneType.Battlefield)) { if (game.getZoneOf(c).is(ZoneType.Battlefield)) {