Commit graph

35 commits

Author SHA1 Message Date
Malte Tammena 013bbd57b6 Added pattern class 2017-10-18 14:05:15 +02:00
Malte Tammena b89eae69bc Redone structure for multi-file ai 2017-10-18 13:56:22 +02:00
Malte Tammena 54ede03ced Minor AI changes, preparing filestruture change 2017-10-18 13:52:42 +02:00
Malte Tammena 6fbf9d6cbc Added random response again, creating method for pick from Set 2017-10-18 13:35:36 +02:00
Malte Tammena eddeaaf5f3 Merge branch 'master' into malte-ai 2017-10-18 13:16:18 +02:00
Malte Tammena b04e2a8fc6 Fixed naming issue, build passing 2017-10-18 13:02:26 +02:00
Malte Tammena dd0ac78bd0 Merge branch 'master' into malte-ai 2017-10-18 12:47:06 +02:00
Malte Tammena 361fe5920a AI changes. 2017-10-17 12:32:06 +02:00
MaurizioBruetsch c3e8c1bef2 fixed post merge bugs 2017-10-16 20:22:49 +02:00
Maurizio Bruetsch f6062f8530 Merge branch 'master' into 'maurizio-branch'
# Conflicts:
#   src/game/Game.java
#   src/game/Main.java
2017-10-16 20:08:24 +02:00
Malte Tammena 3a7b86a1ff Merge branch 'master' into malte-ai 2017-10-16 11:25:53 +02:00
Malte Tammena d8d4680eca Changing move.
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-16 11:25:23 +02:00
Malte Tammena 9a32883dbd Fixing winner being called Player 1/2.
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-16 11:10:05 +02:00
Malte Tammena 51d18de92f Fixed the issues.
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-16 10:55:48 +02:00
Malte Tammena 3da406151e Changed AI names 2017-10-16 10:43:50 +02:00
MaurizioBruetsch b9e24a89b2 Enhancement + added #8 multipleRounds to Main 2017-10-15 20:59:03 +02:00
MaurizioBruetsch 574cb1df34 Enhancement + added #8 multipleRounds to the Main 2017-10-15 20:56:12 +02:00
Malte Tammena b14c1bddba Added GameHistory and changed things.
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-15 14:17:48 +02:00
Malte Tammena b96e0e2799 Created PlayerObject and implemented into game
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-15 13:32:15 +02:00
Malte Tammena be0540a879 Added a player wrapper PlayerObject
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-15 13:20:16 +02:00
Malte Tammena 049171749d Redoing players in the game.
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-15 13:12:31 +02:00
Malte Tammena d7074f2a18 Fixing format
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-15 12:52:53 +02:00
Malte Tammena 770e78dc4a Did some comments and minor change.
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-15 12:49:14 +02:00
Malte Tammena f7c348b6ce Added last winning condition check
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-15 12:21:39 +02:00
Malte Tammena 8839a61ae5 Almost finished winning conditions.
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-15 00:45:35 +02:00
Malte Tammena 3fe047f1bb Not a working state, implementing winning conditions
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-14 23:31:31 +02:00
Malte Tammena 0dda4b6d0c Changed makeMove such that illegal moves will be punished
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-14 22:50:52 +02:00
Malte Tammena 47903da1a7 Added deepCopy method for board and removed magic nrs
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-14 22:31:40 +02:00
Malte Tammena c5d3cf127a Fixed post-merge bugs
Signed-off-by: Malte Tammena <malte.tammena@gmx.de>
2017-10-14 22:17:05 +02:00
MalteT 5860b3c4ce Merge branch 'master' into maurizio-branch 2017-10-14 21:05:33 +02:00
MaurizioBruetsch a9681a2161 Added a few functionalities to Game.java and created basic AI's.
The AIs are rather simple minded, but if possible they make a vlid move.
2017-10-14 12:03:43 +02:00
Malte Tammena ed10fdb24b Working game, needing stateChanges 2017-10-13 14:43:08 +02:00
Malte Tammena fdfd1219df Worked on Game 2017-10-13 11:26:08 +02:00
Malte Tammena 4240ac37cd Worked on Game 2017-10-13 11:04:14 +02:00
Malte Tammena 09c7e4e41d Added basics 2017-10-13 10:46:02 +02:00