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

Fix AbilityManaPart.canProduce() for Command Tower. This has the effect of being able to Auto-pay using Command Tower and also lets AI correctly figure out it can tap it for any of those colors as well (affects both heuristic and simulated AI).

Browse Source
This commit is contained in:
Myrd
2016-01-01 23:46:16 +00:00
parent ed1ae4a71d
commit 7303d132de
2 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1125,7 +1125,7 @@ public class ComputerUtilMana {
sortedManaSources.addAll(sortedManaSources.size(), otherManaSources);
if (DEBUG_MANA_PAYMENT) {
System.out.println("DEBUG_MANA_PAYMENT: manaAbilityMap = " + sortedManaSources);
System.out.println("DEBUG_MANA_PAYMENT: sortedManaSources = " + sortedManaSources);
}
return sortedManaSources;
} // getAvailableMana()

74
forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View File

@@ -483,15 +483,19 @@ public class AbilityManaPart implements java.io.Serializable {
return true;
}
if (this.getOrigProduced().contains("Chosen") && sourceCard != null ) {
if (this.getSourceCard().hasChosenColor() && MagicColor.toShortString(this.getSourceCard().getChosenColor()).contains(s)) {
String origProduced = getOrigProduced();
if (origProduced.contains("Chosen") && sourceCard != null ) {
if (getSourceCard().hasChosenColor() && MagicColor.toShortString(getSourceCard().getChosenColor()).contains(s)) {
return true;
}
}
if (sa != null) {
return applyManaReplacement(sa, this.getOrigProduced()).contains(s);
if (isComboMana()) {
return getComboColors().contains(s);
}
return this.getOrigProduced().contains(s);
if (sa != null) {
return applyManaReplacement(sa, origProduced).contains(s);
}
return origProduced.contains(s);
}
/**
@@ -540,44 +544,30 @@ public class AbilityManaPart implements java.io.Serializable {
* @return the color available in combination mana
*/
public String getComboColors() {
String retVal = "";
if (this.getOrigProduced().contains("Combo")) {
retVal = this.getOrigProduced().replace("Combo ", "");
if (retVal.contains("Any")) {
retVal = "W U B R G";
}
if(retVal.contains("ColorIdentity")) {
retVal = "";
Card cmdr = this.getSourceCard().getController().getCommander();
if(cmdr == null)
{
return retVal;
}
ColorSet CID = cmdr.getRules().getColorIdentity();
if(CID.hasWhite())
{
retVal += "W ";
}
if(CID.hasBlue())
{
retVal += "U ";
}
if(CID.hasBlack())
{
retVal += "B ";
}
if(CID.hasRed())
{
retVal += "R ";
}
if(CID.hasGreen())
{
retVal += "G ";
}
retVal = retVal.substring(0,retVal.length()-1);
}
String origProduced = getOrigProduced();
if (!origProduced.contains("Combo")) {
return "";
}
return retVal;
if (origProduced.contains("Any")) {
return "W U B R G";
}
if (!origProduced.contains("ColorIdentity")) {
return origProduced.replace("Combo ", "");
}
// ColorIdentity
Card cmdr = getSourceCard().getController().getCommander();
if (cmdr == null) {
return "";
}
StringBuilder sb = new StringBuilder();
ColorSet identity = cmdr.getRules().getColorIdentity();
if (identity.hasWhite()) { sb.append("W "); }
if (identity.hasBlue()) { sb.append("U "); }
if (identity.hasBlack()) { sb.append("B "); }
if (identity.hasRed()) { sb.append("R "); }
if (identity.hasGreen()) { sb.append("R "); }
// TODO: Add support for {C}.
return sb.length() == 0 ? "" : sb.substring(0, sb.length() - 1);
}
public Card getSourceCard() {