Merge pull request #236 from n8rzz/feature/ATC-181

feature/ATC-181

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Major
 - Restructures `src` files into `client` and `server` folders. [#220](https://github.com/n8rzz/atc/issues/220)
 - Updates Node to version 7.0.0 [#184](https://github.com/n8rzz/atc/issues/184)
+- Moves aircraft command logic from `AircraftInstanceModel` to new `AircraftCommander` class [#181](https://github.com/n8rzz/atc/issues/181)
 
 ### Minor
 - Changes `AircraftStripView` text outputs to be all uppercase [#193](https://github.com/n8rzz/atc/issues/193)

src/assets/scripts/client/App.js

@@ -4,6 +4,7 @@ import LoadingView from './LoadingView';
 import AirportController from './airport/AirportController';
 import GameController from './game/GameController';
 import TutorialView from './tutorial/TutorialView';
+import AircraftCommander from './aircraft/AircraftCommander';
 import InputController from './InputController';
 import UiController from './UiController';
 import CanvasController from './canvas/CanvasController';
@@ -57,6 +58,7 @@ export default class App {
         this.contentQueue = null;
         this.airportController = null;
         this.tutorialView = null;
+        this.aircraftCommander = null;
         this.inputController = null;
         this.uiController = null;
         this.canvasController = null;
@@ -104,8 +106,9 @@ export default class App {
         this.airportController = new AirportController(airportLoadList, this.updateRun);
         this.gameController = new GameController(this.getDeltaTime);
         this.tutorialView = new TutorialView(this.$element);
-        this.inputController = new InputController(this.$element);
         this.uiController = new UiController(this.$element);
+        this.aircraftCommander = new AircraftCommander(this.airportController, this.gameController, this.uiController);
+        this.inputController = new InputController(this.$element, this.aircraftCommander);
         this.canvasController = new CanvasController(this.$element);
         this.gameClockView = new GameClockView(this.$element);
 
@@ -163,6 +166,7 @@ export default class App {
         this.airportController = null;
         this.gameController = null;
         this.tutorialView = null;
+        this.aircraftCommander = null;
         this.inputController = null;
         this.uiController = null;
         this.canvasController = null;

src/assets/scripts/client/InputController.js

@@ -85,13 +85,15 @@ export default class InputController {
     /**
      * @constructor
      */
-    constructor($element) {
+    constructor($element, aircraftCommander) {
         this.$element = $element;
         this.$window = null;
         this.$commandInput = null;
         this.$canvases = null;
         this.$sidebar = null;
 
+        this._aircraftCommander = aircraftCommander;
+
         this.input = input;
         this.input.command = '';
         this.input.callsign = '';
@@ -880,6 +882,6 @@ export default class InputController {
 
         const aircraft = prop.aircraft.list[match];
 
-        return aircraft.runCommands(commandParser.args);
+        return this._aircraftCommander.runCommands(aircraft, commandParser.args);
     }
 }