Merge branch 'escalate' into 'master'

Fix Escalate Cost

Closes #1819

See merge request core-developers/forge!4663

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

@@ -123,7 +123,7 @@ public class CostAdjustment {
             if ("Escalate".equals(amount)) {
                 SpellAbility sub = sa;
                 while(sub != null) {
-                    if (!sub.getSVar("CharmOrder").equals("")) {
+                    if (sub.getDirectSVars().containsKey("CharmOrder")) {
                         count++;
                     }
                     sub = sub.getSubAbility();