ZHAW-IT21b_WIN
/
gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
169 Commits 1 Branch 0 Tags 5 MiB
Commit Graph

141 Commits

Author SHA1 Message Date
Andrin Fassbind 260d7bf2f0 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	src/ch/zhaw/catan/SiedlerGame.java
 2021-12-04 14:06:19 +01:00
Andrin Fassbind 4a352dd40a Fixed Bug set strutcture in water and set bug addressource nullpointer exception 2021-12-04 14:02:06 +01:00
schrom01 f6865451a6 added Method handleDiceThrow7 in SiedlerGame 2021-12-04 13:20:09 +01:00
Leonardo Brandenberger 7129435fea SiedlerGame throwDice method implemented (for 7 not yet implemented) and method getResourcesforFaction implemented in SiedlerBoard 2021-12-03 16:39:11 +01:00
schrom01 8b2b9e2882 rename variables in SiedlerBoard 2021-12-03 11:54:12 +01:00
schrom01 c910c00c38 Merge remote-tracking branch 'origin/main' 2021-12-03 11:52:41 +01:00
schrom01 b38e24b612 changes in Siedler Board. Usage of Field Class added. 2021-12-03 11:52:32 +01:00
Speedy Gonzalez 4fe4daf730 Merge remote-tracking branch 'origin/main' 2021-12-03 11:28:50 +01:00
Speedy Gonzalez 2dfe55584e Added placeInitialRoad and placeInitialSettlement methods. 2021-12-03 11:28:42 +01:00
schrom01 7c913089b5 reated Class Field 2021-12-03 11:15:07 +01:00
schrom01 8fc77abdd0 added Method toString in City 2021-12-03 10:48:59 +01:00
schrom01 8cb13ce0a6 change in getCurrentPlayerWinpoints 2021-12-03 10:36:53 +01:00
schrom01 442cce6761 solved merge problems 2021-12-03 10:09:17 +01:00
Speedy Gonzalez c45471c337 Added method buildCity. 2021-12-03 09:57:42 +01:00
Andrin Fassbind b4783c8009 changed javadoc 2021-12-03 09:52:42 +01:00
Andrin Fassbind a2e7f60836 Merge remote-tracking branch 'origin/main' 2021-12-03 09:49:01 +01:00
Speedy Gonzalez 86d998ddd7 Merge remote-tracking branch 'origin/main' 2021-12-03 09:48:36 +01:00
Speedy Gonzalez 70b27af038 Added method buildCity. 2021-12-03 09:48:30 +01:00
Andrin Fassbind 40dcfaa304 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/ch/zhaw/catan/SiedlerGame.java
 2021-12-03 09:47:04 +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
schrom01 8811410e44 change in Main Method 
changed Method getWinner and getCurrentPlayerWinpoints
 2021-12-03 09:37:19 +01:00
schrom01 8a494b247b change in Main Method 2021-12-03 09:01:24 +01:00
schrom01 7d1a326dc0 change in Main Method 2021-12-03 08:54:27 +01:00
Leonardo Brandenberger c387420ca8 Siedler Class minor bug fixes 2021-12-03 08:52:26 +01:00
Leonardo Brandenberger 6e1c06f769 Merge remote-tracking branch 'origin/main' 2021-12-03 08:48:40 +01:00
Leonardo Brandenberger ff734bce23 Delected CommandWords.java 
added quit Method in Parser
Fixed minor grammar mistakes in Siedler Game
 2021-12-03 08:48:26 +01:00
schrom01 1e49424b9c fixed Error in Main Method 2021-12-03 08:35:37 +01:00
schrom01 d233e5f67f Merge remote-tracking branch 'origin/main' 2021-12-03 08:34:57 +01:00
schrom01 f60b65af83 fixed Error in Main Method 2021-12-03 08:34:48 +01:00
Leonardo Brandenberger 57649df6ba Fixed grammar error in method displayPlayerResource Stock. 2021-12-03 08:32:51 +01:00
Leonardo Brandenberger d749838600 fixed Error in trade method in Parser 2021-12-03 08:28:58 +01:00
schrom01 060310aebc change in Main Method 2021-12-03 08:12:21 +01:00
schrom01 2de44a1b99 change Method throwDice in Siedler 2021-12-03 07:56:38 +01:00
schrom01 1c90d18510 created Method throwDice in Siedler 2021-12-02 19:16:28 +01:00
schrom01 1362850570 changes in mainMethod 2021-12-02 19:13:16 +01:00
schrom01 0c63540616 changes in mainMethod 
added Method displayPlayerResourceStock to Parser
 2021-12-02 19:05:14 +01:00
