From 2e047ee41083636f5f3ec20f329b535f36de08ce Mon Sep 17 00:00:00 2001 From: Tim Mocny Date: Sat, 2 Apr 2022 04:55:06 +0000 Subject: [PATCH] AbilityFactory :: allow auto TgtPrompt to decap when ValidTgts is CoreType --- .../src/main/java/forge/game/ability/AbilityFactory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java index 837963f5f7f..4c7d50de2a6 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java @@ -25,6 +25,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import forge.card.CardStateName; +import forge.card.CardType; import forge.game.CardTraitBase; import forge.game.IHasSVars; import forge.game.ability.effects.CharmEffect; @@ -327,8 +328,10 @@ public final class AbilityFactory { final String min = mapParams.containsKey("TargetMin") ? mapParams.get("TargetMin") : "1"; final String max = mapParams.containsKey("TargetMax") ? mapParams.get("TargetMax") : "1"; - // TgtPrompt now optional - final String prompt = mapParams.containsKey("TgtPrompt") ? mapParams.get("TgtPrompt") : "Select target " + mapParams.get("ValidTgts"); + // TgtPrompt should only be needed for more complicated ValidTgts + final String prompt = mapParams.containsKey("TgtPrompt") ? mapParams.get("TgtPrompt") : "Select target " + + (CardType.CoreType.isValidEnum(mapParams.get("ValidTgts")) ? mapParams.get("ValidTgts").toLowerCase() : + mapParams.get("ValidTgts")); TargetRestrictions abTgt = new TargetRestrictions(prompt, mapParams.get("ValidTgts").split(","), min, max);