Merge branch 'refs/heads/fix/v1'

Author: Clashsoft

docs/Changelog.md

@@ -114,3 +114,16 @@
 ## Bugfixes
 
 * Fixed isolated system clusters without outgoing links. [#19](https://github.com/sekassel/stp-24-server-tracker/issues/19)
+
+# v1.3.2 (2024-06-17)
+
+## Improvements
+
+* Pop migration now depends on free jobs instead of free capacity.
+* New colonies (`colonized`) start with at least one pop.
+* Attempting to upgrade a system in the wrong order now results in a `400 Bad Request` error.
+
+## Bugfixes
+
+* Fixed a wrong population delta value in the system resource aggregate.
+* Fixed invalid pop growth when a system with capacity 0 is somehow colonized.

src/game-logic/game-logic.service.ts

@@ -314,6 +314,10 @@ export class GameLogicService {
 
   private popGrowth(system: SystemDocument, variables: Record<Variable, number>, aggregates?: Partial<Record<ResourceName, AggregateResult>>) {
     const {population, capacity} = system;
+    if (!capacity) {
+      // Growth calculation will yield NaN. This is probably an uninhabitable system, so just do nothing.
+      return;
+    }
     const growthVariable: Variable = `systems.${system.upgrade}.pop_growth`;
     const growthRate = variables[growthVariable];
     const growth = growthRate * population * Math.clamp(1 - population / capacity, 0, 1); // logistic growth

src/system/system.service.ts

@@ -44,10 +44,6 @@ export class SystemService extends MongooseRepository<System> {
     const {upgrade, districts, buildings, ...rest} = dto;
     system.set(rest);
     if (upgrade) {
-      const upgrades = Object.keys(SYSTEM_UPGRADES);
-      if (upgrades.indexOf(upgrade) !== upgrades.indexOf(system.upgrade) + 1) {
-        throw new BadRequestException(`Invalid upgrade ${upgrade} for system ${system._id}`);
-      }
       await this.upgradeSystem(system, upgrade, empire);
     }
     if (districts) {
@@ -62,6 +58,11 @@ export class SystemService extends MongooseRepository<System> {
   }
 
   private async upgradeSystem(system: SystemDocument, upgrade: SystemUpgradeName, empire: EmpireDocument) {
+    const upgrades = Object.keys(SYSTEM_UPGRADES);
+    if (upgrades.indexOf(upgrade) !== upgrades.indexOf(system.upgrade) + 1) {
+      throw new BadRequestException(`Invalid upgrade ${upgrade} for system ${system._id}`);
+    }
+
     system.upgrade = upgrade;
     system.capacity *= SYSTEM_UPGRADES[upgrade].capacity_multiplier;