r0r-5chach/CSY2030-assignment-2
r0r-5chach
/
CSY2030-assignment-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added characters to table

This commit is contained in:
Joshua Perry 2023-02-01 19:40:30 +00:00
parent 713dde5236
commit 3134fd2c89
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/r0r5chach/CompetitorRow.java
View File

@ -15,18 +15,18 @@ public class CompetitorRow {
private SimpleStringProperty playerName; private SimpleStringProperty playerName;
private SimpleObjectProperty<Rank> playerLevel; private SimpleObjectProperty<Rank> playerLevel;
private SimpleStringProperty scores; private SimpleStringProperty scores;
private SimpleObjectProperty<ValorantAgent> favoriteAgent; private SimpleStringProperty favoriteAgent;
private SimpleObjectProperty<R6Attacker> favoriteAttacker; private SimpleStringProperty favoriteAttacker;
private SimpleObjectProperty<R6Defender> favoriteDefender; private SimpleStringProperty favoriteDefender;
public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores) { public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores) {
this.playerNumber = new SimpleIntegerProperty(playerNumber); this.playerNumber = new SimpleIntegerProperty(playerNumber);
this.playerName = new SimpleStringProperty(playerName.getFullName()); this.playerName = new SimpleStringProperty(playerName.getFullName());
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel); this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", "")); this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
this.favoriteAgent = null; this.favoriteAgent = new SimpleStringProperty("N/A");
this.favoriteAttacker = null; this.favoriteAttacker = new SimpleStringProperty("N/A");
this.favoriteDefender = null; this.favoriteDefender = new SimpleStringProperty("N/A");
} }
public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores, ValorantAgent favoriteAgent) { public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores, ValorantAgent favoriteAgent) {
@ -34,9 +34,9 @@ public class CompetitorRow {
this.playerName = new SimpleStringProperty(playerName.getFullName()); this.playerName = new SimpleStringProperty(playerName.getFullName());
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", "")); this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel); this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
this.favoriteAgent = new SimpleObjectProperty<ValorantAgent>(favoriteAgent); this.favoriteAgent = new SimpleStringProperty(favoriteAgent.getAgent());
this.favoriteAttacker = null; this.favoriteAttacker = new SimpleStringProperty("N/A");
this.favoriteDefender = null; this.favoriteDefender = new SimpleStringProperty("N/A");
} }
public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores, R6Attacker favoriteAttacker, R6Defender favoriteDefender) { public CompetitorRow(int playerNumber, Name playerName, Rank playerLevel, int[] scores, R6Attacker favoriteAttacker, R6Defender favoriteDefender) {
@ -44,9 +44,9 @@ public class CompetitorRow {
this.playerNumber = new SimpleIntegerProperty(playerNumber); this.playerNumber = new SimpleIntegerProperty(playerNumber);
this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", "")); this.scores = new SimpleStringProperty(Arrays.toString(scores).replace("[", "").replace("]", ""));
this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel); this.playerLevel = new SimpleObjectProperty<Rank>(playerLevel);
this.favoriteAgent = null; this.favoriteAgent = new SimpleStringProperty("N/A");
this.favoriteAttacker = new SimpleObjectProperty<R6Attacker>(favoriteAttacker); this.favoriteAttacker = new SimpleStringProperty(favoriteAttacker.getAttacker());
this.favoriteDefender = new SimpleObjectProperty<R6Defender>(favoriteDefender); this.favoriteDefender = new SimpleStringProperty(favoriteDefender.getDefender());
} }
public void setPlayerNumber(int newValue) { public void setPlayerNumber(int newValue) {
@ -61,13 +61,13 @@ public class CompetitorRow {
public void setScores(String newValue) { public void setScores(String newValue) {
this.scores.set(newValue); this.scores.set(newValue);
} }
public void setFavoriteAgent(ValorantAgent newValue) { public void setFavoriteAgent(String newValue) {
this.favoriteAgent.set(newValue); this.favoriteAgent.set(newValue);
} }
public void setFavoriteAttacker(R6Attacker newValue) { public void setFavoriteAttacker(String newValue) {
this.favoriteAttacker.set(newValue); this.favoriteAttacker.set(newValue);
} }
public void setFavoriteDefender(R6Defender newValue) { public void setFavoriteDefender(String newValue) {
this.favoriteDefender.set(newValue); this.favoriteDefender.set(newValue);
} }
@ -83,13 +83,13 @@ public class CompetitorRow {
public String getScores() { public String getScores() {
return this.scores.get(); return this.scores.get();
} }
public ValorantAgent getFavoriteAgent() { public String getFavoriteAgent() {
return this.favoriteAgent.get(); return this.favoriteAgent.get();
} }
public R6Attacker getFavoriteAttacker() { public String getFavoriteAttacker() {
return this.favoriteAttacker.get(); return this.favoriteAttacker.get();
} }
public R6Defender getFavoriteDefender() { public String getFavoriteDefender() {
return this.favoriteDefender.get(); return this.favoriteDefender.get();
} }
} }

17
src/main/java/com/r0r5chach/MainController.java
View File

@ -134,20 +134,30 @@ public class MainController implements Initializable {
TableColumn<CompetitorRow,String> playerNameCol = new TableColumn<CompetitorRow,String>("Player Name"); TableColumn<CompetitorRow,String> playerNameCol = new TableColumn<CompetitorRow,String>("Player Name");
TableColumn<CompetitorRow,Rank> playerLevelCol = new TableColumn<CompetitorRow,Rank>("Player Level"); TableColumn<CompetitorRow,Rank> playerLevelCol = new TableColumn<CompetitorRow,Rank>("Player Level");
TableColumn<CompetitorRow,String> scoresCol = new TableColumn<CompetitorRow,String>("Player Scores"); TableColumn<CompetitorRow,String> scoresCol = new TableColumn<CompetitorRow,String>("Player Scores");
TableColumn<CompetitorRow,String> favoriteCharsCol = new TableColumn<CompetitorRow,String>("Favorite Characters");
TableColumn<CompetitorRow,String> favoriteAgentCol = new TableColumn<CompetitorRow,String>("Agent");
TableColumn<CompetitorRow,String> favoriteAttackerCol = new TableColumn<CompetitorRow,String>("Attacker");
TableColumn<CompetitorRow,String> favoriteDefenderCol = new TableColumn<CompetitorRow,String>("Defender");
playerNumCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,Integer>("playerNumber")); playerNumCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,Integer>("playerNumber"));
playerNameCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,String>("playerName")); playerNameCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,String>("playerName"));
playerLevelCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,Rank>("playerLevel")); playerLevelCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,Rank>("playerLevel"));
scoresCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,String>("scores")); scoresCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,String>("scores"));
favoriteAgentCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,String>("favoriteAgent"));
favoriteAttackerCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,String>("favoriteAttacker"));
favoriteDefenderCol.setCellValueFactory(new PropertyValueFactory<CompetitorRow,String>("favoriteDefender"));
competitorTable.getColumns().add(playerNumCol); competitorTable.getColumns().add(playerNumCol);
competitorTable.getColumns().add(playerNameCol); competitorTable.getColumns().add(playerNameCol);
competitorTable.getColumns().add(playerLevelCol); competitorTable.getColumns().add(playerLevelCol);
competitorTable.getColumns().add(scoresCol); competitorTable.getColumns().add(scoresCol);
favoriteCharsCol.getColumns().add(favoriteAgentCol);
favoriteCharsCol.getColumns().add(favoriteAttackerCol);
favoriteCharsCol.getColumns().add(favoriteDefenderCol);
competitorTable.getColumns().add(favoriteCharsCol);
} }
@FXML @FXML
private void loadView() { private void loadView() {
competitorTable.setItems(generateTable()); competitorTable.setItems(generateTable());
//TODO: Add favorite characters
} }
private void loadPlayer(Competitor player) { private void loadPlayer(Competitor player) {
@ -216,12 +226,9 @@ public class MainController implements Initializable {
if (player instanceof ValorantPlayer) { if (player instanceof ValorantPlayer) {
list.add(new CompetitorRow(player.getPlayerNumber(), player.getPlayerName(), player.getPlayerLevel(), player.getScores(), ((ValorantPlayer) player).getFavoriteAgent())); list.add(new CompetitorRow(player.getPlayerNumber(), player.getPlayerName(), player.getPlayerLevel(), player.getScores(), ((ValorantPlayer) player).getFavoriteAgent()));
} }
else if (player instanceof R6Player) { if (player instanceof R6Player) {
list.add(new CompetitorRow(player.getPlayerNumber(), player.getPlayerName(), player.getPlayerLevel(), player.getScores(), ((R6Player) player).getFavoriteAttacker(), ((R6Player) player).getFavoriteDefender())); list.add(new CompetitorRow(player.getPlayerNumber(), player.getPlayerName(), player.getPlayerLevel(), player.getScores(), ((R6Player) player).getFavoriteAttacker(), ((R6Player) player).getFavoriteDefender()));
} }
else {
list.add(new CompetitorRow(player.getPlayerNumber(), player.getPlayerName(), player.getPlayerLevel(), player.getScores()));
}
} }
return FXCollections.observableArrayList(list); return FXCollections.observableArrayList(list);
} }