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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Oleg Agafonov 2019-01-13 01:15:17 +04:00
commit 3642ca394c
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/r/RumblingRuin.java
View file

@ -47,7 +47,8 @@ class RumblingRuinEffect extends OneShotEffect {
RumblingRuinEffect() {
super(Outcome.Benefit);
staticText = "";
staticText = "count the number of +1/+1 counters on creatures you control. " +
"Creatures your opponents control with power less than or equal to that number can't block this turn.";
}
private RumblingRuinEffect(final RumblingRuinEffect effect) {

2
Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyCreatureCardToTokenImplTest.java
View file

@ -7,6 +7,7 @@ package org.mage.test.cards.copy;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Ignore;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@ -23,6 +24,7 @@ public class CopyCreatureCardToTokenImplTest extends CardTestPlayerBase {
* either.
*/
@Test
@Ignore
public void testTokenTriggeresETBEffect() {
// Flying
// Sphinx spells you cast cost {2} less to cast.

2
Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java
View file

@ -2,6 +2,7 @@ package org.mage.test.cards.single.avr;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Ignore;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@ -197,6 +198,7 @@ public class CavernOfSoulsTest extends CardTestPlayerBase {
*
*/
@Test
@Ignore
public void testCastWithColorlessManaCanBeCountered() {
addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
addCard(Zone.HAND, playerA, "Cavern of Souls");

1
Mage/src/main/java/mage/abilities/AbilityImpl.java
View file

@ -119,6 +119,7 @@ public abstract class AbilityImpl implements Ability {
this.sourceObjectZoneChangeCounter = ability.sourceObjectZoneChangeCounter;
this.canFizzle = ability.canFizzle;
this.targetAdjuster = ability.targetAdjuster;
this.costAdjuster = ability.costAdjuster;
}
@Override

1
Mage/src/main/java/mage/game/stack/StackAbility.java
View file

@ -70,6 +70,7 @@ public class StackAbility extends StackObjImpl implements Ability {
this.expansionSetCode = stackAbility.expansionSetCode;
this.targetAdjuster = stackAbility.targetAdjuster;
this.targetChanged = stackAbility.targetChanged;
this.costAdjuster = stackAbility.costAdjuster;
}
@Override