From 9fb6d8a1f6c89439e25eecdab2e879b0684eda1b Mon Sep 17 00:00:00 2001 From: tool4ever Date: Sun, 21 Apr 2024 10:27:11 +0200 Subject: [PATCH] Remove obsolete logic (#5090) --- forge-game/src/main/java/forge/game/GameActionUtil.java | 9 --------- forge-gui/res/cardsfolder/a/ancestral_vision.txt | 2 +- forge-gui/res/cardsfolder/c/crashing_footfalls.txt | 2 +- forge-gui/res/cardsfolder/e/evermind.txt | 2 +- forge-gui/res/cardsfolder/r/restore_balance.txt | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java index bcd806c924d..adf3fbdcc9d 100644 --- a/forge-game/src/main/java/forge/game/GameActionUtil.java +++ b/forge-game/src/main/java/forge/game/GameActionUtil.java @@ -301,15 +301,12 @@ public final class GameActionUtil { SpellAbility newSA = null; - boolean changedManaCost = false; if (o.getPayManaCost() == PayManaCost.NO) { newSA = sa.copyWithNoManaCost(activator); newSA.setBasicSpell(false); - changedManaCost = true; } else if (o.getAltManaCost() != null) { newSA = sa.copyWithManaCostReplaced(activator, o.getAltManaCost()); newSA.setBasicSpell(false); - changedManaCost = true; } else { if (altCostOnly) { continue; @@ -328,12 +325,6 @@ public final class GameActionUtil { sar.setZone(null); newSA.setMayPlay(o); - if (changedManaCost) { - if ("0".equals(sa.getParam("ActivationLimit")) && sa.getHostCard().getManaCost().isNoCost()) { - sar.setLimitToCheck(null); - } - } - final StringBuilder sb = new StringBuilder(sa.getDescription()); if (!source.equals(host)) { sb.append(" by "); diff --git a/forge-gui/res/cardsfolder/a/ancestral_vision.txt b/forge-gui/res/cardsfolder/a/ancestral_vision.txt index d00c431390c..67c2b643f6f 100644 --- a/forge-gui/res/cardsfolder/a/ancestral_vision.txt +++ b/forge-gui/res/cardsfolder/a/ancestral_vision.txt @@ -3,5 +3,5 @@ ManaCost:no cost Colors:blue Types:Sorcery K:Suspend:4:U -A:SP$ Draw | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws three cards. | ActivationLimit$ 0 +A:SP$ Draw | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws three cards. Oracle:Suspend 4—{U} (Rather than cast this card from your hand, pay {U} and exile it with four time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nTarget player draws three cards. diff --git a/forge-gui/res/cardsfolder/c/crashing_footfalls.txt b/forge-gui/res/cardsfolder/c/crashing_footfalls.txt index 3edf0fb04e2..47c3a3c8fc1 100644 --- a/forge-gui/res/cardsfolder/c/crashing_footfalls.txt +++ b/forge-gui/res/cardsfolder/c/crashing_footfalls.txt @@ -3,8 +3,8 @@ ManaCost:no cost Colors:green Types:Sorcery K:Suspend:4:G +A:SP$ Token | TokenAmount$ 2 | TokenScript$ g_4_4_rhino_trample | SpellDescription$ Create two 4/4 green Rhino creature tokens with trample. SVar:NonStackingEffect:True AI:RemoveDeck:Random -A:SP$ Token | TokenAmount$ 2 | TokenScript$ g_4_4_rhino_trample | SpellDescription$ Create two 4/4 green Rhino creature tokens with trample. DeckHas:Ability$Token & Type$Rhino Oracle:Suspend 4—{G} (Rather than cast this card from your hand, pay {G} and exile it with four time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nCreate two 4/4 green Rhino creature tokens with trample. diff --git a/forge-gui/res/cardsfolder/e/evermind.txt b/forge-gui/res/cardsfolder/e/evermind.txt index 6e6c55f9661..70d62f265bb 100644 --- a/forge-gui/res/cardsfolder/e/evermind.txt +++ b/forge-gui/res/cardsfolder/e/evermind.txt @@ -3,6 +3,6 @@ ManaCost:no cost Colors:blue Types:Instant Arcane K:Splice:Arcane:1 U -A:SP$ Draw | Cost$ 0 | NumCards$ 1 | ActivationLimit$ 0 | SpellDescription$ Draw a card. +A:SP$ Draw | NumCards$ 1 | SpellDescription$ Draw a card. AI:RemoveDeck:Random Oracle:(Nonexistent mana costs can't be paid.)\nDraw a card.\nSplice onto Arcane {1}{U} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.) diff --git a/forge-gui/res/cardsfolder/r/restore_balance.txt b/forge-gui/res/cardsfolder/r/restore_balance.txt index 1bad14b7e77..772a8c46e83 100644 --- a/forge-gui/res/cardsfolder/r/restore_balance.txt +++ b/forge-gui/res/cardsfolder/r/restore_balance.txt @@ -3,7 +3,7 @@ ManaCost:no cost Colors:white Types:Sorcery K:Suspend:6:W -A:SP$ Balance | Cost$ 0 | Valid$ Land | AILogic$ BalanceCreaturesAndLands | SubAbility$ BalanceCreatures | SpellDescription$ Each player chooses a number of lands they control equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way. | ActivationLimit$ 0 +A:SP$ Balance | Valid$ Land | AILogic$ BalanceCreaturesAndLands | SubAbility$ BalanceCreatures | SpellDescription$ Each player chooses a number of lands they control equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way. SVar:BalanceCreatures:DB$ Balance | Valid$ Creature | SubAbility$ BalanceHands SVar:BalanceHands:DB$ Balance | Zone$ Hand AI:RemoveDeck:All