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

Fix 'C' cards with card name instead of {this}

Browse source 
Cyclone effect full text replacement
This commit is contained in:
Steven Knipe 2025-06-21 21:30:17 -07:00
parent 4a59c16b2a
commit c59f5fedbd
11 changed files with 29 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/cards/c/CanalDredger.java
View file

@ -1,7 +1,6 @@
package mage.cards.c;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
@ -16,6 +15,8 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.target.common.TargetCardInYourGraveyard;
import java.util.UUID;
/**
*
* @author L_J
@ -31,7 +32,7 @@ public final class CanalDredger extends CardImpl {
// TODO: Draft specific abilities not implemented
// Draft Canal Dredger face up.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Draft Canal Dredger face up - not implemented.")));
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Draft {this} face up - not implemented.")));
// Each player passes the last card from each booster pack to a player who drafted a card named Canal Dredger.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Each player passes the last card from each booster pack to a player who drafted a card named Canal Dredger - not implemented.")));

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

@ -10,7 +10,6 @@ import mage.constants.Outcome;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.players.Player;
import mage.target.TargetPlayer;
import mage.watchers.Watcher;
@ -48,7 +47,7 @@ class CerebralVortexEffect extends OneShotEffect {
CerebralVortexEffect() {
super(Outcome.Damage);
this.staticText = ", then Cerebral Vortex deals damage to that player equal to the number of cards they've drawn this turn";
this.staticText = ", then {this} deals damage to that player equal to the number of cards they've drawn this turn";
}
private CerebralVortexEffect(final CerebralVortexEffect effect) {

9
Mage.Sets/src/mage/cards/c/Cetavolver.java
View file

@ -1,7 +1,6 @@
package mage.cards.c;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.common.KickedCostCondition;
@ -14,10 +13,12 @@ import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.SubType;
import mage.counters.CounterType;
import java.util.UUID;
/**
*
* @author Loki
@ -39,7 +40,7 @@ public final class Cetavolver extends CardImpl {
// If Cetavolver was kicked with its {1}{R} kicker, it enters with two +1/+1 counters on it and with first strike.
EntersBattlefieldAbility ability1 = new EntersBattlefieldAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance(2),false),
new KickedCostCondition("{1}{R}"), "If Cetavolver was kicked with its {1}{R} kicker, it enters with two +1/+1 counters on it and with first strike.",
new KickedCostCondition("{1}{R}"), "If {this} was kicked with its {1}{R} kicker, it enters with two +1/+1 counters on it and with first strike.",
"{this} enters with two +1/+1 counters on it and with first strike");
((EntersBattlefieldEffect)ability1.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield));
this.addAbility(ability1);
@ -47,7 +48,7 @@ public final class Cetavolver extends CardImpl {
// If Cetavolver was kicked with its {G} kicker, it enters with a +1/+1 counter on it and with trample.
EntersBattlefieldAbility ability2 = new EntersBattlefieldAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance(1),false), new KickedCostCondition("{G}"),
"If Cetavolver was kicked with its {G} kicker, it enters with a +1/+1 counter on it and with trample.",
"If {this} was kicked with its {G} kicker, it enters with a +1/+1 counter on it and with trample.",
"{this} enters with a +1/+1 counter on it and with trample");
((EntersBattlefieldEffect)ability2.getEffects().get(0)).addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield));
this.addAbility(ability2);

5
Mage.Sets/src/mage/cards/c/CoalitionRelic.java
View file

@ -3,18 +3,17 @@ package mage.cards.c;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.triggers.BeginningOfFirstMainTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.mana.AnyColorManaAbility;
import mage.abilities.triggers.BeginningOfFirstMainTriggeredAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.choices.ChoiceColor;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -52,7 +51,7 @@ class CoalitionRelicEffect extends OneShotEffect {
CoalitionRelicEffect() {
super(Outcome.PutManaInPool);
this.staticText = "remove all charge counters from Coalition Relic. Add one mana of any color for each charge counter removed this way";
this.staticText = "remove all charge counters from {this}. Add one mana of any color for each charge counter removed this way";
}
private CoalitionRelicEffect(final CoalitionRelicEffect effect) {

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

@ -1,15 +1,16 @@
package mage.cards.c;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.InfoEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.InfoEffect;
import java.util.UUID;
/**
*
@ -27,12 +28,12 @@ public final class CogworkLibrarian extends CardImpl {
// TODO: Draft specific abilities not implemented
// Draft Cogwork Librarian face up.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Draft Cogwork Librarian face up - not implemented.")));
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Draft {this} face up - not implemented.")));
// As you draft a card, you may draft an additional card from that booster pack. If you do, put Cogwork Librarian into that booster pack.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("As you draft a card, "
+ "you may draft an additional card from that booster pack. If you do, "
+ "put Cogwork Librarian into that booster pack - not implemented.")));
+ "put {this} into that booster pack - not implemented.")));
}
private CogworkLibrarian(final CogworkLibrarian card) {

2
Mage.Sets/src/mage/cards/c/CogworkSpy.java
View file

@ -28,7 +28,7 @@ public final class CogworkSpy extends CardImpl {
// TODO: Draft specific abilities not implemented
// Reveal Cogwork Spy as you draft it. You may look at the next card drafted from this booster pack.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Reveal Cogwork Spy as you draft it. "
this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("Reveal {this} as you draft it. "
+ "You may look at the next card drafted from this booster pack - not implemented.")));
// Flying

2
Mage.Sets/src/mage/cards/c/CometStellarPup.java
View file

@ -76,7 +76,7 @@ class CometStellarPupAbility extends OneShotEffect {
+ "1 or 2 &mdash; [+2], then create two 1/1 green Squirrel creature tokens. They gain haste until end of turn.<br>"
+ "3 &mdash; [-1], then return a card with mana value 2 or less from your graveyard to your hand.<br>"
+ "4 or 5 &mdash; {this} deals damage equal to the number of loyalty counters on him to a creature or player, then [-2].<br>"
+ "6 &mdash; [+1], and you may activate Comet, Stellar Pup's loyalty ability two more times this turn.";
+ "6 &mdash; [+1], and you may activate {this}'s loyalty ability two more times this turn.";
}
private CometStellarPupAbility(final CometStellarPupAbility effect) {

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

@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.filter.StaticFilters;
import mage.game.ExileZone;
import mage.game.Game;
@ -64,7 +63,7 @@ class CreepingInnEffect extends OneShotEffect {
super(Outcome.Exile);
this.staticText = "you may exile a creature card from your graveyard. " +
"If you do, each opponent loses X life and you gain X life, " +
"where X is the number of creature cards exiled with Creeping Inn.";
"where X is the number of creature cards exiled with {this}.";
}
private CreepingInnEffect(final CreepingInnEffect effect) {

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

@ -1,7 +1,6 @@
package mage.cards.c;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
@ -15,14 +14,12 @@ import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.effects.common.LookLibraryControllerEffect;
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
import mage.cards.*;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.constants.*;
import mage.game.Game;
import mage.players.Player;
import java.util.UUID;
/**
*
* @author LevelX2
@ -57,7 +54,7 @@ class CruelDeceiverEffect extends OneShotEffect {
CruelDeceiverEffect() {
super(Outcome.AddAbility);
this.staticText = "Reveal the top card of your library. If it's a land card, {this} gains \"Whenever Cruel Deceiver deals damage to a creature, destroy that creature\" until end of turn";
this.staticText = "Reveal the top card of your library. If it's a land card, {this} gains \"Whenever {this} deals damage to a creature, destroy that creature\" until end of turn";
}
private CruelDeceiverEffect(final CruelDeceiverEffect effect) {

2
Mage.Sets/src/mage/cards/c/CultivatorOfBlades.java
View file

@ -32,7 +32,7 @@ public final class CultivatorOfBlades extends CardImpl {
// Whenever Cultivator of Blades attacks, you may have other attacking creatures get +X/+X until end of turn, where X is Cultivator of Blades's power.
this.addAbility(new AttacksTriggeredAbility(new BoostControlledEffect(SourcePermanentPowerValue.NOT_NEGATIVE, SourcePermanentPowerValue.NOT_NEGATIVE, Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES, true),
true, "Whenever Cultivator of Blades attacks, you may have other attacking creatures get +X/+X until end of turn, where X is Cultivator of Blades's power."));
true, "Whenever Cultivator of Blades attacks, you may have other attacking creatures get +X/+X until end of turn, where X is {this}'s power."));
}
private CultivatorOfBlades(final CultivatorOfBlades card) {

7
Mage.Sets/src/mage/cards/c/Cyclone.java
View file

@ -1,14 +1,13 @@
package mage.cards.c;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.costs.Cost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DamageEverythingEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
@ -18,6 +17,8 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.UUID;
/**
@ -48,7 +49,7 @@ class CycloneEffect extends OneShotEffect {
CycloneEffect() {
super(Outcome.Damage);
this.staticText = "Pay Green Mana for each counter to damage everything or sacrifice Cyclone.";
this.staticText = ", then sacrifice {this} unless you pay {G} for each wind counter on it. If you pay, {this} deals damage equal to the number of wind counters on it to each creature and each player";
}
private CycloneEffect(final CycloneEffect effect) {