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

updated some text that references "that creature or player"

Browse source
This commit is contained in:
Evan Kranzler 2018-04-19 14:22:10 -04:00
parent 46507f3353
commit 53e5ac86c9
16 changed files with 54 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage.Sets/src/mage/cards/a/AkoumHellkite.java
View file

@ -55,7 +55,7 @@ import java.util.UUID;
public class AkoumHellkite extends CardImpl {
public AkoumHellkite(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}");
this.subtype.add(SubType.DRAGON);
this.power = new MageInt(4);
this.toughness = new MageInt(4);
@ -82,8 +82,8 @@ public class AkoumHellkite extends CardImpl {
class AkoumHellkiteTriggeredAbility extends TriggeredAbilityImpl {
private static final String text = "<i>Landfall</i> - Whenever a land enters the battlefield under your control, {this} deals 1 damage to target creature or player. "
+ "If that land is a Mountain, Akoum Hellkite deals 2 damage to that creature or player instead.";
private static final String text = "<i>Landfall</i> - Whenever a land enters the battlefield under your control, {this} deals 1 damage to any target. "
+ "If that land is a Mountain, Akoum Hellkite deals 2 damage to that permanent or player instead.";
public AkoumHellkiteTriggeredAbility() {
super(Zone.BATTLEFIELD, new AkoumHellkiteDamageEffect());
@ -110,12 +110,13 @@ class AkoumHellkiteTriggeredAbility extends TriggeredAbilityImpl {
&& permanent.isLand()
&& permanent.getControllerId().equals(getControllerId())) {
Permanent sourcePermanent = game.getPermanent(getSourceId());
if (sourcePermanent != null)
if (sourcePermanent != null) {
for (Effect effect : getEffects()) {
if (effect instanceof AkoumHellkiteDamageEffect) {
effect.setTargetPointer(new FixedTarget(permanent, game));
if (effect instanceof AkoumHellkiteDamageEffect) {
effect.setTargetPointer(new FixedTarget(permanent, game));
}
return true;
}
return true;
}
}
return false;

4
Mage.Sets/src/mage/cards/a/ArrowStorm.java
View file

@ -51,13 +51,13 @@ public class ArrowStorm extends CardImpl {
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
new DamageTargetEffect(4),
new InvertCondition(RaidCondition.instance),
"{this} deals 4 damage to target creature or player"));
"{this} deals 4 damage to any target"));
this.getSpellAbility().addTarget(new TargetAnyTarget());
// Raid - If you attacked with a creature this turn, instead Arrow Storm deals 5 damage to that creature or player and the damage can't be prevented.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
new DamageTargetEffect(5, false),
RaidCondition.instance,
"<br/><br/><i>Raid</i> &mdash; If you attacked with a creature this turn, instead {this} deals 5 damage to that creature or player and the damage can't be prevented"));
"<br/><br/><i>Raid</i> &mdash; If you attacked with a creature this turn, instead {this} deals 5 damage to that permanent or player and the damage can't be prevented"));
this.getSpellAbility().addWatcher(new PlayerAttackedWatcher());
}

