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

- Minor logic tweak (Buyback)

Browse Source 
- hasXInAnyCostPart doesn't need a SA parameter now that it's in Cost.
- Fixed a minor mistype on mobile Forge.
This commit is contained in:
Agetian
2018-12-04 16:11:08 +03:00
parent 4d1b7a9aec
commit a2ca811136
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -671,7 +671,7 @@ public class AiController {
// This is for playing spells regularly (no Cascade/Ripple etc.) // This is for playing spells regularly (no Cascade/Ripple etc.)
private AiPlayDecision canPlayAndPayFor(final SpellAbility sa) { private AiPlayDecision canPlayAndPayFor(final SpellAbility sa) {
boolean xCost = sa.getPayCosts().hasXInAnyCostPart(sa); boolean xCost = sa.getPayCosts().hasXInAnyCostPart();
if (!xCost && !ComputerUtilCost.canPayCost(sa, player)) { if (!xCost && !ComputerUtilCost.canPayCost(sa, player)) {
// for most costs, it's OK to check if they can be paid early in order to avoid running a heavy API check // for most costs, it's OK to check if they can be paid early in order to avoid running a heavy API check
@@ -708,7 +708,7 @@ public class AiController {
return canPlaySa(((WrappedAbility) sa).getWrappedAbility()); return canPlaySa(((WrappedAbility) sa).getWrappedAbility());
} }
// Trying to play a card that has Buyback without a Buyback cost // Trying to play a card that has Buyback without a Buyback cost, look for possible additional considerations
if (card.hasKeyword(Keyword.BUYBACK) && !sa.isBuyBackAbility() && !canPlaySpellWithoutBuyback(card, sa)) { if (card.hasKeyword(Keyword.BUYBACK) && !sa.isBuyBackAbility() && !canPlaySpellWithoutBuyback(card, sa)) {
return AiPlayDecision.NeedsToPlayCriteriaNotMet; return AiPlayDecision.NeedsToPlayCriteriaNotMet;
} }

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

@@ -935,19 +935,17 @@ public class Cost implements Serializable {
return true; return true;
} }
public boolean hasXInAnyCostPart(SpellAbility sa) { public boolean hasXInAnyCostPart() {
boolean xCost = false; boolean xCost = false;
if (sa.getPayCosts() != null) { for (CostPart p : this.getCostParts()) {
for (CostPart p : sa.getPayCosts().getCostParts()) { if (p instanceof CostPartMana) {
if (p instanceof CostPartMana) { if (((CostPartMana) p).getAmountOfX() > 0) {
if (((CostPartMana) p).getAmountOfX() > 0) {
xCost = true;
break;
}
} else if (p.getAmount().equals("X")) {
xCost = true; xCost = true;
break; break;
} }
} else if (p.getAmount().equals("X")) {
xCost = true;
break;
} }
} }
return xCost; return xCost;

2
forge-gui/src/main/java/forge/match/input/InputAttack.java
View File

@@ -84,7 +84,7 @@ public class InputAttack extends InputSyncronizedBase {
} }
private void updatePrompt() { private void updatePrompt() {
String alphaLabel = canCallBackAttackers() ? "Call Back" : "AlphaStrike"; String alphaLabel = canCallBackAttackers() ? "Call Back" : "Alpha Strike";
getController().getGui().updateButtons(getOwner(), "OK", alphaLabel, true, true, true); getController().getGui().updateButtons(getOwner(), "OK", alphaLabel, true, true, true);
} }