Commit Graph

35 Commits

Author SHA1 Message Date
Andrin Fassbind 0ea44905e2 updated javaodoc SiedlerGame
updated constructor SiedlerGame
2021-12-10 13:39:19 +01:00
MikeZyeman f4adf68b9f Merge remote-tracking branch 'origin/main' into main 2021-12-10 11:46:06 +01:00
MikeZyeman daa367260f Added test case TestGameAfterSetup 2021-12-10 11:45:57 +01:00
Speedy Gonzalez 3fb5d72699 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/misc.xml
#	src/ch/zhaw/catan/Road.java
#	src/ch/zhaw/catan/SiedlerBoard.java
2021-12-10 11:19:19 +01:00
Andrin Fassbind 5cf79daa8b misc language lvl updated 2021-12-10 11:13:55 +01:00
schrom01 71344de9f4 merge 2021-12-10 11:02:57 +01:00
Speedy Gonzalez c468680542 Merge remote-tracking branch 'origin/main' 2021-12-10 11:02:42 +01:00
Andrin Fassbind 828218023f Javadoc Player 2021-12-10 10:57:28 +01:00
Andrin Fassbind 57bdf372f1 Merge remote-tracking branch 'origin/main' 2021-12-10 09:42:06 +01:00
Andrin Fassbind 6fa5764e14 refactored longestRoad in SiedlerBoard 2021-12-10 09:41:58 +01:00
schrom01 9d0468ec6e update codeStyleConfig 2021-12-10 09:41:11 +01:00
MikeZyeman 5770d86a6f Added test classes for separation of purpose. 2021-12-09 16:14:47 +01:00
Andrin Fassbind 572926d3c8 refactored longestRoad implementation from SiedlerGame to SiedlerBoard and updated Test Method longestRoad 2021-12-09 16:05:46 +01:00
MikeZyeman e9a6113097 Added UnitTests for reconstruction/simulation for a real game 2021-12-08 14:39:19 +01:00
Andrin Fassbind 46484df77c adjust countRoad in SiedlerGame 2021-12-07 15:33:39 +01:00
schrom01 d35c7299ae refactoring in Siedler.java 2021-12-07 08:30:14 +01:00
Andrin Fassbind 21f144b294 adjust countRoad in SiedlerGame 2021-12-05 14:12:22 +01:00
Andrin Fassbind 8f12b40e50 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	.gitignore
#	.idea/.gitignore
#	src/ch/zhaw/catan/Road.java
#	src/ch/zhaw/catan/SiedlerGame.java
2021-12-04 12:59:31 +01:00
schrom01 442cce6761 solved merge problems 2021-12-03 10:09:17 +01:00
Andrin Fassbind a5f856313d created method in SiedlerGame:
-checkAdjacentCornerList
-checkAdjacentEdgesList
-validPositionForSettlement
-validPositionForRoad

updated method in SiedlerGame:
-buildRoad
-buildSettlement
2021-12-03 09:42:29 +01:00
Leonardo Brandenberger e48371a121 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/misc.xml
2021-12-02 15:16:00 +01:00
Leonardo Brandenberger 3c67d62e42 Several new methods added in Parser class 2021-12-02 15:15:39 +01:00
Andrin Fassbind d6c225a5aa created method storeResourceToBank in Bank.java
adapted method buildRoad and buildSettlement in SiedlerGame.java
2021-12-02 14:12:12 +01:00
Leonardo Brandenberger 9e347e8792 implementing part of Parser class 2021-12-01 23:24:16 +01:00
schrom01 3830cf6594 implemented Method getWinner and getWinPoints
added Class City for later use.
2021-11-30 20:20:48 +01:00
Andrin Fassbind 971cfe8868 SiedlerGame.java added few methodes 2021-11-29 16:47:02 +01:00
MikeZyeman c2d2f11d2a Added superclass structure to roads and settlement 2021-11-29 16:02:38 +01:00
Andrin Fassbind ef51b7c980 overworked Settlement 2021-11-29 15:55:36 +01:00
Andrin Fassbind 5e0ebedfea Player added methods and javadoc 2021-11-26 12:21:57 +01:00
schrom01 98316bb566 changed Datatype of Road and Settlement in SiedlerBoardTextView 2021-11-26 11:44:22 +01:00
Andrin Fassbind aef0479cf5 Player created 2021-11-26 11:41:00 +01:00
schrom01 3adec5bd43 changed Datatype of Road and Settlement in SiedlerBoard 2021-11-26 11:25:56 +01:00
Speedy Gonzalez 5e8db04f0d Added new class player. 2021-11-26 10:58:19 +01:00
Andrin Fassbind 79cc4f3f3c New Class Road
Start to edit SiedlerGame.buildRoad
2021-11-25 17:26:18 +01:00
schrom01 8094aa7167 add untracked files 2021-11-19 10:54:49 +01:00