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 Boats powering up and down correctly. Icons respond correctly

Browse Source 
#story[1293]
This commit is contained in:
William Muir
2017-09-26 19:43:32 +13:00
parent ab07c7f298
commit 4b7dfe38c4
4 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+2 -16
View File
@@ -78,8 +78,8 @@ public class GameState implements Runnable {
private static final Double COLLISION_VELOCITY_PENALTY = 0.3;
//Powerup Constants
private static final Integer VELOCITY_BOOST_MULTIPLIER = 2;
private static final Integer HANDLING_BOOST_MULTIPLIER = 2;
public static final Integer VELOCITY_BOOST_MULTIPLIER = 2;
public static final Integer HANDLING_BOOST_MULTIPLIER = 2;
public static final Long BUMPER_DISABLE_TIME = 5_000L;
private static final Long TOKEN_SPAWN_TIME = 15_000L;
@@ -550,20 +550,6 @@ public class GameState implements Runnable {
}
TokenType tokenType = collidedToken.getTokenType();
switch (tokenType) {
case BOOST:
yacht.setPowerUpSpeedMultiplier(VELOCITY_BOOST_MULTIPLIER);
break;
case BUMPER:
// TODO: 22/09/17 wmu16
break;
case HANDLING:
yacht.setPowerUpHandlingMultiplier(HANDLING_BOOST_MULTIPLIER);
break;
case WIND_WALKER:
// TODO: 22/09/17 wmu16
break;
}
yacht.powerUp(tokenType);
String logMessage =