github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 03:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added additional parameter for effect outcome. Updated choosing permanents for AI.

Browse source
This commit is contained in:
magenoxx 2012-03-26 10:59:04 +04:00
parent 7ecf9f125d
commit 523481b5a2
9 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
View file

@ -196,12 +196,16 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
}
if (target instanceof TargetPermanent) {
List<Permanent> targets;
if (outcome.isGood()) {
targets = threats(playerId, ((TargetPermanent)target).getFilter(), game, target.getTargets());
}
else {
targets = threats(opponentId, ((TargetPermanent)target).getFilter(), game, target.getTargets());
}
if (outcome.isCanTargetAll()) {
targets = threats(null, ((TargetPermanent)target).getFilter(), game, target.getTargets());
} else {
if (outcome.isGood()) {
targets = threats(playerId, ((TargetPermanent)target).getFilter(), game, target.getTargets());
}
else {
targets = threats(opponentId, ((TargetPermanent)target).getFilter(), game, target.getTargets());
}
}
for (Permanent permanent: targets) {
if (((TargetPermanent)target).canTarget(playerId, permanent.getId(), null, game) && !target.getTargets().contains(permanent.getId())) {
target.add(permanent.getId(), game);
@ -1486,7 +1490,10 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
}
protected List<Permanent> threats(UUID playerId, FilterPermanent filter, Game game, List<UUID> targets) {
List<Permanent> threats = game.getBattlefield().getAllActivePermanents(filter, playerId);
List<Permanent> threats = playerId == null ?
game.getBattlefield().getAllActivePermanents(filter) :
game.getBattlefield().getAllActivePermanents(filter, playerId);
Iterator<Permanent> it = threats.iterator();
while (it.hasNext()) { // remove permanents already targetted
Permanent test = it.next();
@ -1494,6 +1501,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
it.remove();
}
Collections.sort(threats, new PermanentComparator(game));
Collections.reverse(threats);
return threats;
}

BIN
Mage.Server/plugins/mage-player-ai-ma.jar
View file

Binary file not shown.

BIN
Mage.Server/plugins/mage-player-ai.jar
View file

Binary file not shown.

BIN
Mage.Server/plugins/mage-player-aimcts.jar
View file

Binary file not shown.

BIN
Mage.Server/plugins/mage-player-aiminimax.jar
View file

Binary file not shown.

BIN
Mage.Tests/plugins/mage-player-ai-ma.jar
View file

Binary file not shown.

BIN
Mage.Tests/plugins/mage-player-ai.jar
View file

Binary file not shown.

BIN
Mage.Tests/plugins/mage-player-aiminimax.jar
View file

Binary file not shown.

13
Mage/src/mage/Constants.java
View file

@ -341,23 +341,32 @@ public final class Constants {
Transform(true),
Untap(true),
Win(true),
Copy(true),
Copy(true, true),
Benefit(true),
Detriment(false),
Neutral(true),
Removal(true);
private boolean good;
private boolean canTargetAll;
Outcome(boolean good) {
this.good = good;
}
Outcome(boolean good, boolean canTargetAll) {
this.good = good;
this.canTargetAll = canTargetAll;
}
public boolean isGood() {
return good;
}
}
public boolean isCanTargetAll() {
return canTargetAll;
}
}
public enum Zone {
HAND, GRAVEYARD, LIBRARY, BATTLEFIELD, STACK, EXILED, ALL, OUTSIDE, PICK, COMMAND;