8
Mage.Sets/src/mage/cards/b/BlastOfGenius.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.cards.b;
import java.util.UUID;
@ -46,13 +45,10 @@ import mage.target.common.TargetDiscard;
*
* @author LevelX2
*/
public class BlastOfGenius extends CardImpl {
public BlastOfGenius(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U}{R}");
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{U}{R}");
// Choose target creature or player. Draw three cards and discard a card. Blast of Genius deals damage equal to the converted mana cost of the discard card to that creature or player.
this.getSpellAbility().addEffect(new BlastOfGeniusEffect());
@ -74,7 +70,7 @@ class BlastOfGeniusEffect extends OneShotEffect {
public BlastOfGeniusEffect() {
super(Outcome.Benefit);
this.staticText = "Choose target creature or player. Draw three cards and discard a card. Blast of Genius deals damage equal to the converted mana cost of the discard card to that creature or player";
this.staticText = "Choose any target. Draw three cards and discard a card. Blast of Genius deals damage equal to the converted mana cost of the discard card to that permanent or player";
}
public BlastOfGeniusEffect(final BlastOfGeniusEffect effect) {

7
Mage.Sets/src/mage/cards/b/BrimstoneVolley.java
View file

@ -47,8 +47,7 @@ import mage.watchers.common.MorbidWatcher;
public class BrimstoneVolley extends CardImpl {
public BrimstoneVolley(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}");
// Brimstone Volley deals 3 damage to target creature or player.
// Morbid - Brimstone Volley deals 5 damage to that creature or player instead if a creature died this turn.
@ -70,7 +69,7 @@ class BrimstoneVolleyEffect extends OneShotEffect {
public BrimstoneVolleyEffect() {
super(Outcome.Damage);
staticText = "{this} deals 3 damage to target creature or player.\n Morbid - {this} deals 5 damage to that creature or player instead if a creature died this turn";
staticText = "{this} deals 3 damage to any target.\n Morbid - {this} deals 5 damage to that permanent or player instead if a creature died this turn";
}
public BrimstoneVolleyEffect(final BrimstoneVolleyEffect effect) {
@ -82,7 +81,7 @@ class BrimstoneVolleyEffect extends OneShotEffect {
int damage = 3;
Watcher watcher = game.getState().getWatchers().get(MorbidWatcher.class.getSimpleName());
if (watcher.conditionMet()) {
damage = 5;
damage = 5;
}
Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source));
if (permanent != null) {

8
Mage.Sets/src/mage/cards/b/BurstLightning.java
View file

@ -24,8 +24,7 @@
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
*/
package mage.cards.b;
import java.util.UUID;
@ -45,8 +44,7 @@ import mage.target.common.TargetAnyTarget;
public class BurstLightning extends CardImpl {
public BurstLightning(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{R}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}");
// Kicker {4} (You may pay an additional {4} as you cast this spell.)
this.addAbility(new KickerAbility("{4}"));
@ -54,7 +52,7 @@ public class BurstLightning extends CardImpl {
// Burst Lightning deals 2 damage to target creature or player. If Burst Lightning was kicked, it deals 4 damage to that creature or player instead.
this.getSpellAbility().addTarget(new TargetAnyTarget());
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(4),
new DamageTargetEffect(2), KickedCondition.instance, "{this} deals 2 damage to target creature or player. If {this} was kicked, it deals 4 damage to that creature or player instead"));
new DamageTargetEffect(2), KickedCondition.instance, "{this} deals 2 damage to any target. If {this} was kicked, it deals 4 damage to that permanent or player instead"));
}
public BurstLightning(final BurstLightning card) {

10
Mage.Sets/src/mage/cards/c/CacklingFlames.java
View file

@ -44,21 +44,19 @@ import mage.target.common.TargetAnyTarget;
public class CacklingFlames extends CardImpl {
public CacklingFlames(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}");
// Cackling Flames deals 3 damage to target creature or player.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
new DamageTargetEffect(3),
new InvertCondition(HellbentCondition.instance),
"{this} deals 3 damage to target creature or player"));
"{this} deals 3 damage to any target"));
// Hellbent - Cackling Flames deals 5 damage to that creature or player instead if you have no cards in hand.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
new DamageTargetEffect(5),
HellbentCondition.instance,
"<br/><br/><i>Hellbent</i> - {this} deals 5 damage to that creature or player instead if you have no cards in hand."));
"<br/><br/><i>Hellbent</i> - {this} deals 5 damage to that permanent or player instead if you have no cards in hand."));
this.getSpellAbility().addTarget(new TargetAnyTarget());
}

6
Mage.Sets/src/mage/cards/c/CratersClaws.java
View file

@ -45,7 +45,7 @@ import mage.target.common.TargetAnyTarget;
public class CratersClaws extends CardImpl {
public CratersClaws(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{R}");
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{R}");
// Crater's Claws deals X damage to target creature or player.
// <i>Ferocious</i> - Crater's Claws deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater.
@ -53,8 +53,8 @@ public class CratersClaws extends CardImpl {
new DamageTargetEffect(new IntPlusDynamicValue(2, new ManacostVariableValue())),
new DamageTargetEffect(new ManacostVariableValue()),
FerociousCondition.instance,
"{this} deals X damage to target creature or player." +
"<br><i>Ferocious</i> &mdash; {this} deals X plus 2 damage to that creature or player instead if you control a creature with power 4 or greater"));
"{this} deals X damage to any target."
+ "<br><i>Ferocious</i> &mdash; {this} deals X plus 2 damage to that permanent or player instead if you control a creature with power 4 or greater"));
this.getSpellAbility().addTarget(new TargetAnyTarget());
}

4
Mage.Sets/src/mage/cards/e/ErraticExplosion.java
View file

