nathanwoodburn/comp1110-ass2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

game: Fixed mouse controls

Browse Source
This commit is contained in:
Nathan Woodburn 2023-05-02 14:52:23 +10:00
parent 91d9721855
commit 025d5af907
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/comp1110/ass2/gui/Game.java
View File

@ -308,13 +308,15 @@ public class Game extends Application {
*/ */
private void tileClick(String coordString, MouseButton button){ private void tileClick(String coordString, MouseButton button){
// TODO implement left and right click for each piece type
int y = Integer.parseInt(coordString.split(",")[0]); int y = Integer.parseInt(coordString.split(",")[0]);
int x = Integer.parseInt(coordString.split(",")[1]); int x = Integer.parseInt(coordString.split(",")[1]);
selectedTile = new Coord(y,x); selectedTile = new Coord(y,x);
sendMessage("Tile " + selectedTile.toString() + " selected");
if (button == MouseButton.PRIMARY) doMove(0);
else if (button == MouseButton.SECONDARY) doMove(1);
selectedTile = new Coord(-1,-1);
refresh(); refresh();
} }
@ -396,7 +398,6 @@ public class Game extends Application {
for (Coord stoneCircle: currentGame.getStones()){ for (Coord stoneCircle: currentGame.getStones()){
addStoneTileToBoard(viewerGrid, tileSize, stoneCircle.toString(), Color.GRAY); addStoneTileToBoard(viewerGrid, tileSize, stoneCircle.toString(), Color.GRAY);
} }
StringBuilder playerData = new StringBuilder("Scores:"); StringBuilder playerData = new StringBuilder("Scores:");
// For each player add their settlements and roads // For each player add their settlements and roads
for (int i = 0; i < currentGame.getNumPlayers(); i++){ for (int i = 0; i < currentGame.getNumPlayers(); i++){
@ -456,15 +457,12 @@ public class Game extends Application {
* It will create the controls variable * It will create the controls variable
*/ */
private void makeControls() { private void makeControls() {
Label newLabel = new Label("New Game:"); Label newLabel = new Label("Start New Game:");
Button twoPlayer = new Button("2 Player"); Button twoPlayer = new Button("2 Player");
Button threePlayer = new Button("3 Player"); Button threePlayer = new Button("3 Player");
Button fourPlayer = new Button("4 Player"); Button fourPlayer = new Button("4 Player");
Label mapLabel = new Label("Select Map:"); Label mapLabel = new Label("Select Map:");
Label aiLabel = new Label("How many AI players:"); Label aiLabel = new Label("How many AI players:");
Label playLabel = new Label("Place piece:");
Button placeVillage = new Button("Village");
Button placeSettler = new Button("Settler");
// Numeric select for AI // Numeric select for AI
ComboBox aiSelector = new ComboBox(); ComboBox aiSelector = new ComboBox();
@ -522,23 +520,8 @@ public class Game extends Application {
} }
}); });
placeVillage.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent e) {
doMove(1);
}
});
placeSettler.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent e) {
doMove(0);
}
});
HBox hb = new HBox(); HBox hb = new HBox();
hb.getChildren().addAll(newLabel, twoPlayer,threePlayer,fourPlayer,aiLabel,aiSelector,mapLabel,mapSelector,playLabel,placeVillage,placeSettler); hb.getChildren().addAll(mapLabel,mapSelector,aiLabel,aiSelector,newLabel, twoPlayer,threePlayer,fourPlayer);
hb.setSpacing(10); hb.setSpacing(10);
hb.setLayoutX(50); hb.setLayoutX(50);
hb.setLayoutY(WINDOW_HEIGHT - 50); hb.setLayoutY(WINDOW_HEIGHT - 50);