Devour: remove KeywordWithAmountAndType (Card-Forge#9478)

Hanmac · web-flow · commit 79e9ae433d8c · 2026-01-10T16:37:18.000+01:00
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
@@ -2635,13 +2635,6 @@ public final String keywordsToText(final Collection<KeywordInterface> keywords)
                         sbLong.append(rem.toString());
                     }
                     sbLong.append(")");
-                } else if (keyword.startsWith("Devour ")) {
-                    final String[] k = keyword.split(":");
-                    final String[] s = (k[0]).split(" ");
-                    final String t = s[1];
-                    sbLong.append(k[0]).append(" ").append(k[1]).append(" (As this enters, you may ");
-                    sbLong.append("sacrifice any number of ").append(t).append("s. This creature enters ");
-                    sbLong.append("with that many +1/+1 counters on it.)");
                 } else if (keyword.startsWith("Prototype")) {
                     final String[] k = keyword.split(":");
                     final Cost cost = new Cost(k[1], false);
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -32,6 +32,7 @@
 import forge.game.cost.*;
 import forge.game.event.GameEventCardForetold;
 import forge.game.event.GameEventCardPlotted;
+import forge.game.keyword.Devour;
 import forge.game.keyword.Keyword;
 import forge.game.keyword.KeywordInterface;
 import forge.game.player.Player;
@@ -2262,27 +2263,11 @@ public static void addReplacementEffect(final KeywordInterface inst, final CardS
             re.setOverridingAbility(saTransform);
 
             inst.addReplacement(re);
-        } else if (keyword.startsWith("Devour")) {
-            final String[] k = keyword.split(":");
-            final String magnitude = k[1];
-            String valid = "Creature";
-            String type = "creature";
-            StringBuilder sbDesc = new StringBuilder("Devour ");
-            if (k.length > 2 && !k[2].isEmpty()) {
-                valid = k[2];
-                type = valid;
-                if (CardType.isACardType(type)) {
-                    type = type.toLowerCase(Locale.ENGLISH);
-                }
-                sbDesc.append(type).append(" ");
-            }
-            sbDesc.append(magnitude);
-            if (k.length > 3) {
-                sbDesc.append(k[3]);
-            }
+        } else if (keyword.startsWith("Devour") && inst instanceof Devour devour) {
+            String valid = devour.getValidType();
 
             String sacrificeStr = "DB$ Sacrifice | Defined$ You | Amount$ DevourSacX | RememberSacrificed$ True | Optional$ True"
-                    + " | SacValid$ " + valid + ".Other | SacMessage$ another " + type;
+                    + " | SacValid$ " + valid + ".Other | SacMessage$ another " + devour.getTypeDescription();
             // TODO find better way to add Devour N to Player Msg
             // Also better lblDoYouWantSacrifice?
 
@@ -2293,13 +2278,13 @@ public static void addReplacementEffect(final KeywordInterface inst, final CardS
             sacrificeSA.setSVar("DevourSacX", "Count$Valid " + valid + ".YouCtrl+Other");
 
             AbilitySub counterSA = (AbilitySub) AbilityFactory.getAbility(counterStr, card);
-            counterSA.setSVar("DevourX", "Count$RememberedSize/Times." + magnitude);
+            counterSA.setSVar("DevourX", "Count$RememberedSize/Times." + devour.getAmountString());
             sacrificeSA.setSubAbility(counterSA);
 
             AbilitySub cleanupSA = (AbilitySub) AbilityFactory.getAbility(cleanupStr, card);
             counterSA.setSubAbility(cleanupSA);
 
-            String repeffstr = "Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | Description$ " + sbDesc + " ("+ inst.getReminderText() + ")";
+            String repeffstr = "Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | Description$ " + devour.getTitle() + " ("+ inst.getReminderText() + ")";
 
             ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, host, intrinsic, card);
 
diff --git a/forge-game/src/main/java/forge/game/keyword/Devour.java b/forge-game/src/main/java/forge/game/keyword/Devour.java
@@ -1,14 +1,58 @@
 package forge.game.keyword;
 
+import java.util.Locale;
+
 import forge.card.CardType;
 
-public class Devour extends KeywordWithAmountAndType {
+public class Devour extends KeywordWithAmount {
+    protected String type = null;
+    protected String descType = null;
+    protected String reminderType = null;
+    protected String extra = null;
+
+    public String getValidType() { return type == null ? "Creature" : type; }
+    public String getTypeDescription() { return descType; }
+
+    public String getTitle() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getKeyword());
+        if (type != null) {
+            sb.append(" ").append(getTypeDescription());
+        }
+        sb.append(" ").append(getAmountString());
+        if (extra != null) {
+            sb.append(extra);
+        }
+        return sb.toString();
+    }
+
     @Override
     protected void parse(String details) {
-        super.parse(details);
         String[] d = details.split(":");
-        type = "creatures";
-        if (d.length > 1 && !d[1].isEmpty())
-            type = CardType.getPluralType(d[1]);
+        if (details.startsWith("X")) {
+            withX = true;
+        } else {
+            amount = Integer.parseInt(d[0]);
+        }
+        descType = "Creature";
+        reminderType = "creatures";
+        if (d.length > 1 && !d[1].isEmpty()) {
+            descType = type = d[1];
+            reminderType = CardType.getPluralType(type);
+        }
+        if (CardType.isACardType(descType)) {
+            descType = descType.toLowerCase(Locale.ENGLISH);
+        }
+        if (d.length > 2) {
+            extra = d[2];
+        }
+    }
+
+    @Override
+    protected String formatReminderText(String reminderText) {
+        if (withX) {
+            return String.format(reminderText.replaceAll("\\%(\\d+\\$)?d", "%$1s"), "X", reminderType);
+        }
+        return String.format(reminderText, amount, reminderType);
     }
 }
diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java b/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java
@@ -35,24 +35,14 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
     private List<SpellAbility> abilities = Lists.newArrayList();
     private List<StaticAbility> staticAbilities = Lists.newArrayList();
 
-
-    /* (non-Javadoc)
-     * @see forge.game.keyword.KeywordInterface#getOriginal()
-     */
     @Override
     public String getOriginal() {
         return original;
     }
-    /* (non-Javadoc)
-     * @see forge.game.keyword.KeywordInterface#getKeyword()
-     */
     @Override
     public Keyword getKeyword() {
         return keyword;
     }
-    /* (non-Javadoc)
-     * @see forge.game.keyword.KeywordInterface#getReminderText()
-     */
     @Override
     public String getReminderText() {
         String result = formatReminderText(keyword.reminderText);
@@ -65,13 +55,14 @@ public String getReminderText() {
         m.appendTail(sb);
         return sb.toString();
     }
-    /* (non-Javadoc)
-     * @see forge.game.keyword.KeywordInterface#getAmount()
-     */
     @Override
     public int getAmount() {
         return 1;
     }
+    @Override
+    public String getAmountString() {
+        return String.valueOf(getAmount());
+    }
     protected void initialize(String original0, Keyword keyword0, String details) {
         original = original0;
         keyword = keyword0;
diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordInterface.java b/forge-game/src/main/java/forge/game/keyword/KeywordInterface.java
@@ -24,6 +24,7 @@ public interface KeywordInterface extends Cloneable, IHasSVars {
     String getReminderText();
 
     int getAmount();
+    String getAmountString();
 
     StaticAbility getStatic();
     void setStatic(StaticAbility st);
diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordWithAmount.java b/forge-game/src/main/java/forge/game/keyword/KeywordWithAmount.java
@@ -10,6 +10,11 @@ public int getAmount() {
         return amount;
     }
 
+    @Override
+    public String getAmountString() {
+        return withX ? "X" : String.valueOf(amount);
+    }
+
     @Override
     protected void parse(String details) {
         if (details.startsWith("X")) {
diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordWithAmountAndType.java b/forge-game/src/main/java/forge/game/keyword/KeywordWithAmountAndType.java
