Added preliminary icons for pickups

RaceView now has a grid pane to contain some icons to display power ups. These are just preliminary

ClientYacht now has a power up field that is set from recieveing messages in the Game Client, as well as observed by the RaceViewController to display the relevant icon when the powerup field is changed

#story[1245]

src/main/java/seng302/gameServer/GameState.java

@@ -47,6 +47,7 @@ public class GameState implements Runnable {
     private static final Double BOUNCE_DISTANCE_MARK = 20.0;
     public static final Double BOUNCE_DISTANCE_YACHT = 30.0;
     private static final Double COLLISION_VELOCITY_PENALTY = 0.3;
+    private static final Integer VELOCITY_BOOST_MULTIPLIER = 2;
 
     private static Long previousUpdateTime;
     public static Double windDirection;
@@ -453,8 +454,7 @@ public class GameState implements Runnable {
         Double maxBoatSpeed = GeoUtility.knotsToMMS(boatSpeedInKnots) * speedMultiplier;
         if (yacht.getPowerUp() != null) {
             if (yacht.getPowerUp().equals(TokenType.BOOST)) {
-                // TODO: 11/09/17 wmu16 CHANGE THIS TO MAGIC NUMBER
+                maxBoatSpeed *= VELOCITY_BOOST_MULTIPLIER;
-                maxBoatSpeed *= 2;
             }
         }
 

src/main/java/seng302/model/ClientYacht.java

@@ -12,9 +12,13 @@ import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.beans.property.ReadOnlyLongProperty;
 import javafx.beans.property.ReadOnlyLongWrapper;
+import javafx.beans.value.ObservableObjectValue;
+import javafx.collections.FXCollections;
 import javafx.scene.paint.Color;
+import jdk.nashorn.internal.objects.annotations.Function;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import seng302.model.token.TokenType;
 
 /**
  * Yacht class for the racing boat. <p> Class created to store more variables (eg. boat statuses)
@@ -34,6 +38,12 @@ public class ClientYacht extends Observable {
         void notifyRounding(ClientYacht yacht, int legNumber);
     }
 
+    @FunctionalInterface
+    public interface PowerUpListener {
+
+        void notifyPowerUp(ClientYacht yacht, TokenType tokenType);
+    }
+
     private Logger logger = LoggerFactory.getLogger(ClientYacht.class);
 
 
@@ -44,6 +54,7 @@ public class ClientYacht extends Observable {
     private String boatName;
     private String country;
     private Integer position;
+    private TokenType powerUp;
 
     private Long estimateTimeAtFinish;
     private Boolean sailIn = false;
@@ -58,6 +69,7 @@ public class ClientYacht extends Observable {
 
     private List<YachtLocationListener> locationListeners = new ArrayList<>();
     private List<MarkRoundingListener> markRoundingListeners = new ArrayList<>();
+    private List<PowerUpListener> powerUpListeners = new ArrayList<>();
     private ReadOnlyDoubleWrapper velocityProperty = new ReadOnlyDoubleWrapper();
     private ReadOnlyLongWrapper timeTillNextProperty = new ReadOnlyLongWrapper();
     private ReadOnlyLongWrapper timeSinceLastMarkProperty = new ReadOnlyLongWrapper();
@@ -199,6 +211,17 @@ public class ClientYacht extends Observable {
         this.position = position;
     }
 
+    public void setPowerUp(TokenType tokenType) {
+        this.powerUp = tokenType;
+        for (PowerUpListener listener : powerUpListeners) {
+            listener.notifyPowerUp(this, tokenType);
+        }
+    }
+
+    public TokenType getPowerUp() {
+        return powerUp;
+    }
+
     public void toggleSail() {
         sailIn = !sailIn;
     }
@@ -268,6 +291,10 @@ public class ClientYacht extends Observable {
         markRoundingListeners.add(listener);
     }
 
+    public void addPowerUpListener(PowerUpListener listener) {
+        powerUpListeners.add(listener);
+    }
+
     public void removeMarkRoundingListener(MarkRoundingListener listener) {
         markRoundingListeners.remove(listener);
     }

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

@@ -37,6 +37,7 @@ import seng302.model.stream.parser.RaceStatusData;
 import seng302.model.stream.parser.YachtEventData;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.model.stream.xml.parser.RegattaXMLData;
+import seng302.model.token.TokenType;
 import seng302.utilities.Sounds;
 import seng302.utilities.StreamParser;
 import seng302.utilities.XMLGenerator;
@@ -245,7 +246,7 @@ public class GameClient {
                     break;
 
                 case YACHT_EVENT_CODE:
-                    displayYachtEvent(StreamParser.extractYachtEventCode(packet));
+                    processYachtEvent(StreamParser.extractYachtEventCode(packet));
                     break;
 
                 case CHATTER_TEXT:
@@ -408,19 +409,25 @@ public class GameClient {
      *
      * @param yachtEventData The YachtEvent data packet
      */
-    private void displayYachtEvent(YachtEventData yachtEventData) {
+    private void processYachtEvent(YachtEventData yachtEventData) {
         if (yachtEventData.getEventId() == YachtEventType.COLLISION.getCode()) {
             showCollisionAlert(yachtEventData);
-        } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_VELOCITY.getCode()) {
+        } else {
-            showPickUp(yachtEventData);
+            TokenType tokenType = null;
-        } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_BUMPER.getCode()) {
+            if (yachtEventData.getEventId() == YachtEventType.TOKEN_VELOCITY.getCode()) {
-            showPickUp(yachtEventData);
+                tokenType = TokenType.BOOST;
-        } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_HANDLING.getCode()) {
+            } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_BUMPER.getCode()) {
-            showPickUp(yachtEventData);
+                tokenType = TokenType.BUMPER;
-        } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_RANDOM.getCode()) {
+            } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_HANDLING.getCode()) {
-            showPickUp(yachtEventData);
+                tokenType = TokenType.HANDLING;
-        } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_WIND_WALKER.getCode()) {
+            } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_RANDOM.getCode()) {
-            showPickUp(yachtEventData);
+                tokenType = TokenType.RANDOM;
+            } else if (yachtEventData.getEventId() == YachtEventType.TOKEN_WIND_WALKER.getCode()) {
+                tokenType = TokenType.WIND_WALKER;
+            }
+
+            showTokenPickUp(tokenType);
+            allBoatsMap.get(yachtEventData.getSubjectId().intValue()).setPowerUp(tokenType);
         }
     }
 
