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

Convert Kicker to costs tag system

Browse source
This commit is contained in:
Steven Knipe 2023-11-16 15:07:58 -08:00
parent 1e76b59f4e
commit 77dd1711b5
6 changed files with 44 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/condition/common/KickedCondition.java
View file

@ -24,7 +24,7 @@ public enum KickedCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
return KickerAbility.getSourceObjectKickedCount(game, source) >= kickedCount;
return KickerAbility.getKickedCounter(game, source) >= kickedCount;
}
@Override

12
Mage/src/main/java/mage/abilities/condition/common/KickedCostCondition.java
View file

@ -1,10 +1,8 @@
package mage.abilities.condition.common;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.abilities.keyword.KickerAbility;
import mage.cards.Card;
import mage.game.Game;
/**
@ -22,14 +20,6 @@ public class KickedCostCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
MageObject sourceObject = source.getSourceObject(game);
if (sourceObject instanceof Card) {
for (Ability ability : ((Card) sourceObject).getAbilities(game)) {
if (ability instanceof KickerAbility) {
return ((KickerAbility) ability).isKicked(game, source, kickerCostText);
}
}
}
return false;
return KickerAbility.getKickedCounterStrict(game, source, kickerCostText) > 0;
}
}