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

Avoid muddying collection with unowned cards

Browse Source
This commit is contained in:
drdev
2016-01-03 04:53:54 +00:00
parent e3cf3b65bd
commit 915a3c32f1
7 changed files with 13 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
forge-core/src/main/java/forge/util/ItemPool.java
View File

@@ -105,8 +105,6 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
private final Class<T> myClass; //class does not keep this in runtime by itself private final Class<T> myClass; //class does not keep this in runtime by itself
private boolean allowZero; //whether to allow items with 0 count to remain in pool
@Override @Override
public final Iterator<Entry<T, Integer>> iterator() { public final Iterator<Entry<T, Integer>> iterator() {
return items.entrySet().iterator(); return items.entrySet().iterator();
@@ -184,13 +182,6 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
return myClass; return myClass;
} }
public boolean allowZero() {
return allowZero;
}
public void setAllowZero(boolean allowZero0) {
allowZero = allowZero0;
}
public ItemPool<T> getView() { public ItemPool<T> getView() {
return new ItemPool<T>(Collections.unmodifiableMap(items), getMyClass()); return new ItemPool<T>(Collections.unmodifiableMap(items), getMyClass());
} }
@@ -200,16 +191,8 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
} }
public void add(final T item, final int amount) { public void add(final T item, final int amount) {
if (item == null) { return; } if (item == null || amount <= 0) { return; }
if (amount <= 0) {
if (allowZero) {
if (!items.containsKey(item)) {
items.put(item, 0);
}
}
else { return; }
}
items.put(item, count(item) + amount); items.put(item, count(item) + amount);
} }
@@ -253,12 +236,7 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
return false; return false;
} }
if (count <= amount) { if (count <= amount) {
if (allowZero) { items.remove(item);
items.put(item, 0);
}
else {
items.remove(item);
}
} }
else { else {
items.put(item, count - amount); items.put(item, count - amount);

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

@@ -408,7 +408,6 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
public void setPool(final ItemPool<T> pool0, boolean infinite) { public void setPool(final ItemPool<T> pool0, boolean infinite) {
pool = pool0; pool = pool0;
model.clear(); model.clear();
model.setAllowZero(pool.allowZero());
model.addItems(pool); model.addItems(pool);
model.setInfinite(infinite); model.setInfinite(infinite);
updateView(true, null); updateView(true, null);
@@ -763,17 +762,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
//update ratio of # in filtered pool / # in total pool //update ratio of # in filtered pool / # in total pool
ItemPool<T> filteredItems = getFilteredItems(); ItemPool<T> filteredItems = getFilteredItems();
int filteredCount = filteredItems.countAll(); int filteredCount = filteredItems.countAll();
int totalCount = useFilter ? pool.countAll() : filteredCount;
int totalCount;
if (pool.allowZero() && isInfinite()) { //use count distinct if pool is infinite to account for zeros and save performance
totalCount = filteredItems.countDistinct();
}
else if (useFilter) {
totalCount = pool.countAll();
}
else {
totalCount = filteredCount;
}
searchFilter.setRatio("(" + filteredCount + " / " + totalCount + ")"); searchFilter.setRatio("(" + filteredCount + " / " + totalCount + ")");
} }

43
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@@ -366,13 +366,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
group = otherItems; group = otherItems;
} }
if (qty > 0) { for (int i = 0; i < qty; i++) {
for (int i = 0; i < qty; i++) { group.add(new ItemInfo(item, group));
group.add(new ItemInfo(item, group, false));
}
}
else { //add single item for unowned item
group.add(new ItemInfo(item, group, true));
} }
} }
@@ -771,7 +766,6 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private final String name; private final String name;
private boolean isCollapsed; private boolean isCollapsed;
private float scrollWidth; private float scrollWidth;
private int owned;
public Group(String name0) { public Group(String name0) {
name = name0; name = name0;
@@ -779,9 +773,6 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
public void add(ItemInfo item) { public void add(ItemInfo item) {
items.add(item); items.add(item);
if (!item.unowned) {
owned++;
}
} }
@Override @Override
@@ -797,13 +788,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
//draw group name and horizontal line //draw group name and horizontal line
float x = GROUP_HEADER_GLYPH_WIDTH + PADDING + 1; float x = GROUP_HEADER_GLYPH_WIDTH + PADDING + 1;
float y = 0; float y = 0;
String caption; String caption = name + " (" + items.size() + ")";
if (itemManager.getPool().allowZero() && itemManager.isInfinite()) {
caption = name + " (" + owned + " / " + items.size() + ")"; //show ratio of owned / total when zero allowed
}
else {
caption = name + " (" + owned + ")";
}
g.drawText(caption, GROUP_HEADER_FONT, GROUP_HEADER_FORE_COLOR, x, y, getWidth(), GROUP_HEADER_HEIGHT, false, HAlignment.LEFT, true); g.drawText(caption, GROUP_HEADER_FONT, GROUP_HEADER_FORE_COLOR, x, y, getWidth(), GROUP_HEADER_HEIGHT, false, HAlignment.LEFT, true);
x += GROUP_HEADER_FONT.getBounds(caption).width + PADDING; x += GROUP_HEADER_FONT.getBounds(caption).width + PADDING;
y += GROUP_HEADER_HEIGHT / 2; y += GROUP_HEADER_HEIGHT / 2;
@@ -922,15 +907,13 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private class ItemInfo extends FDisplayObject implements Entry<InventoryItem, Integer> { private class ItemInfo extends FDisplayObject implements Entry<InventoryItem, Integer> {
private final T item; private final T item;
private final Group group; private final Group group;
private final boolean unowned;
private int index; private int index;
private CardStackPosition pos; private CardStackPosition pos;
private boolean selected; private boolean selected;
private ItemInfo(T item0, Group group0, boolean unowned0) { private ItemInfo(T item0, Group group0) {
item = item0; item = item0;
group = group0; group = group0;
unowned = unowned0;
} }
@Override @Override
@@ -961,18 +944,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
final float h = getHeight(); final float h = getHeight();
if (selected) { if (selected) {
if (unowned) { //use drawRect for unowned to prevent green showing through card g.fillRect(Color.GREEN, x - SEL_BORDER_SIZE, y - SEL_BORDER_SIZE,
g.drawRect(SEL_BORDER_SIZE, Color.GREEN, x - SEL_BORDER_SIZE, y - SEL_BORDER_SIZE, w + 2 * SEL_BORDER_SIZE, h + 2 * SEL_BORDER_SIZE);
w + 2 * SEL_BORDER_SIZE, h + 2 * SEL_BORDER_SIZE);
}
else {
g.fillRect(Color.GREEN, x - SEL_BORDER_SIZE, y - SEL_BORDER_SIZE,
w + 2 * SEL_BORDER_SIZE, h + 2 * SEL_BORDER_SIZE);
}
}
if (unowned) {
g.setAlphaComposite(UNOWNED_ALPHA_COMPOSITE);
} }
if (item instanceof PaperCard) { if (item instanceof PaperCard) {
@@ -988,10 +961,6 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
g.drawText(item.getName(), GROUP_HEADER_FONT, Color.WHITE, x + PADDING, y + PADDING, w - 2 * PADDING, h - 2 * PADDING, true, HAlignment.CENTER, false); g.drawText(item.getName(), GROUP_HEADER_FONT, Color.WHITE, x + PADDING, y + PADDING, w - 2 * PADDING, h - 2 * PADDING, true, HAlignment.CENTER, false);
} }
} }
if (unowned) {
g.resetAlphaComposite();
}
} }
} }
} }

