github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-12 01:01:04 -09:00
Code Issues Projects Releases Packages Wiki Activity

[CLB] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2022-06-13 21:50:50 -04:00
parent 843d6b38be
commit f2e27148cb
10 changed files with 23 additions and 19 deletions

9
Mage.Sets/src/mage/cards/d/DrownyardTemple.java
View file

@ -1,7 +1,5 @@
package mage.cards.d;
import java.util.UUID;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
@ -11,20 +9,21 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public final class DrownyardTemple extends CardImpl {
public DrownyardTemple(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
// {T}: Add {C}.
this.addAbility(new ColorlessManaAbility());
// {3}: Return Drownyard Temple from your graveyard to the battlefield tapped.
this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true), new GenericManaCost(3)));
this.addAbility(new SimpleActivatedAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(true, false), new GenericManaCost(3)));
}
private DrownyardTemple(final DrownyardTemple card) {

9
Mage.Sets/src/mage/cards/f/FromTheCatacombs.java
View file

@ -12,7 +12,8 @@ import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.StaticFilters;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreatureCard;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
@ -25,19 +26,21 @@ import java.util.UUID;
*/
public final class FromTheCatacombs extends CardImpl {
private static final FilterCard filter = new FilterCreatureCard("creature card from a graveyard");
public FromTheCatacombs(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}{B}");
// Return target creature card from a graveyard to the battlefield with a corpse counter on it. If that creature would leave the battlefield, exile it instead of putting it anywhere else.
this.getSpellAbility().addEffect(new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(CounterType.CORPSE.createInstance()));
this.getSpellAbility().addEffect(new FromTheCatacombsEffect());
this.getSpellAbility().addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE));
this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter));
// You take the initiative.
this.getSpellAbility().addEffect(new TakeTheInitiativeEffect().concatBy("<br>"));
// Escape—{3}{B}{B}, Exile four other cards from your graveyard.
this.addAbility(new EscapeAbility(this, "{3}{B}{B}", 4));
this.addAbility(new EscapeAbility(this, "{3}{B}{B}", 5));
}
private FromTheCatacombs(final FromTheCatacombs card) {

4
Mage.Sets/src/mage/cards/h/HauntedOne.java
View file

@ -46,10 +46,10 @@ public final class HauntedOne extends CardImpl {
).setTriggerPhrase("Whenever this creature becomes tapped, ");
ability.addEffect(new GainAbilitySourceEffect(
new UndyingAbility(), Duration.EndOfTurn
).setText("and other creatures you control that share a creature type with it"));
).setText("and other creatures you control that share a creature type"));
ability.addEffect(new BoostAllEffect(
2, 0, Duration.EndOfTurn, filter, true
).setText("each get +2/+0"));
).setText("with it each get +2/+0"));
ability.addEffect(new GainAbilityAllEffect(
new UndyingAbility(), Duration.EndOfTurn, filter, true
).setText("and gain undying until end of turn"));

4
Mage.Sets/src/mage/cards/h/HornOfValhalla.java
View file

@ -25,10 +25,10 @@ public final class HornOfValhalla extends AdventureCard {
this.subtype.add(SubType.EQUIPMENT);
// Equipped creature gets +1/+1 for each other creature you control.
// Equipped creature gets +1/+1 for each creature you control.
this.addAbility(new SimpleStaticAbility(new BoostEquippedEffect(
CreaturesYouControlCount.instance, CreaturesYouControlCount.instance
)).addHint(CreaturesYouControlHint.instance));
).setText("equipped creature gets +1/+1 for each creature you control")).addHint(CreaturesYouControlHint.instance));
// Equip {3}
this.addAbility(new EquipAbility(3, false));

2
Mage.Sets/src/mage/cards/m/MajesticGenesis.java
View file

@ -45,7 +45,7 @@ class MajesticGenesisEffect extends OneShotEffect {
MajesticGenesisEffect() {
super(Outcome.Benefit);
staticText = "reveal the top X cards of your library, where X is the highest mana value of a commander " +
staticText = "reveal the top X cards of your library, where X is the greatest mana value of a commander " +
"you own on the battlefield or in the command zone. You may put any number of a permanent cards " +
"from among them onto the battlefield. Put the rest on the bottom of your library in a random order";
}

2
Mage.Sets/src/mage/cards/p/PassionateArchaeologist.java
View file

@ -83,6 +83,6 @@ enum PassionateArchaeologistValue implements DynamicValue {
@Override
public String toString() {
return "1";
return "";
}
}

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

@ -35,7 +35,7 @@ public final class SeaHag extends AdventureCard {
// Aquatic Ingress
// Up to two target creatures each get +1/+0 until end of turn and can't be blocked this turn.
this.getSpellCard().getSpellAbility().addEffect(new BoostTargetEffect(1, 0));
this.getSpellCard().getSpellAbility().addEffect(new BoostTargetEffect(1, 0).setText("up to two target creatures each get +1/+0 until end of turn"));
this.getSpellCard().getSpellAbility().addEffect(new CantBeBlockedTargetEffect().setText("and can't be blocked this turn"));
this.getSpellCard().getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2));
}

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

@ -40,7 +40,7 @@ public final class SilvanussInvoker extends CardImpl {
.withAbility(TrampleAbility.getInstance())
.withAbility(HasteAbility.getInstance()),
false, true, Duration.EndOfTurn
));
).setText("It becomes an 8/8 Elemental creature with trample and haste until end of turn. It's still a land"));
ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND));
this.addAbility(ability.withFlavorWord("Conjure Elemental"));
}

2
Mage.Sets/src/mage/cards/t/Thunderwave.java
View file

@ -35,7 +35,7 @@ public final class Thunderwave extends CardImpl {
effect.addTableEntry(10, 19, new ThunderwaveEffect());
// 20 | Thunderwave deals 6 damage to each creature your opponents control.
effect.addTableEntry(20, 20, new DamageAllEffect(6, StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE));
effect.addTableEntry(20, 20, new DamageAllEffect(6, StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE).setText("{this} deals 6 damage to each creature your opponents control"));
this.getSpellAbility().addEffect(effect);
}

6
Mage/src/main/java/mage/abilities/decorator/ConditionalInterveningIfTriggeredAbility.java
View file

@ -9,6 +9,7 @@ import mage.abilities.effects.Effects;
import mage.constants.EffectType;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.util.CardUtil;
import mage.watchers.Watcher;
import java.util.List;
@ -78,8 +79,9 @@ public class ConditionalInterveningIfTriggeredAbility extends TriggeredAbilityIm
if (abilityText == null || abilityText.isEmpty()) {
return ability.getRule();
}
return (abilityWord != null ? abilityWord.formatWord() : "") + abilityText +
(abilityText.endsWith(".") || abilityText.endsWith("\"") || abilityText.endsWith(">") ? "" : ".");
return (flavorWord != null ? CardUtil.italicizeWithEmDash(flavorWord) : "") +
(abilityWord != null ? abilityWord.formatWord() : "") +
abilityText + (abilityText.endsWith(".") || abilityText.endsWith("\"") || abilityText.endsWith(">") ? "" : ".");
}
@Override