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

Add new booster pack quest starting pool generation, fix a card duplication bug in the quest shop, and improve the way the card shop generates singles

Browse Source
This commit is contained in:
Krazy
2017-05-25 06:13:04 +00:00
parent 5195b9c5b5
commit 3953610b56
12 changed files with 449 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -605,7 +605,7 @@ public class NewQuestScreen extends FScreen {
public void run() {
final QuestMode mode = isFantasy() ? QuestMode.Fantasy : QuestMode.Classic;
final StartingPoolPreferences userPrefs =
new StartingPoolPreferences(getPoolType(), getPreferredColors(), cbIncludeArtifacts.isSelected(), startWithCompleteSet(), allowDuplicateCards());
new StartingPoolPreferences(getPoolType(), getPreferredColors(), cbIncludeArtifacts.isSelected(), startWithCompleteSet(), allowDuplicateCards(), 0);
QuestController qc = FModel.getQuest();
qc.newGame(questName, getSelectedDifficulty(), mode, fmtPrizes, isUnlockSetsAllowed(), dckStartPool, fmtStartPool, getStartingWorldName(), userPrefs);
qc.save();

22
forge-gui-mobile/src/forge/toolbox/FProgressBar.java
View File

@@ -1,18 +1,16 @@
package forge.toolbox;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import forge.Graphics;
import forge.assets.FSkinFont;
import forge.interfaces.IProgressBar;
import forge.util.Utils;
import org.apache.commons.lang3.tuple.Pair;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class FProgressBar extends FDisplayObject implements IProgressBar {
public static Color BACK_COLOR, FORE_COLOR, SEL_BACK_COLOR, SEL_FORE_COLOR;
@@ -38,7 +36,7 @@ public class FProgressBar extends FDisplayObject implements IProgressBar {
/**
* Sets description on bar.
*
*
* @param s0   A description to prepend before statistics.
*/
public void setDescription(final String s0) {
@@ -47,8 +45,8 @@ public class FProgressBar extends FDisplayObject implements IProgressBar {
}
/** Increments bar. */
public void setValue(int value0) {
value = value0;
public void setValue(int progress) {
value = progress;
setShowProgressTrail(false); //can't show progress trail if value set
// String.format leads to StringBuilder anyway. Direct calls will be faster
@@ -105,11 +103,11 @@ public class FProgressBar extends FDisplayObject implements IProgressBar {
public void setPercentMode(boolean percentMode0) {
percentMode = percentMode0;
}
public int getMaximum() {
return maximum;
}
public void setMaximum(int maximum0) {
maximum = maximum0;
}