Elvish Refueler regression

Author: tool4EvEr

forge-game/src/main/java/forge/game/staticability/StaticAbilityAdditionalActivations.java

@@ -25,7 +25,11 @@ public static int getLimit(final Card card, final SpellAbility sa, Player activa
                     continue;
                 }
                 if (stAb.hasParam("MinLimit")) {
-                    result = Math.max(result, AbilityUtils.calculateAmount(stAb.getHostCard(), stAb.getParam("MinLimit"), stAb));
+                    int min = AbilityUtils.calculateAmount(stAb.getHostCard(), stAb.getParam("MinLimit"), stAb);
+                    if (min == -1) {
+                        return Integer.MAX_VALUE;
+                    }
+                    result = Math.max(result, min);
                 }
                 if (stAb.hasParam("Additional")) {
                     additional += AbilityUtils.calculateAmount(stAb.getHostCard(), stAb.getParam("Additional"), stAb);

forge-gui-desktop/src/main/java/forge/screens/match/menus/CardOverlaysMenu.java

@@ -61,25 +61,18 @@ private ActionListener getShowOverlaysAction() {
     }
 
     private void toggleCardOverlayDisplay(JMenuItem showMenu) {
-        toggleShowOverlaySetting();
+        toggleOverlaySetting(FPref.UI_SHOW_CARD_OVERLAYS);
         repaintCardOverlays();
         // Enable/disable overlay menu items based on state of "Show" menu.
         for (Component c : showMenu.getParent().getComponents()) {
-            if (c instanceof JMenuItem) {
-                JMenuItem m = (JMenuItem)c;
-                if (m != showMenu) {
-                    m.setEnabled(prefs.getPrefBoolean(FPref.UI_SHOW_CARD_OVERLAYS));
+            if (c instanceof JMenuItem jmu) {
+                if (jmu != showMenu) {
+                    jmu.setEnabled(prefs.getPrefBoolean(FPref.UI_SHOW_CARD_OVERLAYS));
                 }
             }
         }
     }
 
-    private static void toggleShowOverlaySetting() {
-        boolean isOverlayEnabled = !prefs.getPrefBoolean(FPref.UI_SHOW_CARD_OVERLAYS);
-        prefs.setPref(FPref.UI_SHOW_CARD_OVERLAYS, isOverlayEnabled);
-        prefs.save();
-    }
-
     private ActionListener getCardOverlaysAction(final FPref overlaySetting) {
         return e -> {
             toggleOverlaySetting(overlaySetting);

forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java

@@ -51,19 +51,16 @@ public void handleEvent(FEvent e) {
                     @Override
                     public void setVisible(boolean b0) {
                         super.setVisible(b0);
-                        if (!b0) {
-                            if (autoYieldsDisabled && !MatchController.instance.getGameController().getYieldController().getDisableAutoYields()) {
-                                //if re-enabling auto-yields, auto-yield to current ability on stack if applicable
-                                if (MatchController.instance.getGameView().peekStack() != null) {
-                                    final String key = MatchController.instance.getGameView().peekStack().getKey();
-                                    final boolean autoYield = MatchController.instance.getGameController().shouldAutoYield(key);
-                                    boolean abilityScope = MatchController.instance.getGameController().getYieldController().isAbilityScope();
-                                    MatchController.instance.getGameController().setShouldAutoYield(key, !autoYield, abilityScope);
-                                    if (!autoYield && MatchController.instance.getGameController().shouldAutoYield(key)) {
-                                        //auto-pass priority if ability is on top of stack
-                                        MatchController.instance.getGameController().passPriority();
-                                    }
-                                }
+                        if (!b0 && MatchController.instance.getGameView().peekStack() != null
+                                && autoYieldsDisabled && !MatchController.instance.getGameController().getYieldController().getDisableAutoYields()) {
+                            //if re-enabling auto-yields, auto-yield to current ability on stack if applicable
+                            final String key = MatchController.instance.getGameView().peekStack().getKey();
+                            final boolean autoYield = MatchController.instance.getGameController().shouldAutoYield(key);
+                            boolean abilityScope = MatchController.instance.getGameController().getYieldController().isAbilityScope();
+                            MatchController.instance.getGameController().setShouldAutoYield(key, !autoYield, abilityScope);
+                            if (!autoYield && MatchController.instance.getGameController().shouldAutoYield(key)) {
+                                //auto-pass priority if ability is on top of stack
+                                MatchController.instance.getGameController().passPriority();
                             }
                         }
                     }

forge-gui/res/cardsfolder/e/elvish_refueler.txt

@@ -2,7 +2,7 @@ Name:Elvish Refueler
 ManaCost:2 G
 Types:Creature Elf Druid
 PT:2/3
-S:Mode$ Activations | ValidSA$ Activated.Exhaust | ValidPlayer$ You | MinLimit$ 2 | PlayerTurn$ You | CheckSVar$ X | SVarCompare$ LT1 | Description$ During your turn, as long as you haven't activated an exhaust ability this turn, you may activate exhaust abilities as though they haven't been activated.
+S:Mode$ Activations | ValidSA$ Activated.Exhaust | ValidPlayer$ You | MinLimit$ -1 | PlayerTurn$ You | CheckSVar$ X | SVarCompare$ LT1 | Description$ During your turn, as long as you haven't activated an exhaust ability this turn, you may activate exhaust abilities as though they haven't been activated.
 SVar:X:Count$ThisTurnActivated_Activated.Exhaust+YouCtrl
 A:AB$ PutCounter | Cost$ 1 G | CounterType$ P1P1 | CounterNum$ 1 | Exhaust$ True | SpellDescription$ Put a +1/+1 counter on this creature.
 Oracle:During your turn, as long as you haven't activated an exhaust ability this turn, you may activate exhaust abilities as though they haven't been activated.\nExhaust — {1}{G}: Put a +1/+1 counter on this creature. (Activate each exhaust ability only once.)

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

@@ -1,6 +1,6 @@
 Name:Hydro-Channeler
 ManaCost:1 U
-Types:Creature Elf Merfolk Wizard
+Types:Creature Merfolk Wizard
 PT:1/3
 A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Spell.Instant,Spell.Sorcery | SpellDescription$ Add {U}. Spend this mana only to cast an instant or sorcery spell.
 A:AB$ Mana | Cost$ 1 T | Produced$ Any | RestrictValid$ Spell.Instant,Spell.Sorcery | SpellDescription$ Add one mana of any color. Spend this mana only to cast an instant or sorcery spell.