From d45a962faa71e66e2c79c55cd714e1b6ea71fe34 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Tue, 22 Nov 2022 13:37:48 +0100 Subject: [PATCH] Cleanup SpellDescription from some Triggers that don't need it --- forge-gui/res/cardsfolder/a/awakening.txt | 2 +- forge-gui/res/cardsfolder/b/barbed_shocker.txt | 4 ++-- forge-gui/res/cardsfolder/b/benthicore.txt | 2 +- forge-gui/res/cardsfolder/b/borborygmos_enraged.txt | 2 +- forge-gui/res/cardsfolder/c/crafty_cutpurse.txt | 2 +- forge-gui/res/cardsfolder/d/dragonborn_champion.txt | 2 +- forge-gui/res/cardsfolder/e/euroakus.txt | 2 +- forge-gui/res/cardsfolder/g/genesis_chamber.txt | 2 +- forge-gui/res/cardsfolder/i/irregular_cohort.txt | 2 +- forge-gui/res/cardsfolder/j/jolrael_mwonvuli_recluse.txt | 2 +- forge-gui/res/cardsfolder/j/josu_vess_lich_knight.txt | 2 +- forge-gui/res/cardsfolder/m/militant_angel.txt | 2 +- forge-gui/res/cardsfolder/p/pure_reflection.txt | 2 +- forge-gui/res/cardsfolder/r/regna_the_redeemer.txt | 2 +- forge-gui/res/cardsfolder/t/thelonite_hermit.txt | 2 +- forge-gui/res/cardsfolder/w/watchful_giant.txt | 2 +- .../java/forge/gamemodes/match/input/InputSelectManyBase.java | 4 ++-- .../src/main/java/forge/player/PlayerControllerHuman.java | 4 ++-- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/forge-gui/res/cardsfolder/a/awakening.txt b/forge-gui/res/cardsfolder/a/awakening.txt index f72b293b02a..6949b70094d 100644 --- a/forge-gui/res/cardsfolder/a/awakening.txt +++ b/forge-gui/res/cardsfolder/a/awakening.txt @@ -2,7 +2,7 @@ Name:Awakening ManaCost:2 G G Types:Enchantment T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigUntapAll | TriggerDescription$ At the beginning of each upkeep, untap all creatures and lands. -SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature,Land | SpellDescription$ untap all creatures and lands. +SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature,Land SVar:UntapsEachTurn:Creature,Land AI:RemoveDeck:Random Oracle:At the beginning of each upkeep, untap all creatures and lands. diff --git a/forge-gui/res/cardsfolder/b/barbed_shocker.txt b/forge-gui/res/cardsfolder/b/barbed_shocker.txt index bc5adff1780..5e8fb13273b 100644 --- a/forge-gui/res/cardsfolder/b/barbed_shocker.txt +++ b/forge-gui/res/cardsfolder/b/barbed_shocker.txt @@ -5,8 +5,8 @@ PT:2/2 K:Trample K:Haste T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME deals damage to a player, that player discards all the cards in their hand, then draws that many cards. -SVar:TrigDiscard:DB$ Discard | Defined$ TriggeredTarget | Mode$ Hand | RememberDiscarded$ True | SubAbility$ DBDraw | SpellDescription$ Discard hand -SVar:DBDraw:DB$ Draw | NumCards$ X | Defined$ TriggeredTarget | SubAbility$ DBCleanup | SpellDescription$ Draw that many cards +SVar:TrigDiscard:DB$ Discard | Defined$ TriggeredTarget | Mode$ Hand | RememberDiscarded$ True | SubAbility$ DBDraw +SVar:DBDraw:DB$ Draw | NumCards$ X | Defined$ TriggeredTarget | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Amount Oracle:Trample, haste\nWhenever Barbed Shocker deals damage to a player, that player discards all the cards in their hand, then draws that many cards. diff --git a/forge-gui/res/cardsfolder/b/benthicore.txt b/forge-gui/res/cardsfolder/b/benthicore.txt index 1f1c8db3028..c2ed26357cc 100644 --- a/forge-gui/res/cardsfolder/b/benthicore.txt +++ b/forge-gui/res/cardsfolder/b/benthicore.txt @@ -3,7 +3,7 @@ ManaCost:6 U Types:Creature Elemental PT:5/5 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 blue Merfolk Wizard creature tokens. -SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ u_1_1_merfolk_wizard | TokenOwner$ You | SpellDescription$ Create two 1/1 blue Merfolk Wizard creature tokens. +SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ u_1_1_merfolk_wizard | TokenOwner$ You A:AB$ Untap | Cost$ tapXType<2/Merfolk> | SubAbility$ GainShroud | SpellDescription$ Untap CARDNAME. SVar:GainShroud:DB$ Pump | Defined$ Self | KW$ Shroud | SpellDescription$ CARDNAME gains shroud until end of turn. Oracle:When Benthicore enters the battlefield, create two 1/1 blue Merfolk Wizard creature tokens.\nTap two untapped Merfolk you control: Untap Benthicore. It gains shroud until end of turn. (It can't be the target of spells or abilities.) diff --git a/forge-gui/res/cardsfolder/b/borborygmos_enraged.txt b/forge-gui/res/cardsfolder/b/borborygmos_enraged.txt index 5e9275c28e5..cabfd133ee1 100644 --- a/forge-gui/res/cardsfolder/b/borborygmos_enraged.txt +++ b/forge-gui/res/cardsfolder/b/borborygmos_enraged.txt @@ -4,6 +4,6 @@ Types:Legendary Creature Cyclops PT:7/6 K:Trample T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest into your graveyard. -SVar:TrigDig:DB$ Dig | DigNum$ 3 | Defined$ You | Reveal$ True | ChangeNum$ All | ChangeValid$ Land | DestinationZone2$ Graveyard | SpellDescription$ Reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest into your graveyard. +SVar:TrigDig:DB$ Dig | DigNum$ 3 | Defined$ You | Reveal$ True | ChangeNum$ All | ChangeValid$ Land | DestinationZone2$ Graveyard A:AB$ DealDamage | Cost$ Discard<1/Land> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target. Oracle:Trample\nWhenever Borborygmos Enraged deals combat damage to a player, reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest into your graveyard.\nDiscard a land card: Borborygmos Enraged deals 3 damage to any target. diff --git a/forge-gui/res/cardsfolder/c/crafty_cutpurse.txt b/forge-gui/res/cardsfolder/c/crafty_cutpurse.txt index fab73f2e1e7..7bafc1cafef 100644 --- a/forge-gui/res/cardsfolder/c/crafty_cutpurse.txt +++ b/forge-gui/res/cardsfolder/c/crafty_cutpurse.txt @@ -4,7 +4,7 @@ Types:Creature Human Pirate PT:2/2 K:Flash T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME enters the battlefield, each token that would be created under an opponent's control this turn is created under your control instead. -SVar:TrigEffect:DB$ Effect | Name$ Crafty Cutpurse Effect | ReplacementEffects$ OppCreatEnters | SpellDescription$ Each token that would be created under an opponent's control this turn is created under your control instead. +SVar:TrigEffect:DB$ Effect | Name$ Crafty Cutpurse Effect | ReplacementEffects$ OppCreatEnters SVar:OppCreatEnters:Event$ CreateToken | ActiveZones$ Command | ValidToken$ Card.OppCtrl | ReplaceWith$ ETBYourCtrl | Layer$ Control | Description$ Each token that would be created under an opponent's control this turn is created under your control instead. SVar:ETBYourCtrl:DB$ ReplaceToken | Type$ ReplaceController | ValidCard$ Card.OppCtrl | NewController$ You Oracle:Flash\nWhen Crafty Cutpurse enters the battlefield, each token that would be created under an opponent's control this turn is created under your control instead. diff --git a/forge-gui/res/cardsfolder/d/dragonborn_champion.txt b/forge-gui/res/cardsfolder/d/dragonborn_champion.txt index d9ab5d07aa1..9d58306dffd 100644 --- a/forge-gui/res/cardsfolder/d/dragonborn_champion.txt +++ b/forge-gui/res/cardsfolder/d/dragonborn_champion.txt @@ -4,5 +4,5 @@ Types:Creature Dragon Warrior PT:5/3 K:Trample T:Mode$ DamageDone | ValidSource$ Card.YouCtrl,Emblem.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | DamageAmount$ GE5 | Execute$ TrigDraw | TriggerDescription$ Whenever a source you control deals 5 or more damage to a player, draw a card. -SVar:TrigDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card. +SVar:TrigDraw:DB$ Draw | NumCards$ 1 Oracle:Trample\nWhenever a source you control deals 5 or more damage to a player, draw a card. diff --git a/forge-gui/res/cardsfolder/e/euroakus.txt b/forge-gui/res/cardsfolder/e/euroakus.txt index cc4bf947253..7cf889a96f9 100644 --- a/forge-gui/res/cardsfolder/e/euroakus.txt +++ b/forge-gui/res/cardsfolder/e/euroakus.txt @@ -3,7 +3,7 @@ ManaCost:4 G G Types:Legendary Creature Treefolk Wizard PT:6/6 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a number of 1/1 blue Human Wizard creature tokens equal to the number of differently named lands you control. -SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ u_1_1_human_wizard | SpellDescription$ Create a number of 1/1 blue Human Wizard creature tokens equal to the number of differently named lands you control. +SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ u_1_1_human_wizard SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield A:AB$ Draw | Cost$ 4 G U | NumCards$ Y | SubAbility$ PumpAll | SpellDescription$ Draw a card for each Wizard you control. They each get +1/+1 until end of turn for each card in your hand. SVar:Y:Count$Valid Wizard.YouCtrl diff --git a/forge-gui/res/cardsfolder/g/genesis_chamber.txt b/forge-gui/res/cardsfolder/g/genesis_chamber.txt index 91ff9e9bfa0..ee1c96f536e 100644 --- a/forge-gui/res/cardsfolder/g/genesis_chamber.txt +++ b/forge-gui/res/cardsfolder/g/genesis_chamber.txt @@ -2,7 +2,7 @@ Name:Genesis Chamber ManaCost:2 Types:Artifact T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | IsPresent$ Card.Self+untapped | TriggerDescription$ Whenever a nontoken creature enters the battlefield, if CARDNAME is untapped, that creature's controller creates a 1/1 colorless Myr artifact creature token. -SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ TriggeredCardController | TokenScript$ c_1_1_a_myr | SpellDescription$ Create a 1/1 Myr artifact creature token. +SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ TriggeredCardController | TokenScript$ c_1_1_a_myr AI:RemoveDeck:Random DeckHas:Ability$Token Oracle:Whenever a nontoken creature enters the battlefield, if Genesis Chamber is untapped, that creature's controller creates a 1/1 colorless Myr artifact creature token. diff --git a/forge-gui/res/cardsfolder/i/irregular_cohort.txt b/forge-gui/res/cardsfolder/i/irregular_cohort.txt index a3a211266f9..6e999cb2d97 100644 --- a/forge-gui/res/cardsfolder/i/irregular_cohort.txt +++ b/forge-gui/res/cardsfolder/i/irregular_cohort.txt @@ -4,6 +4,6 @@ Types:Creature Shapeshifter PT:2/2 K:Changeling T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a colorless Shapeshifter creature token with changeling. -SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_2_2_shapeshifter_changeling | TokenOwner$ You | SpellDescription$ Create a 2/2 colorless Shapeshifter creature token with changeling. (It has every creature type.) +SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_2_2_shapeshifter_changeling | TokenOwner$ You DeckHas:Ability$Token Oracle:Changeling (This card is every creature type.)\nWhen Irregular Cohort enters the battlefield, create a 2/2 colorless Shapeshifter creature token with changeling. diff --git a/forge-gui/res/cardsfolder/j/jolrael_mwonvuli_recluse.txt b/forge-gui/res/cardsfolder/j/jolrael_mwonvuli_recluse.txt index 6984b82d5dd..3d617ce3faa 100644 --- a/forge-gui/res/cardsfolder/j/jolrael_mwonvuli_recluse.txt +++ b/forge-gui/res/cardsfolder/j/jolrael_mwonvuli_recluse.txt @@ -3,7 +3,7 @@ ManaCost:1 G Types:Legendary Creature Human Druid PT:1/2 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you draw your second card each turn, create a 2/2 green Cat creature token. -SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ g_2_2_cat | SpellDescription$ Create a 2/2 green Cat creature token. +SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ g_2_2_cat DeckHas:Ability$Token A:AB$ AnimateAll | Cost$ 4 G G | ValidCards$ Creature.YouCtrl | Power$ X | Toughness$ X | SpellDescription$ Until end of turn, creatures you control have base power and toughness X/X, where X is the number of cards in your hand. SVar:X:Count$InYourHand diff --git a/forge-gui/res/cardsfolder/j/josu_vess_lich_knight.txt b/forge-gui/res/cardsfolder/j/josu_vess_lich_knight.txt index 234b0820e55..55a55261d77 100644 --- a/forge-gui/res/cardsfolder/j/josu_vess_lich_knight.txt +++ b/forge-gui/res/cardsfolder/j/josu_vess_lich_knight.txt @@ -5,6 +5,6 @@ PT:4/5 K:Kicker:5 B K:Menace T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, create eight 2/2 black Zombie Knight creature tokens with menace. -SVar:TrigToken:DB$ Token | TokenAmount$ 8 | TokenScript$ b_2_2_zombie_knight_menace | TokenOwner$ You | SpellDescription$ When CARDNAME enters the battlefield, if it was kicked, create eight 2/2 black Zombie Knight creature tokens with menace. +SVar:TrigToken:DB$ Token | TokenAmount$ 8 | TokenScript$ b_2_2_zombie_knight_menace | TokenOwner$ You DeckHas:Ability$Token Oracle:Kicker {5}{B} (You may pay an additional {5}{B} as you cast this spell.)\nMenace\nWhen Josu Vess, Lich Knight enters the battlefield, if it was kicked, create eight 2/2 black Zombie Knight creature tokens with menace. diff --git a/forge-gui/res/cardsfolder/m/militant_angel.txt b/forge-gui/res/cardsfolder/m/militant_angel.txt index 2e468461510..1a47c0b7b7d 100644 --- a/forge-gui/res/cardsfolder/m/militant_angel.txt +++ b/forge-gui/res/cardsfolder/m/militant_angel.txt @@ -5,6 +5,6 @@ PT:3/4 K:Flying K:Lifelink T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a number of 2/2 white Knight creature tokens with vigilance equal to the number of opponents you attacked this turn. -SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ X | TokenScript$ w_2_2_knight_vigilance | SpellDescription$ Create a number of 2/2 white Knight creature tokens with vigilance equal to the number of opponents you attacked this turn. +SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ X | TokenScript$ w_2_2_knight_vigilance SVar:X:TriggeredCardController$OpponentsAttackedThisTurn Oracle:Flying, lifelink\nWhen Militant Angel enters the battlefield, create a number of 2/2 white Knight creature tokens with vigilance equal to the number of opponents you attacked this turn. diff --git a/forge-gui/res/cardsfolder/p/pure_reflection.txt b/forge-gui/res/cardsfolder/p/pure_reflection.txt index 4abf93cfa22..57f067c4be2 100644 --- a/forge-gui/res/cardsfolder/p/pure_reflection.txt +++ b/forge-gui/res/cardsfolder/p/pure_reflection.txt @@ -2,7 +2,7 @@ Name:Pure Reflection ManaCost:2 W Types:Enchantment T:Mode$ SpellCast | ValidCard$ Creature | Execute$ TrigDestroy | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts a creature spell, destroy all Reflections. Then that player creates an X/X white Reflection creature token, where X is the mana value of that spell. -SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Reflection | SubAbility$ DBToken | SpellDescription$ Destroy all Reflections +SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Reflection | SubAbility$ DBToken SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenPower$ X | TokenToughness$ X | TokenScript$ w_x_x_reflection | TokenOwner$ TriggeredActivator SVar:X:TriggeredStackInstance$CardManaCostLKI Oracle:Whenever a player casts a creature spell, destroy all Reflections. Then that player creates an X/X white Reflection creature token, where X is the mana value of that spell. diff --git a/forge-gui/res/cardsfolder/r/regna_the_redeemer.txt b/forge-gui/res/cardsfolder/r/regna_the_redeemer.txt index 5ec291771c9..8ebab24bfa5 100644 --- a/forge-gui/res/cardsfolder/r/regna_the_redeemer.txt +++ b/forge-gui/res/cardsfolder/r/regna_the_redeemer.txt @@ -5,7 +5,7 @@ PT:4/4 K:Partner:Krav, the Unredeemed:Krav K:Flying T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ YouTeamLifeGained | SVarCompare$ GE1 | Execute$ TrigWarrior | TriggerDescription$ At the beginning of each end step, if your team gained life this turn, create two 1/1 white Warrior creature tokens. -SVar:TrigWarrior:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_warrior | TokenOwner$ You | SpellDescription$ Create two 1/1 white Warrior creature tokens. +SVar:TrigWarrior:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_warrior | TokenOwner$ You SVar:YouTeamLifeGained:Count$LifeYourTeamGainedThisTurn DeckHints:Name$Krav, the Unredeemed Oracle:Partner with Krav, the Unredeemed (When this creature enters the battlefield, target player may put Krav into their hand from their library, then shuffle.)\nFlying\nAt the beginning of each end step, if your team gained life this turn, create two 1/1 white Warrior creature tokens. diff --git a/forge-gui/res/cardsfolder/t/thelonite_hermit.txt b/forge-gui/res/cardsfolder/t/thelonite_hermit.txt index c5bb2d29cea..1f9a3769a44 100644 --- a/forge-gui/res/cardsfolder/t/thelonite_hermit.txt +++ b/forge-gui/res/cardsfolder/t/thelonite_hermit.txt @@ -5,7 +5,7 @@ PT:1/1 K:Morph:3 G G S:Mode$ Continuous | Affected$ Creature.Saproling | AddPower$ 1 | AddToughness$ 1 | IsPresent$ Card.Self+faceUp | Description$ All Saprolings get +1/+1. T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, create four 1/1 green Saproling creature tokens. -SVar:TrigToken:DB$ Token | TokenAmount$ 4 | TokenScript$ g_1_1_saproling | TokenOwner$ You | SpellDescription$ Create four 1/1 green Saproling creature tokens. +SVar:TrigToken:DB$ Token | TokenAmount$ 4 | TokenScript$ g_1_1_saproling | TokenOwner$ You SVar:PlayMain1:TRUE DeckHints:Type$Fungus DeckHas:Ability$Token diff --git a/forge-gui/res/cardsfolder/w/watchful_giant.txt b/forge-gui/res/cardsfolder/w/watchful_giant.txt index 8df72a9e184..adf0987e2d5 100644 --- a/forge-gui/res/cardsfolder/w/watchful_giant.txt +++ b/forge-gui/res/cardsfolder/w/watchful_giant.txt @@ -3,7 +3,7 @@ ManaCost:5 W Types:Creature Giant Soldier PT:3/6 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Human creature token. -SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human | TokenOwner$ You | SpellDescription$ Create a 1/1 white Human creature token. +SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human | TokenOwner$ You DeckHints:Type$Human DeckHas:Ability$Token Oracle:When Watchful Giant enters the battlefield, create a 1/1 white Human creature token. diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java index ec6d1095826..0c1dacdedc3 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java @@ -64,8 +64,8 @@ public abstract class InputSelectManyBase extends InputSyn @Override public final void showMessage() { - if ( FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DETAILED_SPELLDESC_IN_PROMPT) && - (card!=null) ) { + if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DETAILED_SPELLDESC_IN_PROMPT) && + card != null) { final StringBuilder sb = new StringBuilder(); sb.append(card.toString()); if ( (sa != null) && (!sa.toString().isEmpty()) ) { // some spell abilities have no useful string value diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 654394c5efb..b96ff13ad81 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -743,13 +743,13 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont switch (sa.getParam("ShowCardInPrompt")) { case "FirstRemembered": o = sa.getHostCard().getFirstRemembered(); - if (o != null && o instanceof Card) { + if (o instanceof Card) { show = (Card)o; } break; case "LastRemembered": o = sa.getHostCard().getFirstRemembered(); - if (o != null && o instanceof Card) { + if (o instanceof Card) { show = (Card)o; } break;