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

Just let custom toString handle translation

Browse Source
This commit is contained in:
tool4EvEr
2022-11-24 09:12:39 +01:00
parent ffbf5c8928
commit bc1d4f3dce
7 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -750,8 +750,7 @@ public abstract class SpellAbilityEffect {
CardCollectionView discardedByPlayer = discardedMap.get(p); CardCollectionView discardedByPlayer = discardedMap.get(p);
if (!discardedByPlayer.isEmpty()) { if (!discardedByPlayer.isEmpty()) {
boolean firstDiscard = p.getNumDiscardedThisTurn() - discardedByPlayer.size() == 0; boolean firstDiscard = p.getNumDiscardedThisTurn() - discardedByPlayer.size() == 0;
final Map<AbilityKey, Object> runParams = AbilityKey.newMap(); final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPlayer(p);
runParams.put(AbilityKey.Player, p);
runParams.put(AbilityKey.Cards, discardedByPlayer); runParams.put(AbilityKey.Cards, discardedByPlayer);
runParams.put(AbilityKey.Cause, sa); runParams.put(AbilityKey.Cause, sa);
runParams.put(AbilityKey.FirstTime, firstDiscard); runParams.put(AbilityKey.FirstTime, firstDiscard);

3
forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffectBase.java
View File

@@ -17,7 +17,6 @@ import forge.game.spellability.AbilitySub;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.CardTranslation;
import forge.util.TextUtil; import forge.util.TextUtil;
public abstract class DamagePreventEffectBase extends SpellAbilityEffect { public abstract class DamagePreventEffectBase extends SpellAbilityEffect {
@@ -25,7 +24,7 @@ public abstract class DamagePreventEffectBase extends SpellAbilityEffect {
final Card hostCard = sa.getHostCard(); final Card hostCard = sa.getHostCard();
final Game game = hostCard.getGame(); final Game game = hostCard.getGame();
final Player player = hostCard.getController(); 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(); final String image = hostCard.getImageKey();
StringBuilder sb = new StringBuilder("Event$ DamageDone | ActiveZones$ Command | ValidTarget$ "); StringBuilder sb = new StringBuilder("Event$ DamageDone | ActiveZones$ Command | ValidTarget$ ");
sb.append((o instanceof Card ? "Card.IsRemembered" : "Player.IsRemembered")); sb.append((o instanceof Card ? "Card.IsRemembered" : "Player.IsRemembered"));

3
forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
View File

@@ -27,7 +27,6 @@ import forge.game.trigger.Trigger;
import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerHandler;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.CardTranslation;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.collect.FCollection; import forge.util.collect.FCollection;
@@ -114,7 +113,7 @@ public class EffectEffect extends SpellAbilityEffect {
String name = sa.getParam("Name"); String name = sa.getParam("Name");
if (name == null) { 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 // Unique Effects shouldn't be duplicated

3
forge-game/src/main/java/forge/game/ability/effects/FogEffect.java
View File

@@ -10,7 +10,6 @@ import forge.game.replacement.ReplacementHandler;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.CardTranslation;
public class FogEffect extends SpellAbilityEffect { public class FogEffect extends SpellAbilityEffect {
@@ -23,7 +22,7 @@ public class FogEffect extends SpellAbilityEffect {
public void resolve(SpellAbility sa) { public void resolve(SpellAbility sa) {
final Card hostCard = sa.getHostCard(); final Card hostCard = sa.getHostCard();
final Game game = hostCard.getGame(); 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 String image = hostCard.getImageKey();
StringBuilder sb = new StringBuilder("Event$ DamageDone | ActiveZones$ Command | IsCombat$ True"); StringBuilder sb = new StringBuilder("Event$ DamageDone | ActiveZones$ Command | IsCombat$ True");
sb.append(" | Prevent$ True | Description$ Prevent all combat damage this turn."); sb.append(" | Prevent$ True | Description$ Prevent all combat damage this turn.");

3
forge-game/src/main/java/forge/game/ability/effects/RegenerateBaseEffect.java
View File

@@ -15,7 +15,6 @@ import forge.game.trigger.Trigger;
import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerHandler;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.CardTranslation;
public abstract class RegenerateBaseEffect extends SpellAbilityEffect { public abstract class RegenerateBaseEffect extends SpellAbilityEffect {
@@ -25,7 +24,7 @@ public abstract class RegenerateBaseEffect extends SpellAbilityEffect {
// create Effect for Regeneration // create Effect for Regeneration
final Card eff = createEffect( 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); eff.addRemembered(list);
addForgetOnMovedTrigger(eff, "Battlefield"); addForgetOnMovedTrigger(eff, "Battlefield");

3
forge-game/src/main/java/forge/game/ability/effects/SkipPhaseEffect.java
View File

@@ -15,7 +15,6 @@ import forge.game.replacement.ReplacementLayer;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.CardTranslation;
public class SkipPhaseEffect extends SpellAbilityEffect { public class SkipPhaseEffect extends SpellAbilityEffect {
@@ -59,7 +58,7 @@ public class SkipPhaseEffect extends SpellAbilityEffect {
final String duration, final String phase, final String step) { final String duration, final String phase, final String step) {
final Card hostCard = sa.getHostCard(); final Card hostCard = sa.getHostCard();
final Game game = hostCard.getGame(); 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 String image = hostCard.getImageKey();
final boolean isNextThisTurn = duration != null && duration.equals("NextThisTurn"); final boolean isNextThisTurn = duration != null && duration.equals("NextThisTurn");

3
forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java
View File

@@ -16,7 +16,6 @@ import forge.game.spellability.AbilitySub;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.CardTranslation;
import forge.util.Lang; import forge.util.Lang;
public class SkipTurnEffect extends SpellAbilityEffect { public class SkipTurnEffect extends SpellAbilityEffect {
@@ -39,7 +38,7 @@ public class SkipTurnEffect extends SpellAbilityEffect {
public void resolve(SpellAbility sa) { public void resolve(SpellAbility sa) {
final Card hostCard = sa.getHostCard(); final Card hostCard = sa.getHostCard();
final Game game = hostCard.getGame(); 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 String image = hostCard.getImageKey();
final int numTurns = AbilityUtils.calculateAmount(hostCard, sa.getParam("NumTurns"), sa); final int numTurns = AbilityUtils.calculateAmount(hostCard, sa.getParam("NumTurns"), sa);
String repeffstr = "Event$ BeginTurn | ActiveZones$ Command | ValidPlayer$ You " + String repeffstr = "Event$ BeginTurn | ActiveZones$ Command | ValidPlayer$ You " +