external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean + fix combo (#6830)

Browse Source
This commit is contained in:
tool4ever
2025-01-22 17:52:43 +01:00
committed by GitHub
parent 47a57f50b3
commit d314b2ef85
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/CardTraitBase.java
View File

@@ -548,11 +548,6 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView,
} }
} }
if (params.containsKey("ActivateNoLoyaltyAbilitiesCondition")) {
final Player active = game.getPhaseHandler().getPlayerTurn();
return !active.getActivateLoyaltyAbilityThisTurn(this);
}
if (params.containsKey("ClassLevel")) { if (params.containsKey("ClassLevel")) {
final int level = getHostCard().getClassLevel(); final int level = getHostCard().getClassLevel();
final int levelMin = Integer.parseInt(params.get("ClassLevel")); final int levelMin = Integer.parseInt(params.get("ClassLevel"));

4
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -1890,10 +1890,6 @@ public class Player extends GameEntity implements Comparable<Player> {
beenDealtCombatDamageSinceLastTurn = 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() { public final List<Card> getCreaturesAttackedThisTurn() {
List<Card> result = Lists.newArrayList(Iterables.concat(attackedThisTurn.values())); List<Card> result = Lists.newArrayList(Iterables.concat(attackedThisTurn.values()));
return result; return result;

2
forge-gui/res/cardsfolder/r/rose_cutthroat_raider.txt
View File

@@ -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.") 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:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_a_junk_sac_exileplay | TokenOwner$ You
SVar:RaidTest:Count$AttackersDeclared 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}. 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 SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 1
DeckHas:Ability$Sacrifice|Token & Type$Junk|Artifact DeckHas:Ability$Sacrifice|Token & Type$Junk|Artifact

3
forge-gui/res/cardsfolder/t/the_chain_veil.txt
View File

@@ -1,10 +1,11 @@
Name:The Chain Veil Name:The Chain Veil
ManaCost:4 ManaCost:4
Types:Legendary Artifact 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 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. 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: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 SVar:NeedsToPlay:Planeswalker.YouCtrl
AI:RemoveDeck:All AI:RemoveDeck:All
AI:RemoveDeck:Random AI:RemoveDeck:Random