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

tweaks for AI improvement

Browse Source
This commit is contained in:
Northmoc
2023-11-30 11:10:56 -05:00
parent b94a2868d8
commit fa3d1366fa
22 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -2903,7 +2903,6 @@ public class CardFactoryUtil {
return;
}
String[] k = keyword.split(":");
String cost = "Exile<1/CARDNAME> Exile " + k[1];
final StringBuilder cd = new StringBuilder();
cd.append(k[0]).append(" with ");
@@ -2928,6 +2927,8 @@ public class CardFactoryUtil {
}
}
String partType = part.getType();
//consume .Other from most partTypes
if (partType.contains(".Other")) partType = partType.replace(".Other", "");
String singNoun = part.getTypeDescription() != null ? part.getTypeDescription() :
CardType.CoreType.isValidEnum(partType) ? partType.toLowerCase() : partType;
if (singNoun.equalsIgnoreCase("Permanent")) break;
@@ -2940,11 +2941,11 @@ public class CardFactoryUtil {
cd.append(kCost.getCostMana() != null ? kCost.getCostMana().toString() : "no mana?");
// Create return transformed ability string
String ab = "AB$ ChangeZone | CostDesc$ " + cd.toString() + " | Cost$ " + cost + " | Origin$ Exile | " +
"Destination$ Battlefield | Transformed$ True | Defined$ CorrectedSelf | Craft$ True | " +
"XAnnounceTitle$ " + Localizer.getInstance().getMessage("lblCraft") + " | SorcerySpeed$ True" +
" | StackDescription$ Return this card transformed under its owner's control. (Craft) | " +
"SpellDescription$ (" + inst.getReminderText() + ")";
String ab = "AB$ ChangeZone | CostDesc$ " + cd.toString() + " | Cost$ Exile<1/CARDNAME> " + k[1] + " | " +
"Origin$ Exile | Destination$ Battlefield | Transformed$ True | Defined$ CorrectedSelf | " +
"Craft$ True | XAnnounceTitle$ " + Localizer.getInstance().getMessage("lblCraft") + " | " +
"SorcerySpeed$ True | StackDescription$ Return this card transformed under its owner's control. " +
"(Craft) | SpellDescription$ (" + inst.getReminderText() + ")";
final SpellAbility newSA = AbilityFactory.getAbility(ab, card);
newSA.setIntrinsic(intrinsic);
inst.addSpellAbility(newSA);

30
forge-game/src/main/java/forge/game/cost/CostExile.java
View File

@@ -22,10 +22,7 @@ import forge.card.CardType;
import forge.game.Game;
import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardCollectionView;
import forge.game.card.CardLists;
import forge.game.card.CardPredicates;
import forge.game.card.*;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
@@ -176,12 +173,8 @@ public class CostExile extends CostPartWithList {
type = TextUtil.fastReplace(type, "FromTopGrave", "");
}
CardCollectionView list;
if (zoneRestriction != 1) {
list = game.getCardsIn(this.from);
} else {
list = payer.getCardsIn(this.from);
}
CardCollection list = new CardCollection(zoneRestriction != 1 ? game.getCardsIn(this.from) :
payer.getCardsIn(this.from));
if (this.payCostFromSource()) {
return list.contains(source);
@@ -230,6 +223,21 @@ public class CostExile extends CostPartWithList {
return CardLists.cmcCanSumTo(i, list);
}
// for Craft: do not count the source card twice (it will be sacrificed)
if (ability.isCraft()) {
CostExile firstExileCost = ability.getPayCosts().getCostPartByType(CostExile.class);
if (firstExileCost != null && firstExileCost.payCostFromSource()) list.remove(ability.getHostCard());
// TODO: UGLY HACK! Ideally there should be no AI-specific code here, but not adding any (and adding it into ComputerUtil.chooseExileFrom)
// makes the game fail to play the SA with "AI failed to play....".
if (payer.isAI()) {
CardCollection toRemove = new CardCollection();
for (Card exileTgt : list) {
if (exileTgt.isInPlay() && exileTgt.getCMC() >= 3) toRemove.add(exileTgt);
}
list.removeAll(toRemove);
}
}
// for cards like Allosaurus Rider, do not count it
if (this.from.size() == 1 && this.from.get(0).equals(ZoneType.Hand) && source.isInZone(ZoneType.Hand)
&& list.contains(source)) {
@@ -269,6 +277,8 @@ public class CostExile extends CostPartWithList {
String amount = this.getAmount();
int amt = StringUtils.isNumeric(amount) ? Integer.parseInt(amount) : 0;
String partType = this.getType();
//consume .Other from most partTypes
if (partType.contains(".Other")) partType = partType.replace(".Other", "");
String singNoun = this.getTypeDescription() != null ? this.getTypeDescription() :
CardType.CoreType.isValidEnum(partType) || partType.equals("Permanent") ? partType.toLowerCase() :
partType;