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

Fixed a AI target selecting problem.

Browse source
This commit is contained in:
LevelX2 2018-04-19 21:02:34 +02:00
parent cdd6094f59
commit 47ad1ea0ee
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -576,6 +576,41 @@ public class ComputerPlayer extends PlayerImpl implements Player {
} }
} }
} }
}
if (target.getOriginalTarget() instanceof TargetPlayerOrPlaneswalker) {
List<Permanent> targets;
TargetPlayerOrPlaneswalker t = ((TargetPlayerOrPlaneswalker) target);
if (outcome.isGood()) {
targets = threats(abilityControllerId, source.getSourceId(), ((FilterPermanentOrPlayer) t.getFilter()).getPermanentFilter(), game, target.getTargets());
} else {
targets = threats(randomOpponentId, source.getSourceId(), ((FilterPermanentOrPlayer) t.getFilter()).getPermanentFilter(), game, target.getTargets());
}
if (targets.isEmpty()) {
if (outcome.isGood()) {
if (target.canTarget(getId(), abilityControllerId, source, game)) {
target.addTarget(abilityControllerId, source, game);
return true;
}
} else if (target.canTarget(getId(), randomOpponentId, source, game)) {
target.addTarget(randomOpponentId, source, game);
return true;
}
}
if (targets.isEmpty() && target.isRequired(source)) {
targets = game.getBattlefield().getActivePermanents(((TargetPlayerOrPlaneswalker) t.getFilter()).getPlaneswalkerFilter(), playerId, game);
}
for (Permanent permanent : targets) {
List<UUID> alreadyTargetted = target.getTargets();
if (t.canTarget(abilityControllerId, permanent.getId(), source, game)) {
if (alreadyTargetted != null && !alreadyTargetted.contains(permanent.getId())) {
target.addTarget(permanent.getId(), source, game);
return true;
}
}
}
if (outcome.isGood()) { if (outcome.isGood()) {
if (target.canTarget(getId(), abilityControllerId, source, game)) { if (target.canTarget(getId(), abilityControllerId, source, game)) {
@ -753,6 +788,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
} }
return target.isChosen(); return target.isChosen();
} }
throw new IllegalStateException("Target wasn't handled. class:" + target.getClass().toString()); throw new IllegalStateException("Target wasn't handled. class:" + target.getClass().toString());
} //end of chooseTarget method } //end of chooseTarget method

5
Mage/src/main/java/mage/target/common/TargetPlayerOrPlaneswalker.java
View file

@ -12,6 +12,7 @@ import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.Filter; import mage.filter.Filter;
import mage.filter.common.FilterPlaneswalkerPermanent;
import mage.filter.common.FilterPlayerOrPlaneswalker; import mage.filter.common.FilterPlayerOrPlaneswalker;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -213,6 +214,10 @@ public class TargetPlayerOrPlaneswalker extends TargetImpl {
return sb.toString(); return sb.toString();
} }
public FilterPlaneswalkerPermanent getPlaneswalkerFilter() {
return filter.getPlaneswalkerFilter();
}
@Override @Override
public TargetPlayerOrPlaneswalker copy() { public TargetPlayerOrPlaneswalker copy() {
return new TargetPlayerOrPlaneswalker(this); return new TargetPlayerOrPlaneswalker(this);