diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java index ce0e8600e22..3390ff98150 100644 --- a/forge-core/src/main/java/forge/card/CardRules.java +++ b/forge-core/src/main/java/forge/card/CardRules.java @@ -92,6 +92,7 @@ public final class CardRules implements ICardCharacteristics { colorIdentity = newRules.colorIdentity; meldWith = newRules.meldWith; partnerWith = newRules.partnerWith; + tokens = newRules.tokens; } private static byte calculateColorIdentity(final ICardFace face) { @@ -386,7 +387,7 @@ public final class CardRules implements ICardCharacteristics { private int deltaHand; private int deltaLife; - private List tokens; + private List tokens = Collections.emptyList(); public List getTokens() { return tokens; @@ -484,7 +485,9 @@ public final class CardRules implements ICardCharacteristics { result.setNormalizedName(this.normalizedName); result.meldWith = this.meldWith; result.partnerWith = this.partnerWith; - result.tokens = tokens.isEmpty() ? Collections.emptyList() : tokens; + if (!tokens.isEmpty()) { + result.tokens = tokens; + } if (StringUtils.isNotBlank(handLife)) result.setVanguardProperties(handLife); return result; @@ -742,7 +745,10 @@ public final class CardRules implements ICardCharacteristics { } public boolean hasStartOfKeyword(final String k) { - for (final String inst : mainPart.getKeywords()) { + return hasStartOfKeyword(k, mainPart); + } + public boolean hasStartOfKeyword(final String k, ICardFace cf) { + for (final String inst : cf.getKeywords()) { final String[] parts = inst.split(":"); if (parts[0].equals(k)) { return true; diff --git a/forge-core/src/main/java/forge/card/CardRulesPredicates.java b/forge-core/src/main/java/forge/card/CardRulesPredicates.java index 572d9dd6664..16123d574bd 100644 --- a/forge-core/src/main/java/forge/card/CardRulesPredicates.java +++ b/forge-core/src/main/java/forge/card/CardRulesPredicates.java @@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.collect.Iterables; import forge.util.CardTranslation; import forge.util.ComparableOp; @@ -186,7 +187,7 @@ public final class CardRulesPredicates { return new Predicate() { @Override public boolean apply(final CardRules card) { - return card.hasStartOfKeyword(keyword); + return Iterables.any(card.getAllFaces(), cf -> cf != null && card.hasStartOfKeyword(keyword, cf)); } }; } diff --git a/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java index 1b3869cd50c..bf5ec71316d 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java @@ -180,12 +180,8 @@ public class RepeatEachEffect extends SpellAbilityEffect { } } for (final Player p : repeatPlayers) { - if (optional) { - if (!p.getController().confirmAction(repeat, null, sa.getParam("RepeatOptionalMessage"), null)) { - continue; - } else if (sa.hasParam("RememberDeciders")) { - source.addRemembered(p); - } + if (optional && !p.getController().confirmAction(repeat, null, sa.getParam("RepeatOptionalMessage"), null)) { + continue; } if (nextTurn) { game.getCleanup().addUntil(p, new GameCommand() { diff --git a/forge-gui/res/cardsfolder/d/desecrate_reality.txt b/forge-gui/res/cardsfolder/d/desecrate_reality.txt index cf25f75752a..c36ac922a6f 100644 --- a/forge-gui/res/cardsfolder/d/desecrate_reality.txt +++ b/forge-gui/res/cardsfolder/d/desecrate_reality.txt @@ -1,7 +1,7 @@ Name:Desecrate Reality ManaCost:7 Types:Instant -A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl+cmcEven | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True | TgtPrompt$ Select up to one target nonland permanent each opponent controls | SubAbility$ DBReturn | SpellDescription$ For each opponent, exile up to one target permanent that player controls with an even mana value. (Zero is even.) +A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.OppCtrl+cmcEven | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True | TgtPrompt$ Select up to one target permanent with an even mana value each opponent controls | SubAbility$ DBReturn | SpellDescription$ For each opponent, exile up to one target permanent that player controls with an even mana value. (Zero is even.) SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Permanent.cmcOdd+YouOwn | Hidden$ True | Mandatory$ True | ChangeTypeDesc$ permanent card with an odd mana value | ChangeNum$ 1 | ConditionCheckSVar$ X | SpellDescription$ Adamant — If at least three colorless mana was spent to cast this spell, return a permanent card with an odd mana value from your graveyard to the battlefield. SVar:X:Count$Adamant.Colorless.1.0 SVar:OneEach:PlayerCountOpponents$Amount diff --git a/forge-gui/res/cardsfolder/k/korvold_fae_cursed_king.txt b/forge-gui/res/cardsfolder/k/korvold_fae_cursed_king.txt index 68f07fd16ff..303a5b5ce84 100644 --- a/forge-gui/res/cardsfolder/k/korvold_fae_cursed_king.txt +++ b/forge-gui/res/cardsfolder/k/korvold_fae_cursed_king.txt @@ -7,7 +7,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, sacrifice another permanent. SVar:TrigSac:DB$ Sacrifice | Defined$ You | SacValid$ Permanent.Other SVar:NeedsToPlay:Permanent.YouCtrl+cmcLE2 -T:Mode$ Sacrificed | ValidCard$ Permanent | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice a permanent, put a +1/+1 counter on CARDNAME and draw a card. +T:Mode$ Sacrificed | ValidCard$ Permanent | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice a permanent, put a +1/+1 counter on NICKNAME and draw a card. SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 AI:RemoveDeck:Random diff --git a/forge-gui/res/cardsfolder/t/tempting_contract.txt b/forge-gui/res/cardsfolder/t/tempting_contract.txt index 1e8182f4225..de5440b17be 100644 --- a/forge-gui/res/cardsfolder/t/tempting_contract.txt +++ b/forge-gui/res/cardsfolder/t/tempting_contract.txt @@ -2,10 +2,10 @@ Name:Tempting Contract ManaCost:4 Types:Artifact T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBRepeat | SubAbility$ DBToken | TriggerDescription$ At the beginning of your upkeep, each opponent may create a Treasure token. For each opponent who does, you create a Treasure token. -SVar:DBRepeat:DB$ RepeatEach | RepeatSubAbility$ DBOppToken | RepeatPlayers$ Opponent | RepeatOptionalForEachPlayer$ True | RememberDeciders$ True | RepeatOptionalMessage$ Do you want to create a Treasure token? | ChangeZoneTable$ True | SubAbility$ DBToken -SVar:DBOppToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenOwner$ Player.IsRemembered +SVar:DBRepeat:DB$ RepeatEach | RepeatSubAbility$ DBOppToken | RepeatPlayers$ Opponent | RepeatOptionalForEachPlayer$ True | RepeatOptionalMessage$ Do you want to create a Treasure token? | ChangeZoneTable$ True | SubAbility$ DBToken +SVar:DBOppToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenOwner$ Player.IsRemembered | RememberTokens$ True SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$RememberedSize +SVar:X:PlayerCountRememberedOwner$Amount DeckHas:Ability$Token|Sacrifice Oracle:At the beginning of your upkeep, each opponent may create a Treasure token. For each opponent who does, you create a Treasure token. diff --git a/forge-gui/res/cardsfolder/upcoming/grist_voracious_larva_grist_the_plague_swarm.txt b/forge-gui/res/cardsfolder/upcoming/grist_voracious_larva_grist_the_plague_swarm.txt index 70f533020ec..ddab1d42bd5 100644 --- a/forge-gui/res/cardsfolder/upcoming/grist_voracious_larva_grist_the_plague_swarm.txt +++ b/forge-gui/res/cardsfolder/upcoming/grist_voracious_larva_grist_the_plague_swarm.txt @@ -3,8 +3,8 @@ ManaCost:G Types:Legendary Creature Insect PT:1/2 K:Deathtouch -T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | ValidCard$ Card.Self,Creature.YouCtrl | Execute$ TrigTransform | TriggerDescription$ When CARDNAME or another creature enters the battlefield under your control, if it entered from your graveyard or you cast it from your graveyard, you may pay {G}. If you do, exile NICKNAME, then return it to the battlefield transformed under its owner's control. -T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self+wasCastFromYourGraveyardByYou,Creature.YouCtrl+wasCastFromYourGraveyardByYou | Execute$ TrigTransform | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, you may pay {G}. If you do, exile NICKNAME, then return it to the battlefield transformed under its owner's control. +T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | ValidCard$ Card.Self,Creature.YouCtrl | Execute$ TrigTransform | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME or another creature enters the battlefield under your control, if it entered from your graveyard or you cast it from your graveyard, you may pay {G}. If you do, exile NICKNAME, then return it to the battlefield transformed under its owner's control. +T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self+wasCastFromYourGraveyardByYou,Creature.YouCtrl+wasCastFromYourGraveyardByYou | Execute$ TrigTransform | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, you may pay {G}. If you do, exile NICKNAME, then return it to the battlefield transformed under its owner's control. SVar:TrigTransform:AB$ ChangeZone | Cost$ G | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | ForgetOtherRemembered$ True | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True diff --git a/forge-gui/res/cardsfolder/upcoming/tempt_with_mayhem.txt b/forge-gui/res/cardsfolder/upcoming/tempt_with_mayhem.txt index c032f8b72f5..d48a1eebb78 100644 --- a/forge-gui/res/cardsfolder/upcoming/tempt_with_mayhem.txt +++ b/forge-gui/res/cardsfolder/upcoming/tempt_with_mayhem.txt @@ -1,9 +1,9 @@ Name:Tempt with Mayhem ManaCost:1 R R Types:Instant -A:SP$ RepeatEach | ValidTgts$ Instant,Sorcery | TgtZone$ Stack | TgtPrompt$ Select target instant or sorcery spell | RepeatSubAbility$ DBCopy | RepeatPlayers$ Player.Opponent | SubAbility$ DBCopySelf | RepeatOptionalForEachPlayer$ True | RememberDeciders$ True | RepeatOptionalMessage$ Do you want to copy the targeted spell? | SpellDescription$ Tempting offer — Choose target instant or sorcery spell. Each opponent may copy that spell and may choose new targets for the copy they control. You copy that spell once plus an additional time for each opponent who copied the spell this way. You may choose new targets for the copies you control. -SVar:DBCopy:DB$ CopySpellAbility | Defined$ Targeted | Controller$ Remembered | Amount$ 1 | MayChooseTarget$ True +A:SP$ RepeatEach | ValidTgts$ Instant,Sorcery | TgtZone$ Stack | TgtPrompt$ Select target instant or sorcery spell | RepeatSubAbility$ DBCopy | RepeatPlayers$ Player.Opponent | SubAbility$ DBCopySelf | RepeatOptionalForEachPlayer$ True | RepeatOptionalMessage$ Do you want to copy the targeted spell? | SpellDescription$ Tempting offer — Choose target instant or sorcery spell. Each opponent may copy that spell and may choose new targets for the copy they control. You copy that spell once plus an additional time for each opponent who copied the spell this way. You may choose new targets for the copies you control. +SVar:DBCopy:DB$ CopySpellAbility | Defined$ Targeted | Controller$ Remembered | Amount$ 1 | MayChooseTarget$ True | RememberCopies$ True SVar:DBCopySelf:DB$ CopySpellAbility | Defined$ Targeted | Amount$ X | MayChooseTarget$ True | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$RememberedSize/Plus.1 +SVar:X:PlayerCountRememberedController$Amount/Plus.1 Oracle:Tempting offer — Choose target instant or sorcery spell. Each opponent may copy that spell and may choose new targets for the copy they control. You copy that spell once plus an additional time for each opponent who copied the spell this way. You may choose new targets for the copies you control. diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java index 98cc5269900..6d14b52396e 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java @@ -223,7 +223,6 @@ public class SFilterUtil { } }; - } public static Predicate buildColorFilter(Map buttonMap) {