Affinity: extra class for the special cases (Card-Forge#10007)

* Affinity: extra class for the special cases

* Update CardFactoryUtil.java

Keyword String not used

Author: Hanmac

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

@@ -3824,23 +3824,12 @@ public void resolve() {
     public static void addStaticAbility(final KeywordInterface inst, final CardState state, final boolean intrinsic) {
         String keyword = inst.getOriginal();
 
-        if (keyword.startsWith("Affinity")) {
-            final String[] k = keyword.split(":");
-            final String t = k[1];
-
-            String desc;
-            if (k.length > 2) {
-                String typeText = k[2];
-                if (typeText.contains(" with "))
-                    desc = typeText.substring(typeText.indexOf(" with ") + 6);
-                else
-                    desc = typeText + "s";
-            } else
-                desc = CardType.getPluralType(t);
+        if (inst instanceof Affinity affinity) {
+            final String t = affinity.getValidType();
 
             StringBuilder sb = new StringBuilder();
             sb.append("Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ AffinityX | EffectZone$ All");
-            sb.append("| Description$ Affinity for ").append(desc);
+            sb.append("| Description$ ").append(affinity.getTitle());
             sb.append(" (").append(inst.getReminderText()).append(")");
             String effect = sb.toString();
 

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

@@ -0,0 +1,43 @@
+package forge.game.keyword;
+
+import java.util.Arrays;
+
+import forge.card.CardType;
+import forge.util.Lang;
+
+public class Affinity extends KeywordWithType {
+
+    @Override
+    public String getTitle() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Affinity for ").append(descType);
+        return sb.toString();
+    }
+
+    @Override
+    protected void parse(String details) {
+        if ("Affinity".equalsIgnoreCase(details)) {
+            type = "Permanent.withAffinity";
+            descType = "Affinity";
+            reminderType = "permanent with affinity"; // technically the reminder says "permanent you control with affinity", but thats a TestCard
+        } else if ("Outlaw".equalsIgnoreCase(details)) {
+            type = "Permanent.Outlaw";
+            descType = "outlaws";
+            reminderType = Lang.getInstance().buildValidDesc(CardType.Constant.OUTLAW_TYPES, true);
+        } else if ("Historic".equalsIgnoreCase(details)) {
+            type = "Permanent.Historic";
+            descType = "historic permanents";
+            reminderType = "artifact, legendary, and/or Saga permanent";
+        } else if (details.contains(":")) {
+            String k[];
+            k = details.split(":");
+            type = k[0];
+            descType = Lang.getPlural(k[1]);
+            reminderType = k[1];
+        } else {
+            type = details;
+            descType = CardType.getPluralType(type);
+            reminderType = Lang.getInstance().buildValidDesc(Arrays.asList(type.split(",")), true);
+        }
+    }
+}

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

@@ -9,7 +9,7 @@
 public enum Keyword {
     UNDEFINED("", SimpleKeyword.class, false, ""),
     ABSORB("Absorb", KeywordWithAmount.class, false, "If a source would deal damage to this creature, prevent %d of that damage."),
-    AFFINITY("Affinity", KeywordWithType.class, false, "This spell costs {1} less to cast for each %s you control."),
+    AFFINITY("Affinity", Affinity.class, false, "This spell costs {1} less to cast for each %s you control."),
     AFFLICT("Afflict", KeywordWithAmount.class, false, "Whenever this creature becomes blocked, defending player loses %d life."),
     AFTERLIFE("Afterlife", KeywordWithAmount.class, false, "When this creature dies, create {%1$d:1/1 white and black Spirit creature token} with flying."),
     AFTERMATH("Aftermath", SimpleKeyword.class, false, "Cast this spell only from your graveyard. Then exile it."),

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

@@ -29,7 +29,6 @@ protected void parse(String details) {
         String k[];
         if (details.contains(":")) {
             switch (getKeyword()) {
-            case AFFINITY:
             case BANDSWITH:
             case ENCHANT:
             case HEXPROOF:
@@ -49,22 +48,12 @@ protected void parse(String details) {
                 type = "Card." + StringUtils.capitalize(color.getName());
                 descType = color.getName();
             } else {
-                descType = type = details;
-                boolean multiple = switch(getKeyword()) {
-                    case AFFINITY -> true;
-                    default -> false;
-                };
-                descType = Lang.getInstance().buildValidDesc(Arrays.asList(type.split(",")), multiple);
+                type = details;
+                descType = Lang.getInstance().buildValidDesc(Arrays.asList(type.split(",")), false);
             }
         }
 
-        if (descType.equalsIgnoreCase("Outlaw")) {
-            reminderType = "Assassin, Mercenary, Pirate, Rogue, and/or Warlock";
-        } else if (type.equalsIgnoreCase("historic permanent")) {
-            reminderType = "artifact, legendary, and/or Saga permanent";
-        } else {
-            reminderType = descType;
-        }
+        reminderType = descType;
     }
 
     @Override

forge-gui/res/cardsfolder/b/banish_to_another_universe.txt

@@ -1,7 +1,7 @@
 Name:Banish to Another Universe
 ManaCost:4 W
 Types:Enchantment
-K:Affinity:Permanent.Historic:historic permanent
+K:Affinity:Historic
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target nonland permanent an opponent controls until CARDNAME leaves the battlefield.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Duration$ UntilHostLeavesPlay
 SVar:PlayMain1:TRUE

forge-gui/res/cardsfolder/h/hellspur_brute.txt

@@ -2,7 +2,7 @@ Name:Hellspur Brute
 ManaCost:4 R
 Types:Creature Minotaur Mercenary
 PT:5/4
-K:Affinity:Permanent.Outlaw:outlaw
+K:Affinity:Outlaw
 K:Trample
 DeckHints:Type$Assassin|Mercenary|Pirate|Rogue|Warlock
 Oracle:Affinity for outlaws (This spell costs {1} less to cast for each Assassin, Mercenary, Pirate, Rogue, and/or Warlock you control.)\nTrample

forge-gui/res/cardsfolder/s/sojourners_enforcermite.txt

@@ -2,6 +2,6 @@ Name:Sojourner's Enforcermite
 ManaCost:6
 Types:Artifact Creature Frog Myr Salamander
 PT:6/6
-K:Affinity:Permanent.withAffinity:permanent with affinity
+K:Affinity:Affinity
 K:TypeCycling:Affinity:2
 Oracle:Affinity for Affinity (This card costs {1} less to cast for each permanent you control with affinity.)\nAffinitycycling {2} ({2}, Discard this card: Search your library for a card with affinity, reveal it, put it into your hand, then shuffle.)