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

Make highest value and number of stones dealt settable

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@337 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-05-31 01:50:56 +02:00
parent c78e8e6448
commit c004a07a42
11 changed files with 190 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,12 +2,15 @@ package jrummikub.control;
import java.awt.Color;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import jrummikub.control.turn.TurnControlFactory;
import jrummikub.control.turn.TurnControlFactory.Type;
import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings;
import jrummikub.model.StoneColor;
import jrummikub.util.Connection;
import jrummikub.util.Event1;
import jrummikub.util.IEvent1;
@ -83,6 +86,30 @@ public class SettingsControl {
update();
}
}));
connections.add(view.getSettingsPanel().getChangeNumberOfStonesDealtEvent()
.add(new IListener1<Integer>() {
@Override
public void handle(Integer value) {
settings.setNumberOfStonesDealt(value);
update();
}
}));
connections.add(view.getSettingsPanel().getChangeHighestValueEvent()
.add(new IListener1<Integer>() {
@Override
public void handle(Integer value) {
settings.setHighestValue(value);
update();
}
}));
connections.add(view.getSettingsPanel().getChangeStoneColorsEvent()
.add(new IListener1<Set<StoneColor>>() {
@Override
public void handle(Set<StoneColor> value) {
settings.setStoneColors(new HashSet<StoneColor>(value));
update();
}
}));
addPlayerSettingsListeners();
@ -242,7 +269,7 @@ public class SettingsControl {
int totalStonesDealt = settings.getNumberOfStonesDealt()
* settings.getPlayerList().size();
int totalStones = settings.getHighestCard()
int totalStones = settings.getHighestValue()
* settings.getStoneSetNumber()
* settings.getStoneColors().size() + settings.getJokerNumber();