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

* Fixed Bant Sureblade, Esper Stormblade, Jund Hackblade and Naya Hushblade getting their boost now correctly also from controlled non creature multicolored permanents.

Browse source
This commit is contained in:
LevelX2 2013-09-10 21:46:17 +02:00
parent 36ecc1e121
commit 62256db943
5 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Sets/src/mage/sets/alarareborn/BantSureblade.java
View file

@ -41,7 +41,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
*/ */
public class BantSureblade extends CardImpl<BantSureblade> { public class BantSureblade extends CardImpl<BantSureblade> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent"); private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
static { static {
filter.add(new MulticoloredPredicate()); filter.add(new MulticoloredPredicate());
@ -75,12 +75,11 @@ public class BantSureblade extends CardImpl<BantSureblade> {
new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, {this} gets +1/+1")); "As long as you control another multicolored permanent, {this} gets +1/+1"));
Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( ability.addEffect(new ConditionalContinousEffect(
new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, {this} has first strike")); "and has first strike"));
this.addAbility(ability); this.addAbility(ability);
this.addAbility(ability2);
} }
public BantSureblade(final BantSureblade card) { public BantSureblade(final BantSureblade card) {

9
Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java
View file

@ -41,7 +41,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
*/ */
public class EsperStormblade extends CardImpl<EsperStormblade> { public class EsperStormblade extends CardImpl<EsperStormblade> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent"); private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
static { static {
filter.add(new MulticoloredPredicate()); filter.add(new MulticoloredPredicate());
@ -75,12 +75,11 @@ public class EsperStormblade extends CardImpl<EsperStormblade> {
new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, {this} gets +1/+1")); "As long as you control another multicolored permanent, {this} gets +1/+1"));
Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( ability.addEffect(new ConditionalContinousEffect(
new GainAbilitySourceEffect(FlyingAbility.getInstance()), new GainAbilitySourceEffect(FlyingAbility.getInstance()),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, {this} has flying")); "and has flying"));
this.addAbility(ability); this.addAbility(ability);
this.addAbility(ability2);
} }
public EsperStormblade(final EsperStormblade card) { public EsperStormblade(final EsperStormblade card) {

5
Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java
View file

@ -75,12 +75,11 @@ public class GrixisGrimblade extends CardImpl<GrixisGrimblade> {
new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, {this} gets +1/+1")); "As long as you control another multicolored permanent, {this} gets +1/+1"));
Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( ability.addEffect(new ConditionalContinousEffect(
new GainAbilitySourceEffect(DeathtouchAbility.getInstance()), new GainAbilitySourceEffect(DeathtouchAbility.getInstance()),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, {this} has deathtouch")); "and has deathtouch"));
this.addAbility(ability); this.addAbility(ability);
this.addAbility(ability2);
} }

9
Mage.Sets/src/mage/sets/alarareborn/JundHackblade.java
View file

@ -41,7 +41,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
*/ */
public class JundHackblade extends CardImpl<JundHackblade> { public class JundHackblade extends CardImpl<JundHackblade> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent"); private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
static { static {
filter.add(new MulticoloredPredicate()); filter.add(new MulticoloredPredicate());
@ -75,12 +75,11 @@ public class JundHackblade extends CardImpl<JundHackblade> {
new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, {this} gets +1/+1")); "As long as you control another multicolored permanent, {this} gets +1/+1"));
Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( ability.addEffect(new ConditionalContinousEffect(
new GainAbilitySourceEffect(HasteAbility.getInstance()), new GainAbilitySourceEffect(HasteAbility.getInstance()),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, {this} has haste")); "and has haste"));
this.addAbility(ability); this.addAbility(ability);
this.addAbility(ability2);
} }
public JundHackblade(final JundHackblade card) { public JundHackblade(final JundHackblade card) {

11
Mage.Sets/src/mage/sets/alarareborn/NayaHushblade.java
View file

@ -41,7 +41,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.MulticoloredPredicate; import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
*/ */
public class NayaHushblade extends CardImpl<NayaHushblade> { public class NayaHushblade extends CardImpl<NayaHushblade> {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent"); private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
static { static {
filter.add(new MulticoloredPredicate()); filter.add(new MulticoloredPredicate());
@ -74,13 +74,12 @@ public class NayaHushblade extends CardImpl<NayaHushblade> {
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
new BoostSourceEffect(1,1, Duration.WhileOnBattlefield), new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
"As long as you control another multicolored permanent, Naya Hushblade gets +1/+1 and has shroud")); "As long as you control another multicolored permanent, Naya Hushblade gets +1/+1"));
Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect( ability.addEffect(new ConditionalContinousEffect(
new GainAbilitySourceEffect(ShroudAbility.getInstance()), new GainAbilitySourceEffect(ShroudAbility.getInstance()),
new ControlsPermanentCondition(filter), new ControlsPermanentCondition(filter),
null)); " and has shroud"));
this.addAbility(ability); this.addAbility(ability);
this.addAbility(ability2);
} }
public NayaHushblade(final NayaHushblade card) { public NayaHushblade(final NayaHushblade card) {