neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No Limits implementiert und getestet, geht

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@413 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-06-11 04:09:29 +02:00
parent 8b1e09f025
commit 2c4d2ba28b
4 changed files with 161 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/jrummikub/control/SettingsControl.java
View file

@ -44,8 +44,8 @@ public class SettingsControl {
}
/**
* the start game event is emitted when the user wants to start a game and the
* settings made are valid
* the start game event is emitted when the user wants to start a game and
* the settings made are valid
*
* @return the event
*/
@ -78,7 +78,8 @@ public class SettingsControl {
private void addOptionListeners1() {
connections.add(view.getSettingsPanel()
.getChangeInitialMeldThresholdEvent().add(new IListener1<Integer>() {
.getChangeInitialMeldThresholdEvent()
.add(new IListener1<Integer>() {
@Override
public void handle(Integer value) {
settings.setInitialMeldThreshold(value);
@ -103,7 +104,8 @@ public class SettingsControl {
update();
}
}));
connections.add(view.getSettingsPanel().getChangeNumberOfStonesDealtEvent()
connections.add(view.getSettingsPanel()
.getChangeNumberOfStonesDealtEvent()
.add(new IListener1<Integer>() {
@Override
public void handle(Integer value) {
@ -138,6 +140,15 @@ public class SettingsControl {
update();
}
}));
connections.add(view.getSettingsPanel().getChangeNoLimitsEvent()
.add(new IListener1<Boolean>() {
@Override
public void handle(Boolean value) {
settings.setNoLimits(value);
update();
}
}));
}
private void addPlayerSettingsListeners() {
@ -210,7 +221,8 @@ public class SettingsControl {
break;
}
settings.getPlayerList().add(new PlayerSettings("Spieler " + num, color));
settings.getPlayerList().add(
new PlayerSettings("Spieler " + num, color));
update();
}
@ -251,7 +263,8 @@ public class SettingsControl {
protected void update() {
view.getSettingsPanel().enableRemovePlayerButtons(
settings.getPlayerList().size() > 2);
view.getSettingsPanel().enableAddPlayerButton(
view.getSettingsPanel()
.enableAddPlayerButton(
settings.getPlayerList().size() < ISettingsPanel.PLAYER_COLORS.length);
checkSettings();
@ -273,7 +286,8 @@ public class SettingsControl {
for (int j = i + 1; j < settings.getPlayerList().size(); ++j) {
if (settings.getPlayerList().get(j).getName().equals(name)) {
view.getSettingsPanel().setError(
view.getSettingsPanel()
.setError(
ISettingsPanel.SettingsError.DUPLICATE_PLAYER_NAME_ERROR);
view.getSettingsPanel().enableStartGameButton(false);
return false;
@ -283,7 +297,8 @@ public class SettingsControl {
int totalStonesDealt = settings.getNumberOfStonesDealt()
* settings.getPlayerList().size();
int totalStones = settings.getHighestValue() * settings.getStoneSetNumber()
int totalStones = settings.getHighestValue()
* settings.getStoneSetNumber()
* settings.getStoneColors().size() + settings.getJokerNumber();
if (totalStones <= totalStonesDealt) {

40
src/jrummikub/model/StoneSet.java
View file

@ -85,17 +85,20 @@ public class StoneSet implements Iterable<Stone>, Sizeable, Serializable {
if (nonJoker == -1) {
if (stones.size() > settings.getHighestValue()
&& stones.size() > settings.getStoneColors().size()) {
&& stones.size() > settings.getStoneColors().size()
&& !settings.isNoLimits()) {
return new Pair<Type, Integer>(INVALID, 0);
} else if (stones.size() > settings.getStoneColors().size()) {
return new Pair<Type, Integer>(
RUN,
(settings.getHighestValue() * (settings
.getHighestValue() + 1))
/ 2
- (stones.size() - settings.getHighestValue())
* (stones.size() - settings.getHighestValue() - 1)
/ 2);
int value = 0;
int stoneValue = settings.getHighestValue();
for (int i = 0; i < stones.size(); i++) {
value += stoneValue;
stoneValue--;
if (stoneValue == 0) {
stoneValue = settings.getHighestValue();
}
}
return new Pair<Type, Integer>(RUN, value);
} else {
return new Pair<Type, Integer>(GROUP, stones.size()
* settings.getHighestValue());
@ -126,24 +129,33 @@ public class StoneSet implements Iterable<Stone>, Sizeable, Serializable {
int startValue = stones.get(referencePosition).getValue()
- referencePosition;
int endValue = startValue + stones.size() - 1;
if (!settings.isNoLimits()) {
if (startValue < 1 || endValue > settings.getHighestValue()) {
return 0;
}
}
int value = 0;
for (int i = 0; i < stones.size(); i++) {
int expectedValue = i + startValue;
while (expectedValue < 1) {
expectedValue += settings.getHighestValue();
}
while (expectedValue > settings.getHighestValue()) {
expectedValue -= settings.getHighestValue();
}
value += expectedValue;
if (stones.get(i).isJoker()) {
continue;
}
if (stones.get(i).getColor() != runColor) {
return 0;
}
if (stones.get(i).getValue() != i + startValue) {
if (stones.get(i).getValue() != expectedValue) {
return 0;
}
}
int value = 0;
for (int i = 0; i < stones.size(); i++) {
value += startValue + i;
}
return value;
}

12
src/jrummikub/view/ISettingsPanel.java
View file

@ -6,6 +6,7 @@ import java.util.Set;
import jrummikub.control.turn.TurnControlFactory;
import jrummikub.model.GameSettings;
import jrummikub.model.StoneColor;
import jrummikub.util.Event1;
import jrummikub.util.IEvent;
import jrummikub.util.IEvent1;
import jrummikub.util.IEvent2;
@ -36,8 +37,8 @@ public interface ISettingsPanel {
};
/**
* The add player event is emitted when the user wants to add a player to the
* player list
* The add player event is emitted when the user wants to add a player to
* the player list
*
* @return the event
*/
@ -84,8 +85,8 @@ public interface ISettingsPanel {
public IEvent1<Integer> getChangeInitialMeldThresholdEvent();
/**
* The change StoneSet number event is emitted when the user wants to use more
* or less than 2 StoneSets per color
* The change StoneSet number event is emitted when the user wants to use
* more or less than 2 StoneSets per color
*
* @return number of SoneSets
*/
@ -172,6 +173,8 @@ public interface ISettingsPanel {
public IEvent1<Integer> getChangeTimeEvent();
public IEvent1<Boolean> getChangeNoLimitsEvent();
/**
* Specifies the different kinds of settings errors that can be displayed
*/
@ -193,4 +196,5 @@ public interface ISettingsPanel {
/** Only computer players added */
COMPUTER_PLAYERS_ONLY_WARNING
}
}

87
src/jrummikub/view/impl/SettingsPanel.java
View file

@ -26,6 +26,7 @@ import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
@ -67,6 +68,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
private JButton addPlayerButton;
private JLabel errorMessageLabel;
private JButton startButton;
private JCheckBox noLimitsBox;
private boolean removeButtonsEnabled = true;
private List<PlayerSettingsPanel> playerSettingsPanels = new ArrayList<PlayerSettingsPanel>();
@ -96,6 +98,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
private Event1<Integer> changeHighestValueEvent = new Event1<Integer>();
private Event1<Set<StoneColor>> changeStoneColorsEvent = new Event1<Set<StoneColor>>();
private Event1<Integer> changeTimeEvent = new Event1<Integer>();
private Event1<Boolean> changeNoLimitsEvent = new Event1<Boolean>();
@Override
public IEvent getStartGameEvent() {
@ -161,10 +164,15 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
}
@Override
public Event1<Integer> getChangeTimeEvent() {
public IEvent1<Integer> getChangeTimeEvent() {
return changeTimeEvent;
}
@Override
public IEvent1<Boolean> getChangeNoLimitsEvent() {
return changeNoLimitsEvent;
}
@Override
public IEvent1<Set<StoneColor>> getChangeStoneColorsEvent() {
return changeStoneColorsEvent;
@ -228,7 +236,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
@Override
public void setGameSettings(GameSettings gameSettings) {
while (playerSettingsPanels.size() > gameSettings.getPlayerList().size()) {
while (playerSettingsPanels.size() > gameSettings.getPlayerList()
.size()) {
removePlayerSettingsPanel();
}
@ -236,13 +245,15 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
updatePlayerSettingsPanel(i, gameSettings.getPlayerList().get(i));
}
initialMeldThresholdSpinner
.setValue(gameSettings.getInitialMeldThreshold());
initialMeldThresholdSpinner.setValue(gameSettings
.getInitialMeldThreshold());
stoneSetNumberSpinner.setValue(gameSettings.getStoneSetNumber());
highestValueSpinner.setValue(gameSettings.getHighestValue());
numberOfStonesDealtSpinner.setValue(gameSettings.getNumberOfStonesDealt());
numberOfStonesDealtSpinner.setValue(gameSettings
.getNumberOfStonesDealt());
jokerNumberSpinner.setValue(gameSettings.getJokerNumber());
timeSpinner.setValue(gameSettings.getTime());
noLimitsBox.setSelected(gameSettings.isNoLimits());
for (StoneColor color : StoneColor.values()) {
colorButtons.get(color).getModel()
@ -268,8 +279,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
}
private void removePlayerSettingsPanel() {
PlayerSettingsPanel p = playerSettingsPanels.remove(playerSettingsPanels
.size() - 1);
PlayerSettingsPanel p = playerSettingsPanels
.remove(playerSettingsPanels.size() - 1);
playerSettingsViewport.remove(p);
}
@ -291,7 +302,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
playerSettingsViewport.add(addPlayerPanel);
addPlayerButton = new JButton("+");
addPlayerButton.setFont(addPlayerButton.getFont().deriveFont(Font.BOLD));
addPlayerButton
.setFont(addPlayerButton.getFont().deriveFont(Font.BOLD));
addPlayerButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@ -328,17 +340,21 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
changeNumberOfStonesDealtEvent);
makeOptionLabel(4, "Jokeranzahl:");
jokerNumberSpinner = makeOptionSpinner(4, 1, 999, 1, changeJokerNumberEvent);
jokerNumberSpinner = makeOptionSpinner(4, 1, 999, 1,
changeJokerNumberEvent);
makeOptionLabel(5, "Zeit für Spielzug:");
timeSpinner = makeOptionSpinner(5, 1, 999, 1, changeTimeEvent);
makeOptionLabel(6, "Steinfarben:");
createColorSelectionPanel(6);
makeOptionLabel(6, "No Limits:");
noLimitsBox = makeOptionCheckbox(6, changeNoLimitsEvent);
makeOptionLabel(7, "Steinfarben:");
createColorSelectionPanel(7);
GridBagConstraints c = new GridBagConstraints();
c.gridx = 1;
c.gridy = 7;
c.gridy = 8;
c.fill = GridBagConstraints.BOTH;
c.weightx = 1;
c.weighty = 1;
@ -388,6 +404,24 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
changeStoneColorsEvent.emit(colors);
}
private JCheckBox makeOptionCheckbox(int row,
final Event1<Boolean> targetEvent) {
GridBagConstraints c = new GridBagConstraints();
c.anchor = GridBagConstraints.WEST;
c.gridx = 1;
c.gridy = row;
c.insets = new Insets(2, 2, 2, 2);
final JCheckBox box = new JCheckBox();
box.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
targetEvent.emit(box.isSelected());
}
});
optionsPanel.add(box, c);
return box;
}
private JSpinner makeOptionSpinner(int row, int min, int max, int step,
final Event1<Integer> targetEvent) {
GridBagConstraints c = new GridBagConstraints();
@ -397,8 +431,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
c.insets = new Insets(2, 2, 2, 2);
final JSpinner spinner = new JSpinner();
spinner.setModel(new SpinnerNumberModel(min, min, max, step));
spinner
.setPreferredSize(new Dimension(60, spinner.getMinimumSize().height));
spinner.setPreferredSize(new Dimension(60,
spinner.getMinimumSize().height));
spinner.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
@ -458,8 +492,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
c.gridwidth = GridBagConstraints.REMAINDER;
addButton("Netzwerkspiel...", networkGameEvent, c);
setBorder(new CompoundBorder(new LineBorder(Color.BLACK), new EmptyBorder(
10, 10, 10, 10)));
setBorder(new CompoundBorder(new LineBorder(Color.BLACK),
new EmptyBorder(10, 10, 10, 10)));
}
void resetTabbedPane() {
@ -496,8 +530,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
if (index != playerType.getSelectedIndex()) {
playerType.setSelectedIndex(index);
}
colorButton
.setIcon(ImageUtil.createColorIcon(settings.getColor(), 16, 2));
colorButton.setIcon(ImageUtil.createColorIcon(settings.getColor(),
16, 2));
}
public void enableRemoveButton(boolean enable) {
@ -545,7 +579,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
c.gridy = 0;
add(colorButton, c);
nameField.getDocument().addDocumentListener(new NameChangeListener());
nameField.getDocument().addDocumentListener(
new NameChangeListener());
c2.gridy = 0;
c2.weightx = 1;
c2.fill = GridBagConstraints.HORIZONTAL;
@ -578,8 +613,9 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
public Dimension getPreferredSize() {
Dimension preferredSize = super.getPreferredSize();
for (Component component : this.getComponents()) {
preferredSize
.setSize(preferredSize.width, Math.max(preferredSize.height,
preferredSize.setSize(
preferredSize.width,
Math.max(preferredSize.height,
component.getPreferredSize().height));
}
return preferredSize;
@ -589,8 +625,9 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
public Dimension getMaximumSize() {
Dimension preferredSize = super.getPreferredSize();
for (Component component : this.getComponents()) {
preferredSize
.setSize(Integer.MAX_VALUE, Math.max(preferredSize.height,
preferredSize.setSize(
Integer.MAX_VALUE,
Math.max(preferredSize.height,
component.getPreferredSize().height));
}
return preferredSize;
@ -605,8 +642,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
}
private void changeType() {
changePlayerTypeEvent.emit(playerNumber,
TurnControlFactory.Type.values()[playerType.getSelectedIndex()]);
changePlayerTypeEvent.emit(playerNumber, TurnControlFactory.Type
.values()[playerType.getSelectedIndex()]);
}
private void remove() {