7
forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
View File

@@ -239,10 +239,6 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
@Override @Override
public void drawValue(Graphics g, Integer index, Entry<T, Integer> value, FSkinFont font, FSkinColor foreColor, FSkinColor backColor, boolean pressed, float x, float y, float w, float h) { public void drawValue(Graphics g, Integer index, Entry<T, Integer> value, FSkinFont font, FSkinColor foreColor, FSkinColor backColor, boolean pressed, float x, float y, float w, float h) {
boolean unowned = (value.getValue() == 0); //fade out item if item isn't owned
if (unowned) {
g.setAlphaComposite(UNOWNED_ALPHA_COMPOSITE);
}
if (maxSelections > 1) { if (maxSelections > 1) {
if (pressed) { //if multi-select mode, draw SEL_COLOR when pressed if (pressed) { //if multi-select mode, draw SEL_COLOR when pressed
g.fillRect(SEL_COLOR, x - FList.PADDING, y - FList.PADDING, w + 2 * FList.PADDING, h + 2 * FList.PADDING); g.fillRect(SEL_COLOR, x - FList.PADDING, y - FList.PADDING, w + 2 * FList.PADDING, h + 2 * FList.PADDING);
@@ -255,9 +251,6 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
w -= padding; w -= padding;
} }
renderer.drawValue(g, value, font, foreColor, backColor, pressed, x + 1, y, w - 2, h); //x + 1 and w - 2 to account for left and right borders renderer.drawValue(g, value, font, foreColor, backColor, pressed, x + 1, y, w - 2, h); //x + 1 and w - 2 to account for left and right borders
if (unowned) {
g.resetAlphaComposite();
}
} }
}); });
setFont(FSkinFont.get(14)); setFont(FSkinFont.get(14));

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

