From d4d6592d533487cfb4665a18d3bb49d69b771338 Mon Sep 17 00:00:00 2001
From: Krazy <mitchell@krazyweb.net>
Date: Thu, 8 May 2014 17:30:20 +0000
Subject: [PATCH] A few minor tweaks for wording and calculating when rewards
 are awarded. (Ex: Jackpot is now awarded on the 80th win, not the 81st.)

---
 .../src/main/java/forge/screens/match/QuestWinLose.java   | 8 ++++----
 .../src/main/java/forge/view/arcane/PlayArea.java         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLose.java b/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLose.java
index e88f0610fde..d6fce01b8ce 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLose.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLose.java
@@ -184,7 +184,7 @@ public class QuestWinLose extends ControlWinLose {
 
             // Award jackpot every 80 games won (currently 10 rares)
 
-            if ((wins > 0) && ((wins % 80) == 0)) {
+            if ((wins > 0) && (((wins + 1) % 80) == 0)) {
                 this.awardJackpot();
             }
 
@@ -624,9 +624,9 @@ public class QuestWinLose extends ControlWinLose {
             if (this.wonMatch) {
                 maxChoices++;
                 final int wins = qData.getAchievements().getWin();
-                if (wins + 1 % 5 == 0) { maxChoices++; }
-                if (wins + 1 % 20 == 0) { maxChoices++; }
-                if (wins + 1 % 50 == 0) { maxChoices++; }
+                if ((wins + 1) % 5 == 0) { maxChoices++; }
+                if ((wins + 1) % 20 == 0) { maxChoices++; }
+                if ((wins + 1) % 50 == 0) { maxChoices++; }
                 maxChoices += qData.getAssets().getItemLevel(QuestItemType.MEMBERSHIP_TOKEN);
             }
 
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
index c36e01528d2..b3db819ddbe 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
@@ -197,13 +197,13 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
 
             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++) {
                 final CardStack stack = allCreatures.get(i);
                 final CardPanel firstPanel = stack.get(0);
                 if (firstPanel.getCard().getName().equals(panel.getCard().getName())) {
                     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.
                         insertIndex = i;
                         break;
@@ -217,7 +217,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
                             || (panel.getCard().getNetAttack() != firstPanel.getCard().getNetAttack())
                             || (panel.getCard().getNetDefense() != firstPanel.getCard().getNetDefense())
                             || (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.
                         insertIndex = i + 1;
                         continue;