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

clean up cost tweaks

Browse Source
This commit is contained in:
Northmoc
2021-02-01 08:11:20 -05:00
parent 0e9f24cafd
commit f72f49def4
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,10 +131,8 @@ public class CostTapType extends CostPartWithList {
} }
typeList = CardLists.filter(typeList, Presets.UNTAPPED); typeList = CardLists.filter(typeList, Presets.UNTAPPED);
boolean isCrew=false;
if (ability.hasParam("Crew")) { if (ability.hasParam("Crew")) {
typeList = CardLists.getNotKeyword(typeList, "CARDNAME can't crew Vehicles."); typeList = CardLists.getNotKeyword(typeList, "CARDNAME can't crew Vehicles.");
isCrew=true;
} }
if (sameType) { if (sameType) {
@@ -148,7 +146,7 @@ public class CostTapType extends CostPartWithList {
if (totalPower) { if (totalPower) {
final int i = Integer.parseInt(totalP); final int i = Integer.parseInt(totalP);
return CardLists.getTotalPower(typeList, true, isCrew) >= i; return CardLists.getTotalPower(typeList, true, ability.hasParam("Crew")) >= i;
} }
final Integer amount = this.convertAmount(); final Integer amount = this.convertAmount();

4
forge-gui/src/main/java/forge/player/HumanCostDecision.java
View File

@@ -1187,10 +1187,8 @@ public class HumanCostDecision extends CostDecisionMakerBase {
source, ability); source, ability);
typeList = CardLists.filter(typeList, Presets.UNTAPPED); typeList = CardLists.filter(typeList, Presets.UNTAPPED);
boolean isCrew=false;
if (ability.hasParam("Crew")) { if (ability.hasParam("Crew")) {
typeList = CardLists.getNotKeyword(typeList, "CARDNAME can't crew Vehicles."); typeList = CardLists.getNotKeyword(typeList, "CARDNAME can't crew Vehicles.");
isCrew=true;
} }
if (c == null && !amount.equals("Any")) { if (c == null && !amount.equals("Any")) {
@@ -1249,7 +1247,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
inp.showAndWait(); inp.showAndWait();
if (inp.hasCancelled() || CardLists.getTotalPower(inp.getSelected(), true, isCrew) < i) { if (inp.hasCancelled() || CardLists.getTotalPower(inp.getSelected(), true, ability.hasParam("Crew")) < i) {
return null; return null;
} }
return PaymentDecision.card(inp.getSelected()); return PaymentDecision.card(inp.getSelected());