@@ -2,6 +2,7 @@ package forge.screens.planarconquest;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.deck.CardPool;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.CardManager; import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManager; import forge.itemmanager.ItemManager;
@@ -33,7 +34,9 @@ public class ConquestCollectionScreen extends FScreen {
} }
public void refreshCards() { public void refreshCards() {
FModel.getConquest().getModel().populateCollectionManager(lstCollection); CardPool pool = new CardPool();
pool.add(FModel.getConquest().getModel().getUnlockedCards());
lstCollection.setPool(pool, true);
} }
@Override @Override

7
forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java
View File

@@ -117,13 +117,6 @@ public final class ItemManagerModel<T extends InventoryItem> {
return infiniteSupply; return infiniteSupply;
} }
public boolean allowZero() {
return data.allowZero();
}
public void setAllowZero(boolean allowZero0) {
data.setAllowZero(allowZero0);
}
public CascadeManager getCascadeManager() { public CascadeManager getCascadeManager() {
return cascadeManager; return cascadeManager;
} }

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

@@ -23,7 +23,6 @@ import forge.card.CardDb;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.itemmanager.ColumnDef; import forge.itemmanager.ColumnDef;
import forge.itemmanager.IItemManager;
import forge.itemmanager.ItemColumn; import forge.itemmanager.ItemColumn;
import forge.itemmanager.ItemManagerConfig; import forge.itemmanager.ItemManagerConfig;
import forge.model.FModel; import forge.model.FModel;
@@ -31,7 +30,6 @@ import forge.planarconquest.ConquestPlane.Region;
import forge.planarconquest.ConquestPreferences.CQPref; import forge.planarconquest.ConquestPreferences.CQPref;
import forge.properties.ForgeConstants; import forge.properties.ForgeConstants;
import forge.util.FileUtil; import forge.util.FileUtil;
import forge.util.ItemPool;
import forge.util.XmlReader; import forge.util.XmlReader;
import forge.util.XmlWriter; import forge.util.XmlWriter;
@@ -55,7 +53,6 @@ public final class ConquestData {
private ISkinImage planeswalkerToken; private ISkinImage planeswalkerToken;
private ConquestLocation currentLocation; private ConquestLocation currentLocation;
private int aetherShards; private int aetherShards;
private ConquestCollection collection;
private final File directory; private final File directory;
private final String xmlFilename; private final String xmlFilename;
@@ -145,13 +142,6 @@ public final class ConquestData {
return getOrCreatePlaneData(getCurrentPlane()); return getOrCreatePlaneData(getCurrentPlane());
} }
public void populateCollectionManager(IItemManager<PaperCard> manager) {
if (collection == null) {
collection = new ConquestCollection();
}
manager.setPool(collection, true);
}
public Iterable<PaperCard> getUnlockedCards() { public Iterable<PaperCard> getUnlockedCards() {
return unlockedCards; return unlockedCards;
} }
@@ -163,9 +153,6 @@ public final class ConquestData {
public void unlockCard(PaperCard card) { public void unlockCard(PaperCard card) {
if (unlockedCards.add(card)) { if (unlockedCards.add(card)) {
newCards.add(card); newCards.add(card);
if (collection != null) {
collection.add(card);
}
} }
} }
public void unlockCards(Iterable<PaperCard> cards) { public void unlockCards(Iterable<PaperCard> cards) {
@@ -404,20 +391,4 @@ public final class ConquestData {
} }
} }
} }
@SuppressWarnings("serial")
private class ConquestCollection extends ItemPool<PaperCard> {
private ConquestCollection() {
super(PaperCard.class);
setAllowZero(true);
//initialize to contain all available cards, with unlocked
//having a count of 1 and the rest having a count of 0
for (ConquestPlane plane : ConquestPlane.values()) {
for (PaperCard card : plane.getCardPool().getAllCards()) {
items.put(card, hasUnlockedCard(card) ? 1 : 0);
}
}
}
}
} }