Immanuel Alvaro Bhirawa
192570fb47
Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2
2023-05-01 15:19:25 +10:00
da5d6dbdff
game: Added custom message for no villages left
2023-05-01 15:08:42 +10:00
0a4f729108
game: Moved board to have more room for message
2023-05-01 15:08:28 +10:00
d2c8ba86c0
game: Added better AI and UI
2023-05-01 14:51:36 +10:00
c37ee0c5f7
game: Added player actions
2023-05-01 14:32:22 +10:00
Immanuel Alvaro Bhirawa
ccf71b45b4
Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2
2023-05-01 14:24:43 +10:00
Immanuel Alvaro Bhirawa
938ebe95fc
Trying to do Task 11 Link
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-05-01 14:24:34 +10:00
3307b01bf2
game: Added simple functions
2023-05-01 13:25:45 +10:00
1ad2f6d3f3
state: Cleaned up isPhaseOver
2023-04-26 18:06:37 +10:00
Immanuel Alvaro Bhirawa
8db5652ec6
New Upstream pulled
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-26 17:55:23 +10:00
e228e9551a
state: Added simple mode for isPhaseOver()
2023-04-26 11:49:06 +10:00
10b23e8a8c
state: Added addPlayer function
2023-04-24 21:33:05 +10:00
8bab67bcba
blueLagoon: Fixed formatting & cleaned up code
2023-04-24 21:32:53 +10:00
a9a7ddef94
blueLagoon: Added AI
2023-04-24 21:07:16 +10:00
3e04727e7c
coord: Add is adjacent methods
2023-04-24 18:25:07 +10:00
741ddc2cf0
blueLagoon: pointed applyMove to state object
2023-04-24 18:15:34 +10:00
bfc7070b78
blueLagoon: pointed endPhase to state object
2023-04-24 18:10:57 +10:00
70f3b3c707
state: Fixed majorities bug
2023-04-24 17:57:13 +10:00
da04d53092
blueLagoon: Pointed scoring to state object
2023-04-24 17:53:07 +10:00
899497d037
task 9 and 10: Added using state class
2023-04-24 17:36:20 +10:00
8ed19d75bd
state: Added more scoring and turn actions
2023-04-24 16:56:31 +10:00
543a09f548
blueLagoon: Use state object for distribute resouces
2023-04-24 16:03:26 +10:00
2179ba5eaa
state: Added more functionality
2023-04-24 16:03:04 +10:00
7ed595dced
state: Added initial state, island, player, coord object types
2023-04-24 13:59:25 +10:00
Immanuel Alvaro Bhirawa
72fd76408a
Cleaner switch syntax task 7
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-24 10:48:29 +10:00
Immanuel Alvaro Bhirawa
e259a9a982
D2D Test completed
...
- Alvaro
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-22 09:49:44 +10:00
e73524592a
game: Added metadata and build info
2023-04-21 13:56:49 +10:00
024f6f63ff
BlueLagoon: Fixed bug found in testIsStateStringWellFormed
2023-04-21 13:29:08 +10:00
cba1604afa
BlueLagoon: Fixed double comment
2023-04-21 11:34:41 +10:00
8adc551913
BlueLagoon: Cleanup imports and style
2023-04-21 11:08:02 +10:00
14544cc990
task8: Cleaned more code and added some comments
2023-04-14 17:43:56 +10:00
056992a269
task8: Cleaned some code and sped up time
2023-04-14 17:37:13 +10:00
be28548cd7
task8: Sped up code some more
2023-04-14 17:19:48 +10:00
a12db3b0bd
task8: Sped up compute time
2023-04-14 16:58:36 +10:00
8802c9545f
task8: Use ismovevalid
2023-04-14 16:08:57 +10:00
Immanuel Alvaro Bhirawa
999177bc67
Sorry for the spam commits but tidied up some stuff again
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 14:07:45 +10:00
Immanuel Alvaro Bhirawa
088a34010e
Tidied up some stuff
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 14:06:27 +10:00
Immanuel Alvaro Bhirawa
8ffd63bab3
Task 7 DONE :)
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 13:53:11 +10:00
Immanuel Alvaro Bhirawa
e8485d8e21
Task 7 [Debug-In-Process], made some progress [1] + pulled upstream
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 11:10:08 +10:00
Immanuel Alvaro Bhirawa
e976071639
Task 7 [Debug-In-Process], made some progress [1]
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 10:55:57 +10:00
Immanuel Alvaro Bhirawa
e0bc262c6a
Task 7 [Debug-In-Process], made some progress
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 08:16:42 +10:00
Immanuel Alvaro Bhirawa
f1d678660c
Task 7 Debug-In-Process, good progress so far ig
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-14 01:58:32 +10:00
Immanuel Alvaro Bhirawa
ccc6caed17
Task 7 Confused on where I got the logic wrong but sort of done
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-13 21:31:33 +10:00
Immanuel Alvaro Bhirawa
cc951302f6
Task 7 Progress so far
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-12 23:32:30 +10:00
Immanuel Alvaro Bhirawa
0da848fdf2
Task 5 fixed again
...
Task 7 otw
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-12 21:32:01 +10:00
Immanuel Alvaro Bhirawa
187e66b5e7
Task 5 fixed with the shapes
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-12 14:40:27 +10:00
Immanuel Alvaro Bhirawa
c633c8188f
Task 5 added some comments.
...
NOTE: Noticed a bug where after launching and inputting the string for the first time, the programme won't refresh if we put in a different string.
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-11 10:06:30 +10:00
Immanuel Alvaro Bhirawa
37b09c5576
Task 5 done hopefully
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-11 01:10:55 +10:00
Immanuel Alvaro Bhirawa
809701c5f6
Task 5 [Fixed slight string error in player statement] and the bug is fixed (Just need some comments later lol)
...
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-08 00:25:37 +10:00
Immanuel Alvaro Bhirawa
2e7ae85051
Task 5 [Fixed player statement]
...
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-08 00:14:17 +10:00
Immanuel Alvaro Bhirawa
bb364bd4c7
Task 5 should be finished I think
...
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-08 00:07:37 +10:00
Immanuel Alvaro Bhirawa
5a2e876a29
Task 5 progress 5/6 just need to finish [player statement]
...
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
2023-04-07 21:15:42 +10:00
Immanuel Alvaro Bhirawa
9f547c5aab
Task 5 progress 5/6 just need to finish [player statement]
...
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol
2023-04-07 21:15:16 +10:00
2747d89712
Merge branch 'task8'
2023-04-03 11:45:00 +10:00
e4d5e40ea9
admin: Added originality
2023-03-27 23:05:06 +11:00
9b17641a62
task8: Added initial code
2023-03-27 22:50:40 +11:00
69adaa296a
Merge branch 'fix-distribute'
2023-03-27 16:22:25 +11:00
47104eb7d0
task 6: Fixed randomness errors
2023-03-27 16:22:03 +11:00
d38fc5925b
task6: Updated random generator and test
2023-03-27 12:01:05 +11:00
Immanuel Alvaro Bhirawa
8f204e274c
Task 5 progress 4/6 just need to finish [unclaimedResourceStatement] and [player statement]
...
NOTE: There's a bug with the water board and stoneCircles tile generator. Will fix later hopefully lol
2023-03-27 10:36:53 +11:00
62e7698832
distribute: Changed to not allow multiple resources on one circle
2023-03-25 16:29:42 +11:00
08c2eee299
Merge remote-tracking branch 'origin/master'
2023-03-24 14:56:41 +11:00
ce89e9ca37
Viewer: Added favicon
2023-03-24 14:56:34 +11:00
Immanuel Alvaro Bhirawa
8b03da60c4
Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2
2023-03-24 14:53:12 +11:00
Immanuel Alvaro Bhirawa
1f0df80121
Fixed Task 5 part 2 (Current Arrangement State)
2023-03-24 14:53:07 +11:00
4ba76d14f8
BlueLagoon: Cleaned up isStateStringWellFormed
2023-03-24 14:42:27 +11:00
9239293a26
BlueLagoon: changed isStateStringWellFormed to just regex match
2023-03-24 12:20:14 +11:00
Immanuel Alvaro Bhirawa
9e33b57ce7
Task 4 Added comments
2023-03-24 11:55:16 +11:00
Immanuel Alvaro Bhirawa
822f040609
Task 4 made shorter
2023-03-24 11:46:44 +11:00
Immanuel Alvaro Bhirawa
b2dc79dec2
Task 5 boardArrangement and CurrentStageArrangement done
2023-03-24 11:13:46 +11:00
ff4b5d3e8d
added: Check message
2023-03-23 17:51:30 +11:00
cb1a475bd5
task6: Initial add
2023-03-23 17:41:13 +11:00
605f94c4c3
Task4: Removed FIXME tag
2023-03-23 17:19:50 +11:00
Immanuel Alvaro Bhirawa
f2747a9582
Task 4 updated
2023-03-23 14:06:49 +11:00
Immanuel Alvaro Bhirawa
c12d3c2efe
Task 4 Done and updated with task 3
2023-03-23 13:54:54 +11:00
Immanuel Alvaro Bhirawa
f93ee3df76
Merge branch 'master' of https://gitlab.cecs.anu.edu.au/u7156831/comp1110-ass2
2023-03-23 13:53:49 +11:00
Immanuel Alvaro Bhirawa
3c96737854
Task 4 Done
2023-03-23 13:53:42 +11:00
dc45c15788
BlueLagoon: Added isStateStringWellFormed
2023-03-23 12:22:32 +11:00
1984883997
Merge remote-tracking branch 'comp1110/master'
2023-03-23 10:41:12 +11:00
Paul Scott
5ea35de501
Added tests and populated BlueLagoon
2023-03-22 14:26:58 +11:00
46690b5f2c
Merge branch 'nathan_stage_test'
2023-03-21 13:52:31 +11:00
Immanuel Alvaro Bhirawa
5845c41582
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/gittest/Main.java
2023-03-21 13:46:34 +11:00
116067f42e
removed second A
2023-03-21 13:45:39 +11:00
be847584cd
Merge remote-tracking branch 'origin/master'
2023-03-21 13:45:14 +11:00
9bf0c3ade5
Merge with both A and B
2023-03-21 13:44:58 +11:00
Immanuel Alvaro Bhirawa
425fc01a2e
Cindy added new C object again
2023-03-21 13:44:30 +11:00
Alice
8b7b6cb880
added a (again
2023-03-21 13:44:18 +11:00
ab30ed4552
gittest: Added B
2023-03-21 13:44:10 +11:00
Immanuel Alvaro Bhirawa
96f420bef5
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/gittest/Main.java
2023-03-21 13:41:31 +11:00
12d20193e0
Merge branch 'bobsexperiment'
2023-03-21 13:40:26 +11:00
Alice
888173de94
added a
2023-03-21 13:39:19 +11:00
Cindy
b7706e4fce
Cindy added new C object
2023-03-21 13:39:08 +11:00
Cindy
bd34221877
Cindy added new C object
2023-03-21 13:38:19 +11:00
352e14d421
gittest: Main
2023-03-21 13:36:19 +11:00
c9d78fc3a0
gittest: Added comment
2023-03-21 13:22:26 +11:00
626dc8ff41
gittest: Added main
2023-03-21 13:21:46 +11:00
d63adea7dc
Merge remote-tracking branch 'origin/master'
2023-03-21 13:19:58 +11:00
Cindy
92641d81e1
Cindy added C and toString
2023-03-21 13:18:32 +11:00
5b63dc75d8
gittest: Added B
2023-03-21 13:17:32 +11:00
Alice
eaf5b694dd
signed Alice
2023-03-21 13:15:53 +11:00
