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

Player: replace Hand revealed with MayLookAt

Browse Source
This commit is contained in:
Hans Mackowiak
2021-12-25 13:27:46 +00:00
committed by Michael Kamensky
parent c6a5d74e4c
commit 84f3c9f393
14 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-ai/src/main/java/forge/ai/ComputerUtil.java
View File

@@ -1414,6 +1414,9 @@ public class ComputerUtil {
all.addAll(ai.getCardsIn(ZoneType.Hand));
for (final Card c : all) {
if (c.getZone().getPlayer() != null && c.getZone().getPlayer() != ai && c.mayPlay(ai).isEmpty()) {
continue;
}
for (final SpellAbility sa : c.getSpellAbilities()) {
if (sa.getApi() == ApiType.Pump && sa.hasParam("KW") && sa.getParam("KW").contains("Haste")) {
return true;
@@ -1449,11 +1452,17 @@ public class ComputerUtil {
final CardCollection all = new CardCollection(ai.getCardsIn(ZoneType.Battlefield));
all.addAll(ai.getCardsActivableInExternalZones(true));
if (!checkingOther || ai.hasKeyword("Play with your hand revealed.")) {
// TODO check if cards can be viewed instead
if (!checkingOther) {
all.addAll(ai.getCardsIn(ZoneType.Hand));
}
for (final Card c : all) {
// check if card is at least available to be played
// further improvements might consider if AI has options to steal the spell by making it playable first
if (c.getZone().getPlayer() != null && c.getZone().getPlayer() != ai && c.mayPlay(ai).isEmpty()) {
continue;
}
for (final SpellAbility sa : c.getSpellAbilities()) {
if (sa.getApi() != ApiType.Fog) {
continue;
@@ -1461,7 +1470,7 @@ public class ComputerUtil {
// Avoid re-entry for cards already being considered (e.g. in case the AI is considering
// Convoke or Improvise for a Fog-like effect)
if (c.hasKeyword("Convoke") || c.hasKeyword("Improvise")) {
if (c.hasKeyword(Keyword.CONVOKE) || c.hasKeyword(Keyword.IMPROVISE)) {
// TODO skipping for now else this will lead to GUI interaction
if (!c.getController().isAI()) {
continue;
@@ -1488,6 +1497,9 @@ public class ComputerUtil {
all.addAll(CardLists.filter(ai.getCardsIn(ZoneType.Hand), Predicates.not(Presets.PERMANENTS)));
for (final Card c : all) {
if (c.getZone().getPlayer() != null && c.getZone().getPlayer() != ai && c.mayPlay(ai).isEmpty()) {
continue;
}
for (final SpellAbility sa : c.getSpellAbilities()) {
if (sa.getApi() != ApiType.DealDamage) {
continue;

3
forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
View File

@@ -1086,6 +1086,9 @@ public class DamageDealAi extends DamageAiBase {
cards.addAll(ai.getCardsIn(ZoneType.Battlefield));
cards.addAll(ai.getCardsActivableInExternalZones(true));
for (Card c : cards) {
if (c.getZone().getPlayer() != null && c.getZone().getPlayer() != ai && c.mayPlay(ai).isEmpty()) {
continue;
}
for (SpellAbility ab : c.getSpellAbilities()) {
if (ab.equals(sa) || ab.getSubAbility() != null) { // decisions for complex SAs with subs are not supported yet
continue;