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

* Fixed a bug of CanBlockOnlyFlyingAbility that prevented other creatures with flying on the battlefield to block (Gloomwidow, Scrapskin Drake, Stormbound Geist, Skywinder Drake, Cloud Elemental, Cloud Sprite, Vaporkin, Welkin Tern).

Browse source
This commit is contained in:
LevelX2 2014-03-27 20:08:16 +01:00
parent be4f3f63d3
commit ea498413cf
4 changed files with 225 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/theros/NimbusNaiad.java
View file

@ -1,4 +1,4 @@
/*
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are

152
Mage.Tests/src/test/java/org/mage/test/cards/restriction/CanBlockOnlyFlyingTest.java Normal file
View file

@ -0,0 +1,152 @@
/*
* 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 org.mage.test.cards.restriction;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
/*
* Vaporkin
* Creature — Elemental 2/1, 1U
* Flying
* Vaporkin can block only creatures with flying.
*/
public class CanBlockOnlyFlyingTest extends CardTestPlayerBase {
/**
* Tests if Vaporkin can't block a creature without flying
*/
@Test
public void testCannotBlockCreatureWithoutFlying() {
addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion");
addCard(Zone.BATTLEFIELD, playerB, "Vaporkin");
attack(3, playerA, "Silvercoat Lion");
block(3, playerB, "Vaporkin", "Silvercoat Lion");
setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertPermanentCount(playerA, "Silvercoat Lion", 1);
assertPermanentCount(playerB, "Vaporkin", 1);
assertLife(playerA, 20);
assertLife(playerB, 18);
}
/**
* Tests if Vaporkin can block a creature with flying
*/
@Test
public void testCanBlockCreatureWithFlying() {
addCard(Zone.BATTLEFIELD, playerA, "Wingsteed Rider");
addCard(Zone.BATTLEFIELD, playerB, "Vaporkin");
attack(3, playerA, "Wingsteed Rider");
block(3, playerB, "Vaporkin", "Wingsteed Rider");
setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertPermanentCount(playerA, "Wingsteed Rider", 0);
assertPermanentCount(playerB, "Vaporkin", 0);
assertLife(playerA, 20);
assertLife(playerB, 20);
}
/**
* Tests if Vaporkin can't block a flying creature after loosing Flying
*/
@Test
public void testCantBlockFlyerAfterLosingFlying() {
addCard(Zone.BATTLEFIELD, playerA, "Archetype of Imagination");
addCard(Zone.BATTLEFIELD, playerB, "Vaporkin");
attack(3, playerA, "Archetype of Imagination");
block(3, playerB, "Vaporkin", "Archetype of Imagination");
setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertPermanentCount(playerA, "Archetype of Imagination", 1);
assertPermanentCount(playerB, "Vaporkin", 1);
assertLife(playerA, 20);
assertLife(playerB, 17);
}
/**
* Tests if Vaporkin can block a creature whicj gained flying
*/
@Test
public void testCanBlockCreatureWhichGainedFlying() {
addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion");
addCard(Zone.HAND, playerB, "Jump");
addCard(Zone.BATTLEFIELD, playerB, "Vaporkin");
addCard(Zone.BATTLEFIELD, playerB, "Island");
castSpell(3, PhaseStep.PRECOMBAT_MAIN, playerB, "Jump", "Silvercoat Lion");
attack(3, playerA, "Silvercoat Lion");
block(3, playerB, "Vaporkin", "Silvercoat Lion");
setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerA, 20);
assertLife(playerB, 20);
assertPermanentCount(playerA, "Silvercoat Lion", 0);
assertPermanentCount(playerB, "Vaporkin", 0);
}
}

18
Mage/src/mage/abilities/common/CanBlockOnlyFlyingAbility.java
View file

@ -6,12 +6,9 @@
package mage.abilities.common;
import mage.abilities.effects.common.combat.CantBlockAllEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.effects.common.combat.CanBlockOnlyFlyingEffect;
import mage.constants.Duration;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AbilityPredicate;
/**
*
@ -20,25 +17,14 @@ import mage.filter.predicate.mageobject.AbilityPredicate;
public class CanBlockOnlyFlyingAbility extends SimpleStaticAbility {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with flying");
static {
filter.add(new AbilityPredicate(FlyingAbility.class));
}
public CanBlockOnlyFlyingAbility() {
super(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.WhileOnBattlefield));
super(Zone.BATTLEFIELD, new CanBlockOnlyFlyingEffect(Duration.WhileOnBattlefield));
}
private CanBlockOnlyFlyingAbility(CanBlockOnlyFlyingAbility ability) {
super(ability);
}
@Override
public String getRule() {
return "{this} can block only creatures with flying.";
}
@Override
public CanBlockOnlyFlyingAbility copy() {
return new CanBlockOnlyFlyingAbility(this);

70
Mage/src/mage/abilities/effects/common/combat/CanBlockOnlyFlyingEffect.java Normal file
View file

@ -0,0 +1,70 @@
/*
* 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.combat;
import mage.abilities.Ability;
import mage.abilities.effects.RestrictionEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.constants.Duration;
import mage.game.Game;
import mage.game.permanent.Permanent;
/**
*
* @author LevelX2
*/
public class CanBlockOnlyFlyingEffect extends RestrictionEffect<CanBlockOnlyFlyingEffect> {
public CanBlockOnlyFlyingEffect(Duration duration) {
super(duration);
this.staticText = "{this} can block only creatures with flying";
}
public CanBlockOnlyFlyingEffect(final CanBlockOnlyFlyingEffect effect) {
super(effect);
}
@Override
public boolean applies(Permanent permanent, Ability source, Game game) {
return permanent.getId().equals(source.getSourceId());
}
@Override
public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
return attacker.getAbilities().contains(FlyingAbility.getInstance());
}
@Override
public CanBlockOnlyFlyingEffect copy() {
return new CanBlockOnlyFlyingEffect(this);
}
}