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

Merge branch 'mdfc' into 'master'

Browse Source 
Correctly evaluate modal faces

See merge request core-developers/forge!5112
This commit is contained in:
Michael Kamensky
2021-07-27 04:53:19 +00:00
parent 0cb35f7c84 7eec98db61
commit c9036f90ef
26 changed files with 94 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
View File

@@ -697,9 +697,9 @@ public enum ColumnDef {
return !(((IPaperCard) i).getRules().getType().isArtifact() && (toColor(i).isColorless() ||
//If it isn't colorless, see if it can be paid with only white, only blue, only black.
//No need to check others since three-color hybrid shards don't exist.
manaCost.canBePaidWithAvaliable(MagicColor.WHITE) &&
manaCost.canBePaidWithAvaliable(MagicColor.BLUE) &&
manaCost.canBePaidWithAvaliable(MagicColor.BLACK)))
manaCost.canBePaidWithAvailable(MagicColor.WHITE) &&
manaCost.canBePaidWithAvailable(MagicColor.BLUE) &&
manaCost.canBePaidWithAvailable(MagicColor.BLACK)))
? "0" + toSplitLast(i) : "1";
}
@@ -757,9 +757,9 @@ public enum ColumnDef {
private static String toGoldFirst(final InventoryItem i) {
forge.card.mana.ManaCost manaCost = ((IPaperCard) i).getRules().getManaCost();
return !(manaCost.canBePaidWithAvaliable(MagicColor.WHITE) | manaCost.canBePaidWithAvaliable(MagicColor.BLUE) |
manaCost.canBePaidWithAvaliable(MagicColor.BLACK) | manaCost.canBePaidWithAvaliable(MagicColor.RED) |
manaCost.canBePaidWithAvaliable(MagicColor.GREEN)) ? "0" : "1";
return !(manaCost.canBePaidWithAvailable(MagicColor.WHITE) | manaCost.canBePaidWithAvailable(MagicColor.BLUE) |
manaCost.canBePaidWithAvailable(MagicColor.BLACK) | manaCost.canBePaidWithAvailable(MagicColor.RED) |
manaCost.canBePaidWithAvailable(MagicColor.GREEN)) ? "0" : "1";
}
/**

4
forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java
View File

@@ -90,12 +90,12 @@ public abstract class AchievementCollection implements Iterable<Achievement> {
filename = filename0;
isLimitedFormat = isLimitedFormat0;
path = path0;
addSharedAchivements();
addSharedAchievements();
addAchievements();
load();
}
protected void addSharedAchivements() {
protected void addSharedAchievements() {
add(new GameWinStreak(10, 25, 50, 100));
add(new MatchWinStreak(10, 25, 50, 100));
add(new TotalGameWins(250, 500, 1000, 2000));

2
forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java
View File

@@ -18,7 +18,7 @@ public class AltWinAchievements extends AchievementCollection {
}
@Override
protected void addSharedAchivements() {
protected void addSharedAchievements() {
//prevent including shared achievements
}

2
forge-gui/src/main/java/forge/localinstance/achievements/ChallengeAchievements.java
View File

@@ -15,7 +15,7 @@ public class ChallengeAchievements extends AchievementCollection {
}
@Override
protected void addSharedAchivements() {
protected void addSharedAchievements() {
//prevent including shared achievements
}

2
forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java
View File

@@ -23,7 +23,7 @@ public class PlaneswalkerAchievements extends AchievementCollection {
}
@Override
protected void addSharedAchivements() {
protected void addSharedAchievements() {
//prevent including shared achievements
}

2
forge-gui/src/main/java/forge/localinstance/achievements/PuzzleAchievements.java
View File

@@ -8,7 +8,7 @@ public class PuzzleAchievements extends AchievementCollection {
}
@Override
protected void addSharedAchivements() {
protected void addSharedAchievements() {
//prevent including shared achievements
}