Merge branch 'main' of ssh://git.keithsolomon.net:222/keith/2D6-Dungeon

# Conflicts:
#	src/App.tsx
#	src/data/contentHelpers.test.ts
#	src/data/contentHelpers.ts
#	src/data/sampleContentPack.ts
#	src/rules/runState.test.ts
#	src/rules/runState.ts
#	src/schemas/state.ts
#	src/styles.css
#	src/types/state.ts
This commit is contained in:
Keith Solomon committed 2026-03-18 20:19:45 -05:00
commit bcd720cae8
10 files changed
+667 -9

No files matched your search

+2
View File
@@ -239,6 +239,8 @@ export type RunState = {
townState: TownState;
defeatedCreatureIds: string[];
xpGained: number;
goldGained: number;
lootedItems: InventoryEntry[];
log: LogEntry[];
pendingEffects: RuleEffect[];
};