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

[SPM] Implement Skyward Spider

Browse source
This commit is contained in:
theelk801 2025-09-03 10:11:17 -04:00
parent cf586d0b8f
commit 9b295448cd
5 changed files with 87 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage.Sets/src/mage/cards/i/IanTheReckless.java
View file

@ -3,8 +3,7 @@ package mage.cards.i;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.SourceMatchesFilterCondition;
import mage.abilities.condition.common.SourceModifiedCondition;
import mage.abilities.dynamicvalue.common.SourcePermanentPowerValue;
import mage.abilities.effects.common.DamageControllerEffect;
import mage.abilities.effects.common.DamageTargetEffect;
@ -13,8 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ModifiedPredicate;
import mage.target.common.TargetAnyTarget;
import java.util.UUID;
@ -24,14 +21,6 @@ import java.util.UUID;
*/
public final class IanTheReckless extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("it's modified");
static {
filter.add(ModifiedPredicate.instance);
}
private static final Condition condition = new SourceMatchesFilterCondition(filter);
public IanTheReckless(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}");
@ -42,8 +31,10 @@ public final class IanTheReckless extends CardImpl {
this.toughness = new MageInt(1);
// Whenever Ian the Reckless attacks, if it's modified, you may have it deal damage equal to its power to you and any target.
Ability ability = new AttacksTriggeredAbility(new DamageControllerEffect(SourcePermanentPowerValue.NOT_NEGATIVE)
.setText("have it deal damage equal to its power to you"), true).withInterveningIf(condition);
Ability ability = new AttacksTriggeredAbility(
new DamageControllerEffect(SourcePermanentPowerValue.NOT_NEGATIVE)
.setText("have it deal damage equal to its power to you"), true
).withInterveningIf(SourceModifiedCondition.instance);
ability.addEffect(new DamageTargetEffect(SourcePermanentPowerValue.NOT_NEGATIVE).setText("and any target"));
ability.addTarget(new TargetAnyTarget());
this.addAbility(ability);

15
Mage.Sets/src/mage/cards/o/OrochiMergeKeeper.java
View file

@ -3,8 +3,7 @@ package mage.cards.o;
import mage.MageInt;
import mage.Mana;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.SourceMatchesFilterCondition;
import mage.abilities.condition.common.SourceModifiedCondition;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
@ -15,8 +14,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ModifiedPredicate;
import java.util.UUID;
@ -25,14 +22,6 @@ import java.util.UUID;
*/
public final class OrochiMergeKeeper extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent();
static {
filter.add(ModifiedPredicate.instance);
}
private static final Condition condition = new SourceMatchesFilterCondition(filter);
public OrochiMergeKeeper(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}");
@ -48,7 +37,7 @@ public final class OrochiMergeKeeper extends CardImpl {
this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
new GainAbilitySourceEffect(new SimpleManaAbility(
Zone.BATTLEFIELD, Mana.GreenMana(2), new TapSourceCost()
)), condition, "as long as {this} is modified, it has \"{T}: Add {G}{G}.\""
)), SourceModifiedCondition.instance, "as long as {this} is modified, it has \"{T}: Add {G}{G}.\""
)));
}

51
Mage.Sets/src/mage/cards/s/SkywardSpider.java Normal file
View file

@ -0,0 +1,51 @@
package mage.cards.s;
import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.SourceModifiedCondition;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.WardAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.SubType;
import java.util.UUID;
/**
* @author TheElk801
*/
public final class SkywardSpider extends CardImpl {
public SkywardSpider(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W/U}{W/U}");
this.subtype.add(SubType.SPIDER);
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.HERO);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
// Ward {2}
this.addAbility(new WardAbility(new ManaCostsImpl<>("{2}")));
// This creature has flying as long as it's modified.
this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield),
SourceModifiedCondition.instance, "{this} has flying as long as it's modified"
)));
}
private SkywardSpider(final SkywardSpider card) {
super(card);
}
@Override
public SkywardSpider copy() {
return new SkywardSpider(this);
}
}

1
Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
View file

@ -126,6 +126,7 @@ public final class MarvelsSpiderMan extends ExpansionSet {
cards.add(new SetCardInfo("Selfless Police Captain", 12, Rarity.COMMON, mage.cards.s.SelflessPoliceCaptain.class));
cards.add(new SetCardInfo("Shock", 88, Rarity.COMMON, mage.cards.s.Shock.class));
cards.add(new SetCardInfo("Shocker, Unshakable", 89, Rarity.UNCOMMON, mage.cards.s.ShockerUnshakable.class));
cards.add(new SetCardInfo("Skyward Spider", 146, Rarity.COMMON, mage.cards.s.SkywardSpider.class));
cards.add(new SetCardInfo("Spectacular Spider-Man", 14, Rarity.RARE, mage.cards.s.SpectacularSpiderMan.class, NON_FULL_USE_VARIOUS));
cards.add(new SetCardInfo("Spectacular Spider-Man", 235, Rarity.RARE, mage.cards.s.SpectacularSpiderMan.class, NON_FULL_USE_VARIOUS));
cards.add(new SetCardInfo("Spectacular Spider-Man", 236, Rarity.RARE, mage.cards.s.SpectacularSpiderMan.class, NON_FULL_USE_VARIOUS));

28
Mage/src/main/java/mage/abilities/condition/common/SourceModifiedCondition.java Normal file
View file

@ -0,0 +1,28 @@
package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.filter.predicate.permanent.ModifiedPredicate;
import mage.game.Game;
import java.util.Optional;
/**
* @author TheElk801
*/
public enum SourceModifiedCondition implements Condition {
instance;
@Override
public boolean apply(Game game, Ability source) {
return Optional
.ofNullable(source.getSourcePermanentIfItStillExists(game))
.filter(permanent -> ModifiedPredicate.instance.apply(permanent, game))
.isPresent();
}
@Override
public String toString() {
return "it's modified";
}
}