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

fix incorrect mana bills for human (eg: ai plays Mana Leak, with Goblin Electromancer in play)

Browse Source
This commit is contained in:
Maxmtg
2014-02-23 14:12:53 +00:00
parent d72e5d0f5d
commit 4ff887959d
11 changed files with 197 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui/src/main/java/forge/gui/player/HumanPlay.java
View File

@@ -1,6 +1,7 @@
package forge.gui.player;
import com.google.common.base.Predicate;
import forge.FThreads;
import forge.card.MagicColor;
import forge.card.mana.ManaCost;
@@ -15,6 +16,7 @@ import forge.game.ability.effects.FlipCoinEffect;
import forge.game.card.*;
import forge.game.card.CardPredicates.Presets;
import forge.game.cost.*;
import forge.game.mana.ManaCostAdjustment;
import forge.game.mana.ManaCostBeingPaid;
import forge.game.player.Player;
import forge.game.spellability.Ability;
@@ -24,6 +26,7 @@ import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;
import forge.gui.input.*;
import forge.util.Lang;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
@@ -124,7 +127,7 @@ public class HumanPlay {
}
else {
manaCost = new ManaCostBeingPaid(sa.getPayCosts().getTotalMana());
manaCost.applySpellCostChange(sa, false);
ManaCostAdjustment.adjust(manaCost, sa, false);
}
boolean isPaid = manaCost.isPaid();
@@ -627,8 +630,9 @@ public class HumanPlay {
prompt = source + "\n" + promptCurrent;
}
sourceAbility.clearManaPaid();
boolean paid = p.getController().payManaCost(cost.getCostMana(), sourceAbility, prompt);
if( sourceAbility != null )
sourceAbility.clearManaPaid();
boolean paid = p.getController().payManaCost(cost.getCostMana(), sourceAbility, prompt, false);
if (!paid) {
p.getManaPool().refundManaPaid(sourceAbility);
}
@@ -679,7 +683,7 @@ public class HumanPlay {
return done;
}
public static boolean payManaCost(final ManaCost realCost, final CostPartMana mc, final SpellAbility ability, final Player activator, String prompt) {
public static boolean payManaCost(final ManaCost realCost, final CostPartMana mc, final SpellAbility ability, final Player activator, String prompt, boolean isActivatedSa) {
final Card source = ability.getHostCard();
ManaCostBeingPaid toPay = new ManaCostBeingPaid(realCost, mc.getRestiction());
@@ -699,8 +703,8 @@ public class HumanPlay {
toPay.addManaCost(mkCost);
}
toPay.applySpellCostChange(ability, false);
if( isActivatedSa )
ManaCostAdjustment.adjust(toPay, ability, false);
InputPayMana inpPayment;
if (ability.isOffering() && ability.getSacrificedAsOffering() == null) {

7
forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java
View File

@@ -957,8 +957,7 @@ public class PlayerControllerHuman extends PlayerController {
@Override
public boolean payCostToPreventEffect(Cost cost, SpellAbility sa, boolean alreadyPaid, List<Player> allPayers) {
// if it's paid by the AI already the human can pay, but it won't change anything
final Card source = sa.getHostCard();
return HumanPlay.payCostDuringAbilityResolve(player, source, cost, sa, null);
return HumanPlay.payCostDuringAbilityResolve(player, sa.getHostCard(), cost, sa, null);
}
@Override
@@ -1062,8 +1061,8 @@ public class PlayerControllerHuman extends PlayerController {
}
@Override
public boolean payManaCost(ManaCost toPay, CostPartMana costPartMana, SpellAbility sa, String prompt /* ai needs hints as well */ ) {
return HumanPlay.payManaCost(toPay, costPartMana, sa, player, prompt);
public boolean payManaCost(ManaCost toPay, CostPartMana costPartMana, SpellAbility sa, String prompt, boolean isActivatedSa) {
return HumanPlay.payManaCost(toPay, costPartMana, sa, player, prompt, isActivatedSa);
}
@Override

5
forge-gui/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -566,9 +566,10 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public boolean payManaCost(ManaCost toPay, CostPartMana costPartMana, SpellAbility sa, String prompt /* ai needs hints as well */ ) {
public boolean payManaCost(ManaCost toPay, CostPartMana costPartMana, SpellAbility sa, String prompt /* ai needs hints as well */, boolean isActivatedSa ) {
// TODO Auto-generated method stub
return ComputerUtilMana.payManaCost(new ManaCostBeingPaid(toPay), sa, player);
ManaCostBeingPaid cost = new ManaCostBeingPaid(toPay);
return ComputerUtilMana.payManaCost(cost, sa, player);
}
@Override