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

Support showing unowned cards in collection

Browse Source
This commit is contained in:
drdev
2015-12-07 03:02:39 +00:00
parent 85320926e7
commit c93418a526
7 changed files with 132 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,18 +90,22 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
return result;
}
protected ItemPool(final Map<T, Integer> inMap, final Class<T> cls) {
items = inMap;
protected ItemPool(final Map<T, Integer> items0, final Class<T> cls) {
if (items0 != null) {
items = items0;
}
else {
items = new HashMap<T, Integer>(); //prevent items being null
}
myClass = cls;
}
// Data members
/** The items. */
protected final Map<T, Integer> items;
/** The my class. */
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
public final Iterator<Entry<T, Integer>> iterator() {
@@ -109,14 +113,11 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
}
public final boolean contains(final T item) {
if (items == null) {
return false;
}
return items.containsKey(item);
}
public final int count(final T item) {
if (items == null || item == null) {
if (item == null) {
return 0;
}
final Integer boxed = items.get(item);
@@ -133,15 +134,13 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
public final <U extends InventoryItem> int countAll(Predicate<U> condition, Class<U> cls) {
int result = 0;
if (items != null) {
final boolean isSameClass = cls == myClass;
for (final Entry<T, Integer> kv : this) {
final T key = kv.getKey();
@SuppressWarnings("unchecked")
final U castKey = isSameClass || cls.isInstance(key) ? (U)key : null;
if (null == condition || castKey != null && condition.apply(castKey))
result += kv.getValue();
}
final boolean isSameClass = cls == myClass;
for (final Entry<T, Integer> kv : this) {
final T key = kv.getKey();
@SuppressWarnings("unchecked")
final U castKey = isSameClass || cls.isInstance(key) ? (U)key : null;
if (null == condition || castKey != null && condition.apply(castKey))
result += kv.getValue();
}
return result;
}
@@ -151,7 +150,7 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
}
public final boolean isEmpty() {
return (items == null) || items.isEmpty();
return items.isEmpty();
}
public final List<T> toFlatList() {
@@ -176,6 +175,13 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
return myClass;
}
public boolean allowZero() {
return allowZero;
}
public void setAllowZero(boolean allowZero0) {
allowZero = allowZero0;
}
public ItemPool<T> getView() {
return new ItemPool<T>(Collections.unmodifiableMap(items), getMyClass());
}
@@ -185,14 +191,21 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
}
public void add(final T item, final int amount) {
if (item == null || amount <= 0) {
return;
if (item == null) { return; }
if (amount <= 0) {
if (allowZero) {
if (!items.containsKey(item)) {
items.put(item, 0);
}
}
else { return; }
}
items.put(item, Integer.valueOf(count(item) + amount));
items.put(item, count(item) + amount);
}
public void addAllFlat(final Iterable<T> items) {
for (T item : items) {
public void addAllFlat(final Iterable<T> itms) {
for (T item : itms) {
add(item);
}
}
@@ -204,8 +217,8 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
}
@SuppressWarnings("unchecked")
public <U extends InventoryItem> void addAllOfTypeFlat(final Iterable<U> items) {
for (U item : items) {
public <U extends InventoryItem> void addAllOfTypeFlat(final Iterable<U> itms) {
for (U item : itms) {
if (myClass.isInstance(item)) {
add((T) item);
}
@@ -214,10 +227,9 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
@SuppressWarnings("unchecked")
public <U extends InventoryItem> void addAllOfType(final Iterable<Entry<U, Integer>> map) {
Class<T> myClass = this.getMyClass();
for (final Entry<U, Integer> e : map) {
for (Entry<U, Integer> e : map) {
if (myClass.isInstance(e.getKey())) {
this.add((T) e.getKey(), e.getValue());
add((T) e.getKey(), e.getValue());
}
}
}
@@ -228,12 +240,18 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
public boolean remove(final T item, final int amount) {
final int count = count(item);
if ((count == 0) || (amount <= 0)) {
if (count == 0 || amount <= 0) {
return false;
}
if (count <= amount) {
items.remove(item);
} else {
if (allowZero) {
items.put(item, 0);
}
else {
items.remove(item);
}
}
else {
items.put(item, count - amount);
}
return true;

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

@@ -406,8 +406,9 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
setPool(pool0, false);
}
public void setPool(final ItemPool<T> pool0, boolean infinite) {
model.clear();
pool = pool0;
model.clear();
model.setAllowZero(pool.allowZero());
model.addItems(pool);
model.setInfinite(infinite);
updateView(true, null);

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

@@ -366,8 +366,13 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
group = otherItems;
}
for (int i = 0; i < qty; i++) {
group.add(new ItemInfo(item, group));
if (qty > 0) {
for (int i = 0; i < qty; i++) {
group.add(new ItemInfo(item, group, false));
}
}
else { //add single item for unowned item
group.add(new ItemInfo(item, group, true));
}
}
@@ -907,13 +912,15 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
private class ItemInfo extends FDisplayObject implements Entry<InventoryItem, Integer> {
private final T item;
private final Group group;
private final boolean unowned;
private int index;
private CardStackPosition pos;
private boolean selected;
private ItemInfo(T item0, Group group0) {
private ItemInfo(T item0, Group group0, boolean unowned0) {
item = item0;
group = group0;
unowned = unowned0;
}
@Override
@@ -938,6 +945,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
@Override
public void draw(Graphics g) {
if (unowned) {
g.setAlphaComposite(UNOWNED_ALPHA_COMPOSITE);
}
final float x = getLeft() - group.getScrollLeft();
final float y = getTop() - group.getTop() - getScrollValue();
final float w = getWidth();
@@ -961,6 +972,10 @@ 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);
}
}
if (unowned) {
g.resetAlphaComposite();
}
}
}
}

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

@@ -239,6 +239,10 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
@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) {
boolean unowned = (value.getValue() == 0); //fade out item if item isn't owned
if (unowned) {
g.setAlphaComposite(UNOWNED_ALPHA_COMPOSITE);
}
if (maxSelections > 1) {
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);
@@ -251,6 +255,9 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
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
if (unowned) {
g.resetAlphaComposite();
}
}
});
setFont(FSkinFont.get(14));
@@ -293,11 +300,6 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
public final class ItemListModel {
private final ItemManagerModel<T> model;
/**
* Instantiates a new list model.
*
* @param model0 &emsp; {@link forge.gui.ItemManager.ItemManagerModel<T>}
*/
public ItemListModel(final ItemManagerModel<T> model0) {
model = model0;
}

1
forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import com.badlogic.gdx.math.Rectangle;
public abstract class ItemView<T extends InventoryItem> {
protected static final float UNOWNED_ALPHA_COMPOSITE = 0.35f;
private static final FSkinColor BORDER_COLOR = FSkinColor.get(Colors.CLR_TEXT);
protected final ItemManager<T> itemManager;

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

@@ -29,16 +29,7 @@ import forge.itemmanager.ItemColumnConfig.SortState;
import forge.util.ItemPool;
import forge.util.ItemPoolSorter;
/**
* <p>
* ItemManagerModel class.
* </p>
*
* @param <T>
* the generic type
* @author Forge
* @version $Id: ItemManagerModel.java 19857 2013-02-24 08:49:52Z Max mtg $
*/
public final class ItemManagerModel<T extends InventoryItem> {
private static final int maxSortDepth = 3;
@@ -46,102 +37,71 @@ public final class ItemManagerModel<T extends InventoryItem> {
private boolean infiniteSupply;
private final CascadeManager cascadeManager = new CascadeManager();
/**
* Instantiates a new list view model
*
* @param ItemManager0
* @param genericType0
*/
public ItemManagerModel(final Class<T> genericType0) {
this.data = new ItemPool<T>(genericType0);
data = new ItemPool<T>(genericType0);
}
/**
* Clears all data in the model.
*/
public void clear() {
this.data.clear();
data.clear();
}
// same thing as above, it was copied to provide sorting (needed by table
// views in deck editors)
/** The items ordered. */
private final transient List<Entry<T, Integer>> itemsOrdered = new ArrayList<Map.Entry<T, Integer>>();
/** Whether list is in sync. */
protected transient boolean isListInSync = false;
public List<Entry<T, Integer>> getOrderedList() {
if (!this.isListInSync) {
this.rebuildOrderedList();
if (!isListInSync) {
rebuildOrderedList();
}
return this.itemsOrdered;
return itemsOrdered;
}
private void rebuildOrderedList() {
this.itemsOrdered.clear();
if (this.data != null) {
for (final Entry<T, Integer> e : this.data) {
this.itemsOrdered.add(e);
itemsOrdered.clear();
if (data != null) {
for (final Entry<T, Integer> e : data) {
itemsOrdered.add(e);
}
}
this.isListInSync = true;
isListInSync = true;
}
public int countDistinct() {
return this.data.countDistinct();
return data.countDistinct();
}
/**
* Gets all items in the model.
*
* @return ItemPoolView<T>
*/
public ItemPool<T> getItems() {
return this.data.getView();
return data.getView();
}
/**
* Removes a item from the model.
*
* @param item0 &emsp; {@link forge.Item} object
*/
public void removeItem(final T item0, final int qty) {
if (isInfinite()) { return; }
final boolean wasThere = this.data.count(item0) > 0;
final boolean wasThere = data.count(item0) > 0;
if (wasThere) {
this.data.remove(item0, qty);
data.remove(item0, qty);
isListInSync = false;
}
}
public void replaceAll(final T item0, final T replacement0) {
final int count = this.data.count(item0);
final int count = data.count(item0);
if (count > 0) {
this.data.removeAll(item0);
this.data.add(replacement0, count);
data.removeAll(item0);
data.add(replacement0, count);
isListInSync = false;
}
}
/**
* Adds a item to the model.
*
* @param item0 &emsp; {@link forge.Item} object.
*/
public void addItem(final T item0, final int qty) {
this.data.add(item0, qty);
data.add(item0, qty);
isListInSync = false;
}
/**
* Adds multiple copies of multiple items to the model.
*
* @param items0 &emsp; {@link java.lang.Iterable}<Entry<T, Integer>>
*/
public void addItems(final Iterable<Entry<T, Integer>> items0) {
this.data.addAll(items0);
data.addAll(items0);
isListInSync = false;
}
@@ -150,29 +110,31 @@ public final class ItemManagerModel<T extends InventoryItem> {
* items in the table have a limited number of copies.
*/
public void setInfinite(final boolean infinite) {
this.infiniteSupply = infinite;
infiniteSupply = infinite;
}
public boolean isInfinite() {
return infiniteSupply;
}
public boolean allowZero() {
return data.allowZero();
}
public void setAllowZero(boolean allowZero0) {
data.setAllowZero(allowZero0);
}
public CascadeManager getCascadeManager() {
return cascadeManager;
}
/**
* Resort.
*/
public void refreshSort() {
if (this.getOrderedList().isEmpty()) { return; }
if (getOrderedList().isEmpty()) { return; }
Collections.sort(this.getOrderedList(), new MyComparator());
Collections.sort(getOrderedList(), new MyComparator());
}
/**
* Manages sorting orders for multiple depths of sorting.
*/
//Manages sorting orders for multiple depths of sorting
public final class CascadeManager {
private final List<ItemColumn> colsToSort = new ArrayList<ItemColumn>(3);
private Sorter sorter = null;
@@ -181,20 +143,21 @@ public final class ItemManagerModel<T extends InventoryItem> {
// If column is first in the cascade, inverts direction of sort.
// Otherwise, sorts in ascending direction.
public void add(final ItemColumn col0, final boolean forSetup) {
this.sorter = null;
sorter = null;
if (forSetup) { //just add column unmodified if setting up sort columns
this.colsToSort.add(0, col0);
} else {
colsToSort.add(0, col0);
}
else {
if (colsToSort.size() > 0 && colsToSort.get(0).equals(col0)) { //if column already at top level, just invert
col0.getConfig().setSortPriority(1);
col0.getConfig().setSortState(col0.getConfig().getSortState() == SortState.ASC ? SortState.DESC : SortState.ASC);
}
else { //otherwise move column to top level and move others down
this.colsToSort.remove(col0);
colsToSort.remove(col0);
col0.getConfig().setSortPriority(1);
col0.getConfig().setSortState(col0.getConfig().getDefaultSortState());
this.colsToSort.add(0, col0);
colsToSort.add(0, col0);
}
//decrement sort priority on remaining columns
@@ -208,28 +171,28 @@ public final class ItemManagerModel<T extends InventoryItem> {
}
//unset and remove boundary columns.
if (this.colsToSort.size() > maxSortDepth) {
this.colsToSort.get(maxSortDepth).getConfig().setSortPriority(0);
this.colsToSort.remove(maxSortDepth);
if (colsToSort.size() > maxSortDepth) {
colsToSort.get(maxSortDepth).getConfig().setSortPriority(0);
colsToSort.remove(maxSortDepth);
}
}
public Sorter getSorter() {
if (this.sorter == null) {
this.sorter = createSorter();
if (sorter == null) {
sorter = createSorter();
}
return this.sorter;
return sorter;
}
public void reset() {
this.colsToSort.clear();
this.sorter = null;
colsToSort.clear();
sorter = null;
}
private Sorter createSorter() {
final List<ItemPoolSorter<InventoryItem>> oneColSorters = new ArrayList<ItemPoolSorter<InventoryItem>>(maxSortDepth);
for (final ItemColumn col : this.colsToSort) {
for (final ItemColumn col : colsToSort) {
oneColSorters.add(new ItemPoolSorter<InventoryItem>(
col.getFnSort(),
col.getConfig().getSortState().equals(SortState.ASC) ? true : false));
@@ -242,30 +205,18 @@ public final class ItemManagerModel<T extends InventoryItem> {
private final List<ItemPoolSorter<InventoryItem>> sorters;
private final int cntFields;
/**
*
* Sorter Constructor.
*
* @param sorters0
* a List<TableSorter<InventoryItem>>
*/
public Sorter(final List<ItemPoolSorter<InventoryItem>> sorters0) {
this.sorters = sorters0;
this.cntFields = sorters0.size();
sorters = sorters0;
cntFields = sorters0.size();
}
/*
* (non-Javadoc)
*
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
@Override
public final int compare(final Entry<InventoryItem, Integer> arg0, final Entry<InventoryItem, Integer> arg1) {
int lastCompare = 0;
int iField = -1;
while ((++iField < this.cntFields) && (lastCompare == 0)) { // reverse
while ((++iField < cntFields) && (lastCompare == 0)) { // reverse
// iteration
final ItemPoolSorter<InventoryItem> sorter = this.sorters.get(iField);
final ItemPoolSorter<InventoryItem> sorter = sorters.get(iField);
if (sorter == null) {
break;
}
@@ -277,13 +228,10 @@ public final class ItemManagerModel<T extends InventoryItem> {
}
private final class MyComparator implements Comparator<Entry<T, Integer>> {
/* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
@SuppressWarnings("unchecked")
@Override
public int compare(final Entry<T, Integer> o1, final Entry<T, Integer> o2) {
return cascadeManager.getSorter().compare((Entry<InventoryItem, Integer>)o1, (Entry<InventoryItem, Integer>)o2);
}
}
} // ItemManagerModel
}

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

@@ -130,7 +130,7 @@ public final class ConquestData {
if (collection == null) {
collection = new ConquestCollection();
}
manager.setPool(collection);
manager.setPool(collection, true);
}
public Iterable<PaperCard> getUnlockedCards() {
@@ -433,6 +433,7 @@ public final class ConquestData {
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