external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing translation

Browse Source
This commit is contained in:
friarsol
2020-01-17 23:20:39 -05:00
parent 3d7bd388e1
commit ca1504b839
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java
View File

@@ -1,5 +1,6 @@
package forge.game.ability.effects; package forge.game.ability.effects;
import com.google.common.collect.Lists;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect; import forge.game.ability.SpellAbilityEffect;
import forge.game.player.Player; import forge.game.player.Player;
@@ -8,8 +9,6 @@ import forge.util.Localizer;
import java.util.List; import java.util.List;
import com.google.common.collect.Lists;
public class ScryEffect extends SpellAbilityEffect { public class ScryEffect extends SpellAbilityEffect {
@Override @Override
@@ -38,16 +37,15 @@ public class ScryEffect extends SpellAbilityEffect {
boolean isOptional = sa.hasParam("Optional"); boolean isOptional = sa.hasParam("Optional");
final List<Player> players = Lists.newArrayList(); // players really affected final List<Player> players = Lists.newArrayList(); // players really affected
// Optional here for spells that have optional multi-player scrying // Optional here for spells that have optional multi-player scrying
for (final Player p : getTargetPlayers(sa)) { for (final Player p : getTargetPlayers(sa)) {
if ( (!sa.usesTargeting() || p.canBeTargetedBy(sa)) && if ( (!sa.usesTargeting() || p.canBeTargetedBy(sa)) &&
(!isOptional || p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWanttoScry"))) ) { (!isOptional || p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWanttoScry"))) ) {
players.add(p); players.add(p);
}
} }
} sa.getActivatingPlayer().getGame().getAction().scry(players, num, sa);
sa.getActivatingPlayer().getGame().getAction().scry(players, num, sa);
} }
} }

4
forge-gui/src/main/java/forge/quest/QuestWinLoseController.java
View File

@@ -23,9 +23,9 @@ import forge.quest.bazaar.QuestItemType;
import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences;
import forge.quest.data.QuestPreferences.DifficultyPrefs; import forge.quest.data.QuestPreferences.DifficultyPrefs;
import forge.quest.data.QuestPreferences.QPref; import forge.quest.data.QuestPreferences.QPref;
import forge.util.Localizer;
import forge.util.MyRandom; import forge.util.MyRandom;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.Localizer;
import forge.util.gui.SGuiChoose; import forge.util.gui.SGuiChoose;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@@ -474,7 +474,7 @@ public class QuestWinLoseController {
} }
if (!cardsWon.isEmpty()) { 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);
} }
} }