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

- Better fix for ChosenX.

Browse Source
This commit is contained in:
Sloth
2012-07-18 09:38:40 +00:00
parent 3c0ae07572
commit ce0417a6df
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/card/cost/CostUtil.java
View File

@@ -292,10 +292,10 @@ public class CostUtil {
* @return the int * @return the int
*/ */
public static int chooseXValue(final Card card, final SpellAbility sa, final int maxValue) { public static int chooseXValue(final Card card, final SpellAbility sa, final int maxValue) {
final String chosen = sa.getSVar("ChosenX"); /*final String chosen = sa.getSVar("ChosenX");
if (chosen.length() > 0) { if (chosen.length() > 0) {
return AbilityFactory.calculateAmount(card, "ChosenX", null); return AbilityFactory.calculateAmount(card, "ChosenX", null);
} }*/
final Integer[] choiceArray = new Integer[maxValue + 1]; final Integer[] choiceArray = new Integer[maxValue + 1];
for (int i = 0; i < choiceArray.length; i++) { for (int i = 0; i < choiceArray.length; i++) {
@@ -303,7 +303,7 @@ public class CostUtil {
} }
final Object o = GuiUtils.chooseOne(card.toString() + " - Choose a Value for X", choiceArray); final Object o = GuiUtils.chooseOne(card.toString() + " - Choose a Value for X", choiceArray);
final int chosenX = (Integer) o; final int chosenX = (Integer) o;
//sa.setSVar("ChosenX", "Number$" + Integer.toString(chosenX)); sa.setSVar("ChosenX", "Number$" + Integer.toString(chosenX));
card.setSVar("ChosenX", "Number$" + Integer.toString(chosenX)); card.setSVar("ChosenX", "Number$" + Integer.toString(chosenX));
return chosenX; return chosenX;
@@ -319,10 +319,10 @@ public class CostUtil {
* @return the int * @return the int
*/ */
public static int chooseYValue(final Card card, final SpellAbility sa, final int maxValue) { public static int chooseYValue(final Card card, final SpellAbility sa, final int maxValue) {
final String chosen = sa.getSVar("ChosenY"); /*final String chosen = sa.getSVar("ChosenY");
if (chosen.length() > 0) { if (chosen.length() > 0) {
return AbilityFactory.calculateAmount(card, "ChosenY", null); return AbilityFactory.calculateAmount(card, "ChosenY", null);
} }*/
final Integer[] choiceArray = new Integer[maxValue + 1]; final Integer[] choiceArray = new Integer[maxValue + 1];
for (int i = 0; i < choiceArray.length; i++) { for (int i = 0; i < choiceArray.length; i++) {
@@ -330,6 +330,7 @@ public class CostUtil {
} }
final Object o = GuiUtils.chooseOne(card.toString() + " - Choose a Value for Y", choiceArray); final Object o = GuiUtils.chooseOne(card.toString() + " - Choose a Value for Y", choiceArray);
final int chosenY = (Integer) o; final int chosenY = (Integer) o;
sa.setSVar("ChosenY", "Number$" + Integer.toString(chosenY));
card.setSVar("ChosenY", "Number$" + Integer.toString(chosenY)); card.setSVar("ChosenY", "Number$" + Integer.toString(chosenY));
return chosenY; return chosenY;