Merge branch 'feature/t1125-side-minis-arcs'
@@ -3749,6 +3749,187 @@ else if (typeof globalThis !== 'undefined')
3749
3749
* /workspace/meteors/src/gameCore.js
3750
3750
*/
3751
3751
3752
/*
3753
* Start File:
3754
* /workspace/meteors/src/miniLayout.js
3755
*/
3756
'use strict';
3757
3758
/**
3759
* Opponent miniature layout for online and Offline Strijd (t1125).
3760
* Wide screens: alternating left/right of the player's field, extra
3761
* rows stacked upward. Narrow screens: a row (wrapping) above the field.
3762
*/
3763
3764
var MiniLayout = (function ()
3765
{
3766
3767
var GAP = 12;
3768
var VGAP = 8;
3769
var EDGE = 16;
3770
var MIN_TILE_FOR_SIDES = 18;
3771
var MIN_VIEWPORT_FOR_SIDES = 960;
3772
var LABEL_H = 32;
3773
3774
function canvasSize (n, mode, availH)
3775
{
3776
n = n || 0;
3777
if (mode === 'sides' && availH && n > 0)
3778
{
3779
var rows = Math.ceil(n / 2);
3780
var maxOuter = Math.floor((availH - (rows - 1) * VGAP) / Math.max(1, rows));
3781
var ch = Math.max(40, Math.min(104, maxOuter - LABEL_H));
3782
var cw = Math.max(32, Math.round(ch * 10 / 13));
3783
return {
3784
w: cw,
3785
h: ch,
3786
outerW: Math.max(cw + 8, 64),
3787
outerH: ch + LABEL_H
3788
};
3789
}
3790
if (n >= 10)
3791
{ return { w: 40, h: 52, outerW: 56, outerH: 52 + LABEL_H }; }
3792
if (n >= 6)
3793
{ return { w: 56, h: 73, outerW: 68, outerH: 73 + LABEL_H }; }
3794
return { w: 80, h: 104, outerW: 90, outerH: 104 + LABEL_H };
3795
}
3796
3797
function sidePositions (n, fieldX, fieldY, fieldW, fieldH, mini, hudH)
3798
{
3799
var positions = [];
3800
if (n <= 0)
3801
{ return positions; }
3802
var rows = Math.ceil(n / 2);
3803
var stackH = rows * mini.outerH + Math.max(0, rows - 1) * VGAP;
3804
var bottom = fieldY + fieldH;
3805
var top = bottom - stackH;
3806
if (top < hudH + 4)
3807
{
3808
top = hudH + 4;
3809
bottom = top + stackH;
3810
}
3811
for (var i = 0; i < n; i++)
3812
{
3813
var col = i % 2;
3814
var row = Math.floor(i / 2);
3815
var x = col === 0
3816
? fieldX - GAP - mini.outerW
3817
: fieldX + fieldW + GAP;
3818
var y = bottom - (row + 1) * mini.outerH - row * VGAP;
3819
positions.push({
3820
index: i,
3821
side: col === 0 ? 'left' : 'right',
3822
row: row,
3823
x: x,
3824
y: y,
3825
w: mini.outerW,
3826
h: mini.outerH,
3827
canvasW: mini.w,
3828
canvasH: mini.h
3829
});
3830
}
3831
return positions;
3832
}
3833
3834
/**
3835
* Compute the field and mini plan for a viewport.
3836
* `n` is the number of opponents (0 = solo, no minis).
3837
*/
3838
function plan (vw, vh, n, hudH, margin)
3839
{
3840
vw = vw || 320;
3841
vh = vh || 480;
3842
n = n || 0;
3843
hudH = hudH == null ? 56 : hudH;
3844
margin = margin == null ? Math.max(6, Math.round(Math.min(vw, vh) * 0.015)) : margin;
3845
3846
function finish (mode, tile, fieldX, fieldY, miniH, mini, positions)
3847
{
3848
return {
3849
mode: mode,
3850
tile: tile,
3851
fieldW: tile * 10,
3852
fieldH: tile * 13,
3853
fieldX: fieldX,
3854
fieldY: fieldY,
3855
miniH: miniH,
3856
mini: mini,
3857
positions: positions || [],
3858
n: n
3859
};
3860
}
3861
3862
if (n > 0)
3863
{
3864
var availHSide = Math.max(80, vh - hudH - margin);
3865
var probe = canvasSize(n, 'sides', availHSide);
3866
var availWSide = Math.max(80, vw - margin * 2 - 2 * (probe.outerW + GAP));
3867
var tileSide = Math.max(14, Math.floor(Math.min(availWSide / 10, availHSide / 13)));
3868
var fieldWSide = tileSide * 10;
3869
var fieldHSide = tileSide * 13;
3870
var leftover = (vw - fieldWSide) / 2;
3871
var need = probe.outerW + GAP + EDGE;
3872
if (vw >= MIN_VIEWPORT_FOR_SIDES && leftover >= need
3873
&& tileSide >= MIN_TILE_FOR_SIDES)
3874
{
3875
var fieldX = Math.floor((vw - fieldWSide) / 2);
3876
var fieldY = hudH + Math.floor((availHSide - fieldHSide) / 2);
3877
if (fieldY < hudH)
3878
{ fieldY = hudH; }
3879
return finish('sides', tileSide, fieldX, fieldY, 0, probe,
3880
sidePositions(n, fieldX, fieldY, fieldWSide, fieldHSide, probe, hudH));
3881
}
3882
}
3883
3884
var miniTop = canvasSize(n, 'top', 0);
3885
var miniH = 0;
3886
if (n > 0)
3887
{
3888
var share = n > 6 ? 0.26 : 0.20;
3889
miniH = Math.min(n > 6 ? 180 : 150, Math.max(86, Math.round(vh * share)));
3890
}
3891
var availW = Math.max(80, vw - margin * 2);
3892
var availH = Math.max(80, vh - hudH - miniH - margin);
3893
var tile = Math.max(14, Math.floor(Math.min(availW / 10, availH / 13)));
3894
var fieldW = tile * 10;
3895
var fieldH = tile * 13;
3896
var fieldX = Math.floor((vw - fieldW) / 2);
3897
var topBand = hudH + miniH;
3898
var fieldY = topBand + Math.floor((vh - topBand - fieldH - margin / 2) / 2);
3899
if (fieldY < topBand)
3900
{ fieldY = topBand; }
3901
return finish('top', tile, fieldX, fieldY, miniH, miniTop, []);
3902
}
3903
3904
var api = {
3905
GAP: GAP,
3906
VGAP: VGAP,
3907
EDGE: EDGE,
3908
MIN_TILE_FOR_SIDES: MIN_TILE_FOR_SIDES,
3909
MIN_VIEWPORT_FOR_SIDES: MIN_VIEWPORT_FOR_SIDES,
3910
LABEL_H: LABEL_H,
3911
canvasSize: canvasSize,
3912
sidePositions: sidePositions,
3913
plan: plan
3914
};
3915
3916
if (typeof module !== 'undefined' && module.exports)
3917
{ module.exports = api; }
3918
else if (typeof globalThis !== 'undefined')
3919
{ globalThis.MiniLayout = api; }
3920
3921
return api;
3922
3923
})();
3924
3925
if (typeof module !== 'undefined' && module.exports && typeof MiniLayout !== 'undefined')
3926
{ module.exports = MiniLayout; }
3927
3928
/*
3929
* End File:
3930
* /workspace/meteors/src/miniLayout.js
3931
*/
3932
3752
3933
/*
3753
3934
* Start File:
3754
3935
* /workspace/meteors/src/online.js
@@ -3958,8 +4139,15 @@ Online._handleTransitions = function (prevStatus, data)
3958
4139
{ this.onGameStart(lobby); }
3959
4140
if (data && data.incoming && data.incoming.length && this.onIncoming)
3960
4141
{ this.onIncoming(data.incoming); }
4142
// Own outgoing results (immediate) and lobby-wide recent flights
4143
// (so every client can draw opponent and enemy-to-enemy arcs, t1125).
4144
var flights = [];
3961
4145
if (data && data.shot_results && data.shot_results.length)
3962
{ this.spawnFlights(data.shot_results, this._lastQueuedMeta); }
4146
{ flights = flights.concat(data.shot_results); }
4147
if (data && data.shot_flights && data.shot_flights.length)
4148
{ flights = flights.concat(data.shot_flights); }
4149
if (flights.length)
4150
{ this.spawnFlights(flights, this._flightLocals); }
3963
4151
if (status === 'finished' && prevStatus !== 'finished' && this.onFinished)
3964
4152
{ this.onFinished(lobby); }
3965
4153
if (status === 'waiting' && prevStatus === 'finished' && this.onLobbyReturn)
@@ -4050,6 +4238,20 @@ Online.renderMinis = function (container)
4050
4238
+ '<div class="mini-meta"></div>';
4051
4239
container.appendChild(el);
4052
4240
}
4241
var mz = (typeof app !== 'undefined' && app.miniLayout && app.miniLayout.mini)
4242
? app.miniLayout.mini
4243
: { w: 80, h: 104 };
4244
var canvas = el.querySelector('canvas');
4245
if (canvas && (canvas.width !== mz.w || canvas.height !== mz.h))
4246
{
4247
canvas.width = mz.w;
4248
canvas.height = mz.h;
4249
}
4250
if (canvas)
4251
{
4252
canvas.style.width = mz.w + 'px';
4253
canvas.style.height = mz.h + 'px';
4254
}
4053
4255
el.classList.toggle('eliminated', !!p.eliminated);
4054
4256
el.querySelector('.mini-name').textContent = p.name + (p.is_host ? ' (host)' : '');
4055
4257
el.querySelector('.mini-meta').textContent = p.eliminated
@@ -4062,6 +4264,8 @@ Online.renderMinis = function (container)
4062
4264
if (!seen[id])
4063
4265
{ existing[id].remove(); }
4064
4266
}
4267
if (typeof applyMinisLayout === 'function')
4268
{ applyMinisLayout(); }
4065
4269
};
4066
4270
4067
4271
var MINI_COLORS = ['#d4553a', '#3a9ad4', '#4caf6a', '#e6c04a', '#b86ad4'];
@@ -4156,40 +4360,221 @@ function colorSpriteUrl (color, planetId)
4156
4360
* startX, startY} in viewport pixels, filled by the view just after
4157
4361
* consumeOutgoingShots.
4158
4362
*/
4363
Online.playerId = function ()
4364
{
4365
if (typeof app !== 'undefined' && app.offline)
4366
{ return 'player'; }
4367
if (this.lobby && this.lobby.players)
4368
{
4369
for (var i = 0; i < this.lobby.players.length; i++)
4370
{
4371
if (this.lobby.players[i].is_me)
4372
{ return this.lobby.players[i].id; }
4373
}
4374
}
4375
return 'player';
4376
};
4377
4378
/**
4379
* Classify a shot for visual treatment (t1125).
4380
* player-to-enemy, enemy-to-player, enemy-to-enemy,
4381
* player-miss, enemy-miss.
4382
*/
4383
Online.flightKind = function (fromId, targetId, miss)
4384
{
4385
var me = this.playerId();
4386
var fromMe = !fromId || fromId === me || fromId === 'player';
4387
if (miss)
4388
{ return fromMe ? 'player-miss' : 'enemy-miss'; }
4389
if (fromMe)
4390
{ return 'player-to-enemy'; }
4391
if (targetId === me || targetId === 'player')
4392
{ return 'enemy-to-player'; }
4393
return 'enemy-to-enemy';
4394
};
4395
4396
/**
4397
* Parabolic arc: linear in x, a rise of `height` pixels above the
4398
* chord at mid-flight (screen y grows downward, so we subtract).
4399
*/
4400
Online.arcPoint = function (start, end, u, height)
4401
{
4402
var t = u < 0 ? 0 : (u > 1 ? 1 : u);
4403
var x = start.x + (end.x - start.x) * t;
4404
var y = start.y + (end.y - start.y) * t - 4 * height * t * (1 - t);
4405
return { x: x, y: y };
4406
};
4407
4408
Online.arcHeight = function (start, end)
4409
{
4410
var dx = end.x - start.x;
4411
var dy = end.y - start.y;
4412
var dist = Math.sqrt(dx * dx + dy * dy);
4413
return Math.max(48, Math.min(220, dist * 0.28));
4414
};
4415
4416
Online.easeInOutCubic = function (t)
4417
{
4418
if (t < 0.5)
4419
{ return 4 * t * t * t; }
4420
var u = -2 * t + 2;
4421
return 1 - (u * u * u) / 2;
4422
};
4423
4424
Online._miniCellSize = function (playerId)
4425
{
4426
var el = this.miniElement(playerId);
4427
var canvas = el && el.querySelector('canvas');
4428
if (canvas)
4429
{
4430
var r = canvas.getBoundingClientRect();
4431
return Math.max(6, r.width / 10);
4432
}
4433
return 10;
4434
};
4435
4436
Online._fullTileSize = function ()
4437
{
4438
if (typeof app !== 'undefined' && app.tile)
4439
{ return app.tile; }
4440
return 40;
4441
};
4442
4443
Online._miniAnchor = function (playerId, dir)
4444
{
4445
var el = this.miniElement(playerId);
4446
var canvas = el && (el.querySelector ? el.querySelector('canvas') : null);
4447
var box = canvas || el;
4448
if (!box)
4449
{ return { x: window.innerWidth / 2, y: 48 }; }
4450
var r = box.getBoundingClientRect();
4451
if (dir === 'out')
4452
{ return { x: r.left + r.width / 2, y: r.top + 4 }; }
4453
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
4454
};
4455
4456
Online._fieldTop = function (col)
4457
{
4458
return this._flightStart(col);
4459
};
4460
4461
/**
4462
* Animate shot results. `locals` is a map of client_id → {col, y, color,
4463
* startX, startY, from_id} in viewport pixels.
4464
*
4465
* Visual-only (t1125): a parabolic arc whose scale goes from mini-cell
4466
* to full tile (or the reverse). Enemy-to-enemy arcs stay small and
4467
* are drawn behind the player's field. Delivery timing is unchanged;
4468
* a late-seen flight starts mid-arc via `age`.
4469
*/
4159
4470
Online.spawnFlights = function (results, locals)
4160
4471
{
4161
4472
locals = locals || this._flightLocals || {};
4162
var layer = document.getElementById('flights');
4163
if (!layer)
4473
var front = document.getElementById('flights');
4474
var back = document.getElementById('flights-back') || front;
4475
if (!front)
4164
4476
{ return; }
4477
if (!this._flightSeen)
4478
{ this._flightSeen = Object.create(null); }
4479
var now = performance.now();
4480
var full = this._fullTileSize();
4165
4481
for (var i = 0; i < results.length; i++)
4166
4482
{
4167
4483
var r = results[i];
4168
var meta = locals[r.client_id] || {};
4169
var start = this._flightStart(meta.col);
4170
var end;
4484
var sid = String(r.id != null ? r.id : (r.client_id || ('tmp-' + i)));
4485
if (this._flightSeen[sid])
4486
{ continue; }
4487
this._flightSeen[sid] = now;
4488
4489
var meta = locals[r.client_id] || locals[sid] || {};
4490
var fromId = r.from_id || r.from_user || meta.from_id || null;
4491
var targetId = r.target_id != null ? r.target_id : r.to_user;
4171
4492
var miss = !!r.miss;
4493
var kind = this.flightKind(fromId, targetId, miss);
4494
var duration = (r.flight_duration || this.FLIGHT_DURATION) * 1000;
4495
if (r.age != null && isFinite(r.age) && r.age * 1000 >= duration)
4496
{ continue; }
4497
4498
var start;
4499
if (meta.startX != null && isFinite(meta.startX))
4500
{ start = { x: meta.startX, y: meta.startY }; }
4501
else if (kind === 'player-to-enemy' || kind === 'player-miss')
4502
{ start = this._flightStart(meta.col != null ? meta.col : r.col); }
4503
else
4504
{ start = this._miniAnchor(fromId, 'out'); }
4505
4506
var end;
4172
4507
if (miss)
4173
{ end = this._missEnd(start); }
4508
{ end = this._missEnd(start, kind === 'enemy-miss'); }
4509
else if (kind === 'enemy-to-player')
4510
{ end = this._fieldTop(null); }
4174
4511
else
4175
{ end = this._targetEnd(r.target_id, start); }
4512
{ end = this._targetEnd(targetId, start); }
4513
4514
var startScale;
4515
var endScale;
4516
var mini = this._miniCellSize(fromId || targetId) / full;
4517
if (mini < 0.12)
4518
{ mini = 0.2; }
4519
if (kind === 'player-to-enemy')
4520
{
4521
startScale = 1;
4522
endScale = mini;
4523
}
4524
else if (kind === 'enemy-to-player')
4525
{
4526
startScale = mini;
4527
endScale = 1;
4528
}
4529
else if (kind === 'enemy-to-enemy')
4530
{
4531
startScale = mini;
4532
endScale = mini;
4533
}
4534
else if (kind === 'enemy-miss')
4535
{
4536
startScale = mini;
4537
endScale = 0;
4538
}
4539
else
4540
{
4541
startScale = 1;
4542
endScale = 0;
4543
}
4544
4545
var layer = (kind === 'enemy-to-enemy' && back) ? back : front;
4176
4546
var el = document.createElement('img');
4177
4547
el.src = colorSpriteUrl(r.color != null ? r.color : meta.color);
4178
4548
el.alt = '';
4179
el.className = 'flight';
4549
el.className = 'flight' + (kind === 'enemy-to-enemy' ? ' flight-behind' : '');
4550
el.style.width = full + 'px';
4551
el.style.height = full + 'px';
4180
4552
layer.appendChild(el);
4181
var spin = (Math.random() * 2 - 1) * 720;
4182
var duration = (r.flight_duration || this.FLIGHT_DURATION) * 1000;
4553
4554
var t0 = now;
4555
if (r.age != null && isFinite(r.age) && r.age > 0)
4556
{
4557
var u0 = Math.min(0.95, (r.age * 1000) / duration);
4558
t0 = now - u0 * duration;
4559
}
4560
var height = miss
4561
? Math.max(40, Math.min(160, Math.abs(end.y - start.y) * 0.35))
4562
: this.arcHeight(start, end);
4183
4563
this._flights.push({
4184
4564
el: el,
4185
4565
start: start,
4186
4566
end: end,
4187
ctrl: miss ? this._missCtrl(start, end) : this._hitCtrl(start, end),
4188
t0: performance.now(),
4567
ctrl: miss ? this._missCtrl(start, end) : null,
4568
height: height,
4569
t0: t0,
4189
4570
duration: duration,
4190
spin: spin,
4571
spin: (Math.random() * 2 - 1) * 720,
4191
4572
miss: miss,
4192
angle: Math.random() * 360
4573
kind: kind,
4574
startScale: startScale,
4575
endScale: endScale,
4576
angle: Math.random() * 360,
4577
id: sid
4193
4578
});
4194
4579
}
4195
4580
this._flightLocals = {};
@@ -4204,13 +4589,13 @@ Online.rememberFlightLocal = function (shot, startX, startY)
4204
4589
y: shot.y,
4205
4590
color: shot.color,
4206
4591
startX: startX,
4207
startY: startY
4592
startY: startY,
4593
from_id: shot.from_id
4208
4594
};
4209
4595
};
4210
4596
4211
4597
Online._flightStart = function (col)
4212
4598
{
4213
var field = document.querySelector('canvas');
4214
4599
var appRef = typeof app !== 'undefined' ? app : null;
4215
4600
if (appRef && appRef.scene && appRef.scene.canvas)
4216
4601
{
@@ -4222,6 +4607,7 @@ Online._flightStart = function (col)
4222
4607
y: rect.top + 4
4223
4608
};
4224
4609
}
4610
var field = document.querySelector('canvas');
4225
4611
if (field)
4226
4612
{
4227
4613
var rect = field.getBoundingClientRect();
@@ -4235,19 +4621,25 @@ Online._targetEnd = function (targetId, start)
4235
4621
var el = targetId && this.miniElement(targetId);
4236
4622
if (el)
4237
4623
{
4238
var r = el.getBoundingClientRect();
4624
var canvas = el.querySelector('canvas') || el;
4625
var r = canvas.getBoundingClientRect();
4239
4626
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
4240
4627
}
4241
4628
return { x: start.x + (Math.random() - 0.5) * 80, y: 40 };
4242
4629
};
4243
4630
4244
Online._missEnd = function (start)
4631
Online._missEnd = function (start, fromMini)
4245
4632
{
4246
var dx = (Math.random() * 2 - 1) * window.innerWidth * 0.35;
4247
return {
4248
x: start.x + dx,
4249
y: start.y - (120 + Math.random() * 220)
4250
};
4633
var w = window.innerWidth || 800;
4634
var outward;
4635
if (start.x < w * 0.4)
4636
{ outward = -(80 + Math.random() * w * 0.25); }
4637
else if (start.x > w * 0.6)
4638
{ outward = (80 + Math.random() * w * 0.25); }
4639
else
4640
{ outward = (Math.random() * 2 - 1) * w * 0.35; }
4641
var lift = fromMini ? (80 + Math.random() * 160) : (120 + Math.random() * 220);
4642
return { x: start.x + outward, y: start.y - lift };
4251
4643
};
4252
4644
4253
4645
Online._missCtrl = function (start, end)
@@ -4273,26 +4665,53 @@ Online.tickFlights = function (now)
4273
4665
for (var i = 0; i < this._flights.length; i++)
4274
4666
{
4275
4667
var f = this._flights[i];
4276
var u = (now - f.t0) / f.duration;
4277
if (u >= 1)
4668
var raw = (now - f.t0) / f.duration;
4669
if (raw >= 1)
4278
4670
{
4279
4671
if (f.el && f.el.parentNode)
4280
4672
{ f.el.parentNode.removeChild(f.el); }
4281
4673
continue;
4282
4674
}
4283
// Quadratic bezier, ease-in so they feel like they recede.
4284
var e = u * u;
4285
var mt = 1 - e;
4286
var x = mt * mt * f.start.x + 2 * mt * e * f.ctrl.x + e * e * f.end.x;
4287
var y = mt * mt * f.start.y + 2 * mt * e * f.ctrl.y + e * e * f.end.y;
4288
var scale = f.miss ? (1 - e) : (1 - 0.85 * e);
4289
var angle = f.angle + f.spin * u;
4675
if (raw < 0)
4676
{ raw = 0; }
4677
var u = this.easeInOutCubic(raw);
4678
var x, y;
4679
if (f.miss && f.ctrl)
4680
{
4681
var e = raw * raw;
4682
var mt = 1 - e;
4683
x = mt * mt * f.start.x + 2 * mt * e * f.ctrl.x + e * e * f.end.x;
4684
y = mt * mt * f.start.y + 2 * mt * e * f.ctrl.y + e * e * f.end.y;
4685
}
4686
else
4687
{
4688
var pt = this.arcPoint(f.start, f.end, u, f.height || 80);
4689
x = pt.x;
4690
y = pt.y;
4691
}
4692
var scale = f.startScale + (f.endScale - f.startScale) * u;
4693
if (f.miss)
4694
{
4695
var fadeU = raw * raw;
4696
scale = f.startScale * (1 - fadeU);
4697
}
4698
var angle = f.angle + f.spin * raw;
4290
4699
f.el.style.transform = 'translate(' + x + 'px,' + y + 'px) translate(-50%,-50%) rotate('
4291
4700
+ angle + 'deg) scale(' + scale + ')';
4292
f.el.style.opacity = f.miss ? String(1 - e) : '1';
4701
f.el.style.opacity = f.miss ? String(Math.max(0, 1 - raw * raw)) : '1';
4293
4702
leftover.push(f);
4294
4703
}
4295
4704
this._flights = leftover;
4705
if (this._flightSeen)
4706
{
4707
var cutoff = now - 8000;
4708
var ids = Object.keys(this._flightSeen);
4709
for (var k = 0; k < ids.length; k++)
4710
{
4711
if (this._flightSeen[ids[k]] < cutoff)
4712
{ delete this._flightSeen[ids[k]]; }
4713
}
4714
}
4296
4715
};
4297
4716
4298
4717
Online.clearFlights = function ()
@@ -4305,6 +4724,7 @@ Online.clearFlights = function ()
4305
4724
}
4306
4725
this._flights = [];
4307
4726
this._flightLocals = {};
4727
this._flightSeen = Object.create(null);
4308
4728
};
4309
4729
4310
4730
if (typeof globalThis !== 'undefined')
@@ -5215,13 +5635,122 @@ function placeTile (obj, col, y)
5215
5635
obj.transform.size = { x: t, y: t };
5216
5636
}
5217
5637
5638
function opponentCount ()
5639
{
5640
if (app.offline && app.battle && app.battle.bots)
5641
{ return app.battle.bots.length; }
5642
if (app.online && typeof Online !== 'undefined' && Online.opponents)
5643
{ return Online.opponents().length; }
5644
return 0;
5645
}
5646
5647
function currentMiniSize ()
5648
{
5649
if (app.miniLayout && app.miniLayout.mini)
5650
{ return { w: app.miniLayout.mini.w, h: app.miniLayout.mini.h }; }
5651
var n = opponentCount();
5652
var mode = (app.miniLayout && app.miniLayout.mode) || 'top';
5653
if (typeof MiniLayout !== 'undefined' && MiniLayout.canvasSize)
5654
{ return MiniLayout.canvasSize(n, mode, 0); }
5655
if (n >= 10)
5656
{ return { w: 40, h: 52 }; }
5657
if (n >= 6)
5658
{ return { w: 56, h: 73 }; }
5659
return { w: 80, h: 104 };
5660
}
5661
5662
function applyMinisContainer (plan)
5663
{
5664
var minis = document.getElementById('minis');
5665
if (!minis)
5666
{ return; }
5667
var n = plan ? plan.n : 0;
5668
minis.classList.toggle('crowded', n > 5);
5669
if (!plan || n === 0 || plan.mode !== 'sides')
5670
{
5671
minis.classList.remove('sides');
5672
minis.style.top = (app.hudH || 56) + 'px';
5673
minis.style.maxHeight = (plan && plan.miniH ? plan.miniH : 0) + 'px';
5674
minis.style.bottom = '';
5675
minis.style.left = '';
5676
minis.style.right = '';
5677
var kids = minis.querySelectorAll('.mini');
5678
for (var i = 0; i < kids.length; i++)
5679
{
5680
kids[i].style.left = '';
5681
kids[i].style.top = '';
5682
kids[i].style.width = '';
5683
kids[i].style.position = '';
5684
}
5685
return;
5686
}
5687
minis.classList.add('sides');
5688
minis.style.top = '0';
5689
minis.style.bottom = '0';
5690
minis.style.left = '0';
5691
minis.style.right = '0';
5692
minis.style.maxHeight = 'none';
5693
}
5694
5695
function applyMinisLayout ()
5696
{
5697
var plan = app.miniLayout;
5698
var minis = document.getElementById('minis');
5699
if (!minis)
5700
{ return; }
5701
applyMinisContainer(plan);
5702
if (!plan || plan.mode !== 'sides')
5703
{ return; }
5704
var positions = plan.positions || [];
5705
var kids = minis.querySelectorAll('.mini');
5706
for (var i = 0; i < positions.length && i < kids.length; i++)
5707
{
5708
var p = positions[i];
5709
var el = kids[i];
5710
el.style.position = 'absolute';
5711
el.style.left = p.x + 'px';
5712
el.style.top = p.y + 'px';
5713
el.style.width = p.w + 'px';
5714
var canvas = el.querySelector('canvas');
5715
if (canvas)
5716
{
5717
canvas.style.width = p.canvasW + 'px';
5718
canvas.style.height = p.canvasH + 'px';
5719
}
5720
}
5721
}
5722
5723
function applyFlightsBackClip ()
5724
{
5725
var back = document.getElementById('flights-back');
5726
if (!back)
5727
{ return; }
5728
var x = app.fieldX || 0;
5729
var y = app.fieldY || 0;
5730
var w = app.fieldW || 0;
5731
var h = app.fieldH || 0;
5732
if (!w || !h)
5733
{
5734
back.style.clipPath = '';
5735
return;
5736
}
5737
// Even-odd polygon: full viewport with a hole over the player's field,
5738
// so enemy-to-enemy arcs travel behind the field (t1125).
5739
back.style.clipPath = 'polygon(evenodd, 0 0, 100% 0, 100% 100%, 0 100%, 0 0, '
5740
+ x + 'px ' + y + 'px, ' + (x + w) + 'px ' + y + 'px, '
5741
+ (x + w) + 'px ' + (y + h) + 'px, ' + x + 'px ' + (y + h) + 'px, '
5742
+ x + 'px ' + y + 'px)';
5743
}
5744
5218
5745
function layoutIfNeeded ()
5219
5746
{
5220
5747
if (app.core && app.core.drag)
5221
5748
{ return; }
5222
5749
var vw = window.innerWidth || 320;
5223
5750
var vh = window.innerHeight || 480;
5224
if (app._layoutVw === vw && app._layoutVh === vh && app.scene && app.tile)
5751
var n = (app.online || app.offline) ? opponentCount() : 0;
5752
if (app._layoutVw === vw && app._layoutVh === vh && app._layoutN === n
5753
&& app.scene && app.tile)
5225
5754
{ return; }
5226
5755
layout();
5227
5756
}
@@ -5232,8 +5761,10 @@ function layout ()
5232
5761
{ return; }
5233
5762
var vw = window.innerWidth || 320;
5234
5763
var vh = window.innerHeight || 480;
5764
var n = (app.online || app.offline) ? opponentCount() : 0;
5235
5765
app._layoutVw = vw;
5236
5766
app._layoutVh = vh;
5767
app._layoutN = n;
5237
5768
var safeTop = 0;
5238
5769
try
5239
5770
{
@@ -5242,30 +5773,34 @@ function layout ()
5242
5773
}
5243
5774
catch (e) { /* ignore */ }
5244
5775
app.hudH = Math.max(56, Math.round(vh * 0.09) + safeTop);
5245
app.miniH = 0;
5246
if (app.online || app.offline)
5247
{
5248
var nBots = (app.battle && app.battle.bots) ? app.battle.bots.length : 2;
5249
var share = nBots > 6 ? 0.26 : 0.20;
5250
app.miniH = Math.min(nBots > 6 ? 180 : 150, Math.max(86, Math.round(vh * share)));
5251
}
5252
5776
var margin = Math.max(6, Math.round(Math.min(vw, vh) * 0.015));
5253
var availW = Math.max(80, vw - margin * 2);
5254
var availH = Math.max(80, vh - app.hudH - app.miniH - margin);
5255
app.tile = Math.max(14, Math.floor(Math.min(availW / 10, availH / 13)));
5256
app.fieldW = app.tile * 10;
5257
app.fieldH = app.tile * 13;
5258
app.fieldX = Math.floor((vw - app.fieldW) / 2);
5259
var topBand = app.hudH + app.miniH;
5260
app.fieldY = topBand + Math.floor((vh - topBand - app.fieldH - margin / 2) / 2);
5261
if (app.fieldY < topBand)
5262
{ app.fieldY = topBand; }
5263
var minis = document.getElementById('minis');
5264
if (minis)
5777
var plan;
5778
if (typeof MiniLayout !== 'undefined' && MiniLayout.plan)
5779
{ plan = MiniLayout.plan(vw, vh, n, app.hudH, margin); }
5780
else
5265
5781
{
5266
minis.style.top = app.hudH + 'px';
5267
minis.style.maxHeight = app.miniH + 'px';
5782
plan = {
5783
mode: 'top',
5784
tile: 14,
5785
fieldW: 140,
5786
fieldH: 182,
5787
fieldX: Math.floor((vw - 140) / 2),
5788
fieldY: app.hudH,
5789
miniH: n > 0 ? 100 : 0,
5790
mini: { w: 80, h: 104 },
5791
positions: [],
5792
n: n
5793
};
5268
5794
}
5795
app.miniLayout = plan;
5796
app.miniH = plan.miniH;
5797
app.tile = plan.tile;
5798
app.fieldW = plan.fieldW;
5799
app.fieldH = plan.fieldH;
5800
app.fieldX = plan.fieldX;
5801
app.fieldY = plan.fieldY;
5802
applyMinisLayout();
5803
applyFlightsBackClip();
5269
5804
5270
5805
if (app.scene)
5271
5806
{
@@ -6101,6 +6636,7 @@ function tickOnline (dt)
6101
6636
}
6102
6637
Online.tickFlights();
6103
6638
Online.renderMinis(document.getElementById('minis'));
6639
applyMinisLayout();
6104
6640
}
6105
6641
6106
6642
@@ -6179,7 +6715,8 @@ function tickOffline (dt)
6179
6715
y: s.y,
6180
6716
color: s.color,
6181
6717
startX: start.x,
6182
startY: start.y
6718
startY: start.y,
6719
from_id: s.from_id
6183
6720
};
6184
6721
}
6185
6722
Online.spawnFlights(result.flights, locals);
@@ -6293,16 +6830,20 @@ function miniViewportCenter (botId)
6293
6830
if (!el)
6294
6831
{ return { x: window.innerWidth / 2, y: 40 }; }
6295
6832
var rect = el.getBoundingClientRect();
6833
var plan = app.miniLayout;
6834
if (plan && plan.mode === 'sides')
6835
{
6836
var mid = plan.fieldX + plan.fieldW / 2;
6837
if (rect.left + rect.width / 2 < mid)
6838
{ return { x: rect.right, y: rect.top + rect.height / 2 }; }
6839
return { x: rect.left, y: rect.top + rect.height / 2 };
6840
}
6296
6841
return { x: rect.left + rect.width / 2, y: rect.bottom };
6297
6842
}
6298
6843
6299
6844
function offlineMiniSize (n)
6300
6845
{
6301
if (n >= 10)
6302
{ return { w: 40, h: 52 }; }
6303
if (n >= 6)
6304
{ return { w: 56, h: 73 }; }
6305
return { w: 80, h: 104 };
6846
return currentMiniSize();
6306
6847
}
6307
6848
6308
6849
function updateOfflineMinis (dt, force)
@@ -6365,6 +6906,7 @@ function renderOfflineMinis ()
6365
6906
if (!seen[id])
6366
6907
{ existing[id].remove(); }
6367
6908
}
6909
applyMinisLayout();
6368
6910
}
6369
6911
6370
6912
function buildColumnWarn ()
@@ -3749,6 +3749,187 @@ else if (typeof globalThis !== 'undefined')3749
* /workspace/meteors/src/gameCore.js3749
* /workspace/meteors/src/gameCore.js3750
*/ 3750
*/ 3751
3751
3752
/*3753
* Start File:3754
* /workspace/meteors/src/miniLayout.js3755
*/ 3756
'use strict';3757
3758
/**3759
* Opponent miniature layout for online and Offline Strijd (t1125).3760
* Wide screens: alternating left/right of the player's field, extra3761
* rows stacked upward. Narrow screens: a row (wrapping) above the field.3762
*/3763
3764
var MiniLayout = (function ()3765
{3766
3767
var GAP = 12;3768
var VGAP = 8;3769
var EDGE = 16;3770
var MIN_TILE_FOR_SIDES = 18;3771
var MIN_VIEWPORT_FOR_SIDES = 960;3772
var LABEL_H = 32;3773
3774
function canvasSize (n, mode, availH)3775
{3776
n = n || 0;3777
if (mode === 'sides' && availH && n > 0)3778
{3779
var rows = Math.ceil(n / 2);3780
var maxOuter = Math.floor((availH - (rows - 1) * VGAP) / Math.max(1, rows));3781
var ch = Math.max(40, Math.min(104, maxOuter - LABEL_H));3782
var cw = Math.max(32, Math.round(ch * 10 / 13));3783
return {3784
w: cw,3785
h: ch,3786
outerW: Math.max(cw + 8, 64),3787
outerH: ch + LABEL_H3788
};3789
}3790
if (n >= 10)3791
{ return { w: 40, h: 52, outerW: 56, outerH: 52 + LABEL_H }; }3792
if (n >= 6)3793
{ return { w: 56, h: 73, outerW: 68, outerH: 73 + LABEL_H }; }3794
return { w: 80, h: 104, outerW: 90, outerH: 104 + LABEL_H };3795
}3796
3797
function sidePositions (n, fieldX, fieldY, fieldW, fieldH, mini, hudH)3798
{3799
var positions = [];3800
if (n <= 0)3801
{ return positions; }3802
var rows = Math.ceil(n / 2);3803
var stackH = rows * mini.outerH + Math.max(0, rows - 1) * VGAP;3804
var bottom = fieldY + fieldH;3805
var top = bottom - stackH;3806
if (top < hudH + 4)3807
{3808
top = hudH + 4;3809
bottom = top + stackH;3810
}3811
for (var i = 0; i < n; i++)3812
{3813
var col = i % 2;3814
var row = Math.floor(i / 2);3815
var x = col === 03816
? fieldX - GAP - mini.outerW3817
: fieldX + fieldW + GAP;3818
var y = bottom - (row + 1) * mini.outerH - row * VGAP;3819
positions.push({3820
index: i,3821
side: col === 0 ? 'left' : 'right',3822
row: row,3823
x: x,3824
y: y,3825
w: mini.outerW,3826
h: mini.outerH,3827
canvasW: mini.w,3828
canvasH: mini.h3829
});3830
}3831
return positions;3832
}3833
3834
/**3835
* Compute the field and mini plan for a viewport.3836
* `n` is the number of opponents (0 = solo, no minis).3837
*/3838
function plan (vw, vh, n, hudH, margin)3839
{3840
vw = vw || 320;3841
vh = vh || 480;3842
n = n || 0;3843
hudH = hudH == null ? 56 : hudH;3844
margin = margin == null ? Math.max(6, Math.round(Math.min(vw, vh) * 0.015)) : margin;3845
3846
function finish (mode, tile, fieldX, fieldY, miniH, mini, positions)3847
{3848
return {3849
mode: mode,3850
tile: tile,3851
fieldW: tile * 10,3852
fieldH: tile * 13,3853
fieldX: fieldX,3854
fieldY: fieldY,3855
miniH: miniH,3856
mini: mini,3857
positions: positions || [],3858
n: n3859
};3860
}3861
3862
if (n > 0)3863
{3864
var availHSide = Math.max(80, vh - hudH - margin);3865
var probe = canvasSize(n, 'sides', availHSide);3866
var availWSide = Math.max(80, vw - margin * 2 - 2 * (probe.outerW + GAP));3867
var tileSide = Math.max(14, Math.floor(Math.min(availWSide / 10, availHSide / 13)));3868
var fieldWSide = tileSide * 10;3869
var fieldHSide = tileSide * 13;3870
var leftover = (vw - fieldWSide) / 2;3871
var need = probe.outerW + GAP + EDGE;3872
if (vw >= MIN_VIEWPORT_FOR_SIDES && leftover >= need3873
&& tileSide >= MIN_TILE_FOR_SIDES)3874
{3875
var fieldX = Math.floor((vw - fieldWSide) / 2);3876
var fieldY = hudH + Math.floor((availHSide - fieldHSide) / 2);3877
if (fieldY < hudH)3878
{ fieldY = hudH; }3879
return finish('sides', tileSide, fieldX, fieldY, 0, probe,3880
sidePositions(n, fieldX, fieldY, fieldWSide, fieldHSide, probe, hudH));3881
}3882
}3883
3884
var miniTop = canvasSize(n, 'top', 0);3885
var miniH = 0;3886
if (n > 0)3887
{3888
var share = n > 6 ? 0.26 : 0.20;3889
miniH = Math.min(n > 6 ? 180 : 150, Math.max(86, Math.round(vh * share)));3890
}3891
var availW = Math.max(80, vw - margin * 2);3892
var availH = Math.max(80, vh - hudH - miniH - margin);3893
var tile = Math.max(14, Math.floor(Math.min(availW / 10, availH / 13)));3894
var fieldW = tile * 10;3895
var fieldH = tile * 13;3896
var fieldX = Math.floor((vw - fieldW) / 2);3897
var topBand = hudH + miniH;3898
var fieldY = topBand + Math.floor((vh - topBand - fieldH - margin / 2) / 2);3899
if (fieldY < topBand)3900
{ fieldY = topBand; }3901
return finish('top', tile, fieldX, fieldY, miniH, miniTop, []);3902
}3903
3904
var api = {3905
GAP: GAP,3906
VGAP: VGAP,3907
EDGE: EDGE,3908
MIN_TILE_FOR_SIDES: MIN_TILE_FOR_SIDES,3909
MIN_VIEWPORT_FOR_SIDES: MIN_VIEWPORT_FOR_SIDES,3910
LABEL_H: LABEL_H,3911
canvasSize: canvasSize,3912
sidePositions: sidePositions,3913
plan: plan3914
};3915
3916
if (typeof module !== 'undefined' && module.exports)3917
{ module.exports = api; }3918
else if (typeof globalThis !== 'undefined')3919
{ globalThis.MiniLayout = api; }3920
3921
return api;3922
3923
})();3924
3925
if (typeof module !== 'undefined' && module.exports && typeof MiniLayout !== 'undefined')3926
{ module.exports = MiniLayout; }3927
3928
/*3929
* End File:3930
* /workspace/meteors/src/miniLayout.js3931
*/ 3932
3752
/*3933
/*3753
* Start File:3934
* Start File:3754
* /workspace/meteors/src/online.js3935
* /workspace/meteors/src/online.js@@ -3958,8 +4139,15 @@ Online._handleTransitions = function (prevStatus, data)3958
{ this.onGameStart(lobby); }4139
{ this.onGameStart(lobby); }3959
if (data && data.incoming && data.incoming.length && this.onIncoming)4140
if (data && data.incoming && data.incoming.length && this.onIncoming)3960
{ this.onIncoming(data.incoming); }4141
{ this.onIncoming(data.incoming); }4142
// Own outgoing results (immediate) and lobby-wide recent flights4143
// (so every client can draw opponent and enemy-to-enemy arcs, t1125).4144
var flights = [];3961
if (data && data.shot_results && data.shot_results.length)4145
if (data && data.shot_results && data.shot_results.length)3962
{ this.spawnFlights(data.shot_results, this._lastQueuedMeta); }4146
{ flights = flights.concat(data.shot_results); }4147
if (data && data.shot_flights && data.shot_flights.length)4148
{ flights = flights.concat(data.shot_flights); }4149
if (flights.length)4150
{ this.spawnFlights(flights, this._flightLocals); }3963
if (status === 'finished' && prevStatus !== 'finished' && this.onFinished)4151
if (status === 'finished' && prevStatus !== 'finished' && this.onFinished)3964
{ this.onFinished(lobby); }4152
{ this.onFinished(lobby); }3965
if (status === 'waiting' && prevStatus === 'finished' && this.onLobbyReturn)4153
if (status === 'waiting' && prevStatus === 'finished' && this.onLobbyReturn)@@ -4050,6 +4238,20 @@ Online.renderMinis = function (container)4050
+ '<div class="mini-meta"></div>';4238
+ '<div class="mini-meta"></div>';4051
container.appendChild(el);4239
container.appendChild(el);4052
}4240
}4241
var mz = (typeof app !== 'undefined' && app.miniLayout && app.miniLayout.mini)4242
? app.miniLayout.mini4243
: { w: 80, h: 104 };4244
var canvas = el.querySelector('canvas');4245
if (canvas && (canvas.width !== mz.w || canvas.height !== mz.h))4246
{4247
canvas.width = mz.w;4248
canvas.height = mz.h;4249
}4250
if (canvas)4251
{4252
canvas.style.width = mz.w + 'px';4253
canvas.style.height = mz.h + 'px';4254
}4053
el.classList.toggle('eliminated', !!p.eliminated);4255
el.classList.toggle('eliminated', !!p.eliminated);4054
el.querySelector('.mini-name').textContent = p.name + (p.is_host ? ' (host)' : '');4256
el.querySelector('.mini-name').textContent = p.name + (p.is_host ? ' (host)' : '');4055
el.querySelector('.mini-meta').textContent = p.eliminated4257
el.querySelector('.mini-meta').textContent = p.eliminated@@ -4062,6 +4264,8 @@ Online.renderMinis = function (container)4062
if (!seen[id])4264
if (!seen[id])4063
{ existing[id].remove(); }4265
{ existing[id].remove(); }4064
}4266
}4267
if (typeof applyMinisLayout === 'function')4268
{ applyMinisLayout(); }4065
};4269
};4066
4270
4067
var MINI_COLORS = ['#d4553a', '#3a9ad4', '#4caf6a', '#e6c04a', '#b86ad4'];4271
var MINI_COLORS = ['#d4553a', '#3a9ad4', '#4caf6a', '#e6c04a', '#b86ad4'];@@ -4156,40 +4360,221 @@ function colorSpriteUrl (color, planetId)4156
* startX, startY} in viewport pixels, filled by the view just after4360
* startX, startY} in viewport pixels, filled by the view just after4157
* consumeOutgoingShots.4361
* consumeOutgoingShots.4158
*/4362
*/4363
Online.playerId = function ()4364
{4365
if (typeof app !== 'undefined' && app.offline)4366
{ return 'player'; }4367
if (this.lobby && this.lobby.players)4368
{4369
for (var i = 0; i < this.lobby.players.length; i++)4370
{4371
if (this.lobby.players[i].is_me)4372
{ return this.lobby.players[i].id; }4373
}4374
}4375
return 'player';4376
};4377
4378
/**4379
* Classify a shot for visual treatment (t1125).4380
* player-to-enemy, enemy-to-player, enemy-to-enemy,4381
* player-miss, enemy-miss.4382
*/4383
Online.flightKind = function (fromId, targetId, miss)4384
{4385
var me = this.playerId();4386
var fromMe = !fromId || fromId === me || fromId === 'player';4387
if (miss)4388
{ return fromMe ? 'player-miss' : 'enemy-miss'; }4389
if (fromMe)4390
{ return 'player-to-enemy'; }4391
if (targetId === me || targetId === 'player')4392
{ return 'enemy-to-player'; }4393
return 'enemy-to-enemy';4394
};4395
4396
/**4397
* Parabolic arc: linear in x, a rise of `height` pixels above the4398
* chord at mid-flight (screen y grows downward, so we subtract).4399
*/4400
Online.arcPoint = function (start, end, u, height)4401
{4402
var t = u < 0 ? 0 : (u > 1 ? 1 : u);4403
var x = start.x + (end.x - start.x) * t;4404
var y = start.y + (end.y - start.y) * t - 4 * height * t * (1 - t);4405
return { x: x, y: y };4406
};4407
4408
Online.arcHeight = function (start, end)4409
{4410
var dx = end.x - start.x;4411
var dy = end.y - start.y;4412
var dist = Math.sqrt(dx * dx + dy * dy);4413
return Math.max(48, Math.min(220, dist * 0.28));4414
};4415
4416
Online.easeInOutCubic = function (t)4417
{4418
if (t < 0.5)4419
{ return 4 * t * t * t; }4420
var u = -2 * t + 2;4421
return 1 - (u * u * u) / 2;4422
};4423
4424
Online._miniCellSize = function (playerId)4425
{4426
var el = this.miniElement(playerId);4427
var canvas = el && el.querySelector('canvas');4428
if (canvas)4429
{4430
var r = canvas.getBoundingClientRect();4431
return Math.max(6, r.width / 10);4432
}4433
return 10;4434
};4435
4436
Online._fullTileSize = function ()4437
{4438
if (typeof app !== 'undefined' && app.tile)4439
{ return app.tile; }4440
return 40;4441
};4442
4443
Online._miniAnchor = function (playerId, dir)4444
{4445
var el = this.miniElement(playerId);4446
var canvas = el && (el.querySelector ? el.querySelector('canvas') : null);4447
var box = canvas || el;4448
if (!box)4449
{ return { x: window.innerWidth / 2, y: 48 }; }4450
var r = box.getBoundingClientRect();4451
if (dir === 'out')4452
{ return { x: r.left + r.width / 2, y: r.top + 4 }; }4453
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };4454
};4455
4456
Online._fieldTop = function (col)4457
{4458
return this._flightStart(col);4459
};4460
4461
/**4462
* Animate shot results. `locals` is a map of client_id → {col, y, color,4463
* startX, startY, from_id} in viewport pixels.4464
*4465
* Visual-only (t1125): a parabolic arc whose scale goes from mini-cell4466
* to full tile (or the reverse). Enemy-to-enemy arcs stay small and4467
* are drawn behind the player's field. Delivery timing is unchanged;4468
* a late-seen flight starts mid-arc via `age`.4469
*/4159
Online.spawnFlights = function (results, locals)4470
Online.spawnFlights = function (results, locals)4160
{4471
{4161
locals = locals || this._flightLocals || {};4472
locals = locals || this._flightLocals || {};4162
var layer = document.getElementById('flights');4473
var front = document.getElementById('flights');4163
if (!layer)4474
var back = document.getElementById('flights-back') || front;4475
if (!front)4164
{ return; }4476
{ return; }4477
if (!this._flightSeen)4478
{ this._flightSeen = Object.create(null); }4479
var now = performance.now();4480
var full = this._fullTileSize();4165
for (var i = 0; i < results.length; i++)4481
for (var i = 0; i < results.length; i++)4166
{4482
{4167
var r = results[i];4483
var r = results[i];4168
var meta = locals[r.client_id] || {};4484
var sid = String(r.id != null ? r.id : (r.client_id || ('tmp-' + i)));4169
var start = this._flightStart(meta.col);4485
if (this._flightSeen[sid])4170
var end;4486
{ continue; }4487
this._flightSeen[sid] = now;4488
4489
var meta = locals[r.client_id] || locals[sid] || {};4490
var fromId = r.from_id || r.from_user || meta.from_id || null;4491
var targetId = r.target_id != null ? r.target_id : r.to_user;4171
var miss = !!r.miss;4492
var miss = !!r.miss;4493
var kind = this.flightKind(fromId, targetId, miss);4494
var duration = (r.flight_duration || this.FLIGHT_DURATION) * 1000;4495
if (r.age != null && isFinite(r.age) && r.age * 1000 >= duration)4496
{ continue; }4497
4498
var start;4499
if (meta.startX != null && isFinite(meta.startX))4500
{ start = { x: meta.startX, y: meta.startY }; }4501
else if (kind === 'player-to-enemy' || kind === 'player-miss')4502
{ start = this._flightStart(meta.col != null ? meta.col : r.col); }4503
else4504
{ start = this._miniAnchor(fromId, 'out'); }4505
4506
var end;4172
if (miss)4507
if (miss)4173
{ end = this._missEnd(start); }4508
{ end = this._missEnd(start, kind === 'enemy-miss'); }4509
else if (kind === 'enemy-to-player')4510
{ end = this._fieldTop(null); }4174
else4511
else4175
{ end = this._targetEnd(r.target_id, start); }4512
{ end = this._targetEnd(targetId, start); }4513
4514
var startScale;4515
var endScale;4516
var mini = this._miniCellSize(fromId || targetId) / full;4517
if (mini < 0.12)4518
{ mini = 0.2; }4519
if (kind === 'player-to-enemy')4520
{4521
startScale = 1;4522
endScale = mini;4523
}4524
else if (kind === 'enemy-to-player')4525
{4526
startScale = mini;4527
endScale = 1;4528
}4529
else if (kind === 'enemy-to-enemy')4530
{4531
startScale = mini;4532
endScale = mini;4533
}4534
else if (kind === 'enemy-miss')4535
{4536
startScale = mini;4537
endScale = 0;4538
}4539
else4540
{4541
startScale = 1;4542
endScale = 0;4543
}4544
4545
var layer = (kind === 'enemy-to-enemy' && back) ? back : front;4176
var el = document.createElement('img');4546
var el = document.createElement('img');4177
el.src = colorSpriteUrl(r.color != null ? r.color : meta.color);4547
el.src = colorSpriteUrl(r.color != null ? r.color : meta.color);4178
el.alt = '';4548
el.alt = '';4179
el.className = 'flight';4549
el.className = 'flight' + (kind === 'enemy-to-enemy' ? ' flight-behind' : '');4550
el.style.width = full + 'px';4551
el.style.height = full + 'px';4180
layer.appendChild(el);4552
layer.appendChild(el);4181
var spin = (Math.random() * 2 - 1) * 720;4553
4182
var duration = (r.flight_duration || this.FLIGHT_DURATION) * 1000;4554
var t0 = now;4555
if (r.age != null && isFinite(r.age) && r.age > 0)4556
{4557
var u0 = Math.min(0.95, (r.age * 1000) / duration);4558
t0 = now - u0 * duration;4559
}4560
var height = miss4561
? Math.max(40, Math.min(160, Math.abs(end.y - start.y) * 0.35))4562
: this.arcHeight(start, end);4183
this._flights.push({4563
this._flights.push({4184
el: el,4564
el: el,4185
start: start,4565
start: start,4186
end: end,4566
end: end,4187
ctrl: miss ? this._missCtrl(start, end) : this._hitCtrl(start, end),4567
ctrl: miss ? this._missCtrl(start, end) : null,4188
t0: performance.now(),4568
height: height,4569
t0: t0,4189
duration: duration,4570
duration: duration,4190
spin: spin,4571
spin: (Math.random() * 2 - 1) * 720,4191
miss: miss,4572
miss: miss,4192
angle: Math.random() * 3604573
kind: kind,4574
startScale: startScale,4575
endScale: endScale,4576
angle: Math.random() * 360,4577
id: sid4193
});4578
});4194
}4579
}4195
this._flightLocals = {};4580
this._flightLocals = {};@@ -4204,13 +4589,13 @@ Online.rememberFlightLocal = function (shot, startX, startY)4204
y: shot.y,4589
y: shot.y,4205
color: shot.color,4590
color: shot.color,4206
startX: startX,4591
startX: startX,4207
startY: startY4592
startY: startY,4593
from_id: shot.from_id4208
};4594
};4209
};4595
};4210
4596
4211
Online._flightStart = function (col)4597
Online._flightStart = function (col)4212
{4598
{4213
var field = document.querySelector('canvas');4214
var appRef = typeof app !== 'undefined' ? app : null;4599
var appRef = typeof app !== 'undefined' ? app : null;4215
if (appRef && appRef.scene && appRef.scene.canvas)4600
if (appRef && appRef.scene && appRef.scene.canvas)4216
{4601
{@@ -4222,6 +4607,7 @@ Online._flightStart = function (col)4222
y: rect.top + 44607
y: rect.top + 44223
};4608
};4224
}4609
}4610
var field = document.querySelector('canvas');4225
if (field)4611
if (field)4226
{4612
{4227
var rect = field.getBoundingClientRect();4613
var rect = field.getBoundingClientRect();@@ -4235,19 +4621,25 @@ Online._targetEnd = function (targetId, start)4235
var el = targetId && this.miniElement(targetId);4621
var el = targetId && this.miniElement(targetId);4236
if (el)4622
if (el)4237
{4623
{4238
var r = el.getBoundingClientRect();4624
var canvas = el.querySelector('canvas') || el;4625
var r = canvas.getBoundingClientRect();4239
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };4626
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };4240
}4627
}4241
return { x: start.x + (Math.random() - 0.5) * 80, y: 40 };4628
return { x: start.x + (Math.random() - 0.5) * 80, y: 40 };4242
};4629
};4243
4630
4244
Online._missEnd = function (start)4631
Online._missEnd = function (start, fromMini)4245
{4632
{4246
var dx = (Math.random() * 2 - 1) * window.innerWidth * 0.35;4633
var w = window.innerWidth || 800;4247
return {4634
var outward;4248
x: start.x + dx,4635
if (start.x < w * 0.4)4249
y: start.y - (120 + Math.random() * 220)4636
{ outward = -(80 + Math.random() * w * 0.25); }4250
};4637
else if (start.x > w * 0.6)4638
{ outward = (80 + Math.random() * w * 0.25); }4639
else4640
{ outward = (Math.random() * 2 - 1) * w * 0.35; }4641
var lift = fromMini ? (80 + Math.random() * 160) : (120 + Math.random() * 220);4642
return { x: start.x + outward, y: start.y - lift };4251
};4643
};4252
4644
4253
Online._missCtrl = function (start, end)4645
Online._missCtrl = function (start, end)@@ -4273,26 +4665,53 @@ Online.tickFlights = function (now)4273
for (var i = 0; i < this._flights.length; i++)4665
for (var i = 0; i < this._flights.length; i++)4274
{4666
{4275
var f = this._flights[i];4667
var f = this._flights[i];4276
var u = (now - f.t0) / f.duration;4668
var raw = (now - f.t0) / f.duration;4277
if (u >= 1)4669
if (raw >= 1)4278
{4670
{4279
if (f.el && f.el.parentNode)4671
if (f.el && f.el.parentNode)4280
{ f.el.parentNode.removeChild(f.el); }4672
{ f.el.parentNode.removeChild(f.el); }4281
continue;4673
continue;4282
}4674
}4283
// Quadratic bezier, ease-in so they feel like they recede.4675
if (raw < 0)4284
var e = u * u;4676
{ raw = 0; }4285
var mt = 1 - e;4677
var u = this.easeInOutCubic(raw);4286
var x = mt * mt * f.start.x + 2 * mt * e * f.ctrl.x + e * e * f.end.x;4678
var x, y;4287
var y = mt * mt * f.start.y + 2 * mt * e * f.ctrl.y + e * e * f.end.y;4679
if (f.miss && f.ctrl)4288
var scale = f.miss ? (1 - e) : (1 - 0.85 * e);4680
{4289
var angle = f.angle + f.spin * u;4681
var e = raw * raw;4682
var mt = 1 - e;4683
x = mt * mt * f.start.x + 2 * mt * e * f.ctrl.x + e * e * f.end.x;4684
y = mt * mt * f.start.y + 2 * mt * e * f.ctrl.y + e * e * f.end.y;4685
}4686
else4687
{4688
var pt = this.arcPoint(f.start, f.end, u, f.height || 80);4689
x = pt.x;4690
y = pt.y;4691
}4692
var scale = f.startScale + (f.endScale - f.startScale) * u;4693
if (f.miss)4694
{4695
var fadeU = raw * raw;4696
scale = f.startScale * (1 - fadeU);4697
}4698
var angle = f.angle + f.spin * raw;4290
f.el.style.transform = 'translate(' + x + 'px,' + y + 'px) translate(-50%,-50%) rotate('4699
f.el.style.transform = 'translate(' + x + 'px,' + y + 'px) translate(-50%,-50%) rotate('4291
+ angle + 'deg) scale(' + scale + ')';4700
+ angle + 'deg) scale(' + scale + ')';4292
f.el.style.opacity = f.miss ? String(1 - e) : '1';4701
f.el.style.opacity = f.miss ? String(Math.max(0, 1 - raw * raw)) : '1';4293
leftover.push(f);4702
leftover.push(f);4294
}4703
}4295
this._flights = leftover;4704
this._flights = leftover;4705
if (this._flightSeen)4706
{4707
var cutoff = now - 8000;4708
var ids = Object.keys(this._flightSeen);4709
for (var k = 0; k < ids.length; k++)4710
{4711
if (this._flightSeen[ids[k]] < cutoff)4712
{ delete this._flightSeen[ids[k]]; }4713
}4714
}4296
};4715
};4297
4716
4298
Online.clearFlights = function ()4717
Online.clearFlights = function ()@@ -4305,6 +4724,7 @@ Online.clearFlights = function ()4305
}4724
}4306
this._flights = [];4725
this._flights = [];4307
this._flightLocals = {};4726
this._flightLocals = {};4727
this._flightSeen = Object.create(null);4308
};4728
};4309
4729
4310
if (typeof globalThis !== 'undefined')4730
if (typeof globalThis !== 'undefined')@@ -5215,13 +5635,122 @@ function placeTile (obj, col, y)5215
obj.transform.size = { x: t, y: t };5635
obj.transform.size = { x: t, y: t };5216
}5636
}5217
5637
5638
function opponentCount ()5639
{5640
if (app.offline && app.battle && app.battle.bots)5641
{ return app.battle.bots.length; }5642
if (app.online && typeof Online !== 'undefined' && Online.opponents)5643
{ return Online.opponents().length; }5644
return 0;5645
}5646
5647
function currentMiniSize ()5648
{5649
if (app.miniLayout && app.miniLayout.mini)5650
{ return { w: app.miniLayout.mini.w, h: app.miniLayout.mini.h }; }5651
var n = opponentCount();5652
var mode = (app.miniLayout && app.miniLayout.mode) || 'top';5653
if (typeof MiniLayout !== 'undefined' && MiniLayout.canvasSize)5654
{ return MiniLayout.canvasSize(n, mode, 0); }5655
if (n >= 10)5656
{ return { w: 40, h: 52 }; }5657
if (n >= 6)5658
{ return { w: 56, h: 73 }; }5659
return { w: 80, h: 104 };5660
}5661
5662
function applyMinisContainer (plan)5663
{5664
var minis = document.getElementById('minis');5665
if (!minis)5666
{ return; }5667
var n = plan ? plan.n : 0;5668
minis.classList.toggle('crowded', n > 5);5669
if (!plan || n === 0 || plan.mode !== 'sides')5670
{5671
minis.classList.remove('sides');5672
minis.style.top = (app.hudH || 56) + 'px';5673
minis.style.maxHeight = (plan && plan.miniH ? plan.miniH : 0) + 'px';5674
minis.style.bottom = '';5675
minis.style.left = '';5676
minis.style.right = '';5677
var kids = minis.querySelectorAll('.mini');5678
for (var i = 0; i < kids.length; i++)5679
{5680
kids[i].style.left = '';5681
kids[i].style.top = '';5682
kids[i].style.width = '';5683
kids[i].style.position = '';5684
}5685
return;5686
}5687
minis.classList.add('sides');5688
minis.style.top = '0';5689
minis.style.bottom = '0';5690
minis.style.left = '0';5691
minis.style.right = '0';5692
minis.style.maxHeight = 'none';5693
}5694
5695
function applyMinisLayout ()5696
{5697
var plan = app.miniLayout;5698
var minis = document.getElementById('minis');5699
if (!minis)5700
{ return; }5701
applyMinisContainer(plan);5702
if (!plan || plan.mode !== 'sides')5703
{ return; }5704
var positions = plan.positions || [];5705
var kids = minis.querySelectorAll('.mini');5706
for (var i = 0; i < positions.length && i < kids.length; i++)5707
{5708
var p = positions[i];5709
var el = kids[i];5710
el.style.position = 'absolute';5711
el.style.left = p.x + 'px';5712
el.style.top = p.y + 'px';5713
el.style.width = p.w + 'px';5714
var canvas = el.querySelector('canvas');5715
if (canvas)5716
{5717
canvas.style.width = p.canvasW + 'px';5718
canvas.style.height = p.canvasH + 'px';5719
}5720
}5721
}5722
5723
function applyFlightsBackClip ()5724
{5725
var back = document.getElementById('flights-back');5726
if (!back)5727
{ return; }5728
var x = app.fieldX || 0;5729
var y = app.fieldY || 0;5730
var w = app.fieldW || 0;5731
var h = app.fieldH || 0;5732
if (!w || !h)5733
{5734
back.style.clipPath = '';5735
return;5736
}5737
// Even-odd polygon: full viewport with a hole over the player's field,5738
// so enemy-to-enemy arcs travel behind the field (t1125).5739
back.style.clipPath = 'polygon(evenodd, 0 0, 100% 0, 100% 100%, 0 100%, 0 0, '5740
+ x + 'px ' + y + 'px, ' + (x + w) + 'px ' + y + 'px, '5741
+ (x + w) + 'px ' + (y + h) + 'px, ' + x + 'px ' + (y + h) + 'px, '5742
+ x + 'px ' + y + 'px)';5743
}5744
5218
function layoutIfNeeded ()5745
function layoutIfNeeded ()5219
{5746
{5220
if (app.core && app.core.drag)5747
if (app.core && app.core.drag)5221
{ return; }5748
{ return; }5222
var vw = window.innerWidth || 320;5749
var vw = window.innerWidth || 320;5223
var vh = window.innerHeight || 480;5750
var vh = window.innerHeight || 480;5224
if (app._layoutVw === vw && app._layoutVh === vh && app.scene && app.tile)5751
var n = (app.online || app.offline) ? opponentCount() : 0;5752
if (app._layoutVw === vw && app._layoutVh === vh && app._layoutN === n5753
&& app.scene && app.tile)5225
{ return; }5754
{ return; }5226
layout();5755
layout();5227
}5756
}@@ -5232,8 +5761,10 @@ function layout ()5232
{ return; }5761
{ return; }5233
var vw = window.innerWidth || 320;5762
var vw = window.innerWidth || 320;5234
var vh = window.innerHeight || 480;5763
var vh = window.innerHeight || 480;5764
var n = (app.online || app.offline) ? opponentCount() : 0;5235
app._layoutVw = vw;5765
app._layoutVw = vw;5236
app._layoutVh = vh;5766
app._layoutVh = vh;5767
app._layoutN = n;5237
var safeTop = 0;5768
var safeTop = 0;5238
try5769
try5239
{5770
{@@ -5242,30 +5773,34 @@ function layout ()5242
}5773
}5243
catch (e) { /* ignore */ }5774
catch (e) { /* ignore */ }5244
app.hudH = Math.max(56, Math.round(vh * 0.09) + safeTop);5775
app.hudH = Math.max(56, Math.round(vh * 0.09) + safeTop);5245
app.miniH = 0;5246
if (app.online || app.offline)5247
{5248
var nBots = (app.battle && app.battle.bots) ? app.battle.bots.length : 2;5249
var share = nBots > 6 ? 0.26 : 0.20;5250
app.miniH = Math.min(nBots > 6 ? 180 : 150, Math.max(86, Math.round(vh * share)));5251
}5252
var margin = Math.max(6, Math.round(Math.min(vw, vh) * 0.015));5776
var margin = Math.max(6, Math.round(Math.min(vw, vh) * 0.015));5253
var availW = Math.max(80, vw - margin * 2);5777
var plan;5254
var availH = Math.max(80, vh - app.hudH - app.miniH - margin);5778
if (typeof MiniLayout !== 'undefined' && MiniLayout.plan)5255
app.tile = Math.max(14, Math.floor(Math.min(availW / 10, availH / 13)));5779
{ plan = MiniLayout.plan(vw, vh, n, app.hudH, margin); }5256
app.fieldW = app.tile * 10;5780
else5257
app.fieldH = app.tile * 13;5258
app.fieldX = Math.floor((vw - app.fieldW) / 2);5259
var topBand = app.hudH + app.miniH;5260
app.fieldY = topBand + Math.floor((vh - topBand - app.fieldH - margin / 2) / 2);5261
if (app.fieldY < topBand)5262
{ app.fieldY = topBand; }5263
var minis = document.getElementById('minis');5264
if (minis)5265
{5781
{5266
minis.style.top = app.hudH + 'px';5782
plan = {5267
minis.style.maxHeight = app.miniH + 'px';5783
mode: 'top',5784
tile: 14,5785
fieldW: 140,5786
fieldH: 182,5787
fieldX: Math.floor((vw - 140) / 2),5788
fieldY: app.hudH,5789
miniH: n > 0 ? 100 : 0,5790
mini: { w: 80, h: 104 },5791
positions: [],5792
n: n5793
};5268
}5794
}5795
app.miniLayout = plan;5796
app.miniH = plan.miniH;5797
app.tile = plan.tile;5798
app.fieldW = plan.fieldW;5799
app.fieldH = plan.fieldH;5800
app.fieldX = plan.fieldX;5801
app.fieldY = plan.fieldY;5802
applyMinisLayout();5803
applyFlightsBackClip();5269
5804
5270
if (app.scene)5805
if (app.scene)5271
{5806
{@@ -6101,6 +6636,7 @@ function tickOnline (dt)6101
}6636
}6102
Online.tickFlights();6637
Online.tickFlights();6103
Online.renderMinis(document.getElementById('minis'));6638
Online.renderMinis(document.getElementById('minis'));6639
applyMinisLayout();6104
}6640
}6105
6641
6106
6642
@@ -6179,7 +6715,8 @@ function tickOffline (dt)6179
y: s.y,6715
y: s.y,6180
color: s.color,6716
color: s.color,6181
startX: start.x,6717
startX: start.x,6182
startY: start.y6718
startY: start.y,6719
from_id: s.from_id6183
};6720
};6184
}6721
}6185
Online.spawnFlights(result.flights, locals);6722
Online.spawnFlights(result.flights, locals);@@ -6293,16 +6830,20 @@ function miniViewportCenter (botId)6293
if (!el)6830
if (!el)6294
{ return { x: window.innerWidth / 2, y: 40 }; }6831
{ return { x: window.innerWidth / 2, y: 40 }; }6295
var rect = el.getBoundingClientRect();6832
var rect = el.getBoundingClientRect();6833
var plan = app.miniLayout;6834
if (plan && plan.mode === 'sides')6835
{6836
var mid = plan.fieldX + plan.fieldW / 2;6837
if (rect.left + rect.width / 2 < mid)6838
{ return { x: rect.right, y: rect.top + rect.height / 2 }; }6839
return { x: rect.left, y: rect.top + rect.height / 2 };6840
}6296
return { x: rect.left + rect.width / 2, y: rect.bottom };6841
return { x: rect.left + rect.width / 2, y: rect.bottom };6297
}6842
}6298
6843
6299
function offlineMiniSize (n)6844
function offlineMiniSize (n)6300
{6845
{6301
if (n >= 10)6846
return currentMiniSize();6302
{ return { w: 40, h: 52 }; }6303
if (n >= 6)6304
{ return { w: 56, h: 73 }; }6305
return { w: 80, h: 104 };6306
}6847
}6307
6848
6308
function updateOfflineMinis (dt, force)6849
function updateOfflineMinis (dt, force)@@ -6365,6 +6906,7 @@ function renderOfflineMinis ()6365
if (!seen[id])6906
if (!seen[id])6366
{ existing[id].remove(); }6907
{ existing[id].remove(); }6367
}6908
}6909
applyMinisLayout();6368
}6910
}6369
6911
6370
function buildColumnWarn ()6912
function buildColumnWarn ()@@ -12,6 +12,7 @@
12
12
</head>
13
13
<body>
14
14
<div id="stars" aria-hidden="true"></div>
15
<div id="flights-back" aria-hidden="true"></div>
15
16
<div id="flights" aria-hidden="true"></div>
16
17
17
18
<div id="menu" class="screen">
@@ -12,6 +12,7 @@12
</head>12
</head>13
<body>13
<body>14
<div id="stars" aria-hidden="true"></div>14
<div id="stars" aria-hidden="true"></div>15
<div id="flights-back" aria-hidden="true"></div>15
<div id="flights" aria-hidden="true"></div>16
<div id="flights" aria-hidden="true"></div>16
17
17
<div id="menu" class="screen">18
<div id="menu" class="screen">@@ -46,7 +46,7 @@ html, body {
46
46
text-align: center;
47
47
}
48
48
49
.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #planet-select[hidden], #offline-result[hidden], #offline-hud[hidden], #chain-indicator[hidden] { display: none !important; }
49
.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #offline-hud[hidden], #chain-indicator[hidden] { display: none !important; }
50
50
51
51
h1 {
52
52
font-size: clamp(48px, 14vw, 96px);
@@ -350,6 +350,22 @@ a.button:is(:hover, :focus-visible) {
350
350
padding: 6px 8px 0;
351
351
pointer-events: none;
352
352
}
353
#minis.sides {
354
inset: 0;
355
display: block;
356
padding: 0;
357
overflow: visible;
358
max-height: none;
359
gap: 0;
360
}
361
#minis.sides .mini {
362
position: absolute;
363
margin: 0;
364
min-width: 0;
365
}
366
#minis.sides .mini-name {
367
max-width: 100%;
368
}
353
369
.mini {
354
370
text-align: center;
355
371
color: #c5cae0;
@@ -382,7 +398,17 @@ a.button:is(:hover, :focus-visible) {
382
398
pointer-events: none;
383
399
overflow: visible;
384
400
}
385
#flights .flight {
401
/* Enemy-to-enemy arcs: above the starfield and minis, but the field
402
rectangle is clipped out so they pass behind the player's field (t1125). */
403
#flights-back {
404
position: fixed;
405
inset: 0;
406
z-index: 5;
407
pointer-events: none;
408
overflow: visible;
409
}
410
#flights .flight,
411
#flights-back .flight {
386
412
position: fixed;
387
413
top: 0;
388
414
left: 0;
@@ -46,7 +46,7 @@ html, body {46
text-align: center;46
text-align: center;47
}47
}48
48
49
.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #planet-select[hidden], #offline-result[hidden], #offline-hud[hidden], #chain-indicator[hidden] { display: none !important; }49
.screen[hidden], #hud[hidden], #game-over[hidden], #online-panel[hidden], #minis[hidden], #spectator[hidden], #podium[hidden], #flights[hidden], #flights-back[hidden], #planet-select[hidden], #offline-result[hidden], #offline-hud[hidden], #chain-indicator[hidden] { display: none !important; }50
50
51
h1 {51
h1 {52
font-size: clamp(48px, 14vw, 96px);52
font-size: clamp(48px, 14vw, 96px);@@ -350,6 +350,22 @@ a.button:is(:hover, :focus-visible) {350
padding: 6px 8px 0;350
padding: 6px 8px 0;351
pointer-events: none;351
pointer-events: none;352
}352
}353
#minis.sides {354
inset: 0;355
display: block;356
padding: 0;357
overflow: visible;358
max-height: none;359
gap: 0;360
}361
#minis.sides .mini {362
position: absolute;363
margin: 0;364
min-width: 0;365
}366
#minis.sides .mini-name {367
max-width: 100%;368
}353
.mini {369
.mini {354
text-align: center;370
text-align: center;355
color: #c5cae0;371
color: #c5cae0;@@ -382,7 +398,17 @@ a.button:is(:hover, :focus-visible) {382
pointer-events: none;398
pointer-events: none;383
overflow: visible;399
overflow: visible;384
}400
}385
#flights .flight {401
/* Enemy-to-enemy arcs: above the starfield and minis, but the field402
rectangle is clipped out so they pass behind the player's field (t1125). */403
#flights-back {404
position: fixed;405
inset: 0;406
z-index: 5;407
pointer-events: none;408
overflow: visible;409
}410
#flights .flight,411
#flights-back .flight {386
position: fixed;412
position: fixed;387
top: 0;413
top: 0;388
left: 0;414
left: 0;@@ -549,3 +549,46 @@ Aanname:
549
549
- Geldt voor het veld van de speler én voor tegenstander-/bot-mini's
550
550
(zelfde puls-klok). Rendering is goedkoop: tien quads op het
551
551
hoofdveld, één `fillRect` per waarschuwingskolom op de mini-canvas.
552
553
## t1125 — mini's links/rechts en boogjes tussen velden
554
555
- **Breed scherm:** als het venster minstens 960 px breed is, er aan
556
weerszijden van het geschaalde veld genoeg marge is voor één mini
557
(buitenmaat + 12 px tussenruimte + 16 px rand) én de tegels
558
minstens 18 px blijven, staan de tegenstanders om-en-om
559
links en rechts van het veld van de speler (1e links, 2e rechts,
560
3e links, …). De onderste rij sluit aan op de onderkant van het
561
veld. Extra tegenstanders vormen rijen daarboven (kolommen die
562
omhoog groeien). Mini's worden kleiner als dat nodig is om onder
563
de HUD te blijven. Het veld gebruikt de volle hoogte onder de HUD
564
(`miniH = 0`).
565
- **Smal scherm / telefoon:** de bestaande layout blijft: mini's in
566
een wrappende rij boven het veld.
567
- **Boogjes** zijn puur visueel. De vluchttijd blijft 1,2 s, gelijk
568
aan de bestaande aflevering (`deliver_at` / Offline `_deliver`).
569
We vertragen de gameplay-aflevering níét: een late poll stapt
570
mid-arc in via de server-`age` (seconden sinds `created`). Als de
571
vlucht al voorbij is (`age ≥ duration`), tekenen we geen inhaalboog;
572
de incoming is dan al op schema afgeleverd.
573
- Vorm: een parabool in schermcoördinaten,
574
`x = lerp`, `y = lerp − 4·h·t·(1−t)` (y groeit naar beneden).
575
Booghoogte `h` is 0,28 × afstand, geklemd tussen 48 en 220 px,
576
met ease-in-out-cubic. Hits van vijand→speler schalen van mini-tegel
577
naar volle tegel; speler→vijand andersom; vijand→vijand blijven
578
klein. Missers hergebruiken de bestaande fade-en-wegvlieg-animatie;
579
vijand-missers starten kleiner (mini-schaal).
580
- Het visuele eindpunt van vijand→speler is de bovenkant van het
581
veld van de speler (midden, of de kolom als die bekend is). De
582
échte `ingestGarbage` kiest nog steeds een willekeurige kolom —
583
die hoeft niet overeen te komen met waar de boog landt.
584
- Vijand→vijand (bot-bot of remote-remote) worden in `#flights-back`
585
getekend (z-index 5, onder `#flights` z-index 6). Een CSS
586
`clip-path` spaart het rechthoek van het spelersveld uit, zodat
587
die blokjes achter het veld langs gaan, niet ervoor. Ze blijven
588
zichtbaar in de zijmarges.
589
- Online ziet elke client alle recente schoten via `shot_flights`
590
op de poll (`from_id`, `target_id`, `miss`, `age`,
591
`flight_duration`). Eigen `shot_results` blijven bestaan; de
592
client de-dupliceert op id. Extra velden zijn backward compatible.
593
- Performance: alleen CSS-transforms, één tick per frame, beelden
594
verdwijnen na 1,2 s. Geen pooling nodig voor tientallen bots.
@@ -549,3 +549,46 @@ Aanname:549
- Geldt voor het veld van de speler én voor tegenstander-/bot-mini's549
- Geldt voor het veld van de speler én voor tegenstander-/bot-mini's550
(zelfde puls-klok). Rendering is goedkoop: tien quads op het550
(zelfde puls-klok). Rendering is goedkoop: tien quads op het551
hoofdveld, één `fillRect` per waarschuwingskolom op de mini-canvas.551
hoofdveld, één `fillRect` per waarschuwingskolom op de mini-canvas.552
553
## t1125 — mini's links/rechts en boogjes tussen velden554
555
- **Breed scherm:** als het venster minstens 960 px breed is, er aan556
weerszijden van het geschaalde veld genoeg marge is voor één mini557
(buitenmaat + 12 px tussenruimte + 16 px rand) én de tegels558
minstens 18 px blijven, staan de tegenstanders om-en-om559
links en rechts van het veld van de speler (1e links, 2e rechts,560
3e links, …). De onderste rij sluit aan op de onderkant van het561
veld. Extra tegenstanders vormen rijen daarboven (kolommen die562
omhoog groeien). Mini's worden kleiner als dat nodig is om onder563
de HUD te blijven. Het veld gebruikt de volle hoogte onder de HUD564
(`miniH = 0`).565
- **Smal scherm / telefoon:** de bestaande layout blijft: mini's in566
een wrappende rij boven het veld.567
- **Boogjes** zijn puur visueel. De vluchttijd blijft 1,2 s, gelijk568
aan de bestaande aflevering (`deliver_at` / Offline `_deliver`).569
We vertragen de gameplay-aflevering níét: een late poll stapt570
mid-arc in via de server-`age` (seconden sinds `created`). Als de571
vlucht al voorbij is (`age ≥ duration`), tekenen we geen inhaalboog;572
de incoming is dan al op schema afgeleverd.573
- Vorm: een parabool in schermcoördinaten,574
`x = lerp`, `y = lerp − 4·h·t·(1−t)` (y groeit naar beneden).575
Booghoogte `h` is 0,28 × afstand, geklemd tussen 48 en 220 px,576
met ease-in-out-cubic. Hits van vijand→speler schalen van mini-tegel577
naar volle tegel; speler→vijand andersom; vijand→vijand blijven578
klein. Missers hergebruiken de bestaande fade-en-wegvlieg-animatie;579
vijand-missers starten kleiner (mini-schaal).580
- Het visuele eindpunt van vijand→speler is de bovenkant van het581
veld van de speler (midden, of de kolom als die bekend is). De582
échte `ingestGarbage` kiest nog steeds een willekeurige kolom —583
die hoeft niet overeen te komen met waar de boog landt.584
- Vijand→vijand (bot-bot of remote-remote) worden in `#flights-back`585
getekend (z-index 5, onder `#flights` z-index 6). Een CSS586
`clip-path` spaart het rechthoek van het spelersveld uit, zodat587
die blokjes achter het veld langs gaan, niet ervoor. Ze blijven588
zichtbaar in de zijmarges.589
- Online ziet elke client alle recente schoten via `shot_flights`590
op de poll (`from_id`, `target_id`, `miss`, `age`,591
`flight_duration`). Eigen `shot_results` blijven bestaan; de592
client de-dupliceert op id. Extra velden zijn backward compatible.593
- Performance: alleen CSS-transforms, één tick per frame, beelden594
verdwijnen na 1,2 s. Geen pooling nodig voor tientallen bots.@@ -17,7 +17,7 @@ try {
17
17
$user = currentUser();
18
18
19
19
if ($action === 'me' || $action === '') {
20
$view = ['lobby' => null, 'incoming' => [], 'shot_results' => []];
20
$view = ['lobby' => null, 'incoming' => [], 'shot_results' => [], 'shot_flights' => []];
21
21
if ($user) {
22
22
$view = Store::open()->viewFor($user['id']);
23
23
}
@@ -30,6 +30,7 @@ try {
30
30
'lobby' => $view['lobby'],
31
31
'incoming' => $view['incoming'],
32
32
'shot_results' => $view['shot_results'],
33
'shot_flights' => $view['shot_flights'] ?? [],
33
34
'miss_chance_default' => METEORS_DEFAULT_MISS,
34
35
'flight_duration' => METEORS_FLIGHT_DURATION,
35
36
'login_url' => 'auth.php',
@@ -103,6 +104,7 @@ try {
103
104
'lobby' => $view['lobby'],
104
105
'incoming' => $view['incoming'],
105
106
'shot_results' => $view['shot_results'],
107
'shot_flights' => $view['shot_flights'] ?? [],
106
108
]);
107
109
108
110
default:
@@ -17,7 +17,7 @@ try {17
$user = currentUser();17
$user = currentUser();18
18
19
if ($action === 'me' || $action === '') {19
if ($action === 'me' || $action === '') {20
$view = ['lobby' => null, 'incoming' => [], 'shot_results' => []];20
$view = ['lobby' => null, 'incoming' => [], 'shot_results' => [], 'shot_flights' => []];21
if ($user) {21
if ($user) {22
$view = Store::open()->viewFor($user['id']);22
$view = Store::open()->viewFor($user['id']);23
}23
}@@ -30,6 +30,7 @@ try {30
'lobby' => $view['lobby'],30
'lobby' => $view['lobby'],31
'incoming' => $view['incoming'],31
'incoming' => $view['incoming'],32
'shot_results' => $view['shot_results'],32
'shot_results' => $view['shot_results'],33
'shot_flights' => $view['shot_flights'] ?? [],33
'miss_chance_default' => METEORS_DEFAULT_MISS,34
'miss_chance_default' => METEORS_DEFAULT_MISS,34
'flight_duration' => METEORS_FLIGHT_DURATION,35
'flight_duration' => METEORS_FLIGHT_DURATION,35
'login_url' => 'auth.php',36
'login_url' => 'auth.php',@@ -103,6 +104,7 @@ try {103
'lobby' => $view['lobby'],104
'lobby' => $view['lobby'],104
'incoming' => $view['incoming'],105
'incoming' => $view['incoming'],105
'shot_results' => $view['shot_results'],106
'shot_results' => $view['shot_results'],107
'shot_flights' => $view['shot_flights'] ?? [],106
]);108
]);107
109
108
default:110
default:@@ -413,12 +413,15 @@ SQL);
413
413
$results[] = [
414
414
'id' => (int) $this->pdo->lastInsertId(),
415
415
'client_id' => $clientId,
416
'from_id' => $userId,
417
'from_user' => $userId,
416
418
'miss' => $miss,
417
419
'target_id' => $to,
418
420
'target_name' => $toName,
419
421
'deliver_at' => $deliver,
420
422
'color' => $color,
421
423
'flight_duration' => $flight,
424
'age' => 0.0,
422
425
];
423
426
}
424
427
return $results;
@@ -568,6 +571,43 @@ SQL);
568
571
$this->pdo->prepare('DELETE FROM shots WHERE lobby_id = ?')->execute([$lobbyId]);
569
572
}
570
573
574
/**
575
* Shots still (or just) in flight, for every client in the lobby (t1125).
576
* `age` is seconds since `created`, so a late poll can join mid-arc.
577
* Window is flight_duration + 0.8 s (one poll slack).
578
*
579
* @return list<array>
580
*/
581
public function recentFlights(string $lobbyId, ?float $flightDuration = null): array
582
{
583
$flight = $flightDuration !== null ? (float) $flightDuration : (float) METEORS_FLIGHT_DURATION;
584
$now = $this->nowf();
585
$window = $flight + 0.8;
586
$stmt = $this->pdo->prepare(
587
'SELECT * FROM shots
588
WHERE lobby_id = ? AND created >= ?
589
ORDER BY id ASC'
590
);
591
$stmt->execute([$lobbyId, $now - $window]);
592
$out = [];
593
foreach ($stmt->fetchAll() as $r) {
594
$to = $r['to_user'];
595
$out[] = [
596
'id' => (int) $r['id'],
597
'client_id' => $r['client_id'],
598
'from_id' => $r['from_user'],
599
'from_user' => $r['from_user'],
600
'target_id' => $to,
601
'miss' => $to === null || $to === '',
602
'color' => (int) $r['color'],
603
'flight_duration' => $flight,
604
'age' => $now - (float) $r['created'],
605
'deliver_at' => (float) $r['deliver_at'],
606
];
607
}
608
return $out;
609
}
610
571
611
/** Public view of a lobby for the given user, including incoming shots. */
572
612
public function viewFor(string $userId, ?array $snapshot = null, ?int $score = null, bool $eliminated = false, array $outgoing = []): array
573
613
{
@@ -595,16 +635,22 @@ SQL);
595
635
'lobby' => null,
596
636
'incoming' => [],
597
637
'shot_results' => $shotResults,
638
'shot_flights' => [],
598
639
];
599
640
}
600
641
$incoming = [];
601
642
if ($lobby['status'] === 'playing') {
602
643
$incoming = $this->takeIncoming($lobby['id'], $userId);
603
644
}
645
$flights = [];
646
if ($lobby['status'] === 'playing') {
647
$flights = $this->recentFlights($lobby['id'], (float) $lobby['flight_duration']);
648
}
604
649
return [
605
650
'lobby' => $this->presentLobby($lobby, $userId),
606
651
'incoming' => $incoming,
607
652
'shot_results' => $shotResults,
653
'shot_flights' => $flights,
608
654
];
609
655
});
610
656
}
@@ -413,12 +413,15 @@ SQL);413
$results[] = [413
$results[] = [414
'id' => (int) $this->pdo->lastInsertId(),414
'id' => (int) $this->pdo->lastInsertId(),415
'client_id' => $clientId,415
'client_id' => $clientId,416
'from_id' => $userId,417
'from_user' => $userId,416
'miss' => $miss,418
'miss' => $miss,417
'target_id' => $to,419
'target_id' => $to,418
'target_name' => $toName,420
'target_name' => $toName,419
'deliver_at' => $deliver,421
'deliver_at' => $deliver,420
'color' => $color,422
'color' => $color,421
'flight_duration' => $flight,423
'flight_duration' => $flight,424
'age' => 0.0,422
];425
];423
}426
}424
return $results;427
return $results;@@ -568,6 +571,43 @@ SQL);568
$this->pdo->prepare('DELETE FROM shots WHERE lobby_id = ?')->execute([$lobbyId]);571
$this->pdo->prepare('DELETE FROM shots WHERE lobby_id = ?')->execute([$lobbyId]);569
}572
}570
573
574
/**575
* Shots still (or just) in flight, for every client in the lobby (t1125).576
* `age` is seconds since `created`, so a late poll can join mid-arc.577
* Window is flight_duration + 0.8 s (one poll slack).578
*579
* @return list<array>580
*/581
public function recentFlights(string $lobbyId, ?float $flightDuration = null): array582
{583
$flight = $flightDuration !== null ? (float) $flightDuration : (float) METEORS_FLIGHT_DURATION;584
$now = $this->nowf();585
$window = $flight + 0.8;586
$stmt = $this->pdo->prepare(587
'SELECT * FROM shots588
WHERE lobby_id = ? AND created >= ?589
ORDER BY id ASC'590
);591
$stmt->execute([$lobbyId, $now - $window]);592
$out = [];593
foreach ($stmt->fetchAll() as $r) {594
$to = $r['to_user'];595
$out[] = [596
'id' => (int) $r['id'],597
'client_id' => $r['client_id'],598
'from_id' => $r['from_user'],599
'from_user' => $r['from_user'],600
'target_id' => $to,601
'miss' => $to === null || $to === '',602
'color' => (int) $r['color'],603
'flight_duration' => $flight,604
'age' => $now - (float) $r['created'],605
'deliver_at' => (float) $r['deliver_at'],606
];607
}608
return $out;609
}610
571
/** Public view of a lobby for the given user, including incoming shots. */611
/** Public view of a lobby for the given user, including incoming shots. */572
public function viewFor(string $userId, ?array $snapshot = null, ?int $score = null, bool $eliminated = false, array $outgoing = []): array612
public function viewFor(string $userId, ?array $snapshot = null, ?int $score = null, bool $eliminated = false, array $outgoing = []): array573
{613
{@@ -595,16 +635,22 @@ SQL);595
'lobby' => null,635
'lobby' => null,596
'incoming' => [],636
'incoming' => [],597
'shot_results' => $shotResults,637
'shot_results' => $shotResults,638
'shot_flights' => [],598
];639
];599
}640
}600
$incoming = [];641
$incoming = [];601
if ($lobby['status'] === 'playing') {642
if ($lobby['status'] === 'playing') {602
$incoming = $this->takeIncoming($lobby['id'], $userId);643
$incoming = $this->takeIncoming($lobby['id'], $userId);603
}644
}645
$flights = [];646
if ($lobby['status'] === 'playing') {647
$flights = $this->recentFlights($lobby['id'], (float) $lobby['flight_duration']);648
}604
return [649
return [605
'lobby' => $this->presentLobby($lobby, $userId),650
'lobby' => $this->presentLobby($lobby, $userId),606
'incoming' => $incoming,651
'incoming' => $incoming,607
'shot_results' => $shotResults,652
'shot_results' => $shotResults,653
'shot_flights' => $flights,608
];654
];609
});655
});610
}656
}@@ -235,6 +235,46 @@ try {
235
235
$store->leaveLobby('local:test_user_1');
236
236
$store->leaveLobby('local:test_user_2');
237
237
238
echo "\nshot_flights (t1125)\n";
239
$e = $store->createLobby('local:test_user_1', 'test_user_1', 0.0);
240
$store->joinLobby('local:test_user_2', 'test_user_2', $e['code']);
241
$store->joinLobby('local:test_user_3', 'test_user_3', $e['code']);
242
$store->setReady('local:test_user_1', true);
243
$store->setReady('local:test_user_2', true);
244
$store->setReady('local:test_user_3', true);
245
$store->startGame('local:test_user_1');
246
$store->testMissOverride = 0.0;
247
$shots = $store->recordShots('local:test_user_1', [
248
['client_id' => 'f1', 'color' => 2],
249
]);
250
$store->testMissOverride = null;
251
expect(count($shots) === 1, 'one recorded shot');
252
expect(($shots[0]['from_id'] ?? null) === 'local:test_user_1', 'shot_results includes from_id');
253
expect(isset($shots[0]['age']) && almostEqual((float) $shots[0]['age'], 0.0), 'own result age is 0');
254
255
$view3 = $store->viewFor('local:test_user_3');
256
expect(isset($view3['shot_flights']) && is_array($view3['shot_flights']), 'viewFor exposes shot_flights');
257
$found = null;
258
foreach ($view3['shot_flights'] as $f) {
259
if (($f['client_id'] ?? '') === 'f1') {
260
$found = $f;
261
break;
262
}
263
}
264
expect($found !== null, 'third player sees the shot in shot_flights');
265
if ($found) {
266
expect($found['from_id'] === 'local:test_user_1', 'shot_flights.from_id is the shooter');
267
expect($found['target_id'] === 'local:test_user_2' || $found['target_id'] === 'local:test_user_3', 'hit lands on a living opponent');
268
expect($found['miss'] === false, 'forced hit is not a miss');
269
expect($found['age'] >= 0 && $found['age'] < 2.0, 'age is seconds since created');
270
expect(almostEqual((float) $found['flight_duration'], METEORS_FLIGHT_DURATION), 'flight_duration on shot_flights');
271
}
272
$view1 = $store->viewFor('local:test_user_1');
273
expect(count($view1['shot_flights']) >= 1, 'shooter also sees shot_flights (client de-dupes)');
274
$store->leaveLobby('local:test_user_1');
275
$store->leaveLobby('local:test_user_2');
276
$store->leaveLobby('local:test_user_3');
277
238
278
echo "\nConfig helpers\n";
239
279
240
280
$cfg = config();
@@ -235,6 +235,46 @@ try {235
$store->leaveLobby('local:test_user_1');235
$store->leaveLobby('local:test_user_1');236
$store->leaveLobby('local:test_user_2');236
$store->leaveLobby('local:test_user_2');237
237
238
echo "\nshot_flights (t1125)\n";239
$e = $store->createLobby('local:test_user_1', 'test_user_1', 0.0);240
$store->joinLobby('local:test_user_2', 'test_user_2', $e['code']);241
$store->joinLobby('local:test_user_3', 'test_user_3', $e['code']);242
$store->setReady('local:test_user_1', true);243
$store->setReady('local:test_user_2', true);244
$store->setReady('local:test_user_3', true);245
$store->startGame('local:test_user_1');246
$store->testMissOverride = 0.0;247
$shots = $store->recordShots('local:test_user_1', [248
['client_id' => 'f1', 'color' => 2],249
]);250
$store->testMissOverride = null;251
expect(count($shots) === 1, 'one recorded shot');252
expect(($shots[0]['from_id'] ?? null) === 'local:test_user_1', 'shot_results includes from_id');253
expect(isset($shots[0]['age']) && almostEqual((float) $shots[0]['age'], 0.0), 'own result age is 0');254
255
$view3 = $store->viewFor('local:test_user_3');256
expect(isset($view3['shot_flights']) && is_array($view3['shot_flights']), 'viewFor exposes shot_flights');257
$found = null;258
foreach ($view3['shot_flights'] as $f) {259
if (($f['client_id'] ?? '') === 'f1') {260
$found = $f;261
break;262
}263
}264
expect($found !== null, 'third player sees the shot in shot_flights');265
if ($found) {266
expect($found['from_id'] === 'local:test_user_1', 'shot_flights.from_id is the shooter');267
expect($found['target_id'] === 'local:test_user_2' || $found['target_id'] === 'local:test_user_3', 'hit lands on a living opponent');268
expect($found['miss'] === false, 'forced hit is not a miss');269
expect($found['age'] >= 0 && $found['age'] < 2.0, 'age is seconds since created');270
expect(almostEqual((float) $found['flight_duration'], METEORS_FLIGHT_DURATION), 'flight_duration on shot_flights');271
}272
$view1 = $store->viewFor('local:test_user_1');273
expect(count($view1['shot_flights']) >= 1, 'shooter also sees shot_flights (client de-dupes)');274
$store->leaveLobby('local:test_user_1');275
$store->leaveLobby('local:test_user_2');276
$store->leaveLobby('local:test_user_3');277
238
echo "\nConfig helpers\n";278
echo "\nConfig helpers\n";239
279
240
$cfg = config();280
$cfg = config();@@ -17,6 +17,7 @@ FILES=(
17
17
"$SRC_DIR/planet.js"
18
18
"$SRC_DIR/easing.js"
19
19
"$SRC_DIR/gameCore.js"
20
"$SRC_DIR/miniLayout.js"
20
21
"$SRC_DIR/online.js"
21
22
"$SRC_DIR/offline.js"
22
23
"$SRC_DIR/main.js"
@@ -17,6 +17,7 @@ FILES=(17
"$SRC_DIR/planet.js"17
"$SRC_DIR/planet.js"18
"$SRC_DIR/easing.js"18
"$SRC_DIR/easing.js"19
"$SRC_DIR/gameCore.js"19
"$SRC_DIR/gameCore.js"20
"$SRC_DIR/miniLayout.js"20
"$SRC_DIR/online.js"21
"$SRC_DIR/online.js"21
"$SRC_DIR/offline.js"22
"$SRC_DIR/offline.js"22
"$SRC_DIR/main.js"23
"$SRC_DIR/main.js"@@ -278,13 +278,122 @@ function placeTile (obj, col, y)
278
278
obj.transform.size = { x: t, y: t };
279
279
}
280
280
281
function opponentCount ()
282
{
283
if (app.offline && app.battle && app.battle.bots)
284
{ return app.battle.bots.length; }
285
if (app.online && typeof Online !== 'undefined' && Online.opponents)
286
{ return Online.opponents().length; }
287
return 0;
288
}
289
290
function currentMiniSize ()
291
{
292
if (app.miniLayout && app.miniLayout.mini)
293
{ return { w: app.miniLayout.mini.w, h: app.miniLayout.mini.h }; }
294
var n = opponentCount();
295
var mode = (app.miniLayout && app.miniLayout.mode) || 'top';
296
if (typeof MiniLayout !== 'undefined' && MiniLayout.canvasSize)
297
{ return MiniLayout.canvasSize(n, mode, 0); }
298
if (n >= 10)
299
{ return { w: 40, h: 52 }; }
300
if (n >= 6)
301
{ return { w: 56, h: 73 }; }
302
return { w: 80, h: 104 };
303
}
304
305
function applyMinisContainer (plan)
306
{
307
var minis = document.getElementById('minis');
308
if (!minis)
309
{ return; }
310
var n = plan ? plan.n : 0;
311
minis.classList.toggle('crowded', n > 5);
312
if (!plan || n === 0 || plan.mode !== 'sides')
313
{
314
minis.classList.remove('sides');
315
minis.style.top = (app.hudH || 56) + 'px';
316
minis.style.maxHeight = (plan && plan.miniH ? plan.miniH : 0) + 'px';
317
minis.style.bottom = '';
318
minis.style.left = '';
319
minis.style.right = '';
320
var kids = minis.querySelectorAll('.mini');
321
for (var i = 0; i < kids.length; i++)
322
{
323
kids[i].style.left = '';
324
kids[i].style.top = '';
325
kids[i].style.width = '';
326
kids[i].style.position = '';
327
}
328
return;
329
}
330
minis.classList.add('sides');
331
minis.style.top = '0';
332
minis.style.bottom = '0';
333
minis.style.left = '0';
334
minis.style.right = '0';
335
minis.style.maxHeight = 'none';
336
}
337
338
function applyMinisLayout ()
339
{
340
var plan = app.miniLayout;
341
var minis = document.getElementById('minis');
342
if (!minis)
343
{ return; }
344
applyMinisContainer(plan);
345
if (!plan || plan.mode !== 'sides')
346
{ return; }
347
var positions = plan.positions || [];
348
var kids = minis.querySelectorAll('.mini');
349
for (var i = 0; i < positions.length && i < kids.length; i++)
350
{
351
var p = positions[i];
352
var el = kids[i];
353
el.style.position = 'absolute';
354
el.style.left = p.x + 'px';
355
el.style.top = p.y + 'px';
356
el.style.width = p.w + 'px';
357
var canvas = el.querySelector('canvas');
358
if (canvas)
359
{
360
canvas.style.width = p.canvasW + 'px';
361
canvas.style.height = p.canvasH + 'px';
362
}
363
}
364
}
365
366
function applyFlightsBackClip ()
367
{
368
var back = document.getElementById('flights-back');
369
if (!back)
370
{ return; }
371
var x = app.fieldX || 0;
372
var y = app.fieldY || 0;
373
var w = app.fieldW || 0;
374
var h = app.fieldH || 0;
375
if (!w || !h)
376
{
377
back.style.clipPath = '';
378
return;
379
}
380
// Even-odd polygon: full viewport with a hole over the player's field,
381
// so enemy-to-enemy arcs travel behind the field (t1125).
382
back.style.clipPath = 'polygon(evenodd, 0 0, 100% 0, 100% 100%, 0 100%, 0 0, '
383
+ x + 'px ' + y + 'px, ' + (x + w) + 'px ' + y + 'px, '
384
+ (x + w) + 'px ' + (y + h) + 'px, ' + x + 'px ' + (y + h) + 'px, '
385
+ x + 'px ' + y + 'px)';
386
}
387
281
388
function layoutIfNeeded ()
282
389
{
283
390
if (app.core && app.core.drag)
284
391
{ return; }
285
392
var vw = window.innerWidth || 320;
286
393
var vh = window.innerHeight || 480;
287
if (app._layoutVw === vw && app._layoutVh === vh && app.scene && app.tile)
394
var n = (app.online || app.offline) ? opponentCount() : 0;
395
if (app._layoutVw === vw && app._layoutVh === vh && app._layoutN === n
396
&& app.scene && app.tile)
288
397
{ return; }
289
398
layout();
290
399
}
@@ -295,8 +404,10 @@ function layout ()
295
404
{ return; }
296
405
var vw = window.innerWidth || 320;
297
406
var vh = window.innerHeight || 480;
407
var n = (app.online || app.offline) ? opponentCount() : 0;
298
408
app._layoutVw = vw;
299
409
app._layoutVh = vh;
410
app._layoutN = n;
300
411
var safeTop = 0;
301
412
try
302
413
{
@@ -305,30 +416,34 @@ function layout ()
305
416
}
306
417
catch (e) { /* ignore */ }
307
418
app.hudH = Math.max(56, Math.round(vh * 0.09) + safeTop);
308
app.miniH = 0;
309
if (app.online || app.offline)
310
{
311
var nBots = (app.battle && app.battle.bots) ? app.battle.bots.length : 2;
312
var share = nBots > 6 ? 0.26 : 0.20;
313
app.miniH = Math.min(nBots > 6 ? 180 : 150, Math.max(86, Math.round(vh * share)));
314
}
315
419
var margin = Math.max(6, Math.round(Math.min(vw, vh) * 0.015));
316
var availW = Math.max(80, vw - margin * 2);
317
var availH = Math.max(80, vh - app.hudH - app.miniH - margin);
318
app.tile = Math.max(14, Math.floor(Math.min(availW / 10, availH / 13)));
319
app.fieldW = app.tile * 10;
320
app.fieldH = app.tile * 13;
321
app.fieldX = Math.floor((vw - app.fieldW) / 2);
322
var topBand = app.hudH + app.miniH;
323
app.fieldY = topBand + Math.floor((vh - topBand - app.fieldH - margin / 2) / 2);
324
if (app.fieldY < topBand)
325
{ app.fieldY = topBand; }
326
var minis = document.getElementById('minis');
327
if (minis)
420
var plan;
421
if (typeof MiniLayout !== 'undefined' && MiniLayout.plan)
422
{ plan = MiniLayout.plan(vw, vh, n, app.hudH, margin); }
423
else
328
424
{
329
minis.style.top = app.hudH + 'px';
330
minis.style.maxHeight = app.miniH + 'px';
425
plan = {
426
mode: 'top',
427
tile: 14,
428
fieldW: 140,
429
fieldH: 182,
430
fieldX: Math.floor((vw - 140) / 2),
431
fieldY: app.hudH,
432
miniH: n > 0 ? 100 : 0,
433
mini: { w: 80, h: 104 },
434
positions: [],
435
n: n
436
};
331
437
}
438
app.miniLayout = plan;
439
app.miniH = plan.miniH;
440
app.tile = plan.tile;
441
app.fieldW = plan.fieldW;
442
app.fieldH = plan.fieldH;
443
app.fieldX = plan.fieldX;
444
app.fieldY = plan.fieldY;
445
applyMinisLayout();
446
applyFlightsBackClip();
332
447
333
448
if (app.scene)
334
449
{
@@ -1164,6 +1279,7 @@ function tickOnline (dt)
1164
1279
}
1165
1280
Online.tickFlights();
1166
1281
Online.renderMinis(document.getElementById('minis'));
1282
applyMinisLayout();
1167
1283
}
1168
1284
1169
1285
@@ -1242,7 +1358,8 @@ function tickOffline (dt)
1242
1358
y: s.y,
1243
1359
color: s.color,
1244
1360
startX: start.x,
1245
startY: start.y
1361
startY: start.y,
1362
from_id: s.from_id
1246
1363
};
1247
1364
}
1248
1365
Online.spawnFlights(result.flights, locals);
@@ -1356,16 +1473,20 @@ function miniViewportCenter (botId)
1356
1473
if (!el)
1357
1474
{ return { x: window.innerWidth / 2, y: 40 }; }
1358
1475
var rect = el.getBoundingClientRect();
1476
var plan = app.miniLayout;
1477
if (plan && plan.mode === 'sides')
1478
{
1479
var mid = plan.fieldX + plan.fieldW / 2;
1480
if (rect.left + rect.width / 2 < mid)
1481
{ return { x: rect.right, y: rect.top + rect.height / 2 }; }
1482
return { x: rect.left, y: rect.top + rect.height / 2 };
1483
}
1359
1484
return { x: rect.left + rect.width / 2, y: rect.bottom };
1360
1485
}
1361
1486
1362
1487
function offlineMiniSize (n)
1363
1488
{
1364
if (n >= 10)
1365
{ return { w: 40, h: 52 }; }
1366
if (n >= 6)
1367
{ return { w: 56, h: 73 }; }
1368
return { w: 80, h: 104 };
1489
return currentMiniSize();
1369
1490
}
1370
1491
1371
1492
function updateOfflineMinis (dt, force)
@@ -1428,6 +1549,7 @@ function renderOfflineMinis ()
1428
1549
if (!seen[id])
1429
1550
{ existing[id].remove(); }
1430
1551
}
1552
applyMinisLayout();
1431
1553
}
1432
1554
1433
1555
function buildColumnWarn ()
@@ -278,13 +278,122 @@ function placeTile (obj, col, y)278
obj.transform.size = { x: t, y: t };278
obj.transform.size = { x: t, y: t };279
}279
}280
280
281
function opponentCount ()282
{283
if (app.offline && app.battle && app.battle.bots)284
{ return app.battle.bots.length; }285
if (app.online && typeof Online !== 'undefined' && Online.opponents)286
{ return Online.opponents().length; }287
return 0;288
}289
290
function currentMiniSize ()291
{292
if (app.miniLayout && app.miniLayout.mini)293
{ return { w: app.miniLayout.mini.w, h: app.miniLayout.mini.h }; }294
var n = opponentCount();295
var mode = (app.miniLayout && app.miniLayout.mode) || 'top';296
if (typeof MiniLayout !== 'undefined' && MiniLayout.canvasSize)297
{ return MiniLayout.canvasSize(n, mode, 0); }298
if (n >= 10)299
{ return { w: 40, h: 52 }; }300
if (n >= 6)301
{ return { w: 56, h: 73 }; }302
return { w: 80, h: 104 };303
}304
305
function applyMinisContainer (plan)306
{307
var minis = document.getElementById('minis');308
if (!minis)309
{ return; }310
var n = plan ? plan.n : 0;311
minis.classList.toggle('crowded', n > 5);312
if (!plan || n === 0 || plan.mode !== 'sides')313
{314
minis.classList.remove('sides');315
minis.style.top = (app.hudH || 56) + 'px';316
minis.style.maxHeight = (plan && plan.miniH ? plan.miniH : 0) + 'px';317
minis.style.bottom = '';318
minis.style.left = '';319
minis.style.right = '';320
var kids = minis.querySelectorAll('.mini');321
for (var i = 0; i < kids.length; i++)322
{323
kids[i].style.left = '';324
kids[i].style.top = '';325
kids[i].style.width = '';326
kids[i].style.position = '';327
}328
return;329
}330
minis.classList.add('sides');331
minis.style.top = '0';332
minis.style.bottom = '0';333
minis.style.left = '0';334
minis.style.right = '0';335
minis.style.maxHeight = 'none';336
}337
338
function applyMinisLayout ()339
{340
var plan = app.miniLayout;341
var minis = document.getElementById('minis');342
if (!minis)343
{ return; }344
applyMinisContainer(plan);345
if (!plan || plan.mode !== 'sides')346
{ return; }347
var positions = plan.positions || [];348
var kids = minis.querySelectorAll('.mini');349
for (var i = 0; i < positions.length && i < kids.length; i++)350
{351
var p = positions[i];352
var el = kids[i];353
el.style.position = 'absolute';354
el.style.left = p.x + 'px';355
el.style.top = p.y + 'px';356
el.style.width = p.w + 'px';357
var canvas = el.querySelector('canvas');358
if (canvas)359
{360
canvas.style.width = p.canvasW + 'px';361
canvas.style.height = p.canvasH + 'px';362
}363
}364
}365
366
function applyFlightsBackClip ()367
{368
var back = document.getElementById('flights-back');369
if (!back)370
{ return; }371
var x = app.fieldX || 0;372
var y = app.fieldY || 0;373
var w = app.fieldW || 0;374
var h = app.fieldH || 0;375
if (!w || !h)376
{377
back.style.clipPath = '';378
return;379
}380
// Even-odd polygon: full viewport with a hole over the player's field,381
// so enemy-to-enemy arcs travel behind the field (t1125).382
back.style.clipPath = 'polygon(evenodd, 0 0, 100% 0, 100% 100%, 0 100%, 0 0, '383
+ x + 'px ' + y + 'px, ' + (x + w) + 'px ' + y + 'px, '384
+ (x + w) + 'px ' + (y + h) + 'px, ' + x + 'px ' + (y + h) + 'px, '385
+ x + 'px ' + y + 'px)';386
}387
281
function layoutIfNeeded ()388
function layoutIfNeeded ()282
{389
{283
if (app.core && app.core.drag)390
if (app.core && app.core.drag)284
{ return; }391
{ return; }285
var vw = window.innerWidth || 320;392
var vw = window.innerWidth || 320;286
var vh = window.innerHeight || 480;393
var vh = window.innerHeight || 480;287
if (app._layoutVw === vw && app._layoutVh === vh && app.scene && app.tile)394
var n = (app.online || app.offline) ? opponentCount() : 0;395
if (app._layoutVw === vw && app._layoutVh === vh && app._layoutN === n396
&& app.scene && app.tile)288
{ return; }397
{ return; }289
layout();398
layout();290
}399
}@@ -295,8 +404,10 @@ function layout ()295
{ return; }404
{ return; }296
var vw = window.innerWidth || 320;405
var vw = window.innerWidth || 320;297
var vh = window.innerHeight || 480;406
var vh = window.innerHeight || 480;407
var n = (app.online || app.offline) ? opponentCount() : 0;298
app._layoutVw = vw;408
app._layoutVw = vw;299
app._layoutVh = vh;409
app._layoutVh = vh;410
app._layoutN = n;300
var safeTop = 0;411
var safeTop = 0;301
try412
try302
{413
{@@ -305,30 +416,34 @@ function layout ()305
}416
}306
catch (e) { /* ignore */ }417
catch (e) { /* ignore */ }307
app.hudH = Math.max(56, Math.round(vh * 0.09) + safeTop);418
app.hudH = Math.max(56, Math.round(vh * 0.09) + safeTop);308
app.miniH = 0;309
if (app.online || app.offline)310
{311
var nBots = (app.battle && app.battle.bots) ? app.battle.bots.length : 2;312
var share = nBots > 6 ? 0.26 : 0.20;313
app.miniH = Math.min(nBots > 6 ? 180 : 150, Math.max(86, Math.round(vh * share)));314
}315
var margin = Math.max(6, Math.round(Math.min(vw, vh) * 0.015));419
var margin = Math.max(6, Math.round(Math.min(vw, vh) * 0.015));316
var availW = Math.max(80, vw - margin * 2);420
var plan;317
var availH = Math.max(80, vh - app.hudH - app.miniH - margin);421
if (typeof MiniLayout !== 'undefined' && MiniLayout.plan)318
app.tile = Math.max(14, Math.floor(Math.min(availW / 10, availH / 13)));422
{ plan = MiniLayout.plan(vw, vh, n, app.hudH, margin); }319
app.fieldW = app.tile * 10;423
else320
app.fieldH = app.tile * 13;321
app.fieldX = Math.floor((vw - app.fieldW) / 2);322
var topBand = app.hudH + app.miniH;323
app.fieldY = topBand + Math.floor((vh - topBand - app.fieldH - margin / 2) / 2);324
if (app.fieldY < topBand)325
{ app.fieldY = topBand; }326
var minis = document.getElementById('minis');327
if (minis)328
{424
{329
minis.style.top = app.hudH + 'px';425
plan = {330
minis.style.maxHeight = app.miniH + 'px';426
mode: 'top',427
tile: 14,428
fieldW: 140,429
fieldH: 182,430
fieldX: Math.floor((vw - 140) / 2),431
fieldY: app.hudH,432
miniH: n > 0 ? 100 : 0,433
mini: { w: 80, h: 104 },434
positions: [],435
n: n436
};331
}437
}438
app.miniLayout = plan;439
app.miniH = plan.miniH;440
app.tile = plan.tile;441
app.fieldW = plan.fieldW;442
app.fieldH = plan.fieldH;443
app.fieldX = plan.fieldX;444
app.fieldY = plan.fieldY;445
applyMinisLayout();446
applyFlightsBackClip();332
447
333
if (app.scene)448
if (app.scene)334
{449
{@@ -1164,6 +1279,7 @@ function tickOnline (dt)1164
}1279
}1165
Online.tickFlights();1280
Online.tickFlights();1166
Online.renderMinis(document.getElementById('minis'));1281
Online.renderMinis(document.getElementById('minis'));1282
applyMinisLayout();1167
}1283
}1168
1284
1169
1285
@@ -1242,7 +1358,8 @@ function tickOffline (dt)1242
y: s.y,1358
y: s.y,1243
color: s.color,1359
color: s.color,1244
startX: start.x,1360
startX: start.x,1245
startY: start.y1361
startY: start.y,1362
from_id: s.from_id1246
};1363
};1247
}1364
}1248
Online.spawnFlights(result.flights, locals);1365
Online.spawnFlights(result.flights, locals);@@ -1356,16 +1473,20 @@ function miniViewportCenter (botId)1356
if (!el)1473
if (!el)1357
{ return { x: window.innerWidth / 2, y: 40 }; }1474
{ return { x: window.innerWidth / 2, y: 40 }; }1358
var rect = el.getBoundingClientRect();1475
var rect = el.getBoundingClientRect();1476
var plan = app.miniLayout;1477
if (plan && plan.mode === 'sides')1478
{1479
var mid = plan.fieldX + plan.fieldW / 2;1480
if (rect.left + rect.width / 2 < mid)1481
{ return { x: rect.right, y: rect.top + rect.height / 2 }; }1482
return { x: rect.left, y: rect.top + rect.height / 2 };1483
}1359
return { x: rect.left + rect.width / 2, y: rect.bottom };1484
return { x: rect.left + rect.width / 2, y: rect.bottom };1360
}1485
}1361
1486
1362
function offlineMiniSize (n)1487
function offlineMiniSize (n)1363
{1488
{1364
if (n >= 10)1489
return currentMiniSize();1365
{ return { w: 40, h: 52 }; }1366
if (n >= 6)1367
{ return { w: 56, h: 73 }; }1368
return { w: 80, h: 104 };1369
}1490
}1370
1491
1371
function updateOfflineMinis (dt, force)1492
function updateOfflineMinis (dt, force)@@ -1428,6 +1549,7 @@ function renderOfflineMinis ()1428
if (!seen[id])1549
if (!seen[id])1429
{ existing[id].remove(); }1550
{ existing[id].remove(); }1430
}1551
}1552
applyMinisLayout();1431
}1553
}1432
1554
1433
function buildColumnWarn ()1555
function buildColumnWarn ()@@ -0,0 +1,171 @@
1
'use strict';
2
3
/**
4
* Opponent miniature layout for online and Offline Strijd (t1125).
5
* Wide screens: alternating left/right of the player's field, extra
6
* rows stacked upward. Narrow screens: a row (wrapping) above the field.
7
*/
8
9
var MiniLayout = (function ()
10
{
11
12
var GAP = 12;
13
var VGAP = 8;
14
var EDGE = 16;
15
var MIN_TILE_FOR_SIDES = 18;
16
var MIN_VIEWPORT_FOR_SIDES = 960;
17
var LABEL_H = 32;
18
19
function canvasSize (n, mode, availH)
20
{
21
n = n || 0;
22
if (mode === 'sides' && availH && n > 0)
23
{
24
var rows = Math.ceil(n / 2);
25
var maxOuter = Math.floor((availH - (rows - 1) * VGAP) / Math.max(1, rows));
26
var ch = Math.max(40, Math.min(104, maxOuter - LABEL_H));
27
var cw = Math.max(32, Math.round(ch * 10 / 13));
28
return {
29
w: cw,
30
h: ch,
31
outerW: Math.max(cw + 8, 64),
32
outerH: ch + LABEL_H
33
};
34
}
35
if (n >= 10)
36
{ return { w: 40, h: 52, outerW: 56, outerH: 52 + LABEL_H }; }
37
if (n >= 6)
38
{ return { w: 56, h: 73, outerW: 68, outerH: 73 + LABEL_H }; }
39
return { w: 80, h: 104, outerW: 90, outerH: 104 + LABEL_H };
40
}
41
42
function sidePositions (n, fieldX, fieldY, fieldW, fieldH, mini, hudH)
43
{
44
var positions = [];
45
if (n <= 0)
46
{ return positions; }
47
var rows = Math.ceil(n / 2);
48
var stackH = rows * mini.outerH + Math.max(0, rows - 1) * VGAP;
49
var bottom = fieldY + fieldH;
50
var top = bottom - stackH;
51
if (top < hudH + 4)
52
{
53
top = hudH + 4;
54
bottom = top + stackH;
55
}
56
for (var i = 0; i < n; i++)
57
{
58
var col = i % 2;
59
var row = Math.floor(i / 2);
60
var x = col === 0
61
? fieldX - GAP - mini.outerW
62
: fieldX + fieldW + GAP;
63
var y = bottom - (row + 1) * mini.outerH - row * VGAP;
64
positions.push({
65
index: i,
66
side: col === 0 ? 'left' : 'right',
67
row: row,
68
x: x,
69
y: y,
70
w: mini.outerW,
71
h: mini.outerH,
72
canvasW: mini.w,
73
canvasH: mini.h
74
});
75
}
76
return positions;
77
}
78
79
/**
80
* Compute the field and mini plan for a viewport.
81
* `n` is the number of opponents (0 = solo, no minis).
82
*/
83
function plan (vw, vh, n, hudH, margin)
84
{
85
vw = vw || 320;
86
vh = vh || 480;
87
n = n || 0;
88
hudH = hudH == null ? 56 : hudH;
89
margin = margin == null ? Math.max(6, Math.round(Math.min(vw, vh) * 0.015)) : margin;
90
91
function finish (mode, tile, fieldX, fieldY, miniH, mini, positions)
92
{
93
return {
94
mode: mode,
95
tile: tile,
96
fieldW: tile * 10,
97
fieldH: tile * 13,
98
fieldX: fieldX,
99
fieldY: fieldY,
100
miniH: miniH,
101
mini: mini,
102
positions: positions || [],
103
n: n
104
};
105
}
106
107
if (n > 0)
108
{
109
var availHSide = Math.max(80, vh - hudH - margin);
110
var probe = canvasSize(n, 'sides', availHSide);
111
var availWSide = Math.max(80, vw - margin * 2 - 2 * (probe.outerW + GAP));
112
var tileSide = Math.max(14, Math.floor(Math.min(availWSide / 10, availHSide / 13)));
113
var fieldWSide = tileSide * 10;
114
var fieldHSide = tileSide * 13;
115
var leftover = (vw - fieldWSide) / 2;
116
var need = probe.outerW + GAP + EDGE;
117
if (vw >= MIN_VIEWPORT_FOR_SIDES && leftover >= need
118
&& tileSide >= MIN_TILE_FOR_SIDES)
119
{
120
var fieldX = Math.floor((vw - fieldWSide) / 2);
121
var fieldY = hudH + Math.floor((availHSide - fieldHSide) / 2);
122
if (fieldY < hudH)
123
{ fieldY = hudH; }
124
return finish('sides', tileSide, fieldX, fieldY, 0, probe,
125
sidePositions(n, fieldX, fieldY, fieldWSide, fieldHSide, probe, hudH));
126
}
127
}
128
129
var miniTop = canvasSize(n, 'top', 0);
130
var miniH = 0;
131
if (n > 0)
132
{
133
var share = n > 6 ? 0.26 : 0.20;
134
miniH = Math.min(n > 6 ? 180 : 150, Math.max(86, Math.round(vh * share)));
135
}
136
var availW = Math.max(80, vw - margin * 2);
137
var availH = Math.max(80, vh - hudH - miniH - margin);
138
var tile = Math.max(14, Math.floor(Math.min(availW / 10, availH / 13)));
139
var fieldW = tile * 10;
140
var fieldH = tile * 13;
141
var fieldX = Math.floor((vw - fieldW) / 2);
142
var topBand = hudH + miniH;
143
var fieldY = topBand + Math.floor((vh - topBand - fieldH - margin / 2) / 2);
144
if (fieldY < topBand)
145
{ fieldY = topBand; }
146
return finish('top', tile, fieldX, fieldY, miniH, miniTop, []);
147
}
148
149
var api = {
150
GAP: GAP,
151
VGAP: VGAP,
152
EDGE: EDGE,
153
MIN_TILE_FOR_SIDES: MIN_TILE_FOR_SIDES,
154
MIN_VIEWPORT_FOR_SIDES: MIN_VIEWPORT_FOR_SIDES,
155
LABEL_H: LABEL_H,
156
canvasSize: canvasSize,
157
sidePositions: sidePositions,
158
plan: plan
159
};
160
161
if (typeof module !== 'undefined' && module.exports)
162
{ module.exports = api; }
163
else if (typeof globalThis !== 'undefined')
164
{ globalThis.MiniLayout = api; }
165
166
return api;
167
168
})();
169
170
if (typeof module !== 'undefined' && module.exports && typeof MiniLayout !== 'undefined')
171
{ module.exports = MiniLayout; }
@@ -0,0 +1,171 @@1
'use strict';2
3
/**4
* Opponent miniature layout for online and Offline Strijd (t1125).5
* Wide screens: alternating left/right of the player's field, extra6
* rows stacked upward. Narrow screens: a row (wrapping) above the field.7
*/8
9
var MiniLayout = (function ()10
{11
12
var GAP = 12;13
var VGAP = 8;14
var EDGE = 16;15
var MIN_TILE_FOR_SIDES = 18;16
var MIN_VIEWPORT_FOR_SIDES = 960;17
var LABEL_H = 32;18
19
function canvasSize (n, mode, availH)20
{21
n = n || 0;22
if (mode === 'sides' && availH && n > 0)23
{24
var rows = Math.ceil(n / 2);25
var maxOuter = Math.floor((availH - (rows - 1) * VGAP) / Math.max(1, rows));26
var ch = Math.max(40, Math.min(104, maxOuter - LABEL_H));27
var cw = Math.max(32, Math.round(ch * 10 / 13));28
return {29
w: cw,30
h: ch,31
outerW: Math.max(cw + 8, 64),32
outerH: ch + LABEL_H33
};34
}35
if (n >= 10)36
{ return { w: 40, h: 52, outerW: 56, outerH: 52 + LABEL_H }; }37
if (n >= 6)38
{ return { w: 56, h: 73, outerW: 68, outerH: 73 + LABEL_H }; }39
return { w: 80, h: 104, outerW: 90, outerH: 104 + LABEL_H };40
}41
42
function sidePositions (n, fieldX, fieldY, fieldW, fieldH, mini, hudH)43
{44
var positions = [];45
if (n <= 0)46
{ return positions; }47
var rows = Math.ceil(n / 2);48
var stackH = rows * mini.outerH + Math.max(0, rows - 1) * VGAP;49
var bottom = fieldY + fieldH;50
var top = bottom - stackH;51
if (top < hudH + 4)52
{53
top = hudH + 4;54
bottom = top + stackH;55
}56
for (var i = 0; i < n; i++)57
{58
var col = i % 2;59
var row = Math.floor(i / 2);60
var x = col === 061
? fieldX - GAP - mini.outerW62
: fieldX + fieldW + GAP;63
var y = bottom - (row + 1) * mini.outerH - row * VGAP;64
positions.push({65
index: i,66
side: col === 0 ? 'left' : 'right',67
row: row,68
x: x,69
y: y,70
w: mini.outerW,71
h: mini.outerH,72
canvasW: mini.w,73
canvasH: mini.h74
});75
}76
return positions;77
}78
79
/**80
* Compute the field and mini plan for a viewport.81
* `n` is the number of opponents (0 = solo, no minis).82
*/83
function plan (vw, vh, n, hudH, margin)84
{85
vw = vw || 320;86
vh = vh || 480;87
n = n || 0;88
hudH = hudH == null ? 56 : hudH;89
margin = margin == null ? Math.max(6, Math.round(Math.min(vw, vh) * 0.015)) : margin;90
91
function finish (mode, tile, fieldX, fieldY, miniH, mini, positions)92
{93
return {94
mode: mode,95
tile: tile,96
fieldW: tile * 10,97
fieldH: tile * 13,98
fieldX: fieldX,99
fieldY: fieldY,100
miniH: miniH,101
mini: mini,102
positions: positions || [],103
n: n104
};105
}106
107
if (n > 0)108
{109
var availHSide = Math.max(80, vh - hudH - margin);110
var probe = canvasSize(n, 'sides', availHSide);111
var availWSide = Math.max(80, vw - margin * 2 - 2 * (probe.outerW + GAP));112
var tileSide = Math.max(14, Math.floor(Math.min(availWSide / 10, availHSide / 13)));113
var fieldWSide = tileSide * 10;114
var fieldHSide = tileSide * 13;115
var leftover = (vw - fieldWSide) / 2;116
var need = probe.outerW + GAP + EDGE;117
if (vw >= MIN_VIEWPORT_FOR_SIDES && leftover >= need118
&& tileSide >= MIN_TILE_FOR_SIDES)119
{120
var fieldX = Math.floor((vw - fieldWSide) / 2);121
var fieldY = hudH + Math.floor((availHSide - fieldHSide) / 2);122
if (fieldY < hudH)123
{ fieldY = hudH; }124
return finish('sides', tileSide, fieldX, fieldY, 0, probe,125
sidePositions(n, fieldX, fieldY, fieldWSide, fieldHSide, probe, hudH));126
}127
}128
129
var miniTop = canvasSize(n, 'top', 0);130
var miniH = 0;131
if (n > 0)132
{133
var share = n > 6 ? 0.26 : 0.20;134
miniH = Math.min(n > 6 ? 180 : 150, Math.max(86, Math.round(vh * share)));135
}136
var availW = Math.max(80, vw - margin * 2);137
var availH = Math.max(80, vh - hudH - miniH - margin);138
var tile = Math.max(14, Math.floor(Math.min(availW / 10, availH / 13)));139
var fieldW = tile * 10;140
var fieldH = tile * 13;141
var fieldX = Math.floor((vw - fieldW) / 2);142
var topBand = hudH + miniH;143
var fieldY = topBand + Math.floor((vh - topBand - fieldH - margin / 2) / 2);144
if (fieldY < topBand)145
{ fieldY = topBand; }146
return finish('top', tile, fieldX, fieldY, miniH, miniTop, []);147
}148
149
var api = {150
GAP: GAP,151
VGAP: VGAP,152
EDGE: EDGE,153
MIN_TILE_FOR_SIDES: MIN_TILE_FOR_SIDES,154
MIN_VIEWPORT_FOR_SIDES: MIN_VIEWPORT_FOR_SIDES,155
LABEL_H: LABEL_H,156
canvasSize: canvasSize,157
sidePositions: sidePositions,158
plan: plan159
};160
161
if (typeof module !== 'undefined' && module.exports)162
{ module.exports = api; }163
else if (typeof globalThis !== 'undefined')164
{ globalThis.MiniLayout = api; }165
166
return api;167
168
})();169
170
if (typeof module !== 'undefined' && module.exports && typeof MiniLayout !== 'undefined')171
{ module.exports = MiniLayout; }@@ -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 flights207
// (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.mini307
: { 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.eliminated321
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
312
var MINI_COLORS = ['#d4553a', '#3a9ad4', '#4caf6a', '#e6c04a', '#b86ad4'];335
var 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 after424
* startX, startY} in viewport pixels, filled by the view just after402
* consumeOutgoingShots.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 the462
* 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-cell530
* to full tile (or the reverse). Enemy-to-enemy arcs stay small and531
* are drawn behind the player's field. Delivery timing is unchanged;532
* a late-seen flight starts mid-arc via `age`.533
*/404
Online.spawnFlights = function (results, locals)534
Online.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
else568
{ 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
else576
{ 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
else603
else420
{ 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 = miss625
? 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() * 360637
kind: kind,638
startScale: startScale,639
endScale: endScale,640
angle: Math.random() * 360,641
id: sid438
});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: startY656
startY: startY,657
from_id: shot.from_id453
};658
};454
};659
};455
660
456
Online._flightStart = function (col)661
Online._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 + 4671
y: rect.top + 4468
};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
489
Online._missEnd = function (start)695
Online._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
else704
{ 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
Online._missCtrl = function (start, end)709
Online._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
else751
{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
543
Online.clearFlights = function ()781
Online.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
555
if (typeof globalThis !== 'undefined')794
if (typeof globalThis !== 'undefined')@@ -0,0 +1,120 @@
1
'use strict';
2
3
const { describe, it } = require('node:test');
4
const assert = require('node:assert/strict');
5
const MiniLayout = require('../src/miniLayout.js');
6
const Online = require('../src/online.js');
7
8
describe('MiniLayout (t1125)', () =>
9
{
10
it('uses sides on a wide desktop and top on a narrow one', () =>
11
{
12
const wide = MiniLayout.plan(1280, 900, 2, 70, 8);
13
assert.equal(wide.mode, 'sides', '1280×900 with 2 opponents is sides');
14
assert.ok(wide.tile >= MiniLayout.MIN_TILE_FOR_SIDES, 'tiles stay large enough');
15
assert.equal(wide.miniH, 0, 'sides mode does not reserve a top band');
16
assert.equal(wide.positions.length, 2);
17
18
const justUnder = MiniLayout.plan(MiniLayout.MIN_VIEWPORT_FOR_SIDES - 1, 900, 2, 70, 8);
19
assert.equal(justUnder.mode, 'top', 'just under 960 px stays on top');
20
const narrow = MiniLayout.plan(720, 800, 2, 70, 8);
21
assert.equal(narrow.mode, 'top', '720-wide keeps the top row');
22
assert.ok(narrow.miniH > 0, 'top mode reserves height above the field');
23
assert.equal(narrow.positions.length, 0);
24
25
const mobile = MiniLayout.plan(393, 851, 1, 60, 6);
26
assert.equal(mobile.mode, 'top', 'phone stays on the top layout');
27
});
28
29
it('alternates first left, second right, third left, and stacks upward', () =>
30
{
31
const plan = MiniLayout.plan(1400, 900, 6, 70, 8);
32
assert.equal(plan.mode, 'sides');
33
assert.equal(plan.positions.length, 6);
34
const sides = plan.positions.map(p => p.side);
35
assert.deepEqual(sides, ['left', 'right', 'left', 'right', 'left', 'right']);
36
const rows = plan.positions.map(p => p.row);
37
assert.deepEqual(rows, [0, 0, 1, 1, 2, 2]);
38
39
// Lowest row aligns with (or near) the field bottom; higher rows go up.
40
const lefts = plan.positions.filter(p => p.side === 'left');
41
assert.ok(lefts[0].y + lefts[0].h <= plan.fieldY + plan.fieldH + 2,
42
'first row sits at the field bottom');
43
assert.ok(lefts[1].y < lefts[0].y, 'second row is above the first');
44
assert.ok(lefts[2].y < lefts[1].y, 'third row is above the second');
45
// Same x for a column
46
assert.equal(lefts[0].x, lefts[1].x);
47
assert.ok(lefts[0].x + lefts[0].w <= plan.fieldX - MiniLayout.GAP + 0.5);
48
const rights = plan.positions.filter(p => p.side === 'right');
49
assert.ok(rights[0].x >= plan.fieldX + plan.fieldW + MiniLayout.GAP - 0.5);
50
});
51
52
it('shrinks minis so stacked rows stay under the HUD', () =>
53
{
54
const plan = MiniLayout.plan(1400, 800, 12, 70, 8);
55
assert.equal(plan.mode, 'sides');
56
for (const p of plan.positions)
57
{
58
assert.ok(p.y >= 70 + 3, 'mini top stays below the HUD, y=' + p.y);
59
assert.ok(p.canvasH >= 40, 'minis do not shrink below a readable size');
60
}
61
});
62
63
it('solo (n=0) never reserves minis', () =>
64
{
65
const plan = MiniLayout.plan(1280, 900, 0, 70, 8);
66
assert.equal(plan.mode, 'top');
67
assert.equal(plan.miniH, 0);
68
assert.equal(plan.positions.length, 0);
69
});
70
});
71
72
describe('Online flight visuals (t1125)', () =>
73
{
74
it('classifies player, enemy, and miss kinds', () =>
75
{
76
const orig = Online.playerId;
77
Online.playerId = function () { return 'player'; };
78
try
79
{
80
assert.equal(Online.flightKind('player', 'bot-1', false), 'player-to-enemy');
81
assert.equal(Online.flightKind('bot-1', 'player', false), 'enemy-to-player');
82
assert.equal(Online.flightKind('bot-1', 'bot-2', false), 'enemy-to-enemy');
83
assert.equal(Online.flightKind('player', null, true), 'player-miss');
84
assert.equal(Online.flightKind('bot-1', null, true), 'enemy-miss');
85
assert.equal(Online.flightKind('bot-3', 'player', false), 'enemy-to-player');
86
}
87
finally
88
{ Online.playerId = orig; }
89
});
90
91
it('arc is a parabola that peaks at mid-flight above the chord', () =>
92
{
93
const start = { x: 0, y: 200 };
94
const end = { x: 100, y: 200 };
95
const h = 80;
96
const mid = Online.arcPoint(start, end, 0.5, h);
97
assert.equal(mid.x, 50);
98
// 4*h*t*(1-t) at t=0.5 is h, so y = 200 - 80
99
assert.equal(mid.y, 120);
100
const a = Online.arcPoint(start, end, 0, h);
101
const b = Online.arcPoint(start, end, 1, h);
102
assert.deepEqual(a, start);
103
assert.deepEqual(b, end);
104
// Symmetric and always above (smaller y) the chord
105
const q1 = Online.arcPoint(start, end, 0.25, h);
106
const q3 = Online.arcPoint(start, end, 0.75, h);
107
assert.equal(q1.y, q3.y);
108
assert.ok(q1.y < 200 && mid.y < q1.y);
109
});
110
111
it('arc height scales with distance, clamped', () =>
112
{
113
const short = Online.arcHeight({ x: 0, y: 0 }, { x: 10, y: 0 });
114
const long = Online.arcHeight({ x: 0, y: 0 }, { x: 2000, y: 0 });
115
assert.equal(short, 48);
116
assert.equal(long, 220);
117
const mid = Online.arcHeight({ x: 0, y: 0 }, { x: 400, y: 0 });
118
assert.ok(Math.abs(mid - 400 * 0.28) < 1e-9);
119
});
120
});
@@ -0,0 +1,120 @@1
'use strict';2
3
const { describe, it } = require('node:test');4
const assert = require('node:assert/strict');5
const MiniLayout = require('../src/miniLayout.js');6
const Online = require('../src/online.js');7
8
describe('MiniLayout (t1125)', () =>9
{10
it('uses sides on a wide desktop and top on a narrow one', () =>11
{12
const wide = MiniLayout.plan(1280, 900, 2, 70, 8);13
assert.equal(wide.mode, 'sides', '1280×900 with 2 opponents is sides');14
assert.ok(wide.tile >= MiniLayout.MIN_TILE_FOR_SIDES, 'tiles stay large enough');15
assert.equal(wide.miniH, 0, 'sides mode does not reserve a top band');16
assert.equal(wide.positions.length, 2);17
18
const justUnder = MiniLayout.plan(MiniLayout.MIN_VIEWPORT_FOR_SIDES - 1, 900, 2, 70, 8);19
assert.equal(justUnder.mode, 'top', 'just under 960 px stays on top');20
const narrow = MiniLayout.plan(720, 800, 2, 70, 8);21
assert.equal(narrow.mode, 'top', '720-wide keeps the top row');22
assert.ok(narrow.miniH > 0, 'top mode reserves height above the field');23
assert.equal(narrow.positions.length, 0);24
25
const mobile = MiniLayout.plan(393, 851, 1, 60, 6);26
assert.equal(mobile.mode, 'top', 'phone stays on the top layout');27
});28
29
it('alternates first left, second right, third left, and stacks upward', () =>30
{31
const plan = MiniLayout.plan(1400, 900, 6, 70, 8);32
assert.equal(plan.mode, 'sides');33
assert.equal(plan.positions.length, 6);34
const sides = plan.positions.map(p => p.side);35
assert.deepEqual(sides, ['left', 'right', 'left', 'right', 'left', 'right']);36
const rows = plan.positions.map(p => p.row);37
assert.deepEqual(rows, [0, 0, 1, 1, 2, 2]);38
39
// Lowest row aligns with (or near) the field bottom; higher rows go up.40
const lefts = plan.positions.filter(p => p.side === 'left');41
assert.ok(lefts[0].y + lefts[0].h <= plan.fieldY + plan.fieldH + 2,42
'first row sits at the field bottom');43
assert.ok(lefts[1].y < lefts[0].y, 'second row is above the first');44
assert.ok(lefts[2].y < lefts[1].y, 'third row is above the second');45
// Same x for a column46
assert.equal(lefts[0].x, lefts[1].x);47
assert.ok(lefts[0].x + lefts[0].w <= plan.fieldX - MiniLayout.GAP + 0.5);48
const rights = plan.positions.filter(p => p.side === 'right');49
assert.ok(rights[0].x >= plan.fieldX + plan.fieldW + MiniLayout.GAP - 0.5);50
});51
52
it('shrinks minis so stacked rows stay under the HUD', () =>53
{54
const plan = MiniLayout.plan(1400, 800, 12, 70, 8);55
assert.equal(plan.mode, 'sides');56
for (const p of plan.positions)57
{58
assert.ok(p.y >= 70 + 3, 'mini top stays below the HUD, y=' + p.y);59
assert.ok(p.canvasH >= 40, 'minis do not shrink below a readable size');60
}61
});62
63
it('solo (n=0) never reserves minis', () =>64
{65
const plan = MiniLayout.plan(1280, 900, 0, 70, 8);66
assert.equal(plan.mode, 'top');67
assert.equal(plan.miniH, 0);68
assert.equal(plan.positions.length, 0);69
});70
});71
72
describe('Online flight visuals (t1125)', () =>73
{74
it('classifies player, enemy, and miss kinds', () =>75
{76
const orig = Online.playerId;77
Online.playerId = function () { return 'player'; };78
try79
{80
assert.equal(Online.flightKind('player', 'bot-1', false), 'player-to-enemy');81
assert.equal(Online.flightKind('bot-1', 'player', false), 'enemy-to-player');82
assert.equal(Online.flightKind('bot-1', 'bot-2', false), 'enemy-to-enemy');83
assert.equal(Online.flightKind('player', null, true), 'player-miss');84
assert.equal(Online.flightKind('bot-1', null, true), 'enemy-miss');85
assert.equal(Online.flightKind('bot-3', 'player', false), 'enemy-to-player');86
}87
finally88
{ Online.playerId = orig; }89
});90
91
it('arc is a parabola that peaks at mid-flight above the chord', () =>92
{93
const start = { x: 0, y: 200 };94
const end = { x: 100, y: 200 };95
const h = 80;96
const mid = Online.arcPoint(start, end, 0.5, h);97
assert.equal(mid.x, 50);98
// 4*h*t*(1-t) at t=0.5 is h, so y = 200 - 8099
assert.equal(mid.y, 120);100
const a = Online.arcPoint(start, end, 0, h);101
const b = Online.arcPoint(start, end, 1, h);102
assert.deepEqual(a, start);103
assert.deepEqual(b, end);104
// Symmetric and always above (smaller y) the chord105
const q1 = Online.arcPoint(start, end, 0.25, h);106
const q3 = Online.arcPoint(start, end, 0.75, h);107
assert.equal(q1.y, q3.y);108
assert.ok(q1.y < 200 && mid.y < q1.y);109
});110
111
it('arc height scales with distance, clamped', () =>112
{113
const short = Online.arcHeight({ x: 0, y: 0 }, { x: 10, y: 0 });114
const long = Online.arcHeight({ x: 0, y: 0 }, { x: 2000, y: 0 });115
assert.equal(short, 48);116
assert.equal(long, 220);117
const mid = Online.arcHeight({ x: 0, y: 0 }, { x: 400, y: 0 });118
assert.ok(Math.abs(mid - 400 * 0.28) < 1e-9);119
});120
});@@ -0,0 +1,317 @@
1
#!/usr/bin/env python3
2
"""Layout and flight-arc visuals for t1125 (wide / narrow / mobile)."""
3
from __future__ import annotations
4
5
import socket
6
import subprocess
7
import sys
8
import time
9
from pathlib import Path
10
11
from playwright.sync_api import sync_playwright
12
13
ROOT = Path("/workspace/meteors")
14
OUT = Path("/workspace/meteors-shots")
15
OUT.mkdir(parents=True, exist_ok=True)
16
CHROME = "/usr/bin/google-chrome"
17
CHROME_ARGS = [
18
"--use-gl=angle",
19
"--use-angle=swiftshader",
20
"--no-sandbox",
21
"--disable-dev-shm-usage",
22
"--disable-gpu-sandbox",
23
]
24
FAILURES = []
25
26
27
def free_port():
28
s = socket.socket()
29
s.bind(("127.0.0.1", 0))
30
port = s.getsockname()[1]
31
s.close()
32
return port
33
34
35
def check(cond, msg):
36
if not cond:
37
FAILURES.append(msg)
38
print("FAIL", msg)
39
else:
40
print("OK ", msg)
41
return cond
42
43
44
def shot(page, name):
45
path = OUT / name
46
page.screenshot(path=str(path), full_page=False)
47
print(f"wrote {path} ({path.stat().st_size} bytes)")
48
return path
49
50
51
def start_http(port):
52
proc = subprocess.Popen(
53
["python3", "-m", "http.server", str(port), "--bind", "127.0.0.1",
54
"--directory", str(ROOT / "build")],
55
stdout=subprocess.DEVNULL,
56
stderr=subprocess.DEVNULL,
57
)
58
time.sleep(0.35)
59
if proc.poll() is not None:
60
raise RuntimeError("http.server failed to start")
61
return proc
62
63
64
def open_offline(page, url, round_n=1):
65
page.goto(url, wait_until="domcontentloaded", timeout=15000)
66
page.wait_for_timeout(400)
67
page.locator("#btn-offline").click()
68
page.wait_for_selector("#planet-select:not([hidden])", timeout=8000)
69
page.locator("#btn-planet-go").click()
70
page.wait_for_function(
71
"() => app && app.mode === 'playing' && app.offline && app.battle && app.core",
72
timeout=10000,
73
)
74
if round_n != 1:
75
page.evaluate(
76
"""(round) => {
77
teardownPlay();
78
startPlay({ planet: app.planet, offline: true, round: round });
79
}""",
80
round_n,
81
)
82
page.wait_for_function(
83
"() => app && app.mode === 'playing' && app.battle && app.miniLayout",
84
timeout=8000,
85
)
86
page.wait_for_timeout(250)
87
88
89
LAYOUT_INFO = """() => {
90
const plan = app.miniLayout || {};
91
const fieldEl = app.scene && app.scene.canvas;
92
const fr = fieldEl ? fieldEl.getBoundingClientRect() : null;
93
const minis = [...document.querySelectorAll('#minis .mini')].map((el) => {
94
const r = el.getBoundingClientRect();
95
const c = el.querySelector('canvas');
96
const cr = c ? c.getBoundingClientRect() : r;
97
return {
98
id: el.getAttribute('data-player'),
99
left: r.left, right: r.right, top: r.top, bottom: r.bottom,
100
cx: cr.left + cr.width / 2,
101
cy: cr.top + cr.height / 2
102
};
103
});
104
return {
105
mode: plan.mode,
106
sidesClass: document.getElementById('minis').classList.contains('sides'),
107
n: plan.n,
108
field: fr ? { left: fr.left, right: fr.right, top: fr.top, bottom: fr.bottom,
109
x: app.fieldX, y: app.fieldY, w: app.fieldW, h: app.fieldH } : null,
110
positions: plan.positions || [],
111
minis,
112
tile: app.tile,
113
vw: window.innerWidth,
114
vh: window.innerHeight
115
};
116
}"""
117
118
119
INJECT_FLIGHTS = """() => {
120
const plan = app.miniLayout;
121
const field = app.scene.canvas.getBoundingClientRect();
122
const minis = [...document.querySelectorAll('#minis .mini')];
123
function anchor(id, inner) {
124
const el = document.querySelector('#minis .mini[data-player=\"' + id + '\"] canvas');
125
if (!el) return { x: 80, y: 80 };
126
const r = el.getBoundingClientRect();
127
if (plan && plan.mode === 'sides') {
128
const mid = field.left + field.width / 2;
129
const left = (r.left + r.width / 2) < mid;
130
if (inner) return { x: left ? r.right : r.left, y: r.top + r.height / 2 };
131
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };
132
}
133
return { x: r.left + r.width / 2, y: inner ? r.bottom : r.top };
134
}
135
const bots = (app.battle.bots || []).map(b => b.id);
136
const a = bots[0] || 'bot-1';
137
const b = bots[1] || bots[0] || 'bot-2';
138
const pStart = {
139
x: field.left + field.width / 2,
140
y: field.top + 4
141
};
142
if (typeof Online.clearFlights === 'function') Online.clearFlights();
143
const flights = [
144
{ id: 'vis-p2e', client_id: 'vis-p2e', from_id: 'player', target_id: a, miss: false, color: 0, flight_duration: 1.2, age: 0.55 },
145
{ id: 'vis-e2p', client_id: 'vis-e2p', from_id: a, target_id: 'player', miss: false, color: 1, flight_duration: 1.2, age: 0.55 },
146
{ id: 'vis-e2e', client_id: 'vis-e2e', from_id: a, target_id: b, miss: false, color: 2, flight_duration: 1.2, age: 0.55 },
147
{ id: 'vis-emiss', client_id: 'vis-emiss', from_id: b, target_id: null, miss: true, color: 3, flight_duration: 1.2, age: 0.45 }
148
];
149
const aOut = anchor(a, true);
150
const bOut = anchor(b, true);
151
const locals = {
152
'vis-p2e': { from_id: 'player', color: 0, startX: pStart.x, startY: pStart.y, col: 4 },
153
'vis-e2p': { from_id: a, color: 1, startX: aOut.x, startY: aOut.y },
154
'vis-e2e': { from_id: a, color: 2, startX: aOut.x, startY: aOut.y },
155
'vis-emiss': { from_id: b, color: 3, startX: bOut.x, startY: bOut.y }
156
};
157
Online.spawnFlights(flights, locals);
158
Online.tickFlights();
159
const front = [...document.querySelectorAll('#flights .flight')].map(el => ({
160
cls: el.className,
161
transform: el.style.transform,
162
opacity: el.style.opacity,
163
parent: 'front'
164
}));
165
const back = [...document.querySelectorAll('#flights-back .flight')].map(el => ({
166
cls: el.className,
167
transform: el.style.transform,
168
opacity: el.style.opacity,
169
parent: 'back'
170
}));
171
return {
172
front: front.length,
173
back: back.length,
174
kinds: (Online._flights || []).map(f => ({
175
kind: f.kind, miss: f.miss,
176
startScale: f.startScale, endScale: f.endScale,
177
parent: (f.el && f.el.parentElement && f.el.parentElement.id) || ''
178
}))
179
};
180
}"""
181
182
183
def assert_sides(info, tag, expect_rows=False):
184
check(info["mode"] == "sides", f"{tag}: mode is sides (got {info['mode']})")
185
check(info["sidesClass"], f"{tag}: #minis has .sides")
186
field = info["field"]
187
minis = info["minis"]
188
check(len(minis) >= 1, f"{tag}: at least one mini ({len(minis)})")
189
if not field or not minis:
190
return
191
for i, m in enumerate(minis):
192
if i % 2 == 0:
193
check(m["right"] <= field["left"] + 2,
194
f"{tag}: mini {i} ({m['id']}) is on the left of the field "
195
f"(right={m['right']:.1f} field.left={field['left']:.1f})")
196
else:
197
check(m["left"] >= field["right"] - 2,
198
f"{tag}: mini {i} ({m['id']}) is on the right of the field "
199
f"(left={m['left']:.1f} field.right={field['right']:.1f})")
200
check(m["bottom"] <= field["bottom"] + 8,
201
f"{tag}: mini {i} does not hang below the field")
202
check(m["top"] >= 50,
203
f"{tag}: mini {i} stays under the HUD (top={m['top']:.1f})")
204
if expect_rows and len(minis) >= 3:
205
# 3rd (index 2) is left, stacked above the first
206
check(minis[2]["bottom"] <= minis[0]["top"] + 4,
207
f"{tag}: third mini is stacked above the first "
208
f"(b={minis[2]['bottom']:.1f} vs top={minis[0]['top']:.1f})")
209
210
211
def assert_top(info, tag):
212
check(info["mode"] == "top", f"{tag}: mode is top (got {info['mode']})")
213
check(not info["sidesClass"], f"{tag}: #minis is not .sides")
214
field = info["field"]
215
minis = info["minis"]
216
check(len(minis) >= 1, f"{tag}: at least one mini")
217
if not field or not minis:
218
return
219
for i, m in enumerate(minis):
220
check(m["bottom"] <= field["top"] + 12,
221
f"{tag}: mini {i} sits above the field "
222
f"(bottom={m['bottom']:.1f} field.top={field['top']:.1f})")
223
224
225
def assert_flights(info, tag, expect_behind=True):
226
check(info["front"] >= 3, f"{tag}: front flights present ({info['front']})")
227
kinds = {k["kind"]: k for k in info["kinds"]}
228
check("player-to-enemy" in kinds, f"{tag}: player-to-enemy")
229
check("enemy-to-player" in kinds, f"{tag}: enemy-to-player")
230
check("enemy-miss" in kinds, f"{tag}: enemy-miss")
231
if "player-to-enemy" in kinds:
232
k = kinds["player-to-enemy"]
233
check(k["startScale"] > k["endScale"],
234
f"{tag}: player-to-enemy shrinks ({k['startScale']:.2f}→{k['endScale']:.2f})")
235
if "enemy-to-player" in kinds:
236
k = kinds["enemy-to-player"]
237
check(k["endScale"] > k["startScale"],
238
f"{tag}: enemy-to-player grows ({k['startScale']:.2f}→{k['endScale']:.2f})")
239
if "enemy-to-enemy" in kinds:
240
k = kinds["enemy-to-enemy"]
241
check(abs(k["startScale"] - k["endScale"]) < 0.05,
242
f"{tag}: enemy-to-enemy stays small ({k['startScale']:.2f})")
243
check(k["parent"] == "flights-back",
244
f"{tag}: enemy-to-enemy is in #flights-back (got {k['parent']})")
245
if expect_behind:
246
check(info["back"] >= 1, f"{tag}: at least one behind-field flight")
247
if "enemy-miss" in kinds:
248
k = kinds["enemy-miss"]
249
check(k["startScale"] < 0.7,
250
f"{tag}: enemy-miss starts small ({k['startScale']:.2f})")
251
check(k["parent"] == "flights",
252
f"{tag}: enemy-miss is in #flights (got {k['parent']})")
253
254
255
def run_viewport(browser, url, name, width, height, is_mobile, round_n, expect_mode):
256
context = browser.new_context(
257
viewport={"width": width, "height": height},
258
device_scale_factor=1,
259
is_mobile=is_mobile,
260
has_touch=is_mobile,
261
)
262
page = context.new_page()
263
open_offline(page, url, round_n=round_n)
264
page.wait_for_timeout(300)
265
info = page.evaluate(LAYOUT_INFO)
266
print(f"--- {name} layout:", {k: info[k] for k in ('mode', 'n', 'tile', 'vw', 'vh', 'sidesClass')})
267
if expect_mode == "sides":
268
assert_sides(info, name, expect_rows=(round_n >= 12))
269
else:
270
assert_top(info, name)
271
shot(page, f"t1125-{name}-layout.png")
272
273
flights = page.evaluate(INJECT_FLIGHTS)
274
print(f"--- {name} flights:", flights)
275
assert_flights(flights, name)
276
shot(page, f"t1125-{name}-flights.png")
277
context.close()
278
279
280
def main():
281
port = free_port()
282
http = start_http(port)
283
url = f"http://127.0.0.1:{port}/"
284
try:
285
with sync_playwright() as p:
286
browser = p.chromium.launch(
287
executable_path=CHROME,
288
args=CHROME_ARGS,
289
headless=True,
290
)
291
# Desktop wide: 2 opponents (round 2) alternating L/R
292
run_viewport(browser, url, "desktop-wide", 1280, 900, False, 2, "sides")
293
# Many opponents, stacked rows (round 25 → 8 bots)
294
run_viewport(browser, url, "desktop-wide-many", 1400, 900, False, 25, "sides")
295
# Desktop narrow: top layout
296
run_viewport(browser, url, "desktop-narrow", 720, 800, False, 2, "top")
297
# Mobile
298
run_viewport(browser, url, "mobile", 393, 851, True, 2, "top")
299
browser.close()
300
finally:
301
http.terminate()
302
try:
303
http.wait(timeout=3)
304
except subprocess.TimeoutExpired:
305
http.kill()
306
307
if FAILURES:
308
print(f"\n{len(FAILURES)} failure(s):")
309
for f in FAILURES:
310
print(" -", f)
311
return 1
312
print("\nall minis/flights checks passed")
313
return 0
314
315
316
if __name__ == "__main__":
317
sys.exit(main())
@@ -0,0 +1,317 @@1
#!/usr/bin/env python32
"""Layout and flight-arc visuals for t1125 (wide / narrow / mobile)."""3
from __future__ import annotations4
5
import socket6
import subprocess7
import sys8
import time9
from pathlib import Path10
11
from playwright.sync_api import sync_playwright12
13
ROOT = Path("/workspace/meteors")14
OUT = Path("/workspace/meteors-shots")15
OUT.mkdir(parents=True, exist_ok=True)16
CHROME = "/usr/bin/google-chrome"17
CHROME_ARGS = [18
"--use-gl=angle",19
"--use-angle=swiftshader",20
"--no-sandbox",21
"--disable-dev-shm-usage",22
"--disable-gpu-sandbox",23
]24
FAILURES = []25
26
27
def free_port():28
s = socket.socket()29
s.bind(("127.0.0.1", 0))30
port = s.getsockname()[1]31
s.close()32
return port33
34
35
def check(cond, msg):36
if not cond:37
FAILURES.append(msg)38
print("FAIL", msg)39
else:40
print("OK ", msg)41
return cond42
43
44
def shot(page, name):45
path = OUT / name46
page.screenshot(path=str(path), full_page=False)47
print(f"wrote {path} ({path.stat().st_size} bytes)")48
return path49
50
51
def start_http(port):52
proc = subprocess.Popen(53
["python3", "-m", "http.server", str(port), "--bind", "127.0.0.1",54
"--directory", str(ROOT / "build")],55
stdout=subprocess.DEVNULL,56
stderr=subprocess.DEVNULL,57
)58
time.sleep(0.35)59
if proc.poll() is not None:60
raise RuntimeError("http.server failed to start")61
return proc62
63
64
def open_offline(page, url, round_n=1):65
page.goto(url, wait_until="domcontentloaded", timeout=15000)66
page.wait_for_timeout(400)67
page.locator("#btn-offline").click()68
page.wait_for_selector("#planet-select:not([hidden])", timeout=8000)69
page.locator("#btn-planet-go").click()70
page.wait_for_function(71
"() => app && app.mode === 'playing' && app.offline && app.battle && app.core",72
timeout=10000,73
)74
if round_n != 1:75
page.evaluate(76
"""(round) => {77
teardownPlay();78
startPlay({ planet: app.planet, offline: true, round: round });79
}""",80
round_n,81
)82
page.wait_for_function(83
"() => app && app.mode === 'playing' && app.battle && app.miniLayout",84
timeout=8000,85
)86
page.wait_for_timeout(250)87
88
89
LAYOUT_INFO = """() => {90
const plan = app.miniLayout || {};91
const fieldEl = app.scene && app.scene.canvas;92
const fr = fieldEl ? fieldEl.getBoundingClientRect() : null;93
const minis = [...document.querySelectorAll('#minis .mini')].map((el) => {94
const r = el.getBoundingClientRect();95
const c = el.querySelector('canvas');96
const cr = c ? c.getBoundingClientRect() : r;97
return {98
id: el.getAttribute('data-player'),99
left: r.left, right: r.right, top: r.top, bottom: r.bottom,100
cx: cr.left + cr.width / 2,101
cy: cr.top + cr.height / 2102
};103
});104
return {105
mode: plan.mode,106
sidesClass: document.getElementById('minis').classList.contains('sides'),107
n: plan.n,108
field: fr ? { left: fr.left, right: fr.right, top: fr.top, bottom: fr.bottom,109
x: app.fieldX, y: app.fieldY, w: app.fieldW, h: app.fieldH } : null,110
positions: plan.positions || [],111
minis,112
tile: app.tile,113
vw: window.innerWidth,114
vh: window.innerHeight115
};116
}"""117
118
119
INJECT_FLIGHTS = """() => {120
const plan = app.miniLayout;121
const field = app.scene.canvas.getBoundingClientRect();122
const minis = [...document.querySelectorAll('#minis .mini')];123
function anchor(id, inner) {124
const el = document.querySelector('#minis .mini[data-player=\"' + id + '\"] canvas');125
if (!el) return { x: 80, y: 80 };126
const r = el.getBoundingClientRect();127
if (plan && plan.mode === 'sides') {128
const mid = field.left + field.width / 2;129
const left = (r.left + r.width / 2) < mid;130
if (inner) return { x: left ? r.right : r.left, y: r.top + r.height / 2 };131
return { x: r.left + r.width / 2, y: r.top + r.height / 2 };132
}133
return { x: r.left + r.width / 2, y: inner ? r.bottom : r.top };134
}135
const bots = (app.battle.bots || []).map(b => b.id);136
const a = bots[0] || 'bot-1';137
const b = bots[1] || bots[0] || 'bot-2';138
const pStart = {139
x: field.left + field.width / 2,140
y: field.top + 4141
};142
if (typeof Online.clearFlights === 'function') Online.clearFlights();143
const flights = [144
{ id: 'vis-p2e', client_id: 'vis-p2e', from_id: 'player', target_id: a, miss: false, color: 0, flight_duration: 1.2, age: 0.55 },145
{ id: 'vis-e2p', client_id: 'vis-e2p', from_id: a, target_id: 'player', miss: false, color: 1, flight_duration: 1.2, age: 0.55 },146
{ id: 'vis-e2e', client_id: 'vis-e2e', from_id: a, target_id: b, miss: false, color: 2, flight_duration: 1.2, age: 0.55 },147
{ id: 'vis-emiss', client_id: 'vis-emiss', from_id: b, target_id: null, miss: true, color: 3, flight_duration: 1.2, age: 0.45 }148
];149
const aOut = anchor(a, true);150
const bOut = anchor(b, true);151
const locals = {152
'vis-p2e': { from_id: 'player', color: 0, startX: pStart.x, startY: pStart.y, col: 4 },153
'vis-e2p': { from_id: a, color: 1, startX: aOut.x, startY: aOut.y },154
'vis-e2e': { from_id: a, color: 2, startX: aOut.x, startY: aOut.y },155
'vis-emiss': { from_id: b, color: 3, startX: bOut.x, startY: bOut.y }156
};157
Online.spawnFlights(flights, locals);158
Online.tickFlights();159
const front = [...document.querySelectorAll('#flights .flight')].map(el => ({160
cls: el.className,161
transform: el.style.transform,162
opacity: el.style.opacity,163
parent: 'front'164
}));165
const back = [...document.querySelectorAll('#flights-back .flight')].map(el => ({166
cls: el.className,167
transform: el.style.transform,168
opacity: el.style.opacity,169
parent: 'back'170
}));171
return {172
front: front.length,173
back: back.length,174
kinds: (Online._flights || []).map(f => ({175
kind: f.kind, miss: f.miss,176
startScale: f.startScale, endScale: f.endScale,177
parent: (f.el && f.el.parentElement && f.el.parentElement.id) || ''178
}))179
};180
}"""181
182
183
def assert_sides(info, tag, expect_rows=False):184
check(info["mode"] == "sides", f"{tag}: mode is sides (got {info['mode']})")185
check(info["sidesClass"], f"{tag}: #minis has .sides")186
field = info["field"]187
minis = info["minis"]188
check(len(minis) >= 1, f"{tag}: at least one mini ({len(minis)})")189
if not field or not minis:190
return191
for i, m in enumerate(minis):192
if i % 2 == 0:193
check(m["right"] <= field["left"] + 2,194
f"{tag}: mini {i} ({m['id']}) is on the left of the field "195
f"(right={m['right']:.1f} field.left={field['left']:.1f})")196
else:197
check(m["left"] >= field["right"] - 2,198
f"{tag}: mini {i} ({m['id']}) is on the right of the field "199
f"(left={m['left']:.1f} field.right={field['right']:.1f})")200
check(m["bottom"] <= field["bottom"] + 8,201
f"{tag}: mini {i} does not hang below the field")202
check(m["top"] >= 50,203
f"{tag}: mini {i} stays under the HUD (top={m['top']:.1f})")204
if expect_rows and len(minis) >= 3:205
# 3rd (index 2) is left, stacked above the first206
check(minis[2]["bottom"] <= minis[0]["top"] + 4,207
f"{tag}: third mini is stacked above the first "208
f"(b={minis[2]['bottom']:.1f} vs top={minis[0]['top']:.1f})")209
210
211
def assert_top(info, tag):212
check(info["mode"] == "top", f"{tag}: mode is top (got {info['mode']})")213
check(not info["sidesClass"], f"{tag}: #minis is not .sides")214
field = info["field"]215
minis = info["minis"]216
check(len(minis) >= 1, f"{tag}: at least one mini")217
if not field or not minis:218
return219
for i, m in enumerate(minis):220
check(m["bottom"] <= field["top"] + 12,221
f"{tag}: mini {i} sits above the field "222
f"(bottom={m['bottom']:.1f} field.top={field['top']:.1f})")223
224
225
def assert_flights(info, tag, expect_behind=True):226
check(info["front"] >= 3, f"{tag}: front flights present ({info['front']})")227
kinds = {k["kind"]: k for k in info["kinds"]}228
check("player-to-enemy" in kinds, f"{tag}: player-to-enemy")229
check("enemy-to-player" in kinds, f"{tag}: enemy-to-player")230
check("enemy-miss" in kinds, f"{tag}: enemy-miss")231
if "player-to-enemy" in kinds:232
k = kinds["player-to-enemy"]233
check(k["startScale"] > k["endScale"],234
f"{tag}: player-to-enemy shrinks ({k['startScale']:.2f}→{k['endScale']:.2f})")235
if "enemy-to-player" in kinds:236
k = kinds["enemy-to-player"]237
check(k["endScale"] > k["startScale"],238
f"{tag}: enemy-to-player grows ({k['startScale']:.2f}→{k['endScale']:.2f})")239
if "enemy-to-enemy" in kinds:240
k = kinds["enemy-to-enemy"]241
check(abs(k["startScale"] - k["endScale"]) < 0.05,242
f"{tag}: enemy-to-enemy stays small ({k['startScale']:.2f})")243
check(k["parent"] == "flights-back",244
f"{tag}: enemy-to-enemy is in #flights-back (got {k['parent']})")245
if expect_behind:246
check(info["back"] >= 1, f"{tag}: at least one behind-field flight")247
if "enemy-miss" in kinds:248
k = kinds["enemy-miss"]249
check(k["startScale"] < 0.7,250
f"{tag}: enemy-miss starts small ({k['startScale']:.2f})")251
check(k["parent"] == "flights",252
f"{tag}: enemy-miss is in #flights (got {k['parent']})")253
254
255
def run_viewport(browser, url, name, width, height, is_mobile, round_n, expect_mode):256
context = browser.new_context(257
viewport={"width": width, "height": height},258
device_scale_factor=1,259
is_mobile=is_mobile,260
has_touch=is_mobile,261
)262
page = context.new_page()263
open_offline(page, url, round_n=round_n)264
page.wait_for_timeout(300)265
info = page.evaluate(LAYOUT_INFO)266
print(f"--- {name} layout:", {k: info[k] for k in ('mode', 'n', 'tile', 'vw', 'vh', 'sidesClass')})267
if expect_mode == "sides":268
assert_sides(info, name, expect_rows=(round_n >= 12))269
else:270
assert_top(info, name)271
shot(page, f"t1125-{name}-layout.png")272
273
flights = page.evaluate(INJECT_FLIGHTS)274
print(f"--- {name} flights:", flights)275
assert_flights(flights, name)276
shot(page, f"t1125-{name}-flights.png")277
context.close()278
279
280
def main():281
port = free_port()282
http = start_http(port)283
url = f"http://127.0.0.1:{port}/"284
try:285
with sync_playwright() as p:286
browser = p.chromium.launch(287
executable_path=CHROME,288
args=CHROME_ARGS,289
headless=True,290
)291
# Desktop wide: 2 opponents (round 2) alternating L/R292
run_viewport(browser, url, "desktop-wide", 1280, 900, False, 2, "sides")293
# Many opponents, stacked rows (round 25 → 8 bots)294
run_viewport(browser, url, "desktop-wide-many", 1400, 900, False, 25, "sides")295
# Desktop narrow: top layout296
run_viewport(browser, url, "desktop-narrow", 720, 800, False, 2, "top")297
# Mobile298
run_viewport(browser, url, "mobile", 393, 851, True, 2, "top")299
browser.close()300
finally:301
http.terminate()302
try:303
http.wait(timeout=3)304
except subprocess.TimeoutExpired:305
http.kill()306
307
if FAILURES:308
print(f"\n{len(FAILURES)} failure(s):")309
for f in FAILURES:310
print(" -", f)311
return 1312
print("\nall minis/flights checks passed")313
return 0314
315
316
if __name__ == "__main__":317
sys.exit(main())