Leonardo Brandenberger
|
69e4c7146e
|
Removed tradeWithBank method and modified constructor
|
2021-12-04 16:33:52 +01:00 |
schrom01
|
e23f8bcdde
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/ch/zhaw/catan/SiedlerGame.java
|
2021-12-04 15:44:17 +01:00 |
|
schrom01
|
212acc0fc5
|
fix payout in Method placeInitialSettlement in SiedlerGame
|
2021-12-04 15:39:25 +01:00 |
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 |
|
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 |
|
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 |