@ -49,7 +49,7 @@ import mage.target.common.TargetAnyTarget;
public class ErraticExplosion extends CardImpl {
public ErraticExplosion(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}");
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}");
// Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. Erratic Explosion deals damage equal to that card's converted mana cost to that creature or player. Put the revealed cards on the bottom of your library in any order.
this.getSpellAbility().addTarget(new TargetAnyTarget());
@ -70,7 +70,7 @@ class ErraticExplosionEffect extends OneShotEffect {
public ErraticExplosionEffect() {
super(Outcome.Damage);
this.staticText = "Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card. {this} deals damage equal to that card's converted mana cost to that creature or player. Put the revealed cards on the bottom of your library in any order";
this.staticText = "Choose any target. Reveal cards from the top of your library until you reveal a nonland card. {this} deals damage equal to that card's converted mana cost to that permanent or player. Put the revealed cards on the bottom of your library in any order";
}
public ErraticExplosionEffect(ErraticExplosionEffect effect) {

2
Mage.Sets/src/mage/cards/e/ExplosiveRevelation.java
View file

@ -72,7 +72,7 @@ class ExplosiveRevelationEffect extends OneShotEffect {
public ExplosiveRevelationEffect() {
super(Outcome.DrawCard);
this.staticText = "Choose target creature or player. Reveal cards from the top of your library until you reveal a nonland card, {this} deals damage equal to that card's converted mana cost to that creature or player. Put the nonland card into your hand and the rest on the bottom of your library in any order";
this.staticText = "Choose any target. Reveal cards from the top of your library until you reveal a nonland card, {this} deals damage equal to that card's converted mana cost to that permanent or player. Put the nonland card into your hand and the rest on the bottom of your library in any order";
}
public ExplosiveRevelationEffect(final ExplosiveRevelationEffect effect) {

2
Mage.Sets/src/mage/cards/g/GalvanicBlast.java
View file

@ -42,7 +42,7 @@ import mage.target.common.TargetAnyTarget;
*/
public class GalvanicBlast extends CardImpl {
private static final String effectText = "{this} deals 2 damage to target creature or player.<br>Metalcraft - {this} deals 4 damage to that creature or player instead if you control three or more artifacts";
private static final String effectText = "{this} deals 2 damage to anytarget.<br>Metalcraft - {this} deals 4 damage to that permanent or player instead if you control three or more artifacts";
public GalvanicBlast(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}");

2
Mage.Sets/src/mage/cards/g/GuardianAngel.java
View file

@ -78,7 +78,7 @@ class GuardianAngelEffect extends OneShotEffect {
public GuardianAngelEffect() {
super(Outcome.Benefit);
this.staticText = "Prevent the next X damage that would be dealt to target creature or player this turn. Until end of turn, you may pay {1} any time you could cast an instant. If you do, prevent the next 1 damage that would be dealt to that creature or player this turn";
this.staticText = "Prevent the next X damage that would be dealt to any target this turn. Until end of turn, you may pay {1} any time you could cast an instant. If you do, prevent the next 1 damage that would be dealt to that permanent or player this turn";
}
public GuardianAngelEffect(final GuardianAngelEffect effect) {

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

@ -51,7 +51,7 @@ import mage.target.common.TargetAnyTarget;
public class HereticsPunishment extends CardImpl {
public HereticsPunishment(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{R}");
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{R}");
// {3}{R}: Choose target creature or player, then put the top three cards of your library into your graveyard. Heretic's Punishment deals damage to that creature or player equal to the highest converted mana cost among those cards.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HereticsPunishmentEffect(), new ManaCostsImpl("{3}{R}"));
@ -73,7 +73,7 @@ class HereticsPunishmentEffect extends OneShotEffect {
public HereticsPunishmentEffect() {
super(Outcome.Damage);
staticText = "Choose target creature or player, then put the top three cards of your library into your graveyard. {this} deals damage to that creature or player equal to the highest converted mana cost among those cards";
staticText = "Choose any target, then put the top three cards of your library into your graveyard. {this} deals damage to that permanent or player equal to the highest converted mana cost among those cards";
}
public HereticsPunishmentEffect(final HereticsPunishmentEffect effect) {

12
Mage.Sets/src/mage/cards/l/LightningSurge.java
View file

@ -47,17 +47,17 @@ import mage.target.common.TargetAnyTarget;
public class LightningSurge extends CardImpl {
public LightningSurge(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}");
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}{R}");
// Lightning Surge deals 4 damage to target creature or player.
// Threshold - If seven or more cards are in your graveyard, instead Lightning Surge deals 6 damage to that creature or player and the damage can't be prevented.
Effect effect = new ConditionalOneShotEffect(new DamageTargetEffect(6, false),
new DamageTargetEffect(4),
new CardsInControllerGraveCondition(7),
"{this} deals 4 damage to target creature or player.<br/><br/><i>Threshold</i> - {this} deals 6 damage to that creature or player and the damage can't be prevented instead if seven or more cards are in your graveyard.");
Effect effect = new ConditionalOneShotEffect(new DamageTargetEffect(6, false),
new DamageTargetEffect(4),
new CardsInControllerGraveCondition(7),
"{this} deals 4 damage to any target.<br/><br/><i>Threshold</i> - {this} deals 6 damage to that permanent or player and the damage can't be prevented instead if seven or more cards are in your graveyard.");
this.getSpellAbility().addTarget(new TargetAnyTarget());
this.getSpellAbility().addEffect(effect);
// Flashback {5}{R}{R}
this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{R}{R}"), TimingRule.SORCERY));
}

8
Mage.Sets/src/mage/cards/o/OrimsTouch.java
View file

@ -47,7 +47,7 @@ import mage.target.common.TargetAnyTarget;
public class OrimsTouch extends CardImpl {
public OrimsTouch(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{W}");
// Kicker {1}
this.addAbility(new KickerAbility("{1}"));
@ -57,11 +57,11 @@ public class OrimsTouch extends CardImpl {
new PreventDamageToTargetEffect(Duration.EndOfTurn, 4),
new LockedInCondition(KickedCondition.instance),
new PreventDamageToTargetEffect(Duration.EndOfTurn, 2));
effect.setText("Prevent the next 2 damage that would be dealt to target creature or player this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead");
effect.setText("Prevent the next 2 damage that would be dealt to any target this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that permanent or player this turn instead");
this.getSpellAbility().addTarget(new TargetAnyTarget());
this.getSpellAbility().addEffect(effect);
}
public OrimsTouch(final OrimsTouch card) {
super(card);
}
@ -70,4 +70,4 @@ public class OrimsTouch extends CardImpl {
public OrimsTouch copy() {
return new OrimsTouch(this);
}
}
}

21
Mage.Sets/src/mage/cards/r/RiddleOfLightning.java
View file

@ -50,15 +50,14 @@ import mage.target.common.TargetAnyTarget;
public class RiddleOfLightning extends CardImpl {
public RiddleOfLightning(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{R}{R}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}{R}");
// Choose target creature or player. Scry 3, then reveal the top card of your library. Riddle of Lightning deals damage equal to that card's converted mana cost to that creature or player.
this.getSpellAbility().addTarget(new TargetAnyTarget());
Effect effect = new ScryEffect(3);
effect.setText("Choose target creature or player. Scry 3");
effect.setText("Choose any target. Scry 3");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addEffect(new RiddleOfLightningEffect());
this.getSpellAbility().addEffect(new RiddleOfLightningEffect());
}
public RiddleOfLightning(final RiddleOfLightning card) {
@ -72,21 +71,21 @@ public class RiddleOfLightning extends CardImpl {
}
class RiddleOfLightningEffect extends OneShotEffect {
public RiddleOfLightningEffect() {
super(Outcome.Damage);
this.staticText = ", then reveal the top card of your library. {this} deals damage equal to that card's converted mana cost to that creature or player";
this.staticText = ", then reveal the top card of your library. {this} deals damage equal to that card's converted mana cost to that permanent or player";
}
public RiddleOfLightningEffect(final RiddleOfLightningEffect effect) {
super(effect);
}
@Override
public RiddleOfLightningEffect copy() {
return new RiddleOfLightningEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
@ -104,8 +103,8 @@ class RiddleOfLightningEffect extends OneShotEffect {
if (targetPlayer != null) {
targetPlayer.damage(card.getConvertedManaCost(), source.getSourceId(), game, false, true);
return true;
}
}
}
}
return true;
}
return false;

4
Mage.Sets/src/mage/cards/u/UrzasRage.java
View file

@ -49,7 +49,7 @@ import mage.target.common.TargetAnyTarget;
public class UrzasRage extends CardImpl {
public UrzasRage(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}");
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{R}");
// Kicker {8}{R}
this.addAbility(new KickerAbility("{8}{R}"));
@ -64,7 +64,7 @@ public class UrzasRage extends CardImpl {
// Urza's Rage deals 3 damage to target creature or player. If Urza's Rage was kicked, instead it deals 10 damage to that creature or player and the damage can't be prevented.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetEffect(10, false),
new DamageTargetEffect(3), KickedCondition.instance,
"{this} deals 3 damage to target creature or player. If {this} was kicked, instead it deals 10 damage to that creature or player and the damage can't be prevented."));
"{this} deals 3 damage to any target. If {this} was kicked, instead it deals 10 damage to that permanent or player and the damage can't be prevented."));
this.getSpellAbility().addTarget(new TargetAnyTarget());
}