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

Adventure fixes: "No Sell Cards", quest tracking

Browse Source
This commit is contained in:
jjayers99
2024-03-04 20:57:57 -05:00
committed by Chris H
parent 8231fd704c
commit f6719d6f06
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java
View File

@@ -295,6 +295,7 @@ public class AdventureQuestStage implements Serializable {
} else { } else {
status = ++progress4 >= count4 && count4 > 0 ? FAILED : status; status = ++progress4 >= count4 && count4 > 0 ? FAILED : status;
} }
break;
case Arena: case Arena:
status = event.type == AdventureQuestEventType.ARENACOMPLETE status = event.type == AdventureQuestEventType.ARENACOMPLETE
&& event.winner //if event won & not conceded && event.winner //if event won & not conceded

41
forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
View File

@@ -453,29 +453,24 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
setSelectedDeckSlot(data.readInt("selectedDeckIndex")); setSelectedDeckSlot(data.readInt("selectedDeckIndex"));
cards.addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("cards")))); cards.addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("cards"))));
//newCards.addAll(InventoryItem data.readObject("cards")))); if (data.containsKey("newCards")) {
data.storeObject("newCards", newCards.toFlatList().toArray(new InventoryItem[0])); InventoryItem[] items = (InventoryItem[]) data.readObject("newCards");
data.storeObject("autoSellCards", autoSellCards.toFlatList().toArray(new InventoryItem[0])); for (InventoryItem item : items){
data.storeObject("noSellCards", noSellCards.toFlatList().toArray(new InventoryItem[0])); newCards.add((PaperCard)item);
}
// if (data.containsKey("newCards")) { }
// InventoryItem[] items = (InventoryItem[]) data.readObject("newCards"); if (data.containsKey("noSellCards")) {
// for (InventoryItem item : items){ PaperCard[] items = (PaperCard[]) data.readObject("noSellCards");
// newCards.add((PaperCard)item); for (PaperCard item : items){
// } noSellCards.add(item);
// } }
// if (data.containsKey("noSellCards")) { }
// PaperCard[] items = (PaperCard[]) data.readObject("noSellCards"); if (data.containsKey("autoSellCards")) {
// for (PaperCard item : items){ PaperCard[] items = (PaperCard[]) data.readObject("autoSellCards");
// noSellCards.add(item); for (PaperCard item : items){
// } autoSellCards.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"); fantasyMode = data.containsKey("fantasyMode") && data.readBool("fantasyMode");
announceFantasy = data.containsKey("announceFantasy") && data.readBool("announceFantasy"); announceFantasy = data.containsKey("announceFantasy") && data.readBool("announceFantasy");