Support "Affinitycycling" and "Affinity for Affinity"

Author: Jetz72

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

@@ -3764,6 +3764,8 @@ public void resolve() {
                 desc = "Basic land";
             } else if (type.equals("Land.Artifact")) {
                 desc = "Artifact land";
+            } else if (type.startsWith("Card.with")) {
+                desc = type.substring(9);
             }
 
             sb.append(" Discard<1/CARDNAME> | ActivationZone$ Hand | PrecostDesc$ ").append(desc).append("cycling ");
@@ -3784,17 +3786,20 @@ public static void addStaticAbility(final KeywordInterface inst, final CardState
         if (keyword.startsWith("Affinity")) {
             final String[] k = keyword.split(":");
             final String t = k[1];
-            String d = "";
-            if (k.length > 2) {
-                final StringBuilder s = new StringBuilder();
-                s.append(k[2]).append("s");
-                d = s.toString();
-            }
 
-            String desc = "Artifact".equals(t) ? "artifacts" : CardType.getPluralType(t);
-            if (!d.isEmpty()) {
-                desc = d;
+            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 if ("Artifact".equals(t))
+                desc = "artifacts";
+            else
+                desc = CardType.getPluralType(t);
+
             StringBuilder sb = new StringBuilder();
             sb.append("Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ AffinityX | EffectZone$ All");
             sb.append("| Description$ Affinity for ").append(desc);

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

@@ -26,6 +26,8 @@ protected void parse(String details) {
                     n[i] = "basic land";
                 } else if (n[i].equals("Land.Artifact")) {
                     n[i] = "artifact land";
+                } else if (n[i].startsWith("Card.with")) {
+                    n[i] = n[i].substring(9);
                 }
             }