diff --git a/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java index a0436020c2f..74111b0adf6 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java @@ -1,5 +1,6 @@ package forge.game.ability.effects; +import com.google.common.collect.Lists; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; @@ -8,8 +9,6 @@ import forge.util.Localizer; import java.util.List; -import com.google.common.collect.Lists; - public class ScryEffect extends SpellAbilityEffect { @Override @@ -38,16 +37,15 @@ public class ScryEffect extends SpellAbilityEffect { boolean isOptional = sa.hasParam("Optional"); - final List players = Lists.newArrayList(); // players really affected + final List players = Lists.newArrayList(); // players really affected - // Optional here for spells that have optional multi-player scrying - for (final Player p : getTargetPlayers(sa)) { - if ( (!sa.usesTargeting() || p.canBeTargetedBy(sa)) && - (!isOptional || p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWanttoScry"))) ) { - players.add(p); + // Optional here for spells that have optional multi-player scrying + for (final Player p : getTargetPlayers(sa)) { + if ( (!sa.usesTargeting() || p.canBeTargetedBy(sa)) && + (!isOptional || p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWanttoScry"))) ) { + players.add(p); + } } - } - sa.getActivatingPlayer().getGame().getAction().scry(players, num, sa); + sa.getActivatingPlayer().getGame().getAction().scry(players, num, sa); } - } diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java index 486a4aa2da6..1c1366fb616 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java +++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java @@ -23,9 +23,9 @@ import forge.quest.bazaar.QuestItemType; import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences.DifficultyPrefs; import forge.quest.data.QuestPreferences.QPref; +import forge.util.Localizer; import forge.util.MyRandom; import forge.util.TextUtil; -import forge.util.Localizer; import forge.util.gui.SGuiChoose; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -474,7 +474,7 @@ public class QuestWinLoseController { } if (!cardsWon.isEmpty()) { - view.showCards(Localizer.getInstance().getMessage("lblAchievedNWinStreakWinMCards", (currentStreak == 0 ? "50" : String.valueOf(currentStreak)), String.valueOf(cardsWon.size()), typeWon), cardsWon); + view.showCards(Localizer.getInstance().getMessage("lblAchievedNWinStreakWinMTypeCards", (currentStreak == 0 ? "50" : String.valueOf(currentStreak)), String.valueOf(cardsWon.size()), typeWon), cardsWon); } }