Merge branch 'codex/p0-general-turn-lifecycle'

# Conflicts: # app/game-engine/src/turn/databaseHooks.ts # app/game-engine/src/turn/inMemoryWorld.ts # app/game-engine/src/turn/reservedTurnHandler.ts # packages/infra/src/turnEngineDb.ts
2026-07-25 08:48:10 +00:00
parent 6889c463fd 45ba960474
commit a8869a77c2
13 changed files with 1325 additions and 68 deletions
@@ -173,6 +173,7 @@ const mapGeneralRow = (row: TurnEngineGeneralRow): TurnGeneral => {
            return { meta: { ...meta, killturn } as TurnGeneral['meta'] };
        })(),
        id: row.id,
+        userId: row.userId,
        name: row.name,
        nationId: row.nationId,
        cityId: row.cityId,
@@ -200,6 +201,9 @@ const mapGeneralRow = (row: TurnEngineGeneralRow): TurnGeneral => {
        atmos: row.atmos,
        age: row.age,
        npcState: row.npcState,
+        bornYear: row.bornYear,
+        deadYear: row.deadYear,
+        affinity: row.affinity,
        triggerState: {
            flags: {},
            counters: {},