- Foil cards will now be drawn with black border no matter what edition they are from (this currently has the side effect of drawing early core set foils with a black border around a thin white border already present in the picture - will probably be remedied later in one way or another).

- Updated the loading progress bar to account for the extra foil sprite sheet.
This commit is contained in:
Agetian
2013-06-30 16:50:43 +00:00
parent 00d76439b2
commit fdebee9011
2 changed files with 2 additions and 2 deletions

View File

@@ -530,7 +530,7 @@ public enum FSkin {
// Everything OK? // Everything OK?
final FProgressBar barProgress = FView.SINGLETON_INSTANCE.getSplash().getProgressBar(); final FProgressBar barProgress = FView.SINGLETON_INSTANCE.getSplash().getProgressBar();
setProgessBarMessage("Processing image sprites: ", 4); setProgessBarMessage("Processing image sprites: ", 5);
// Grab and test various sprite files. // Grab and test various sprite files.

View File

@@ -342,7 +342,7 @@ public class CardPanel extends JPanel implements CardContainer {
// White border if card is known to have it. // White border if card is known to have it.
if (this.getGameCard() != null && !this.getGameCard().isFaceDown()) { if (this.getGameCard() != null && !this.getGameCard().isFaceDown()) {
CardEdition ed = Singletons.getModel().getEditions().get(this.getGameCard().getCurSetCode()); CardEdition ed = Singletons.getModel().getEditions().get(this.getGameCard().getCurSetCode());
if (ed != null && ed.isWhiteBorder()) { if (ed != null && ed.isWhiteBorder() && this.getGameCard().getFoil() == 0) {
g2d.setColor(Color.white); g2d.setColor(Color.white);
int ins = 1; int ins = 1;
g2d.fillRoundRect(this.cardXOffset + ins, this.cardYOffset + ins, this.cardWidth - ins*2, this.cardHeight - ins*2, cornerSize-ins, cornerSize-ins); g2d.fillRoundRect(this.cardXOffset + ins, this.cardYOffset + ins, this.cardWidth - ins*2, this.cardHeight - ins*2, cornerSize-ins, cornerSize-ins);