Compare commits

..

5 Commits

Author SHA1 Message Date
hypercross 113d240f71 refactor: simplify item effect handling in grid inventory
Update `getItemEffects` to directly use `startEffects` from item meta
instead of performing a manual lookup against the effect table. This
is made possible by updating `GameItemMeta` to store the full effect
object (data and stacks) instead of just the effect ID and stack count.
2026-04-21 23:17:19 +08:00
hypercross 0547180074 feat(slay-the-spire-like): add getItemEffects to grid inventory 2026-04-21 23:15:02 +08:00
hypercross d1605a9ee3 feat(samples/slay-the-spire-like): export data module 2026-04-21 23:02:27 +08:00
hypercross 093738cd42 test: expand shape-utils coverage and refactor style 2026-04-21 23:01:26 +08:00
hypercross 97ff61985a refactor(slay-the-spire-like): clean up barrel exports and formatting
- Convert explicit barrel exports to `export *` patterns in several
  systems
- Create a new `utils/index.ts` barrel for the system utils
- Rename `validatePlacement` to `validateShapePlacement` for clarity
- Reformat `shape-collision.ts` to use 2-space indentation and
  consistent
  styling
- Fix import paths in `index.ts`
2026-04-21 23:01:19 +08:00
9 changed files with 501 additions and 502 deletions

View File

@ -3,5 +3,6 @@ export * from "./system/deck";
export * from "./system/encounter";
export * from "./system/grid-inventory";
export * from "./system/map";
export * from "./system/utils/parse-shape";
export * from "./system/utils";
export * from "./system/types";
export { default as data } from "./data";

View File

@ -1,7 +1,2 @@
export type { GameCard, GameCardMeta, PlayerDeck, DeckRegions } from './types';
export {
generateDeckFromInventory,
createCard,
createPlayerDeck,
generateCardId,
} from './factory';
export * from "./factory";
export * from "./types";

View File

@ -1,24 +1,3 @@
export type {
CellCoordinate,
CellKey,
GridInventory,
InventoryItem,
MutationResult,
PlacementResult,
} from "./types";
export type { GameItemMeta, GameItem } from "./types";
export {
createGridInventory,
flipItem,
getAdjacentItems,
getItemAtCell,
getOccupiedCellSet,
moveItem,
placeItem,
removeItem,
rotateItem,
validatePlacement,
} from "./transform";
export * from "./types";
export * from "./transform";
export * from "./factory";

View File

