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

A few minor tweaks for wording and calculating when rewards are awarded. (Ex: Jackpot is now awarded on the 80th win, not the 81st.)

Browse Source
This commit is contained in:
Krazy
2014-05-08 17:30:20 +00:00
parent bf64e177e7
commit d4d6592d53
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,7 @@ public class QuestWinLose extends ControlWinLose {
// Award jackpot every 80 games won (currently 10 rares) // Award jackpot every 80 games won (currently 10 rares)
if ((wins > 0) && ((wins % 80) == 0)) { if ((wins > 0) && (((wins + 1) % 80) == 0)) {
this.awardJackpot(); this.awardJackpot();
} }
@@ -624,9 +624,9 @@ public class QuestWinLose extends ControlWinLose {
if (this.wonMatch) { if (this.wonMatch) {
maxChoices++; maxChoices++;
final int wins = qData.getAchievements().getWin(); final int wins = qData.getAchievements().getWin();
if (wins + 1 % 5 == 0) { maxChoices++; } if ((wins + 1) % 5 == 0) { maxChoices++; }
if (wins + 1 % 20 == 0) { maxChoices++; } if ((wins + 1) % 20 == 0) { maxChoices++; }
if (wins + 1 % 50 == 0) { maxChoices++; } if ((wins + 1) % 50 == 0) { maxChoices++; }
maxChoices += qData.getAssets().getItemLevel(QuestItemType.MEMBERSHIP_TOKEN); maxChoices += qData.getAssets().getItemLevel(QuestItemType.MEMBERSHIP_TOKEN);
} }

6
forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
View File

@@ -197,13 +197,13 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
int insertIndex = -1; int insertIndex = -1;
// Find tokens with the same name. // Find creatures with the same name.
for (int i = 0, n = allCreatures.size(); i < n; i++) { for (int i = 0, n = allCreatures.size(); i < n; i++) {
final CardStack stack = allCreatures.get(i); final CardStack stack = allCreatures.get(i);
final CardPanel firstPanel = stack.get(0); final CardPanel firstPanel = stack.get(0);
if (firstPanel.getCard().getName().equals(panel.getCard().getName())) { if (firstPanel.getCard().getName().equals(panel.getCard().getName())) {
if (!firstPanel.getAttachedPanels().isEmpty()) { if (!firstPanel.getAttachedPanels().isEmpty()) {
// Put this token to the left of tokens with the same // Put this creature to the left of creatures with the same
// name and attachments. // name and attachments.
insertIndex = i; insertIndex = i;
break; break;
@@ -217,7 +217,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
|| (panel.getCard().getNetAttack() != firstPanel.getCard().getNetAttack()) || (panel.getCard().getNetAttack() != firstPanel.getCard().getNetAttack())
|| (panel.getCard().getNetDefense() != firstPanel.getCard().getNetDefense()) || (panel.getCard().getNetDefense() != firstPanel.getCard().getNetDefense())
|| (stack.size() == creatureStackMax)) { || (stack.size() == creatureStackMax)) {
// If this token has attachments or the stack is full, // If this creature has attachments or the stack is full,
// put it to the right. // put it to the right.
insertIndex = i + 1; insertIndex = i + 1;
continue; continue;