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

Treat replaceAbilityText bandaids

Browse Source
This commit is contained in:
tool4EvEr
2023-05-25 22:04:17 +02:00
parent ea4cfaf9b7
commit d4030e0f1d
6 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/PlayAi.java
View File

@@ -120,7 +120,7 @@ public class PlayAi extends SpellAbilityAi {
if ("ReplaySpell".equals(sa.getParam("AILogic"))) {
return ComputerUtil.targetPlayableSpellCard(ai, getPlayableCards(sa, ai), sa, sa.hasParam("WithoutManaCost"), mandatory);
}
}
return checkApiLogic(ai, sa);
}

14
forge-ai/src/main/java/forge/ai/ability/UntapAi.java
View File

@@ -5,6 +5,7 @@ import java.util.Map;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilAbility;
@@ -307,11 +308,18 @@ public class UntapAi extends SpellAbilityAi {
return true;
}
@Override
public Card chooseSingleCard(Player ai, SpellAbility sa, Iterable<Card> list, boolean isOptional, Player targetedPlayer, Map<String, Object> params) {
PlayerCollection pl = ai.getYourTeam();
return ComputerUtilCard.getBestAI(CardLists.filterControlledBy(list, pl));
CardCollection pref = CardLists.filterControlledBy(list, ai.getYourTeam());
if (Iterables.isEmpty(pref)) {
if (isOptional) {
return null;
}
} else {
list = pref;
}
return ComputerUtilCard.getBestAI(list);
}
private static Card detectPriorityUntapTargets(final List<Card> untapList) {