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

Merge branch 'patch-5' into 'master'

Browse Source 
Sort Conspiracy before Eldrazi

See merge request core-developers/forge!85
This commit is contained in:
Michael Kamensky
2018-01-13 04:50:30 +00:00
parent 3efc4807cf 4c6aa708c1
commit 4c29790b6c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -541,7 +541,14 @@ public enum ColumnDef {
//split cards last //split cards last
private static String toSplitLast(final InventoryItem i) { private static String toSplitLast(final InventoryItem i) {
return ((IPaperCard) i).getRules().getSplitType() != CardSplitType.Split ? return ((IPaperCard) i).getRules().getSplitType() != CardSplitType.Split ?
"0" + toColorlessFirst(i): "1" + toSplitCardSort(i); "0" + toConspiracyFirst(i) : "1" + toSplitCardSort(i);
}
//conspiracy first, then everything else
private static String toConspiracyFirst(final InventoryItem i) {
return ((IPaperCard) i).getRules().getType().isConspiracy()
? "0" //is a Conspiracy
: "1" + toColorlessFirst(i); //isn't a Conspiracy
} }
//colorless first, then colored. //colorless first, then colored.