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

Merge branch 'thrivingMana' into 'master'

Browse Source 
AbilityManaPart: support 'Combo X Chosen' Mana Part for Thriving Lands

See merge request core-developers/forge!6048
This commit is contained in:
Michael Kamensky
2022-01-15 13:13:24 +00:00
parent a8861e589a f529bc1c7a
commit 68fb53ff10
11 changed files with 61 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
View File

@@ -156,8 +156,8 @@ public class ComputerUtilMana {
// Mana abilities on the same card
String shardMana = shard.toString().replaceAll("\\{", "").replaceAll("\\}", "");
boolean payWithAb1 = ability1.getManaPart().mana().contains(shardMana);
boolean payWithAb2 = ability2.getManaPart().mana().contains(shardMana);
boolean payWithAb1 = ability1.getManaPart().mana(ability1).contains(shardMana);
boolean payWithAb2 = ability2.getManaPart().mana(ability2).contains(shardMana);
if (payWithAb1 && !payWithAb2) {
return -1;
@@ -196,9 +196,9 @@ public class ComputerUtilMana {
Collections.sort(prefSortedAbilities, new Comparator<SpellAbility>() {
@Override
public int compare(final SpellAbility ability1, final SpellAbility ability2) {
if (ability1.getManaPart().mana().contains(preferredShard))
if (ability1.getManaPart().mana(ability1).contains(preferredShard))
return -1;
else if (ability2.getManaPart().mana().contains(preferredShard))
else if (ability2.getManaPart().mana(ability2).contains(preferredShard))
return 1;
return 0;
@@ -207,9 +207,9 @@ public class ComputerUtilMana {
Collections.sort(otherSortedAbilities, new Comparator<SpellAbility>() {
@Override
public int compare(final SpellAbility ability1, final SpellAbility ability2) {
if (ability1.getManaPart().mana().contains(preferredShard))
if (ability1.getManaPart().mana(ability1).contains(preferredShard))
return 1;
else if (ability2.getManaPart().mana().contains(preferredShard))
else if (ability2.getManaPart().mana(ability2).contains(preferredShard))
return -1;
return 0;
@@ -1021,7 +1021,7 @@ public class ComputerUtilMana {
}
if (m.isComboMana()) {
for (String s : m.getComboColors().split(" ")) {
for (String s : m.getComboColors(ma).split(" ")) {
if (toPay == ManaCostShard.COLORED_X && !ManaCostBeingPaid.canColoredXShardBePaidByColor(s, xManaCostPaidByColor)) {
continue;
}
@@ -1048,7 +1048,7 @@ public class ComputerUtilMana {
}
if (toPay == ManaCostShard.COLORED_X) {
for (String s : m.mana().split(" ")) {
for (String s : m.mana(ma).split(" ")) {
if (ManaCostBeingPaid.canColoredXShardBePaidByColor(s, xManaCostPaidByColor)) {
return true;
}
@@ -1164,7 +1164,7 @@ public class ComputerUtilMana {
if (abMana.isComboMana()) {
int amount = manaAb.hasParam("Amount") ? AbilityUtils.calculateAmount(source, manaAb.getParam("Amount"), manaAb) : 1;
final ManaCostBeingPaid testCost = new ManaCostBeingPaid(cost);
final String[] comboColors = abMana.getComboColors().split(" ");
final String[] comboColors = abMana.getComboColors(manaAb).split(" ");
for (int nMana = 1; nMana <= amount; nMana++) {
String choice = "";
// Use expressChoice first
@@ -1198,7 +1198,7 @@ public class ComputerUtilMana {
}
// check if combo mana can produce most common color in hand
String commonColor = ComputerUtilCard.getMostProminentColor(ai.getCardsIn(ZoneType.Hand));
if (!commonColor.isEmpty() && satisfiesColorChoice(abMana, choiceString, MagicColor.toShortString(commonColor)) && abMana.getComboColors().contains(MagicColor.toShortString(commonColor))) {
if (!commonColor.isEmpty() && satisfiesColorChoice(abMana, choiceString, MagicColor.toShortString(commonColor)) && abMana.getComboColors(manaAb).contains(MagicColor.toShortString(commonColor))) {
choice = MagicColor.toShortString(commonColor);
} else {
// default to first available color
@@ -1536,7 +1536,7 @@ public class ComputerUtilMana {
} else if (producesAnyColor) {
anyColorManaSources.add(card);
} else if (usableManaAbilities == 1) {
if (manaAbilities.get(0).getManaPart().mana().equals("C")) {
if (manaAbilities.get(0).getManaPart().mana(manaAbilities.get(0)).equals("C")) {
colorlessManaSources.add(card);
} else {
oneManaSources.add(card);