External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

some text fixes

Browse source
This commit is contained in:
xenohedron 2023-11-22 22:52:55 -05:00
parent 5691ffa40e
commit 1c6c68e1a4
15 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java
View file

@ -39,7 +39,8 @@ public final class AgrusKosWojekVeteran extends CardImpl {
this.power = new MageInt(3);
this.toughness = new MageInt(3);
// Whenever Agrus Kos, Wojek Veteran attacks, attacking red creatures get +2/+0 and attacking white creatures get +0/+2 until end of turn.
Ability ability = new AttacksTriggeredAbility(new BoostAllEffect(2, 0, Duration.EndOfTurn, filterRed, false), false);
Ability ability = new AttacksTriggeredAbility(new BoostAllEffect(2, 0, Duration.EndOfTurn, filterRed, false)
.setText("attacking red creatures get +2/+0"), false);
ability.addEffect(new BoostAllEffect(0, 2, Duration.EndOfTurn, filterWhite, false).concatBy("and"));
this.addAbility(ability);
}

11
Mage.Sets/src/mage/cards/c/ConclavePhalanx.java
View file

@ -2,8 +2,11 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.GainLifeEffect;
import mage.abilities.hint.Hint;
import mage.abilities.hint.ValueHint;
import mage.abilities.keyword.ConvokeAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -18,6 +21,10 @@ import java.util.UUID;
*/
public final class ConclavePhalanx extends CardImpl {
private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE);
private static final Hint hint = new ValueHint("Number of creatures you control", xValue);
public ConclavePhalanx(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}");
this.subtype.add(SubType.HUMAN);
@ -29,8 +36,8 @@ public final class ConclavePhalanx extends CardImpl {
// Convoke
this.addAbility(new ConvokeAbility());
// When Conclave Phalanx enters the battlefield, you gain 1 life for each creature you control.
this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(
new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_CREATURE))));
this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(xValue)
.setText("you gain 1 life for each creature you control")).addHint(hint));
}
private ConclavePhalanx(final ConclavePhalanx card) {

3
Mage.Sets/src/mage/cards/c/CursedLand.java
View file

@ -36,7 +36,8 @@ public final class CursedLand extends CardImpl {
Effect effect = new DamageTargetEffect(1);
effect.setText("{this} deals 1 damage to that player");
this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect,
TargetController.CONTROLLER_ATTACHED_TO, false, true));
TargetController.CONTROLLER_ATTACHED_TO, false, true)
.setTriggerPhrase("At the beginning of the upkeep of enchanted land's controller, "));
}
private CursedLand(final CursedLand card) {

4
Mage.Sets/src/mage/cards/d/DingusEgg.java
View file

@ -38,7 +38,7 @@ public final class DingusEgg extends CardImpl {
class DingusEggTriggeredAbility extends TriggeredAbilityImpl {
public DingusEggTriggeredAbility() {
DingusEggTriggeredAbility() {
super(Zone.BATTLEFIELD, new DamageTargetEffect(2), false);
}
@ -69,7 +69,7 @@ class DingusEggTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
return "Whenever a land is put into a graveyard from the battlefield, {this} deals 2 damage to that land's controller";
return "Whenever a land is put into a graveyard from the battlefield, {this} deals 2 damage to that land's controller.";
}
@Override

6
Mage.Sets/src/mage/cards/h/HolyArmor.java
View file

@ -1,4 +1,3 @@
package mage.cards.h;
import java.util.UUID;
@ -30,7 +29,6 @@ public final class HolyArmor extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}");
this.subtype.add(SubType.AURA);
// Enchant creature
TargetPermanent auraTarget = new TargetCreaturePermanent();
this.getSpellAbility().addTarget(auraTarget);
@ -38,10 +36,8 @@ public final class HolyArmor extends CardImpl {
Ability ability = new EnchantAbility(auraTarget);
this.addAbility(ability);
// Enchanted creature gets +0/+2.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield)));
this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield)));
// {W}: Enchanted creature gets +0/+1 until end of turn.
Ability ability2 = new EnchantAbility(auraTarget);
this.addAbility(ability2);
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W)));
}

5
Mage.Sets/src/mage/cards/p/PeregrineMask.java
View file

@ -1,4 +1,3 @@
package mage.cards.p;
import java.util.UUID;
@ -26,8 +25,8 @@ public final class PeregrineMask extends CardImpl {
this.subtype.add(SubType.EQUIPMENT);
// Equipped creature has defender, flying, and first strike.
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.EQUIPMENT));
ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT));
ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT));
ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT).setText(", flying"));
ability.addEffect(new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.EQUIPMENT).setText(", and first strike"));
this.addAbility(ability);
// Equip {2}
this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2), new TargetControlledCreaturePermanent(), false));

2
Mage.Sets/src/mage/cards/s/SageOfTheInwardEye.java
View file

