Count destroyed attractions for "number of attractions you've visited this turn"

Author: Jetz72

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

@@ -3704,6 +3704,10 @@ public static int playerXProperty(final Player player, final String s, final Car
             return doXMath(amount, m, source, ctb);
         }
 
+        if (value.equals("AttractionsVisitedThisTurn")) {
+            return doXMath(player.getAttractionsVisitedThisTurn(), m, source, ctb);
+        }
+
         if (value.startsWith("PlaneswalkedToThisTurn")) {
             int found = 0;
             String name = value.split(" ")[1];

forge-game/src/main/java/forge/game/player/Player.java

@@ -112,6 +112,7 @@ public class Player extends GameEntity implements Comparable<Player> {
     private int expentThisTurn;
     private int numLibrarySearchedOwn; //The number of times this player has searched his library
     private int venturedThisTurn;
+    private int attractionsVisitedThisTurn;
     private int descended;
     private int numRingTemptedYou;
     private int devotionMod;
@@ -2589,6 +2590,7 @@ public void onCleanupPhase() {
         setCommitedCrimeThisTurn(0);
         diceRollsThisTurn = Lists.newArrayList();
         setExpentThisTurn(0);
+        attractionsVisitedThisTurn = 0;
 
         damageReceivedThisTurn.clear();
         planeswalkedToThisTurn.clear();
@@ -4008,12 +4010,17 @@ public void setExpentThisTurn(int v) {
     public void visitAttractions(int light) {
         CardCollection attractions = CardLists.filter(getCardsIn(ZoneType.Battlefield), CardPredicates.isAttractionWithLight(light));
         for (Card c : attractions) {
+            if(!c.wasVisitedThisTurn())
+                this.attractionsVisitedThisTurn++;
             c.visitAttraction(this);
         }
     }
     public void rollToVisitAttractions() {
         this.visitAttractions(RollDiceEffect.rollDiceForPlayerToVisitAttractions(this));
     }
+    public int getAttractionsVisitedThisTurn() {
+        return this.attractionsVisitedThisTurn;
+    }
 
     public int getCrankCounter() {
         return this.crankCounter;

forge-gui/res/cardsfolder/b/black_hole.txt

@@ -2,5 +2,5 @@ Name:Black Hole
 ManaCost:3 B
 Types:Sorcery
 A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature and up to X other target creatures, where X is the number of Attractions you're visited this turn | TargetMin$ 1 | TargetMax$ X | SpellDescription$ Destroy target creature and up to X other target creatures, where X is the number of Attractions you've visited this turn.
-SVar:X:Count$Valid Attraction.VisitedThisTurn/Plus.1
+SVar:X:PlayerCountPropertyYou$AttractionsVisitedThisTurn/Plus.1
 Oracle:Destroy target creature and up to X other target creatures, where X is the number of Attractions you've visited this turn.

forge-gui/res/cardsfolder/s/soul_swindler.txt

@@ -5,5 +5,5 @@ PT:5/3
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Indestructible | CheckSVar$ X | Description$ As long as you've visited an Attraction this turn, CARDNAME has indestructible. (Damage and effects that say "destroy" don't destroy it.)
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigOpenAttraction | TriggerDescription$ When CARDNAME enters the battlefield, open an Attraction.
 SVar:TrigOpenAttraction:DB$ OpenAttraction
-SVar:X:Count$Valid Attraction.VisitedThisTurn
+SVar:X:PlayerCountPropertyYou$AttractionsVisitedThisTurn
 Oracle:As long as you've visited an Attraction this turn, Soul Swindler has indestructible. (Damage and effects that say "destroy" don't destroy it.)\nWhen Soul Swindler enters the battlefield, open an Attraction. (Put the top card of your Attraction deck onto the battlefield.)

forge-gui/res/cardsfolder/s/squirrel_squatters.txt

@@ -6,6 +6,6 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefi
 SVar:TrigOpenAttraction:DB$ OpenAttraction
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a 1/1 green Squirrel creature token that's tapped and attacking for each Attraction you've visited this turn.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ g_1_1_squirrel | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True
-SVar:X:Count$Valid Attraction.VisitedThisTurn
+SVar:X:PlayerCountPropertyYou$AttractionsVisitedThisTurn
 SVar:HasAttackEffect:TRUE
 Oracle:When Squirrel Squatters enters, open an Attraction. (Put the top card of your Attraction deck onto the battlefield.)\nWhenever Squirrel Squatters attacks, create a 1/1 green Squirrel creature token that's tapped and attacking for each Attraction you've visited this turn.

forge-gui/res/cardsfolder/s/storybook_ride.txt

@@ -8,7 +8,7 @@ SVar:EffSModeContinuous:Mode$ Continuous | Affected$ Card.IsRemembered | MayPlay
 SVar:DBDelayTrig:DB$ DelayedTrigger | Mode$ Phase | RememberObjects$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionZone$ Exile | Phase$ End Of Turn | Execute$ TrigChangeAll | SubAbility$ DBCleanup | TriggerDescription$ At the beginning of the next end step, if any of those cards remain exiled, put them on the bottom of your library in any order.
 SVar:TrigChangeAll:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Library | LibraryPosition$ 0
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Attraction.VisitedThisTurn
+SVar:X:PlayerCountPropertyYou$AttractionsVisitedThisTurn
 Oracle:Visit — Exile the top X cards of your library, where X is the number of Attractions you've visited this turn (including this one). You may play those cards this turn. At the beginning of the next end step, if any of those cards remain exiled, put them on the bottom of your library in any order.
 
 # --- VARIANTS ---