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

Worked on making a visual component to the stats. Need to implement acceleration.

Browse Source 
#story[1274]
This commit is contained in:
Kusal Ekanayake
2017-09-22 16:45:10 +12:00
parent faeece27ff
commit b05580f018
6 changed files with 108 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/model/ServerYacht.java
+28 -22
View File
@@ -23,7 +23,8 @@ public class ServerYacht {
//Boat info
private String boatType;
private Double turn_step;
private Double turnStep = 10.0;
private Double maxSpeedMultiplier = 1.0;
private Integer sourceId;
private String hullID; //matches HullNum in the XML spec.
private String shortName;
@@ -172,7 +173,7 @@ public class ServerYacht {
if (isAuto) {
turnTowardsHeading(autoHeading);
if (Math.abs(heading - autoHeading)
<= turn_step) { //Cancel when within 1 turn step of target.
<= turnStep) { //Cancel when within 1 turn step of target.
isAuto = false;
}
}
@@ -187,20 +188,20 @@ public class ServerYacht {
Double normalizedHeading = normalizeHeading();
if (normalizedHeading == 0) {
if (lastHeading < 180) {
adjustHeading(-turn_step);
adjustHeading(-turnStep);
} else {
adjustHeading(turn_step);
adjustHeading(turnStep);
}
} else if (normalizedHeading == 180) {
if (lastHeading < 180) {
adjustHeading(turn_step);
adjustHeading(turnStep);
} else {
adjustHeading(-turn_step);
adjustHeading(-turnStep);
}
} else if (normalizedHeading < 180) {
adjustHeading(-turn_step);
adjustHeading(-turnStep);
} else {
adjustHeading(turn_step);
adjustHeading(turnStep);
}
}
@@ -209,20 +210,20 @@ public class ServerYacht {
Double normalizedHeading = normalizeHeading();
if (normalizedHeading == 0) {
if (lastHeading < 180) {
adjustHeading(turn_step);
adjustHeading(turnStep);
} else {
adjustHeading(-turn_step);
adjustHeading(-turnStep);
}
} else if (normalizedHeading == 180) {
if (lastHeading < 180) {
adjustHeading(-turn_step);
adjustHeading(-turnStep);
} else {
adjustHeading(turn_step);
adjustHeading(turnStep);
}
} else if (normalizedHeading < 180) {
adjustHeading(turn_step);
adjustHeading(turnStep);
} else {
adjustHeading(-turn_step);
adjustHeading(-turnStep);
}
}
@@ -266,9 +267,9 @@ public class ServerYacht {
private void turnTowardsHeading(Double newHeading) {
Double newVal = heading - newHeading;
if (Math.floorMod(newVal.longValue(), 360L) > 180) {
adjustHeading(turn_step / 5);
adjustHeading(turnStep / 5);
} else {
adjustHeading(-turn_step / 5);
adjustHeading(-turnStep / 5);
}
}
@@ -420,16 +421,21 @@ public class ServerYacht {
}
public void setBoatType(String boatType) {
if (boatType == BoatMeshType.DINGHY.toString()) {
turn_step = 5.0;
} else if (boatType == BoatMeshType.CAT_ATE_A_MERINGUE.toString()){
turn_step = 10.0;
} else {
turn_step = 7.0;
BoatMeshType boatMeshType;
for (BoatMeshType boatMesh: BoatMeshType.values()) {
if (boatType == boatMesh.toString()) {
boatMeshType = boatMesh;
turnStep = boatMeshType.turnStep;
maxSpeedMultiplier = boatMeshType.maxSpeedMultiplier;
}
}
this.boatType = boatType;
}
public Double getMaxSpeedMultiplier() {
return maxSpeedMultiplier;
}
public String getBoatType() {
return boatType;
}