From 910fef3ecd671bd9f3b68bc81ad7083442de68a3 Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 9 Jan 2020 20:59:20 +0800 Subject: [PATCH] Fix Nykthos --- .../main/java/forge/game/card/CardFactoryUtil.java | 12 ++++++------ .../res/cardsfolder/upcoming/thassas_oracle.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 4d7f67d0cf5..9f34a544f75 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1068,10 +1068,6 @@ public class CardFactoryUtil { // Count$Chroma. if (sq[0].contains("Chroma")) { ZoneType sourceZone = sq[0].contains("ChromaInGrave") ? ZoneType.Graveyard : ZoneType.Battlefield; - String colorName = sq[1]; - if (colorName.contains("Chosen")) { - colorName = MagicColor.toShortString(c.getChosenColor()); - } final CardCollectionView cards; if (sq[0].contains("ChromaSource")) { // Runs Chroma for passed in Source card cards = new CardCollection(c); @@ -1081,7 +1077,7 @@ public class CardFactoryUtil { } int colorOcurrencices = 0; - byte colorCode = ManaAtom.fromName(colorName); + byte colorCode = ManaAtom.fromName(sq[1]); for (Card c0 : cards) { for (ManaCostShard sh : c0.getManaCost()){ if ((sh.getColorMask() & colorCode) != 0) @@ -1094,7 +1090,11 @@ public class CardFactoryUtil { // Count$Devotion. if (sq[0].contains("Devotion")) { int colorOcurrencices = 0; - byte colorCode = ManaAtom.fromName(sq[1]); + String colorName = sq[1]; + if (colorName.contains("Chosen")) { + colorName = MagicColor.toShortString(c.getChosenColor()); + } + byte colorCode = ManaAtom.fromName(colorName); if (sq[0].equals("DevotionDual")) { colorCode |= ManaAtom.fromName(sq[2]); } diff --git a/forge-gui/res/cardsfolder/upcoming/thassas_oracle.txt b/forge-gui/res/cardsfolder/upcoming/thassas_oracle.txt index 68942e28120..9fcbfdb5575 100644 --- a/forge-gui/res/cardsfolder/upcoming/thassas_oracle.txt +++ b/forge-gui/res/cardsfolder/upcoming/thassas_oracle.txt @@ -7,4 +7,4 @@ SVar:Y:Count$InYourLibrary T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top X cards of your library, where X is your devotion to blue. Put one of them on top of your library and the rest on the bottom of your library in a random order. If X is greater than or equal to the number of cards in your library, you win the game. SVar:TrigDig:DB$Dig | DigNum$ X | ChangeNum$ 1 | Optional$ True | DestinationZone$ Library | References$ X | LibraryPosition$ 0 | SubAbility$ DBWin SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX | References$ X,Y -Oracle:When Thassa’s Oracle enters the battlefield, look at the top X cards of your library, where X is your devotion to blue. Put one of them on top of your library and the rest on the bottom of your library in a random order. If X is greater than or equal to the number of cards in your library, you win the game. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.) \ No newline at end of file +Oracle:When Thassa's Oracle enters the battlefield, look at the top X cards of your library, where X is your devotion to blue. Put one of them on top of your library and the rest on the bottom of your library in a random order. If X is greater than or equal to the number of cards in your library, you win the game. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.) \ No newline at end of file