From c99f97323d980247b20fcab99103662a4e0e3ea6 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Mon, 11 Mar 2024 12:38:37 +0000
Subject: [PATCH] =?UTF-8?q?UserID,=20UserName=20type=20-=20Owner=EA=B0=80?=
 =?UTF-8?q?=20=EC=95=84=EB=8B=88=EA=B3=A0,=20User=EC=97=AC=EC=95=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 @sammo/game_logic/src/Entity/GeneralEntity.ts | 6 +++---
 @sammo/game_logic/src/defs.ts                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/@sammo/game_logic/src/Entity/GeneralEntity.ts b/@sammo/game_logic/src/Entity/GeneralEntity.ts
index 7a82bbc..24dcabe 100644
--- a/@sammo/game_logic/src/Entity/GeneralEntity.ts
+++ b/@sammo/game_logic/src/Entity/GeneralEntity.ts
@@ -1,13 +1,13 @@
-import type { DiplomaticPermission, GeneralID, GeneralName, ItemID, ItemKeyType, NationID, NpcType, OfficerLevel, OwnerID, OwnerName, PersonalityType, SpecialityDomesticType, SpecialityWarType, TroopID } from "../defs.js";
+import type { DiplomaticPermission, GeneralID, GeneralName, ItemID, ItemKeyType, NationID, NpcType, OfficerLevel, PersonalityType, SpecialityDomesticType, SpecialityWarType, TroopID, UserID, UserName } from "../defs.js";
 
 export interface IGeneralEntity {
     id: GeneralID;
-    owner?: OwnerID;
+    ownerID?: UserID;
     npcType: NpcType;
     affinity?: number;
     picture?: string;
     name: GeneralName;
-    ownerName?: OwnerName;
+    ownerName?: UserName;
     nationID: NationID;
     cityID: number;
     troopID?: TroopID;
diff --git a/@sammo/game_logic/src/defs.ts b/@sammo/game_logic/src/defs.ts
index c019f3b..d4410c3 100644
--- a/@sammo/game_logic/src/defs.ts
+++ b/@sammo/game_logic/src/defs.ts
@@ -1,6 +1,6 @@
 //Type 정의
-export type OwnerID = number & { zz_t?: "OwnerID" };
-export type OwnerName = string & { zz_t?: "OwnerName" };
+export type UserID = number & { zz_t?: "UserID" };
+export type UserName = string & { zz_t?: "UserName" };
 
 export type GeneralID = number & { zz_t?: "GeneralID" };
 export type GeneralName = string & { zz_t?: "GeneralName" };