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

* GUI: fixed that announced X card icon info shows X=0 on next turns (example: Engineered Explosives, #8046);

Browse source
This commit is contained in:
Oleg Agafonov 2021-09-05 01:20:46 +04:00
parent debf310697
commit cdf6fbb5d8
8 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/abilities/dynamicvalue/common/ManacostVariableValue.java
View file

@ -8,8 +8,10 @@ import mage.watchers.common.ManaSpentToCastWatcher;
public enum ManacostVariableValue implements DynamicValue {
REGULAR, // if you need X on cast/activate (in stack)
ETB; // if you need X after ETB (in battlefield)
REGULAR, // if you need X on cast/activate (in stack) - reset each turn
ETB, // if you need X after ETB (in battlefield) - reset each turn
END_GAME; // if you need X until end game - keep data forever
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
@ -18,7 +20,11 @@ public enum ManacostVariableValue implements DynamicValue {
}
ManaSpentToCastWatcher watcher = game.getState().getWatcher(ManaSpentToCastWatcher.class);
if (watcher != null) {
return watcher.getAndResetLastXValue(sourceAbility);
if (this == END_GAME) {
return watcher.getLastXValue(sourceAbility, true);
} else {
return watcher.getLastXValue(sourceAbility, false);
}
}
return 0;
}