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

Group sealed pool by color by default

Browse Source
This commit is contained in:
drdev
2014-02-07 06:36:26 +00:00
parent 5e0a8a6331
commit de2731c21f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java
View File

@@ -162,7 +162,7 @@ public final class CEditorLimited extends ACEditorBase<PaperCard, DeckGroup> {
*/
@Override
public void update() {
this.getCatalogManager().setup(SColumnUtil.getCatalogDefaultColumns(), GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 1);
this.getCatalogManager().setup(SColumnUtil.getCatalogDefaultColumns(), getScreen() == FScreen.DECK_EDITOR_DRAFT ? GroupDef.CREATURE_SPELL_LAND : GroupDef.COLOR, ColumnDef.CMC, 1);
this.getDeckManager().setup(SColumnUtil.getDeckDefaultColumns(), GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 1);
SItemManagerUtil.resetUI(this);

18
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java
View File

@@ -152,30 +152,30 @@ public enum GroupDef {
private static String[] getColorGroups() {
//TODO: Support breaking up Multicolor into separate groups for each color combination
return new String[] { "Colorless", "White", "Blue", "Black", "Red", "Green", "Multicolor" };
return new String[] { "White", "Blue", "Black", "Red", "Green", "Multicolor", "Colorless" };
}
private static Integer getColorGroup(ColorSet color) {
if (color.isColorless()) {
return 0;
}
if (color.isMulticolor()) {
return 6;
}
if (color.isMulticolor()) {
return 5;
}
if (color.hasWhite()) {
return 1;
return 0;
}
if (color.hasBlue()) {
return 2;
return 1;
}
if (color.hasBlack()) {
return 3;
return 2;
}
if (color.hasRed()) {
return 4;
return 3;
}
if (color.hasGreen()) {
return 5;
return 4;
}
return -1; //shouldn't happen
}