diff --git a/forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java b/forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java index c661f50a741..3afbae2914b 100644 --- a/forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java +++ b/forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java @@ -295,6 +295,7 @@ public AdventureQuestController.QuestStatus handleEvent(AdventureQuestEvent even } else { status = ++progress4 >= count4 && count4 > 0 ? FAILED : status; } + break; case Arena: status = event.type == AdventureQuestEventType.ARENACOMPLETE && event.winner //if event won & not conceded diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java index b3d24001da3..3c5815a3431 100644 --- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java +++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java @@ -453,29 +453,24 @@ public void load(SaveFileData data) { setSelectedDeckSlot(data.readInt("selectedDeckIndex")); cards.addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("cards")))); - //newCards.addAll(InventoryItem data.readObject("cards")))); - data.storeObject("newCards", newCards.toFlatList().toArray(new InventoryItem[0])); - data.storeObject("autoSellCards", autoSellCards.toFlatList().toArray(new InventoryItem[0])); - data.storeObject("noSellCards", noSellCards.toFlatList().toArray(new InventoryItem[0])); - -// if (data.containsKey("newCards")) { -// InventoryItem[] items = (InventoryItem[]) data.readObject("newCards"); -// for (InventoryItem item : items){ -// newCards.add((PaperCard)item); -// } -// } -// if (data.containsKey("noSellCards")) { -// PaperCard[] items = (PaperCard[]) data.readObject("noSellCards"); -// for (PaperCard item : items){ -// noSellCards.add(item); -// } -// } -// if (data.containsKey("autoSellCards")) { -// PaperCard[] items = (PaperCard[]) data.readObject("autoSellCards"); -// for (PaperCard item : items){ -// autoSellCards.add(item); -// } -// } + if (data.containsKey("newCards")) { + InventoryItem[] items = (InventoryItem[]) data.readObject("newCards"); + for (InventoryItem item : items){ + newCards.add((PaperCard)item); + } + } + if (data.containsKey("noSellCards")) { + PaperCard[] items = (PaperCard[]) data.readObject("noSellCards"); + for (PaperCard item : items){ + noSellCards.add(item); + } + } + if (data.containsKey("autoSellCards")) { + PaperCard[] items = (PaperCard[]) data.readObject("autoSellCards"); + for (PaperCard item : items){ + autoSellCards.add(item); + } + } fantasyMode = data.containsKey("fantasyMode") && data.readBool("fantasyMode"); announceFantasy = data.containsKey("announceFantasy") && data.readBool("announceFantasy");