Targeting dims out-of-reach squares; Speedstone pays out immediately
Selecting an L.O.S. card now drops every square you cannot see into shadow, leaving eligible targets lit — computed by the engine's own hasLineOfSight over the player's VIEW, so illusion walls you still believe in block your aim, stone and bushes and the Big Man block everyone's, and Around The Corner widens the light one bend when attached. ADJACENT cards light just your square and its four neighbors. The shade paints over tokens and wizards alike, and switches off while arming an ambush, since ambushes aim at the future. A new sightedCellsFor lives in the engine view module so the client can never disagree with the rules. Speedstone, meanwhile, only took effect at next turn's allowance recompute — displaying it mid-turn granted nothing, as playtesting found. It now bumps the current allowance by one on display (a delta, so number-card movement already played survives), unless SLOW or a zeroed allowance says otherwise. Test covers the immediate grant and the persistence into later turns. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Fable 5
parent
a0d862ca10
commit
4f3083c490
@@ -132,7 +132,7 @@ export interface SquareContent {
|
||||
}
|
||||
|
||||
/** Which square contents block line of sight. */
|
||||
const LOS_BLOCKING_CONTENT: Record<SquareContent["kind"], boolean> = {
|
||||
export const LOS_BLOCKING_CONTENT: Record<SquareContent["kind"], boolean> = {
|
||||
stone: true, thornbush: true, rosebush: true, dust: true, slime: true,
|
||||
ooze: false, tacks: false, pit: false, safe: false,
|
||||
};
|
||||
@@ -1304,7 +1304,17 @@ const CARD_EFFECTS: Record<string, AttackEffect | NeutralEffect | CounterEffect>
|
||||
powerstone: stoneEffect("powerstone"),
|
||||
shadowstone: stoneEffect("shadowstone"),
|
||||
soulstone: stoneEffect("soulstone"),
|
||||
speedstone: stoneEffect("speedstone"),
|
||||
speedstone: stoneEffect("speedstone", (state, _events, caster) => {
|
||||
// "Your movement rate is increased by 1" — starting now, not next turn.
|
||||
// A delta (not a recompute) so number cards already played stay counted.
|
||||
// No bump while SLOW forces 1, or when this turn's movement is already
|
||||
// forced to zero (pit struggle, sticky webs) — next turn recomputes.
|
||||
const isActive = state.players[state.turn.activeIndex]?.id === caster.id;
|
||||
const slowed = sustainedOn(state, caster.id, "slow").length > 0;
|
||||
if (isActive && !slowed && state.turn.movementAllowance > 0) {
|
||||
state.turn.movementAllowance += 1;
|
||||
}
|
||||
}),
|
||||
shieldstone: stoneEffect("shieldstone"),
|
||||
visionstone: stoneEffect("visionstone"),
|
||||
brainstone: stoneEffect("brainstone", (state, events, caster) => {
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
// The server sends this after every state change; clients never see the
|
||||
// deck order or other players' hands.
|
||||
|
||||
import { type AssembledBoard } from "./board";
|
||||
import { hasLineOfSight, type AssembledBoard } from "./board";
|
||||
import { type CardInstance } from "./cards";
|
||||
import {
|
||||
boardView,
|
||||
LOS_BLOCKING_CONTENT,
|
||||
type AmbushState,
|
||||
type CastStack,
|
||||
type CreatureState,
|
||||
@@ -134,3 +135,30 @@ export function viewFor(state: GameState, playerId: PlayerId): GameView {
|
||||
}),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Every cell the viewing player can see from where they stand, by the same
|
||||
* line-of-sight rules the engine enforces — computed from the VIEW, so it
|
||||
* reflects what this player knows (illusion walls they believe in block it).
|
||||
* The basis for the client's "dim the ineligible squares" targeting aid.
|
||||
*/
|
||||
export function sightedCellsFor(view: GameView): Set<string> {
|
||||
const out = new Set<string>();
|
||||
const me = view.players.find((p) => p.id === view.you);
|
||||
if (!me) return out;
|
||||
const blockers: Record<string, true> = {};
|
||||
for (const [key, content] of Object.entries(view.squareContents)) {
|
||||
if (LOS_BLOCKING_CONTENT[content.kind]) blockers[key] = true;
|
||||
}
|
||||
// BIG MAN: you cannot cast spells past him.
|
||||
for (const p of view.players) {
|
||||
if (p.alive && view.sustained.some((s) => s.cardId === "big-man" && s.targetId === p.id)) {
|
||||
blockers[`${p.position.x},${p.position.y}`] = true;
|
||||
}
|
||||
}
|
||||
for (const key of Object.keys(view.board.cells)) {
|
||||
const [x, y] = key.split(",").map(Number) as [number, number];
|
||||
if (hasLineOfSight(view.board, me.position, { x, y }, blockers)) out.add(key);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -298,3 +298,20 @@ describe("stack discipline", () => {
|
||||
if (!result.ok) expect(result.error).toMatch(/not implemented/);
|
||||
});
|
||||
});
|
||||
|
||||
describe("speedstone", () => {
|
||||
it("displaying it grants the extra movement point immediately", () => {
|
||||
let { state } = newGame();
|
||||
state = toRound2(state);
|
||||
const who = activePlayer(state).id;
|
||||
giveCard(state, who, "speedstone");
|
||||
expect(state.turn.movementAllowance).toBe(3);
|
||||
state = must(state, who, { type: "cast", instanceId: "speedstone#T" });
|
||||
expect(state.turn.movementAllowance).toBe(4);
|
||||
// And it persists into later turns via the displayed stone.
|
||||
state = must(state, who, { type: "endTurn", draw: 0 });
|
||||
state = must(state, activePlayer(state).id, { type: "endTurn", draw: 0 });
|
||||
expect(activePlayer(state).id).toBe(who);
|
||||
expect(state.turn.movementAllowance).toBe(4);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import Help from "./Help.svelte";
|
||||
import Replay from "./Replay.svelte";
|
||||
import { local } from "./local.svelte";
|
||||
import { allCardDefs, cardDef, isNumberCard, SIDES, stepTarget, cellKey, isMovableObject } from "@wizwar/engine";
|
||||
import { allCardDefs, cardDef, isNumberCard, SIDES, stepTarget, cellKey, isMovableObject, sightedCellsFor } from "@wizwar/engine";
|
||||
import type { CardInstance, Side } from "@wizwar/engine";
|
||||
|
||||
net.connect();
|
||||
@@ -477,6 +477,35 @@
|
||||
view.treasures.some((t) => t.position && t.position.x === me.position.x &&
|
||||
t.position.y === me.position.y && !t.carriedBy),
|
||||
);
|
||||
/** Squares a selected L.O.S./ADJACENT card can reach; null = no dimming. */
|
||||
const litCells = $derived.by(() => {
|
||||
if (!view || !selectedDef || !isYourTurn) return null;
|
||||
if (ambushVia || ambushSpell || ambushTrigger) return null; // ambushes aim at the future
|
||||
if (!me) return null;
|
||||
if (selectedDef.adjacent === true) {
|
||||
const { x, y } = me.position;
|
||||
return new Set(
|
||||
[[x, y], [x + 1, y], [x - 1, y], [x, y + 1], [x, y - 1]]
|
||||
.map(([cx, cy]) => `${cx},${cy}`)
|
||||
.filter((k) => view.board.cells[k]),
|
||||
);
|
||||
}
|
||||
if (selectedDef.los !== true) return null;
|
||||
const sighted = sightedCellsFor(view);
|
||||
if (attachedMods.some((m) => m.cardId === "around-the-corner")) {
|
||||
const widened = new Set(sighted);
|
||||
for (const key of Object.keys(view.board.cells)) {
|
||||
if (widened.has(key)) continue;
|
||||
const [cx, cy] = key.split(",").map(Number);
|
||||
if ([[1, 0], [-1, 0], [0, 1], [0, -1]].some(([dx, dy]) => sighted.has(`${cx! + dx!},${cy! + dy!}`))) {
|
||||
widened.add(key);
|
||||
}
|
||||
}
|
||||
return widened;
|
||||
}
|
||||
return sighted;
|
||||
});
|
||||
|
||||
const objectsHere = $derived(
|
||||
view != null && me != null
|
||||
? (view.groundObjects[`${me.position.x},${me.position.y}`] ?? [])
|
||||
@@ -806,6 +835,7 @@
|
||||
onCreatureClick={clickCreature}
|
||||
onWarpClick={clickWarp}
|
||||
markedCell={tradeFrom ?? pendingSectorFrom}
|
||||
{litCells}
|
||||
/>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
onCreatureClick,
|
||||
onWarpClick,
|
||||
markedCell = null,
|
||||
litCells = null,
|
||||
}: {
|
||||
view: GameView;
|
||||
edgeSelectMode?: boolean;
|
||||
@@ -26,6 +27,8 @@
|
||||
onWarpClick?: (cell: { x: number; y: number }, side: Side) => void;
|
||||
/** First square of a two-square spell: marked so the click reads as taken. */
|
||||
markedCell?: { x: number; y: number } | null;
|
||||
/** When set, squares NOT in this set dim — the targeting aid. */
|
||||
litCells?: Set<string> | null;
|
||||
} = $props();
|
||||
|
||||
const PLAYER_COLORS = ["#1a9c46", "#d3352b", "#c9308f", "#3a3ac0", "#2ab0c9", "#c9a72a"];
|
||||
@@ -431,6 +434,16 @@
|
||||
onkeydown={() => {}}
|
||||
/>
|
||||
{/each}
|
||||
<!-- targeting aid: ineligible squares fall into shadow -->
|
||||
{#if litCells}
|
||||
{#each Object.keys(view.board.cells) as key (key)}
|
||||
{#if !litCells.has(key)}
|
||||
{@const dx = Number(key.split(",")[0])}
|
||||
{@const dy = Number(key.split(",")[1])}
|
||||
<rect x={dx * CELL} y={dy * CELL} width={CELL} height={CELL} class="dim-cell" />
|
||||
{/if}
|
||||
{/each}
|
||||
{/if}
|
||||
</svg>
|
||||
|
||||
<style>
|
||||
@@ -519,6 +532,10 @@
|
||||
fill: #6a5c44;
|
||||
pointer-events: none;
|
||||
}
|
||||
.dim-cell {
|
||||
fill: rgba(12, 9, 5, 0.55);
|
||||
pointer-events: none;
|
||||
}
|
||||
.marked-cell {
|
||||
fill: rgba(211, 133, 43, 0.18);
|
||||
stroke: #d3852b;
|
||||
@@ -540,7 +557,11 @@
|
||||
50% { opacity: 0.35; }
|
||||
}
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.marked-cell {
|
||||
.dim-cell {
|
||||
fill: rgba(12, 9, 5, 0.55);
|
||||
pointer-events: none;
|
||||
}
|
||||
.marked-cell {
|
||||
fill: rgba(211, 133, 43, 0.18);
|
||||
stroke: #d3852b;
|
||||
stroke-width: 2.5;
|
||||
|
||||
Reference in New Issue
Block a user