Emerge: refactor keyword (Card-Forge#9480)

* Emerge: refactor keyword

Author: Hanmac

forge-game/src/main/java/forge/game/card/Card.java

@@ -2575,14 +2575,8 @@ public final String keywordsToText(final Collection<KeywordInterface> keywords)
                         }
                     }
                     sbLong.append("\r\n");
-                } else if (keyword.startsWith("Emerge")) {
-                    final String[] k = keyword.split(":");
-                    sbLong.append(k[0]);
-                    if (k.length > 2) {
-                        sbLong.append(" from ").append(k[2].toLowerCase());
-                    }
-                    sbLong.append(" ").append(ManaCostParser.parse(k[1]));
-                    sbLong.append(" (").append(inst.getReminderText()).append(")");
+                } else if (keyword.startsWith("Emerge") && inst instanceof Emerge emerge) {
+                    sbLong.append(emerge.getTitle()).append(" (").append(inst.getReminderText()).append(")");
                     sbLong.append("\r\n");
                 } else if (inst.getKeyword().equals(Keyword.COMPANION)) {
                     sbLong.append("Companion — ");

forge-game/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -33,6 +33,7 @@
 import forge.game.event.GameEventCardForetold;
 import forge.game.event.GameEventCardPlotted;
 import forge.game.keyword.Devour;
+import forge.game.keyword.Emerge;
 import forge.game.keyword.Keyword;
 import forge.game.keyword.KeywordInterface;
 import forge.game.player.Player;
@@ -2896,20 +2897,13 @@ else if (part instanceof CostCollectEvidence) {
             newSA.getRestrictions().setZone(ZoneType.Graveyard);
             newSA.setIntrinsic(intrinsic);
             inst.addSpellAbility(newSA);
-        } else if (keyword.startsWith("Emerge")) {
-            final String[] kw = keyword.split(":");
-            String costStr = kw[1];
-            String validStr = kw.length > 2 ? kw[2] : "Creature";
-            String desc = "(Emerge";
-            if (kw.length > 2) {
-                desc += " from " + kw[2].toLowerCase();
-            }
-            desc += ")";
+        } else if (keyword.startsWith("Emerge") && inst instanceof Emerge emerge) {
+            String desc = "(" + emerge.getTitleWithoutCost()  + ")";
 
             final SpellAbility sa = card.getFirstSpellAbilityWithFallback();
-            final SpellAbility newSA = sa.copyWithDefinedCost(new Cost(costStr, false));
+            final SpellAbility newSA = sa.copyWithDefinedCost(emerge.getCost());
 
-            newSA.getRestrictions().setIsPresent(validStr + ".YouCtrl+CanBeSacrificedBy");
+            newSA.getRestrictions().setIsPresent(emerge.getValidType() + ".YouCtrl+CanBeSacrificedBy");
             newSA.putParam("Secondary", "True");
             newSA.setAlternativeCost(AlternativeCost.Emerge);
 

forge-game/src/main/java/forge/game/cost/CostAdjustment.java

@@ -12,6 +12,7 @@
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.*;
+import forge.game.keyword.Emerge;
 import forge.game.keyword.Keyword;
 import forge.game.keyword.KeywordInterface;
 import forge.game.mana.ManaCostBeingPaid;
@@ -245,8 +246,8 @@ else if (stAb.checkMode(StaticAbilityMode.SetCost)) {
         if (sa.isSpell() && sa.isOffering()) {
             adjustCostByOffering(cost, sa);
         }
-        if (sa.isSpell() && sa.isEmerge()) {
-            adjustCostByEmerge(cost, sa);
+        if (sa.isSpell() && sa.isEmerge() && sa.getKeyword() instanceof Emerge emerge) {
+            adjustCostByEmerge(cost, sa, emerge);
         }
 
         // Set cost (only used by Trinisphere) is applied last
@@ -398,10 +399,8 @@ private static void adjustCostByOffering(final ManaCostBeingPaid cost, final Spe
         toSac.setUsedToPay(true); //stop it from interfering with mana input
     }
 
-    private static void adjustCostByEmerge(final ManaCostBeingPaid cost, final SpellAbility sa) {
-        String kw = sa.getKeyword().getOriginal();
-        String k[] = kw.split(":");
-        String validStr = k.length > 2 ? k[2] : "Creature";
+    private static void adjustCostByEmerge(final ManaCostBeingPaid cost, final SpellAbility sa, final Emerge emerge) {
+        String validStr = emerge.getValidType();
         Player p = sa.getActivatingPlayer();
         CardCollectionView canEmerge = CardLists.filter(p.getCardsIn(ZoneType.Battlefield),
                 CardPredicates.restriction(validStr, p, sa.getHostCard(), sa),

forge-game/src/main/java/forge/game/keyword/Emerge.java

@@ -1,13 +1,48 @@
 package forge.game.keyword;
 
-public class Emerge extends KeywordWithCostAndType {
+import java.util.Locale;
+
+import forge.card.CardType;
+import forge.game.cost.Cost;
+
+public class Emerge extends KeywordWithCost {
+    protected String type = null;
+    protected String descType = null;
+
+    public String getValidType() { return type == null ? "Creature" : type; }
+    public String getTypeDescription() { return descType; }
+
+    public String getTitle() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getTitleWithoutCost());
+        sb.append(" ").append(cost.toSimpleString());
+        return sb.toString();
+    }
+
+    public String getTitleWithoutCost() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getKeyword());
+        if (type != null) {
+            sb.append(" from ").append(getTypeDescription());
+        }
+        return sb.toString();
+    }
+
+    @Override
     protected void parse(String details) {
         final String[] k = details.split(":");
-        if (k.length < 2) {
-            super.parse("Creature:" + k[0]);
-        } else {
-            // Flip parameters
-            super.parse(k[1] + ":" + k[0]);
+        cost = new Cost(k[0], false);
+        descType = "creature";
+        if (k.length >= 2) {
+            descType = type = k[1];
+            if (CardType.isACardType(descType)) {
+                descType = descType.toLowerCase(Locale.ENGLISH);
+            }
         }
     }
+
+    @Override
+    protected String formatReminderText(String reminderText) {
+        return String.format(reminderText, cost.toSimpleString(), descType);
+    }
 }

forge-game/src/main/java/forge/game/keyword/KeywordWithCost.java

@@ -5,6 +5,8 @@
 public class KeywordWithCost extends KeywordInstance<KeywordWithCost> {
     protected Cost cost;
 
+    public Cost getCost() { return cost; }
+
     @Override
     protected void parse(String details) {
         String[] allDetails = details.split(":");