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

Sure enough, the code didn't work with brand new cards lacking SetInfo.

Browse Source
This commit is contained in:
jendave
2011-08-06 16:01:47 +00:00
parent 73c98b0e33
commit 90b531bd8d
5 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/forge/GameAction.java
View File

@@ -2301,11 +2301,13 @@ public class GameAction {
if ((card.getSets().size() > 0) && card.getCurSetCode().equals("")) if ((card.getSets().size() > 0) && card.getCurSetCode().equals(""))
card.setRandomSetCode(); card.setRandomSetCode();
int n = SetInfoUtil.getSetInfo_Code(card.getSets(), card.getCurSetCode()).PicCount; if (!card.getCurSetCode().equals("")) {
if (n > 1) int n = SetInfoUtil.getSetInfo_Code(card.getSets(), card.getCurSetCode()).PicCount;
card.setRandomPicture(generator.nextInt(n)); 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()); //System.out.println("human random number:" + card.getRandomPicture());
//} //}
@@ -2335,11 +2337,13 @@ public class GameAction {
if ((card.getSets().size() > 0) && card.getCurSetCode().equals("")) if ((card.getSets().size() > 0) && card.getCurSetCode().equals(""))
card.setRandomSetCode(); card.setRandomSetCode();
int n = SetInfoUtil.getSetInfo_Code(card.getSets(), card.getCurSetCode()).PicCount; if (!card.getCurSetCode().equals("")) {
if (n > 1) int n = SetInfoUtil.getSetInfo_Code(card.getSets(), card.getCurSetCode()).PicCount;
card.setRandomPicture(generator.nextInt(n)); if (n > 1)
card.setRandomPicture(generator.nextInt(n));
card.setImageFilename(CardUtil.buildFilename(card)); card.setImageFilename(CardUtil.buildFilename(card));
}
AllZone.Computer_Library.add(card); AllZone.Computer_Library.add(card);

11
src/forge/Gui_BoosterDraft.java
View File

@@ -518,12 +518,13 @@ public class Gui_BoosterDraft extends JFrame implements CardContainer, NewConsta
if (c.getCurSetCode().equals("")) if (c.getCurSetCode().equals(""))
c.setCurSetCode(c.getMostRecentSet()); c.setCurSetCode(c.getMostRecentSet());
int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; if (!c.getCurSetCode().equals("")) {
if (n > 1) int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount;
c.setRandomPicture(r.nextInt(n)); if (n > 1)
c.setRandomPicture(r.nextInt(n));
c.setImageFilename(CardUtil.buildFilename(c));
c.setImageFilename(CardUtil.buildFilename(c));
}
allCardModel.addCard(c); allCardModel.addCard(c);
} }

22
src/forge/Gui_CardShop.java
View File

@@ -129,12 +129,13 @@ public class Gui_CardShop extends JFrame implements CardContainer, DeckDisplay,
if (c.getCurSetCode().equals("")) if (c.getCurSetCode().equals(""))
c.setCurSetCode(c.getMostRecentSet()); c.setCurSetCode(c.getMostRecentSet());
int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; if (!c.getCurSetCode().equals("")) {
if (n > 1) int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount;
c.setRandomPicture(r.nextInt(n)); if (n > 1)
c.setRandomPicture(r.nextInt(n));
c.setImageFilename(CardUtil.buildFilename(c));
c.setImageFilename(CardUtil.buildFilename(c));
}
topModel.addCard(c); topModel.addCard(c);
@@ -158,12 +159,13 @@ public class Gui_CardShop extends JFrame implements CardContainer, DeckDisplay,
if (c.getCurSetCode().equals("")) if (c.getCurSetCode().equals(""))
c.setCurSetCode(c.getMostRecentSet()); c.setCurSetCode(c.getMostRecentSet());
int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; if (!c.getCurSetCode().equals("")) {
if (n > 1) int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount;
c.setRandomPicture(r.nextInt(n)); if (n > 1)
c.setRandomPicture(r.nextInt(n));
c.setImageFilename(CardUtil.buildFilename(c)); c.setImageFilename(CardUtil.buildFilename(c));
}
bottomModel.addCard(c); bottomModel.addCard(c);
}// for }// for

24
src/forge/Gui_DeckEditor.java
View File

@@ -195,12 +195,13 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
if (c.getCurSetCode().equals("")) if (c.getCurSetCode().equals(""))
c.setCurSetCode(c.getMostRecentSet()); c.setCurSetCode(c.getMostRecentSet());
int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; if (!c.getCurSetCode().equals("")) {
if (n > 1) int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount;
c.setRandomPicture(r.nextInt(n)); if (n > 1)
c.setRandomPicture(r.nextInt(n));
c.setImageFilename(CardUtil.buildFilename(c));
c.setImageFilename(CardUtil.buildFilename(c));
}
if(!filteredOut) { if(!filteredOut) {
topModel.addCard(c); topModel.addCard(c);
@@ -226,13 +227,14 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
if (c.getCurSetCode().equals("")) if (c.getCurSetCode().equals(""))
c.setCurSetCode(c.getMostRecentSet()); 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); bottomModel.addCard(c);
}// for }// for

22
src/forge/Gui_Quest_DeckEditor.java
View File

@@ -154,12 +154,13 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD
if (c.getCurSetCode().equals("")) if (c.getCurSetCode().equals(""))
c.setCurSetCode(c.getMostRecentSet()); c.setCurSetCode(c.getMostRecentSet());
int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; if (!c.getCurSetCode().equals("")) {
if (n > 1) int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount;
c.setRandomPicture(r.nextInt(n)); if (n > 1)
c.setRandomPicture(r.nextInt(n));
c.setImageFilename(CardUtil.buildFilename(c));
c.setImageFilename(CardUtil.buildFilename(c));
}
topModel.addCard(c); topModel.addCard(c);
@@ -184,12 +185,13 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD
if (c.getCurSetCode().equals("")) if (c.getCurSetCode().equals(""))
c.setCurSetCode(c.getMostRecentSet()); c.setCurSetCode(c.getMostRecentSet());
int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount; if (!c.getCurSetCode().equals("")) {
if (n > 1) int n = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode()).PicCount;
c.setRandomPicture(r.nextInt(n)); if (n > 1)
c.setRandomPicture(r.nextInt(n));
c.setImageFilename(CardUtil.buildFilename(c)); c.setImageFilename(CardUtil.buildFilename(c));
}
bottomModel.addCard(c); bottomModel.addCard(c);
}//for }//for