merge: add secure troop management

# Conflicts:
#	app/game-engine/src/turn/types.ts
#	app/game-engine/src/turn/worldLoader.ts

packages/infra/src/turnEngineDb.ts

@@ -48,6 +48,7 @@ export interface TurnEngineGeneralRow {
     deadYear: number;
     affinity: number | null;
     meta: JsonValue;
+    penalty: JsonValue;
     turnTime: Date;
     recentWarTime: Date | null;
 }