Merge branch 'refs/heads/fix/v1'

Author: Clashsoft

docs/Changelog.md

@@ -100,3 +100,17 @@
 ## Documentation
 
 * Documented the possible `403 Forbidden` error in the `PATCH .../systems/:system` endpoint.
+
+# v1.3.1 (2024-06-14)
+
+## Balancing
+
+* Pops consume way more food and (if unemployed) more credits.
+* Home systems start as developed instead of upgraded.
+* Replaced system food consumption with minerals.
+* Halved pop growth for colonized and developed systems.
+* Pop growth now follows a logistic curve.
+
+## Bugfixes
+
+* Fixed isolated system clusters without outgoing links. [#19](https://github.com/sekassel/stp-24-server-tracker/issues/19)

src/game-logic/empire-variables.ts

@@ -4,9 +4,9 @@ export const EMPIRE_VARIABLES = {
   },
   pop: {
     consumption: {
-      food: 0.1, // nutrition tech tree
+      food: 1, // nutrition tech tree
       credits: {
-        unemployed: 0.1, // social benefits tech tree
+        unemployed: 1, // social benefits tech tree
       },
     },
   },

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

@@ -47,8 +47,8 @@ export class GameLogicService {
 
       homeSystem.owner = empire._id;
       homeSystem.population = empire.resources.population;
-      homeSystem.upgrade = 'developed';
-      homeSystem.capacity *= SYSTEM_UPGRADES.developed.capacity_multiplier;
+      homeSystem.upgrade = 'upgraded';
+      homeSystem.capacity *= SYSTEM_UPGRADES.upgraded.capacity_multiplier;
       if (member?.empire?.homeSystem) {
         homeSystem.type = member.empire.homeSystem;
       }
@@ -303,12 +303,11 @@ export class GameLogicService {
 
   private popGrowth(system: SystemDocument, variables: Record<Variable, number>, aggregates?: Partial<Record<ResourceName, AggregateResult>>) {
     const {population, capacity} = system;
-    const growthVariable: Variable = population >= capacity
-      ? 'systems.developed.pop_growth'
-      : `systems.${system.upgrade}.pop_growth`;
-    const newValue = variables[growthVariable] * population;
-    this.updateAggregate(aggregates?.population, growthVariable, 1, newValue - population);
-    system.population = newValue;
+    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
+    this.updateAggregate(aggregates?.population, growthVariable, 1, growth);
+    system.population = population + growth;
   }
 
   aggregateResources(empire: Empire, systems: System[], resources: ResourceName[]): AggregateResult[] {

src/game-logic/system-upgrade.ts

@@ -17,44 +17,44 @@ export const SYSTEM_UPGRADES = {
   },
   colonized: {
     id: 'colonized',
-    pop_growth: 1.10, // pop_growth_colonized tech tree
+    pop_growth: 0.05, // pop_growth_colonized tech tree
     cost: {
       minerals: 100, // cheap_claims tech tree
       energy: 100, // cheap_claims tech tree
     },
     upkeep: {
       energy: 1,
+      minerals: 1,
       fuel: 1,
-      food: 1,
     },
     capacity_multiplier: 1,
   },
   upgraded: {
     id: 'upgraded',
-    pop_growth: 1.05, // pop_growth_upgraded tech tree
+    pop_growth: 0.02, // pop_growth_upgraded tech tree
     cost: {
       minerals: 100, // cheap_claims tech tree
       alloys: 100, // cheap_claims tech tree
     },
     upkeep: {
       energy: 2,
+      minerals: 2,
       fuel: 2,
-      food: 2,
       alloys: 1, // upgraded systems provide defense that must be maintained
     },
     capacity_multiplier: 1.25,
   },
   developed: {
     id: 'developed',
-    pop_growth: 1.01,
+    pop_growth: 0.01,
     cost: {
       alloys: 200, // cheap_claims tech tree
       fuel: 100, // cheap_claims tech tree
     },
     upkeep: {
       energy: 4,
+      minerals: 4,
       fuel: 4,
-      food: 4,
       alloys: 3,
     },
     capacity_multiplier: 1.25,

src/game-logic/technologies.ts

@@ -182,20 +182,20 @@ export const TECHNOLOGIES: Record<string, Technology> = {
   },
   efficient_systems_3: {
     id: 'efficient_systems_3',
-    tags: ['society', 'biology'],
+    tags: ['engineering', 'materials'],
     cost: 8,
     requires: ['efficient_systems_2'],
     effects: [
       {
-        variable: 'systems.colonized.upkeep.food',
+        variable: 'systems.colonized.upkeep.minerals',
         multiplier: 0.9,
       },
       {
-        variable: 'systems.upgraded.upkeep.food',
+        variable: 'systems.upgraded.upkeep.minerals',
         multiplier: 0.9,
       },
       {
-        variable: 'systems.developed.upkeep.food',
+        variable: 'systems.developed.upkeep.minerals',
         multiplier: 0.9,
       },
     ],
@@ -1104,11 +1104,11 @@ export const TECHNOLOGIES: Record<string, Technology> = {
 // special resources
 generate_sequence('pop_food_consumption', ['society', 'biology'], 'empire.pop.consumption.food',
   {multiplierIncrement: -0.05}, ['demographic']);
-// pop growth is already a multiplier, so it will be 1.05 -> 1.05 * 1.025 = 1.07625 -> 1.05 * 1.025^2 = 1.10390625
+// pop growth is already a multiplier, so it will be 0.05 -> 0.05 * 1.1 = 0.055 -> 0.05 * 1.2 = 0.06
 generate_sequence('pop_growth_colonized', ['society', 'biology'], 'systems.colonized.pop_growth',
-  {multiplierIncrement: +0.025}, ['demographic']);
+  {multiplierIncrement: +0.1}, ['demographic']);
 generate_sequence('pop_growth_upgraded', ['society', 'biology'], 'systems.upgraded.pop_growth',
-  {multiplierIncrement: +0.025}, ['demographic']);
+  {multiplierIncrement: +0.1}, ['demographic']);
 generate_sequence('unemployed_pop_cost', ['society', 'state'],
   'empire.pop.consumption.credits.unemployed',
   {