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

- Fixed and improved AI mana payment.

Browse Source
This commit is contained in:
Sloth
2013-05-21 16:35:10 +00:00
parent bea0fcd49d
commit 3873ad9633
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ public class ComputerUtilMana {
} }
// select which abilities may be used for each shard // select which abilities may be used for each shard
Map<ManaCostShard, Collection<SpellAbility>> sourcesForShards = ComputerUtilMana.groupAndOrderToPayShards(ai, manaAbilityMap, cost); MapOfLists<ManaCostShard, SpellAbility> sourcesForShards = ComputerUtilMana.groupAndOrderToPayShards(ai, manaAbilityMap, cost);
// Loop over mana needed // Loop over mana needed
List<Card> cardsUsed = new ArrayList<Card>(); List<Card> cardsUsed = new ArrayList<Card>();
@@ -114,19 +114,20 @@ public class ComputerUtilMana {
while (!cost.isPaid()) { while (!cost.isPaid()) {
toPay = getNextShardToPay(cost, sourcesForShards); toPay = getNextShardToPay(cost, sourcesForShards);
Collection<SpellAbility> saList = sourcesForShards.get(toPay); List<SpellAbility> saList = (List<SpellAbility>) sourcesForShards.get(toPay);
List<SpellAbility> payableSources = new ArrayList<SpellAbility>(); SpellAbility saPayment = null;
if( saList != null ) { if( saList != null ) {
for (final SpellAbility ma : saList) { for (final SpellAbility ma : saList) {
if( test && cardsUsed.contains(ma.getSourceCard()) ) if(cardsUsed.contains(ma.getSourceCard()) )
continue; continue;
if( canPayShardWithSpellAbility(toPay, ai, ma, sa, checkPlayable || !test ) ) { if( canPayShardWithSpellAbility(toPay, ai, ma, sa, checkPlayable || !test ) ) {
payableSources.add(ma); saPayment = ma;
break;
} }
} }
} }
if( payableSources.isEmpty() ) { if( saPayment == null ) {
if(!toPay.isPhyrexian() || !ai.canPayLife(2)) if(!toPay.isPhyrexian() || !ai.canPayLife(2))
break; // cannot pay break; // cannot pay
@@ -136,9 +137,6 @@ public class ComputerUtilMana {
continue; continue;
} }
// choose the best SA.
SpellAbility saPayment = payableSources.get(0);
setExpressColorChoice(sa, ai, cost, toPay, saPayment); setExpressColorChoice(sa, ai, cost, toPay, saPayment);
if ( test ) { if ( test ) {
@@ -392,7 +390,7 @@ public class ComputerUtilMana {
* @return Were all mana sources found? * @return Were all mana sources found?
*/ */
private static MapOfLists<ManaCostShard, SpellAbility> groupAndOrderToPayShards(final Player ai, final MapOfLists<Integer, SpellAbility> manaAbilityMap, final ManaCostBeingPaid cost) { private static MapOfLists<ManaCostShard, SpellAbility> groupAndOrderToPayShards(final Player ai, final MapOfLists<Integer, SpellAbility> manaAbilityMap, final ManaCostBeingPaid cost) {
MapOfLists<ManaCostShard, SpellAbility> res = new EnumMapOfLists<ManaCostShard, SpellAbility>(ManaCostShard.class, CollectionSuppliers.<SpellAbility>hashSets()); MapOfLists<ManaCostShard, SpellAbility> res = new EnumMapOfLists<ManaCostShard, SpellAbility>(ManaCostShard.class, CollectionSuppliers.<SpellAbility>arrayLists());
// loop over cost parts // loop over cost parts
for (ManaCostShard shard : cost.getDistinctShards() ) { for (ManaCostShard shard : cost.getDistinctShards() ) {
@@ -419,8 +417,6 @@ public class ComputerUtilMana {
if (cost.getColorlessManaAmount() > 0 && manaAbilityMap.containsKey(ManaAtom.COLORLESS)) if (cost.getColorlessManaAmount() > 0 && manaAbilityMap.containsKey(ManaAtom.COLORLESS))
res.addAll(ManaCostShard.COLORLESS, manaAbilityMap.get(ManaAtom.COLORLESS)); res.addAll(ManaCostShard.COLORLESS, manaAbilityMap.get(ManaAtom.COLORLESS));
System.out.println("groupAndOrderToPayShards " + res);
return res; return res;
} }
@@ -479,7 +475,7 @@ public class ComputerUtilMana {
public boolean apply(final Card c) { public boolean apply(final Card c) {
for (final SpellAbility am : getAIPlayableMana(c)) { for (final SpellAbility am : getAIPlayableMana(c)) {
am.setActivatingPlayer(ai); am.setActivatingPlayer(ai);
if (am.canPlay() || !checkPlayable) { if (!checkPlayable || am.canPlay()) {
return true; return true;
} }
} }
@@ -578,7 +574,6 @@ public class ComputerUtilMana {
CardLists.sortByEvaluateCreature(otherManaSources); CardLists.sortByEvaluateCreature(otherManaSources);
Collections.reverse(otherManaSources); Collections.reverse(otherManaSources);
sortedManaSources.addAll(otherManaSources); sortedManaSources.addAll(otherManaSources);
System.out.println("getAvailableMana " + sortedManaSources);
return sortedManaSources; return sortedManaSources;
} // getAvailableMana() } // getAvailableMana()
@@ -591,7 +586,7 @@ public class ComputerUtilMana {
for (final Card sourceCard : getAvailableMana(ai, checkPlayable)) { for (final Card sourceCard : getAvailableMana(ai, checkPlayable)) {
for (final SpellAbility m : getAIPlayableMana(sourceCard)) { for (final SpellAbility m : getAIPlayableMana(sourceCard)) {
m.setActivatingPlayer(ai); m.setActivatingPlayer(ai);
if (!m.canPlay() && checkPlayable) { if (checkPlayable && !m.canPlay()) {
continue; continue;
} }