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

Merge branch 'master' into 'master'

Browse Source 
Fix spell shop items

See merge request core-developers/forge!4358
This commit is contained in:
Anthony Calosa
2021-04-03 09:32:39 +00:00
parent 7c9404864a 4444438670
commit 709524b7c9
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
View File

@@ -284,7 +284,6 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
private static class SpellShopPage extends SpellShopBasePage { private static class SpellShopPage extends SpellShopBasePage {
private FTextArea lblSellPercentage = add(new FTextArea(false)); private FTextArea lblSellPercentage = add(new FTextArea(false));
private ItemPool<InventoryItem> shopItems = FModel.getQuest().getCards().getShopList();
private SpellShopPage() { private SpellShopPage() {
super(localizer.getMessage("lblCardsForSale"), FSkinImage.QUEST_BOOK, true); super(localizer.getMessage("lblCardsForSale"), FSkinImage.QUEST_BOOK, true);
@@ -304,7 +303,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
ItemColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverrides, ColumnDef.OWNED, FModel.getQuest().getCards().getFnOwnedCompare(), FModel.getQuest().getCards().getFnOwnedGet()); ItemColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverrides, ColumnDef.OWNED, FModel.getQuest().getCards().getFnOwnedCompare(), FModel.getQuest().getCards().getFnOwnedGet());
itemManager.setup(ItemManagerConfig.SPELL_SHOP, colOverrides); itemManager.setup(ItemManagerConfig.SPELL_SHOP, colOverrides);
itemManager.setPool(shopItems); itemManager.setPool(FModel.getQuest().getCards().getShopList());
} }
}); });
} }