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

Refactor Spell Shop prompts to only appear once no matter how many items are being bought/sold together

Browse Source
This commit is contained in:
drdev
2014-01-28 22:51:56 +00:00
parent 86f6a9e3f1
commit a8bf257391
2 changed files with 77 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java
View File

@@ -19,7 +19,6 @@ package forge.gui.deckeditor.controllers;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -306,26 +305,41 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
return; return;
} }
ItemPool<InventoryItem> itemsToAdd = new ItemPool<InventoryItem>(InventoryItem.class); long totalCost = 0;
List<Entry<InventoryItem, Integer>> itemsToRemove = new ArrayList<Entry<InventoryItem, Integer>>(); ItemPool<InventoryItem> itemsToBuy = new ItemPool<InventoryItem>(InventoryItem.class);
for (Entry<InventoryItem, Integer> itemEntry : items) { for (Entry<InventoryItem, Integer> itemEntry : items) {
final InventoryItem item = itemEntry.getKey(); final InventoryItem item = itemEntry.getKey();
if (item instanceof PaperCard || item instanceof SealedProduct || item instanceof PreconDeck) {
final int qty = itemEntry.getValue();
itemsToBuy.add(item, qty);
totalCost += qty * this.getCardValue(item);
}
}
if (itemsToBuy.isEmpty()) { return; }
List<InventoryItem> itemFlatList = itemsToBuy.toFlatList();
String suffix = SItemManagerUtil.getItemDisplayString(itemFlatList, 1, true);
String displayList = SItemManagerUtil.buildDisplayList(itemsToBuy);
String title = "Buy " + suffix;
long creditsShort = totalCost - this.questData.getAssets().getCredits();
if (creditsShort > 0) {
FOptionPane.showMessageDialog("You need " + creditsShort + " more credits to purchase the following " + suffix.toLowerCase() + ".\n" + displayList, title);
return;
}
if (!FOptionPane.showConfirmDialog("Pay " + totalCost + " credits to purchase the following " +
suffix.toLowerCase() + "?\n" + displayList, title, "Buy", "Cancel")) {
return;
}
ItemPool<InventoryItem> itemsToAdd = new ItemPool<InventoryItem>(InventoryItem.class);
for (Entry<InventoryItem, Integer> itemEntry : itemsToBuy) {
final InventoryItem item = itemEntry.getKey();
final int qty = itemEntry.getValue(); final int qty = itemEntry.getValue();
final int value = this.getCardValue(item); final int value = this.getCardValue(item);
final int totalCost = qty * value;
final String title = "Buy " + SItemManagerUtil.getItemDisplayString(item, 1, true);
final String promptSuffix = " credits to purchase " + (qty == 1 ? "'" : qty + " copies of '") + item.getName() + "'";
if (totalCost > this.questData.getAssets().getCredits()) {
FOptionPane.showMessageDialog("Not enough" + promptSuffix + ".", title);
continue;
}
if (!FOptionPane.showConfirmDialog("Pay " + totalCost + promptSuffix + "?", title, "Buy", "Cancel")) {
continue;
}
if (item instanceof PaperCard) { if (item instanceof PaperCard) {
this.questData.getCards().buyCard((PaperCard) item, qty, value); this.questData.getCards().buyCard((PaperCard) item, qty, value);
@@ -368,16 +382,10 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
deck.getName(), one ? "was" : "were", one ? "Its" : "Their"), deck.getName(), one ? "was" : "were", one ? "Its" : "Their"),
"Thanks for purchasing!", FOptionPane.INFORMATION_ICON); "Thanks for purchasing!", FOptionPane.INFORMATION_ICON);
} }
else {
continue; //don't remove item from Catalog if any other type
} }
itemsToRemove.add(itemEntry);
}
if (itemsToRemove.isEmpty()) { return; }
this.getDeckManager().addItems(itemsToAdd); this.getDeckManager().addItems(itemsToAdd);
this.getCatalogManager().removeItems(itemsToRemove); this.getCatalogManager().removeItems(itemsToBuy);
this.creditsLabel.setText("Credits: " + this.questData.getAssets().getCredits()); this.creditsLabel.setText("Credits: " + this.questData.getAssets().getCredits());
} }
@@ -389,31 +397,38 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
protected void onRemoveItems(Iterable<Entry<InventoryItem, Integer>> items, boolean toAlternate) { protected void onRemoveItems(Iterable<Entry<InventoryItem, Integer>> items, boolean toAlternate) {
if (showingFullCatalog || toAlternate) { return; } if (showingFullCatalog || toAlternate) { return; }
List<Entry<InventoryItem, Integer>> itemsToRemove = new ArrayList<Entry<InventoryItem, Integer>>(); long totalReceived = 0;
ItemPool<InventoryItem> itemsToSell = new ItemPool<InventoryItem>(InventoryItem.class);
for (Entry<InventoryItem, Integer> itemEntry : items) { for (Entry<InventoryItem, Integer> itemEntry : items) {
final InventoryItem item = itemEntry.getKey(); final InventoryItem item = itemEntry.getKey();
if (item instanceof PaperCard) { if (item instanceof PaperCard) {
final PaperCard card = (PaperCard) item; final int qty = itemEntry.getValue();
itemsToSell.add(item, qty);
totalReceived += qty * Math.min((int) (this.multiplier * this.getCardValue(item)), this.questData.getCards().getSellPriceLimit());
}
}
if (itemsToSell.isEmpty()) { return; }
List<InventoryItem> itemFlatList = itemsToSell.toFlatList();
String suffix = SItemManagerUtil.getItemDisplayString(itemFlatList, 1, true);
String displayList = SItemManagerUtil.buildDisplayList(itemsToSell);
String title = "Sell " + suffix;
if (!FOptionPane.showConfirmDialog("Sell the following " + suffix.toLowerCase() + " for " + totalReceived +
" credit" + (totalReceived != 1 ? "s" : "") + "?\n" + displayList, title, "Sell", "Cancel")) {
return;
}
for (Entry<InventoryItem, Integer> itemEntry : itemsToSell) {
final PaperCard card = (PaperCard) itemEntry.getKey();
final int qty = itemEntry.getValue(); final int qty = itemEntry.getValue();
final int price = Math.min((int) (this.multiplier * this.getCardValue(card)), this.questData.getCards().getSellPriceLimit()); final int price = Math.min((int) (this.multiplier * this.getCardValue(card)), this.questData.getCards().getSellPriceLimit());
final int totalReceived = price * qty;
if (!FOptionPane.showConfirmDialog("Sell " + (qty == 1 ? "'" : qty + " copies of '") +
item.getName() + "' for " + totalReceived + " credit" + (totalReceived != 1 ? "s" : "") + "?",
"Sell Card", "Sell", "Cancel")) {
continue;
}
this.questData.getCards().sellCard(card, qty, price); this.questData.getCards().sellCard(card, qty, price);
itemsToRemove.add(itemEntry);
}
} }
if (itemsToRemove.isEmpty()) { return; } this.getCatalogManager().addItems(itemsToSell);
this.getDeckManager().removeItems(itemsToSell);
this.getCatalogManager().addItems(itemsToRemove);
this.getDeckManager().removeItems(itemsToRemove);
this.creditsLabel.setText("Credits: " + this.questData.getAssets().getCredits()); this.creditsLabel.setText("Credits: " + this.questData.getAssets().getCredits());
} }

22
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java
View File

@@ -1,6 +1,10 @@
package forge.gui.toolbox.itemmanager; package forge.gui.toolbox.itemmanager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Map.Entry;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.card.CardRules; import forge.card.CardRules;
@@ -157,4 +161,22 @@ public final class SItemManagerUtil {
} }
return result; return result;
} }
public static String buildDisplayList(Iterable<Entry<InventoryItem, Integer>> items) {
ArrayList<Entry<InventoryItem, Integer>> sorted = new ArrayList<Entry<InventoryItem, Integer>>();
for (Entry<InventoryItem, Integer> itemEntry : items) {
sorted.add(itemEntry);
}
Collections.sort(sorted, new Comparator<Entry<InventoryItem, Integer>>() {
@Override
public int compare(final Entry<InventoryItem, Integer> x, final Entry<InventoryItem, Integer> y) {
return x.getKey().toString().compareTo(y.getKey().toString());
}
});
StringBuilder builder = new StringBuilder();
for (Entry<InventoryItem, Integer> itemEntry : sorted) {
builder.append("\n" + itemEntry.getValue() + " * " + itemEntry.getKey().toString());
}
return builder.toString();
}
} }