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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2016-01-29 23:10:09 +01:00
commit 20289f836f
11 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/sets/avacynrestored/VanguardsShield.java
View file

@ -57,10 +57,10 @@ public class VanguardsShield extends CardImpl {
this.expansionSetCode = "AVR";
this.subtype.add("Equipment");
// Equipped creature gets +0/+3 and can black an additional creature each combat.
// Equipped creature gets +0/+3 and can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3)));
// Equipped creature can black an additional creature each combat. (static abilit of equipment, no ability that will be gained to equiped creature!)
// Equipped creature can block an additional creature each combat. (static abilit of equipment, no ability that will be gained to equiped creature!)
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new VanguardsShieldEffect()));
// Equip {3}
@ -81,7 +81,7 @@ class VanguardsShieldEffect extends ContinuousEffectImpl {
public VanguardsShieldEffect() {
super(Duration.WhileOnBattlefield, Outcome.AddAbility);
staticText = "Equipped creature can black an additional creature each combat";
staticText = "Equipped creature can block an additional creature each combat";
}
public VanguardsShieldEffect(final VanguardsShieldEffect effect) {

2
Mage.Sets/src/mage/sets/exodus/HighGround.java
View file

@ -47,7 +47,7 @@ public class HighGround extends CardImpl {
super(ownerId, 7, "High Ground", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{W}");
this.expansionSetCode = "EXO";
// Each creature you control can black an additional creature each combat.
// Each creature you control can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureAllEffect(1, new FilterControlledCreaturePermanent("Each creature you control"), Duration.WhileOnBattlefield)));
}

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

@ -53,7 +53,7 @@ public class BraveTheSands extends CardImpl {
// Creatures you control have vigilance.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, new FilterControlledCreaturePermanent("Creatures"))));
// Each creature you control can black an additional creature each combat.
// Each creature you control can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureAllEffect(1, new FilterControlledCreaturePermanent("Each creature you control"), Duration.WhileOnBattlefield)));
}

2
Mage.Sets/src/mage/sets/masterseditioniv/TwoHeadedGiantOfForiys.java
View file

@ -52,7 +52,7 @@ public class TwoHeadedGiantOfForiys extends CardImpl {
// Trample
this.addAbility(TrampleAbility.getInstance());
// Two-Headed Giant of Foriys can black an additional creature each combat.
// Two-Headed Giant of Foriys can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect()));
}

2
Mage.Sets/src/mage/sets/mercadianmasques/TwoHeadedDragon.java
View file

@ -65,7 +65,7 @@ public class TwoHeadedDragon extends CardImpl {
// Menace (This creature can't be blocked except by two or more creatures.)
this.addAbility(new MenaceAbility());
// Two-Headed Dragon can black an additional creature each combat.
// Two-Headed Dragon can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect()));
}

2
Mage.Sets/src/mage/sets/morningtide/CennsTactician.java
View file

@ -76,7 +76,7 @@ public class CennsTactician extends CardImpl {
ability.addTarget(new TargetCreaturePermanent(filterSoldier));
this.addAbility(ability);
// Each creature you control with a +1/+1 counter on it can black an additional creature each combat.
// Each creature you control with a +1/+1 counter on it can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureAllEffect(1, filterCounter, Duration.WhileOnBattlefield)));
}

2
Mage.Sets/src/mage/sets/ravnica/SelesnyaSagittars.java
View file

@ -53,7 +53,7 @@ public class SelesnyaSagittars extends CardImpl {
// Reach
this.addAbility(ReachAbility.getInstance());
// Selesnya Sagittars can black an additional creature each combat.
// Selesnya Sagittars can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect()));
}

4
Mage.Sets/src/mage/sets/scarsofmirrodin/EchoCirclet.java
View file

@ -50,7 +50,7 @@ public class EchoCirclet extends CardImpl {
this.expansionSetCode = "SOM";
this.subtype.add("Equipment");
// Equipped creature can black an additional creature each combat. (static abilit of equipment, no ability that will be gained to equiped creature!)
// Equipped creature can block an additional creature each combat. (static abilit of equipment, no ability that will be gained to equiped creature!)
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EchoCircletEffect()));
// Equip {1}
@ -71,7 +71,7 @@ class EchoCircletEffect extends ContinuousEffectImpl {
public EchoCircletEffect() {
super(Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "Equipped creature can black an additional creature each combat";
staticText = "Equipped creature can block an additional creature each combat";
}
public EchoCircletEffect(final EchoCircletEffect effect) {

2
Mage.Sets/src/mage/sets/timespiral/ForiysianInterceptor.java
View file

@ -56,7 +56,7 @@ public class ForiysianInterceptor extends CardImpl {
this.addAbility(FlashAbility.getInstance());
// Defender
this.addAbility(DefenderAbility.getInstance());
// Foriysian Interceptor can black an additional creature each combat.
// Foriysian Interceptor can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect()));
}

4
Mage.Sets/src/mage/sets/timespiral/ForiysianTotem.java
View file

@ -53,7 +53,7 @@ import java.util.UUID;
*/
public class ForiysianTotem extends CardImpl {
private final static String ruleText = "As long as {this} is a creature, it can black an additional creature each combat.";
private final static String ruleText = "As long as {this} is a creature, it can block an additional creature each combat.";
public ForiysianTotem(UUID ownerId) {
super(ownerId, 254, "Foriysian Totem", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}");
@ -65,7 +65,7 @@ public class ForiysianTotem extends CardImpl {
// {4}{R}: Foriysian Totem becomes a 4/4 red Giant artifact creature with trample until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new ForiysianTotemToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{4}{R}")));
// As long as Foriysian Totem is a creature, it can black an additional creature each combat.
// As long as Foriysian Totem is a creature, it can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new CanBlockAdditionalCreatureEffect(1), new SourceMatchesFilterCondition(new FilterCreaturePermanent()), ruleText)));
}

2
Mage.Sets/src/mage/sets/weatherlight/ForiysianBrigade.java
View file

@ -50,7 +50,7 @@ public class ForiysianBrigade extends CardImpl {
this.power = new MageInt(2);
this.toughness = new MageInt(4);
// Foriysian Brigade can black an additional creature each combat.
// Foriysian Brigade can block an additional creature each combat.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CanBlockAdditionalCreatureEffect()));
}