From 5e32a47e8ed010fde4842035696551403dc14d05 Mon Sep 17 00:00:00 2001 From: Joshua Perry <45966243+jpez-development@users.noreply.github.com> Date: Wed, 1 Feb 2023 13:51:13 +0000 Subject: [PATCH] added viewing of scores --- .../java/com/r0r5chach/MainController.java | 35 +++ src/main/resources/com/r0r5chach/main.fxml | 206 ++++++++++++------ 2 files changed, 169 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/r0r5chach/MainController.java b/src/main/java/com/r0r5chach/MainController.java index 0ec1d97..b3315f1 100644 --- a/src/main/java/com/r0r5chach/MainController.java +++ b/src/main/java/com/r0r5chach/MainController.java @@ -39,9 +39,33 @@ public class MainController implements Initializable { @FXML TextField favoriteDefender; + @FXML + TextField scores0; + + @FXML + TextField scores1; + + @FXML + TextField scores2; + + @FXML + TextField scores3; + + @FXML + TextField scores4; + + @FXML + TextField scores5; + + @FXML + TextField overallScore; + + TextField[] scores; + @Override public void initialize(URL url, ResourceBundle rb) { loadCompetitors(); + this.scores = new TextField[]{scores0, scores1, scores2, scores3, scores4, scores5}; loadView(); } @@ -67,7 +91,12 @@ public class MainController implements Initializable { this.playerNumber.setText(String.valueOf(player.getPlayerNumber())); this.playerName.setText(player.getPlayerName().getFullName()); this.playerLevel.setText(player.getPlayerLevel().getRank()); + loadFavoriteCharacters(player); + loadScores(player); + this.overallScore.setText(String.valueOf(player.getOverallScore())); + } + private void loadFavoriteCharacters(Competitor player) { if (player instanceof R6Player) { this.favoriteAttacker.setText(((R6Player) player).getFavoriteAttacker().getAttacker()); this.favoriteDefender.setText(((R6Player) player).getFavoriteDefender().getDefender()); @@ -79,6 +108,12 @@ public class MainController implements Initializable { this.favoriteDefender.visibleProperty().set(false); this.favoriteCharacters.setText("Favorite Agent"); } + } + private void loadScores(Competitor player) { + int[] playerScores = player.getScores(); + for (int i = 0; i < playerScores.length; i++) { + this.scores[i].setText(String.valueOf(playerScores[i])); + } } } \ No newline at end of file diff --git a/src/main/resources/com/r0r5chach/main.fxml b/src/main/resources/com/r0r5chach/main.fxml index 9002164..cff57ed 100644 --- a/src/main/resources/com/r0r5chach/main.fxml +++ b/src/main/resources/com/r0r5chach/main.fxml @@ -3,6 +3,8 @@ + + @@ -13,77 +15,137 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +