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

Merge branch 'discard' into 'master'

Browse Source 
DiscardAi: Improve targeting

See merge request core-developers/forge!5441
This commit is contained in:
Michael Kamensky
2021-09-26 17:48:55 +00:00
parent 3967814f0b 889c5fbf86
commit 4ba9472a60
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-ai/src/main/java/forge/ai/ability/DiscardAi.java
View File

@@ -1,5 +1,6 @@
package forge.ai.ability;
import java.util.Collections;
import java.util.List;
import forge.ai.AiAttackController;
@@ -18,6 +19,7 @@ import forge.game.cost.Cost;
import forge.game.phase.PhaseType;
import forge.game.player.Player;
import forge.game.player.PlayerActionConfirmMode;
import forge.game.player.PlayerCollection;
import forge.game.spellability.SpellAbility;
import forge.game.spellability.TargetRestrictions;
import forge.game.zone.ZoneType;
@@ -147,7 +149,9 @@ public class DiscardAi extends SpellAbilityAi {
private boolean discardTargetAI(final Player ai, final SpellAbility sa) {
final TargetRestrictions tgt = sa.getTargetRestrictions();
for (Player opp : ai.getOpponents()) {
final PlayerCollection opps = ai.getOpponents();
Collections.shuffle(opps);
for (Player opp : opps) {
if (opp.getCardsIn(ZoneType.Hand).isEmpty() && !ComputerUtil.activateForCost(sa, ai)) {
continue;
} else if (!opp.canDiscardBy(sa)) { // e.g. Tamiyo, Collector of Tales
@@ -155,6 +159,7 @@ public class DiscardAi extends SpellAbilityAi {
}
if (tgt != null) {
if (sa.canTarget(opp)) {
sa.resetTargets();
sa.getTargets().add(opp);
return true;
}