code cleanup

Author: mattbgold

src/controllers/game/ai/controller.ts

@@ -9,8 +9,8 @@ import {InputStateManager} from "../../../services/state/input/service";
 export class AIController extends BaseController {
 	constructor(
 		private _game: Game,
-		@inject('gameState') private _gameState: GameStateManager,
-		@inject('inputState') private _inputState: InputStateManager,
+		private _gameState: GameStateManager,
+		private _inputState: InputStateManager,
 		@inject('config') private _config: GameConfig
 	) {
 		super();

src/controllers/game/contextmenu/controller.ts

@@ -14,8 +14,8 @@ export class ContextMenuController extends BaseController {
 
 	constructor(
 		private _game: Game,
-		@inject('gameState') private _gameState: GameStateManager,
-		@inject('inputState') private _inputState: InputStateManager,
+		private _gameState: GameStateManager,
+		private _inputState: InputStateManager,
 		@inject('config') private _config: GameConfig
 	) {
 		super();

src/controllers/game/controller.ts

@@ -11,7 +11,7 @@ import {GameEvent, GameStateManager} from "../../services/state/game/service";
 export class GameController extends BaseController {
 	constructor(
 		private _game: Game,
-		@inject('gameState') private _gameState: GameStateManager,
+		private _gameState: GameStateManager,
 		@inject('config') private _config: GameConfig,
 		@inject('IMapBuilder') private _mapBuilder: IMapBuilder
 	) {

src/controllers/game/grid/controller.ts

@@ -20,8 +20,8 @@ export class GridController extends BaseController {
 
 	constructor(
 		private _game: Game,
-		@inject('gameState') private _gameState: GameStateManager,
-		@inject('inputState') private _inputState: InputStateManager,
+		private _gameState: GameStateManager,
+		private _inputState: InputStateManager,
 		@inject('IMapBuilder') private _mapBuilder: IMapBuilder
 	) {
 		super();
@@ -36,7 +36,7 @@ export class GridController extends BaseController {
 		this._gameState.subscribe(GameEvent.UnitMoveCompleted, (): void => {this._canActivateCells = true;});
 
 		this.cells = this._mapBuilder.buildGrid();
-		this._gameState.set('cells', this.cells);
+		this._gameState.cells = this.cells;
 
 		this._game.iso.simpleSort(this._game['isoGridGroup']);
 	}
@@ -211,9 +211,7 @@ export class GridController extends BaseController {
 	}
 
 	private _getUnitAt(cell: GridCell): BaseUnit {
-		let units: BaseUnit[] = this._gameState.get('units');
-
-		return units.find(unit => unit.x === cell.x && unit.y === cell.y)
+		return this._gameState.units.find(unit => unit.x === cell.x && unit.y === cell.y)
 	}
 
 	private _getCellAt(unit: BaseUnit): GridCell {

src/controllers/game/unit/controller.ts

@@ -16,7 +16,7 @@ export class UnitController extends BaseController {
 
 	constructor(
 		private _game: Game,
-		@inject('gameState') private _gameState: GameStateManager,
+		private _gameState: GameStateManager,
 		@inject('config') private _config: GameConfig,
 		@inject('IMapBuilder') private _mapBuilder: IMapBuilder
 	) {
@@ -32,7 +32,7 @@ export class UnitController extends BaseController {
 		this._gameState.subscribe(GameEvent.UnitAttack, this._onUnitAttack);
 
 		this.units = this._mapBuilder.buildUnits();
-		this._gameState.set('units', this.units);
+		this._gameState.units = this.units;
 	}
 
 	update() {

src/controllers/input/controller.ts

@@ -13,8 +13,10 @@ export class InputController extends BaseController {
 	private _attackKey: Key; //TODO: move all shortcut keys to a map
 	private _isAttackKeyDown: boolean;
 
-	constructor(private _game: Game,
-	            @inject('inputState') private _inputState: InputStateManager){
+	constructor(
+		private _game: Game, 
+        private _inputState: InputStateManager
+	) {
 		super();
 	}
 

src/inversify.config.ts

@@ -29,8 +29,8 @@ container.bind<ContextMenuController>(ContextMenuController).toSelf().inSingleto
 container.bind<GridController>(GridController).toSelf().inSingletonScope();
 container.bind<UnitController>(UnitController).toSelf().inSingletonScope();
 
-container.bind<IStateManager>('gameState').to(GameStateManager).inSingletonScope();
-container.bind<IStateManager>('inputState').to(InputStateManager).inSingletonScope();
+container.bind<GameStateManager>(GameStateManager).toSelf().inSingletonScope();
+container.bind<InputStateManager>(InputStateManager).toSelf().inSingletonScope();
 
 container.bind<IMapBuilder>('IMapBuilder').to(MapBuilder).inSingletonScope();
 

src/services/army_command_strategy/factory/service.ts

@@ -3,13 +3,16 @@ import {IArmyCommandStrategyFactory} from "./interface";
 import {ArmyCommandStrategy} from "../service";
 import Game = Phaser.Game;
 import {IArmyCommandStrategy} from "../interface";
+import {GameStateManager} from "../../state/game/service";
 
 export class ArmyCommandStrategyFactory implements IArmyCommandStrategyFactory {
-	constructor(private _game: Game) {
+	constructor(
+		private _gameState: GameStateManager
+	) {
 	}
 
 	getForPlayer(playerNum: number): IArmyCommandStrategy {
 		//TODO: configure difficulty, strategy, etc...
-		return new ArmyCommandStrategy(playerNum, this._game);
+		return new ArmyCommandStrategy(playerNum, this._gameState);
 	}
 }

src/services/army_command_strategy/service.ts

@@ -2,9 +2,14 @@ import * as Phaser from 'phaser';
 import {IArmyCommandStrategy} from "./interface";
 import {GameController} from "../../controllers/game/controller";
 import Game = Phaser.Game;
+import {GameStateManager} from "../state/game/service";
 
 export class ArmyCommandStrategy implements IArmyCommandStrategy {
-	constructor(private _playerNum: number, private _game: Game) {
+	constructor(
+		private _playerNum: number, 
+		private _gameState: GameStateManager
+	) {
+	
 	}
 
 	executeTurn() {

src/services/state/base.ts

@@ -4,10 +4,11 @@ import Signal = Phaser.Signal;
 import {injectable} from "inversify";
 
 @injectable()
-export abstract class BaseStateManager implements IStateManager {
+export abstract class BaseStateManager {
 	private _cache: {[key:string]: any} = {};
 	protected signals: {[key: number]: Signal} = {};
 
+	//TODO: localStorage
 	set(key: string, obj: any):void {
 		this._cache[key] = obj;
 	}