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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-12-01 15:55:11 +00:00
parent 93bdf289e4
commit fe88846564
8 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/GameActionUtil.java
View File

@@ -487,7 +487,7 @@ public final class GameActionUtil {
} }
else if (part instanceof CostSacrifice) { else if (part instanceof CostSacrifice) {
CostSacrifice sacCost = (CostSacrifice)part; CostSacrifice sacCost = (CostSacrifice) part;
Player p = Singletons.getControl().getPlayer(); Player p = Singletons.getControl().getPlayer();
String valid = sacCost.getType(); String valid = sacCost.getType();
int amount = Integer.parseInt(sacCost.getAmount()); int amount = Integer.parseInt(sacCost.getAmount());

2
src/main/java/forge/card/abilityfactory/effects/DamagePreventEffect.java
View File

@@ -34,7 +34,7 @@ public class DamagePreventEffect extends SpellEffect {
} else { } else {
sb.append(tgtC); sb.append(tgtC);
} }
} else if (o instanceof Player){ } else if (o instanceof Player) {
sb.append(o.toString()); sb.append(o.toString());
} }
} }

2
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -2734,7 +2734,7 @@ public class CardFactoryUtil {
if (sq[0].equals("Random")) { if (sq[0].equals("Random")) {
int min = Integer.parseInt(sq[1]); int min = Integer.parseInt(sq[1]);
int max = Integer.parseInt(sq[2]); int max = Integer.parseInt(sq[2]);
return forge.util.MyRandom.getRandom().nextInt(max)+min; return forge.util.MyRandom.getRandom().nextInt(max) + min;
} }
n = someCards.size(); n = someCards.size();

3
src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java
View File

@@ -90,8 +90,9 @@ public enum CSubmenuArchenemy implements ICDoc {
starter.addPlayer(lobby.findLocalPlayer(PlayerType.HUMAN), humanStart); starter.addPlayer(lobby.findLocalPlayer(PlayerType.HUMAN), humanStart);
humanStart.setStartingLife(10 + 10 * numFields); // will have 40 life to play against 3 opponents humanStart.setStartingLife(10 + 10 * numFields); // will have 40 life to play against 3 opponents
for( int i = 0; i < numFields; i++ ) for (int i = 0; i < numFields; i++) {
starter.addPlayer(lobby.findLocalPlayer(PlayerType.COMPUTER), DeckgenUtil.getRandomColorDeck(PlayerType.COMPUTER)); starter.addPlayer(lobby.findLocalPlayer(PlayerType.COMPUTER), DeckgenUtil.getRandomColorDeck(PlayerType.COMPUTER));
}
MatchController mc = Singletons.getModel().getMatch(); MatchController mc = Singletons.getModel().getMatch();
mc.initMatch(GameType.Constructed, starter.getPlayerMap()); mc.initMatch(GameType.Constructed, starter.getPlayerMap());

15
src/main/java/forge/gui/home/variant/CSubmenuVanguard.java
View File

@@ -139,15 +139,14 @@ public enum CSubmenuVanguard implements ICDoc {
boolean useDefault = VSubmenuVanguard.SINGLETON_INSTANCE.getCbDefaultAvatars().isSelected(); boolean useDefault = VSubmenuVanguard.SINGLETON_INSTANCE.getCbDefaultAvatars().isSelected();
useDefault &= playerDecks.get(i).getAvatar() != null; useDefault &= playerDecks.get(i).getAvatar() != null;
if(useDefault) if (useDefault) {
{
avatar = playerDecks.get(i).getAvatar(); avatar = playerDecks.get(i).getAvatar();
defaultAvatarInfo.append("Player " + (i+1) + ": "); defaultAvatarInfo.append("Player " + (i + 1) + ": ");
defaultAvatarInfo.append(avatar.getName() + nl); defaultAvatarInfo.append(avatar.getName() + nl);
usedDefaults = true; usedDefaults = true;
} } else {
else
{
if (obj instanceof String) { if (obj instanceof String) {
//Random is the only string in the list so grab a random avatar. //Random is the only string in the list so grab a random avatar.
if (i == 0) { if (i == 0) {
@@ -169,8 +168,8 @@ public enum CSubmenuVanguard implements ICDoc {
playerAvatars.add(avatar); playerAvatars.add(avatar);
} }
if(usedDefaults) if (usedDefaults) {
{
GameActionUtil.showInfoDialg(defaultAvatarInfo.toString()); GameActionUtil.showInfoDialg(defaultAvatarInfo.toString());
} }

14
src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
View File

@@ -132,9 +132,9 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
int index = avatarLists.indexOf(arg0.getSource()); int index = avatarLists.indexOf(arg0.getSource());
Object obj = avatarLists.get(index).getSelectedValue(); Object obj = avatarLists.get(index).getSelectedValue();
if(!(obj instanceof String)) if (!(obj instanceof String)) {
{
cdpAvatarDetails.get(index).setCard(((CardPrinted)obj).toForgeCard()); cdpAvatarDetails.get(index).setCard(((CardPrinted) obj).toForgeCard());
} }
} }
@@ -153,7 +153,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
FPanel radioPane = new FPanel(); FPanel radioPane = new FPanel();
radioPane.setLayout(new MigLayout("wrap 1")); radioPane.setLayout(new MigLayout("wrap 1"));
radioPane.setOpaque(false); radioPane.setOpaque(false);
radioPane.add(new FLabel.Builder().text("Set number of opponents").build(),"wrap"); radioPane.add(new FLabel.Builder().text("Set number of opponents").build(), "wrap");
for (int i = 1; i < 8; i++) { for (int i = 1; i < 8; i++) {
tempRadio = new FRadioButton(); tempRadio = new FRadioButton();
tempRadio.setText(String.valueOf(i)); tempRadio.setText(String.valueOf(i));
@@ -163,7 +163,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
tempRadio.addItemListener(iListener); tempRadio.addItemListener(iListener);
radioPane.add(tempRadio, "wrap,align 50% 50%"); radioPane.add(tempRadio, "wrap,align 50% 50%");
} }
settingsPanel.add(radioPane,"span 1 2"); settingsPanel.add(radioPane, "span 1 2");
settingsPanel.add(cbDefaultAvatars); settingsPanel.add(cbDefaultAvatars);
tabPane.add("Settings", settingsPanel); tabPane.add("Settings", settingsPanel);
@@ -187,7 +187,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
tempPanel.add(tempChooser, "span 1 2, w 44%!, gap 0 0 20px 20px, growy, pushy, wrap"); tempPanel.add(tempChooser, "span 1 2, w 44%!, gap 0 0 20px 20px, growy, pushy, wrap");
tempPanel.add(new FLabel.Builder().text("Select Avatar:").build(),"flowy"); tempPanel.add(new FLabel.Builder().text("Select Avatar:").build(), "flowy");
JScrollPane scrAvatar = new FScrollPane(tempList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); JScrollPane scrAvatar = new FScrollPane(tempList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
tempPanel.add(scrAvatar, "h 90%!,wrap"); tempPanel.add(scrAvatar, "h 90%!,wrap");
@@ -195,7 +195,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
tempDetail = new CardDetailPanel(null); tempDetail = new CardDetailPanel(null);
cdpAvatarDetails.add(tempDetail); cdpAvatarDetails.add(tempDetail);
tempPanel.add(tempDetail,"span 1 2,growy,pushy,growx,pushx"); tempPanel.add(tempDetail, "span 1 2, growy, pushy, growx, pushx");
playerPanels.add(tempPanel); playerPanels.add(tempPanel);
if (i == 0) { if (i == 0) {