diff --git a/@sammo/game_logic/src/Entity/External/GeneralReservedTurn.ts b/@sammo/game_logic/src/Entity/External/GeneralReservedTurn.ts new file mode 100644 index 0000000..51d63ca --- /dev/null +++ b/@sammo/game_logic/src/Entity/External/GeneralReservedTurn.ts @@ -0,0 +1,6 @@ +import type { GeneralID, ReservedTurn } from "@/defs.js"; + +export interface IGeneralReservedTurn { + generalID: GeneralID; + turn: ReservedTurn[]; +} diff --git a/@sammo/game_logic/src/Entity/External/GeneralTurn.ts b/@sammo/game_logic/src/Entity/External/GeneralTurn.ts deleted file mode 100644 index 5e78133..0000000 --- a/@sammo/game_logic/src/Entity/External/GeneralTurn.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { GeneralID } from "@/defs.js"; - -export interface IGeneralTurn { - generalID: GeneralID; - turn: { - action: string; - arg?: Record; - brief: string; - }[]; -} diff --git a/@sammo/game_logic/src/Entity/External/NationReservedTurn.ts b/@sammo/game_logic/src/Entity/External/NationReservedTurn.ts new file mode 100644 index 0000000..6e5a16f --- /dev/null +++ b/@sammo/game_logic/src/Entity/External/NationReservedTurn.ts @@ -0,0 +1,10 @@ +import type { ReservedTurn, StaffLevel } from "@/defs.js"; + +export interface INationReservedTurn { + _id: string; + + nationID: string; + officerLevel: StaffLevel, + + turn: ReservedTurn[]; +} \ No newline at end of file diff --git a/@sammo/game_logic/src/Entity/External/NationTurn.ts b/@sammo/game_logic/src/Entity/External/NationTurn.ts deleted file mode 100644 index 4259a9d..0000000 --- a/@sammo/game_logic/src/Entity/External/NationTurn.ts +++ /dev/null @@ -1,14 +0,0 @@ -import type { StaffLevel } from "@/defs.js"; - -export interface INationTurn { - _id: string; - - nationID: string; - officerLevel: StaffLevel, - - turn: { - action: string; - arg?: Record; - brief: string; - }[]; -} \ No newline at end of file diff --git a/@sammo/game_logic/src/Entity/ReservedTurn.ts b/@sammo/game_logic/src/Entity/ReservedTurn.ts deleted file mode 100644 index 4c0bcfb..0000000 --- a/@sammo/game_logic/src/Entity/ReservedTurn.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IReservedTurn { - action: string; - arg: Record; -} \ No newline at end of file diff --git a/@sammo/game_logic/src/IResourceController.ts b/@sammo/game_logic/src/IResourceController.ts index 9c947f7..98d47c6 100644 --- a/@sammo/game_logic/src/IResourceController.ts +++ b/@sammo/game_logic/src/IResourceController.ts @@ -1,7 +1,7 @@ import type { General } from "./General.js"; import type { City } from "./City.js"; import type { Nation } from "./Nation.js"; -import type { CityID, GeneralID, NationID, TroopID } from "./defs.js"; +import type { CityID, GeneralID, NationID, ReservedTurn, TroopID } from "./defs.js"; import type { GameEnv } from "./GameEnv.js"; import type { IGeneralEntity } from "./Entity/GeneralEntity.js"; import type { Troop } from "./Troop.js"; @@ -10,7 +10,6 @@ import type { LazyEntityUpdater } from "./LazyEntityUpdater.js"; import type { ICityEntity } from "./Entity/CityEntity.js"; import type { INationEntity } from "./Entity/NationEntity.js"; import type { EntityType, ValidEntityType } from "./Entity/index.js"; -import type { IReservedTurn } from "./Entity/ReservedTurn.js"; export interface IResourceController { @@ -61,8 +60,8 @@ export interface IResourceController { //---- DB 접근 --- //예턴은 호출마다 DB에서 조회 - getReservedTurn(general: General): Promise; - nationReservedTurn(general: General): Promise; + getReservedTurn(general: General): Promise; + nationReservedTurn(general: General): Promise; resetAndFill(): Promise; saveAll(): Promise; diff --git a/@sammo/game_logic/src/defs.ts b/@sammo/game_logic/src/defs.ts index 012b2ad..ffad35c 100644 --- a/@sammo/game_logic/src/defs.ts +++ b/@sammo/game_logic/src/defs.ts @@ -221,4 +221,10 @@ export interface WarSkillNameBase { 회피불가: unknown; 회피: unknown; } -export type WarSkillName = keyof WarSkillNameBase; \ No newline at end of file +export type WarSkillName = keyof WarSkillNameBase; + +export interface ReservedTurn { + action: string; + arg: Record; + brief: string; +} \ No newline at end of file