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

* UI: added cancel button for all target definition abilities;

Browse source
This commit is contained in:
Oleg Agafonov 2019-03-10 23:31:11 +04:00
parent 904660e624
commit dab481ee17
3 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage/src/main/java/mage/target/Targets.java
View file

@ -64,7 +64,7 @@ public class Targets extends ArrayList<Target> {
return true;
}
public boolean chooseTargets(Outcome outcome, UUID playerId, Ability source, boolean noMana, Game game) {
public boolean chooseTargets(Outcome outcome, UUID playerId, Ability source, boolean noMana, Game game, boolean canCancel) {
if (this.size() > 0) {
if (!canChoose(source.getSourceId(), playerId, game)) {
return false;
@ -73,12 +73,23 @@ public class Targets extends ArrayList<Target> {
while (!isChosen()) {
Target target = this.getUnchosen().get(0);
UUID targetController = playerId;
if (target.getTargetController() != null) { // some targets can have controller different than ability controller
// some targets can have controller different than ability controller
if (target.getTargetController() != null) {
targetController = target.getTargetController();
}
if (noMana) { // if cast without mana (e.g. by suspend you may not be able to cancel the casting if you are able to cast it
// if cast without mana (e.g. by suspend you may not be able to cancel the casting if you are able to cast it
if (noMana) {
target.setRequired(true);
}
// can be cancel by user
if (canCancel) {
target.setRequired(false);
}
// make response checks
if (!target.chooseTarget(outcome, targetController, source, game)) {
return false;
}