github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
drmDev 2016-07-25 18:23:35 -04:00
commit bc14f8176a
3 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/sets/avacynrestored/SigardaHostOfHerons.java
View file

@ -35,12 +35,14 @@ import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.HexproofAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Controllable;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.PermanentCard;
@ -112,6 +114,11 @@ class SigardaHostOfHeronsEffect extends ContinuousRuleModifyingEffectImpl {
return true;
}
}
if (object instanceof Card) {
if (game.getOpponents(source.getControllerId()).contains(((Card) object).getOwnerId())) {
return true;
}
}
}
return false;
}

25
Mage.Sets/src/mage/sets/eldritchmoon/NephaliaAcademy.java
View file

@ -28,6 +28,7 @@
package mage.sets.eldritchmoon;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ReplacementEffectImpl;
@ -44,6 +45,8 @@ import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.PermanentCard;
import mage.game.stack.Spell;
import mage.players.Player;
/**
@ -118,11 +121,25 @@ class NephaliaAcademyEffect extends ReplacementEffectImpl {
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
if (event.getType().equals(GameEvent.EventType.DISCARD_CARD)) {
// only save card info
// only save card info if it's an opponent effect
Card card = game.getCard(event.getTargetId());
if (card != null) {
cardId = card.getId();
zoneChangeCounter = game.getState().getZoneChangeCounter(cardId);
boolean isAnOpponentEffect = false;
MageObject object = game.getObject(event.getSourceId());
if (object instanceof PermanentCard) {
isAnOpponentEffect = game.getOpponents(source.getControllerId()).contains(((PermanentCard) object).getControllerId());
}
else if (object instanceof Spell) {
isAnOpponentEffect = game.getOpponents(source.getControllerId()).contains(((Spell) object).getControllerId());
}
else if (object instanceof Card) {
isAnOpponentEffect = game.getOpponents(source.getControllerId()).contains(((Card) object).getOwnerId());
}
if (isAnOpponentEffect) {
cardId = card.getId();
zoneChangeCounter = game.getState().getZoneChangeCounter(cardId);
}
}
return false;
}
@ -133,7 +150,7 @@ class NephaliaAcademyEffect extends ReplacementEffectImpl {
cardId = null;
zoneChangeCounter = 0;
if (controller.chooseUse(outcome, "Put " + card.getIdName() + " on top of your library instead?", source, game)) {
Cards cardsToLibrary = new CardsImpl(card);
// reveal the card then put it on top of your library
controller.revealCards(card.getName(), cardsToLibrary, game);

2
Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java
View file

@ -107,7 +107,7 @@ public class SigardaHostOfHeronsTest extends CardTestPlayerBase {
assertGraveyardCount(playerB, "Tempt with Immortality", 1);
assertGraveyardCount(playerA, "Sigarda, Host of Herons", 0);
assertGraveyardCount(playerB, "Merciless Executioner", 0);
assertGraveyardCount(playerB, "Merciless Executioner", 1);
}
}