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

Some minor changes already included in 2014-09-13 release.

Browse source
This commit is contained in:
LevelX2 2014-09-13 21:05:54 +02:00
parent 5ce246aba1
commit 1f41f3013a
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/KhansOfTarkir.java
View file

@ -51,7 +51,7 @@ public class KhansOfTarkir extends ExpansionSet {
this.hasBoosters = true; this.hasBoosters = true;
this.hasBasicLands = true; this.hasBasicLands = true;
this.numBoosterLands = 1; this.numBoosterLands = 1;
this.numBoosterCommon = 9; this.numBoosterCommon = 10;
this.numBoosterUncommon = 3; this.numBoosterUncommon = 3;
this.numBoosterRare = 1; this.numBoosterRare = 1;
this.ratioBoosterMythic = 8; this.ratioBoosterMythic = 8;

5
Mage.Sets/src/mage/sets/darkascension/FaithsShield.java
View file

@ -35,7 +35,6 @@ import mage.abilities.Ability;
import mage.abilities.condition.common.FatefulHourCondition; import mage.abilities.condition.common.FatefulHourCondition;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.abilities.effects.common.continious.GainAbilityControllerEffect;
import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect; import mage.abilities.effects.common.continious.GainProtectionFromColorTargetEffect;
import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.ProtectionAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -64,7 +63,6 @@ public class FaithsShield extends CardImpl {
// Fateful hour - If you have 5 or less life, instead you and each permanent you control gain protection from the color of your choice until end of turn. // Fateful hour - If you have 5 or less life, instead you and each permanent you control gain protection from the color of your choice until end of turn.
this.getSpellAbility().addEffect(new FaithsShieldEffect()); this.getSpellAbility().addEffect(new FaithsShieldEffect());
this.getSpellAbility().addTarget(new TargetControlledPermanent()); this.getSpellAbility().addTarget(new TargetControlledPermanent());
this.getSpellAbility().addChoice(new ChoiceColor());
} }
public FaithsShield(final FaithsShield card) { public FaithsShield(final FaithsShield card) {
@ -98,12 +96,11 @@ class FaithsShieldEffect extends OneShotEffect {
Ability ability = new ProtectionAbility(filter) ; Ability ability = new ProtectionAbility(filter) ;
game.addEffect(new GainAbilityControlledEffect(ability, Duration.EndOfTurn), source); game.addEffect(new GainAbilityControlledEffect(ability, Duration.EndOfTurn), source);
game.addEffect(new GainAbilityControllerEffect(ability, Duration.EndOfTurn), source);
} }
else { else {
game.addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), source); game.addEffect(new GainProtectionFromColorTargetEffect(Duration.EndOfTurn), source);
} }
return false; return true;
} }
@Override @Override

1
Mage.Sets/src/mage/sets/khansoftarkir/BearsCompanion.java
View file

@ -28,7 +28,6 @@
package mage.sets.khansoftarkir; package mage.sets.khansoftarkir;
import java.util.UUID; import java.util.UUID;
import static javafx.scene.paint.Color.color;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.CreateTokenEffect;

2
Mage.Sets/src/mage/sets/khansoftarkir/PonybackBrigade.java
View file

@ -50,7 +50,7 @@ import mage.game.permanent.token.GoblinToken;
public class PonybackBrigade extends CardImpl { public class PonybackBrigade extends CardImpl {
public PonybackBrigade(UUID ownerId) { public PonybackBrigade(UUID ownerId) {
super(ownerId, 191, "Ponyback Brigade", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{W}{B}"); super(ownerId, 191, "Ponyback Brigade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}{W}{B}");
this.expansionSetCode = "KTK"; this.expansionSetCode = "KTK";
this.subtype.add("Goblin"); this.subtype.add("Goblin");
this.subtype.add("Warrior"); this.subtype.add("Warrior");

5
Mage.Tests/src/test/java/org/mage/test/cards/single/FaithsShieldTest.java
View file

@ -14,6 +14,11 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
*/ */
public class FaithsShieldTest extends CardTestPlayerBase { public class FaithsShieldTest extends CardTestPlayerBase {
/*
Target permanent you control gains protection from the color of your choice until end of turn.
Fateful hour - If you have 5 or less life, instead you and each permanent you control
gain protection from the color of your choice until end of turn.
*/
@Test @Test
public void testCard() { public void testCard() {
addCard(Zone.BATTLEFIELD, playerA, "White Knight"); addCard(Zone.BATTLEFIELD, playerA, "White Knight");