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

simplify ConditionalActivatedAbility constructors more

Browse source
This commit is contained in:
theelk801 2025-06-18 15:42:18 -04:00
parent 84dc2a27ab
commit fe1b01114f
3 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/cards/a/ArmageddonClock.java
View file

@ -12,7 +12,10 @@ import mage.abilities.triggers.BeginningOfDrawTriggeredAbility;
import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility; import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.PhaseStep;
import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import java.util.UUID; import java.util.UUID;
@ -38,9 +41,8 @@ public final class ArmageddonClock extends CardImpl {
// {4}: Remove a doom counter from Armageddon Clock. Any player may activate this ability but only during any upkeep step. // {4}: Remove a doom counter from Armageddon Clock. Any player may activate this ability but only during any upkeep step.
this.addAbility(new ConditionalActivatedAbility( this.addAbility(new ConditionalActivatedAbility(
Zone.BATTLEFIELD, new RemoveCounterSourceEffect(CounterType.DOOM.createInstance()), new GenericManaCost(4), new RemoveCounterSourceEffect(CounterType.DOOM.createInstance()), new GenericManaCost(4), condition
condition, "any player may activate this ability but only during any upkeep step" ).withConditionText("any player may activate this ability but only during any upkeep step").setMayActivate(TargetController.ANY));
).setMayActivate(TargetController.ANY));
} }
private ArmageddonClock(final ArmageddonClock card) { private ArmageddonClock(final ArmageddonClock card) {

6
Mage.Sets/src/mage/cards/s/SkarrganHellkite.java
View file

@ -13,7 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.target.common.TargetAnyTargetAmount; import mage.target.common.TargetAnyTargetAmount;
@ -41,9 +40,8 @@ public final class SkarrganHellkite extends CardImpl {
// {3}{R}: Skarrgan Hellkite deals 2 damage divided as you choose among one or two targets. Activate this ability only if Skarrgan Hellkite has a +1/+1 counter on it. // {3}{R}: Skarrgan Hellkite deals 2 damage divided as you choose among one or two targets. Activate this ability only if Skarrgan Hellkite has a +1/+1 counter on it.
Ability ability = new ConditionalActivatedAbility( Ability ability = new ConditionalActivatedAbility(
Zone.BATTLEFIELD, new DamageMultiEffect(), new ManaCostsImpl<>("{3}{R}"), new DamageMultiEffect(), new ManaCostsImpl<>("{3}{R}"), condition
condition, "activate only if {this} has a +1/+1 counter on it" ).withConditionText("activate only if {this} has a +1/+1 counter on it");
);
ability.addTarget(new TargetAnyTargetAmount(2)); ability.addTarget(new TargetAnyTargetAmount(2));
this.addAbility(ability); this.addAbility(ability);
} }

35
Mage/src/main/java/mage/abilities/decorator/ConditionalActivatedAbility.java
View file

@ -18,27 +18,20 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
private static final Effects emptyEffects = new Effects(); private static final Effects emptyEffects = new Effects();
private final String conditionText; private String conditionText = null;
private boolean showCondition = true;
public ConditionalActivatedAbility(Effect effect, Cost cost, Condition condition) { public ConditionalActivatedAbility(Effect effect, Cost cost, Condition condition) {
this(Zone.BATTLEFIELD, effect, cost, condition); this(Zone.BATTLEFIELD, effect, cost, condition);
} }
public ConditionalActivatedAbility(Zone zone, Effect effect, Cost cost, Condition condition) { public ConditionalActivatedAbility(Zone zone, Effect effect, Cost cost, Condition condition) {
this(zone, effect, cost, condition, null);
}
public ConditionalActivatedAbility(Zone zone, Effect effect, Cost cost, Condition condition, String conditionText) {
super(zone, effect, cost); super(zone, effect, cost);
this.condition = condition; this.condition = condition;
this.conditionText = conditionText;
} }
protected ConditionalActivatedAbility(final ConditionalActivatedAbility ability) { protected ConditionalActivatedAbility(final ConditionalActivatedAbility ability) {
super(ability); super(ability);
this.conditionText = ability.conditionText; this.conditionText = ability.conditionText;
this.showCondition = ability.showCondition;
} }
@Override @Override
@ -55,7 +48,11 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
} }
public ConditionalActivatedAbility hideCondition() { public ConditionalActivatedAbility hideCondition() {
this.showCondition = false; return withConditionText("");
}
public ConditionalActivatedAbility withConditionText(String conditionText) {
this.conditionText = conditionText;
return this; return this;
} }
@ -68,18 +65,16 @@ public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
return super.getRule() + ' ' + CardUtil.getTextWithFirstCharUpperCase(conditionText) + '.'; return super.getRule() + ' ' + CardUtil.getTextWithFirstCharUpperCase(conditionText) + '.';
} }
StringBuilder sb = new StringBuilder(super.getRule()); StringBuilder sb = new StringBuilder(super.getRule());
if (showCondition) { sb.append(" Activate only ");
sb.append(" Activate only "); if (timing == TimingRule.SORCERY) {
if (timing == TimingRule.SORCERY) { sb.append("as a sorcery and only ");
sb.append("as a sorcery and only ");
}
String conditionText = condition.toString();
if (!conditionText.startsWith("during") && !conditionText.startsWith("before") && !conditionText.startsWith("if")) {
sb.append("if ");
}
sb.append(conditionText);
sb.append('.');
} }
String conditionText = condition.toString();
if (!conditionText.startsWith("during") && !conditionText.startsWith("before") && !conditionText.startsWith("if")) {
sb.append("if ");
}
sb.append(conditionText);
sb.append('.');
return sb.toString(); return sb.toString();
} }
} }