From 90b531bd8d78b5172981d38bcc45202f033ed180 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 16:01:47 +0000 Subject: [PATCH] Sure enough, the code didn't work with brand new cards lacking SetInfo. --- src/forge/GameAction.java | 20 ++++++++++++-------- src/forge/Gui_BoosterDraft.java | 11 ++++++----- src/forge/Gui_CardShop.java | 22 ++++++++++++---------- src/forge/Gui_DeckEditor.java | 24 +++++++++++++----------- src/forge/Gui_Quest_DeckEditor.java | 22 ++++++++++++---------- 5 files changed, 55 insertions(+), 44 deletions(-) diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index 315b8243ef7..865621d8af4 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -2301,11 +2301,13 @@ public class GameAction { if ((card.getSets().size() > 0) && card.getCurSetCode().equals("")) card.setRandomSetCode(); - int n = SetInfoUtil.getSetInfo_Code(card.getSets(), card.getCurSetCode()).PicCount; - if (n > 1) - card.setRandomPicture(generator.nextInt(n)); + if (!card.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(card.getSets(), card.getCurSetCode()).PicCount; + if (n > 1) + card.setRandomPicture(generator.nextInt(n)); - card.setImageFilename(CardUtil.buildFilename(card)); + card.setImageFilename(CardUtil.buildFilename(card)); + } //System.out.println("human random number:" + card.getRandomPicture()); //} @@ -2335,11 +2337,13 @@ public class GameAction { if ((card.getSets().size() > 0) && card.getCurSetCode().equals("")) card.setRandomSetCode(); - int n = SetInfoUtil.getSetInfo_Code(card.getSets(), card.getCurSetCode()).PicCount; - if (n > 1) - card.setRandomPicture(generator.nextInt(n)); + if (!card.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(card.getSets(), card.getCurSetCode()).PicCount; + if (n > 1) + card.setRandomPicture(generator.nextInt(n)); - card.setImageFilename(CardUtil.buildFilename(card)); + card.setImageFilename(CardUtil.buildFilename(card)); + } AllZone.Computer_Library.add(card); diff --git a/src/forge/Gui_BoosterDraft.java b/src/forge/Gui_BoosterDraft.java index 7f6c9849281..ae16dd6f6ce 100644 --- a/src/forge/Gui_BoosterDraft.java +++ b/src/forge/Gui_BoosterDraft.java @@ -518,12 +518,13 @@ public class Gui_BoosterDraft extends JFrame implements CardContainer, NewConsta if (c.getCurSetCode().equals("")) c.setCurSetCode(c.getMostRecentSet()); - int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; - if (n > 1) - c.setRandomPicture(r.nextInt(n)); - - c.setImageFilename(CardUtil.buildFilename(c)); + if (!c.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; + if (n > 1) + c.setRandomPicture(r.nextInt(n)); + c.setImageFilename(CardUtil.buildFilename(c)); + } allCardModel.addCard(c); } diff --git a/src/forge/Gui_CardShop.java b/src/forge/Gui_CardShop.java index 5b85575748e..eee00ccbf00 100644 --- a/src/forge/Gui_CardShop.java +++ b/src/forge/Gui_CardShop.java @@ -129,12 +129,13 @@ public class Gui_CardShop extends JFrame implements CardContainer, DeckDisplay, if (c.getCurSetCode().equals("")) c.setCurSetCode(c.getMostRecentSet()); - int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; - if (n > 1) - c.setRandomPicture(r.nextInt(n)); - - c.setImageFilename(CardUtil.buildFilename(c)); + if (!c.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; + if (n > 1) + c.setRandomPicture(r.nextInt(n)); + c.setImageFilename(CardUtil.buildFilename(c)); + } topModel.addCard(c); @@ -158,12 +159,13 @@ public class Gui_CardShop extends JFrame implements CardContainer, DeckDisplay, if (c.getCurSetCode().equals("")) c.setCurSetCode(c.getMostRecentSet()); - int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; - if (n > 1) - c.setRandomPicture(r.nextInt(n)); + if (!c.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; + if (n > 1) + c.setRandomPicture(r.nextInt(n)); - c.setImageFilename(CardUtil.buildFilename(c)); - + c.setImageFilename(CardUtil.buildFilename(c)); + } bottomModel.addCard(c); }// for diff --git a/src/forge/Gui_DeckEditor.java b/src/forge/Gui_DeckEditor.java index 8ee1b997a2c..a60d6f99480 100644 --- a/src/forge/Gui_DeckEditor.java +++ b/src/forge/Gui_DeckEditor.java @@ -195,12 +195,13 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay if (c.getCurSetCode().equals("")) c.setCurSetCode(c.getMostRecentSet()); - int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; - if (n > 1) - c.setRandomPicture(r.nextInt(n)); - - c.setImageFilename(CardUtil.buildFilename(c)); + if (!c.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; + if (n > 1) + c.setRandomPicture(r.nextInt(n)); + c.setImageFilename(CardUtil.buildFilename(c)); + } if(!filteredOut) { topModel.addCard(c); @@ -226,13 +227,14 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay if (c.getCurSetCode().equals("")) c.setCurSetCode(c.getMostRecentSet()); - - int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; - if (n > 1) - c.setRandomPicture(r.nextInt(n)); - c.setImageFilename(CardUtil.buildFilename(c)); - + if (!c.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; + if (n > 1) + c.setRandomPicture(r.nextInt(n)); + + c.setImageFilename(CardUtil.buildFilename(c)); + } bottomModel.addCard(c); }// for diff --git a/src/forge/Gui_Quest_DeckEditor.java b/src/forge/Gui_Quest_DeckEditor.java index d8079b53622..f039c02e01d 100644 --- a/src/forge/Gui_Quest_DeckEditor.java +++ b/src/forge/Gui_Quest_DeckEditor.java @@ -154,12 +154,13 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD if (c.getCurSetCode().equals("")) c.setCurSetCode(c.getMostRecentSet()); - int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; - if (n > 1) - c.setRandomPicture(r.nextInt(n)); - - c.setImageFilename(CardUtil.buildFilename(c)); + if (!c.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; + if (n > 1) + c.setRandomPicture(r.nextInt(n)); + c.setImageFilename(CardUtil.buildFilename(c)); + } topModel.addCard(c); @@ -184,12 +185,13 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD if (c.getCurSetCode().equals("")) c.setCurSetCode(c.getMostRecentSet()); - int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; - if (n > 1) - c.setRandomPicture(r.nextInt(n)); + if (!c.getCurSetCode().equals("")) { + int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; + if (n > 1) + c.setRandomPicture(r.nextInt(n)); - c.setImageFilename(CardUtil.buildFilename(c)); - + c.setImageFilename(CardUtil.buildFilename(c)); + } bottomModel.addCard(c); }//for