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

* BattleCry - Fixed that power boost did not last until end of turn.

Browse source
This commit is contained in:
LevelX2 2014-08-16 17:37:38 +02:00
parent 6e4facfa8b
commit df475d8049
5 changed files with 115 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BattleCryTest.java Normal file
View file

@ -0,0 +1,92 @@
/*
* 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.abilities.keywords;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* 702.90. Battle Cry
*
* 702.90a Battle cry is a triggered ability. "Battle cry" means "Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn."
* 702.90b If a creature has multiple instances of battle cry, each triggers separately.
*
* @author LevelX2
*/
public class BattleCryTest extends CardTestPlayerBase {
/**
* Tests boost last until end of turn
*/
@Test
public void testBoostDurationUntilEndTurn() {
// Signal Pest {1}
// Artifact Creature - Pest 0/1
// Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
// Signal Pest can't be blocked except by creatures with flying or reach.
addCard(Zone.BATTLEFIELD, playerB, "Signal Pest", 3);
attack(2, playerB, "Signal Pest");
attack(2, playerB, "Signal Pest");
attack(2, playerB, "Signal Pest");
setStopAt(2, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertPermanentCount(playerB, "Signal Pest", 3);
assertPowerToughness(playerB, "Signal Pest", 2,1); // two other Signal Pest atack, so it get +2 power
}
/**
* Tests boost last until end of turn
*/
@Test
public void testBoostDurationNotNextTurn() {
// Signal Pest {1}
// Artifact Creature - Pest 0/1
// Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
// Signal Pest can't be blocked except by creatures with flying or reach.
addCard(Zone.BATTLEFIELD, playerB, "Signal Pest", 3);
attack(2, playerB, "Signal Pest");
attack(2, playerB, "Signal Pest");
attack(2, playerB, "Signal Pest");
setStopAt(3, PhaseStep.UPKEEP);
execute();
assertPermanentCount(playerB, "Signal Pest", 3);
assertPowerToughness(playerB, "Signal Pest", 0,1);
}
}

3
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -59,6 +59,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.AttackingPredicate;
/**
*
@ -178,6 +180,7 @@ public class TestPlayer extends ComputerPlayer {
}
FilterCreatureForCombat filter = new FilterCreatureForCombat();
filter.add(new NamePredicate(groups[0]));
filter.add(Predicates.not(new AttackingPredicate()));
Permanent attacker = findPermanent(filter, playerId, game);
if (attacker != null && attacker.canAttack(defenderId, game)) {
this.declareAttacker(attacker.getId(), defenderId, game, false);

2
Mage/src/mage/abilities/effects/ContinuousEffectImpl.java
View file

@ -137,7 +137,7 @@ public abstract class ContinuousEffectImpl extends EffectImpl implements Continu
public void init(Ability source, Game game) {
targetPointer.init(game, source);
//20100716 - 611.2c
if (source instanceof ActivatedAbility || source instanceof TriggeredAbility) {
if (AbilityType.ACTIVATED.equals(source.getAbilityType()) || AbilityType.TRIGGERED.equals(source.getAbilityType())) {
if (layer != null) {
switch (layer) {
case CopyEffects_1:

20
Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java
View file

@ -28,6 +28,10 @@
package mage.abilities.effects.common.continious;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
@ -126,13 +130,25 @@ public class BoostControlledEffect extends ContinuousEffectImpl {
@Override
public boolean apply(Game game, Ability source) {
for (Permanent perm : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
if (!this.affectedObjectsSet || objects.contains(perm.getId())) {
if (this.affectedObjectsSet) {
for (Iterator<UUID> it = objects.iterator(); it.hasNext();) { // filter may not be used again, because object can have changed filter relevant attributes but still geets boost
UUID permanentId = it.next();
Permanent permanent = game.getPermanent(permanentId);
if (permanent != null) {
permanent.addPower(power.calculate(game, source, this));
permanent.addToughness(toughness.calculate(game, source, this));
} else {
it.remove(); // no longer on the battlefield, remove reference to object
}
}
} else {
for (Permanent perm : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
if (!(excludeSource && perm.getId().equals(source.getSourceId()))) {
perm.addPower(power.calculate(game, source, this));
perm.addToughness(toughness.calculate(game, source, this));
}
}
}
return true;
}

1
Mage/src/mage/abilities/keyword/BattleCryAbility.java
View file

@ -6,6 +6,7 @@ import mage.constants.Duration;
import mage.filter.common.FilterAttackingCreature;
public class BattleCryAbility extends AttacksTriggeredAbility {
public BattleCryAbility() {
super(new BoostControlledEffect(1, 0, Duration.EndOfTurn, new FilterAttackingCreature(), true), false);
}