External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* UI: improved choose target amount dialog (selected targets can be removed/de-selected);

Browse source
This commit is contained in:
Oleg Agafonov 2019-09-24 08:40:58 +04:00
parent eafb4eb653
commit 6cc2472ed6
2 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Mage/src/main/java/mage/target/TargetAmount.java
View file

@ -1,5 +1,3 @@
package mage.target;
import mage.abilities.Ability;
@ -7,11 +5,14 @@ import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.constants.Outcome;
import mage.game.Game;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public abstract class TargetAmount extends TargetImpl {
@ -63,8 +64,8 @@ public abstract class TargetAmount extends TargetImpl {
public void setAmountDefinition(DynamicValue amount) {
this.amount = amount;
}
}
public void setAmount(Ability source, Game game) {
remainingAmount = amount.calculate(game, source, null);
amountWasSet = true;
@ -82,6 +83,13 @@ public abstract class TargetAmount extends TargetImpl {
}
}
@Override
public void remove(UUID id) {
int amount = getTargetAmount(id);
super.remove(id);
this.remainingAmount += amount;
}
@Override
public boolean chooseTarget(Outcome outcome, UUID playerId, Ability source, Game game) {
if (!amountWasSet) {
@ -111,7 +119,7 @@ public abstract class TargetAmount extends TargetImpl {
if (!amountWasSet) {
setAmount(source, game);
}
for (UUID targetId: targets) {
for (UUID targetId : targets) {
for (int n = 1; n <= target.remainingAmount; n++) {
TargetAmount t = target.copy();
t.addTarget(targetId, n, source, game, true);
@ -120,8 +128,7 @@ public abstract class TargetAmount extends TargetImpl {
Set<UUID> newTargets = targets.stream().filter(newTarget -> !newTarget.equals(targetId)).collect(Collectors.toSet());
addTargets(t, newTargets, options, source, game);
}
}
else {
} else {
options.add(t);
}
}