변수명 재정의

@sammo/server/src/ResourceController.ts

@@ -4,7 +4,7 @@ import type { CityID, GeneralID, NationID, SquadID } from "@sammo/game_logic/src
 import type { IGeneralEntity } from "@sammo/game_logic/src/Entity/GeneralEntity.js";
 import type { ICityEntity, ValidEntityType } from "@sammo/game_logic/src/Entity/index.js";
 import type { INationEntity } from "@sammo/game_logic/src/Entity/NationEntity.js";
-import type { IReservedTurn } from "@sammo/game_logic/src/Entity/ReservedTurn.js";
+import type { ReservedTurn } from "@sammo/game_logic/src/defs.js";
 import type { ISquadEntity } from "@sammo/game_logic/src/Entity/SquadEntity.js";
 import type { GameEnv } from "@sammo/game_logic/src/GameEnv.js";
 import { General } from "@sammo/game_logic/src/General.js";
@@ -30,8 +30,8 @@ export class ResourceController implements IResourceController{
     private _squad: Map<number, Squad> = new Map();
     private _general: Map<number, General> = new Map();
 
-    //내부적으로 turntime asc, id asc로 동작하는 PriorityQueue
-    private _generalByTurntime = new Denque<General>();
+    //내부적으로 turnTime asc, id asc로 동작하는 PriorityQueue
+    private _generalByTurnTime = new Denque<General>();
 
 
 
@@ -60,16 +60,16 @@ export class ResourceController implements IResourceController{
         throw new NotYetImplemented();
     }
 
-    peekGeneralTurntimeQueue(): General | undefined {
-        return this._generalByTurntime.peekFront();
+    peekGeneralTurnTimeQueue(): General | undefined {
+        return this._generalByTurnTime.peekFront();
     }
 
-    popGeneralTurntimeQueue(): General | undefined {
-        return this._generalByTurntime.shift();
+    popGeneralTurnTimeQueue(): General | undefined {
+        return this._generalByTurnTime.shift();
     }
 
-    insertGeneralTurntimeQueue(general: General, maybeTail: boolean): void {
-        insertItemAtArrayLike(this._generalByTurntime, general, (a, b)=>a.compareTurntime(b), maybeTail);
+    insertGeneralTurnTimeQueue(general: General, maybeTail: boolean): void {
+        insertItemAtArrayLike(this._generalByTurnTime, general, (a, b)=>a.compareTurnTime(b), maybeTail);
     }
 
     gameEnv(): GameEnv {
@@ -150,11 +150,11 @@ export class ResourceController implements IResourceController{
 
     //---- DB 접근 ---
 
-    getReservedTurn(general: General): Promise<IReservedTurn> {
+    getReservedTurn(general: General): Promise<ReservedTurn> {
         throw new NotYetImplemented();
     }
 
-    nationReservedTurn(general: General): Promise<IReservedTurn | undefined> {
+    nationReservedTurn(general: General): Promise<ReservedTurn | undefined> {
         throw new NotYetImplemented();
     }