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

added cardsUsed list to test manacosts

Browse Source
This commit is contained in:
Maxmtg
2013-05-19 10:18:31 +00:00
parent f39e6e9fc3
commit 28deb7d70a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/forge/game/ai/ComputerUtilMana.java
View File

@@ -105,6 +105,8 @@ public class ComputerUtilMana {
Map<ManaCostShard, Collection<SpellAbility>> sourcesForShards = ComputerUtilMana.groupAndOrderToPayShards(ai, manaAbilityMap, cost); Map<ManaCostShard, Collection<SpellAbility>> sourcesForShards = ComputerUtilMana.groupAndOrderToPayShards(ai, manaAbilityMap, cost);
// Loop over mana needed // Loop over mana needed
List<Card> cardsUsed = test ? new ArrayList<Card>() : null;
ManaCostShard toPay = null; ManaCostShard toPay = null;
while (!cost.isPaid()) { while (!cost.isPaid()) {
toPay = getNextShardToPay(cost, sourcesForShards); toPay = getNextShardToPay(cost, sourcesForShards);
@@ -113,6 +115,8 @@ public class ComputerUtilMana {
List<SpellAbility> payableSources = new ArrayList<SpellAbility>(); List<SpellAbility> payableSources = new ArrayList<SpellAbility>();
if( saList != null ) { if( saList != null ) {
for (final SpellAbility ma : saList) { for (final SpellAbility ma : saList) {
if( test && cardsUsed.contains(ma.getSourceCard()) )
continue;
if( canPayShardWithSpellAbility(toPay, ai, ma, sa, checkPlayable || !test ) ) { if( canPayShardWithSpellAbility(toPay, ai, ma, sa, checkPlayable || !test ) ) {
payableSources.add(ma); payableSources.add(ma);
} }
@@ -144,6 +148,7 @@ public class ComputerUtilMana {
for(Collection<SpellAbility> kv : sourcesForShards.values()) { for(Collection<SpellAbility> kv : sourcesForShards.values()) {
kv.remove(saPayment); kv.remove(saPayment);
} }
cardsUsed.add(saPayment.getSourceCard());
} else { } else {
if (saPayment.getPayCosts() != null) { if (saPayment.getPayCosts() != null) {
final CostPayment pay = new CostPayment(saPayment.getPayCosts(), saPayment); final CostPayment pay = new CostPayment(saPayment.getPayCosts(), saPayment);