From bc1d4f3dce74df333b288195dae038eecc0a4a0c Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Thu, 24 Nov 2022 09:12:39 +0100 Subject: [PATCH] Just let custom toString handle translation --- .../src/main/java/forge/game/ability/SpellAbilityEffect.java | 3 +-- .../forge/game/ability/effects/DamagePreventEffectBase.java | 3 +-- .../src/main/java/forge/game/ability/effects/EffectEffect.java | 3 +-- .../src/main/java/forge/game/ability/effects/FogEffect.java | 3 +-- .../java/forge/game/ability/effects/RegenerateBaseEffect.java | 3 +-- .../main/java/forge/game/ability/effects/SkipPhaseEffect.java | 3 +-- .../main/java/forge/game/ability/effects/SkipTurnEffect.java | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java index 97996f91b5b..1ce87661d78 100644 --- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java @@ -750,8 +750,7 @@ public abstract class SpellAbilityEffect { CardCollectionView discardedByPlayer = discardedMap.get(p); if (!discardedByPlayer.isEmpty()) { boolean firstDiscard = p.getNumDiscardedThisTurn() - discardedByPlayer.size() == 0; - final Map runParams = AbilityKey.newMap(); - runParams.put(AbilityKey.Player, p); + final Map runParams = AbilityKey.mapFromPlayer(p); runParams.put(AbilityKey.Cards, discardedByPlayer); runParams.put(AbilityKey.Cause, sa); runParams.put(AbilityKey.FirstTime, firstDiscard); diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java index 039ab8088aa..4b47945ebf0 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java @@ -17,7 +17,6 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; -import forge.util.CardTranslation; import forge.util.TextUtil; public abstract class DamagePreventEffectBase extends SpellAbilityEffect { @@ -25,7 +24,7 @@ public abstract class DamagePreventEffectBase extends SpellAbilityEffect { final Card hostCard = sa.getHostCard(); final Game game = hostCard.getGame(); final Player player = hostCard.getController(); - final String name = CardTranslation.getTranslatedName(hostCard.getName()) + "'s Effect"; + final String name = hostCard + "'s Effect"; final String image = hostCard.getImageKey(); StringBuilder sb = new StringBuilder("Event$ DamageDone | ActiveZones$ Command | ValidTarget$ "); sb.append((o instanceof Card ? "Card.IsRemembered" : "Player.IsRemembered")); diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index 2cd937fc899..80f3544731d 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -27,7 +27,6 @@ import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; -import forge.util.CardTranslation; import forge.util.TextUtil; import forge.util.collect.FCollection; @@ -114,7 +113,7 @@ public class EffectEffect extends SpellAbilityEffect { String name = sa.getParam("Name"); if (name == null) { - name = CardTranslation.getTranslatedName(hostCard.getName()) + (sa.hasParam("Boon") ? "'s Boon" : "'s Effect"); + name = hostCard + (sa.hasParam("Boon") ? "'s Boon" : "'s Effect"); } // Unique Effects shouldn't be duplicated diff --git a/forge-game/src/main/java/forge/game/ability/effects/FogEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FogEffect.java index 9f848b2f8d7..1886bbd2d70 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/FogEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/FogEffect.java @@ -10,7 +10,6 @@ import forge.game.replacement.ReplacementHandler; import forge.game.spellability.SpellAbility; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; -import forge.util.CardTranslation; public class FogEffect extends SpellAbilityEffect { @@ -23,7 +22,7 @@ public class FogEffect extends SpellAbilityEffect { public void resolve(SpellAbility sa) { final Card hostCard = sa.getHostCard(); final Game game = hostCard.getGame(); - final String name = CardTranslation.getTranslatedName(hostCard.getName()) + "'s Effect"; + final String name = hostCard + "'s Effect"; final String image = hostCard.getImageKey(); StringBuilder sb = new StringBuilder("Event$ DamageDone | ActiveZones$ Command | IsCombat$ True"); sb.append(" | Prevent$ True | Description$ Prevent all combat damage this turn."); diff --git a/forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java index 68f3e7142ac..74375a6b610 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java @@ -15,7 +15,6 @@ import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; -import forge.util.CardTranslation; public abstract class RegenerateBaseEffect extends SpellAbilityEffect { @@ -25,7 +24,7 @@ public abstract class RegenerateBaseEffect extends SpellAbilityEffect { // create Effect for Regeneration final Card eff = createEffect( - sa, sa.getActivatingPlayer(), CardTranslation.getTranslatedName(hostCard.getName()) + "'s Regeneration", hostCard.getImageKey()); + sa, sa.getActivatingPlayer(), hostCard + "'s Regeneration", hostCard.getImageKey()); eff.addRemembered(list); addForgetOnMovedTrigger(eff, "Battlefield"); diff --git a/forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java index 2e25b4f5373..96b21d1cbf2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java @@ -15,7 +15,6 @@ import forge.game.replacement.ReplacementLayer; import forge.game.spellability.SpellAbility; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; -import forge.util.CardTranslation; public class SkipPhaseEffect extends SpellAbilityEffect { @@ -59,7 +58,7 @@ public class SkipPhaseEffect extends SpellAbilityEffect { final String duration, final String phase, final String step) { final Card hostCard = sa.getHostCard(); final Game game = hostCard.getGame(); - final String name = CardTranslation.getTranslatedName(hostCard.getName()) + "'s Effect"; + final String name = hostCard + "'s Effect"; final String image = hostCard.getImageKey(); final boolean isNextThisTurn = duration != null && duration.equals("NextThisTurn"); diff --git a/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java index ec956b5e12f..a4adb77a8fe 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java @@ -16,7 +16,6 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; -import forge.util.CardTranslation; import forge.util.Lang; public class SkipTurnEffect extends SpellAbilityEffect { @@ -39,7 +38,7 @@ public class SkipTurnEffect extends SpellAbilityEffect { public void resolve(SpellAbility sa) { final Card hostCard = sa.getHostCard(); final Game game = hostCard.getGame(); - final String name = CardTranslation.getTranslatedName(hostCard.getName()) + "'s Effect"; + final String name = hostCard + "'s Effect"; final String image = hostCard.getImageKey(); final int numTurns = AbilityUtils.calculateAmount(hostCard, sa.getParam("NumTurns"), sa); String repeffstr = "Event$ BeginTurn | ActiveZones$ Command | ValidPlayer$ You " +