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

Merged dev back on

Browse Source 
#story[1293]
This commit is contained in:
William Muir
2017-09-25 11:26:44 +13:00
parent 8a0ad8d6a9
commit 29b97a194d
2 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+15 -9
View File
@@ -433,7 +433,7 @@ public class GameState implements Runnable {
* @param yacht The yacht to disable
*/
private void boatTempShutDown(ServerYacht yacht) {
yacht.setSpeedMultiplier(0);
yacht.setPowerUpSpeedMultiplier(0);
Timer shutDownTimer = new Timer("Shutdown Timer");
shutDownTimer.schedule(new TimerTask() {
@Override
@@ -542,13 +542,13 @@ public class GameState implements Runnable {
TokenType tokenType = collidedToken.getTokenType();
switch (tokenType) {
case BOOST:
yacht.setSpeedMultiplier(VELOCITY_BOOST_MULTIPLIER);
yacht.setPowerUpSpeedMultiplier(VELOCITY_BOOST_MULTIPLIER);
break;
case BUMPER:
// TODO: 22/09/17 wmu16
break;
case HANDLING:
yacht.setHandlingMultiplier(HANDLING_BOOST_MULTIPLIER);
yacht.setPowerUpHandlingMultiplier(HANDLING_BOOST_MULTIPLIER);
break;
case WIND_WALKER:
// TODO: 22/09/17 wmu16
@@ -634,23 +634,29 @@ public class GameState implements Runnable {
Double trueWindAngle = Math.abs(windDirection - yacht.getHeading());
Double boatSpeedInKnots = PolarTable.getBoatSpeed(getWindSpeedKnots(), trueWindAngle);
Double maxBoatSpeed =
GeoUtility.knotsToMMS(boatSpeedInKnots) * serverSpeedMultiplier * yacht.getSpeedMultiplier() * yacht.getMaxSpeedMultiplier();
GeoUtility.knotsToMMS(boatSpeedInKnots) * serverSpeedMultiplier * yacht
.getPowerUpSpeedMultiplier() * yacht.getBoatTypeSpeedMultiplier();
Double currentVelocity = yacht.getCurrentVelocity();
// TODO: 15/08/17 remove magic numbers from these equations.
if (yacht.getSailIn()) {
if (currentVelocity < maxBoatSpeed - 500) {
yacht.changeVelocity((maxBoatSpeed / 100) * yacht.getAccelerationMultiplier());
yacht.changeVelocity(
(maxBoatSpeed / 100) * yacht.getBoatTypeAccelerationMultiplier());
} else if (currentVelocity > maxBoatSpeed + 500) {
yacht.changeVelocity((-currentVelocity / 200) * yacht.getAccelerationMultiplier());
yacht.changeVelocity(
(-currentVelocity / 200) * yacht.getBoatTypeAccelerationMultiplier());
} else {
yacht.setCurrentVelocity((maxBoatSpeed) * yacht.getAccelerationMultiplier());
yacht
.setCurrentVelocity((maxBoatSpeed) * yacht.getBoatTypeAccelerationMultiplier());
}
} else {
if (currentVelocity > 3000) {
yacht.changeVelocity((-currentVelocity / 200) * yacht.getAccelerationMultiplier());
yacht.changeVelocity(
(-currentVelocity / 200) * yacht.getBoatTypeAccelerationMultiplier());
} else if (currentVelocity > 100) {
yacht.changeVelocity((-currentVelocity / 50) * yacht.getAccelerationMultiplier());
yacht.changeVelocity(
(-currentVelocity / 50) * yacht.getBoatTypeAccelerationMultiplier());
} else if (currentVelocity <= 100) {
yacht.setCurrentVelocity(0d);
}