Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[READY FOR REVIEW] Implement a "multi-amount" dialog (#7528)

Browse source 
* Implemented chooseTargetAmount and new GUI dialog (distribute damage, distribute mana)
* Added tests and AI support;
* Test framework: added aliases support in TargetAmount dialogs;

Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
This commit is contained in:
Daniel Bomar 2021-04-17 05:28:01 -05:00 • committed by GitHub
parent 042aa61ad4
commit 600cac6fc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 1209 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Mage/src/main/java/mage/target/TargetImpl.java
View file

@ -278,51 +278,60 @@ public abstract class TargetImpl implements Target {
@Override
public boolean choose(Outcome outcome, UUID playerId, UUID sourceId, Game game) {
Player player = game.getPlayer(playerId);
if (player == null) {
Player targetController = getTargetController(game, playerId);
if (targetController == null) {
return false;
}
while (!isChosen() && !doneChosing()) {
if (!player.canRespond()) {
return chosen = targets.size() >= getNumberOfTargets();
chosen = targets.size() >= getNumberOfTargets();
do {
if (!targetController.canRespond()) {
return chosen;
}
chosen = targets.size() >= getNumberOfTargets();
if (!player.choose(outcome, this, sourceId, game)) {
if (!targetController.choose(outcome, this, sourceId, game)) {
return chosen;
}
chosen = targets.size() >= getNumberOfTargets();
}
return chosen = true;
} while (!isChosen() && !doneChosing());
return chosen;
}
@Override
public boolean chooseTarget(Outcome outcome, UUID playerId, Ability source, Game game) {
Player player = game.getPlayer(playerId);
if (player == null) {
Player targetController = getTargetController(game, playerId);
if (targetController == null) {
return false;
}
List<UUID> possibleTargets = new ArrayList<>(possibleTargets(source.getSourceId(), playerId, game));
while (!isChosen() && !doneChosing()) {
if (!player.canRespond()) {
return chosen = targets.size() >= getNumberOfTargets();
chosen = targets.size() >= getNumberOfTargets();
do {
if (!targetController.canRespond()) {
return chosen;
}
chosen = targets.size() >= getNumberOfTargets();
if (isRandom()) {
if (!possibleTargets.isEmpty()) {
int index = RandomUtil.nextInt(possibleTargets.size());
this.addTarget(possibleTargets.get(index), source, game);
possibleTargets.remove(index);
} else {
if (possibleTargets.isEmpty()) {
return chosen;
}
} else if (!getTargetController(game, playerId).chooseTarget(outcome, this, source, game)) {
// find valid target
while (!possibleTargets.isEmpty()) {
int index = RandomUtil.nextInt(possibleTargets.size());
if (this.canTarget(playerId, possibleTargets.get(index), source, game)) {
this.addTarget(possibleTargets.get(index), source, game);
possibleTargets.remove(index);
break;
} else {
possibleTargets.remove(index);
}
}
} else if (!targetController.chooseTarget(outcome, this, source, game)) {
return chosen;
}
chosen = targets.size() >= getNumberOfTargets();
}
return chosen = true;
} while (!isChosen() && !doneChosing());
return chosen;
}
@Override
@ -574,4 +583,14 @@ public abstract class TargetImpl implements Target {
public void setEventReporting(boolean shouldReport) {
this.shouldReportEvents = shouldReport;
}
@Override
public int getSize() {
return targets.size();
}
@Override
public boolean contains(UUID targetId) {
return targets.containsKey(targetId);
}
}