Created Boat bumper logic. Refactored logic for powering up / dpwn

YachtEventType: Added some new events, a generic power down event and a bumper_crash event for an affected boat
GameState: Implemented boat bumper logic
MessageFactory: Made new messages for powerdown and status effect
ClientYacht: Had to create another powerDown functional interface to inform the race view controller when to turn off the icon
RaceViewController/GameClient: Now waits for a message about powering down before turning off rather than waiting time client side

#story[1293]

src/main/java/seng302/visualiser/GameClient.java

@@ -410,8 +410,15 @@ public class GameClient {
      * @param yachtEventData The YachtEvent data packet
      */
     private void processYachtEvent(YachtEventData yachtEventData) {
+        ClientYacht thisYacht = allBoatsMap.get(yachtEventData.getSubjectId().intValue());
+
         if (yachtEventData.getEventId() == YachtEventType.COLLISION.getCode()) {
             showCollisionAlert(yachtEventData);
+        } else if (yachtEventData.getEventId() == YachtEventType.POWER_DOWN.getCode()) {
+            thisYacht.powerDown();
+            Sounds.playTokenPickupSound();  // TODO: 23/09/17 This should be power down sound
+        } else if (yachtEventData.getEventId() == YachtEventType.BUMPER_CRASH.getCode()) {
+            // TODO: 23/09/17 notify the client that the yacht has been disabled
         } else {
             TokenType tokenType = null;
             if (yachtEventData.getEventId() == YachtEventType.TOKEN_VELOCITY.getCode()) {
@@ -427,7 +434,7 @@ public class GameClient {
             }
 
             showTokenPickUp(tokenType);
-            allBoatsMap.get(yachtEventData.getSubjectId().intValue()).setPowerUp(tokenType);
+            thisYacht.setPowerUp(tokenType);
         }
     }
 

src/main/java/seng302/visualiser/controllers/RaceViewController.java

@@ -48,6 +48,7 @@ import javafx.scene.shape.Polyline;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
+import javax.swing.ImageIcon;
 import seng302.model.ClientYacht;
 import seng302.model.ClientYacht.PowerUpListener;
 import seng302.model.RaceState;
@@ -140,6 +141,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private JFXDialog finishScreenDialog;
     private FinishDialogController finishDialogController;
 
+    //Icon stuff
+    private Timer blinkingTimer = new Timer();
+    private ImageView iconToDisplay;
+
     public void initialize() {
         Sounds.stopMusic();
         Sounds.playRaceMusic();
@@ -253,6 +258,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
 
         player.addPowerUpListener(this::displayPowerUpIcon);
+        player.addPowerDownListener(this::removeIcon);
 
         updateOrder(raceState.getPlayerPositions());
         gameView = new GameView3D();
@@ -301,7 +307,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
      */
     private void displayPowerUpIcon(ClientYacht yacht, TokenType tokenType) {
         if (yacht == player) {
-            final ImageView iconToDisplay;
 
             switch (tokenType) {
                 case BOOST:
@@ -324,7 +329,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             iconToDisplay.setVisible(true);
 
             //Start blinking icon towards end
-            Timer blinkingTimer = new Timer();
+            if (blinkingTimer != null) {
+                blinkingTimer.cancel();
+            }
+            blinkingTimer = new Timer("Blinking Timer");
             blinkingTimer.schedule(new TimerTask() {
                 Boolean isVisible = true;
 
@@ -334,16 +342,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                     iconToDisplay.setVisible(isVisible);
                 }
             }, (int) (tokenType.getTimeout() * ICON_BLINK_TIMEOUT_RATIO), ICON_BLINK_PERIOD);
+        }
+    }
 
-            //Turn icon off after the time out
-            Timer switchOffTimer = new Timer();
-            switchOffTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    blinkingTimer.cancel();
-                    iconToDisplay.setVisible(false);
-                }
-            }, tokenType.getTimeout());
+    public void removeIcon(ClientYacht yacht) {
+        if (yacht == player) {
+            blinkingTimer.cancel();
+            iconToDisplay.setVisible(false);
         }
     }