Merge branch 'master' into animatesub

Author: tool4ever

forge-game/src/main/java/forge/game/ForgeScript.java

@@ -240,6 +240,8 @@ public static boolean spellAbilityHasProperty(SpellAbility sa, String property,
             return sa.isEquip();
         } else if (property.equals("Boast")) {
             return sa.isBoast();
+        } else if (property.equals("Exhaust")) {
+            return sa.isExhaust();
         } else if (property.equals("Mutate")) {
             return sa.isMutate();
         } else if (property.equals("Ninjutsu")) {

forge-game/src/main/java/forge/game/ability/AbilityFactory.java

@@ -253,11 +253,14 @@ else if (api == ApiType.PermanentCreature || api == ApiType.PermanentNoncreature
             spellAbility.putParam("PlayerTurn", "True");
             spellAbility.putParam("PrecostDesc", "Forecast — ");
         }
-        if (mapParams.containsKey("Boast")) {
+        if (spellAbility.isBoast()) {
             spellAbility.putParam("PresentDefined", "Self");
             spellAbility.putParam("IsPresent", "Card.attackedThisTurn");
             spellAbility.putParam("PrecostDesc", "Boast — ");
         }
+        if (spellAbility.isExhaust()) {
+            spellAbility.putParam("PrecostDesc", "Exhaust — ");
+        }
 
         // *********************************************
         // set universal properties of the SpellAbility

forge-game/src/main/java/forge/game/spellability/SpellAbility.java

@@ -587,6 +587,9 @@ public boolean isBackup() {
     public boolean isBoast() {
         return this.hasParam("Boast");
     }
+    public boolean isExhaust() {
+        return this.hasParam("Exhaust");
+    }
 
     public boolean isNinjutsu() {
         return this.isKeyword(Keyword.NINJUTSU);

forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java

@@ -34,6 +34,7 @@
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.staticability.StaticAbilityCastWithFlash;
+import forge.game.staticability.StaticAbilityExhaust;
 import forge.game.staticability.StaticAbilityNumLoyaltyAct;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
@@ -542,6 +543,10 @@ public final boolean checkOtherRestrictions(final Card c, final SpellAbility sa,
             if (limit <= sa.getActivationsThisTurn()) {
                 return false;
             }
+        } else if (sa.isExhaust()) {
+            if (sa.getActivationsThisGame() > 0 && !StaticAbilityExhaust.anyWithExhaust(activator)) {
+                return false;
+            }
         }
 
         // Rule 605.3c about Mana Abilities

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

@@ -0,0 +1,34 @@
+package forge.game.staticability;
+
+import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.player.Player;
+import forge.game.zone.ZoneType;
+    
+public class StaticAbilityExhaust {
+
+    static String MODE = "CanExhaust";
+
+    public static boolean anyWithExhaust(final Player player) {
+        final Game game = player.getGame();
+        for (final Card ca : game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
+            for (final StaticAbility stAb : ca.getStaticAbilities()) {
+                if (!stAb.checkConditions(MODE)) {
+                    continue;
+                }
+                if (applyWithExhaust(stAb, player)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean applyWithExhaust(final StaticAbility stAb, final Player player) {
+        if (!stAb.matchesValidParam("ValidPlayer", player)) {
+            return false;
+        }
+
+        return true;
+    }
+}

forge-gui/res/adventure/common/config.json

@@ -73,7 +73,8 @@
     "UEIND23",
     "UEBAR23",
     "MB2",
-    "UNF"
+    "UNF",
+    "DA1"
   ],
   "difficulties": [
     {

forge-gui/res/cardsfolder/.gitattributes

@@ -0,0 +1 @@
+*.txt text eol=lf

forge-gui/res/cardsfolder/a/abandon_reason.txt

@@ -1,7 +1,7 @@
 Name:Abandon Reason
 ManaCost:2 R
 Types:Instant
-A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +1 | KW$ First Strike | ValidTgts$ Creature | TgtPrompt$ Select target Creature | SpellDescription$ Up to two target creatures each get +1/+0 and gain first strike until end of turn.
+A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +1 | KW$ First Strike | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | SpellDescription$ Up to two target creatures each get +1/+0 and gain first strike until end of turn.
 K:Madness:1 R
 DeckHints:Ability$Discard
 Oracle:Up to two target creatures each get +1/+0 and gain first strike until end of turn.\nMadness {1}{R} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)

forge-gui/res/cardsfolder/a/admiral_brass_unsinkable.txt

@@ -5,7 +5,7 @@ PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill four cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 4 | Defined$ You
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of combat on your turn, you may return target Pirate creature card from your graveyard to the battlefield with a finality counter on it. It has base power and toughness 4/4. It gains haste until end of turn. (If a creature with a finality counter on it would die, exile it instead.)
-SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ FINALITY | ValidTgts$ Pirate.YouOwn | Optional$ True | TgtPrompt$ Select target pirate in your graveyard | SubAbility$ DBPump | RememberChanged$ True | StaticEffect$ Animate
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ FINALITY | ValidTgts$ Pirate.YouOwn | Optional$ True | TgtPrompt$ Select target Pirate in your graveyard | SubAbility$ DBPump | RememberChanged$ True | StaticEffect$ Animate
 SVar:Animate:Mode$ Continuous | Affected$ Card.IsRemembered | SetPower$ 4 | SetToughness$ 4
 SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

forge-gui/res/cardsfolder/a/aegis_of_the_meek.txt

@@ -1,5 +1,5 @@
 Name:Aegis of the Meek
 ManaCost:3
 Types:Artifact
-A:AB$ Pump | Cost$ 1 T | NumAtt$ 1 | NumDef$ 2 | ValidTgts$ Creature.powerEQ1+toughnessEQ1 | TgtPrompt$ Select target 1/1 Creature | SpellDescription$ Target 1/1 creature gets +1/+2 until end of turn.
+A:AB$ Pump | Cost$ 1 T | NumAtt$ 1 | NumDef$ 2 | ValidTgts$ Creature.powerEQ1+toughnessEQ1 | TgtPrompt$ Select target 1/1 creature | SpellDescription$ Target 1/1 creature gets +1/+2 until end of turn.
 Oracle:{1}, {T}: Target 1/1 creature gets +1/+2 until end of turn.