mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 19:58:00 +00:00
Revert "- Attempting to avoid an AI logic spec (needs testing)."
This reverts commit 7703178
This commit is contained in:
@@ -298,10 +298,8 @@ public class ChangeZoneAi extends SpellAbilityAi {
|
|||||||
} else {
|
} else {
|
||||||
if (sa.hasParam("DefinedPlayer")) {
|
if (sa.hasParam("DefinedPlayer")) {
|
||||||
pDefined = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("DefinedPlayer"), sa);
|
pDefined = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("DefinedPlayer"), sa);
|
||||||
} else if (sa.hasParam("Defined")) {
|
|
||||||
pDefined = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Defined"), sa);
|
|
||||||
} else {
|
} else {
|
||||||
pDefined = ai.getGame().getPlayers(); // no Defined players, assume all player zones
|
pDefined = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Defined"), sa);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -316,7 +314,11 @@ public class ChangeZoneAi extends SpellAbilityAi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (final Player p : pDefined) {
|
for (final Player p : pDefined) {
|
||||||
CardCollectionView list = p.getCardsIn(origin);
|
// TODO: figure out how to make the AI properly establish which zones to look in for cards like Sisters of Stone Death
|
||||||
|
// without needing a separate AI logic for it (the issue is that there's no Defined/DefinedPlayer in cards like that, and
|
||||||
|
// the AI normally defaults to its own zone in these cases)
|
||||||
|
CardCollectionView list = "CheckAllPlayerZones".equals(sa.getParam("AILogic")) ? p.getGame().getCardsIn(origin)
|
||||||
|
: p.getCardsIn(origin);
|
||||||
|
|
||||||
if (type != null && p == ai) {
|
if (type != null && p == ai) {
|
||||||
// AI only "knows" about his information
|
// AI only "knows" about his information
|
||||||
|
|||||||
Reference in New Issue
Block a user