refactor: improved ability's modes code (related to #11333)

This commit is contained in:
Oleg Agafonov 2023-10-23 21:53:29 +04:00
parent fec5de873b
commit b7ce9c80f0
32 changed files with 162 additions and 137 deletions

View file

@ -2409,7 +2409,7 @@ public class HumanPlayer extends PlayerImpl {
Mode selectedMode = modes.get(selectedModeId);
if (mode.getId().equals(selectedMode.getId())) {
// mode selected
if (modes.isEachModeMoreThanOnce()) {
if (modes.isMayChooseSameModeMoreThanOnce()) {
// can select again
} else {
// hide mode from dialog
@ -2423,7 +2423,7 @@ public class HumanPlayer extends PlayerImpl {
if (obj != null) {
modeText = modeText.replace("{this}", obj.getName());
}
if (modes.isEachModeMoreThanOnce()) {
if (modes.isMayChooseSameModeMoreThanOnce()) {
if (timesSelected > 0) {
modeText = "(selected " + timesSelected + "x) " + modeText;
}