Merge branch 'fury' into 'master'

Fix Fury

Closes #1995

See merge request core-developers/forge!5662

forge-ai/src/main/java/forge/ai/ability/DigUntilAi.java

@@ -51,8 +51,8 @@ public class DigUntilAi extends SpellAbilityAi {
                 // until opponent's end of turn phase!
                 // But we still want more (and want to fill grave) if nothing better to do then
                 // This is important for Replenish/Living Death type decks
-                if (!((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN))
+                if (!ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)
-                        && (!ai.getGame().getPhaseHandler().isPlayerTurn(ai)))) {
+                        && !ai.getGame().getPhaseHandler().isPlayerTurn(ai)) {
                     return false;
                 }
             }
@@ -75,7 +75,7 @@ public class DigUntilAi extends SpellAbilityAi {
         }
 
         final String num = sa.getParam("Amount");
-        if ((num != null) && num.equals("X") && sa.getSVar(num).equals("Count$xPaid")) {
+        if (num != null && num.equals("X") && sa.getSVar(num).equals("Count$xPaid")) {
             // Set PayX here to maximum value.
             SpellAbility root = sa.getRootAbility();
             if (root.getXManaCostPaid() == null) {

forge-core/src/main/java/forge/StaticData.java

@@ -169,7 +169,6 @@ public class StaticData {
         return this.customEditions;
     }
 
-
     private List<CardEdition> sortedEditions;
     public final List<CardEdition> getSortedEditions() {
         if (sortedEditions == null) {
@@ -231,7 +230,6 @@ public class StaticData {
     public void attemptToLoadCard(String cardName){
         this.attemptToLoadCard(cardName, null);
     }
-
     public void attemptToLoadCard(String cardName, String setCode) {
         CardRules rules = cardReader.attemptToLoadCard(cardName);
         CardRules customRules = null;
@@ -450,10 +448,6 @@ public class StaticData {
 
     public Predicate<PaperCard> getBrawlPredicate() { return brawlPredicate; }
 
-    public void setFilteredHandsEnabled(boolean filteredHandsEnabled){
-        this.filteredHandsEnabled = filteredHandsEnabled;
-    }
-
     /**
      * Get an alternative card print for the given card wrt. the input setReleaseDate.
      * The reference release date will be used to retrieve the alternative art, according
@@ -537,7 +531,6 @@ public class StaticData {
     public PaperCard getAlternativeCardPrint(PaperCard card, Date setReleaseDate, boolean isCardArtPreferenceLatestArt,
                                              boolean cardArtPreferenceHasFilter,
                                              boolean preferCandidatesFromExpansionSets, boolean preferModernFrame) {
-
         PaperCard altCard = this.getAlternativeCardPrint(card, setReleaseDate, isCardArtPreferenceLatestArt,
                                                          cardArtPreferenceHasFilter);
         if (altCard == null)
@@ -690,6 +683,9 @@ public class StaticData {
     public boolean getFilteredHandsEnabled() {
         return filteredHandsEnabled;
     }
+    public void setFilteredHandsEnabled(boolean filteredHandsEnabled) {
+        this.filteredHandsEnabled = filteredHandsEnabled;
+    }
 
     public void setMulliganRule(MulliganDefs.MulliganRule rule) {
         mulliganRule = rule;
@@ -751,7 +747,6 @@ public class StaticData {
         this.customCards.setCardArtPreference(artPreference);
     }
 
-    //
     public boolean isEnabledCardArtSmartSelection() {
         return this.enableSmartCardArtSelection;
     }

forge-gui/res/cardsfolder/f/fury.txt

@@ -5,5 +5,5 @@ PT:3/3
 K:Double Strike
 K:Evoke:ExileFromHand<1/Card.Red+Other/red card>
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 4 damage divided as you choose among any number of target creatures and/or planeswalkers.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker to distribute damage to | NumDmg$ 4 | TargetMin$ 1 | TargetMax$ 4 | DividedAsYouChoose$ 4
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker to distribute damage to | NumDmg$ 4 | TargetMin$ 0 | TargetMax$ 4 | DividedAsYouChoose$ 4
 Oracle:Double strike\nWhen Fury enters the battlefield, it deals 4 damage divided as you choose among any number of target creatures and/or planeswalkers.\nEvoke—Exile a red card from your hand.