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

- Canceling when paying an X Mana cost will now actually cancel the Cost.

Browse Source
This commit is contained in:
Sol
2013-05-11 19:59:27 +00:00
parent c265680e69
commit ff1e742427
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/control/input/InputPayManaX.java
View File

@@ -12,6 +12,7 @@ public class InputPayManaX extends InputPayManaBase {
private final String strX; private final String strX;
private String colorsPaid; private String colorsPaid;
private final boolean xCanBe0; private final boolean xCanBe0;
private boolean canceled = false;
public InputPayManaX(final SpellAbility sa0, final int amountX, final boolean xCanBe0) public InputPayManaX(final SpellAbility sa0, final int amountX, final boolean xCanBe0)
@@ -34,14 +35,14 @@ public class InputPayManaX extends InputPayManaBase {
public boolean isPaid() { public boolean isPaid() {
//return !( xPaid == 0 && !costMana.canXbe0() || this.colorX.equals("") && !this.manaCost.toString().equals(strX) ); //return !( xPaid == 0 && !costMana.canXbe0() || this.colorX.equals("") && !this.manaCost.toString().equals(strX) );
// return !( xPaid == 0 && !costMana.canXbe0()) && !(this.colorX.equals("") && !this.manaCost.toString().equals(strX)); // return !( xPaid == 0 && !costMana.canXbe0()) && !(this.colorX.equals("") && !this.manaCost.toString().equals(strX));
return ( xPaid > 0 || xCanBe0) && (!this.colorX.equals("") || this.manaCost.toString().equals(strX)); return ( !canceled && (xPaid > 0 || xCanBe0) && (!this.colorX.equals("") || this.manaCost.toString().equals(strX)));
} }
@Override @Override
public void showMessage() { public void showMessage() {
if( isFinished() ) return; if( isFinished() ) return;
// only cancel if partially paid an X value // Enable just cancel is full X value hasn't been paid for multiple X values
// or X is 0, and x can't be 0 // or X is 0, and x can't be 0
if (!isPaid()) { if (!isPaid()) {
ButtonUtil.enableOnlyCancel(); ButtonUtil.enableOnlyCancel();
@@ -79,6 +80,8 @@ public class InputPayManaX extends InputPayManaBase {
@Override @Override
protected final void onCancel() { protected final void onCancel() {
// If you hit cancel, isPaid needs to return false
this.canceled = true;
this.stop(); this.stop();
} }