Clean + fix combo (#6830)

Card-Forge · Jan 22, 2025 · d314b2e · d314b2e
1 parent 47a57f5
commit d314b2e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -548,11 +548,6 @@ else if ("None".equalsIgnoreCase(params.get("Revolt"))) {
             }
         }
 
-        if (params.containsKey("ActivateNoLoyaltyAbilitiesCondition")) {
-            final Player active = game.getPhaseHandler().getPlayerTurn();
-            return !active.getActivateLoyaltyAbilityThisTurn(this);
-        }
-
         if (params.containsKey("ClassLevel")) {
             final int level = getHostCard().getClassLevel();
             final int levelMin = Integer.parseInt(params.get("ClassLevel"));

diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
@@ -1890,10 +1890,6 @@ public final void setBeenDealtCombatDamageSinceLastTurn(final boolean b) {
         beenDealtCombatDamageSinceLastTurn = b;
     }
 
-    public final boolean getActivateLoyaltyAbilityThisTurn(CardTraitBase ctb) {
-        return !CardUtil.getThisTurnActivated("Activated.Loyalty+Planeswalker+YouCtrl", ctb.getHostCard(), ctb, this).isEmpty();
-    }
-
     public final List<Card> getCreaturesAttackedThisTurn() {
         List<Card> result = Lists.newArrayList(Iterables.concat(attackedThisTurn.values()));
         return result;

diff --git a/forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt b/forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt
@@ -6,7 +6,7 @@ K:First Strike
 T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ You | CheckSVar$ RaidTest | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Raid — At end of combat on your turn, if you attacked this turn, create a Junk token for each opponent you attacked. (It's an artifact with "{T}, Sacrifice this artifact: Exile the top card of your library. You may play that card this turn. Activate only as a sorcery.")
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_a_junk_sac_exileplay | TokenOwner$ You
 SVar:RaidTest:Count$AttackersDeclared
-SVar:X:PlayerCountRegisteredOpponents$HasPropertyBeenAttackedThisCombat
+SVar:X:PlayerCountPropertyYou$OpponentsAttackedThisTurn
 T:Mode$ Sacrificed | ValidCard$ Junk.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever you sacrifice a Junk, add {R}.
 SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 1
 DeckHas:Ability$Sacrifice|Token & Type$Junk|Artifact

diff --git a/forge-gui/res/cardsfolder/t/the_chain_veil.txt b/forge-gui/res/cardsfolder/t/the_chain_veil.txt
@@ -1,10 +1,11 @@
 Name:The Chain Veil
 ManaCost:4
 Types:Legendary Artifact
-T:Mode$ Phase | Phase$ End of Turn | ActivateNoLoyaltyAbilitiesCondition$ True | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life.
+T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ EQ0 | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 2
 A:AB$ Effect | Cost$ 4 T | StaticAbilities$ LoyaltyAbs | AILogic$ ChainVeil | SpellDescription$ For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn.
 SVar:LoyaltyAbs:Mode$ NumLoyaltyAct | ValidCard$ Planeswalker.YouCtrl | Additional$ 1 | Description$ For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn.
+SVar:X:Count$ThisTurnActivated_Activated.Loyalty+Planeswalker+YouCtrl
 SVar:NeedsToPlay:Planeswalker.YouCtrl
 AI:RemoveDeck:All
 AI:RemoveDeck:Random