Merge remote-tracking branch 'origin/master'

2017-09-14 16:27:54 +12:00
parent 004aebceb5 43ee92fb95
commit 86de4e7c0c
8 changed files with 18 additions and 11 deletions
@@ -25,7 +25,7 @@ public enum TutorialState {
    /**
     * State for vmg in tutorial
     */
-    VMG(BoatActionEnum.AUTO_PILOT),
+    VMG(BoatActionEnum.VMG),

    /**
     * State for sails-in in tutorial
@@ -12,7 +12,7 @@ public class SailsToggleKey extends ControlKey {
     * Constructor for Control
     */
    public SailsToggleKey() {
-        super("Toggle Sails", BoatActionEnum.NOT_A_STATUS);
+        super("Toggle Sails", BoatActionEnum.TOGGLE_SAILS);
    }

    /**
@@ -11,7 +11,7 @@ public class VMGKey extends ControlKey{
     * Constructor for Control
     */
    public VMGKey() {
-        super("VMG", BoatActionEnum.AUTO_PILOT);
+        super("VMG", BoatActionEnum.VMG);
    }

    @Override
@@ -1,12 +1,14 @@
 package visualiser.gameController.Keys;

+import network.Messages.Enums.BoatActionEnum;
+
 /**
 * key to zoom into the game
 */
 public class ZoomInKey extends ControlKey {

    public ZoomInKey() {
-        super("Zoom In");
+        super("Zoom In", BoatActionEnum.ZOOM_IN);
    }

    @Override
@@ -1,5 +1,7 @@
 package visualiser.gameController.Keys;

+import network.Messages.Enums.BoatActionEnum;
+
 /**
 * Key to zoom out of the game.
 */
@@ -9,7 +11,7 @@ public class ZoomOutKey extends ControlKey{
     * Constructor for Control
     */
    public ZoomOutKey() {
-        super("Zoom Out");
+        super("Zoom Out", BoatActionEnum.ZOOM_OUT);
    }

    @Override