github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2122 from fwannmacher/master

Browse source 
Fixed some bugs
This commit is contained in:
Derek M 2016-07-26 19:20:27 -04:00 committed by GitHub
commit 8d67ddde5c
4 changed files with 111 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/timespiral/PulmonicSliver.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.PutIntoGraveFromAnywhereSourceAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.ReturnToLibrarySpellEffect;
import mage.abilities.effects.common.ReturnToLibraryPermanentEffect;
import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
@ -65,7 +65,7 @@ public class PulmonicSliver extends CardImpl {
filter, "All Sliver creatures have flying.")));
// All Slivers have "If this permanent would be put into a graveyard, you may put it on top of its owner's library instead."
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(
new PutIntoGraveFromAnywhereSourceAbility(new ReturnToLibrarySpellEffect(true)), Duration.WhileOnBattlefield,
new PutIntoGraveFromAnywhereSourceAbility(new ReturnToLibraryPermanentEffect(true)), Duration.WhileOnBattlefield,
filterSlivers, "All Slivers have \"If this permanent would be put into a graveyard, you may put it on top of its owner's library instead.\"")));
}

20
Mage.Tests/src/test/java/org/mage/test/cards/triggers/EntersTheBattlefieldTriggerTest.java
View file

@ -309,10 +309,26 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Scathe Zombies", 1); // 2/2 Zombie {2}{B}
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Noxious Ghoul");
/*
* playerA's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 3/4
* playerB's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 3/4
*/
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Clone");
setChoice(playerA, "Noxious Ghoul");
/*
* playerA's Carnivorous Plant will get -1/-1 from Clone -> 2/3
* playerB's Carnivorous Plant will get -1/-1 from Clone -> 2/3
*/
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Ego Erasure", "targetPlayer=PlayerA", "Whenever");
/*
* playerA' Noxious Ghoul will get -2/0 -> 1/3
* playerA's Carnivorous Plant will get -2/0 > 0/3
* playerA' Noxious Ghoul will get -1/-1 from Clone -> 0/2
* playerA' Noxious Ghoul will get -1/-1 from itself -> -1/1
* playerA's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> -1/2
* playerB's Carnivorous Plant will get -1/-1 from Noxious Ghoul -> 1/2
*/
setStopAt(1, PhaseStep.END_TURN);
execute();
@ -322,7 +338,7 @@ public class EntersTheBattlefieldTriggerTest extends CardTestPlayerBase {
assertPowerToughness(playerA, "Noxious Ghoul", -1, 1, Filter.ComparisonScope.All);// -1/-1 from the second Noxious Ghoul also if it's no zombie
assertGraveyardCount(playerB, "Zephyr Falcon", 1);
assertPowerToughness(playerB, "Carnivorous Plant", 2, 3);
assertPowerToughness(playerA, "Carnivorous Plant", 0, 3);
assertPowerToughness(playerB, "Carnivorous Plant", 1, 2);
assertPowerToughness(playerA, "Carnivorous Plant", -1, 2);
}
}

31
Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java
View file

@ -73,25 +73,28 @@ public class DealsDamageToAPlayerAllTriggeredAbility extends TriggeredAbilityImp
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
public boolean checkTrigger(GameEvent event, Game game) {
if (!onlyCombat || ((DamagedPlayerEvent) event).isCombatDamage()) {
Permanent permanent = game.getPermanent(event.getSourceId());
if (permanent != null && filter.match(permanent, sourceId, controllerId, game)) {
if (!setTargetPointer.equals(SetTargetPointer.NONE)) {
for (Effect effect : this.getEffects()) {
effect.setValue("damage", event.getAmount());
switch (setTargetPointer) {
case PLAYER:
effect.setTargetPointer(new FixedTarget(permanent.getControllerId()));
break;
case PERMANENT:
effect.setTargetPointer(new FixedTarget(permanent.getId(), permanent.getZoneChangeCounter(game)));
break;
}
if (permanent != null) {
controllerId = permanent.getControllerId();
if (filter.match(permanent, sourceId, controllerId, game)) {
if (!setTargetPointer.equals(SetTargetPointer.NONE)) {
for (Effect effect : this.getEffects()) {
effect.setValue("damage", event.getAmount());
switch (setTargetPointer) {
case PLAYER:
effect.setTargetPointer(new FixedTarget(permanent.getControllerId()));
break;
case PERMANENT:
effect.setTargetPointer(new FixedTarget(permanent.getId(), permanent.getZoneChangeCounter(game)));
break;
}
}
}
return true;
}
return true;
}
}
return false;

74
Mage/src/main/java/mage/abilities/effects/common/ReturnToLibraryPermanentEffect.java Normal file
View file

@ -0,0 +1,74 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
/**
*
* @author fwannmacher
*/
public class ReturnToLibraryPermanentEffect extends OneShotEffect {
private final boolean toTop;
public ReturnToLibraryPermanentEffect(boolean top) {
super(Outcome.Neutral);
staticText = "Put {this} on "+ (top ? "top":"the bottom") + " of its owner's library";
this.toTop = top;
}
public ReturnToLibraryPermanentEffect(final ReturnToLibraryPermanentEffect effect) {
super(effect);
this.toTop = effect.toTop;
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Card card = game.getPermanent(source.getSourceId());
if (card != null) {
controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.STACK, toTop, true);
}
return true;
}
return false;
}
@Override
public ReturnToLibraryPermanentEffect copy() {
return new ReturnToLibraryPermanentEffect(this);
}
}