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

DeckEditor now shows planewalkers' initial loyalty properly (in the power column)

Browse Source
This commit is contained in:
Maxmtg
2013-02-20 14:25:30 +00:00
parent 811b1c3fb1
commit f1aba0b5ef
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/CardFace.java
View File

@@ -32,7 +32,7 @@ final class CardFace implements ICardCharacteristics {
private int iToughness = -1;
private String power = null;
private String toughness = null;
private int initialLoyalty = 0;
private int initialLoyalty = -1;
private final List<String> keywords = new ArrayList<String>();

25
src/main/java/forge/gui/deckeditor/tables/SColumnUtil.java
View File

@@ -324,19 +324,18 @@ public final class SColumnUtil {
return i instanceof CardPrinted ? ((CardPrinted) i).getRules().getColor() : ColorSet.getNullColor();
}
private static Integer toPower(final InventoryItem i) {
Integer result = -1;
private static int toPower(final InventoryItem i) {
int result = -1;
if (i instanceof CardPrinted) {
result = ((CardPrinted) i).getRules().getIntPower();
if (result == null) {
result = Integer.valueOf(((CardPrinted) i).getRules().getInitialLoyalty());
if (result == null) { result = -1; }
if (result == -1) {
result = ((CardPrinted) i).getRules().getInitialLoyalty();
}
}
return result;
}
private static Integer toToughness(final InventoryItem i) {
private static int toToughness(final InventoryItem i) {
return i instanceof CardPrinted ? ((CardPrinted) i).getRules().getIntToughness() : -1;
}
@@ -383,10 +382,6 @@ public final class SColumnUtil {
return ranking;
}
private static String toRankingStr(final InventoryItem i) {
return String.valueOf(toRankingCmp(i));
}
//==========
/** Lamda sort fnQtyCompare. */
@@ -476,7 +471,7 @@ public final class SColumnUtil {
private static final Function<Entry<InventoryItem, Integer>, Comparable<?>> FN_POWER_COMPARE = new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override
public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
return SColumnUtil.toPower(from.getKey());
return Integer.valueOf(SColumnUtil.toPower(from.getKey()));
}
};
@@ -484,7 +479,7 @@ public final class SColumnUtil {
private static final Function<Entry<InventoryItem, Integer>, Object> FN_POWER_GET = new Function<Entry<InventoryItem, Integer>, Object>() {
@Override
public Object apply(final Entry<InventoryItem, Integer> from) {
return SColumnUtil.toPower(from.getKey());
return Integer.valueOf(SColumnUtil.toPower(from.getKey()));
}
};
@@ -492,7 +487,7 @@ public final class SColumnUtil {
private static final Function<Entry<InventoryItem, Integer>, Comparable<?>> FN_TOUGHNESS_COMPARE = new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override
public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
return SColumnUtil.toToughness(from.getKey());
return Integer.valueOf(SColumnUtil.toToughness(from.getKey()));
}
};
@@ -500,7 +495,7 @@ public final class SColumnUtil {
private static final Function<Entry<InventoryItem, Integer>, Object> FN_TOUGHNESS_GET = new Function<Entry<InventoryItem, Integer>, Object>() {
@Override
public Object apply(final Entry<InventoryItem, Integer> from) {
return SColumnUtil.toToughness(from.getKey());
return Integer.valueOf(SColumnUtil.toToughness(from.getKey()));
}
};
@@ -580,7 +575,7 @@ public final class SColumnUtil {
private static final Function<Entry<InventoryItem, Integer>, Object> FN_RANKING_GET = new Function<Entry<InventoryItem, Integer>, Object>() {
@Override
public Object apply(final Entry<InventoryItem, Integer> from) {
return SColumnUtil.toRankingStr(from.getKey());
return String.valueOf(SColumnUtil.toRankingCmp(from.getKey()));
}
};
}