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

Fixed quest pool color option selections not getting updated properly.

Browse Source
This commit is contained in:
Krazy
2015-06-06 17:56:47 +00:00
parent 47093d857d
commit fc0e527877
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -53,6 +53,7 @@ forge-gui-mobile-dev/fallback_skin/Thumbs.db
forge-gui-mobile-dev/res forge-gui-mobile-dev/res
forge-gui-mobile-dev/target forge-gui-mobile-dev/target
forge-gui-mobile-dev/testAssets forge-gui-mobile-dev/testAssets
forge-gui-mobile/*.iml
forge-gui-mobile/bin forge-gui-mobile/bin
forge-gui-mobile/target forge-gui-mobile/target
forge-gui/forge-gui.iml forge-gui/forge-gui.iml

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java
View File

@@ -49,7 +49,7 @@ public enum CSubmenuQuestData implements ICDoc {
} }
}; };
List<Byte> preferredColors = new ArrayList<>(); private List<Byte> preferredColors = new ArrayList<>();
private PoolType poolType = PoolType.BALANCED; private PoolType poolType = PoolType.BALANCED;
private boolean includeArtifacts = true; private boolean includeArtifacts = true;

10
forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseColors.java
View File

@@ -133,9 +133,19 @@ public class DialogChooseColors {
cbxRed.setEnabled(radBalanced.isSelected()); cbxRed.setEnabled(radBalanced.isSelected());
cbxWhite.setEnabled(radBalanced.isSelected()); cbxWhite.setEnabled(radBalanced.isSelected());
cbxColorless.setEnabled(radBalanced.isSelected()); cbxColorless.setEnabled(radBalanced.isSelected());
cbxArtifacts.setEnabled(!radSurpriseMe.isSelected());
} }
}; };
clearColors.setEnabled(radBalanced.isSelected());
cbxBlack.setEnabled(radBalanced.isSelected());
cbxBlue.setEnabled(radBalanced.isSelected());
cbxGreen.setEnabled(radBalanced.isSelected());
cbxRed.setEnabled(radBalanced.isSelected());
cbxWhite.setEnabled(radBalanced.isSelected());
cbxColorless.setEnabled(radBalanced.isSelected());
cbxArtifacts.setEnabled(!radSurpriseMe.isSelected());
radBalanced.setToolTipText("A balanced distribution will provide a roughly equal number of cards in each selected color."); radBalanced.setToolTipText("A balanced distribution will provide a roughly equal number of cards in each selected color.");
radRandom.setToolTipText("A random distribution will be almost entirely randomly selected. This ignores any color selections."); radRandom.setToolTipText("A random distribution will be almost entirely randomly selected. This ignores any color selections.");
radSurpriseMe.setToolTipText("This is the same as a balanced distribution, except the colors picked will be random and you will not be told what they are."); radSurpriseMe.setToolTipText("This is the same as a balanced distribution, except the colors picked will be random and you will not be told what they are.");

4
forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
View File

@@ -78,7 +78,7 @@ public class NewQuestScreen extends FScreen {
} }
obj.setBounds(xAdjustment, y, visWidth, h); //make label take up half of line so combo boxes all the same width obj.setBounds(xAdjustment, y, visWidth, h); //make label take up half of line so combo boxes all the same width
x += obj.getWidth(); x += obj.getWidth();
if (colorBoxCount == 3 || colorBoxCount == 6) { if (colorBoxCount % 3 == 0) {
y += h + gapY; y += h + gapY;
x = PADDING; x = PADDING;
} }
@@ -228,7 +228,7 @@ public class NewQuestScreen extends FScreen {
cbRed.setEnabled(radBalanced.isSelected()); cbRed.setEnabled(radBalanced.isSelected());
cbWhite.setEnabled(radBalanced.isSelected()); cbWhite.setEnabled(radBalanced.isSelected());
cbColorless.setEnabled(radBalanced.isSelected()); cbColorless.setEnabled(radBalanced.isSelected());
cbIncludeArtifacts.setEnabled(radBalanced.isSelected()); cbIncludeArtifacts.setEnabled(!radSurpriseMe.isSelected());
} }
}; };