schrom01 7c84f7f600 changes in mainMethod 2021-12-02 18:47:00 +01:00
schrom01 7b23ed5380 changes in mainMethod 2021-12-02 18:12:04 +01:00
Leonardo Brandenberger be26fc77cd Merge remote-tracking branch 'origin/main' 2021-12-02 18:07:09 +01:00
Leonardo Brandenberger 4748643163 added method trade to Parser 2021-12-02 18:07:02 +01:00
schrom01 fb38fc07b0 completed founding Phase 2021-12-02 17:57:28 +01:00
schrom01 b75afdc6a0 Merge remote-tracking branch 'origin/main' 2021-12-02 17:39:42 +01:00
schrom01 9294cbc3e3 fix bug in switchToPreviousPlayer 2021-12-02 17:39:33 +01:00
Leonardo Brandenberger f65449df56 eroorMessage method prinlText Output minorly changed 2021-12-02 17:23:48 +01:00
schrom01 9916d38073 first draft of foundigPhase Method 2021-12-02 17:13:43 +01:00
Leonardo Brandenberger c4a3346fad eroorMessage method prinln added 2021-12-02 17:01:53 +01:00
Leonardo Brandenberger 0e5a4c6254 Merge remote-tracking branch 'origin/main' 2021-12-02 16:49:52 +01:00
Leonardo Brandenberger a7a2085632 Implemented the functionality of all methods in Parser.java and created missing Enum Instances in Command.java. 2021-12-02 16:49:44 +01:00
MikeZyeman b1ba5636ce Removed TODO comments of finished methods and removed unnecessary variable 2021-12-02 16:25:38 +01:00
Leonardo Brandenberger 60d1c9a90b Merge remote-tracking branch 'origin/main' 2021-12-02 15:37:36 +01:00
Leonardo Brandenberger 014b838187 displayGameboard method added. 2021-12-02 15:37:27 +01:00
Speedy Gonzalez c8d560b8c9 Merge remote-tracking branch 'origin/main' 2021-12-02 15:28:20 +01:00
Speedy Gonzalez 68cc2402b4 Added player switches 2021-12-02 15:28:00 +01:00
Leonardo Brandenberger 684bf9e553 gameStart method now returns HashMap 2021-12-02 15:22:33 +01:00
Leonardo Brandenberger cba5a6b22c gameStart method now returns HashMap 2021-12-02 15:20:30 +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
Leonardo Brandenberger 54b1d794f8 new Class Parser and corresponding enums created 2021-11-29 17:23:55 +01:00
Andrin Fassbind cb9e22ea92 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/ch/zhaw/catan/Structure.java
 2021-11-29 16:47:41 +01:00
Andrin Fassbind 971cfe8868 SiedlerGame.java added few methodes 2021-11-29 16:47:02 +01:00
MikeZyeman cf94a835fc Fixed display error toString in structure 2021-11-29 16:39:29 +01:00
Leonardo Brandenberger 3ddd86e4e1 activePlayer Datafield added 2021-11-29 16:21:13 +01:00
MikeZyeman c2d2f11d2a Added superclass structure to roads and settlement 2021-11-29 16:02:38 +01:00
MikeZyeman d70a3daed0 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	.idea/misc.xml
 2021-11-29 15:57:01 +01:00
MikeZyeman ce31d0f439 Added superclass structure to roads and settlement 2021-11-29 15:56:52 +01:00
Andrin Fassbind ef51b7c980 overworked Settlement 2021-11-29 15:55:36 +01:00
Leonardo Brandenberger b30a019566 createFixGamefield method finished and removed depreciated code 2021-11-28 01:14:34 +01:00
leobr c4c30670b4 finished Method tradeWithBankFourToOne 
Modified Class Bank to work with mentioned Method
 2021-11-27 02:13:55 +01:00
Leonardo Brandenberger 2f9f93d862 Bank Klasse erstellt (wird warscheinlich wieder entfernt da Funktionalität in SiedlerGame sein soll) 2021-11-27 01:45:14 +01:00
Andrin Fassbind 9a79bf0cf4 Player added methods and javadoc 2021-11-26 12:32:26 +01:00
Andrin Fassbind 5e0ebedfea Player added methods and javadoc 2021-11-26 12:21:57 +01:00
Andrin Fassbind b23e210bb2 Merge remote-tracking branch 'origin/main' 2021-11-26 12:15:30 +01:00
Andrin Fassbind bfb1433fd2 Player added methods and javadoc 2021-11-26 12:15:18 +01:00
schrom01 235798ff97 Merge remote-tracking branch 'origin/main' 2021-11-26 11:44:31 +01:00
schrom01 98316bb566 changed Datatype of Road and Settlement in SiedlerBoardTextView 2021-11-26 11:44:22 +01:00
Leonardo Brandenberger 647fa90f30 Merge remote-tracking branch 'origin/main' 2021-11-26 11:41:15 +01:00
Leonardo Brandenberger fcf8c842fb getLandsForCorner method created. 2021-11-26 11:41:06 +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 ef484a31ea Merge remote-tracking branch 'origin/main' 2021-11-26 10:58:27 +01:00
Speedy Gonzalez 5e8db04f0d Added new class player. 2021-11-26 10:58:19 +01:00
Andrin Fassbind 456ea5356f Settlement.java and changes SiedlerGame buildRoad Method 2021-11-26 10:43:04 +01:00
Andrin Fassbind 0db6be32b6 Road.java and changes SiedlerGame buildRoad Method 2021-11-26 10:05:02 +01:00
schrom01 8b61927eae created Class Siedler 2021-11-24 17:16:13 +01:00
schrom01 ad1227ac98 completed method getFieldsForDiceValue in SiedlerBoard 2021-11-24 17:03:55 +01:00
Leonardo Brandenberger e6b2882591 New methods in SiedlerBoard created 2021-11-24 16:18:49 +01:00
schrom01 e4a56b73c9 test commit 2021-11-19 10:03:52 +01:00
fassband f2fe06f720 Add files via upload 2021-11-19 08:32:32 +01:00