From 2b86fbb7ba66e3255a0ee08e4013d4a0d53b4cde Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 22 Aug 2011 20:54:35 +0000 Subject: [PATCH] Aestetic text changes (booster type "T2" renamed to Standard) --- src/main/java/forge/Gui_WinLose.java | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/forge/Gui_WinLose.java b/src/main/java/forge/Gui_WinLose.java index fcf7fbb9ceb..b486e44b95e 100644 --- a/src/main/java/forge/Gui_WinLose.java +++ b/src/main/java/forge/Gui_WinLose.java @@ -282,15 +282,12 @@ public class Gui_WinLose extends JFrame implements NewConstants { int estatesLevel = q.getInventory().getItemLevel("Estates"); - if (estatesLevel == 1) { - sb.append("Estates bonus: 10%.
"); - } else if (estatesLevel == 2) { - sb.append("Estates bonus: 15%.
"); - } else if (estatesLevel == 3) { - sb.append("Estates bonus: 20%.
"); + if (estatesLevel == 1) { sb.append("Estates bonus: 10%.
"); + } else if (estatesLevel == 2) { sb.append("Estates bonus: 15%.
"); + } else if (estatesLevel == 3) { sb.append("Estates bonus: 20%.
"); } - sb.append("You have earned " + creds + " credits in total."); - + + sb.append(String.format("
You have earned %d credits in total.", creds)); sb.append(""); return sb.toString(); } @@ -378,16 +375,16 @@ public class Gui_WinLose extends JFrame implements NewConstants { protected void giveBooster() { - String[] boosterTypes = {"Legacy", "Extended", "T2"}; - String boosterType = GuiUtils.getChoice("Choose prize booster type", boosterTypes); + String[] boosterTypes = {"Legacy", "Extended", "Standard"}; + String boosterType = GuiUtils.getChoice("Choose a format of cards for the prize booster", boosterTypes); List setsToGive = null; - if (boosterTypes[2].equals( boosterType )) { // T2 + if (boosterTypes[2].equals(boosterType)) { // T2 setsToGive = new ArrayList(); - setsToGive.addAll( Arrays.asList(new String[]{"M12","NPH","MBS","M11","ROE","WWK","ZEN"}) ); + setsToGive.addAll(Arrays.asList(new String[]{"M12","NPH","MBS","M11","ROE","WWK","ZEN"})); } - if (boosterTypes[1].equals( boosterType )) { // Ext + if (boosterTypes[1].equals(boosterType)) { // Ext setsToGive = new ArrayList(); - setsToGive.addAll( Arrays.asList(new String[]{"M12","NPH","MBS","M11","ROE","WWK","ZEN","M10","ARB","CFX","ALA","MOR","SHM","EVE","LRW"}) ); + setsToGive.addAll(Arrays.asList(new String[]{"M12","NPH","MBS","M11","ROE","WWK","ZEN","M10","ARB","CFX","ALA","MOR","SHM","EVE","LRW"})); } ArrayList cardsWon = model.quest.addCards(setsToGive); @@ -395,7 +392,7 @@ public class Gui_WinLose extends JFrame implements NewConstants { CardListViewer c = new CardListViewer("Booster", "You have won the following new cards", cardsWon, icon); c.show(); } - + protected void giveQuestRewards(final boolean wonMatch) { // Award a random booster, as frequent as set in difficulty setup if (model.quest.shouldAddCards(wonMatch)) {