michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge errors and reimplemented handling multiplier

Browse Source 
#story[1274]
This commit is contained in:
Kusal Ekanayake
2017-09-23 15:04:11 +12:00
parent 9112183ac3
commit 364264377a
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/LobbyController.java
+1 -1
View File
@@ -131,7 +131,7 @@ public class LobbyController implements Initializable {
.get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
.getBoatName());
controller.setCurrentBoat(this.playerBoats.get(ViewManager.getInstance().getGameClient().getServerThread().getClientId())
.getBoatType());
.getBoatType().toString());
return customizationDialog;
}
src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java
+6 -6
View File
@@ -122,7 +122,7 @@ public class BoatCustomizeController implements Initializable{
}
public void setCurrentBoat(String boatType) {
currentBoat = boatType;
currentBoat = BoatMeshType.valueOf(boatType);
displayCurrentBoat();
refreshStatBars(currentBoat);
}
@@ -155,7 +155,7 @@ public class BoatCustomizeController implements Initializable{
boatPane.getChildren().add(group);
BoatModel bo = ModelFactory.boatCustomiseView(currentBoat, colorPicker.getValue());
group.getChildren().add(bo.getAssets());
refreshStatBars(bo);
refreshStatBars(currentBoat);
}
private void generateMaxStats() {
@@ -172,9 +172,9 @@ public class BoatCustomizeController implements Initializable{
}
}
private void refreshStatBars(BoatModel bo) {
speedBar.setProgress((bo.getMeshType().maxSpeedMultiplier) / maxSpeedMultiplier);
accelBar.setProgress(bo.getMeshType().accelerationMultiplier / maxAcceleration);
handleBar.setProgress(bo.getMeshType().turnStep / maxTurnRate);
private void refreshStatBars(BoatMeshType bo) {
speedBar.setProgress((bo.maxSpeedMultiplier) / maxSpeedMultiplier);
accelBar.setProgress(bo.accelerationMultiplier / maxAcceleration);
handleBar.setProgress(bo.turnStep / maxTurnRate);
}
}