mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
format
This commit is contained in:
parent
10eeea50bc
commit
96c09e940c
1 changed files with 23 additions and 29 deletions
|
@ -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;
|
||||||
|
@ -184,11 +183,11 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
|
||||||
}
|
}
|
||||||
if (target instanceof TargetControlledPermanent) {
|
if (target instanceof TargetControlledPermanent) {
|
||||||
List<Permanent> targets;
|
List<Permanent> targets;
|
||||||
targets = threats(playerId, sourceId, ((TargetControlledPermanent)target).getFilter(), game, target.getTargets());
|
targets = threats(playerId, sourceId, ((TargetControlledPermanent) target).getFilter(), game, target.getTargets());
|
||||||
if (!outcome.isGood())
|
if (!outcome.isGood())
|
||||||
Collections.reverse(targets);
|
Collections.reverse(targets);
|
||||||
for (Permanent permanent: targets) {
|
for (Permanent permanent : targets) {
|
||||||
if (((TargetControlledPermanent)target).canTarget(playerId, permanent.getId(), null, game) && !target.getTargets().contains(permanent.getId())) {
|
if (((TargetControlledPermanent) target).canTarget(playerId, permanent.getId(), null, game) && !target.getTargets().contains(permanent.getId())) {
|
||||||
target.add(permanent.getId(), game);
|
target.add(permanent.getId(), game);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -197,39 +196,37 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
|
||||||
if (target instanceof TargetPermanent) {
|
if (target instanceof TargetPermanent) {
|
||||||
List<Permanent> targets;
|
List<Permanent> targets;
|
||||||
if (outcome.isCanTargetAll()) {
|
if (outcome.isCanTargetAll()) {
|
||||||
targets = threats(null, sourceId, ((TargetPermanent)target).getFilter(), game, target.getTargets());
|
targets = threats(null, sourceId, ((TargetPermanent) target).getFilter(), game, target.getTargets());
|
||||||
} 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());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (Permanent permanent: targets) {
|
for (Permanent permanent : targets) {
|
||||||
if (((TargetPermanent)target).canTarget(playerId, permanent.getId(), null, game) && !target.getTargets().contains(permanent.getId())) {
|
if (((TargetPermanent) target).canTarget(playerId, permanent.getId(), null, game) && !target.getTargets().contains(permanent.getId())) {
|
||||||
target.add(permanent.getId(), game);
|
target.add(permanent.getId(), game);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ( target instanceof TargetCardInHand ) {
|
if (target instanceof TargetCardInHand) {
|
||||||
List<Card> cards = new ArrayList<Card>();
|
List<Card> cards = new ArrayList<Card>();
|
||||||
cards.addAll(this.hand.getCards(game));
|
cards.addAll(this.hand.getCards(game));
|
||||||
Card pick = pickTarget(cards, outcome, target, null, game);
|
Card pick = pickTarget(cards, outcome, target, null, game);
|
||||||
if ( pick != null ) {
|
if (pick != null) {
|
||||||
target.add(pick.getId(), game);
|
target.add(pick.getId(), game);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (target instanceof TargetCreatureOrPlayer) {
|
if (target instanceof TargetCreatureOrPlayer) {
|
||||||
List<Permanent> targets;
|
List<Permanent> targets;
|
||||||
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) {
|
||||||
List<UUID> alreadyTargetted = target.getTargets();
|
List<UUID> alreadyTargetted = target.getTargets();
|
||||||
|
@ -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;
|
||||||
|
@ -257,12 +253,11 @@ public class ComputerPlayer<T extends ComputerPlayer<T>> extends PlayerImpl<T> i
|
||||||
}
|
}
|
||||||
if (target instanceof TargetPermanentOrPlayer) {
|
if (target instanceof TargetPermanentOrPlayer) {
|
||||||
List<Permanent> targets;
|
List<Permanent> targets;
|
||||||
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) {
|
||||||
List<UUID> alreadyTargetted = target.getTargets();
|
List<UUID> alreadyTargetted = target.getTargets();
|
||||||
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue