Commit graph

206 commits

Author SHA1 Message Date
Jannis Harder
f1abd1b564 Some AI fixes
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@350 72836036-5685-4462-b002-a69064685172
2011-05-31 05:34:24 +02:00
Bennet Gerlach
4913a5b5fb Fix AI initially melding in inspect turn
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@348 72836036-5685-4462-b002-a69064685172
2011-05-31 05:04:28 +02:00
Bennet Gerlach
061e7ab305 Base AI is now able to meld initially properly
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@346 72836036-5685-4462-b002-a69064685172
2011-05-31 04:56:09 +02:00
Bennet Gerlach
d276b03c39 AIUtil now needs game settings, both hand and player do not anymore
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@342 72836036-5685-4462-b002-a69064685172
2011-05-31 03:45:32 +02:00
Bennet Gerlach
278edc37a9 findSetsWithTotalPoints now finds sets (and total points)
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@341 72836036-5685-4462-b002-a69064685172
2011-05-31 03:45:21 +02:00
acc7d3f11f HumanTurnControl: Fix method length
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@339 72836036-5685-4462-b002-a69064685172
2011-05-31 03:04:22 +02:00
25c6383c73 Allow setting stone colors to use
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@338 72836036-5685-4462-b002-a69064685172
2011-05-31 03:02:31 +02:00
c004a07a42 Make highest value and number of stones dealt settable
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@337 72836036-5685-4462-b002-a69064685172
2011-05-31 01:50:56 +02:00
Ida Massow
2e24ee3e7f Man kann im Model bestimmen, wie viele Steine gegeben werden. Test geht auch
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@335 72836036-5685-4462-b002-a69064685172
2011-05-31 00:58:50 +02:00
Ida Massow
f22ff5f0f1 Tests für Sets mit mehr Farben, mehr Values, ...
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@332 72836036-5685-4462-b002-a69064685172
2011-05-31 00:58:46 +02:00
Jannis Harder
d66d73ea8f Fixed out of stones rules
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@331 72836036-5685-4462-b002-a69064685172
2011-05-30 21:04:43 +02:00
Bennet Gerlach
d25a73167c Extracted a AIUtil class from several hand methods
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@330 72836036-5685-4462-b002-a69064685172
2011-05-30 21:01:48 +02:00
Ida Massow
1660736239 Man kann jetzt die Anzahl der Steinsätze einstellen
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@328 72836036-5685-4462-b002-a69064685172
2011-05-30 20:16:48 +02:00
Bennet Gerlach
ad2f226369 Implemented timer in base AI class
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@326 72836036-5685-4462-b002-a69064685172
2011-05-30 19:29:20 +02:00
Ida Massow
ae9ce59d36 Warnings tauchen auf, wenn man beim Einstellen Unfug macht
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@325 72836036-5685-4462-b002-a69064685172
2011-05-30 19:08:33 +02:00
Ida Massow
7404566d46 Fixed a few warnings
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@320 72836036-5685-4462-b002-a69064685172
2011-05-30 10:13:26 +02:00
Jannis Harder
b19a46b7b2 Implemented view code for AI turns
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@319 72836036-5685-4462-b002-a69064685172
2011-05-30 01:31:36 +02:00
Jannis Harder
15558d7138 Implemented dummy AI
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@318 72836036-5685-4462-b002-a69064685172
2011-05-30 01:31:32 +02:00
Jannis Harder
f3f52956f7 Tested and implemented player type selection in the settings panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@317 72836036-5685-4462-b002-a69064685172
2011-05-29 22:24:48 +02:00
Jannis Harder
43ace4c18a Added player type selection to the settings panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@315 72836036-5685-4462-b002-a69064685172
2011-05-29 21:49:03 +02:00
d6b8b23c6d Disable player panel while settings panel is shown
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@313 72836036-5685-4462-b002-a69064685172
2011-05-29 21:19:20 +02:00
Ida Massow
e4a1246f01 Viele Warnings durch Kommentare beseitigt
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@312 72836036-5685-4462-b002-a69064685172
2011-05-29 20:36:26 +02:00
Jannis Harder
65d08ea450 Created dummy base AI control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@311 72836036-5685-4462-b002-a69064685172
2011-05-29 20:22:47 +02:00
Ida Massow
794777c2fe Neuer Button im WinPanel mit funktion
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@309 72836036-5685-4462-b002-a69064685172
2011-05-29 20:19:17 +02:00
Jannis Harder
eb7ccb46c5 Added TurnControlFactory
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@308 72836036-5685-4462-b002-a69064685172
2011-05-29 19:46:53 +02:00
Jannis Harder
73f6fb9c1b Created interface and abstract base class for turn control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@307 72836036-5685-4462-b002-a69064685172
2011-05-29 19:46:50 +02:00
Jannis Harder
bf8aa23758 Implement joker number in settings control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@302 72836036-5685-4462-b002-a69064685172
2011-05-29 18:50:52 +02:00
Ida Massow
05107f6035 Rauskommen ist in der View zu sehen, genauso wie Farben
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@299 72836036-5685-4462-b002-a69064685172
2011-05-29 18:42:36 +02:00
9cf3dc09ae Implement score panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@298 72836036-5685-4462-b002-a69064685172
2011-05-29 15:50:30 +02:00
Jannis Harder
89e59b2f2c Implemented initial meld threshold in settings control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@296 72836036-5685-4462-b002-a69064685172
2011-05-29 15:32:01 +02:00
Jannis Harder
09aa507e3b Test initial meld threshold in settings control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@295 72836036-5685-4462-b002-a69064685172
2011-05-29 15:32:00 +02:00
5aa79ea898 Implement settings control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@291 72836036-5685-4462-b002-a69064685172
2011-05-28 20:13:35 +02:00
Jannis Harder
5029ff206a Checking whether redealing is allowed
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@290 72836036-5685-4462-b002-a69064685172
2011-05-27 18:55:19 +02:00
Jannis Harder
2d198820a9 GameControl tests, temporary handler in SettingsControl and small
fixes

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@288 72836036-5685-4462-b002-a69064685172
2011-05-27 17:54:46 +02:00
Jannis Harder
63397e2f5f Implemented redealing in RoundControl
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@287 72836036-5685-4462-b002-a69064685172
2011-05-27 17:54:44 +02:00
Jannis Harder
f7743efa7d Test redealing in RoundControl
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@286 72836036-5685-4462-b002-a69064685172
2011-05-27 17:54:42 +02:00
Ida Massow
531fe57b17 Test für SettingsControl, 3 neue Klassen, Mocks für SettingPanel, lauter fixes
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@285 72836036-5685-4462-b002-a69064685172
2011-05-27 15:00:28 +02:00
df79c78dec Add application control, use game settings from settings panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@284 72836036-5685-4462-b002-a69064685172
2011-05-26 16:12:44 +02:00
3d74d11974 Remove player labels at the table edges
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@283 72836036-5685-4462-b002-a69064685172
2011-05-26 16:02:33 +02:00
10e8c1f0e6 Fix two warnings
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@277 72836036-5685-4462-b002-a69064685172
2011-05-25 17:36:29 +02:00
Jannis Harder
a1c0cb89f6 Added test and implementation for an inspection turn before the first
turn

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@273 72836036-5685-4462-b002-a69064685172
2011-05-25 17:10:43 +02:00
Jannis Harder
157bd4f606 Tested and implemented scoring
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@272 72836036-5685-4462-b002-a69064685172
2011-05-25 15:51:34 +02:00
Jannis Harder
6df3d5fe32 Moved displaying of win panel in game control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@270 72836036-5685-4462-b002-a69064685172
2011-05-24 23:15:21 +02:00
Jannis Harder
79bffeba5d Fixed drawing single cards before the initial meld
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@269 72836036-5685-4462-b002-a69064685172
2011-05-24 22:33:08 +02:00
Jannis Harder
81ca3e174a Renamed win() and fixed end of round tests
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@267 72836036-5685-4462-b002-a69064685172
2011-05-24 22:16:16 +02:00
Jannis Harder
8c3c66f361 Implemented routine to check if initial melds are possible
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@266 72836036-5685-4462-b002-a69064685172
2011-05-24 21:57:18 +02:00
Jannis Harder
92d1109954 Select a random player for the first round
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@263 72836036-5685-4462-b002-a69064685172
2011-05-24 01:51:54 +02:00
Jannis Harder
d9a0b0e37d Implemented special case round end (heap empty)
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@262 72836036-5685-4462-b002-a69064685172
2011-05-24 01:51:53 +02:00
Jannis Harder
2446671f7a Cleaned up RoundControl tests
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@260 72836036-5685-4462-b002-a69064685172
2011-05-24 01:51:49 +02:00
Jannis Harder
102299d0ff Fixed invalid moves without laying out stones and cleaned up rule
checks

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@259 72836036-5685-4462-b002-a69064685172
2011-05-24 01:51:47 +02:00