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

- Fixed the AI producing errors when faced with RemoveCounter All costs.

Browse Source
This commit is contained in:
Sloth
2012-02-12 08:26:36 +00:00
parent 647af65586
commit aa07ee9c1c
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/forge/card/cost/CostRemoveCounter.java
View File

@@ -136,9 +136,15 @@ public class CostRemoveCounter extends CostPart {
*/ */
@Override @Override
public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) { public final void payAI(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount();
Integer c = this.convertAmount(); Integer c = this.convertAmount();
final Counters type = this.getCounter();
if (c == null) { if (c == null) {
c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); if (amount.equals("All")) {
c = source.getCounters(type);
} else {
c = AbilityFactory.calculateAmount(source, amount, ability);
}
} }
source.subtractCounter(this.getCounter(), c); source.subtractCounter(this.getCounter(), c);
source.setSVar("CostCountersRemoved", "Number$" + Integer.toString(c)); source.setSVar("CostCountersRemoved", "Number$" + Integer.toString(c));
@@ -194,17 +200,22 @@ public class CostRemoveCounter extends CostPart {
*/ */
@Override @Override
public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) { public final boolean decideAIPayment(final SpellAbility ability, final Card source, final CostPayment payment) {
final String amount = this.getAmount();
Integer c = this.convertAmount(); Integer c = this.convertAmount();
final Counters type = this.getCounter();
if (c == null) { if (c == null) {
final String sVar = source.getSVar(this.getAmount()); final String sVar = source.getSVar(amount);
if (sVar.equals("XChoice")) { if (sVar.equals("XChoice")) {
return false; return false;
} }
if (amount.equals("All")) {
c = AbilityFactory.calculateAmount(source, this.getAmount(), ability); c = source.getCounters(type);
} else {
c = AbilityFactory.calculateAmount(source, amount, ability);
}
} }
if (c > source.getCounters(this.getCounter())) { if (c > source.getCounters(this.getCounter())) {
System.out.println("Not enough " + this.getCounter() + " on " + source.getName()); System.out.println("Not enough " + type + " on " + source.getName());
return false; return false;
} }
return true; return true;