External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-24 20:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #73 from magefree/master

Browse source 
merge
This commit is contained in:
theelk801 2017-09-16 21:57:19 -04:00 • committed by GitHub
commit a6b95db4fc
5 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage.Sets/src/mage/cards/d/DeathgorgeScavenger.java
View file

@ -34,12 +34,12 @@ import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.Card;
import mage.constants.SubType;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
@ -92,14 +92,16 @@ class DeathgorgeScavengerEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Card card = game.getCard(getTargetPointer().getFirst(game, source));
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && card != null) {
controller.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.GRAVEYARD, true);
if (card.isCreature()) {
controller.gainLife(2, game);
} else {
new BoostSourceEffect(1, 1, Duration.EndOfTurn).apply(game, source);
if (controller != null) {
Card card = game.getCard(getTargetPointer().getFirst(game, source));
if (card != null) {
controller.moveCards(card, Zone.EXILED, source, game);
if (card.isCreature()) {
controller.gainLife(2, game);
} else {
game.addEffect(new BoostSourceEffect(1, 1, Duration.EndOfTurn), source);
}
}
return true;
}

2
Mage.Sets/src/mage/cards/m/MaraudingLooter.java
View file

@ -57,7 +57,7 @@ public class MaraudingLooter extends CardImpl {
// Raid - At the beginning of your end step, if you attacked with a creature this turn, you may draw a card. If you do, discard a card.
Ability ability = new ConditionalTriggeredAbility(
new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1), TargetController.YOU, false),
new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true), TargetController.YOU, false),
RaidCondition.instance,
"<i>Raid</i> &mdash; At the beginning of your end step, "
+ "if you attacked with a creature this turn, "