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

Rewrote draft generation and rotations.

Browse Source
This commit is contained in:
Krazy
2014-06-03 23:58:50 +00:00
parent b874b39241
commit 423a9f1687
5 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
View File

@@ -85,7 +85,7 @@ public enum CSubmenuQuestDraft implements ICDoc {
if (achievements == null) {
view.setMode(Mode.EMPTY);
} else if (achievements.getDraftEvents() == null || achievements.getDraftEvents().isEmpty()) {
achievements.generateNewTournaments();
achievements.generateDrafts();
if (achievements.getDraftEvents().isEmpty()) {
view.setMode(Mode.EMPTY);
} else {
@@ -307,7 +307,7 @@ public enum CSubmenuQuestDraft implements ICDoc {
}
QuestAchievements achievements = FModel.getQuest().getAchievements();
achievements.generateNewTournaments();
achievements.generateDrafts();
if (FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) {
view.setMode(Mode.EMPTY);
@@ -354,7 +354,7 @@ public enum CSubmenuQuestDraft implements ICDoc {
view.getLblCredits().setText("Available Credits: " + NUMBER_FORMATTER.format(FModel.getQuest().getAssets().getCredits()));
FModel.getQuest().getAchievements().generateNewTournaments();
FModel.getQuest().getAchievements().generateDrafts();
view.getPnlTournaments().removeAll();
JXButtonPanel grpPanel = new JXButtonPanel();

17
forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLose.java
View File

@@ -198,7 +198,7 @@ public class QuestWinLose extends ControlWinLose {
if (this.wonMatch || difficulty == 0) {
final int outcome = this.wonMatch ? wins : qData.getAchievements().getLost();
int winsPerBooster = FModel.getQuestPreferences().getPrefInt(DifficultyPrefs.WINS_BOOSTER, qData.getAchievements().getDifficulty());
if (winsPerBooster > 0 && outcome % winsPerBooster == 0) {
if (winsPerBooster > 0 && (outcome + 1) % winsPerBooster == 0) {
this.awardBooster();
}
}
@@ -514,6 +514,7 @@ public class QuestWinLose extends ControlWinLose {
final List<PaperCard> cardsWon = new ArrayList<>();
List<PaperCard> cardsToAdd;
String typeWon = "";
boolean addDraftToken = false;
switch (currentStreak) {
case 3:
@@ -547,6 +548,7 @@ public class QuestWinLose extends ControlWinLose {
cardsWon.addAll(qData.getCards().addRandomRareNotMythic(15));
typeWon = "rare";
}
addDraftToken = true;
break;
case 0: //The 50th win in the streak is 0, since (50 % 50 == 0)
cardsToAdd = qData.getCards().addRandomMythicRare(10);
@@ -562,6 +564,19 @@ public class QuestWinLose extends ControlWinLose {
return;
}
if (addDraftToken) {
TitleLabel title = new TitleLabel("25 Win Streak Bonus Reward");
SkinnedLabel contents = new SkinnedLabel("For achieving a 25 win streak, a new tournament has been made available!");
contents.setHorizontalAlignment(SwingConstants.CENTER);
contents.setFont(FSkin.getFont(14));
contents.setForeground(Color.white);
contents.setIcon(FSkin.getImage(FSkinProp.ICO_QUEST_COIN));
contents.setIconTextGap(50);
this.getView().getPnlCustom().add(title, QuestWinLose.CONSTRAINTS_TITLE);
this.getView().getPnlCustom().add(contents, QuestWinLose.CONSTRAINTS_TEXT);
qData.getAchievements().addDraftToken();
}
this.lblTemp1 = new TitleLabel("You have achieved a " + (currentStreak == 0 ? "50" : currentStreak) + " win streak and won " + cardsWon.size() + " " + typeWon + " card" + ((cardsWon.size() != 1) ? "s" : "") + "!");
final QuestWinLoseCardViewer cv = new QuestWinLoseCardViewer(cardsWon);