변수명 재정의

@sammo/game_logic/src/Entity/CityEntity.ts

@@ -1,4 +1,4 @@
-import type { CityID, CityLevel, CityName, CityOfficerLevel, CityState, FrontStatus, NationID, FractionalRange, RegionID, RemainMonth } from "../defs.js";
+import type { CityID, CityLevel, CityName, CityOfficerLevel, CityState, FrontStatus, NationID, FractionalRange, RegionID, IntMonth } from "../defs.js";
 
 
 export interface ICityEntity{
@@ -73,8 +73,8 @@ export interface ICityEntity{
 
     state: CityState;
     //전투 잔여 개월
-    remainWarMonth: RemainMonth;
+    remainWarMonth: IntMonth;
 
     //국가별 수비병 사살 수
-    conflict: Record<NationID, number>;
+    cityDamageRatio: Record<NationID, number>;
 }

@sammo/game_logic/src/Entity/External/DiplomaticLetter.ts

@@ -1,4 +1,4 @@
-import type { NationID } from "@/defs.js";
+import type { GeneralID, GeneralName, NationID } from "@/defs.js";
 
 export interface IDiplomaticLetter {
     _id: string;
@@ -11,13 +11,13 @@ export interface IDiplomaticLetter {
     state: 'proposed' | 'accepted' | 'rejected' | 'canceled' | 'replaced';
 
     srcSigner: {
-        generalID: string;
-        generalName: string;
+        generalID: GeneralID;
+        generalName: GeneralName;
         icon: string;
     };
     destSigner: {
-        generalID: string;
-        generalName: string;
+        generalID: GeneralID;
+        generalName: GeneralName;
         icon: string;
     };
 

@sammo/game_logic/src/Entity/GameEnvEntity.ts

@@ -15,7 +15,7 @@ export interface IGameEnvEntity {
 
     secondsPerTurn: number;
 
-    refreshedKillTurn: number;
+    numberOfIdleTurnTillDeath: number;
 
     isFictionMode: boolean;
     unitedGameState: UnitedGameState;

@sammo/game_logic/src/Entity/GeneralEntity.ts

@@ -1,11 +1,11 @@
-import type { CityID, DiplomaticPermission, GeneralID, GeneralName, ItemID, ItemKeyType, NationID, NpcType, OfficerLevel, PersonalityType, SpecialityDomesticType, SpecialityWarType, SquadID, UserID, UserName } from "../defs.js";
+import type { CityID, DiplomaticPermission, FractionalRange, GeneralID, GeneralName, IntMonth, IntYear, ItemID, ItemKeyType, NationID, NpcType, OfficerLevel, PersonalityType, SpecialityDomesticType, SpecialityWarType, SquadID, URILike, UserID, UserName } from "../defs.js";
 
 export interface IGeneralEntity {
     id: GeneralID;
     ownerID?: UserID;
     npcType: NpcType;
     affinity?: number;
-    icon?: string;
+    icon?: URILike;
     name: GeneralName;
     ownerName?: UserName;
     nationID: NationID;
@@ -19,7 +19,7 @@ export interface IGeneralEntity {
     intel: number;
     intelExp: number;
 
-    injury: number;
+    injury: FractionalRange;
 
     experience: number;
     dedication: number;
@@ -42,14 +42,14 @@ export interface IGeneralEntity {
         option: Record<string, unknown>,
     }>;
 
-    turntime: Date;
+    turnTime: Date;
 
-    killturn: number;
+    idleTurn: IntMonth;
 
-    age: number;
-    startAge: number;
+    age: IntYear;
+    startAge: IntYear;
 
-    nationBelong: number;
+    nationJoinedRelYear: IntYear;
 
     betray: number;
 

@sammo/game_logic/src/Entity/GeneralRankEntity.ts

@@ -14,14 +14,14 @@ export interface IGeneralRankEntity {
     battleLoseCnt: number;
 
     //누적 병력 사망 수
-    crewDeathCnt: number;
+    allDeathCnt: number;
     //누적 병력 사살 수
-    crewKillCnt: number;
+    allKillCnt: number;
 
     //누적 대인 병력 사망 수
-    crewDeathCntByGeneral: number;
+    armyDeathCnt: number;
     //누적 대인 병력 사살 수
-    crewKillCntByGeneral: number;
+    armyKillCnt: number;
 
     //점령 수
     occupyCnt: number;

@sammo/game_logic/src/Entity/NationEntity.ts

@@ -1,4 +1,4 @@
-import type { CityID, ColorType, IntYearMonth, NationCmdType, NationID, NationLevel, NationName, NationType, FractionalRange, RemainMonth, ReservedTurn, StaffLevel, StrategicCmdType } from "../defs.js";
+import type { CityID, ColorType, IntYearMonth, NationCmdType, NationID, NationLevel, NationName, NationType, FractionalRange, IntMonth, ReservedTurn, StaffLevel, StrategicCmdType } from "../defs.js";
 
 export interface INationEntity{
     id: NationID;
@@ -40,7 +40,7 @@ export interface INationEntity{
     power: number;
 
     //첩보 제한
-    spyLimit: Map<CityID, RemainMonth>;
+    spyLimit: Map<CityID, IntMonth>;
 
     //커맨드별 옵션
     commandOption: Map<NationCmdType, Map<string, unknown>>;

@sammo/game_logic/src/Entity/Persistant/OldNation.ts

@@ -1,4 +1,4 @@
-import type { GeneralID, GeneralName, ItemID, ItemKeyType, NationID, NpcType, OfficerLevel, PersonalityType, ServerID, SpecialityDomesticType, SpecialityWarType, UserID } from "@/defs.js";
+import type { GeneralID, GeneralName, ItemID, ItemKeyType, NationID, NpcType, OfficerLevel, PersonalityType, ServerID, SpecialityDomesticType, SpecialityWarType, URILike, UserID } from "@/defs.js";
 import type { INationEntity } from "../NationEntity.js";
 
 export interface IOldNation {
@@ -20,7 +20,7 @@ export interface IOldNation {
         ownerName?: string;
 
         npcType?: NpcType;
-        icon?: string;
+        icon?: URILike;
 
         officerLevel: OfficerLevel;
         officerCityID?: number;