Skip to content

Commit 50d559a

Browse files
committed
Minor changes
1 parent 1c88bc7 commit 50d559a

File tree

5 files changed

+24
-20
lines changed

5 files changed

+24
-20
lines changed

src/main/java/cascadia/CurrentDeck.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package cascadia;
2+
23
import java.util.ArrayList;
34
import java.util.List;
45

@@ -74,7 +75,8 @@ public static void placeTokenChoiceOnMap(Player player, int tokenChoice) {
7475
//deal with token here, either place on a map tile or chuck it back in bag
7576
//places on correct tile based on tileID
7677
if (!player.getMap().checkAllTilesForValidToken(token)) {
77-
Display.outln("You cannot add this token to your current map of tiles, as none of the options match.");
78+
Display.outln("You cannot add this token to your current map of tiles,"
79+
+ " as none of the options match.");
7880
break;
7981
}
8082
int[] result = Input.chooseTokenPlaceOrReturn(deckTokens.get(tokenChoice));

src/main/java/cascadia/Display.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public static void displayTileMap(PlayerMap map) {
155155
*
156156
* @param map the map whose boundary to be found
157157
* @return an int array containing the index of the [top, bottom, left, right]
158-
* co-ords of the boundary
158+
* co-ords of the boundary
159159
*/
160160
// int[] boundaries are [top, bottom, left, right]
161161
private static int[] tileBoundaries(PlayerMap map) {

src/main/java/cascadia/Edge.java

+11-9
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@
77
* Also assists with scoring habitat corridors. */
88
public class Edge {
99
private HabitatTile.Habitat habitatType;
10-
//private boolean isConnected; //for later use for habitat corridors
1110

12-
// Note: Edges of the hexagonal are numbered 0 (starting from the top right edge, going clockwise) to 5 (left top edge)
13-
// Total 6 sides, like in the diagram below
14-
// 5 0
15-
// -- --
16-
// 4| |1
17-
// -- --
18-
// 3 2
19-
11+
/*
12+
Note: Edges of the hexagonal are numbered 0 (starting from the top right edge, going
13+
clockwise) to 5 (left top edge)
14+
Total 6 sides, like in the diagram below
15+
5 0
16+
-- --
17+
4| |1
18+
-- --
19+
3 2
20+
*/
21+
2022
public Edge(int tileID, HabitatTile.Habitat habitatType) {
2123
if (tileID < 0 || tileID > HabitatTile.getTileCounter()) {
2224
throw new IllegalArgumentException("You are trying to make "

src/main/java/cascadia/Game.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
public class Game {
99
private final String[] playerNames;
1010
private final static List<Player> playerList = new ArrayList<>();
11-
// we set this to static, so we can access it from static methods. This does mean
12-
// that multiple game classes cannot be run simultaneously, but this should not be
13-
// an issue
11+
/*
12+
we set this to static, so we can access it from static methods. This does mean
13+
that multiple game classes cannot be run simultaneously, but this should not be
14+
an issue
15+
*/
1416
private static boolean switchTurn = false;
1517

1618
/*

src/main/java/cascadia/WildlifeToken.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package cascadia;
22

3-
// Wildlife token doesn't need to store any other information except the animal
4-
// type. So I've made it just an enum, and removed unnecessary class information
3+
/**
4+
* The animals that a wildlife token can be.
5+
* Also stores the colour associated with the animal.
6+
*/
57
public enum WildlifeToken {
6-
/**
7-
* The animals that a wildlife token can be.
8-
* Also stores the colour associated with the animal.
9-
*/
108
Bear('B', "\033[38;2;153;102;51m", "\033[48;2;153;102;51m"),
119
Elk('E', "\033[30m", "\033[40m"),
1210
Salmon('S', "\033[38;2;255;51;255m", "\033[48;2;255;51;255m"),

0 commit comments

Comments
 (0)