diff --git a/src/main/java/seng302/model/ServerYacht.java b/src/main/java/seng302/model/ServerYacht.java index 29f7eecc..f2965673 100644 --- a/src/main/java/seng302/model/ServerYacht.java +++ b/src/main/java/seng302/model/ServerYacht.java @@ -24,7 +24,7 @@ public class ServerYacht { //Boat info private String boatType; - private Double turnStep = 10.0; + private Double turnStep = 5.0; private Double maxSpeedMultiplier = 1.0; private Double acceleration = 1.0; private Integer sourceId; @@ -427,7 +427,7 @@ public class ServerYacht { for (BoatMeshType boatMesh: BoatMeshType.values()) { if (Objects.equals(boatType, boatMesh.toString())) { boatMeshType = boatMesh; - turnStep = boatMeshType.turnStep; + turnStep = turnStep * boatMeshType.turnStep; maxSpeedMultiplier = boatMeshType.maxSpeedMultiplier; acceleration = boatMeshType.accelerationMultiplier; } diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java b/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java index 3a71422a..b587b62d 100644 --- a/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java +++ b/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java @@ -57,7 +57,7 @@ public class BoatCustomizeController implements Initializable{ private LobbyController lobbyController; private BoatMeshType currentBoat; private Double maxSpeedMultiplier = 1.0; - private Double maxTurnRate = 10.0; + private Double maxTurnRate = 1.0; private Double maxAcceleration = 1.0; @Override diff --git a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java index 2dc55d30..7dc25d38 100644 --- a/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java +++ b/src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java @@ -7,11 +7,11 @@ package seng302.visualiser.fxObjects.assets_3D; */ public enum BoatMeshType { - DINGHY("dinghy_hull.stl", "dinghy_mast.stl", 1.36653, "dinghy_sail.stl", 1.36653, null, false, 1.7, 1.0, 5.0), + DINGHY("dinghy_hull.stl", "dinghy_mast.stl", 1.36653, "dinghy_sail.stl", 1.36653, null, false, 1.7, 1.0, 1.0), CAT_ATE_A_MERINGUE("catamaran_hull.stl", "catamaran_mast.stl", 0.997, "catamaran_sail.stl", - 0.997, null, false, 1.0, 1.4, 10.0), + 0.997, null, false, 1.0, 1.4, 2.0), PIRATE_SHIP("pirateship_hull.stl", "pirateship_mast.stl", -0.5415, "pirateship_mainsail.stl", - -0.5415, "pirateship_frontsail.stl", true, 1.2, 1.6, 6.0); + -0.5415, "pirateship_frontsail.stl", true, 1.2, 1.6, 1.2); final String hullFile, mastFile, sailFile, jibFile; final double mastOffset, sailOffset;