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

Fix so NEW distinction reset after each match

Browse Source 
Fix so NEW distinction appears for AEther rewards
This commit is contained in:
drdev
2016-03-15 01:59:24 +00:00
parent 76176b1344
commit fe29fb1f83
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java
View File

@@ -22,9 +22,8 @@ public class ConquestCollectionScreen extends FScreen {
public ConquestCollectionScreen() { public ConquestCollectionScreen() {
super("", ConquestMenu.getMenu()); super("", ConquestMenu.getMenu());
ConquestData model = FModel.getConquest().getModel();
ItemManagerConfig config = ItemManagerConfig.CONQUEST_COLLECTION; ItemManagerConfig config = ItemManagerConfig.CONQUEST_COLLECTION;
lstCollection.setup(config, model.getColOverrides(config)); lstCollection.setup(config, ConquestData.getColOverrides(config));
} }
@Override @Override

3
forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java
View File

@@ -10,6 +10,7 @@ import forge.itemmanager.ItemColumn;
import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.ItemManagerConfig;
import forge.model.FModel; import forge.model.FModel;
import forge.planarconquest.ConquestCommander; import forge.planarconquest.ConquestCommander;
import forge.planarconquest.ConquestData;
import forge.toolbox.FEvent; import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
@@ -37,6 +38,6 @@ public class ConquestDeckEditor extends FDeckEditor {
@Override @Override
protected Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) { protected Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
return FModel.getConquest().getModel().getColOverrides(config); return ConquestData.getColOverrides(config);
} }
} }

1
forge-gui/src/main/java/forge/planarconquest/ConquestBattle.java
View File

@@ -57,6 +57,7 @@ public abstract class ConquestBattle {
view.getBtnQuit().setText("Quit"); view.getBtnQuit().setText("Quit");
model.addLoss(this); model.addLoss(this);
} }
model.resetNewCards(); //reset new cards after finishing a game
model.saveData(); model.saveData();
} }

14
forge-gui/src/main/java/forge/planarconquest/ConquestData.java
View File

@@ -311,26 +311,26 @@ public final class ConquestData {
directory.renameTo(new File(ForgeConstants.CONQUEST_SAVE_DIR, name)); directory.renameTo(new File(ForgeConstants.CONQUEST_SAVE_DIR, name));
} }
public HashSet<PaperCard> getNewCards() { public void resetNewCards() {
return newCards; newCards.clear();
} }
private final Function<Entry<InventoryItem, Integer>, Comparable<?>> fnNewCompare = private static final Function<Entry<InventoryItem, Integer>, Comparable<?>> fnNewCompare =
new Function<Entry<InventoryItem, Integer>, Comparable<?>>() { new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override @Override
public Comparable<?> apply(final Entry<InventoryItem, Integer> from) { public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
return newCards.contains(from.getKey()) ? Integer.valueOf(1) : Integer.valueOf(0); return FModel.getConquest().getModel().newCards.contains(from.getKey()) ? Integer.valueOf(1) : Integer.valueOf(0);
} }
}; };
private final Function<Entry<? extends InventoryItem, Integer>, Object> fnNewGet = private static final Function<Entry<? extends InventoryItem, Integer>, Object> fnNewGet =
new Function<Entry<? extends InventoryItem, Integer>, Object>() { new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@Override @Override
public Object apply(final Entry<? extends InventoryItem, Integer> from) { public Object apply(final Entry<? extends InventoryItem, Integer> from) {
return newCards.contains(from.getKey()) ? "NEW" : ""; return FModel.getConquest().getModel().newCards.contains(from.getKey()) ? "NEW" : "";
} }
}; };
public Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) { public static Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
Map<ColumnDef, ItemColumn> colOverrides = new HashMap<ColumnDef, ItemColumn>(); Map<ColumnDef, ItemColumn> colOverrides = new HashMap<ColumnDef, ItemColumn>();
ItemColumn.addColOverride(config, colOverrides, ColumnDef.NEW, fnNewCompare, fnNewGet); ItemColumn.addColOverride(config, colOverrides, ColumnDef.NEW, fnNewCompare, fnNewGet);
return colOverrides; return colOverrides;