external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve "ReduceCost with MinMana does reduce to 0, but shouldn't"

Browse Source
This commit is contained in:
Hans Mackowiak
2019-10-16 01:25:33 +00:00
committed by swordshine
parent 544301e5ff
commit 40b1f89c8f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/cost/CostAdjustment.java
View File

@@ -192,7 +192,7 @@ public class CostAdjustment {
}
for (final StaticAbility stAb : reduceAbilities) {
sumGeneric += applyReduceCostAbility(stAb, sa, cost);
sumGeneric += applyReduceCostAbility(stAb, sa, cost, sumGeneric);
}
// need to reduce generic extra because of 2 hybrid mana
cost.decreaseGenericMana(sumGeneric);
@@ -360,7 +360,7 @@ public class CostAdjustment {
* @param manaCost
* a ManaCost
*/
private static int applyReduceCostAbility(final StaticAbility staticAbility, final SpellAbility sa, final ManaCostBeingPaid manaCost) {
private static int applyReduceCostAbility(final StaticAbility staticAbility, final SpellAbility sa, final ManaCostBeingPaid manaCost, int sumReduced) {
//Can't reduce zero cost
if (manaCost.toString().equals("{0}")) {
return 0;
@@ -393,7 +393,7 @@ public class CostAdjustment {
minMana = Integer.valueOf(staticAbility.getParam("MinMana"));
}
final int maxReduction = Math.max(0, manaCost.getConvertedManaCost() - minMana);
final int maxReduction = Math.max(0, manaCost.getConvertedManaCost() - minMana - sumReduced);
if (maxReduction > 0) {
return Math.min(value, maxReduction);
}