Skip to content

wooden bow + projectile #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PJensen merged 1 commit into from
Nov 8, 2025
Merged

wooden bow + projectile #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions app/input/rulesDispatch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import { MoveIntent, WaitIntent, DrinkIntent, CastSpellIntent, PickupIntent, EquipIntent, Position, ItemInfo } from "../../src/rules/components/index.js";
import { UseIntent } from "../../src/rules/components/Intents/UseIntent.js";
import { RangedAttackIntent } from "../../src/rules/components/Intents/RangedAttackIntent.js";
import { itemsAt } from "../../src/rules/utils/queries.js";

/**
Expand Down Expand Up @@ -41,6 +42,20 @@ export function makeRulesDispatcher(world, getActorId) {
world?.tick?.(1);
break;
}
case "rules.shootRanged": {
world?.add?.(actorId, RangedAttackIntent, {});
world?.tick?.(1);
break;
}
case "rules.shootRangedAt": {
const { targetId = 0, x = null, y = null } = action.payload || {};
const intent = {};
if (Number.isInteger(targetId) && targetId > 0) intent.targetId = targetId;
if (Number.isFinite(x) && Number.isFinite(y)) { intent.toX = x; intent.toY = y; }
world?.add?.(actorId, RangedAttackIntent, intent);
world?.tick?.(1);
break;
}
case "rules.equipItem": {
const { itemId = 0 } = action.payload || {};
if (!Number.isInteger(itemId) || itemId <= 0) break;
Expand Down
8 changes: 5 additions & 3 deletions app/rules/scheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ import { useItemSystem } from "../../src/rules/systems/useItemSystem.js";
import { projectileSystem } from "../../src/rules/systems/projectileSystem.js";
import { interactionSystem } from "../../src/rules/systems/interactionSystem.js";
import { effectSystem } from "../../src/rules/systems/effectSystem.js";
import { monsterSpawnerSystem } from "../../src/rules/systems/monsterSpawnerSystem.js";
import { equipmentSystem } from "../../src/rules/systems/equipmentSystem.js";
import { waitSystem } from "../../src/rules/systems/waitSystem.js";
import { castSpellSystem } from "../../src/rules/systems/castSpellSystem.js";
import { rangedAttackSystem } from "../../src/rules/systems/rangedAttackSystem.js";
import { aiChaseSystem } from "../../src/rules/systems/aiChaseSystem.js";
import { movementSystem } from "../../src/rules/systems/movementSystem.js";
import { combatSystem } from "../../src/rules/systems/combatSystem.js";
Expand All @@ -40,6 +42,7 @@ export function configureWorld(world) {
registerSystem(projectileSystem, 'intents');
registerSystem(interactionSystem, 'intents');
registerSystem(castSpellSystem, 'intents');
registerSystem(rangedAttackSystem, 'intents');
registerSystem(movementSystem, 'intents');
registerSystem(combatSystem, 'intents');
// Run pickup after movement so stepping onto items can pick them up immediately
Expand All @@ -48,6 +51,7 @@ export function configureWorld(world) {
// Phase: effects (derived first, then per-turn effects)
registerSystem(equipmentSystem, 'effects');
registerSystem(effectSystem, 'effects');
registerSystem(monsterSpawnerSystem, 'effects');
// Post-move auto-pickup runs after intents, within the same tick
registerSystem(autoPickupPostMoveSystem, 'effects');

Expand Down Expand Up @@ -98,9 +102,7 @@ export function configureWorld(world) {
}

function shouldProfileRules() {
const params = new URLSearchParams(window.location.search || '');
const v = (params.get('rulesProfile') || (typeof localStorage !== 'undefined' ? localStorage.getItem('jshack.rulesProfile') : '0') || '0');
return v === '1' || v === 'true' || v === 'on';
return false;
}

function getRulesProfilerState() {
Expand Down
115 changes: 83 additions & 32 deletions src/display/input/InputManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export class InputManager {
this._gestureCaptureEl = null;
this._gesturePoints = [];
this._gestureWorldPoints = [];
this._gestureClientPoints = [];
this._gestureStartTime = 0;
this._gestureDownTime = 0;
this._gestureActive = false;
Expand Down Expand Up @@ -158,36 +159,8 @@ export class InputManager {
if (!pointer) return;

this._beginGesture(e, pointer);

const origin = this._resolvePointerOrigin();

if (!origin) {
// Fallback: assume center of the canvas represents the actor.
const centerX = canvas.width * 0.5;
const centerY = canvas.height * 0.5;
const dx = (pointer.sx - centerX);
const dy = (pointer.sy - centerY);
if (Math.abs(dx) < 1e-3 && Math.abs(dy) < 1e-3) return;
this._emit(makeAction(Actions.Move, { dx, dy }));
return;
}

if (pointer.wx === null || pointer.wy === null) {
// Without camera conversion, fall back to canvas space relative vector.
const centerX = canvas.width * 0.5;
const centerY = canvas.height * 0.5;
const dx = (pointer.sx - centerX);
const dy = (pointer.sy - centerY);
if (Math.abs(dx) < 1e-3 && Math.abs(dy) < 1e-3) return;
this._emit(makeAction(Actions.Move, { dx, dy }));
return;
}

const dx = pointer.wx - origin.x;
const dy = pointer.wy - origin.y;
if (Math.abs(dx) < 1e-4 && Math.abs(dy) < 1e-4) return;

this._emit(makeAction(Actions.Move, { dx, dy }));
// Do not emit Move on pointer down. We defer deciding between
// a movement tap vs. spell gesture until pointerup.
}

_handlePointerMove(e) {
Expand All @@ -208,7 +181,55 @@ export class InputManager {
if (pointer) {
this._accumulateGesturePoint(pointer);
}
this._finalizeGesture();

// If a long-press/drag activated gesture mode, finalize to run recognizer.
if (this._gestureActive) {
this._finalizeGesture();
return;
}

// Fallback: if the stroke looks like a gesture even without explicit activation,
// try recognition before treating it as a tap move.
try {
const now = performance?.now ? performance.now() : Date.now();
const start = this._gestureDownTime || now;
const duration = (now - start) / 1000;
if (duration >= 0.12 && this._gesturePoints && this._gesturePoints.length >= 6) {
const result = recognizeLightningGesture(this._gesturePoints);
if (result) {
const detail = {
id: "lightning",
duration,
pointerType: this._gesturePointerType,
quality: result.quality,
bounds: result.bounds,
normalizedPath: result.normalizedPath,
worldPath: this._gestureWorldPoints.length ? this._gestureWorldPoints.slice() : null,
};
// Debug overlay notify
try {
const rect = this._lastRect || this._canvas?.getBoundingClientRect?.() || null;
const sx = this._lastScaleX || 1;
const sy = this._lastScaleY || 1;
const b = result.bounds;
const screenBounds = rect ? { x: rect.left + b.minX / (sx || 1), y: rect.top + b.minY / (sy || 1), w: b.width / (sx || 1), h: b.height / (sy || 1) } : null;
window.dispatchEvent(new CustomEvent("ui:gestureProgress", { detail: { points: this._gestureClientPoints?.slice?.() || [], active: true, recognized: { id: 'lightning', quality: result.quality, bounds: screenBounds }, phase: 'recognized' } }));
} catch {}
try { window.dispatchEvent(new CustomEvent("input:spellGesture", { detail })); } catch {}
this._finalizeGesture();
return;
}
}
} catch {}

// Otherwise treat as a short tap.
if (pointer) {
// Emit world-tap with world coords; display handler decides whether to shoot or move
const payload = { x: (pointer.wx ?? null), y: (pointer.wy ?? null), sx: pointer.sx, sy: pointer.sy };
this._emit(makeAction(Actions.TapWorld, payload));
}

this._finalizeGesture(true);
}

_handlePointerCancel(e) {
Expand All @@ -224,6 +245,10 @@ export class InputManager {
const scaleY = rect.height ? (canvas.height / rect.height) : 1;
const sx = (e.clientX - rect.left) * scaleX;
const sy = (e.clientY - rect.top) * scaleY;
// Save for overlay mapping
this._lastRect = rect;
this._lastScaleX = scaleX;
this._lastScaleY = scaleY;

let wx = null;
let wy = null;
Expand All @@ -240,7 +265,7 @@ export class InputManager {
}
}

return { sx, sy, wx, wy };
return { sx, sy, wx, wy, cx: e.clientX, cy: e.clientY };
}

_resolvePointerOrigin() {
Expand All @@ -264,6 +289,7 @@ export class InputManager {
this._gesturePointerType = e.pointerType || "";
this._gesturePoints = [];
this._gestureWorldPoints = [];
this._gestureClientPoints = [];
this._gestureActive = false;
const now = performance?.now ? performance.now() : Date.now();
this._gestureDownTime = now;
Expand Down Expand Up @@ -293,9 +319,22 @@ export class InputManager {
}
}
this._gesturePoints.push({ x: pointer.sx, y: pointer.sy });
if (Number.isFinite(pointer.cx) && Number.isFinite(pointer.cy)) {
this._gestureClientPoints.push({ x: pointer.cx, y: pointer.cy });
}
if (pointer.wx !== null && pointer.wy !== null) {
this._gestureWorldPoints.push({ x: pointer.wx, y: pointer.wy });
}
// Debug overlay update
try {
window.dispatchEvent(new CustomEvent("ui:gestureProgress", {
detail: {
points: this._gestureClientPoints.slice(),
active: this._gestureActive === true,
phase: force ? 'start' : 'move',
}
}));
} catch {}
}

_finalizeGesture(cancelled = false) {
Expand All @@ -308,11 +347,14 @@ export class InputManager {
if (!cancelled && this._gesturePointerId !== null && this._gestureActive) {
this._maybeEmitGesture();
}
// Clear overlay
try { window.dispatchEvent(new CustomEvent("ui:gestureProgress", { detail: { points: [], active: false, phase: 'end', cancelled: !!cancelled } })); } catch {}
this._gesturePointerId = null;
this._gesturePointerType = "";
this._gestureCaptureEl = null;
this._gesturePoints = [];
this._gestureWorldPoints = [];
this._gestureClientPoints = [];
this._gestureStartTime = 0;
this._gestureDownTime = 0;
this._gestureActive = false;
Expand All @@ -337,6 +379,15 @@ export class InputManager {
normalizedPath: result.normalizedPath,
worldPath: this._gestureWorldPoints.length ? this._gestureWorldPoints.slice() : null,
};
// Debug recognition overlay hint
try {
const rect = this._lastRect || this._canvas?.getBoundingClientRect?.() || null;
const sx = this._lastScaleX || 1;
const sy = this._lastScaleY || 1;
const b = result.bounds;
const screenBounds = rect ? { x: rect.left + b.minX / (sx || 1), y: rect.top + b.minY / (sy || 1), w: b.width / (sx || 1), h: b.height / (sy || 1) } : null;
window.dispatchEvent(new CustomEvent("ui:gestureProgress", { detail: { points: this._gestureClientPoints.slice(), active: true, recognized: { id: 'lightning', quality: result.quality, bounds: screenBounds }, phase: 'recognized' } }));
} catch {}
try {
window.dispatchEvent(new CustomEvent("input:spellGesture", { detail }));
} catch {}
Expand Down
2 changes: 2 additions & 0 deletions src/display/input/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const Actions = Object.freeze({
EquipItem: "rules.equipItem", // payload: { itemId:number }

// Display-directed UI
TapWorld: "display.tapWorld", // payload: { x:number, y:number, sx?:number, sy?:number }
OpenInventory: "display.openInventory", // payload: {}
OpenMessageLog: "display.openMessageLog", // payload: {}
Zoom: "display.zoom", // payload: { factor:number } (pinch scale delta)
Expand All @@ -36,6 +37,7 @@ export const defaultActionSinks = Object.freeze({
[Actions.EquipItem]: Sinks.rules,

// Display-directed UI actions
[Actions.TapWorld]: Sinks.display,
[Actions.OpenInventory]: Sinks.display,
[Actions.OpenMessageLog]: Sinks.display,
[Actions.Zoom]: Sinks.display,
Expand Down
Loading
Loading