github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-02 03:18:09 -09:00
Code Issues Projects Releases Packages Wiki Activity

Added some tests and some minor changes.

Browse source
This commit is contained in:
LevelX2 2015-03-30 17:20:04 +02:00
parent 79fe084be3
commit 9d85a26e12
6 changed files with 123 additions and 19 deletions
Mage.Sets/src/mage/sets/dragonsoftarkir
DragonlordAtarka.java
Mage.Tests/src/test/java/org/mage/test/cards/replacement
DryadMilitantTest.java
Mage/src/mage
game/events
GameEvent.java
players
ManaPool.java
target/common
TargetCreatureOrPlaneswalkerAmount.javaTargetCreatureOrPlayerAmount.java

1
Mage.Sets/src/mage/sets/dragonsoftarkir/DragonlordAtarka.java
View file

@ -31,7 +31,6 @@ import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.DamageMultiEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.TrampleAbility;

103
Mage.Tests/src/test/java/org/mage/test/cards/replacement/DryadMilitantTest.java Normal file
View file

@ -0,0 +1,103 @@
/*
* 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.replacement;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* Dryad Militant
* Creature - Dryad Soldier 1/1 {G/W}
* If an instant or sorcery card would be put into a graveyard from anywhere, exile it instead.
*
* @author LevelX2
*/
public class DryadMilitantTest extends CardTestPlayerBase {
/**
* Tests that an instant or sorcery card is moved to exile
*/
@Test
public void testNormalCase() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
addCard(Zone.HAND, playerA, "Lightning Bolt");
addCard(Zone.BATTLEFIELD, playerB, "Dryad Militant");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB);
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertLife(playerB, 17);
assertExileCount("Lightning Bolt", 1);
}
/**
* Tests if Dryad Militant dies by damage spell, the
* spell gets exiled
*/
@Test
public void testDiesByDamage() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
addCard(Zone.HAND, playerA, "Lightning Bolt");
addCard(Zone.BATTLEFIELD, playerB, "Dryad Militant");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Dryad Militant");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertLife(playerB, 20);
assertExileCount("Lightning Bolt", 1);
}
/**
* Tests if Dryad Militant dies by damage spell, the
* spell don't gets exiled
*/
@Test
public void testDiesByDestroy() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
addCard(Zone.HAND, playerA, "Terminate");
addCard(Zone.BATTLEFIELD, playerB, "Dryad Militant");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Terminate", "Dryad Militant");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertLife(playerB, 20);
assertGraveyardCount(playerB, "Terminate", 1);
}
}

2
Mage/src/mage/game/events/GameEvent.java
View file

@ -267,7 +267,7 @@ public class GameEvent {
public void setAppliedEffects(ArrayList<UUID> appliedEffects) {
if (appliedEffects == null) {
appliedEffects = new ArrayList<UUID>();
appliedEffects = new ArrayList<>();
}
this.appliedEffects = appliedEffects;
}

4
Mage/src/mage/players/ManaPool.java
View file

@ -36,6 +36,7 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
import mage.ConditionalMana;
import mage.MageObject;
import mage.Mana;
import mage.abilities.Ability;
import mage.constants.AsThoughEffectType;
@ -110,8 +111,9 @@ public class ManaPool implements Serializable {
lockManaType(); // pay only one mana if mana payment is set to manually
return true;
}
MageObject sourceObject = ability.getSourceObject(game);
for (ManaPoolItem mana : manaItems) {
if (filter == null || filter.match(game.getObject(mana.getSourceId()), game)) {
if (filter == null || filter.match(sourceObject, game)) {
boolean spendAnyMana = spendAnyMana(ability, game);
if (mana.get(manaType) > 0 || (spendAnyMana && mana.count() > 0)) {
game.fireEvent(new GameEvent(GameEvent.EventType.MANA_PAYED, ability.getId(), mana.getSourceId(), ability.getControllerId(), 0, mana.getFlag()));

14
Mage/src/mage/target/common/TargetCreatureOrPlaneswalkerAmount.java
View file

@ -83,8 +83,8 @@
}
@Override
public boolean canTarget(UUID id, Game game) {
Permanent permanent = game.getPermanent(id);
public boolean canTarget(UUID objectId, Game game) {
Permanent permanent = game.getPermanent(objectId);
if (permanent != null) {
return filter.match(permanent, game);
}
@ -92,11 +92,11 @@
}
@Override
public boolean canTarget(UUID id, Ability source, Game game) {
Permanent permanent = game.getPermanent(id);
public boolean canTarget(UUID objectId, Ability source, Game game) {
Permanent permanent = game.getPermanent(objectId);
if (permanent != null) {
if (source != null) {
MageObject targetSource = game.getObject(source.getSourceId());
MageObject targetSource = source.getSourceObject(game);
return permanent.canBeTargetedBy(targetSource, source.getControllerId(), game) && filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
} else {
return filter.match(permanent, game);
@ -106,8 +106,8 @@
}
@Override
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
return canTarget(id, source, game);
public boolean canTarget(UUID playerId, UUID objectId, Ability source, Game game) {
return canTarget(objectId, source, game);
}
@Override

18
Mage/src/mage/target/common/TargetCreatureOrPlayerAmount.java
View file

@ -79,12 +79,12 @@ public class TargetCreatureOrPlayerAmount extends TargetAmount {
}
@Override
public boolean canTarget(UUID id, Game game) {
Permanent permanent = game.getPermanent(id);
public boolean canTarget(UUID objectId, Game game) {
Permanent permanent = game.getPermanent(objectId);
if (permanent != null) {
return filter.match(permanent, game);
}
Player player = game.getPlayer(id);
Player player = game.getPlayer(objectId);
if (player != null) {
return filter.match(player, game);
}
@ -92,12 +92,12 @@ public class TargetCreatureOrPlayerAmount extends TargetAmount {
}
@Override
public boolean canTarget(UUID id, Ability source, Game game) {
Permanent permanent = game.getPermanent(id);
Player player = game.getPlayer(id);
public boolean canTarget(UUID objectId, Ability source, Game game) {
Permanent permanent = game.getPermanent(objectId);
Player player = game.getPlayer(objectId);
if (source != null) {
MageObject targetSource = game.getObject(source.getSourceId());
MageObject targetSource = source.getSourceObject(game);
if (permanent != null) {
return permanent.canBeTargetedBy(targetSource, source.getControllerId(), game) && filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
}
@ -116,8 +116,8 @@ public class TargetCreatureOrPlayerAmount extends TargetAmount {
}
@Override
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
return canTarget(id, source, game);
public boolean canTarget(UUID playerId, UUID objectId, Ability source, Game game) {
return canTarget(objectId, source, game);
}
@Override