From ac286a586d45868b9911740675f8531591a3abbe Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 19 Apr 2019 09:03:16 +0400 Subject: [PATCH] Fixed mode text, added 4 modes support; --- Mage/src/main/java/mage/abilities/Modes.java | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/Modes.java b/Mage/src/main/java/mage/abilities/Modes.java index 98def5bddb6..c7eb75fbb0f 100644 --- a/Mage/src/main/java/mage/abilities/Modes.java +++ b/Mage/src/main/java/mage/abilities/Modes.java @@ -335,26 +335,31 @@ public class Modes extends LinkedHashMap { if (this.getMaxModesFilter() != null) { sb.append("choose one or more. Each mode must target ").append(getMaxModesFilter().getMessage()); } else if (this.getMinModes() == 0 && this.getMaxModes() == 1) { - sb.append("choose up to one "); + sb.append("choose up to one"); } else if (this.getMinModes() == 1 && this.getMaxModes() > 2) { - sb.append("choose one or more "); + sb.append("choose one or more"); } else if (this.getMinModes() == 1 && this.getMaxModes() == 2) { - sb.append("choose one or both "); + sb.append("choose one or both"); } else if (this.getMinModes() == 2 && this.getMaxModes() == 2) { - sb.append("choose two "); + sb.append("choose two"); } else if (this.getMinModes() == 3 && this.getMaxModes() == 3) { - sb.append("choose three "); + sb.append("choose three"); + } else if (this.getMinModes() == 4 && this.getMaxModes() == 4) { + sb.append("choose four"); } else { - sb.append("choose one "); + sb.append("choose one"); } + if (isEachModeOnlyOnce()) { - sb.append("that hasn't been chosen "); + sb.append(" that hasn't been chosen"); } + if (isEachModeMoreThanOnce()) { sb.append(". You may choose the same mode more than once.
"); } else { - sb.append("—
"); + sb.append(" —
"); } + for (Mode mode : this.values()) { sb.append("&bull "); sb.append(mode.getEffects().getTextStartingUpperCase(mode));