Merge pull request #46 from justindujardin/test/feature-components

Test/feature components

Author: justindujardin

src/app/components/notification/notification.service.ts

@@ -94,6 +94,10 @@ export class NotificationService implements IWorldObject, IProcessObject {
     };
   }
 
+  getFirst(): INotifyItem | null {
+    return this._current || this._queue[0] || null;
+  }
+
   show(message: string, done?: () => void, duration?: number): INotifyItem {
     const obj: INotifyItem = {
       message,

src/app/models/combat/combat.reducer.ts

@@ -180,4 +180,6 @@ export const sliceCombatLoading = (state: CombatStateRecord) => state.loading;
 /** @internal {@see sliceCombatState} */
 export const sliceCombatEncounterEnemies = (state: CombatStateRecord) => state.enemies;
 /** @internal {@see sliceCombatState} */
+export const sliceCombatType = (state: CombatStateRecord) => state.type;
+/** @internal {@see sliceCombatState} */
 export const sliceCombatEncounterParty = (state: CombatStateRecord) => state.party;

src/app/models/entity/entity.reducer.spec.ts

@@ -4,6 +4,7 @@ import { addEntityToCollection, EntityCollectionRecord } from '../entity-collect
 import {
   GameStateEquipItemAction,
   GameStateHealPartyAction,
+  GameStateHurtPartyAction,
   GameStateUnequipItemAction,
 } from '../game-state/game-state.actions';
 import { Item } from '../item';
@@ -273,6 +274,39 @@ describe('Entity', () => {
         expect(secondHealed.mp).toBe(secondHealed.maxmp);
       });
     });
