Skip to content

Commit 1ec94b5

Browse files
eoin-creoin-cr
committed
Added group info to top of each file, improved readme
1 parent 71e8017 commit 1ec94b5

35 files changed

+522
-22
lines changed

‎README.md

+17-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
# COMP20050_Group12
2-
## Some ideas:
3-
- We use ansi codes to colour terminal blocks.
4-
- Note that we can represent hexagons as rectangles
5-
without losing data about which sides are touching
6-
- Use a 2d array of tiles to store their locations?
7-
- When the user plays we can draw the possible tiles
8-
they can place at around the actually placed tiles,
9-
and number them so the user can choose where to put
10-
the tile by entering the number
11-
- Try to modularise a lot by using a lot of helper
12-
methods. Will make it easier to change the way things
13-
work in the future.
1+
# COMP20050 Group12
2+
Eoin Creavin, Mynah Bhattacharyya, Ben McDowell
143

4+
Use of certain newer Java features means a requirement of at least Java 17 has been
5+
imposed in the gradle build file.
6+
7+
Gradle should not be required to run the game, however, the tests use the Mockito
8+
library which requires gradle to include.
9+
10+
A screenshot of the test coverage of the project has been included
11+
(see TestCoverage.png).
12+
13+
A modified version of the Google stylesheet has been used for the code
14+
styling (see stylesheet.xml)
15+
16+
We have used the default gradle package layout (`src/main/java/...` and `src/test/java/...`).
17+
Make sure to change the package source file from `src` to `src/main/java` and set the
18+
main run configuration to `cascadia.Main`.

‎TestCoverage.png

80.7 KB
Loading

‎src/main/java/cascadia/Bag.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import java.util.ArrayList;

‎src/main/java/cascadia/Command.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import cascadia.scoring.ScoreCards;

‎src/main/java/cascadia/Constants.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
/**

‎src/main/java/cascadia/CurrentDeck.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import java.util.ArrayList;

‎src/main/java/cascadia/Display.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import java.util.Objects;

‎src/main/java/cascadia/Edge.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import java.util.ArrayList;

‎src/main/java/cascadia/Game.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import cascadia.scoring.ScoreCards;

‎src/main/java/cascadia/Generation.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import java.util.Arrays;

‎src/main/java/cascadia/HabitatTile.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import java.util.List;

‎src/main/java/cascadia/Input.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import java.util.*;

‎src/main/java/cascadia/Main.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
public class Main {

‎src/main/java/cascadia/NatureTokens.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
import java.util.ArrayList;

‎src/main/java/cascadia/Player.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
/**

‎src/main/java/cascadia/PlayerMap.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
17+
218
import java.util.ArrayList;
319
import java.util.Arrays;
420
import java.util.List;

‎src/main/java/cascadia/WildlifeToken.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia;
217

318
/**

‎src/main/java/cascadia/scoring/Scorable.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia.scoring;
217

318
import cascadia.PlayerMap;

‎src/main/java/cascadia/scoring/ScoreCards.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia.scoring;
217

318
import cascadia.Display;

‎src/main/java/cascadia/scoring/ScoreToken.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
COMP20050 Group 12
3+
Eoin Creavin – Student ID: 21390601
4+
eoin.creavin@ucdconnect.ie
5+
GitHub ID: eoin-cr
6+
7+
Mynah Bhattacharyya – Student ID: 21201085
8+
malhar.bhattacharyya@ucdconnect.ie
9+
GitHub ID: mynah-bird
10+
11+
Ben McDowell – Student ID: 21495144
12+
ben.mcdowell@ucdconnect.ie
13+
GitHub ID: Benmc1
14+
*/
15+
116
package cascadia.scoring;
217

318
import cascadia.PlayerMap;

0 commit comments

Comments
 (0)