BlueGit

projects-timfalken-com meteors

feat: parabolic flight arcs between player and opponent fields (t1125)

Shots follow a parabola: player-to-enemy shrinks to mini size,
enemy-to-player grows from mini to a full tile, enemy-to-enemy
stay small and render in #flights-back. Enemy misses reuse the
existing fade, starting smaller. Late polls join mid-arc via age;
delivery timing is unchanged.

timfa Grok Bot · pushed by timfa

Authored 2026-11-13 · 4 days ago

Hash
fa6526a953ecedefb466efa6737251a8976ae1b1
Parent
092bee4e
1 file changed +273 −34
src/online.js +273 −34
@@ -203,8 +203,15 @@ Online._handleTransitions = function (prevStatus, data)
203 203 { this.onGameStart(lobby); }
204 204 if (data && data.incoming && data.incoming.length && this.onIncoming)
205 205 { this.onIncoming(data.incoming); }
206 // Own outgoing results (immediate) and lobby-wide recent flights
207 // (so every client can draw opponent and enemy-to-enemy arcs, t1125).
208 var flights = [];
206 209 if (data && data.shot_results && data.shot_results.length)
207 { this.spawnFlights(data.shot_results, this._lastQueuedMeta); }
210 { flights = flights.concat(data.shot_results); }
211 if (data && data.shot_flights && data.shot_flights.length)
212 { flights = flights.concat(data.shot_flights); }
213 if (flights.length)
214 { this.spawnFlights(flights, this._flightLocals); }
208 215 if (status === 'finished' && prevStatus !== 'finished' && this.onFinished)
209 216 { this.onFinished(lobby); }
210 217 if (status === 'waiting' && prevStatus === 'finished' && this.onLobbyReturn)
@@ -295,6 +302,20 @@ Online.renderMinis = function (container)
295 302 + '<div class="mini-meta"></div>';
296 303 container.appendChild(el);
297 304 }
305 var mz = (typeof app !== 'undefined' && app.miniLayout && app.miniLayout.mini)
306 ? app.miniLayout.mini
307 : { w: 80, h: 104 };
308 var canvas = el.querySelector('canvas');
309 if (canvas && (canvas.width !== mz.w || canvas.height !== mz.h))
310 {
311 canvas.width = mz.w;
312 canvas.height = mz.h;
313 }
314 if (canvas)
315 {
316 canvas.style.width = mz.w + 'px';
317 canvas.style.height = mz.h + 'px';
318 }
298 319 el.classList.toggle('eliminated', !!p.eliminated);
299 320 el.querySelector('.mini-name').textContent = p.name + (p.is_host ? ' (host)' : '');
300 321 el.querySelector('.mini-meta').textContent = p.eliminated
@@ -307,6 +328,8 @@ Online.renderMinis = function (container)
307 328 if (!seen[id])
308 329 { existing[id].remove(); }
309 330 }
331 if (typeof applyMinisLayout === 'function')
332 { applyMinisLayout(); }
310 333 };
311 334
312 335 var MINI_COLORS = ['#d4553a', '#3a9ad4', '#4caf6a', '#e6c04a', '#b86ad4'];
@@ -401,40 +424,221 @@ function colorSpriteUrl (color, planetId)
401 424 * startX, startY} in viewport pixels, filled by the view just after
402 425 * consumeOutgoingShots.
403 426 */
427 Online.playerId = function ()
428 {
429 if (typeof app !== 'undefined' && app.offline)
430 { return 'player'; }
431 if (this.lobby && this.lobby.players)
432 {
433 for (var i = 0; i < this.lobby.players.length; i++)
434 {
435 if (this.lobby.players[i].is_me)
436 { return this.lobby.players[i].id; }
437 }
438 }
439 return 'player';
440 };
441
442 /**
443 * Classify a shot for visual treatment (t1125).
444 * player-to-enemy, enemy-to-player, enemy-to-enemy,
445 * player-miss, enemy-miss.
446 */
447 Online.flightKind = function (fromId, targetId, miss)
448 {
449 var me = this.playerId();
450 var fromMe = !fromId || fromId === me || fromId === 'player';
451 if (miss)
452 { return fromMe ? 'player-miss' : 'enemy-miss'; }
453 if (fromMe)
454 { return 'player-to-enemy'; }
455 if (targetId === me || targetId === 'player')
456 { return 'enemy-to-player'; }
457 return 'enemy-to-enemy';
458 };
459
460 /**
461 * Parabolic arc: linear in x, a rise of `height` pixels above the
462 * chord at mid-flight (screen y grows downward, so we subtract).
463 */
464 Online.arcPoint = function (start, end, u, height)
465 {
466 var t = u < 0 ? 0 : (u > 1 ? 1 : u);
467 var x = start.x + (end.x - start.x) * t;
468 var y = start.y + (end.y - start.y) * t - 4 * height * t * (1 - t);
469 return { x: x, y: y };
470 };
471
472 Online.arcHeight = function (start, end)
473 {
474 var dx = end.x - start.x;
475 var dy = end.y - start.y;
476 var dist = Math.sqrt(dx * dx + dy * dy);
477 return Math.max(48, Math.min(220, dist * 0.28));
478 };
479
480 Online.easeInOutCubic = function (t)
481 {
482 if (t < 0.5)
483 { return 4 * t * t * t; }
484 var u = -2 * t + 2;
485 return 1 - (u * u * u) / 2;
486 };
487
488 Online._miniCellSize = function (playerId)
489 {
490 var el = this.miniElement(playerId);
491 var canvas = el && el.querySelector('canvas');
492 if (canvas)
493 {
494 var r = canvas.getBoundingClientRect();
495 return Math.max(6, r.width / 10);
496 }
497 return 10;
498 };
499
500 Online._fullTileSize = function ()
501 {
502 if (typeof app !== 'undefined' && app.tile)
503 { return app.tile; }
504 return 40;
505 };
506
507 Online._miniAnchor = function (playerId, dir)
508 {
509 var el = this.miniElement(playerId);
510 var canvas = el && (el.querySelector ? el.querySelector('canvas') : null);
511 var box = canvas || el;
512 if (!box)
513 { return { x: window.innerWidth / 2, y: 48 }; }
514 var r = box.getBoundingClientRect();
515 if (dir === 'out')
516 { return { x: r.left + r.width / 2, y: r.top + 4 }; }
517 return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
518 };
519
520 Online._fieldTop = function (col)
521 {
522 return this._flightStart(col);
523 };
524
525 /**
526 * Animate shot results. `locals` is a map of client_id → {col, y, color,
527 * startX, startY, from_id} in viewport pixels.
528 *
529 * Visual-only (t1125): a parabolic arc whose scale goes from mini-cell
530 * to full tile (or the reverse). Enemy-to-enemy arcs stay small and
531 * are drawn behind the player's field. Delivery timing is unchanged;
532 * a late-seen flight starts mid-arc via `age`.
533 */
404 534 Online.spawnFlights = function (results, locals)
405 535 {
406 536 locals = locals || this._flightLocals || {};
407 var layer = document.getElementById('flights');
408 if (!layer)
537 var front = document.getElementById('flights');
538 var back = document.getElementById('flights-back') || front;
539 if (!front)
409 540 { return; }
541 if (!this._flightSeen)
542 { this._flightSeen = Object.create(null); }
543 var now = performance.now();
544 var full = this._fullTileSize();
410 545 for (var i = 0; i < results.length; i++)
411 546 {
412 547 var r = results[i];
413 var meta = locals[r.client_id] || {};
414 var start = this._flightStart(meta.col);
415 var end;
548 var sid = String(r.id != null ? r.id : (r.client_id || ('tmp-' + i)));
549 if (this._flightSeen[sid])
550 { continue; }
551 this._flightSeen[sid] = now;
552
553 var meta = locals[r.client_id] || locals[sid] || {};
554 var fromId = r.from_id || r.from_user || meta.from_id || null;
555 var targetId = r.target_id != null ? r.target_id : r.to_user;
416 556 var miss = !!r.miss;
557 var kind = this.flightKind(fromId, targetId, miss);
558 var duration = (r.flight_duration || this.FLIGHT_DURATION) * 1000;
559 if (r.age != null && isFinite(r.age) && r.age * 1000 >= duration)
560 { continue; }
561
562 var start;
563 if (meta.startX != null && isFinite(meta.startX))
564 { start = { x: meta.startX, y: meta.startY }; }
565 else if (kind === 'player-to-enemy' || kind === 'player-miss')
566 { start = this._flightStart(meta.col != null ? meta.col : r.col); }
567 else
568 { start = this._miniAnchor(fromId, 'out'); }
569
570 var end;
417 571 if (miss)
418 { end = this._missEnd(start); }
572 { end = this._missEnd(start, kind === 'enemy-miss'); }
573 else if (kind === 'enemy-to-player')
574 { end = this._fieldTop(null); }
575 else
576 { end = this._targetEnd(targetId, start); }
577
578 var startScale;
579 var endScale;
580 var mini = this._miniCellSize(fromId || targetId) / full;
581 if (mini < 0.12)
582 { mini = 0.2; }
583 if (kind === 'player-to-enemy')
584 {
585 startScale = 1;
586 endScale = mini;
587 }
588 else if (kind === 'enemy-to-player')
589 {
590 startScale = mini;
591 endScale = 1;
592 }
593 else if (kind === 'enemy-to-enemy')
594 {
595 startScale = mini;
596 endScale = mini;
597 }
598 else if (kind === 'enemy-miss')
599 {
600 startScale = mini;
601 endScale = 0;
602 }
419 603 else
420 { end = this._targetEnd(r.target_id, start); }
604 {
605 startScale = 1;
606 endScale = 0;
607 }
608
609 var layer = (kind === 'enemy-to-enemy' && back) ? back : front;
421 610 var el = document.createElement('img');
422 611 el.src = colorSpriteUrl(r.color != null ? r.color : meta.color);
423 612 el.alt = '';
424 el.className = 'flight';
613 el.className = 'flight' + (kind === 'enemy-to-enemy' ? ' flight-behind' : '');
614 el.style.width = full + 'px';
615 el.style.height = full + 'px';
425 616 layer.appendChild(el);
426 var spin = (Math.random() * 2 - 1) * 720;
427 var duration = (r.flight_duration || this.FLIGHT_DURATION) * 1000;
617
618 var t0 = now;
619 if (r.age != null && isFinite(r.age) && r.age > 0)
620 {
621 var u0 = Math.min(0.95, (r.age * 1000) / duration);
622 t0 = now - u0 * duration;
623 }
624 var height = miss
625 ? Math.max(40, Math.min(160, Math.abs(end.y - start.y) * 0.35))
626 : this.arcHeight(start, end);
428 627 this._flights.push({
429 628 el: el,
430 629 start: start,
431 630 end: end,
432 ctrl: miss ? this._missCtrl(start, end) : this._hitCtrl(start, end),
433 t0: performance.now(),
631 ctrl: miss ? this._missCtrl(start, end) : null,
632 height: height,
633 t0: t0,
434 634 duration: duration,
435 spin: spin,
635 spin: (Math.random() * 2 - 1) * 720,
436 636 miss: miss,
437 angle: Math.random() * 360
637 kind: kind,
638 startScale: startScale,
639 endScale: endScale,
640 angle: Math.random() * 360,
641 id: sid
438 642 });
439 643 }
440 644 this._flightLocals = {};
@@ -449,13 +653,13 @@ Online.rememberFlightLocal = function (shot, startX, startY)
449 653 y: shot.y,
450 654 color: shot.color,
451 655 startX: startX,
452 startY: startY
656 startY: startY,
657 from_id: shot.from_id
453 658 };
454 659 };
455 660
456 661 Online._flightStart = function (col)
457 662 {
458 var field = document.querySelector('canvas');
459 663 var appRef = typeof app !== 'undefined' ? app : null;
460 664 if (appRef && appRef.scene && appRef.scene.canvas)
461 665 {
@@ -467,6 +671,7 @@ Online._flightStart = function (col)
467 671 y: rect.top + 4
468 672 };
469 673 }
674 var field = document.querySelector('canvas');
470 675 if (field)
471 676 {
472 677 var rect = field.getBoundingClientRect();
@@ -480,19 +685,25 @@ Online._targetEnd = function (targetId, start)
480 685 var el = targetId && this.miniElement(targetId);
481 686 if (el)
482 687 {
483 var r = el.getBoundingClientRect();
688 var canvas = el.querySelector('canvas') || el;
689 var r = canvas.getBoundingClientRect();
484 690 return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
485 691 }
486 692 return { x: start.x + (Math.random() - 0.5) * 80, y: 40 };
487 693 };
488 694
489 Online._missEnd = function (start)
695 Online._missEnd = function (start, fromMini)
490 696 {
491 var dx = (Math.random() * 2 - 1) * window.innerWidth * 0.35;
492 return {
493 x: start.x + dx,
494 y: start.y - (120 + Math.random() * 220)
495 };
697 var w = window.innerWidth || 800;
698 var outward;
699 if (start.x < w * 0.4)
700 { outward = -(80 + Math.random() * w * 0.25); }
701 else if (start.x > w * 0.6)
702 { outward = (80 + Math.random() * w * 0.25); }
703 else
704 { outward = (Math.random() * 2 - 1) * w * 0.35; }
705 var lift = fromMini ? (80 + Math.random() * 160) : (120 + Math.random() * 220);
706 return { x: start.x + outward, y: start.y - lift };
496 707 };
497 708
498 709 Online._missCtrl = function (start, end)
@@ -518,26 +729,53 @@ Online.tickFlights = function (now)
518 729 for (var i = 0; i < this._flights.length; i++)
519 730 {
520 731 var f = this._flights[i];
521 var u = (now - f.t0) / f.duration;
522 if (u >= 1)
732 var raw = (now - f.t0) / f.duration;
733 if (raw >= 1)
523 734 {
524 735 if (f.el && f.el.parentNode)
525 736 { f.el.parentNode.removeChild(f.el); }
526 737 continue;
527 738 }
528 // Quadratic bezier, ease-in so they feel like they recede.
529 var e = u * u;
530 var mt = 1 - e;
531 var x = mt * mt * f.start.x + 2 * mt * e * f.ctrl.x + e * e * f.end.x;
532 var y = mt * mt * f.start.y + 2 * mt * e * f.ctrl.y + e * e * f.end.y;
533 var scale = f.miss ? (1 - e) : (1 - 0.85 * e);
534 var angle = f.angle + f.spin * u;
739 if (raw < 0)
740 { raw = 0; }
741 var u = this.easeInOutCubic(raw);
742 var x, y;
743 if (f.miss && f.ctrl)
744 {
745 var e = raw * raw;
746 var mt = 1 - e;
747 x = mt * mt * f.start.x + 2 * mt * e * f.ctrl.x + e * e * f.end.x;
748 y = mt * mt * f.start.y + 2 * mt * e * f.ctrl.y + e * e * f.end.y;
749 }
750 else
751 {
752 var pt = this.arcPoint(f.start, f.end, u, f.height || 80);
753 x = pt.x;
754 y = pt.y;
755 }
756 var scale = f.startScale + (f.endScale - f.startScale) * u;
757 if (f.miss)
758 {
759 var fadeU = raw * raw;
760 scale = f.startScale * (1 - fadeU);
761 }
762 var angle = f.angle + f.spin * raw;
535 763 f.el.style.transform = 'translate(' + x + 'px,' + y + 'px) translate(-50%,-50%) rotate('
536 764 + angle + 'deg) scale(' + scale + ')';
537 f.el.style.opacity = f.miss ? String(1 - e) : '1';
765 f.el.style.opacity = f.miss ? String(Math.max(0, 1 - raw * raw)) : '1';
538 766 leftover.push(f);
539 767 }
540 768 this._flights = leftover;
769 if (this._flightSeen)
770 {
771 var cutoff = now - 8000;
772 var ids = Object.keys(this._flightSeen);
773 for (var k = 0; k < ids.length; k++)
774 {
775 if (this._flightSeen[ids[k]] < cutoff)
776 { delete this._flightSeen[ids[k]]; }
777 }
778 }
541 779 };
542 780
543 781 Online.clearFlights = function ()
@@ -550,6 +788,7 @@ Online.clearFlights = function ()
550 788 }
551 789 this._flights = [];
552 790 this._flightLocals = {};
791 this._flightSeen = Object.create(null);
553 792 };
554 793
555 794 if (typeof globalThis !== 'undefined')
@@ -203,8 +203,15 @@ Online._handleTransitions = function (prevStatus, data)
203 { this.onGameStart(lobby); }
203 { this.onGameStart(lobby); }
204 if (data && data.incoming && data.incoming.length && this.onIncoming)
204 if (data && data.incoming && data.incoming.length && this.onIncoming)
205 { this.onIncoming(data.incoming); }
205 { this.onIncoming(data.incoming); }
206 // Own outgoing results (immediate) and lobby-wide recent flights
207 // (so every client can draw opponent and enemy-to-enemy arcs, t1125).
208 var flights = [];
206 if (data && data.shot_results && data.shot_results.length)
209 if (data && data.shot_results && data.shot_results.length)
207 { this.spawnFlights(data.shot_results, this._lastQueuedMeta); }
210 { flights = flights.concat(data.shot_results); }
211 if (data && data.shot_flights && data.shot_flights.length)
212 { flights = flights.concat(data.shot_flights); }
213 if (flights.length)
214 { this.spawnFlights(flights, this._flightLocals); }
208 if (status === 'finished' && prevStatus !== 'finished' && this.onFinished)
215 if (status === 'finished' && prevStatus !== 'finished' && this.onFinished)
209 { this.onFinished(lobby); }
216 { this.onFinished(lobby); }
210 if (status === 'waiting' && prevStatus === 'finished' && this.onLobbyReturn)
217 if (status === 'waiting' && prevStatus === 'finished' && this.onLobbyReturn)
@@ -295,6 +302,20 @@ Online.renderMinis = function (container)
295 + '<div class="mini-meta"></div>';
302 + '<div class="mini-meta"></div>';
296 container.appendChild(el);
303 container.appendChild(el);
297 }
304 }
305 var mz = (typeof app !== 'undefined' && app.miniLayout && app.miniLayout.mini)
306 ? app.miniLayout.mini
307 : { w: 80, h: 104 };
308 var canvas = el.querySelector('canvas');
309 if (canvas && (canvas.width !== mz.w || canvas.height !== mz.h))
310 {
311 canvas.width = mz.w;
312 canvas.height = mz.h;
313 }
314 if (canvas)
315 {
316 canvas.style.width = mz.w + 'px';
317 canvas.style.height = mz.h + 'px';
318 }
298 el.classList.toggle('eliminated', !!p.eliminated);
319 el.classList.toggle('eliminated', !!p.eliminated);
299 el.querySelector('.mini-name').textContent = p.name + (p.is_host ? ' (host)' : '');
320 el.querySelector('.mini-name').textContent = p.name + (p.is_host ? ' (host)' : '');
300 el.querySelector('.mini-meta').textContent = p.eliminated
321 el.querySelector('.mini-meta').textContent = p.eliminated
@@ -307,6 +328,8 @@ Online.renderMinis = function (container)
307 if (!seen[id])
328 if (!seen[id])
308 { existing[id].remove(); }
329 { existing[id].remove(); }
309 }
330 }
331 if (typeof applyMinisLayout === 'function')
332 { applyMinisLayout(); }
310};
333};
311
334
312var MINI_COLORS = ['#d4553a', '#3a9ad4', '#4caf6a', '#e6c04a', '#b86ad4'];
335var MINI_COLORS = ['#d4553a', '#3a9ad4', '#4caf6a', '#e6c04a', '#b86ad4'];
@@ -401,40 +424,221 @@ function colorSpriteUrl (color, planetId)
401 * startX, startY} in viewport pixels, filled by the view just after
424 * startX, startY} in viewport pixels, filled by the view just after
402 * consumeOutgoingShots.
425 * consumeOutgoingShots.
403 */
426 */
427Online.playerId = function ()
428{
429 if (typeof app !== 'undefined' && app.offline)
430 { return 'player'; }
431 if (this.lobby && this.lobby.players)
432 {
433 for (var i = 0; i < this.lobby.players.length; i++)
434 {
435 if (this.lobby.players[i].is_me)
436 { return this.lobby.players[i].id; }
437 }
438 }
439 return 'player';
440};
441
442/**
443 * Classify a shot for visual treatment (t1125).
444 * player-to-enemy, enemy-to-player, enemy-to-enemy,
445 * player-miss, enemy-miss.
446 */
447Online.flightKind = function (fromId, targetId, miss)
448{
449 var me = this.playerId();
450 var fromMe = !fromId || fromId === me || fromId === 'player';
451 if (miss)
452 { return fromMe ? 'player-miss' : 'enemy-miss'; }
453 if (fromMe)
454 { return 'player-to-enemy'; }
455 if (targetId === me || targetId === 'player')
456 { return 'enemy-to-player'; }
457 return 'enemy-to-enemy';
458};
459
460/**
461 * Parabolic arc: linear in x, a rise of `height` pixels above the
462 * chord at mid-flight (screen y grows downward, so we subtract).
463 */
464Online.arcPoint = function (start, end, u, height)
465{
466 var t = u < 0 ? 0 : (u > 1 ? 1 : u);
467 var x = start.x + (end.x - start.x) * t;
468 var y = start.y + (end.y - start.y) * t - 4 * height * t * (1 - t);
469 return { x: x, y: y };
470};
471
472Online.arcHeight = function (start, end)
473{
474 var dx = end.x - start.x;
475 var dy = end.y - start.y;
476 var dist = Math.sqrt(dx * dx + dy * dy);
477 return Math.max(48, Math.min(220, dist * 0.28));
478};
479
480Online.easeInOutCubic = function (t)
481{
482 if (t < 0.5)
483 { return 4 * t * t * t; }
484 var u = -2 * t + 2;
485 return 1 - (u * u * u) / 2;
486};
487
488Online._miniCellSize = function (playerId)
489{
490 var el = this.miniElement(playerId);
491 var canvas = el && el.querySelector('canvas');
492 if (canvas)
493 {
494 var r = canvas.getBoundingClientRect();
495 return Math.max(6, r.width / 10);
496 }
497 return 10;
498};
499
500Online._fullTileSize = function ()
501{
502 if (typeof app !== 'undefined' && app.tile)
503 { return app.tile; }
504 return 40;
505};
506
507Online._miniAnchor = function (playerId, dir)
508{
509 var el = this.miniElement(playerId);
510 var canvas = el && (el.querySelector ? el.querySelector('canvas') : null);
511 var box = canvas || el;
512 if (!box)
513 { return { x: window.innerWidth / 2, y: 48 }; }
514 var r = box.getBoundingClientRect();
515 if (dir === 'out')
516 { return { x: r.left + r.width / 2, y: r.top + 4 }; }
517 return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
518};
519
520Online._fieldTop = function (col)
521{
522 return this._flightStart(col);
523};
524
525/**
526 * Animate shot results. `locals` is a map of client_id → {col, y, color,
527 * startX, startY, from_id} in viewport pixels.
528 *
529 * Visual-only (t1125): a parabolic arc whose scale goes from mini-cell
530 * to full tile (or the reverse). Enemy-to-enemy arcs stay small and
531 * are drawn behind the player's field. Delivery timing is unchanged;
532 * a late-seen flight starts mid-arc via `age`.
533 */
404Online.spawnFlights = function (results, locals)
534Online.spawnFlights = function (results, locals)
405{
535{
406 locals = locals || this._flightLocals || {};
536 locals = locals || this._flightLocals || {};
407 var layer = document.getElementById('flights');
537 var front = document.getElementById('flights');
408 if (!layer)
538 var back = document.getElementById('flights-back') || front;
539 if (!front)
409 { return; }
540 { return; }
541 if (!this._flightSeen)
542 { this._flightSeen = Object.create(null); }
543 var now = performance.now();
544 var full = this._fullTileSize();
410 for (var i = 0; i < results.length; i++)
545 for (var i = 0; i < results.length; i++)
411 {
546 {
412 var r = results[i];
547 var r = results[i];
413 var meta = locals[r.client_id] || {};
548 var sid = String(r.id != null ? r.id : (r.client_id || ('tmp-' + i)));
414 var start = this._flightStart(meta.col);
549 if (this._flightSeen[sid])
415 var end;
550 { continue; }
551 this._flightSeen[sid] = now;
552
553 var meta = locals[r.client_id] || locals[sid] || {};
554 var fromId = r.from_id || r.from_user || meta.from_id || null;
555 var targetId = r.target_id != null ? r.target_id : r.to_user;
416 var miss = !!r.miss;
556 var miss = !!r.miss;
557 var kind = this.flightKind(fromId, targetId, miss);
558 var duration = (r.flight_duration || this.FLIGHT_DURATION) * 1000;
559 if (r.age != null && isFinite(r.age) && r.age * 1000 >= duration)
560 { continue; }
561
562 var start;
563 if (meta.startX != null && isFinite(meta.startX))
564 { start = { x: meta.startX, y: meta.startY }; }
565 else if (kind === 'player-to-enemy' || kind === 'player-miss')
566 { start = this._flightStart(meta.col != null ? meta.col : r.col); }
567 else
568 { start = this._miniAnchor(fromId, 'out'); }
569
570 var end;
417 if (miss)
571 if (miss)
418 { end = this._missEnd(start); }
572 { end = this._missEnd(start, kind === 'enemy-miss'); }
573 else if (kind === 'enemy-to-player')
574 { end = this._fieldTop(null); }
575 else
576 { end = this._targetEnd(targetId, start); }
577
578 var startScale;
579 var endScale;
580 var mini = this._miniCellSize(fromId || targetId) / full;
581 if (mini < 0.12)
582 { mini = 0.2; }
583 if (kind === 'player-to-enemy')
584 {
585 startScale = 1;
586 endScale = mini;
587 }
588 else if (kind === 'enemy-to-player')
589 {
590 startScale = mini;
591 endScale = 1;
592 }
593 else if (kind === 'enemy-to-enemy')
594 {
595 startScale = mini;
596 endScale = mini;
597 }
598 else if (kind === 'enemy-miss')
599 {
600 startScale = mini;
601 endScale = 0;
602 }
419 else
603 else
420 { end = this._targetEnd(r.target_id, start); }
604 {
605 startScale = 1;
606 endScale = 0;
607 }
608
609 var layer = (kind === 'enemy-to-enemy' && back) ? back : front;
421 var el = document.createElement('img');
610 var el = document.createElement('img');
422 el.src = colorSpriteUrl(r.color != null ? r.color : meta.color);
611 el.src = colorSpriteUrl(r.color != null ? r.color : meta.color);
423 el.alt = '';
612 el.alt = '';
424 el.className = 'flight';
613 el.className = 'flight' + (kind === 'enemy-to-enemy' ? ' flight-behind' : '');
614 el.style.width = full + 'px';
615 el.style.height = full + 'px';
425 layer.appendChild(el);
616 layer.appendChild(el);
426 var spin = (Math.random() * 2 - 1) * 720;
617
427 var duration = (r.flight_duration || this.FLIGHT_DURATION) * 1000;
618 var t0 = now;
619 if (r.age != null && isFinite(r.age) && r.age > 0)
620 {
621 var u0 = Math.min(0.95, (r.age * 1000) / duration);
622 t0 = now - u0 * duration;
623 }
624 var height = miss
625 ? Math.max(40, Math.min(160, Math.abs(end.y - start.y) * 0.35))
626 : this.arcHeight(start, end);
428 this._flights.push({
627 this._flights.push({
429 el: el,
628 el: el,
430 start: start,
629 start: start,
431 end: end,
630 end: end,
432 ctrl: miss ? this._missCtrl(start, end) : this._hitCtrl(start, end),
631 ctrl: miss ? this._missCtrl(start, end) : null,
433 t0: performance.now(),
632 height: height,
633 t0: t0,
434 duration: duration,
634 duration: duration,
435 spin: spin,
635 spin: (Math.random() * 2 - 1) * 720,
436 miss: miss,
636 miss: miss,
437 angle: Math.random() * 360
637 kind: kind,
638 startScale: startScale,
639 endScale: endScale,
640 angle: Math.random() * 360,
641 id: sid
438 });
642 });
439 }
643 }
440 this._flightLocals = {};
644 this._flightLocals = {};
@@ -449,13 +653,13 @@ Online.rememberFlightLocal = function (shot, startX, startY)
449 y: shot.y,
653 y: shot.y,
450 color: shot.color,
654 color: shot.color,
451 startX: startX,
655 startX: startX,
452 startY: startY
656 startY: startY,
657 from_id: shot.from_id
453 };
658 };
454};
659};
455
660
456Online._flightStart = function (col)
661Online._flightStart = function (col)
457{
662{
458 var field = document.querySelector('canvas');
459 var appRef = typeof app !== 'undefined' ? app : null;
663 var appRef = typeof app !== 'undefined' ? app : null;
460 if (appRef && appRef.scene && appRef.scene.canvas)
664 if (appRef && appRef.scene && appRef.scene.canvas)
461 {
665 {
@@ -467,6 +671,7 @@ Online._flightStart = function (col)
467 y: rect.top + 4
671 y: rect.top + 4
468 };
672 };
469 }
673 }
674 var field = document.querySelector('canvas');
470 if (field)
675 if (field)
471 {
676 {
472 var rect = field.getBoundingClientRect();
677 var rect = field.getBoundingClientRect();
@@ -480,19 +685,25 @@ Online._targetEnd = function (targetId, start)
480 var el = targetId && this.miniElement(targetId);
685 var el = targetId && this.miniElement(targetId);
481 if (el)
686 if (el)
482 {
687 {
483 var r = el.getBoundingClientRect();
688 var canvas = el.querySelector('canvas') || el;
689 var r = canvas.getBoundingClientRect();
484 return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
690 return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
485 }
691 }
486 return { x: start.x + (Math.random() - 0.5) * 80, y: 40 };
692 return { x: start.x + (Math.random() - 0.5) * 80, y: 40 };
487};
693};
488
694
489Online._missEnd = function (start)
695Online._missEnd = function (start, fromMini)
490{
696{
491 var dx = (Math.random() * 2 - 1) * window.innerWidth * 0.35;
697 var w = window.innerWidth || 800;
492 return {
698 var outward;
493 x: start.x + dx,
699 if (start.x < w * 0.4)
494 y: start.y - (120 + Math.random() * 220)
700 { outward = -(80 + Math.random() * w * 0.25); }
495 };
701 else if (start.x > w * 0.6)
702 { outward = (80 + Math.random() * w * 0.25); }
703 else
704 { outward = (Math.random() * 2 - 1) * w * 0.35; }
705 var lift = fromMini ? (80 + Math.random() * 160) : (120 + Math.random() * 220);
706 return { x: start.x + outward, y: start.y - lift };
496};
707};
497
708
498Online._missCtrl = function (start, end)
709Online._missCtrl = function (start, end)
@@ -518,26 +729,53 @@ Online.tickFlights = function (now)
518 for (var i = 0; i < this._flights.length; i++)
729 for (var i = 0; i < this._flights.length; i++)
519 {
730 {
520 var f = this._flights[i];
731 var f = this._flights[i];
521 var u = (now - f.t0) / f.duration;
732 var raw = (now - f.t0) / f.duration;
522 if (u >= 1)
733 if (raw >= 1)
523 {
734 {
524 if (f.el && f.el.parentNode)
735 if (f.el && f.el.parentNode)
525 { f.el.parentNode.removeChild(f.el); }
736 { f.el.parentNode.removeChild(f.el); }
526 continue;
737 continue;
527 }
738 }
528 // Quadratic bezier, ease-in so they feel like they recede.
739 if (raw < 0)
529 var e = u * u;
740 { raw = 0; }
530 var mt = 1 - e;
741 var u = this.easeInOutCubic(raw);
531 var x = mt * mt * f.start.x + 2 * mt * e * f.ctrl.x + e * e * f.end.x;
742 var x, y;
532 var y = mt * mt * f.start.y + 2 * mt * e * f.ctrl.y + e * e * f.end.y;
743 if (f.miss && f.ctrl)
533 var scale = f.miss ? (1 - e) : (1 - 0.85 * e);
744 {
534 var angle = f.angle + f.spin * u;
745 var e = raw * raw;
746 var mt = 1 - e;
747 x = mt * mt * f.start.x + 2 * mt * e * f.ctrl.x + e * e * f.end.x;
748 y = mt * mt * f.start.y + 2 * mt * e * f.ctrl.y + e * e * f.end.y;
749 }
750 else
751 {
752 var pt = this.arcPoint(f.start, f.end, u, f.height || 80);
753 x = pt.x;
754 y = pt.y;
755 }
756 var scale = f.startScale + (f.endScale - f.startScale) * u;
757 if (f.miss)
758 {
759 var fadeU = raw * raw;
760 scale = f.startScale * (1 - fadeU);
761 }
762 var angle = f.angle + f.spin * raw;
535 f.el.style.transform = 'translate(' + x + 'px,' + y + 'px) translate(-50%,-50%) rotate('
763 f.el.style.transform = 'translate(' + x + 'px,' + y + 'px) translate(-50%,-50%) rotate('
536 + angle + 'deg) scale(' + scale + ')';
764 + angle + 'deg) scale(' + scale + ')';
537 f.el.style.opacity = f.miss ? String(1 - e) : '1';
765 f.el.style.opacity = f.miss ? String(Math.max(0, 1 - raw * raw)) : '1';
538 leftover.push(f);
766 leftover.push(f);
539 }
767 }
540 this._flights = leftover;
768 this._flights = leftover;
769 if (this._flightSeen)
770 {
771 var cutoff = now - 8000;
772 var ids = Object.keys(this._flightSeen);
773 for (var k = 0; k < ids.length; k++)
774 {
775 if (this._flightSeen[ids[k]] < cutoff)
776 { delete this._flightSeen[ids[k]]; }
777 }
778 }
541};
779};
542
780
543Online.clearFlights = function ()
781Online.clearFlights = function ()
@@ -550,6 +788,7 @@ Online.clearFlights = function ()
550 }
788 }
551 this._flights = [];
789 this._flights = [];
552 this._flightLocals = {};
790 this._flightLocals = {};
791 this._flightSeen = Object.create(null);
553};
792};
554
793
555if (typeof globalThis !== 'undefined')
794if (typeof globalThis !== 'undefined')