github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMR] Fix Armix counting all players' artifacts for -X/-X

Browse source
This commit is contained in:
Alex W. Jackson 2022-02-18 15:31:42 -05:00
parent 5aa5322ff4
commit f7e45d9bbd
2 changed files with 16 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Mage.Sets/src/mage/cards/a/ArmixFiligreeThrasher.java
View file

@ -1,12 +1,14 @@
package mage.cards.a;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.delayed.ReflexiveTriggeredAbility;
import mage.abilities.costs.common.DiscardCardCost;
import mage.abilities.dynamicvalue.AdditiveDynamicValue;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effect;
import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.dynamicvalue.common.SignInversionDynamicValue;
import mage.abilities.effects.common.DoWhenCostPaid;
import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.abilities.keyword.PartnerAbility;
@ -19,8 +21,6 @@ import mage.constants.SuperType;
import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.DefendingPlayerControlsPredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetPermanent;
import java.util.UUID;
@ -36,6 +36,11 @@ public final class ArmixFiligreeThrasher extends CardImpl {
filter.add(DefendingPlayerControlsPredicate.instance);
}
private static final DynamicValue xValue = new SignInversionDynamicValue(new AdditiveDynamicValue(
new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACTS),
new CardsInControllerGraveyardCount(StaticFilters.FILTER_CARD_ARTIFACT)
));
public ArmixFiligreeThrasher(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{B}");
@ -46,11 +51,8 @@ public final class ArmixFiligreeThrasher extends CardImpl {
// Whenever Armix, Filigree Thrasher attacks, you may discard a card. When you do, target creature defending player controls gets -X/-X until end of turn, where X is the number of artifacts you control plus the number of artifact cards in your graveyard.
ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(
new BoostTargetEffect(
ArmixFiligreeThrasherValue.instance,
ArmixFiligreeThrasherValue.instance,
Duration.EndOfTurn, true
), false, "target creature defending player controls gets -X/-X until end of turn, " +
new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn, true), false,
"target creature defending player controls gets -X/-X until end of turn, " +
"where X is the number of artifacts you control plus the number of artifact cards in your graveyard"
);
ability.addTarget(new TargetPermanent(filter));
@ -71,32 +73,3 @@ public final class ArmixFiligreeThrasher extends CardImpl {
return new ArmixFiligreeThrasher(this);
}
}
enum ArmixFiligreeThrasherValue implements DynamicValue {
instance;
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
Player player = game.getPlayer(sourceAbility.getControllerId());
if (player == null) {
return 0;
}
return -(player.getGraveyard().count(
StaticFilters.FILTER_CARD_ARTIFACT, player.getId(), game
) + game.getBattlefield().count(
StaticFilters.FILTER_PERMANENT_ARTIFACT,
sourceAbility.getSourceId(),
sourceAbility.getControllerId(), game
));
}
@Override
public ArmixFiligreeThrasherValue copy() {
return instance;
}
@Override
public String getMessage() {
return "";
}
}

10
Mage.Sets/src/mage/cards/c/CallForBlood.java
View file

@ -34,8 +34,7 @@ public final class CallForBlood extends CardImpl {
// As an additional cost to cast Call for Blood, sacrifice a creature.
this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT)));
// Target creature gets -X/-X until end of turn, where X is the sacrificed creature's power.
DynamicValue xValue = new CallForBloodDynamicValue();
this.getSpellAbility().addEffect(new BoostTargetEffect(xValue, xValue, Duration.EndOfTurn, true));
this.getSpellAbility().addEffect(new BoostTargetEffect(CallForBloodDynamicValue.instance, CallForBloodDynamicValue.instance, Duration.EndOfTurn, true));
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
}
@ -50,7 +49,8 @@ public final class CallForBlood extends CardImpl {
}
}
class CallForBloodDynamicValue implements DynamicValue {
enum CallForBloodDynamicValue implements DynamicValue {
instance;
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
@ -70,12 +70,12 @@ class CallForBloodDynamicValue implements DynamicValue {
@Override
public CallForBloodDynamicValue copy() {
return this;
return instance;
}
@Override
public String getMessage() {
return ", where X is the sacrificed creature's power";
return "the sacrificed creature's power";
}
@Override