External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 21:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Kicker abilities - fixed that some cards don't see kicked status of multikicker spells (example: Hallar, the Firefletcher, #4895);

Browse source
This commit is contained in:
Oleg Agafonov 2020-12-15 21:00:39 +04:00
parent 4d362d7edc
commit 0c2c33e940
6 changed files with 99 additions and 17 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

@ -27,7 +27,7 @@ public enum KickedCondition implements Condition {
if (card != null) {
for (Ability ability : card.getAbilities()) {
if (ability instanceof KickerAbility) {
if (((KickerAbility) ability).isKicked(game, source, "")) {
if (((KickerAbility) ability).isKicked(game, source)) {
return true;
}
}

1
Mage/src/main/java/mage/abilities/dynamicvalue/common/GetKickerXValue.java
View file

@ -36,7 +36,6 @@ public enum GetKickerXValue implements DynamicValue {
.stream()
.anyMatch(varCost -> !((OptionalAdditionalCostImpl) varCost).getVariableCosts().isEmpty());
if (haveVarCost) {
int kickedCount = ((KickerAbility) ability).getKickedCounter(game, sourceAbility);
if (kickedCount > 0) {

64
Mage/src/main/java/mage/abilities/keyword/KickerAbility.java
View file

@ -122,27 +122,63 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
}
}
public int getKickedCounter(Game game, Ability source) {
String key = getActivationKey(source, "", game);
return activations.getOrDefault(key, 0);
}
private int getKickedCounterStrict(Game game, Ability source, String needKickerCost) {
String key;
if (needKickerCost.isEmpty()) {
// need all kickers
key = getActivationKey(source, "", game);
} else {
// need only cost related kickers
key = getActivationKey(source, needKickerCost, game);
}
public boolean isKicked(Game game, Ability source, String costText) {
String key = getActivationKey(source, costText, game);
int totalActivations = 0;
if (kickerCosts.size() > 1) {
for (String activationKey : activations.keySet()) {
if (activationKey.startsWith(key)
&& activations.get(activationKey) > 0) {
return true;
if (activationKey.startsWith(key) && activations.get(activationKey) > 0) {
totalActivations += activations.get(activationKey);
}
}
} else {
if (activations.containsKey(key)) {
return activations.get(key) > 0;
if (activations.containsKey(key) && activations.get(key) > 0) {
totalActivations += activations.get(key);
}
}
return false;
return totalActivations;
}
/**
* Return total kicker activations (kicker + multikicker)
*
* @param game
* @param source
* @return
*/
public int getKickedCounter(Game game, Ability source) {
return getKickedCounterStrict(game, source, "");
}
/**
* If spell was kicked
*
* @param game
* @param source
* @return
*/
public boolean isKicked(Game game, Ability source) {
return isKicked(game, source, "");
}
/**
* If spell was kicked by specific kicker cost
*
* @param game
* @param source
* @param needKickerCost use cost.getText(true)
* @return
*/
public boolean isKicked(Game game, Ability source, String needKickerCost) {
return getKickedCounterStrict(game, source, needKickerCost) > 0;
}
public List<OptionalAdditionalCost> getKickerCosts() {
@ -196,7 +232,7 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
while (player.canRespond() && again) {
String times = "";
if (kickerCost.isRepeatable()) {
int activatedCount = getKickedCounter(game, ability);
int activatedCount = getKickedCounterStrict(game, ability, kickerCost.getText(true));
times = (activatedCount + 1) + (activatedCount == 0 ? " time " : " times ");
}
// TODO: add AI support to find max number of possible activations (from available mana)

2
Mage/src/main/java/mage/abilities/keyword/KickerWithAnyNumberModesAbility.java
View file

@ -26,7 +26,7 @@ public class KickerWithAnyNumberModesAbility extends KickerAbility implements Op
@Override
public void changeModes(Ability ability, Game game) {
if (!isKicked(game, ability, "")) {
if (!isKicked(game, ability)) {
return;
}