+    describe('GameStateHurtPartyAction', () => {
+      it('should restore all entities in partyIds hp and mp to their maximum', () => {
+        const secondId: string = 'MotTon';
+        const first = entityFactory({
+          eid: testId,
+          hp: 25,
+          maxhp: 25,
+          mp: 0,
+          maxmp: 25,
+        });
+        const second = entityFactory({
+          eid: secondId,
+          hp: 20,
+          maxhp: 20,
+          mp: 0,
+          maxmp: 25,
+        });
+        const initial: EntityStateRecord = defaultState('beings', [first, second]);
+        const damage = 10;
+        const actual = entityReducer(
+          initial,
+          new GameStateHurtPartyAction({
+            damage,
+            partyIds: [testId, secondId],
+          })
+        );
+        const firstHurt: IPartyMember = actual.beings.byId.get(testId);
+        expect(firstHurt.hp).toBe(first.hp - damage);
+
+        const secondHurt: IPartyMember = actual.beings.byId.get(secondId);
+        expect(secondHurt.hp).toBe(second.hp - damage);
+      });
+    });
 
     describe('CombatVictoryAction', () => {
       function summaryData(

src/app/models/entity/entity.reducer.ts

@@ -13,6 +13,7 @@ import {
 import {
   GameStateEquipItemAction,
   GameStateHealPartyAction,
+  GameStateHurtPartyAction,
   GameStateUnequipItemAction,
 } from '../game-state/game-state.actions';
 import { Armor, Item, Magic, Weapon } from '../item';
@@ -101,6 +102,7 @@ type EntityReducerTypes =
   | GameStateEquipItemAction
   | GameStateUnequipItemAction
   | GameStateHealPartyAction
+  | GameStateHurtPartyAction
   | CombatVictoryAction;
 
 export function entityReducer(
@@ -152,6 +154,23 @@ export function entityReducer(
         return updateBeingsResult;
       });
     }
+    case GameStateHurtPartyAction.typeId: {
+      const result: EntityStateRecord = state;
+      const partyAction: GameStateHurtPartyAction = action;
+      return result.updateIn(['beings'], (beings: EntityCollectionRecord) => {
+        let updateBeingsResult = beings;
+        const damage = action.payload.damage;
+        partyAction.payload.partyIds.forEach((partyMemberId: string) => {
+          const newHp = state.beings.byId.get(partyMemberId).hp - damage;
+          updateBeingsResult = mergeEntityInCollection(
+            updateBeingsResult,
+            { hp: newHp },
+            partyMemberId
+          );
+        });
+        return updateBeingsResult;
+      });
+    }
     case GameStateEquipItemAction.typeId: {
       let result: EntityStateRecord = state;
       const current: Entity = state.beings.byId.get(action.payload.entityId);

src/app/models/game-state/game-state.actions.ts

@@ -194,6 +194,18 @@ export class GameStateHealPartyAction implements Action {
   ) {}
 }
 
+export class GameStateHurtPartyAction implements Action {
+  static typeId: 'GAME_HURT_PARTY' = type('GAME_HURT_PARTY');
+  type = GameStateHurtPartyAction.typeId;
+
+  constructor(
+    public payload: {
+      damage: number;
+      partyIds: string[];
+    }
+  ) {}
+}
+
 export class GameStateSetBattleCounterAction implements Action {
   static typeId: 'GAME_SET_BATTLE_COUNTER' = type('GAME_SET_BATTLE_COUNTER');
   type = GameStateSetBattleCounterAction.typeId;
@@ -265,6 +277,7 @@ export type GameStateActions =
   | GameStateBoardShipAction
   | GameStateAddGoldAction
   | GameStateHealPartyAction
+  | GameStateHurtPartyAction
   | GameStateEquipItemAction
   | GameStateUnequipItemAction
   | GameStateAddInventoryAction

src/app/models/game-state/game-state.reducer.ts

@@ -13,6 +13,7 @@ import {
   GameStateDeleteSuccessAction,
   GameStateEquipItemAction,
   GameStateHealPartyAction,
+  GameStateHurtPartyAction,
   GameStateLoadAction,
   GameStateLoadFailAction,
   GameStateLoadSuccessAction,
@@ -127,6 +128,7 @@ export function gameStateReducer(
     case GameStateSaveAction.typeId:
     case GameStateSaveSuccessAction.typeId:
     case GameStateSaveFailAction.typeId:
+    case GameStateHurtPartyAction.typeId:
       return state;
     case GameStateMoveAction.typeId: {
       if (state.boardedShip) {

src/app/models/selectors.ts

@@ -6,6 +6,7 @@ import {
   sliceCombatEncounterEnemies,
   sliceCombatEncounterParty,
   sliceCombatLoading,
+  sliceCombatType,
 } from './combat/combat.reducer';
 import { Entity, EntityWithEquipment } from './entity/entity.model';
 import {
@@ -54,6 +55,7 @@ import { assertTrue } from './util';
  */
 export const sliceCombatState = (state: AppState) => state.combat;
 
+export const getCombatType = createSelector(sliceCombatState, sliceCombatType);
 export const getCombatLoading = createSelector(sliceCombatState, sliceCombatLoading);
 export const getCombatEncounterParty = createSelector(
   sliceCombatState,

src/app/routes/combat/combat-player.component.ts

@@ -41,7 +41,7 @@ export class CombatPlayerComponent
   @Input() model: IPartyMember;
   // @ts-ignore
   @Input() icon: string;
-  @Input() scene: Scene;
+  @Input() scene: Scene | null;
   @Input() combat: any; // CombatComponent - flirts with circular imports
 
   _elapsed: number = 0;
@@ -258,14 +258,14 @@ export class CombatPlayerComponent
   }
 
   ngAfterViewInit(): void {
-    this.scene.addObject(this);
+    this.scene?.addObject(this);
     this.behaviors.forEach((c: SceneObjectBehavior) => {
       this.addBehavior(c);
     });
   }
 
   ngOnDestroy(): void {
-    this.scene.removeObject(this);
+    this.scene?.removeObject(this);
     this.behaviors.forEach((c: SceneObjectBehavior) => {
       this.removeBehavior(c);
     });

src/app/routes/combat/combat.component.ts

@@ -316,36 +316,24 @@ export class CombatComponent
     this._tileRenderer.render(this.map, this);
     this.party.forEach((component: CombatPlayerComponent) => {
       this.objectRenderer.render(
-        component,
+        component as TileRenderable,
         component.renderPoint || component.point,
-        this,
-        component.meta
+        this
       );
       const sprites = component.findBehaviors(SpriteComponent) as SpriteComponent[];
       sprites.forEach((sprite: SpriteComponent) => {
-        this.objectRenderer.render(
-          sprite as TileRenderable,
-          sprite.host.point,
-          this,
-          sprite.meta
-        );
+        this.objectRenderer.render(sprite as TileRenderable, sprite.host.point, this);
       });
     });
     this.enemies.forEach((component: CombatEnemyComponent) => {
       this.objectRenderer.render(
-        component,
+        component as TileRenderable,
         component.renderPoint || component.point,
-        this,
-        component.meta
+        this
       );
       const sprites: SpriteComponent[] = component.findBehaviors(SpriteComponent);
       sprites.forEach((sprite: SpriteComponent) => {
-        this.objectRenderer.render(
-          sprite as TileRenderable,
-          sprite.host.point,
-          this,
-          sprite.meta
-        );
+        this.objectRenderer.render(sprite as TileRenderable, sprite.host.point, this);
       });
     });
     return this;

src/app/routes/combat/index.ts

@@ -67,6 +67,7 @@ export const COMBAT_PROVIDERS = [CanActivateCombat];
 @NgModule({
   declarations: COMBAT_EXPORTS,
   exports: COMBAT_EXPORTS,
+  providers: COMBAT_PROVIDERS,
   imports: [CommonModule, BehaviorsModule, AppComponentsModule, ServicesModule],
 })
 export class CombatModule {