Solved fix

Card-Forge · Jan 19, 2024 · b79cdc3 · b79cdc3
1 parent 154fe2a
commit b79cdc3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
@@ -433,6 +433,11 @@ public final boolean checkOtherRestrictions(final Card c, final SpellAbility sa,
                 return false;
             }
         }
+        if (isSolved()) {
+            if (!c.isSolved()) {
+                return false;
+            }
+        }
         if (sa.isProwl()) {
             if (!activator.hasProwl(c.getType().getCreatureTypes())) {
                 return false;

diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java
@@ -552,6 +552,8 @@ public final String getGameLimitToCheck() {
     public final boolean isDesert() {     return this.desert;  }
     public final boolean isBlessing() {     return this.blessing;  }
 
+    public final boolean isSolved() {     return this.solved;  }
+
     public String getShareAllColors() {
         return shareAllColors;
     }

diff --git a/forge-gui/res/cardsfolder/upcoming/case_of_the_filched_falcon.txt b/forge-gui/res/cardsfolder/upcoming/case_of_the_filched_falcon.txt
@@ -5,7 +5,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigInvestigate:DB$ Investigate
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Artifact.YouCtrl | PresentZone$ Battlefield | PresentCompare$ GE3 | CheckSVar$ Solved | SVarCompare$ GE1 | Execute$ SolveFalcon | TriggerDescription$ To solve - You control three or more artifacts.
 SVar:SolveFalcon:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
-A:AB$ PutCounter | Cost$ 2 U Sac<1/CARDNAME> | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select target noncreature artifact | Activation$ Solved |  CounterType$ P1P1 | CounterNum$ 4 | SubAbility$ DBAnimate | PreCostDesc$ Solved - | SpellDescription$ Put 4 +1/+1 counters on target noncreature artifact. It becomes a 0/0 Bird creature with flying in addition to its other types.
+A:AB$ PutCounter | Cost$ 2 U Sac<1/CARDNAME> | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select target noncreature artifact | Activation$ Solved | CounterType$ P1P1 | CounterNum$ 4 | SubAbility$ DBAnimate | PrecostDesc$ Solved - | SpellDescription$ Put four +1/+1 counters on target noncreature artifact. It becomes a 0/0 Bird creature with flying in addition to its other types.
 SVar:DBAnimate:DB$ Animate | Defined$ ParentTarget | Power$ 0 | Toughness$ 0 | Types$ Creature,Bird | Keywords$ Flying | Duration$ Permanent
 SVar:Solved:Count$Valid Card.Self+IsUnsolved
 DeckNeeds:Type$Artifact