Entity

@sammo/game_logic/src/defs.ts

@@ -19,6 +19,7 @@ export type RegionID = number & { zz_t?: "RegionID" };
 
 //서버 ID
 export type ServerID = number & { zz_t?: "ServerID" };
+export type ScenarioID = number & { zz_t?: "ScenarioID" };
 
 //TODO: 무언가의 keyof 로 바꿔야함
 export type NationType = string & { zz_t?: "NationType" };
@@ -43,18 +44,7 @@ export const enum NpcType {
     npc_invader = 9,
 }
 
-export const enum OfficerLevel {
-    //재야
-    none = 0,
-
-    //일반
-    normal = 1,
-
-    //도시관직
-    cityLeadership = 2,
-    cityIntel = 3,
-    cityStrength = 4,
-
+export const enum StaffLevel {
     //지력관직
     staffIntel3 = 5,
     staffIntel2 = 7,
@@ -70,7 +60,45 @@ export const enum OfficerLevel {
 
     //군주
     lord = 12,
+}
 
+
+export const enum CityOfficerLevel {
+    cityLeadership = 2,
+    cityIntel = 3,
+    cityStrength = 4,
+}
+
+
+//XXX: const enum의 merge가 없어?
+
+export const enum OfficerLevel {
+    //재야
+    none = 0,
+
+    //일반
+    normal = 1,
+
+    //도시관직
+    cityLeadership = CityOfficerLevel.cityLeadership,
+    cityIntel = CityOfficerLevel.cityIntel,
+    cityStrength = CityOfficerLevel.cityStrength,
+
+    //지력관직
+    staffIntel3 = StaffLevel.staffIntel3,
+    staffIntel2 = StaffLevel.staffIntel2,
+    staffIntel1 = StaffLevel.staffIntel1,
+
+    //무력관직
+    staffStrength3 = StaffLevel.staffStrength3,
+    staffStrength2 = StaffLevel.staffStrength2,
+    staffStrength1 = StaffLevel.staffStrength1,
+
+    //참모
+    staffChief = StaffLevel.staffChief,
+
+    //군주
+    lord = StaffLevel.lord,
 }
 
 export const enum DiplomaticPermission {
@@ -103,12 +131,6 @@ export const enum FrontStatus {
     NearEmpty = 3,
 }
 
-export const enum CityOfficerLevel {
-    cityLeadership = 2,
-    cityIntel = 3,
-    cityStrength = 4,
-}
-
 //XXX: 기존처럼 값 하나만 유지할 것인가?
 export const enum CityState {
     //일반
@@ -135,6 +157,21 @@ export const enum CityState {
     thief = 9,
 }
 
+//NOTE: PHP버전과 수치가 다름
+export const enum DiplomacyState{
+    //중립
+    neutral = 0,
+
+    //선포중
+    declare = 1,
+
+    //전쟁중
+    war = 2,
+
+    //불가침
+    inviolable = 7,
+}
+
 /* 전용 stat이어서 확장하고자 하는경우 아래와 같이 확장 가능
 ```ts
 declare module "@/defs.js" {