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

gui: improved multi amount dialog (added cancel option, added mana symbols support in messages, improved form structure)

Browse source
This commit is contained in:
Oleg Agafonov 2023-11-02 12:30:40 +04:00
parent 00fcdc4653
commit 81d44e615f
6 changed files with 211 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -2154,6 +2154,9 @@ public class HumanPlayer extends PlayerImpl {
Map<String, Serializable> options = new HashMap<>(2);
options.put("title", type.getTitle());
options.put("header", type.getHeader());
if (type.isCanCancel()) {
options.put("canCancel", true);
}
game.fireGetMultiAmountEvent(playerId, messages, min, max, options);
}
waitForResponse(game);
@ -2169,11 +2172,17 @@ public class HumanPlayer extends PlayerImpl {
logger.error(String.format("GUI return wrong MultiAmountType values: %d %d %d - %s", needCount, min, max, response.getString()));
game.informPlayer(this, "Error, you must enter correct values.");
}
} else if (type.isCanCancel() && response.getBoolean() != null) {
answer = null;
break;
}
}
if (answer != null) {
return answer;
} else if (type.isCanCancel()) {
// cancel
return null;
} else {
// something wrong, e.g. player disconnected
return defaultList;