From cec3c2b01bb9d6a8c2a9a1020e0504b587bceb27 Mon Sep 17 00:00:00 2001 From: Jason Reed Date: Sat, 17 Feb 2024 16:28:48 -0500 Subject: [PATCH] Cleanly separate out resbar-only resources in the types --- public/assets/toolbar.png | Bin 23460 -> 24034 bytes src/core/action.ts | 4 ++-- src/core/landing-resolve.ts | 4 ++-- src/core/state.ts | 9 +++------ src/core/tools.ts | 15 +++++++++------ src/ui/sprite-sheet.ts | 5 ++--- src/ui/widget-helpers.ts | 4 ++-- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/public/assets/toolbar.png b/public/assets/toolbar.png index 4277d33d1c67b6cdfb1335391de4bd2f011463be..e417f0f1ceffd6ea3ca0928f6779ce351ca3a54d 100644 GIT binary patch delta 19086 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 delta 18673 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 // state such that, if it updates, should induce redraw of Canvas2d content export type SlowState = { diff --git a/src/core/tools.ts b/src/core/tools.ts index 4f82f1d..6d85793 100644 --- a/src/core/tools.ts +++ b/src/core/tools.ts @@ -23,13 +23,16 @@ const tools = [ export type Tool = (typeof tools)[number]; -const resources = [ +const resbarResources = [ 'wood', 'axe', - 'planks', ] as const; -export type Resource = (typeof resources)[number]; +export type ResbarResource = (typeof resbarResources)[number]; +export type WorldOnlyResource = + | 'planks' + ; +export type Resource = ResbarResource | WorldOnlyResource; export function toolOfIndex(index: number): Tool | undefined { return tools[index]; @@ -78,11 +81,11 @@ export function getCurrentTools(state: CoreState): Tool[] { return tools; } -export function getCurrentResources(state: CoreState): Resource[] { +export function getCurrentResources(state: CoreState): ResbarResource[] { if (state.slowState.winState.t == 'lost') { return []; } - const resources: Resource[] = []; + const resources: ResbarResource[] = []; if (state.slowState.resource.wood > 0) { resources.push('wood'); } @@ -96,7 +99,7 @@ export function rectOfTool(tool: Tool): Rect { return spriteRectOfPos(spriteLocOfTool(tool)); } -export function largeRectOf(tool: Tool | Resource): Rect { +export function largeRectOf(tool: Tool | ResbarResource): Rect { return largeSpriteRectOfPos(largeSpriteLoc(tool)); } diff --git a/src/ui/sprite-sheet.ts b/src/ui/sprite-sheet.ts index 50e16e1..586fe6c 100644 --- a/src/ui/sprite-sheet.ts +++ b/src/ui/sprite-sheet.ts @@ -1,7 +1,7 @@ import { Bonus } from "../core/bonus"; import { ChunkValue } from "../core/chunk"; import { MobState } from "../core/mobs"; -import { LARGE_SPRITE_PIXEL_WIDTH, Resource, SPRITE_PIXEL_WIDTH, Tool } from "../core/tools"; +import { LARGE_SPRITE_PIXEL_WIDTH, ResbarResource, SPRITE_PIXEL_WIDTH, Tool, Resource } from "../core/tools"; import { Buffer, buffer, fillRect } from "../util/dutil"; import { scale } from "../util/se2"; import { apply_to_rect } from "../util/se2-extra"; @@ -83,7 +83,7 @@ export function spriteLocOfRes(res: Resource): Point { } } -export function largeSpriteLoc(tool: Tool | Resource): Point { +export function largeSpriteLoc(tool: Tool | ResbarResource): Point { switch (tool) { case 'pointer': return { y: 0, x: 0 }; case 'hand': return { y: 0, x: 1 }; @@ -95,7 +95,6 @@ export function largeSpriteLoc(tool: Tool | Resource): Point { case 'time': return { y: 0, x: 7 }; case 'wood': return { y: 0, x: 8 }; case 'axe': return { y: 0, x: 9 }; - case 'planks': return { y: 0, x: 0 }; // XXX - this is invalid } } diff --git a/src/ui/widget-helpers.ts b/src/ui/widget-helpers.ts index 5fca9eb..60ca209 100644 --- a/src/ui/widget-helpers.ts +++ b/src/ui/widget-helpers.ts @@ -1,5 +1,5 @@ import { CoreState, HAND_TILE_LIMIT, Location } from "../core/state"; -import { Resource, Tool, getCurrentResources, getCurrentTools } from "../core/tools"; +import { ResbarResource, Tool, getCurrentResources, getCurrentTools } from "../core/tools"; import { SE2, apply, inverse } from "../util/se2"; import { Point, Rect } from "../util/types"; import { lerp, mapval, pixelSnapRect, pointInRect } from "../util/util"; @@ -161,7 +161,7 @@ export type DragWidgetPoint = export type WidgetPoint = | DragWidgetPoint | { t: 'toolbar', p_in_local: Point, p_in_canvas: Point, local_from_canvas: SE2, tool: Tool } - | { t: 'resbar', p_in_local: Point, p_in_canvas: Point, local_from_canvas: SE2, res: Resource } + | { t: 'resbar', p_in_local: Point, p_in_canvas: Point, local_from_canvas: SE2, res: ResbarResource } | { t: 'pauseButton', p_in_canvas: Point } | { t: 'nowhere', p_in_canvas: Point } // outside canvas bounds ;