fix: Make sure resources are properly defined for new empires

Author: Clashsoft

src/empire/empire-logic.service.ts

@@ -3,7 +3,13 @@ import {Empire, EmpireDocument} from './empire.schema';
 import {TECH_CATEGORIES, TECHNOLOGIES} from '../game-logic/technologies';
 import {notFound} from '@mean-stream/nestx';
 import {ShipType, Technology, TechnologyTag, Variable} from '../game-logic/types';
-import {calculateVariable, calculateVariables, flatten, getVariables} from '../game-logic/variables';
+import {
+  calculateVariable,
+  calculateVariables,
+  EmpireEffectSources,
+  flatten,
+  getVariables,
+} from '../game-logic/variables';
 import {RESOURCE_NAMES, ResourceName} from '../game-logic/resources';
 import {AggregateResult} from '../game-logic/aggregates';
 import {EMPIRE_VARIABLES} from '../game-logic/empire-variables';
@@ -56,12 +62,9 @@ export class EmpireLogicService {
     empire.markModified('resources');
   }
 
-  getInitialResources(empire: EmpireTemplate): Record<ResourceName, number> {
+  getInitialResources(empire: EmpireEffectSources): Record<ResourceName, number> {
     const resourceVariables: Record<Variable, number> = getVariables('resources');
-    calculateVariables(resourceVariables, {
-      traits: empire.traits,
-      technologies: [],
-    });
+    calculateVariables(resourceVariables, empire);
     const resources: any = {};
     for (const resource of RESOURCE_NAMES) {
       resources[resource] = resourceVariables[`resources.${resource}.starting`];

src/empire/empire.controller.ts

@@ -1,7 +1,8 @@
 import {Body, Controller, ForbiddenException, Get, Param, ParseBoolPipe, Patch, Post, Query} from '@nestjs/common';
 import {
   ApiCreatedResponse,
-  ApiForbiddenResponse, ApiNotFoundResponse,
+  ApiForbiddenResponse,
+  ApiNotFoundResponse,
   ApiOkResponse,
   ApiOperation,
   ApiQuery,
@@ -17,8 +18,8 @@ import {Empire} from './empire.schema';
 import {EmpireService} from './empire.service';
 import {notFound, NotFound, ObjectIdPipe} from '@mean-stream/nestx';
 import {Types} from 'mongoose';
-import {MemberService} from '../member/member.service';
 import {GameService} from '../game/game.service';
+import {EmpireLogicService} from './empire-logic.service';
 
 @Controller('games/:game/empires')
 @ApiTags('Game Empires')
@@ -28,8 +29,8 @@ import {GameService} from '../game/game.service';
 export class EmpireController {
   constructor(
     private readonly gameService: GameService,
-    private readonly memberService: MemberService,
     private readonly empireService: EmpireService,
+    private readonly empireLogicService: EmpireLogicService,
   ) {
   }
 
@@ -50,6 +51,11 @@ export class EmpireController {
       ...dto,
       game,
       user: currentUser._id,
+      // Although dto may specify the resources, there might be some missing. Ensure it is a complete record.
+      resources: {
+        ...this.empireLogicService.getInitialResources(dto),
+        ...dto.resources,
+      },
     });
   }
 

src/empire/empire.service.ts

@@ -70,7 +70,7 @@ export class EmpireService extends MongooseRepository<Empire> {
         game: member.game,
         user: member.user,
         technologies: [],
-        resources: this.empireLogicService.getInitialResources(member.empire!),
+        resources: this.empireLogicService.getInitialResources({traits: member.empire!.traits, technologies: []}),
         homeSystem: undefined, // set in a later stage of game initialization
       });
     }));