From 5cf155fb946149f2b19255ff8e98c4426f93c5e8 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Wed, 23 Jul 2025 10:04:20 +0200 Subject: [PATCH] CardFactory: fix Squad TokenNames Can be used for WH40K token But FalloutToken need a fallback to Copy? --- .../java/forge/game/card/CardFactory.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index dcc762c0dea..52aece9e97d 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -722,29 +722,32 @@ public class CardFactory { // Special Rules for Embalm and Eternalize if (sa.isEmbalm() && sa.isIntrinsic()) { - String name = TextUtil.fastReplace( + String name = "embalm_" + TextUtil.fastReplace( TextUtil.fastReplace(host.getName(), ",", ""), " ", "_").toLowerCase(); - String set = host.getSetCode().toLowerCase(); - state.setImageKey(ImageKeys.getTokenKey("embalm_" + name + "_" + set)); + state.setImageKey(StaticData.instance().getOtherImageKey(name, host.getSetCode())); } if (sa.isEternalize() && sa.isIntrinsic()) { - String name = TextUtil.fastReplace( + String name = "eternalize_" + TextUtil.fastReplace( TextUtil.fastReplace(host.getName(), ",", ""), " ", "_").toLowerCase(); - String set = host.getSetCode().toLowerCase(); - state.setImageKey(ImageKeys.getTokenKey("eternalize_" + name + "_" + set)); + state.setImageKey(StaticData.instance().getOtherImageKey(name, host.getSetCode())); } if (sa.isKeyword(Keyword.OFFSPRING) && sa.isIntrinsic()) { - String name = TextUtil.fastReplace( + String name = "offspring_" + TextUtil.fastReplace( TextUtil.fastReplace(host.getName(), ",", ""), " ", "_").toLowerCase(); - String set = host.getSetCode().toLowerCase(); - state.setImageKey(ImageKeys.getTokenKey("offspring_" + name + "|" + set)); + state.setImageKey(StaticData.instance().getOtherImageKey(name, host.getSetCode())); } + if (sa.isKeyword(Keyword.SQUAD) && sa.isIntrinsic()) { + String name = "squad_" + TextUtil.fastReplace( + TextUtil.fastReplace(host.getName(), ",", ""), + " ", "_").toLowerCase(); + state.setImageKey(StaticData.instance().getOtherImageKey(name, host.getSetCode())); + } if (sa.hasParam("GainTextOf") && originalState != null) { state.setSetCode(originalState.getSetCode());