Skip to content

Battle UX polish: faster fade, CRIT labels, brightness, ASCII attacks #333

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
mokn merged 1 commit into from
Apr 8, 2026
Merged

Battle UX polish: faster fade, CRIT labels, brightness, ASCII attacks #333

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
18 changes: 9 additions & 9 deletions packages/client/src/components/pretext/game/BattleFloatingDamage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type FloatingNumber = {

const POOL_SIZE = 50;
const GRAVITY = -0.03;
const FADE_SPEED = 0.00055;
const FADE_SPEED = 0.0013;

function createPool(): FloatingNumber[] {
return Array.from({ length: POOL_SIZE }, () => ({
Expand All @@ -58,27 +58,27 @@ function getConfig(type: DamageType, value: number) {
switch (type) {
case 'crit':
return {
text: `${value}!`,
text: `CRIT ${value}`,
color: COLORS.danger,
font: getFontString('cinzel-700', 28),
font: getFontString('cinzel-700', 26),
vy: -1.8,
scale: 1.65,
scale: 1.5,
};
case 'double':
return {
text: `${value}`,
color: '#A8DEFF',
font: getFontString('cinzel-700', 24),
font: getFontString('cinzel-700', 22),
vy: -1.55,
scale: 1.35,
scale: 1.25,
};
case 'critDouble':
return {
text: `${value}!!`,
text: `CRIT ${value}`,
color: '#F3D27A',
font: getFontString('cinzel-700', 34),
font: getFontString('cinzel-700', 28),
vy: -2.0,
scale: 1.95,
scale: 1.7,
};
case 'heal':
return {
Expand Down
6 changes: 3 additions & 3 deletions packages/client/src/components/pretext/game/BattleSceneCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,16 +630,16 @@ export const BattleSceneCanvas = forwardRef<
const vigGrd = ctx.createLinearGradient(
0,
0,
w * (playerTpl ? 0.08 : 0.3),
w * (playerTpl ? 0.06 : 0.15),
0,
);
vigGrd.addColorStop(
0,
playerTpl ? 'rgba(10,10,8,0.4)' : 'rgba(10,10,8,0.7)',
playerTpl ? 'rgba(10,10,8,0.2)' : 'rgba(10,10,8,0.4)',
);
vigGrd.addColorStop(1, 'rgba(10,10,8,0)');
ctx.fillStyle = vigGrd;
ctx.fillRect(0, 0, w * (playerTpl ? 0.08 : 0.3), h);
ctx.fillRect(0, 0, w * (playerTpl ? 0.06 : 0.15), h);

// ── HUD: Names ─────────────────────────────────────────────────

Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/components/pretext/game/MonsterAsciiRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,8 @@ const GLOW_BLUR_BASE = 6;
const GLOW_BLUR_MAX = 14;

// v8: background fill intensity
const BG_FILL_BRIGHTNESS = 0.30; // how bright the bg rect is relative to cell color
const BG_FILL_ALPHA = 0.35; // opacity of the bg rect
const BG_FILL_BRIGHTNESS = 0.45; // how bright the bg rect is relative to cell color
const BG_FILL_ALPHA = 0.50; // opacity of the bg rect

// ---------------------------------------------------------------------------
// Public API
Expand Down
138 changes: 68 additions & 70 deletions packages/client/src/components/pretext/game/weaponAnimations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,29 +188,37 @@ function drawMonsterMelee(
_h: number,
progress: number,
): void {
// Claw slash — three diagonal lines that expand on impact
// ASCII claw slash — three slash characters that spread on impact
ctx.save();
ctx.translate(x, y);
const spread = progress * Math.PI * 0.3;
const sz = w * 0.025;
ctx.lineWidth = 2;
ctx.lineCap = 'round';

for (let i = -1; i <= 1; i++) {
const angle = -Math.PI * 0.25 + i * spread;
ctx.strokeStyle = `rgba(200,80,60,${0.9 - Math.abs(i) * 0.2})`;
ctx.beginPath();
ctx.moveTo(Math.cos(angle) * sz * 0.3, Math.sin(angle) * sz * 0.3);
ctx.lineTo(Math.cos(angle) * sz * 2, Math.sin(angle) * sz * 2);
ctx.stroke();
const sz = Math.round(w * 0.028);
const font = `bold ${sz}px "Fira Code", monospace`;
const spread = progress * sz * 0.8;
const alpha = Math.max(0, 1 - progress * 0.3);

const chars = ['╲', '│', '╱'];
const offsets = [
{ dx: -spread, dy: -spread * 0.6 },
{ dx: 0, dy: 0 },
{ dx: spread, dy: -spread * 0.6 },
];

for (let i = 0; i < 3; i++) {
ctx.font = font;
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.fillStyle = `rgba(200,80,60,${alpha})`;
ctx.shadowColor = 'rgba(200,80,60,0.6)';
ctx.shadowBlur = 8;
ctx.fillText(chars[i], offsets[i].dx, offsets[i].dy);
}
ctx.shadowBlur = 0;

// Motion trail
// ASCII trail
ctx.font = `${Math.round(sz * 0.6)}px "Fira Code", monospace`;
for (let i = 1; i <= 3; i++) {
ctx.fillStyle = `rgba(180,60,40,${0.2 - i * 0.06})`;
ctx.beginPath();
ctx.arc(-sz * i * 0.8, 0, sz * 0.3, 0, Math.PI * 2);
ctx.fill();
ctx.fillStyle = `rgba(180,60,40,${0.3 - i * 0.08})`;
ctx.fillText('·', -sz * i * 0.7, 0);
}
ctx.restore();
}
Expand All @@ -223,38 +231,31 @@ function drawMonsterRanged(
_h: number,
progress: number,
): void {
// Fang / bone shard — jagged triangular shape
const sz = w * 0.02;
// ASCII bone shard — rotating arrow-like characters
const sz = Math.round(w * 0.026);
ctx.save();
ctx.translate(x, y);
ctx.rotate(progress * Math.PI * 1.5);

// Shard
ctx.font = `bold ${sz}px "Fira Code", monospace`;
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.fillStyle = '#B8A88A';
ctx.beginPath();
ctx.moveTo(sz, 0);
ctx.lineTo(-sz * 0.5, -sz * 0.4);
ctx.lineTo(-sz * 0.3, 0);
ctx.lineTo(-sz * 0.5, sz * 0.4);
ctx.closePath();
ctx.fill();

// Sharp edge highlight
ctx.strokeStyle = '#DDD0BC';
ctx.lineWidth = 1;
ctx.beginPath();
ctx.moveTo(sz, 0);
ctx.lineTo(-sz * 0.5, -sz * 0.4);
ctx.stroke();
ctx.shadowColor = 'rgba(184,168,138,0.5)';
ctx.shadowBlur = 6;
ctx.fillText('▶▸', 0, 0);
ctx.shadowBlur = 0;

ctx.restore();

// Trail
// ASCII trail
const trailSz = Math.round(sz * 0.5);
ctx.font = `${trailSz}px "Fira Code", monospace`;
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
for (let i = 1; i <= 3; i++) {
ctx.fillStyle = `rgba(160,140,120,${0.25 - i * 0.07})`;
ctx.beginPath();
ctx.arc(x - sz * i, y, 1.5, 0, Math.PI * 2);
ctx.fill();
ctx.fillStyle = `rgba(160,140,120,${0.3 - i * 0.08})`;
ctx.fillText('·', x - sz * i * 0.6, y);
}
}

Expand All @@ -266,41 +267,38 @@ function drawMonsterSpell(
_h: number,
progress: number,
): void {
// Dark shadow bolt — purple/green sinister magic
const baseR = w * 0.012;
const pulse = 1 + Math.sin(progress * Math.PI * 5) * 0.25;
const pulseR = baseR * pulse;
// ASCII shadow bolt — pulsing dark magic character with glow
const sz = Math.round(w * 0.03);
const pulse = 1 + Math.sin(progress * Math.PI * 5) * 0.2;
const pulseSz = Math.round(sz * pulse);

// Outer dark glow
const grd = ctx.createRadialGradient(x, y, 0, x, y, pulseR * 3);
grd.addColorStop(0, 'rgba(120,50,180,0.5)');
grd.addColorStop(0.4, 'rgba(60,30,100,0.2)');
grd.addColorStop(1, 'rgba(30,15,50,0)');
ctx.fillStyle = grd;
ctx.fillRect(x - pulseR * 3, y - pulseR * 3, pulseR * 6, pulseR * 6);
ctx.save();
ctx.font = `bold ${pulseSz}px "Fira Code", monospace`;
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';

// Core — sickly green-purple
// Outer glow
ctx.shadowColor = 'rgba(140,80,200,0.7)';
ctx.shadowBlur = 14;
ctx.fillStyle = 'rgb(140,80,200)';
ctx.beginPath();
ctx.arc(x, y, pulseR, 0, Math.PI * 2);
ctx.fill();
ctx.fillText('◆', x, y);

// Inner bright core
// Bright inner core
ctx.shadowBlur = 0;
ctx.font = `bold ${Math.round(pulseSz * 0.5)}px "Fira Code", monospace`;
ctx.fillStyle = 'rgb(200,160,255)';
ctx.beginPath();
ctx.arc(x, y, pulseR * 0.4, 0, Math.PI * 2);
ctx.fill();

// Shadow particles
for (let i = 0; i < 4; i++) {
const tx = x - w * 0.008 * (i + 1) + (Math.random() - 0.5) * w * 0.01;
const ty = y + (Math.random() - 0.5) * w * 0.012;
const tr = pulseR * (0.5 - i * 0.1);
ctx.fillStyle = `rgba(100,40,160,${0.4 - i * 0.1})`;
ctx.beginPath();
ctx.arc(tx, ty, Math.max(1, tr), 0, Math.PI * 2);
ctx.fill();
ctx.fillText('✦', x, y);

// ASCII particle trail
ctx.font = `${Math.round(sz * 0.5)}px "Fira Code", monospace`;
ctx.shadowBlur = 0;
for (let i = 1; i <= 4; i++) {
const tx = x - sz * i * 0.5;
const ty = y + (i % 2 === 0 ? -2 : 2);
ctx.fillStyle = `rgba(100,40,160,${0.4 - i * 0.08})`;
ctx.fillText('·', tx, ty);
}
ctx.restore();
}

// ── Unified draw dispatcher ─────────────────────────────────────────────
Expand Down
Loading