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

Merge branch 'patch' into 'master'

Browse Source 
Fix Nykthos

See merge request core-developers/forge!2398
This commit is contained in:
swordshine
2020-01-09 13:06:14 +00:00
parent 82d7171a92 910fef3ecd
commit 724e483ae3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -1068,10 +1068,6 @@ public class CardFactoryUtil {
// Count$Chroma.<color name> // Count$Chroma.<color name>
if (sq[0].contains("Chroma")) { if (sq[0].contains("Chroma")) {
ZoneType sourceZone = sq[0].contains("ChromaInGrave") ? ZoneType.Graveyard : ZoneType.Battlefield; 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; final CardCollectionView cards;
if (sq[0].contains("ChromaSource")) { // Runs Chroma for passed in Source card if (sq[0].contains("ChromaSource")) { // Runs Chroma for passed in Source card
cards = new CardCollection(c); cards = new CardCollection(c);
@@ -1081,7 +1077,7 @@ public class CardFactoryUtil {
} }
int colorOcurrencices = 0; int colorOcurrencices = 0;
byte colorCode = ManaAtom.fromName(colorName); byte colorCode = ManaAtom.fromName(sq[1]);
for (Card c0 : cards) { for (Card c0 : cards) {
for (ManaCostShard sh : c0.getManaCost()){ for (ManaCostShard sh : c0.getManaCost()){
if ((sh.getColorMask() & colorCode) != 0) if ((sh.getColorMask() & colorCode) != 0)
@@ -1094,7 +1090,11 @@ public class CardFactoryUtil {
// Count$Devotion.<color name> // Count$Devotion.<color name>
if (sq[0].contains("Devotion")) { if (sq[0].contains("Devotion")) {
int colorOcurrencices = 0; 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")) { if (sq[0].equals("DevotionDual")) {
colorCode |= ManaAtom.fromName(sq[2]); colorCode |= ManaAtom.fromName(sq[2]);
} }

2
forge-gui/res/cardsfolder/upcoming/thassas_oracle.txt
View File

@@ -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. 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: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 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.) 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.)