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

- AttachAI shouldn't assume it targets

Browse Source
This commit is contained in:
Sol
2016-02-11 20:35:26 +00:00
parent 2c2676f999
commit b79862bcd3
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
forge-ai/src/main/java/forge/ai/ability/AttachAi.java
View File

@@ -659,7 +659,7 @@ public class AttachAi extends SpellAbilityAi {
prefList = CardLists.filter(prefList, new Predicate<Card>() { prefList = CardLists.filter(prefList, new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
return ComputerUtilCombat.canAttackNextTurn(c) && c.getNetPower() > 0; return ComputerUtilCombat.canAttackNextTurn(c) && c.getNetPower() > 0;
} }
}); });
} }
@@ -998,7 +998,7 @@ public class AttachAi extends SpellAbilityAi {
if (!c.isCreature()) { if (!c.isCreature()) {
return true; return true;
} }
return ComputerUtilCombat.canAttackNextTurn(c) && powerBonus + c.getNetPower() > 0; return ComputerUtilCombat.canAttackNextTurn(c) && powerBonus + c.getNetPower() > 0;
} }
}); });
} }
@@ -1047,16 +1047,20 @@ public class AttachAi extends SpellAbilityAi {
return null; return null;
} }
CardCollection list = CardLists.getValidCards(aiPlayer.getGame().getCardsIn(tgt.getZone()), tgt.getValidTgts(), sa.getActivatingPlayer(), attachSource); CardCollection list = null;
if (tgt == null) {
// TODO If Attaching without casting, don't need to actually target. list = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("Defined"), sa);
// I believe this is the only case where mandatory will be true, so just
// check that when starting that work
// But we shouldn't attach to things with Protection
if (!mandatory) {
list = CardLists.getTargetableCards(list, sa);
} else { } else {
list = CardLists.filter(list, Predicates.not(CardPredicates.isProtectedFrom(attachSource))); list = CardLists.getValidCards(aiPlayer.getGame().getCardsIn(tgt.getZone()), tgt.getValidTgts(), sa.getActivatingPlayer(), attachSource);
// TODO If Attaching without casting, don't need to actually target.
// I believe this is the only case where mandatory will be true, so just
// check that when starting that work
// But we shouldn't attach to things with Protection
if (!mandatory) {
list = CardLists.getTargetableCards(list, sa);
} else {
list = CardLists.filter(list, Predicates.not(CardPredicates.isProtectedFrom(attachSource)));
}
} }
if (list.isEmpty()) { if (list.isEmpty()) {