This commit is contained in:
magenoxx 2012-06-29 20:31:25 +04:00
parent 10eeea50bc
commit 96c09e940c

View file

@ -147,8 +147,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
return true; return true;
} }
} }
} } else {
else {
if (target.canTarget(opponentId, game)) { if (target.canTarget(opponentId, game)) {
target.add(opponentId, game); target.add(opponentId, game);
return true; return true;
@ -201,8 +200,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
} else { } else {
if (outcome.isGood()) { if (outcome.isGood()) {
targets = threats(playerId, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets()); targets = threats(playerId, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets());
} } else {
else {
targets = threats(opponentId, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets()); targets = threats(opponentId, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets());
} }
} }
@ -227,8 +225,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
TargetCreatureOrPlayer t = ((TargetCreatureOrPlayer) target); TargetCreatureOrPlayer t = ((TargetCreatureOrPlayer) target);
if (outcome.isGood()) { if (outcome.isGood()) {
targets = threats(playerId, sourceId, ((FilterCreatureOrPlayer) t.getFilter()).getCreatureFilter(), game, target.getTargets()); targets = threats(playerId, sourceId, ((FilterCreatureOrPlayer) t.getFilter()).getCreatureFilter(), game, target.getTargets());
} } else {
else {
targets = threats(opponentId, sourceId, ((FilterCreatureOrPlayer) t.getFilter()).getCreatureFilter(), game, target.getTargets()); targets = threats(opponentId, sourceId, ((FilterCreatureOrPlayer) t.getFilter()).getCreatureFilter(), game, target.getTargets());
} }
for (Permanent permanent : targets) { for (Permanent permanent : targets) {
@ -245,8 +242,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
target.add(playerId, game); target.add(playerId, game);
return true; return true;
} }
} } else {
else {
if (target.canTarget(opponentId, null, game)) { if (target.canTarget(opponentId, null, game)) {
target.add(opponentId, game); target.add(opponentId, game);
return true; return true;
@ -260,8 +256,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
TargetPermanentOrPlayer t = ((TargetPermanentOrPlayer) target); TargetPermanentOrPlayer t = ((TargetPermanentOrPlayer) target);
if (outcome.isGood()) { if (outcome.isGood()) {
targets = threats(playerId, sourceId, ((FilterPermanentOrPlayer) t.getFilter()).getPermanentFilter(), game, target.getTargets()); targets = threats(playerId, sourceId, ((FilterPermanentOrPlayer) t.getFilter()).getPermanentFilter(), game, target.getTargets());
} } else {
else {
targets = threats(opponentId, sourceId, ((FilterPermanentOrPlayer) t.getFilter()).getPermanentFilter(), game, target.getTargets()); targets = threats(opponentId, sourceId, ((FilterPermanentOrPlayer) t.getFilter()).getPermanentFilter(), game, target.getTargets());
} }
for (Permanent permanent : targets) { for (Permanent permanent : targets) {
@ -278,8 +273,7 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
target.add(playerId, game); target.add(playerId, game);
return true; return true;
} }
} } else {
else {
if (target.canTarget(opponentId, null, game)) { if (target.canTarget(opponentId, null, game)) {
target.add(opponentId, game); target.add(opponentId, game);
return true; return true;