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

Cost.chooseXValue moved to member of CostPart

Browse Source
This commit is contained in:
Maxmtg
2013-12-13 07:10:23 +00:00
parent 753f4d989b
commit 5b18ba9058
17 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
forge-core/src/main/java/forge/util/ThreadUtil.java
View File

@@ -43,27 +43,6 @@ public class ThreadUtil {
getGameThreadPool().execute(toRun);
}
public static void invokeInGameThreadAndWait(final Runnable toRun) {
if (isGameThread()) {
toRun.run(); //just run in the current thread
return;
}
final CountDownLatch latch = new CountDownLatch(1);
getGameThreadPool().execute(new Runnable() {
@Override
public void run() {
toRun.run();
latch.countDown();
}
});
try {
latch.await();
}
catch (final InterruptedException ex) {
throw new RuntimeException(ex);
}
}
public static void delay(int milliseconds, Runnable inputUpdater) {
getScheduledPool().schedule(inputUpdater, milliseconds, TimeUnit.MILLISECONDS);
}

13
forge-gui/src/main/java/forge/game/cost/Cost.java
View File

@@ -26,7 +26,6 @@ import forge.card.mana.ManaCostParser;
import forge.game.card.Card;
import forge.game.card.CounterType;
import forge.game.mana.ManaCostBeingPaid;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
import forge.util.TextUtil;
@@ -719,17 +718,5 @@ public class Cost {
return this;
}
public static int chooseXValue(final Card card, final SpellAbility sa, final int maxValue) {
/*final String chosen = sa.getSVar("ChosenX");
if (chosen.length() > 0) {
return AbilityFactory.calculateAmount(card, "ChosenX", null);
}*/
int chosenX = sa.getActivatingPlayer().getController().chooseNumber(sa, card.toString() + " - Choose a Value for X", 0, maxValue);
sa.setSVar("ChosenX", Integer.toString(chosenX));
card.setSVar("ChosenX", Integer.toString(chosenX));
return chosenX;
}
public static final Cost Zero = new Cost(0);
}

2
forge-gui/src/main/java/forge/game/cost/CostDamage.java
View File

@@ -84,7 +84,7 @@ public class CostDamage extends CostPart {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, life);
c = chooseXValue(source, ability, life);
}
else {
c = AbilityUtils.calculateAmount(source, amount, ability);

4
forge-gui/src/main/java/forge/game/cost/CostDiscard.java
View File

@@ -188,7 +188,7 @@ public class CostDiscard extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, handList.size());
c = chooseXValue(source, ability, handList.size());
}
else {
c = AbilityUtils.calculateAmount(source, amount, ability);
@@ -239,7 +239,7 @@ public class CostDiscard extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, handList.size());
c = chooseXValue(source, ability, handList.size());
}
else {
c = AbilityUtils.calculateAmount(source, amount, ability);

2
forge-gui/src/main/java/forge/game/cost/CostExile.java
View File

@@ -257,7 +257,7 @@ public class CostExile extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, list.size());
c = chooseXValue(source, ability, list.size());
}
else {
c = AbilityUtils.calculateAmount(source, amount, ability);

2
forge-gui/src/main/java/forge/game/cost/CostFlipCoin.java
View File

@@ -75,7 +75,7 @@ public class CostFlipCoin extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, this.getList().size());
c = chooseXValue(source, ability, this.getList().size());
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}

2
forge-gui/src/main/java/forge/game/cost/CostGainLife.java
View File

@@ -127,7 +127,7 @@ public class CostGainLife extends CostPart {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, life);
c = chooseXValue(source, ability, life);
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}

2
forge-gui/src/main/java/forge/game/cost/CostMill.java
View File

@@ -96,7 +96,7 @@ public class CostMill extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, this.getList().size());
c = chooseXValue(source, ability, this.getList().size());
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}

12
forge-gui/src/main/java/forge/game/cost/CostPart.java
View File

@@ -220,4 +220,16 @@ public abstract class CostPart {
public void setAmount(final String amountIn) {
this.amount = amountIn;
}
protected int chooseXValue(final Card card, final SpellAbility sa, final int maxValue) {
/*final String chosen = sa.getSVar("ChosenX");
if (chosen.length() > 0) {
return AbilityFactory.calculateAmount(card, "ChosenX", null);
}*/
int chosenX = sa.getActivatingPlayer().getController().chooseNumber(sa, card.toString() + " - Choose a Value for X", 0, maxValue);
sa.setSVar("ChosenX", Integer.toString(chosenX));
card.setSVar("ChosenX", Integer.toString(chosenX));
return chosenX;
}
}

2
forge-gui/src/main/java/forge/game/cost/CostPayLife.java
View File

@@ -124,7 +124,7 @@ public class CostPayLife extends CostPart {
limit = AbilityUtils.calculateAmount(source, sVar.split("LimitMax.")[1], ability);
}
int maxLifePayment = limit < life ? limit : life;
c = Cost.chooseXValue(source, ability, maxLifePayment);
c = chooseXValue(source, ability, maxLifePayment);
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}

2
forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java
View File

@@ -224,7 +224,7 @@ public class CostPutCardToLib extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, this.getList().size());
c = chooseXValue(source, ability, this.getList().size());
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}

2
forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java
View File

@@ -134,7 +134,7 @@ public class CostRemoveCounter extends CostPartWithList {
if (amount.equals("All"))
cntRemoved = maxCounters;
else if ( c == null && "XChoice".equals(sVarAmount)) {
cntRemoved = Cost.chooseXValue(source, ability, maxCounters);
cntRemoved = chooseXValue(source, ability, maxCounters);
}
if (maxCounters < cntRemoved)

2
forge-gui/src/main/java/forge/game/cost/CostReturn.java
View File

@@ -128,7 +128,7 @@ public class CostReturn extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, list.size());
c = chooseXValue(source, ability, list.size());
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}

2
forge-gui/src/main/java/forge/game/cost/CostReveal.java
View File

@@ -211,7 +211,7 @@ public class CostReveal extends CostPartWithList {
if (num == null) {
final String sVar = ability.getSVar(amount);
if (sVar.equals("XChoice")) {
num = Cost.chooseXValue(source, ability, handList.size());
num = chooseXValue(source, ability, handList.size());
} else {
num = AbilityUtils.calculateAmount(source, amount, ability);
}

2
forge-gui/src/main/java/forge/game/cost/CostSacrifice.java
View File

@@ -151,7 +151,7 @@ public class CostSacrifice extends CostPartWithList {
if (c == null) {
// Generalize this
if (ability.getSVar(amount).equals("XChoice")) {
c = Cost.chooseXValue(source, ability, list.size());
c = chooseXValue(source, ability, list.size());
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}

2
forge-gui/src/main/java/forge/game/cost/CostTapType.java
View File

@@ -198,7 +198,7 @@ public class CostTapType extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, typeList.size());
c = chooseXValue(source, ability, typeList.size());
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}

2
forge-gui/src/main/java/forge/game/cost/CostUntapType.java
View File

@@ -144,7 +144,7 @@ public class CostUntapType extends CostPartWithList {
final String sVar = ability.getSVar(amount);
// Generalize this
if (sVar.equals("XChoice")) {
c = Cost.chooseXValue(source, ability, typeList.size());
c = chooseXValue(source, ability, typeList.size());
} else {
c = AbilityUtils.calculateAmount(source, amount, ability);
}