diff --git a/src/scripts/generation/pack/generateIce.ts b/src/scripts/generation/pack/generateIce.ts index d10641fe..5947c16f 100644 --- a/src/scripts/generation/pack/generateIce.ts +++ b/src/scripts/generation/pack/generateIce.ts @@ -1,15 +1,14 @@ import { ERROR } from "config/logging"; import { aleaPRNG } from "scripts/aleaPRNG"; -import { clipPoly, getGridPolygonWithGrid, last, normalize, P, rn } from "utils"; +import { clipPoly, getGridPolygonLocal, last, normalize, P, rn } from "utils"; export function generateIce( - gridCells: Pick, - vertices: IGraphVertices, - gridPoints: TPoints, + grid: IGrid, features: TGridFeatures, ): IIce { const shieldMin = -8; // max temp to form ice shield (glacier) const icebergMax = 1; // max temp to form an iceberg + const { cells: gridCells, points: gridPoints, vertices } = grid; const nOfCells = gridCells.i.length; const used = new Uint8Array(gridCells.i.length); @@ -52,7 +51,7 @@ export function generateIce( // Helper functions function generateIceberg(i: number, size: number): IiceBerg { const cellMidPoint = gridPoints[i]; - const points: TPoints = getGridPolygonWithGrid(i, gridCells, vertices) + const points: TPoints = getGridPolygonLocal(i, grid) .map((point) => [ (point[0] + (cellMidPoint[0] - point[0]) * size) | 0, (point[1] + (cellMidPoint[1] - point[1]) * size) | 0, diff --git a/src/scripts/generation/pack/pack.ts b/src/scripts/generation/pack/pack.ts index 278a94bd..89bc6634 100644 --- a/src/scripts/generation/pack/pack.ts +++ b/src/scripts/generation/pack/pack.ts @@ -175,7 +175,7 @@ export function createPack(grid: IGrid): IPack { const rivers = specifyRivers(rawRivers, cultureIds, cultures); const features = generateLakeNames(mergedFeatures, cultureIds, cultures); - const ice = generateIce(grid.cells, grid.vertices, grid.points, features); + const ice = generateIce(grid, features); // Military.generate(); // Markers.generate();