@ -31,7 +31,7 @@ public final class SageOfTheInwardEye extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Whenever you cast a noncreature spell, creatures you control gain lifelink until end of turn.
this.addAbility(new SpellCastControllerTriggeredAbility(
new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false),
new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, false),
StaticFilters.FILTER_SPELL_A_NON_CREATURE, false));
}

7
Mage.Sets/src/mage/cards/s/SandstoneBridge.java
View file

@ -1,4 +1,3 @@
package mage.cards.s;
import java.util.UUID;
@ -30,9 +29,9 @@ public final class SandstoneBridge extends CardImpl {
// When Sandstone Bridge enters the battlefield, target creature gets +1/+1 and gains vigilance until end of turn.
Effect effect = new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn);
effect.setText("and gains vigilance");
Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn), false);
ability.addEffect(effect);
Ability ability = new EntersBattlefieldTriggeredAbility(new BoostTargetEffect(1, 1, Duration.EndOfTurn)
.setText("target creature gets +1/+1"), false);
ability.addEffect(effect.setText("and gains vigilance until end of turn"));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);

7
Mage.Sets/src/mage/cards/s/StunningReversal.java
View file

@ -27,7 +27,7 @@ public final class StunningReversal extends CardImpl {
this.getSpellAbility().addEffect(new StunningReversalEffect());
// Exile Stunning Reversal.
this.getSpellAbility().addEffect(new ExileSpellEffect());
this.getSpellAbility().addEffect(new ExileSpellEffect().concatBy("<br>"));
}
private StunningReversal(final StunningReversal card) {
@ -79,10 +79,7 @@ class StunningReversalEffect extends ReplacementEffectImpl {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getPlayerId().equals(source.getControllerId())) {
return true;
}
return false;
return event.getPlayerId().equals(source.getControllerId());
}
}

7
Mage.Sets/src/mage/cards/v/VampiricFury.java
View file

@ -1,4 +1,3 @@
package mage.cards.v;
import java.util.UUID;
@ -30,8 +29,10 @@ public final class VampiricFury extends CardImpl {
// Vampire creatures you control get +2/+0 and gain first strike until end of turn.
this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn, vampires));
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, vampires));
this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn, vampires)
.setText("Vampire creatures you control get +2/+0"));
this.getSpellAbility().addEffect(new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn, vampires)
.setText("and gain first strike until end of turn"));
}
private VampiricFury(final VampiricFury card) {

8
Mage.Sets/src/mage/cards/w/WildHunger.java
View file

@ -1,4 +1,3 @@
package mage.cards.w;
import java.util.UUID;
@ -11,7 +10,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.TimingRule;
import mage.target.common.TargetCreaturePermanent;
/**
@ -26,8 +24,10 @@ public final class WildHunger extends CardImpl {
// Target creature gets +3/+1 and gains trample until end of turn.
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addEffect(new BoostTargetEffect(3, 1, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn));
this.getSpellAbility().addEffect(new BoostTargetEffect(3, 1, Duration.EndOfTurn)
.setText("target creature gets +3/+1"));
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)
.setText("and gains trample until end of turn"));
// Flashback {3}{R}
this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{3}{R}")));
}

3
Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java
View file

@ -1,4 +1,3 @@
package mage.cards.w;
import java.util.UUID;
@ -45,7 +44,7 @@ public final class WolfhuntersQuiver extends CardImpl {
abilityToGain = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new TapSourceCost());
abilityToGain.addTarget(new TargetCreaturePermanent(filter));
effect = new GainAbilityAttachedEffect(abilityToGain, AttachmentType.EQUIPMENT);
effect.setText("and \"{T}: This creature deals 3 damage to target Werewolf creature");
effect.setText("and \"{T}: This creature deals 3 damage to target Werewolf creature.\"");
ability.addEffect(effect);
this.addAbility(ability);

1
Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java
View file

@ -23,6 +23,7 @@ public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl {
this.setAbilityWord(AbilityWord.ENRAGE);
}
setTriggerPhrase("Whenever {this} is dealt damage, ");
this.replaceRuleText = true;
}
protected DealtDamageToSourceTriggeredAbility(final DealtDamageToSourceTriggeredAbility ability) {

2
Mage/src/main/java/mage/abilities/effects/common/LookLibraryTopCardTargetPlayerEffect.java
View file

@ -106,7 +106,7 @@ public class LookLibraryTopCardTargetPlayerEffect extends OneShotEffect {
} else {
sb.append("that card");
}
sb.append(" into their graveyard");
sb.append(" into that player's graveyard");
}
if (mayShuffleAfter) {
sb.append(". You may then have that player shuffle that library");

2
Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolSourceControllerEffect.java
View file

@ -17,7 +17,7 @@ public class AddManaToManaPoolSourceControllerEffect extends OneShotEffect {
public AddManaToManaPoolSourceControllerEffect(Mana mana) {
super(Outcome.PutManaInPool);
this.mana = mana;
this.staticText = "Add " + mana.toString() + "";
this.staticText = "add " + mana.toString() + "";
}
protected AddManaToManaPoolSourceControllerEffect(final AddManaToManaPoolSourceControllerEffect effect) {