@@ -437,7 +444,7 @@ public class GameClient {
     }
 
     // TODO: 11/09/17 wmu16 - Add in functionality to viually indicate a pickup to a user
-    private void showPickUp(YachtEventData yachtEventData) {
+    private void showTokenPickUp(TokenType tokenType) {
         Sounds.playTokenPickupSound();
     }
 

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

@@ -20,6 +20,8 @@ import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Point2D;
+import javafx.scene.Group;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.SubScene;
 import javafx.scene.chart.LineChart;
@@ -47,10 +49,12 @@ import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import seng302.model.ClientYacht;
+import seng302.model.ClientYacht.PowerUpListener;
 import seng302.model.RaceState;
 import seng302.model.mark.CompoundMark;
 import seng302.model.mark.Mark;
 import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.token.TokenType;
 import seng302.utilities.Sounds;
 import seng302.visualiser.GameView3D;
 import seng302.visualiser.controllers.annotations.ImportantAnnotationController;
@@ -60,6 +64,8 @@ import seng302.visualiser.controllers.dialogs.FinishDialogController;
 import seng302.visualiser.fxObjects.ChatHistory;
 import seng302.visualiser.fxObjects.assets_2D.WindArrow;
 import seng302.visualiser.fxObjects.assets_3D.BoatObject;
+import seng302.visualiser.fxObjects.assets_3D.ModelFactory;
+import seng302.visualiser.fxObjects.assets_3D.ModelType;
 
 /**
  * Controller class that manages the display of a race
@@ -110,6 +116,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Label windSpeedLabel;
     @FXML
     private Label positionLabel, boatSpeedLabel, boatHeadingLabel;
+    @FXML
+    private ImageView velocityIcon, handlingIcon, windWalkerIcon, bumperIcon;
 
     //Race Data
     private Map<Integer, ClientYacht> participants;
@@ -222,6 +230,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return finishScreenDialog;
     }
 
+
     public void loadRace (
         Map<Integer, ClientYacht> participants, RaceXMLData raceData, RaceState raceState,
         ClientYacht player) {
@@ -241,6 +250,25 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             }
         });
 
+        player.addPowerUpListener((yacht, tokenType) -> {
+            if (yacht == player) {
+                switch (tokenType) {
+                    case BOOST:
+                        velocityIcon.setVisible(true);
+                        break;
+                    case HANDLING:
+                        handlingIcon.setVisible(true);
+                        break;
+                    case WIND_WALKER:
+                        windWalkerIcon.setVisible(true);
+                        break;
+                    case BUMPER:
+                        bumperIcon.setVisible(true);
+                        break;
+                }
+            }
+        });
+
         updateOrder(raceState.getPlayerPositions());
         gameView = new GameView3D();
 //        gameView.setFrameRateFXText(fpsDisplay);
@@ -279,6 +307,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
     }
 
+
     /**
      * The important annotations have been changed, update this view
      *

src/main/resources/views/RaceView.fxml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.*?>
+<?import javafx.scene.shape.*?>
+<?import com.jfoenix.controls.*?>
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import com.jfoenix.controls.JFXButton?>
 <?import com.jfoenix.controls.JFXTextField?>
 <?import java.lang.String?>
@@ -14,6 +23,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
+
 <AnchorPane fx:id="rvAnchorPane" maxHeight="1.7976931348623157E308"
   maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0"
   prefWidth="1200.0" style="-fx-background-color: lightblue;" xmlns="http://javafx.com/javafx/8"
@@ -235,6 +245,57 @@
                                <Insets bottom="10.0" left="10.0" top="40.0"/>
                            </GridPane.margin>
                        </GridPane>
+                       <GridPane GridPane.columnIndex="1" GridPane.rowIndex="2">
+                           <columnConstraints>
+                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+                                 prefWidth="100.0"/>
+                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+                                 prefWidth="100.0"/>
+                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+                                 prefWidth="100.0"/>
+                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+                                 prefWidth="100.0"/>
+                           </columnConstraints>
+                           <rowConstraints>
+                               <RowConstraints minHeight="10.0" prefHeight="30.0"
+                                 vgrow="SOMETIMES"/>
+                               <RowConstraints minHeight="10.0" prefHeight="30.0"
+                                 vgrow="SOMETIMES"/>
+                           </rowConstraints>
+                           <children>
+                               <ImageView fx:id="velocityIcon" fitHeight="123.0" fitWidth="139.0"
+                                 pickOnBounds="true" preserveRatio="true" visible="false"
+                                 GridPane.halignment="CENTER" GridPane.rowIndex="1">
+                                   <image>
+                                       <Image url="@../icons/velocity.png"/>
+                                   </image>
+                               </ImageView>
+                               <ImageView fx:id="handlingIcon" fitHeight="123.0" fitWidth="139.0"
+                                 pickOnBounds="true" preserveRatio="true" visible="false"
+                                 GridPane.columnIndex="1" GridPane.halignment="CENTER"
+                                 GridPane.rowIndex="1">
+                                   <image>
+                                       <Image url="@../icons/handlingIcon.png"/>
+                                   </image>
+                               </ImageView>
+                               <ImageView fx:id="windWalkerIcon" fitHeight="123.0" fitWidth="139.0"
+                                 pickOnBounds="true" preserveRatio="true" visible="false"
+                                 GridPane.columnIndex="2" GridPane.halignment="CENTER"
+                                 GridPane.rowIndex="1">
+                                   <image>
+                                       <Image url="@../icons/windWalkerIcon.png"/>
+                                   </image>
+                               </ImageView>
+                               <ImageView fx:id="bumperIcon" fitHeight="123.0" fitWidth="139.0"
+                                 pickOnBounds="true" preserveRatio="true" visible="false"
+                                 GridPane.columnIndex="3" GridPane.halignment="CENTER"
+                                 GridPane.rowIndex="1">
+                                   <image>
+                                       <Image url="@../icons/bumperIcon.png"/>
+                                   </image>
+                               </ImageView>
+                           </children>
+                       </GridPane>
                    </children>
                </GridPane>
            </children>