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

Merge branch 'issue68_boat_not_turning_on_starbord_vmg' into 'develop'

Browse Source 
the boat can now turn after snapping to starboard vmg #story[1273]



See merge request !75
This commit is contained in:
Michael Rausch
2017-09-26 18:11:24 +13:00
parent 132a729758 dd43097677
commit 9e4fa30787
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/model/ServerYacht.java
+6 -5
View File
@@ -156,11 +156,11 @@ public class ServerYacht {
/** /**
* Enables the boats auto pilot feature, which will move the boat towards a given heading. * Enables the boats auto pilot feature, which will move the boat towards a given heading.
* *
* @param thisHeading The heading to move the boat towards. * @param newHeading The heading to move the boat towards.
*/ */
private void setAutoPilot(Double thisHeading) { private void setAutoPilot(Double newHeading) {
isAuto = true; isAuto = true;
autoHeading = thisHeading; autoHeading = newHeading;
} }
/** /**
@@ -178,8 +178,9 @@ public class ServerYacht {
if (isAuto) { if (isAuto) {
turnTowardsHeading(autoHeading); turnTowardsHeading(autoHeading);
if (Math.abs(heading - autoHeading) if (Math.abs(heading - autoHeading)
<= turnStep) { //Cancel when within 1 turn step of target. <= turnStep*1.5) {
isAuto = false; isAuto = false;
setHeading(autoHeading);
} }
} }
} }
@@ -265,7 +266,7 @@ public class ServerYacht {
// Take optimal heading and turn into a boat heading rather than a wind heading. // Take optimal heading and turn into a boat heading rather than a wind heading.
optimalHeading = optimalHeading =
optimalHeading + GameState.getWindDirection(); (optimalHeading + GameState.getWindDirection()) % 360;
setAutoPilot(optimalHeading); setAutoPilot(optimalHeading);
} }