Merge branch 'master' into 'master'

Remove Optional$ True when precasting spells in effect from a script (e.g. Puzzle Mode).

See merge request core-developers/forge!6170

forge-ai/src/main/java/forge/ai/GameState.java

@@ -935,6 +935,11 @@ public abstract class GameState {
                             svarValue += " | ValidTgts$ Card";
                         }
                     }
+
+                    // We don't want to ask for Optional, since the effect is being precast as already active
+                    if (svarValue.contains("| Optional$")) {
+                        svarValue = TextUtil.fastReplace(svarValue, "| Optional$", "| RemovedOptional$");
+                    }
                 }
 
                 sa = AbilityFactory.getAbility(svarValue, c);