@ -1,3 +1,4 @@
import { EffectData } from "../types";
import type { ParsedShape } from "../utils/parse-shape";
import type { Transform2D } from "../utils/shape-collision";
import {
@ -10,6 +11,7 @@ import {
} from "../utils/shape-collision";
import type {
CellKey,
GameItemMeta,
GridInventory,
InventoryItem,
MutationResult,
@ -255,3 +257,21 @@ export function getAdjacentItems<TMeta>(
return adjacent;
}
// export type EffectTable = Record<string, { data: EffectData; stacks: number }>;
export function getItemEffects(inv: GridInventory<GameItemMeta>) {
const effects = {} as Record<
string,
Record<string, { data: EffectData; stacks: number }>
>;
for (const item of inv.items.values()) {
if (!item.meta) continue;
const { startEffects } = item.meta;
if (!startEffects) continue;
effects[item.id] = startEffects;
}
return effects;
}

View File

@ -1,4 +1,4 @@
import { ItemData } from "../types";
import { EffectData, ItemData } from "../types";
import type { ParsedShape } from "../utils/parse-shape";
import type { Transform2D } from "../utils/shape-collision";
@ -64,7 +64,7 @@ export interface GameItemMeta {
itemData: ItemData;
shape: ParsedShape;
consumedUses?: number;
startEffects?: Record<string, number>;
startEffects?: Record<string, { data: EffectData; stacks: number }>;
tradePrice?: number;
}
export type GameItem = InventoryItem<GameItemMeta>;

View File

@ -1,24 +1,3 @@
export { MapNodeType, MapLayerType } from "./types";
export type {
MapNode,
MapLayer,
PointCrawlMap,
MapGenerationConfig,
} from "./types";
export { generatePointCrawlMap } from "./generator";
export {
getNode,
getChildren,
getParents,
hasPath,
findAllPaths,
} from "./generator";
export {
canMoveTo,
moveToNode,
getReachableChildren,
isAtEndNode,
isAtStartNode,
} from "./navigation";
export * from "./generator";
export * from "./navigation";
export * from "./types";

View File

@ -0,0 +1,2 @@
export * from "./parse-shape";
export * from "./shape-collision";

View File

@ -1,4 +1,4 @@
import type { ParsedShape } from './parse-shape';
import type { ParsedShape } from "./parse-shape";
/**
* Represents a 2D point in grid coordinates.
@ -54,7 +54,7 @@ export function transformPoint(
point: Point2D,
transform: Transform2D,
shapeWidth: number,
shapeHeight: number
shapeHeight: number,
): Point2D {
let { x, y } = point;
@ -96,10 +96,13 @@ export function transformPoint(
/**
* Transforms a shape and returnss its occupied cells in world coordinates.
*/
export function transformShape(shape: ParsedShape, transform: Transform2D): Point2D[] {
export function transformShape(
shape: ParsedShape,
transform: Transform2D,
): Point2D[] {
const cells = getOccupiedCells(shape);
return cells.map(cell =>
transformPoint(cell, transform, shape.width, shape.height)
return cells.map((cell) =>
transformPoint(cell, transform, shape.width, shape.height),
);
}
@ -110,12 +113,12 @@ export function checkCollision(
shapeA: ParsedShape,
transformA: Transform2D,
shapeB: ParsedShape,
transformB: Transform2D
transformB: Transform2D,
): boolean {
const cellsA = transformShape(shapeA, transformA);
const cellsB = transformShape(shapeB, transformB);
const setA = new Set(cellsA.map(c => `${c.x},${c.y}`));
const setA = new Set(cellsA.map((c) => `${c.x},${c.y}`));
for (const cell of cellsB) {
if (setA.has(`${cell.x},${cell.y}`)) {
@ -135,7 +138,7 @@ export function checkCollision(
export function checkBoardCollision(
shape: ParsedShape,
transform: Transform2D,
occupiedCells: Set<string>
occupiedCells: Set<string>,
): boolean {
const cells = transformShape(shape, transform);
@ -159,12 +162,17 @@ export function checkBounds(
shape: ParsedShape,
transform: Transform2D,
boardWidth: number,
boardHeight: number
boardHeight: number,
): boolean {
const cells = transformShape(shape, transform);
for (const cell of cells) {
if (cell.x < 0 || cell.x >= boardWidth || cell.y < 0 || cell.y >= boardHeight) {
if (
cell.x < 0 ||
cell.x >= boardWidth ||
cell.y < 0 ||
cell.y >= boardHeight
) {
return false;
}
}
@ -176,19 +184,19 @@ export function checkBounds(
* Validates that a placement is both in bounds and collision-free.
* @returns Object with `valid` flag and optional `reason` string
*/
export function validatePlacement(
export function validateShapePlacement(
shape: ParsedShape,
transform: Transform2D,
boardWidth: number,
boardHeight: number,
occupiedCells: Set<string>
occupiedCells: Set<string>,
): { valid: true } | { valid: false; reason: string } {
if (!checkBounds(shape, transform, boardWidth, boardHeight)) {
return { valid: false, reason: '超出边界' };
return { valid: false, reason: "超出边界" };
}
if (checkBoardCollision(shape, transform, occupiedCells)) {
return { valid: false, reason: '与已有形状重叠' };
return { valid: false, reason: "与已有形状重叠" };
}
return { valid: true };
@ -199,10 +207,13 @@ export function validatePlacement(
* @param current The current transform
* @param degrees Degrees to rotate (typically 90, 180, or 270)
*/
export function rotateTransform(current: Transform2D, degrees: number): Transform2D {
export function rotateTransform(
current: Transform2D,
degrees: number,
): Transform2D {
return {
...current,
rotation: ((current.rotation + degrees) % 360 + 360) % 360,
rotation: (((current.rotation + degrees) % 360) + 360) % 360,
};
}

View File

@ -1,18 +1,18 @@
import { describe, it, expect } from 'vitest';
import { parseShapeString } from '@/samples/slay-the-spire-like/system/utils/parse-shape';
import { describe, it, expect } from "vitest";
import { parseShapeString } from "@/samples/slay-the-spire-like/system/utils/parse-shape";
import {
checkCollision,
checkBoardCollision,
checkBounds,
validatePlacement,
validateShapePlacement,
transformShape,
getOccupiedCells,
IDENTITY_TRANSFORM,
} from '@/samples/slay-the-spire-like/system/utils/shape-collision';
} from "@/samples/slay-the-spire-like/system/utils/shape-collision";
describe('parseShapeString', () => {
it('should parse a single cell with o', () => {
const result = parseShapeString('o');
describe("parseShapeString", () => {
it("should parse a single cell with o", () => {
const result = parseShapeString("o");
expect(result.grid).toEqual([[true]]);
expect(result.width).toBe(1);
expect(result.height).toBe(1);
@ -21,8 +21,8 @@ describe('parseShapeString', () => {
expect(result.originY).toBe(0);
});
it('should parse a horizontal line', () => {
const result = parseShapeString('oee');
it("should parse a horizontal line", () => {
const result = parseShapeString("oee");
expect(result.width).toBe(3);
expect(result.height).toBe(1);
expect(result.count).toBe(3);
@ -31,8 +31,8 @@ describe('parseShapeString', () => {
expect(result.originY).toBe(0);
});
it('should parse a vertical line', () => {
const result = parseShapeString('oss');
it("should parse a vertical line", () => {
const result = parseShapeString("oss");
expect(result.width).toBe(1);
expect(result.height).toBe(3);
expect(result.count).toBe(3);
@ -41,8 +41,8 @@ describe('parseShapeString', () => {
expect(result.originY).toBe(0);
});
it('should parse an L shape', () => {
const result = parseShapeString('oes');
it("should parse an L shape", () => {
const result = parseShapeString("oes");
expect(result.width).toBe(2);
expect(result.height).toBe(2);
expect(result.count).toBe(3);
@ -52,47 +52,47 @@ describe('parseShapeString', () => {
]);
});
it('should handle return command', () => {
const result = parseShapeString('oeerww');
it("should handle return command", () => {
const result = parseShapeString("oeerww");
expect(result.width).toBe(4);
expect(result.height).toBe(1);
expect(result.count).toBe(4);
expect(result.grid).toEqual([[true, true, true, true]]);
});
it('should handle case insensitivity', () => {
const resultLower = parseShapeString('oes');
const resultUpper = parseShapeString('OES');
it("should handle case insensitivity", () => {
const resultLower = parseShapeString("oes");
const resultUpper = parseShapeString("OES");
expect(resultLower.grid).toEqual(resultUpper.grid);
expect(resultLower.count).toBe(resultUpper.count);
});
it('should return empty grid for empty input', () => {
const result = parseShapeString('');
it("should return empty grid for empty input", () => {
const result = parseShapeString("");
expect(result.grid).toEqual([[]]);
expect(result.width).toBe(0);
expect(result.height).toBe(1);
expect(result.count).toBe(0);
});
it('should track origin correctly', () => {
it("should track origin correctly", () => {
// eeso: e(1,0), e(2,0), s(2,1), o sets origin at (2,1)
// After normalization: minX=1, minY=0, so originX = 2-1 = 1, originY = 1-0 = 1
const result = parseShapeString('eeso');
const result = parseShapeString("eeso");
expect(result.originX).toBe(1);
expect(result.originY).toBe(1);
});
it('should track origin at first o only', () => {
const result = parseShapeString('oes');
it("should track origin at first o only", () => {
const result = parseShapeString("oes");
expect(result.originX).toBe(0);
expect(result.originY).toBe(0);
});
it('should handle complex T shape', () => {
it("should handle complex T shape", () => {
// oewers: o(0,0), e(1,0), w(0,0), e(1,0), r->(0,0), s(0,1)
// Filled: (0,0), (1,0), (0,1) - 3 cells
const result = parseShapeString('oewers');
const result = parseShapeString("oewers");
expect(result.width).toBe(2);
expect(result.height).toBe(2);
expect(result.count).toBe(3);
@ -103,16 +103,16 @@ describe('parseShapeString', () => {
});
});
describe('shape-collision', () => {
describe('getOccupiedCells', () => {
it('should return cells for a single cell shape', () => {
const shape = parseShapeString('o');
describe("shape-collision", () => {
describe("getOccupiedCells", () => {
it("should return cells for a single cell shape", () => {
const shape = parseShapeString("o");
const cells = getOccupiedCells(shape);
expect(cells).toEqual([{ x: 0, y: 0 }]);
});
it('should return cells for a horizontal line', () => {
const shape = parseShapeString('oe');
it("should return cells for a horizontal line", () => {
const shape = parseShapeString("oe");
const cells = getOccupiedCells(shape);
expect(cells).toEqual([
{ x: 0, y: 0 },
@ -120,8 +120,8 @@ describe('shape-collision', () => {
]);
});
it('should return cells for an L shape', () => {
const shape = parseShapeString('oes');
it("should return cells for an L shape", () => {
const shape = parseShapeString("oes");
const cells = getOccupiedCells(shape);
expect(cells).toEqual([
{ x: 0, y: 0 },
@ -131,49 +131,49 @@ describe('shape-collision', () => {
});
});
describe('checkCollision', () => {
it('should detect collision between overlapping shapes', () => {
const shapeA = parseShapeString('o');
const shapeB = parseShapeString('o');
describe("checkCollision", () => {
it("should detect collision between overlapping shapes", () => {
const shapeA = parseShapeString("o");
const shapeB = parseShapeString("o");
const result = checkCollision(
shapeA,
{ ...IDENTITY_TRANSFORM, offset: { x: 0, y: 0 } },
shapeB,
{ ...IDENTITY_TRANSFORM, offset: { x: 0, y: 0 } }
{ ...IDENTITY_TRANSFORM, offset: { x: 0, y: 0 } },
);
expect(result).toBe(true);
});
it('should not detect collision between non-overlapping shapes', () => {
const shapeA = parseShapeString('o');
const shapeB = parseShapeString('o');
it("should not detect collision between non-overlapping shapes", () => {
const shapeA = parseShapeString("o");
const shapeB = parseShapeString("o");
const result = checkCollision(
shapeA,
{ ...IDENTITY_TRANSFORM, offset: { x: 0, y: 0 } },
shapeB,
{ ...IDENTITY_TRANSFORM, offset: { x: 2, y: 0 } }
{ ...IDENTITY_TRANSFORM, offset: { x: 2, y: 0 } },
);
expect(result).toBe(false);
});
it('should detect collision with adjacent shapes', () => {
const shapeA = parseShapeString('o');
const shapeB = parseShapeString('o');
it("should detect collision with adjacent shapes", () => {
const shapeA = parseShapeString("o");
const shapeB = parseShapeString("o");
const result = checkCollision(
shapeA,
{ ...IDENTITY_TRANSFORM, offset: { x: 0, y: 0 } },
shapeB,
{ ...IDENTITY_TRANSFORM, offset: { x: 1, y: 0 } }
{ ...IDENTITY_TRANSFORM, offset: { x: 1, y: 0 } },
);
expect(result).toBe(false);
});
it('should detect collision with rotation', () => {
const shapeA = parseShapeString('oe');
const shapeB = parseShapeString('os');
it("should detect collision with rotation", () => {
const shapeA = parseShapeString("oe");
const shapeB = parseShapeString("os");
// shapeA is horizontal at (0,0)-(1,0)
// shapeB rotated 90° becomes vertical at (0,0)-(0,1)
@ -182,130 +182,142 @@ describe('shape-collision', () => {
shapeA,
{ ...IDENTITY_TRANSFORM, offset: { x: 0, y: 0 } },
shapeB,
{ ...IDENTITY_TRANSFORM, rotation: 90, offset: { x: 0, y: 0 } }
{ ...IDENTITY_TRANSFORM, rotation: 90, offset: { x: 0, y: 0 } },
);
expect(result).toBe(true);
});
});
describe('checkBoardCollision', () => {
it('should detect collision with occupied cells', () => {
const shape = parseShapeString('oe');
const occupied = new Set(['0,0', '1,0']);
describe("checkBoardCollision", () => {
it("should detect collision with occupied cells", () => {
const shape = parseShapeString("oe");
const occupied = new Set(["0,0", "1,0"]);
const result = checkBoardCollision(shape, IDENTITY_TRANSFORM, occupied);
expect(result).toBe(true);
});
it('should not detect collision with empty board', () => {
const shape = parseShapeString('oe');
it("should not detect collision with empty board", () => {
const shape = parseShapeString("oe");
const occupied = new Set<string>();
const result = checkBoardCollision(shape, IDENTITY_TRANSFORM, occupied);
expect(result).toBe(false);
});
it('should detect collision after translation', () => {
const shape = parseShapeString('oe');
const occupied = new Set(['5,5', '6,5']);
it("should detect collision after translation", () => {
const shape = parseShapeString("oe");
const occupied = new Set(["5,5", "6,5"]);
const result = checkBoardCollision(
shape,
{ ...IDENTITY_TRANSFORM, offset: { x: 5, y: 5 } },
occupied
occupied,
);
expect(result).toBe(true);
});
});
describe('checkBounds', () => {
it('should return true for shape within bounds', () => {
const shape = parseShapeString('oe');
describe("checkBounds", () => {
it("should return true for shape within bounds", () => {
const shape = parseShapeString("oe");
const result = checkBounds(shape, IDENTITY_TRANSFORM, 10, 10);
expect(result).toBe(true);
});
it('should return false for shape outside bounds', () => {
const shape = parseShapeString('oe');
it("should return false for shape outside bounds", () => {
const shape = parseShapeString("oe");
const result = checkBounds(
shape,
{ ...IDENTITY_TRANSFORM, offset: { x: 9, y: 0 } },
10,
10
10,
);
expect(result).toBe(false);
});
it('should return false for negative coordinates', () => {
const shape = parseShapeString('oe');
it("should return false for negative coordinates", () => {
const shape = parseShapeString("oe");
const result = checkBounds(
shape,
{ ...IDENTITY_TRANSFORM, offset: { x: -1, y: 0 } },
10,
10
10,
);
expect(result).toBe(false);
});
it('should return true for shape at boundary edge', () => {
const shape = parseShapeString('o');
it("should return true for shape at boundary edge", () => {
const shape = parseShapeString("o");
const result = checkBounds(
shape,
{ ...IDENTITY_TRANSFORM, offset: { x: 9, y: 9 } },
10,
10
10,
);
expect(result).toBe(true);
});
});
describe('validatePlacement', () => {
it('should return valid for good placement', () => {
const shape = parseShapeString('oe');
describe("validatePlacement", () => {
it("should return valid for good placement", () => {
const shape = parseShapeString("oe");
const occupied = new Set<string>();
const result = validatePlacement(shape, IDENTITY_TRANSFORM, 10, 10, occupied);
const result = validateShapePlacement(
shape,
IDENTITY_TRANSFORM,
10,
10,
occupied,
);
expect(result).toEqual({ valid: true });
});
it('should return invalid for out of bounds', () => {
const shape = parseShapeString('oe');
it("should return invalid for out of bounds", () => {
const shape = parseShapeString("oe");
const occupied = new Set<string>();
const result = validatePlacement(
const result = validateShapePlacement(
shape,
{ ...IDENTITY_TRANSFORM, offset: { x: 9, y: 0 } },
10,
10,
occupied
occupied,
);
expect(result).toEqual({ valid: false, reason: '超出边界' });
expect(result).toEqual({ valid: false, reason: "超出边界" });
});
it('should return invalid for collision', () => {
const shape = parseShapeString('oe');
const occupied = new Set(['0,0', '1,0']);
it("should return invalid for collision", () => {
const shape = parseShapeString("oe");
const occupied = new Set(["0,0", "1,0"]);
const result = validatePlacement(shape, IDENTITY_TRANSFORM, 10, 10, occupied);
expect(result).toEqual({ valid: false, reason: '与已有形状重叠' });
const result = validateShapePlacement(
shape,
IDENTITY_TRANSFORM,
10,
10,
occupied,
);
expect(result).toEqual({ valid: false, reason: "与已有形状重叠" });
});
});
describe('transformShape', () => {
it('should apply translation correctly', () => {
const shape = parseShapeString('o');
describe("transformShape", () => {
it("should apply translation correctly", () => {
const shape = parseShapeString("o");
const transform = { ...IDENTITY_TRANSFORM, offset: { x: 5, y: 3 } };
const cells = transformShape(shape, transform);
expect(cells).toEqual([{ x: 5, y: 3 }]);
});
it('should apply 90° rotation correctly', () => {
const shape = parseShapeString('oe');
it("should apply 90° rotation correctly", () => {
const shape = parseShapeString("oe");
const transform = { ...IDENTITY_TRANSFORM, rotation: 90 };
const cells = transformShape(shape, transform);
@ -315,8 +327,8 @@ describe('shape-collision', () => {
]);
});
it('should apply horizontal flip correctly', () => {
const shape = parseShapeString('oe');
it("should apply horizontal flip correctly", () => {
const shape = parseShapeString("oe");
const transform = { ...IDENTITY_TRANSFORM, flipX: true };
const cells = transformShape(shape, transform);
@ -326,8 +338,8 @@ describe('shape-collision', () => {
]);
});
it('should apply vertical flip correctly', () => {
const shape = parseShapeString('os');
it("should apply vertical flip correctly", () => {
const shape = parseShapeString("os");
const transform = { ...IDENTITY_TRANSFORM, flipY: true };
const cells = transformShape(shape, transform);
@ -337,8 +349,8 @@ describe('shape-collision', () => {
]);
});
it('should combine rotation and translation', () => {
const shape = parseShapeString('os');
it("should combine rotation and translation", () => {
const shape = parseShapeString("os");
const transform = {
...IDENTITY_TRANSFORM,
rotation: 90,