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

Merge pull request #6541 from kevlahnota/master2

Browse Source 
fix sellAll
This commit is contained in:
kevlahnota
2024-11-06 23:24:58 +08:00
committed by GitHub
parent e7e5f4d9a7 7f7248f825
commit cd4b2a02e5
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
View File

@@ -221,11 +221,17 @@ public class AdventureDeckEditor extends TabPageScreen<AdventureDeckEditor> {
} }
if (sellableCount > 0) { if (sellableCount > 0) {
FMenuItem moveToAutosell = new FMenuItem(Forge.getLocalizer().getMessage("lbltoSell", autoSellCount, sellableCount), Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, e1 -> Current.player().autoSellCards.add(card)); FMenuItem moveToAutosell = new FMenuItem(Forge.getLocalizer().getMessage("lbltoSell", autoSellCount, sellableCount), Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, e1 -> {
Current.player().autoSellCards.add(card);
refresh();
});
moveToAutosell.setEnabled(sellableCount - autoSellCount > 0); moveToAutosell.setEnabled(sellableCount - autoSellCount > 0);
menu.addItem(moveToAutosell); menu.addItem(moveToAutosell);
FMenuItem moveToCatalog = new FMenuItem(Forge.getLocalizer().getMessage("lbltoInventory", autoSellCount, sellableCount), Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, e1 -> Current.player().autoSellCards.remove(card)); FMenuItem moveToCatalog = new FMenuItem(Forge.getLocalizer().getMessage("lbltoInventory", autoSellCount, sellableCount), Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, e1 -> {
Current.player().autoSellCards.remove(card);
refresh();
});
moveToCatalog.setEnabled(autoSellCount > 0); moveToCatalog.setEnabled(autoSellCount > 0);
menu.addItem(moveToCatalog); menu.addItem(moveToCatalog);
} }
@@ -587,18 +593,24 @@ public class AdventureDeckEditor extends TabPageScreen<AdventureDeckEditor> {
final int finalCount = count; final int finalCount = count;
final int finalValue = value; final int finalValue = value;
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblSellCurrentFilters"), FSkinImage.QUEST_COINSTACK, e1 -> { addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblSellCurrentFilters"), FSkinImage.QUEST_COINSTACK, e1 -> {
FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblSellAllConfirm", finalCount, finalValue), Forge.getLocalizer().getMessage("lblSellCurrentFilters"), Forge.getLocalizer().getMessage("lblSell"), Forge.getLocalizer().getMessage("lblCancel"), false, new Callback<Boolean>() { // aloww selling on catalog page only
@Override if (catalogPage.cardManager.getCatalogSelectedIndex() == 1) {
public void run(Boolean result) { FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblSellAllConfirm", finalCount, finalValue), Forge.getLocalizer().getMessage("lblSellCurrentFilters"), Forge.getLocalizer().getMessage("lblSell"), Forge.getLocalizer().getMessage("lblCancel"), false, new Callback<Boolean>() {
if (result) { @Override
for (Map.Entry<PaperCard, Integer> entry : catalogPage.cardManager.getFilteredItems()) { public void run(Boolean result) {
AdventurePlayer.current().sellCard(entry.getKey(), entry.getValue()); if (result) {
for (Map.Entry<PaperCard, Integer> entry : catalogPage.cardManager.getFilteredItems()) {
AdventurePlayer.current().sellCard(entry.getKey(), entry.getValue());
}
catalogPage.refresh();
lblGold.setText(String.valueOf(AdventurePlayer.current().getGold()));
} }
catalogPage.refresh();
lblGold.setText(String.valueOf(AdventurePlayer.current().getGold()));
} }
} });
}); } else {
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblChoose") + " " +
Forge.getLocalizer().getMessage("lblShowCollection"));
}
})); }));
} }
((DeckEditorPage) getSelectedPage()).buildDeckMenu(this); ((DeckEditorPage) getSelectedPage()).buildDeckMenu(this);

9
forge-gui-mobile/src/forge/itemmanager/ItemManager.java
View File

@@ -669,6 +669,15 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
} }
} }
public int getCatalogSelectedIndex() {
if (cardFormatFilter == null)
return 0;
if (cardFormatFilter.getMainComponent() instanceof FComboBox<?>) {
return((FComboBox<?>) cardFormatFilter.getMainComponent()).getSelectedIndex();
}
return 0;
}
public void scrollSelectionIntoView() { public void scrollSelectionIntoView() {
currentView.scrollSelectionIntoView(); currentView.scrollSelectionIntoView();
} }