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

remove unneeded methods from DamageTargetEffect

Browse source 
minor cleanup to Sentinel Tower, Tephraderm

(see #11111)
This commit is contained in:
xenohedron 2025-11-17 23:26:02 -05:00
parent aa1e2342e4
commit 2893fb43fc
3 changed files with 12 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage.Sets/src/mage/cards/s/SentinelTower.java
View file

@ -5,7 +5,7 @@ import mage.MageObjectReference;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SpellCastAllTriggeredAbility; import mage.abilities.common.SpellCastAllTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.dynamicvalue.common.SavedDamageValue;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.hint.ValueHint; import mage.abilities.hint.ValueHint;
@ -50,7 +50,7 @@ class SentinelTowerTriggeredAbility extends SpellCastAllTriggeredAbility {
private String damageInfo; private String damageInfo;
SentinelTowerTriggeredAbility() { SentinelTowerTriggeredAbility() {
super(new DamageTargetEffect(0), StaticFilters.FILTER_SPELL_AN_INSTANT_OR_SORCERY, false); super(new DamageTargetEffect(SavedDamageValue.MUCH), StaticFilters.FILTER_SPELL_AN_INSTANT_OR_SORCERY, false);
this.addTarget(new TargetAnyTarget()); this.addTarget(new TargetAnyTarget());
this.addHint(new ValueHint("There were cast instant and sorcery this turn", SentinelTowerSpellsCastValue.instance)); this.addHint(new ValueHint("There were cast instant and sorcery this turn", SentinelTowerSpellsCastValue.instance));
this.damageInfo = null; this.damageInfo = null;
@ -87,12 +87,7 @@ class SentinelTowerTriggeredAbility extends SpellCastAllTriggeredAbility {
} }
} }
damageInfo = " (<b>" + damageToDeal + " damage</b>)"; damageInfo = " (<b>" + damageToDeal + " damage</b>)";
for (Effect effect : this.getEffects()) { this.getEffects().setValue("damage", damageToDeal);
if (effect instanceof DamageTargetEffect) {
((DamageTargetEffect) effect).setAmount(StaticValue.get(damageToDeal));
return true;
}
}
} }
return false; return false;
} }
@ -166,4 +161,4 @@ enum SentinelTowerSpellsCastValue implements DynamicValue {
public String getMessage() { public String getMessage() {
return "There was an instant or sorcery spell in this turn"; return "There was an instant or sorcery spell in this turn";
} }
} }

19
Mage.Sets/src/mage/cards/t/Tephraderm.java
View file

@ -4,8 +4,6 @@ import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.DealsDamageToThisAllTriggeredAbility; import mage.abilities.common.DealsDamageToThisAllTriggeredAbility;
import mage.abilities.dynamicvalue.common.SavedDamageValue; import mage.abilities.dynamicvalue.common.SavedDamageValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
@ -57,7 +55,8 @@ public final class Tephraderm extends CardImpl {
class TephradermSpellDamageTriggeredAbility extends TriggeredAbilityImpl { class TephradermSpellDamageTriggeredAbility extends TriggeredAbilityImpl {
TephradermSpellDamageTriggeredAbility() { TephradermSpellDamageTriggeredAbility() {
super(Zone.BATTLEFIELD, new DamageTargetEffect(0)); super(Zone.BATTLEFIELD, new DamageTargetEffect(SavedDamageValue.MUCH).withTargetDescription("that spell's controller"));
setTriggerPhrase("Whenever a spell deals damage to {this}, ");
} }
private TephradermSpellDamageTriggeredAbility(final TephradermSpellDamageTriggeredAbility ability) { private TephradermSpellDamageTriggeredAbility(final TephradermSpellDamageTriggeredAbility ability) {
@ -74,18 +73,12 @@ class TephradermSpellDamageTriggeredAbility extends TriggeredAbilityImpl {
if (!event.getTargetId().equals(this.getSourceId())) { if (!event.getTargetId().equals(this.getSourceId())) {
return false; return false;
} }
StackObject sourceSpell = game.getStack().getStackObject(event.getSourceId()); StackObject sourceSpell = game.getStack().getStackObject(event.getSourceId());
if (sourceSpell != null && StaticFilters.FILTER_SPELL.match(sourceSpell, getControllerId(), this, game)) { if (sourceSpell != null && StaticFilters.FILTER_SPELL.match(sourceSpell, getControllerId(), this, game)) {
for (Effect effect : getEffects()) { this.getEffects().setTargetPointer(new FixedTarget(sourceSpell.getControllerId()));
if (effect instanceof DamageTargetEffect) { this.getEffects().setValue("damage", event.getAmount());
effect.setTargetPointer(new FixedTarget(sourceSpell.getControllerId()));
((DamageTargetEffect) effect).setAmount(StaticValue.get(event.getAmount()));
}
}
return true; return true;
} }
return false; return false;
} }
@ -94,8 +87,4 @@ class TephradermSpellDamageTriggeredAbility extends TriggeredAbilityImpl {
return new TephradermSpellDamageTriggeredAbility(this); return new TephradermSpellDamageTriggeredAbility(this);
} }
@Override
public String getRule() {
return "Whenever a spell deals damage to {this}, {this} deals that much damage to that spell's controller.";
}
} }

20
Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
View file

@ -20,10 +20,10 @@ import java.util.UUID;
*/ */
public class DamageTargetEffect extends OneShotEffect { public class DamageTargetEffect extends OneShotEffect {
protected DynamicValue amount; private final DynamicValue amount;
protected boolean preventable; private final boolean preventable;
protected String targetDescription; private String targetDescription;
protected String sourceName = "{this}"; private String sourceName = "{this}";
public DamageTargetEffect(int amount) { public DamageTargetEffect(int amount) {
this(StaticValue.get(amount), true); this(StaticValue.get(amount), true);
@ -67,18 +67,6 @@ public class DamageTargetEffect extends OneShotEffect {
this.targetDescription = targetDescription; this.targetDescription = targetDescription;
} }
public int getAmount() {
if (amount instanceof StaticValue) {
return amount.calculate(null, null, this);
} else {
return 0;
}
}
public void setAmount(DynamicValue amount) {
this.amount = amount;
}
protected DamageTargetEffect(final DamageTargetEffect effect) { protected DamageTargetEffect(final DamageTargetEffect effect) {
super(effect); super(effect);
this.amount = effect.amount.copy(); this.amount = effect.amount.copy();