merge: 최신 main을 전투·명예·유산 패리티 작업에 통합한다

2026-08-24 03:39:02 +00:00
parent 4fc20de8d4 77a05a6a25
commit 8fadd49b2c
12 changed files with 568 additions and 232 deletions
@@ -299,6 +299,10 @@ integration('generic general creation through the durable turn daemon', () => {
            userId,
            name: created.name,
            cityId: city.id,
+            role: {
+                specialDomestic: null,
+                specialWar: null,
+            },
            inheritancePoints: {
                previous: 7351,
            },
@@ -363,6 +367,10 @@ integration('generic general creation through the durable turn daemon', () => {
            userId,
            name: created.name,
            cityId: city.id,
+            role: {
+                specialDomestic: null,
+                specialWar: null,
+            },
            inheritancePoints: {
                previous: 7351,
            },