External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-30 07:22:03 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some small fixes to cards submitted by cbt33.

Browse source
This commit is contained in:
LevelX2 2014-01-04 11:23:34 +01:00
parent 3374572ed0
commit c80e9739af
7 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/odyssey/Frightcrawler.java
View file

@ -65,7 +65,7 @@ public class Frightcrawler extends CardImpl<Frightcrawler> {
new ConditionalContinousEffect(
new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield),
new CardsInControllerGraveCondition(7),
"<br/><br/><i>Threshold</i> - If seven or more cards are in your graveyard, {this} gets +2/+2 "
"<i>Threshold</i> - If seven or more cards are in your graveyard, {this} gets +2/+2 "
));
thresholdAbility.addEffect(
new ConditionalContinousEffect(

5
Mage.Sets/src/mage/sets/odyssey/MasterApothecary.java
View file

@ -39,7 +39,9 @@ import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.TappedPredicate;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreatureOrPlayer;
@ -49,10 +51,11 @@ import mage.target.common.TargetCreatureOrPlayer;
*/
public class MasterApothecary extends CardImpl<MasterApothecary> {
public static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Cleric");
public static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped Cleric you control");
static {
filter.add(new SubtypePredicate("Cleric"));
filter.add(Predicates.not(new TappedPredicate()));
}
public MasterApothecary(UUID ownerId) {

2
Mage.Sets/src/mage/sets/odyssey/MysticCrusader.java
View file

@ -76,7 +76,7 @@ public class MysticCrusader extends CardImpl<MysticCrusader> {
// Threshold - As long as seven or more cards are in your graveyard, Mystic Crusader gets +1/+1 and has flying.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "<i>Threshold</i> - As long as seven or more cards are in your graveyard, {this} gets +1/+1"));
ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), " and has flying"));
ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying"));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/sets/odyssey/MysticPenitent.java
View file

@ -65,7 +65,7 @@ public class MysticPenitent extends CardImpl<MysticPenitent> {
// Threshold - As long as seven or more cards are in your graveyard, Mystic Penitent gets +1/+1 and has flying.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "<i>Threshold</i> - As long as seven or more cards are in your graveyard, {this} gets +1/+1"));
ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), " and has flying"));
ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying"));
this.addAbility(ability);
}

2
Mage.Sets/src/mage/sets/odyssey/MysticZealot.java
View file

@ -62,7 +62,7 @@ public class MysticZealot extends CardImpl<MysticZealot> {
// Threshold - As long as seven or more cards are in your graveyard, Mystic Zealot gets +1/+1 and has flying.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), "<i>Threshold</i> - As long as seven or more cards are in your graveyard, {this} gets +1/+1"));
ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), " and has flying"));
ability.addEffect(new ConditionalContinousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), "and has flying"));
this.addAbility(ability);
}

3
Mage.Sets/src/mage/sets/odyssey/PatrolHound.java
View file

@ -35,6 +35,7 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
@ -54,7 +55,7 @@ public class PatrolHound extends CardImpl<PatrolHound> {
this.toughness = new MageInt(2);
// Discard a card: Patrol Hound gains first strike until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), new DiscardCardCost()));
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new DiscardCardCost()));
}
public PatrolHound(final PatrolHound card) {

9
Mage/src/mage/abilities/costs/common/TapTargetCost.java
View file

@ -48,7 +48,11 @@ public class TapTargetCost extends CostImpl<TapTargetCost> {
public TapTargetCost(TargetControlledPermanent target) {
this.target = target;
this.text = "Tap " + target.getMaxNumberOfTargets() + " " + target.getTargetName();
this.text =
new StringBuilder("Tap ")
.append(target.getTargetName().startsWith("a ") || target.getTargetName().startsWith("an ") ? "":target.getMaxNumberOfTargets())
.append(" ")
.append(target.getTargetName()).toString();
}
public TapTargetCost(final TapTargetCost cost) {
@ -61,8 +65,9 @@ public class TapTargetCost extends CostImpl<TapTargetCost> {
if (target.choose(Outcome.Tap, controllerId, sourceId, game)) {
for (UUID targetId: (List<UUID>)target.getTargets()) {
Permanent permanent = game.getPermanent(targetId);
if (permanent == null)
if (permanent == null) {
return false;
}
paid |= permanent.tap(game);
}
}