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" };