FatPack generation

rem warnings
This commit is contained in:
Maxmtg
2013-04-26 03:57:08 +00:00
parent 6a51b8994b
commit 5019f4455b
5 changed files with 12 additions and 14 deletions

View File

@@ -58,11 +58,7 @@ public class BoosterTemplate extends SealedProductTemplate {
if (0 < lastCommaIdx) {
s.replace(lastCommaIdx+1, lastCommaIdx+1, " and");
}
if (0 < foilRate) {
s.append(", with a foil rate of 1 in ").append(foilRate);
}
return s.toString();
}

View File

@@ -69,16 +69,19 @@ public class FatPackTemplate extends SealedProductTemplate {
}
StringBuilder s = new StringBuilder();
if (0 < cntBoosters) {
s.append(cntBoosters).append(" booster packs, ");
}
for(Pair<String, Integer> p : slots) {
s.append(p.getRight()).append(" ").append(p.getLeft()).append(", ");
}
// trim the last comma and space
s.replace(s.length() - 2, s.length(), "");
if( s.length() > 0 )
s.replace(s.length() - 2, s.length(), "");
if (0 < cntBoosters) {
if( s.length() > 0 )
s.append(" and ");
s.append(cntBoosters).append(" booster packs ");
}
return s.toString();
}
}

View File

@@ -44,7 +44,7 @@ public enum FNetOverlay {
private final FLabel cmdSend = new FLabel.ButtonBuilder().text("Send").build();
private boolean minimized = false;
//private boolean minimized = false;
private int height = 120;
private int width = 400;
@@ -62,7 +62,7 @@ public enum FNetOverlay {
}
};
private final int minimizedHeight = 30;
//private final int minimizedHeight = 30;
/**
* Semi-transparent overlay panel. Should be used with layered panes.

View File

@@ -60,7 +60,7 @@ public class FatPack extends OpenablePack {
for (int i = 0; i < fpData.getCntBoosters(); i++) {
result.addAll(super.generate());
}
result.addAll(BoosterGenerator.getBoosterPack(contents));
result.addAll(BoosterGenerator.getBoosterPack(fpData));
return result;
}

View File

@@ -1,6 +1,5 @@
package forge.item;
import java.io.File;
import java.util.List;
import java.util.Map.Entry;
import java.util.ArrayList;