Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

rework some effects to use CardUtil::getEffectValueFromAbility

Browse source
This commit is contained in:
theelk801 2025-06-04 08:35:08 -04:00
parent bccbb2ee8e
commit 562bd9ffeb
14 changed files with 74 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/abilities/keyword/ConspireAbility.java
View file

@ -21,7 +21,6 @@ import mage.players.Player;
import mage.target.common.TargetControlledPermanent;
import mage.util.CardUtil;
import java.util.Objects;
import java.util.UUID;
/*
@ -188,13 +187,9 @@ class ConspireTriggeredAbility extends CastSourceTriggeredAbility {
return false;
}
Spell spell = game.getStack().getSpell(event.getSourceId());
return spell != null
&& spell
.getSpellAbility()
.getAllEffects()
.stream()
.map(effect -> effect.getValue("ConspireActivation" + conspireId + addedById))
.anyMatch(Objects::nonNull);
return spell != null && CardUtil.getEffectValueFromAbility(
spell.getSpellAbility(), "ConspireActivation" + conspireId + addedById, Boolean.class
).orElse(false);
}
@Override

17
Mage/src/main/java/mage/abilities/keyword/EvolveAbility.java
View file

@ -10,6 +10,7 @@ import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
* FAQ 2013/01/11
@ -75,18 +76,14 @@ public class EvolveAbility extends EntersBattlefieldAllTriggeredAbility {
@Override
public boolean checkInterveningIfClause(Game game) {
Permanent sourcePermanent = getSourcePermanentOrLKI(game);
Permanent permanentEntering = (Permanent) this
.getEffects()
.stream()
.map(effect -> effect.getValue("permanentEnteringBattlefield"))
.findFirst()
.orElse(null);
return sourcePermanent != null
&& permanentEntering != null
&& sourcePermanent.isCreature(game)
&& permanentEntering.isCreature(game)
&& (permanentEntering.getPower().getValue() > sourcePermanent.getPower().getValue()
|| permanentEntering.getToughness().getValue() > sourcePermanent.getToughness().getValue());
&& CardUtil
.getEffectValueFromAbility(this, "permanentEnteringBattlefield", Permanent.class)
.filter(permanent -> permanent.isCreature(game))
.filter(permanent -> sourcePermanent.getPower().getValue() < permanent.getPower().getValue()
|| sourcePermanent.getToughness().getValue() < permanent.getToughness().getValue())
.isPresent();
}
@Override