diff --git a/src/scripts/generation/pack/military/generateMilitary.ts b/src/scripts/generation/pack/military/generateMilitary.ts index 6b9c3d17..25480f55 100644 --- a/src/scripts/generation/pack/military/generateMilitary.ts +++ b/src/scripts/generation/pack/military/generateMilitary.ts @@ -9,15 +9,12 @@ export type TCellsData = Pick< >; export interface IPlatoon { + unit: IMilitaryUnit; cell: number; a: number; t: number; x: number; y: number; - u: string; - isNaval: boolean; - s: Logical; - type: TMilitaryUnitType; } export function generateMilitary(states: TStates, burgs: TBurgs, cells: TCellsData) { diff --git a/src/scripts/generation/pack/military/generatePlatoons.ts b/src/scripts/generation/pack/military/generatePlatoons.ts index 795fa57d..4e3e343d 100644 --- a/src/scripts/generation/pack/military/generatePlatoons.ts +++ b/src/scripts/generation/pack/military/generatePlatoons.ts @@ -48,20 +48,9 @@ export function generatePlatoons(states: TStates, burgs: TBurgs, unitModifiers: const placeCell = unit.type === "naval" ? cells.haven[i] : i; const [x, y] = cells.p[placeCell]; - const isNaval = unit.type === "naval"; if (!platoons[stateId]) platoons[stateId] = []; - platoons[stateId].push({ - cell: i, - a: total, - t: total, - x, - y, - u: unit.name, - isNaval, - s: unit.separate, - type: unit.type - }); + platoons[stateId].push({unit, cell: i, a: total, t: total, x, y}); } }