t1199: gravity minimum 2.0 (catalog, designer, server clamp) and gravity shown as % with scaled g
@@ -76,7 +76,11 @@ De spelkern is deterministisch en staat los van tekenen en invoer, zodat stage 2
76
76
| `test/` | Unit tests (`node --test`) voor de kern en de deploy-guard; `server/tests/run.php` voor de API |
77
77
| `ci/` | FTP-deploy, **zonder** `--delete`. Expandeert `$timftproot` zelf. Raakt `favicon.ico` en `data/` (config, database) niet aan. |
78
78
79
Sprongfysica is parametrisch. Een horizontale match van 3 springt
79
Sprongfysica is parametrisch. Zwaartekracht (`jumpsToClear`) loopt van
80
2,0 tot 4,0 (t1199: minimum was 1) en wordt getoond als percentage,
81
lineair: `pct = (v − 1) × 100` en `g = 9,81 × (v − 1)`, dus 2,0 = 100 %
82
(9,81 g), 3,0 = 200 % (19,62 g), 4,0 = 300 % (29,43 g) — in de
83
planeetkaarten, de HUD en de ontwerper. Een horizontale match van 3 springt
80
84
`1,5 × 13 / jumpsToClear` tegels hoog (t1119: de minimumsprong is 50 %
81
85
hoger); een verticale match van 3 krijgt 120 % daarvan, en elk extra
82
86
blokje +5 % (wordt nergens in het spel uitgelegd). De massa bepaalt hoe
@@ -120,7 +124,7 @@ verwijderd, dan valt de keuze terug op Terra.
120
124
Voor je gaat spelen — solo en in de lobby — kies je een **veld**. Elk veld
121
125
is een planeet met een volk, vijf eigen kleuren/vormen, en drie natuurwetten:
122
126
123
- zwaartekracht — hoe hoog de eerste sprong is (`g`, m/s²)
127
- zwaartekracht — hoe hoog de eerste sprong is (`g`, als percentage: 100 % = 9,81 g, minimaal 100 %)
124
128
- luchtweerstand — hoe snel blokjes weer vallen (`d`)
125
129
- massa — hoe snel de sprong omhoog gaat (`F`, newton)
126
130
@@ -76,7 +76,11 @@ De spelkern is deterministisch en staat los van tekenen en invoer, zodat stage 276
| `test/` | Unit tests (`node --test`) voor de kern en de deploy-guard; `server/tests/run.php` voor de API |76
| `test/` | Unit tests (`node --test`) voor de kern en de deploy-guard; `server/tests/run.php` voor de API |77
| `ci/` | FTP-deploy, **zonder** `--delete`. Expandeert `$timftproot` zelf. Raakt `favicon.ico` en `data/` (config, database) niet aan. |77
| `ci/` | FTP-deploy, **zonder** `--delete`. Expandeert `$timftproot` zelf. Raakt `favicon.ico` en `data/` (config, database) niet aan. |78
78
79
Sprongfysica is parametrisch. Een horizontale match van 3 springt79
Sprongfysica is parametrisch. Zwaartekracht (`jumpsToClear`) loopt van80
2,0 tot 4,0 (t1199: minimum was 1) en wordt getoond als percentage,81
lineair: `pct = (v − 1) × 100` en `g = 9,81 × (v − 1)`, dus 2,0 = 100 %82
(9,81 g), 3,0 = 200 % (19,62 g), 4,0 = 300 % (29,43 g) — in de83
planeetkaarten, de HUD en de ontwerper. Een horizontale match van 3 springt80
`1,5 × 13 / jumpsToClear` tegels hoog (t1119: de minimumsprong is 50 %84
`1,5 × 13 / jumpsToClear` tegels hoog (t1119: de minimumsprong is 50 %81
hoger); een verticale match van 3 krijgt 120 % daarvan, en elk extra85
hoger); een verticale match van 3 krijgt 120 % daarvan, en elk extra82
blokje +5 % (wordt nergens in het spel uitgelegd). De massa bepaalt hoe86
blokje +5 % (wordt nergens in het spel uitgelegd). De massa bepaalt hoe@@ -120,7 +124,7 @@ verwijderd, dan valt de keuze terug op Terra.120
Voor je gaat spelen — solo en in de lobby — kies je een **veld**. Elk veld124
Voor je gaat spelen — solo en in de lobby — kies je een **veld**. Elk veld121
is een planeet met een volk, vijf eigen kleuren/vormen, en drie natuurwetten:125
is een planeet met een volk, vijf eigen kleuren/vormen, en drie natuurwetten:122
126
123
- zwaartekracht — hoe hoog de eerste sprong is (`g`, m/s²)127
- zwaartekracht — hoe hoog de eerste sprong is (`g`, als percentage: 100 % = 9,81 g, minimaal 100 %)124
- luchtweerstand — hoe snel blokjes weer vallen (`d`)128
- luchtweerstand — hoe snel blokjes weer vallen (`d`)125
- massa — hoe snel de sprong omhoog gaat (`F`, newton)129
- massa — hoe snel de sprong omhoog gaat (`F`, newton)126
130
@@ -23,7 +23,7 @@ var PLANET_CATALOG = {
23
23
"id": "aurel",
24
24
"name": "Aurel",
25
25
"people": "Aurelians",
26
"jumpsToClear": 1,
26
"jumpsToClear": 2,
27
27
"fallTime": 5,
28
28
"riseTime": 3,
29
29
"colors": [
@@ -53,7 +53,7 @@ var PLANET_CATALOG = {
53
53
"id": "lunara",
54
54
"name": "Lunara",
55
55
"people": "Lunarites",
56
"jumpsToClear": 1,
56
"jumpsToClear": 2,
57
57
"fallTime": 2,
58
58
"riseTime": 1.2,
59
59
"colors": [
@@ -143,7 +143,7 @@ var PLANET_CATALOG = {
143
143
"id": "zephyr",
144
144
"name": "Zephyr",
145
145
"people": "Zephyrites",
146
"jumpsToClear": 1,
146
"jumpsToClear": 2,
147
147
"fallTime": 1.2,
148
148
"riseTime": 2.8,
149
149
"colors": [
@@ -1309,7 +1309,8 @@ var I18N_CATALOG = {
1309
1309
"offline.defeated.one": "{n} opponent defeated",
1310
1310
"offline.defeated.few": "{n} opponents defeated",
1311
1311
"offline.defeated.many": "{n} opponents defeated",
1312
"offline.defeated.other": "{n} opponents defeated"
1312
"offline.defeated.other": "{n} opponents defeated",
1313
"stats.gravity": "{pct}% ({g}g)"
1313
1314
},
1314
1315
"nl": {
1315
1316
"menu.play": "Spelen",
@@ -1598,7 +1599,8 @@ var I18N_CATALOG = {
1598
1599
"offline.defeated.one": "{n} tegenstander verslagen",
1599
1600
"offline.defeated.few": "{n} tegenstanders verslagen",
1600
1601
"offline.defeated.many": "{n} tegenstanders verslagen",
1601
"offline.defeated.other": "{n} tegenstanders verslagen"
1602
"offline.defeated.other": "{n} tegenstanders verslagen",
1603
"stats.gravity": "{pct}% ({g}g)"
1602
1604
},
1603
1605
"de": {
1604
1606
"menu.play": "Spielen",
@@ -1887,7 +1889,8 @@ var I18N_CATALOG = {
1887
1889
"offline.defeated.one": "{n} Gegner besiegt",
1888
1890
"offline.defeated.few": "{n} Gegner besiegt",
1889
1891
"offline.defeated.many": "{n} Gegner besiegt",
1890
"offline.defeated.other": "{n} Gegner besiegt"
1892
"offline.defeated.other": "{n} Gegner besiegt",
1893
"stats.gravity": "{pct} % ({g} g)"
1891
1894
},
1892
1895
"fr": {
1893
1896
"menu.play": "Jouer",
@@ -2176,7 +2179,8 @@ var I18N_CATALOG = {
2176
2179
"offline.defeated.one": "{n} adversaire vaincu",
2177
2180
"offline.defeated.few": "{n} adversaires vaincus",
2178
2181
"offline.defeated.many": "{n} adversaires vaincus",
2179
"offline.defeated.other": "{n} adversaires vaincus"
2182
"offline.defeated.other": "{n} adversaires vaincus",
2183
"stats.gravity": "{pct} % ({g} g)"
2180
2184
},
2181
2185
"ja": {
2182
2186
"menu.play": "プレイ",
@@ -2465,7 +2469,8 @@ var I18N_CATALOG = {
2465
2469
"offline.defeated.one": "{n}人の相手を倒した",
2466
2470
"offline.defeated.few": "{n}人の相手を倒した",
2467
2471
"offline.defeated.many": "{n}人の相手を倒した",
2468
"offline.defeated.other": "{n}人の相手を倒した"
2472
"offline.defeated.other": "{n}人の相手を倒した",
2473
"stats.gravity": "{pct}% ({g}g)"
2469
2474
},
2470
2475
"zh": {
2471
2476
"menu.play": "开始游戏",
@@ -2754,7 +2759,8 @@ var I18N_CATALOG = {
2754
2759
"offline.defeated.one": "击败了 {n} 名对手",
2755
2760
"offline.defeated.few": "击败了 {n} 名对手",
2756
2761
"offline.defeated.many": "击败了 {n} 名对手",
2757
"offline.defeated.other": "击败了 {n} 名对手"
2762
"offline.defeated.other": "击败了 {n} 名对手",
2763
"stats.gravity": "{pct}% ({g}g)"
2758
2764
},
2759
2765
"ko": {
2760
2766
"menu.play": "플레이",
@@ -3043,7 +3049,8 @@ var I18N_CATALOG = {
3043
3049
"offline.defeated.one": "상대 {n}명 격파",
3044
3050
"offline.defeated.few": "상대 {n}명 격파",
3045
3051
"offline.defeated.many": "상대 {n}명 격파",
3046
"offline.defeated.other": "상대 {n}명 격파"
3052
"offline.defeated.other": "상대 {n}명 격파",
3053
"stats.gravity": "{pct}% ({g}g)"
3047
3054
},
3048
3055
"pl": {
3049
3056
"menu.play": "Graj",
@@ -3332,7 +3339,8 @@ var I18N_CATALOG = {
3332
3339
"offline.defeated.one": "{n} pokonany przeciwnik",
3333
3340
"offline.defeated.few": "{n} pokonanych przeciwników",
3334
3341
"offline.defeated.many": "{n} pokonanych przeciwników",
3335
"offline.defeated.other": "{n} pokonanych przeciwników"
3342
"offline.defeated.other": "{n} pokonanych przeciwników",
3343
"stats.gravity": "{pct} % ({g} g)"
3336
3344
},
3337
3345
"ru": {
3338
3346
"menu.play": "Играть",
@@ -3621,7 +3629,8 @@ var I18N_CATALOG = {
3621
3629
"offline.defeated.one": "{n} противник побеждён",
3622
3630
"offline.defeated.few": "{n} противника побеждено",
3623
3631
"offline.defeated.many": "{n} противников побеждено",
3624
"offline.defeated.other": "{n} противников побеждено"
3632
"offline.defeated.other": "{n} противников побеждено",
3633
"stats.gravity": "{pct} % ({g} g)"
3625
3634
},
3626
3635
"es": {
3627
3636
"menu.play": "Jugar",
@@ -3910,7 +3919,8 @@ var I18N_CATALOG = {
3910
3919
"offline.defeated.one": "{n} rival derrotado",
3911
3920
"offline.defeated.few": "{n} rivales derrotados",
3912
3921
"offline.defeated.many": "{n} rivales derrotados",
3913
"offline.defeated.other": "{n} rivales derrotados"
3922
"offline.defeated.other": "{n} rivales derrotados",
3923
"stats.gravity": "{pct} % ({g} g)"
3914
3924
}
3915
3925
},
3916
3926
"errors": {
@@ -4465,7 +4475,10 @@ else if (typeof globalThis !== 'undefined')
4465
4475
* planet; the numbers and jump-height rules are already applied here so
4466
4476
* that later planets only need new data, not new physics code.
4467
4477
*
4468
* Gravity (jumpsToClear): 1 (easy, high jump) .. 4 (hard, short jump).
4478
* Gravity (jumpsToClear): 2 (easy, high jump) .. 4 (hard, short jump).
4479
* Minimum raised from 1 to 2 in t1199 (GRAVITY_MIN). Shown as a
4480
* percentage, linear in the value: pct = (v − 1)·100, so 2 → 100 %
4481
* (9.81 g), 3 → 200 % (19.62 g), 4 → 300 % (29.43 g).
4469
4482
* A horizontal match of 3 jumps JUMP_HEIGHT_SCALE * FIELD_HEIGHT
4470
4483
* / jumpsToClear tiles (JUMP_HEIGHT_SCALE is 1.5 since t1119: the
4471
4484
* minimum jump is 50% higher). At gravity 1 that is 19.5 tiles, so
@@ -4517,10 +4530,41 @@ function defaultColors ()
4517
4530
];
4518
4531
}
4519
4532
4533
/** t1199: gravity (jumpsToClear) range; values below the minimum clamp up. */
4534
var GRAVITY_MIN = 2;
4535
var GRAVITY_MAX = 4;
4536
/** t1199: g at 100 % (jumpsToClear 2). */
4537
var EARTH_G = 9.81;
4538
4539
/** t1199: displayed gravity percentage, linear: (v − 1)·100. */
4540
function gravityPercent (jumpsToClear)
4541
{
4542
return Math.round((clamp(jumpsToClear, GRAVITY_MIN, GRAVITY_MAX) - 1) * 100);
4543
}
4544
4545
/** t1199: displayed g, consistent with the percentage: 9.81·(v − 1). */
4546
function gravityG (jumpsToClear)
4547
{
4548
return EARTH_G * (clamp(jumpsToClear, GRAVITY_MIN, GRAVITY_MAX) - 1);
4549
}
4550
4551
/** t1199: "100% (9.81g)" style text (i18n template stats.gravity). */
4552
function formatGravity (jumpsToClear)
4553
{
4554
var params = { pct: gravityPercent(jumpsToClear), g: gravityG(jumpsToClear).toFixed(2) };
4555
if (typeof I18n !== 'undefined' && I18n.t)
4556
{
4557
var s = I18n.t('stats.gravity', params);
4558
if (s && s !== 'stats.gravity')
4559
{ return s; }
4560
}
4561
return params.pct + '% (' + params.g + 'g)';
4562
}
4563
4520
4564
function createPlanet (opts)
4521
4565
{
4522
4566
opts = opts || {};
4523
var jumpsToClear = clamp(opts.jumpsToClear == null ? 2 : opts.jumpsToClear, 1, 4);
4567
var jumpsToClear = clamp(opts.jumpsToClear == null ? 2 : opts.jumpsToClear, GRAVITY_MIN, GRAVITY_MAX);
4524
4568
var fallTime = clamp(opts.fallTime == null ? 3 : opts.fallTime, 1, 5);
4525
4569
var riseTime = clamp(opts.riseTime == null ? 1.5 : opts.riseTime, 0.5, 3);
4526
4570
var colors = opts.colors || defaultColors();
@@ -4670,7 +4714,7 @@ function formatStats (planet)
4670
4714
var d = displayValues(planet);
4671
4715
var power = (typeof I18n !== 'undefined')
4672
4716
? I18n.t('stats.powerLabel') : 'Power';
4673
return 'g ' + d.gravity.toFixed(2)
4717
return 'g ' + formatGravity(planet.jumpsToClear)
4674
4718
+ ' d ' + d.density.toFixed(2)
4675
4719
+ ' F ' + Math.round(d.newtons) + ' N'
4676
4720
+ ' ' + power + ' ' + d.power + '%';
@@ -4725,6 +4769,9 @@ function launchDeceleration (planet, height)
4725
4769
*/
4726
4770
function power (planet)
4727
4771
{
4772
// t1199: scale kept on the old 1..4 axis on purpose, so unchanged
4773
// planets keep their Power/miss chance; the 2.0 minimum means the
4774
// gravity term is now at least 1/3 (lowest possible Power ≈ 0.11).
4728
4775
var gravity = (planet.jumpsToClear - 1) / 3;
4729
4776
var air = (5 - planet.fallTime) / 4;
4730
4777
var mass = (3 - planet.riseTime) / 2.5;
@@ -4758,11 +4805,12 @@ function displayPower (planet)
4758
4805
*/
4759
4806
function displayValues (planet)
4760
4807
{
4761
var gravity = 9.81 * planet.jumpsToClear / 2;
4808
var gravity = gravityG(planet.jumpsToClear);
4762
4809
var density = 0.25 + ((5 - planet.fallTime) / 4) * 1.60;
4763
4810
var newtons = 40 + ((planet.riseTime - 0.5) / 2.5) * 160;
4764
4811
return {
4765
4812
gravity: gravity,
4813
gravityPct: gravityPercent(planet.jumpsToClear),
4766
4814
density: density,
4767
4815
newtons: newtons,
4768
4816
power: displayPower(planet),
@@ -4780,6 +4828,12 @@ var Planet = {
4780
4828
SPAWN_INTERVAL: 1,
4781
4829
JUMP_VERTICAL_BONUS: 1.2,
4782
4830
JUMP_EXTRA_BLOCK: 0.05,
4831
GRAVITY_MIN: GRAVITY_MIN,
4832
GRAVITY_MAX: GRAVITY_MAX,
4833
EARTH_G: EARTH_G,
4834
gravityPercent: gravityPercent,
4835
gravityG: gravityG,
4836
formatGravity: formatGravity,
4783
4837
createPlanet: createPlanet,
4784
4838
defaultPlanet: defaultPlanet,
4785
4839
defaultColors: defaultColors,
@@ -12905,7 +12959,7 @@ Designer.openEdit = function (id)
12905
12959
}
12906
12960
document.getElementById('des-name').value = pl.name || '';
12907
12961
document.getElementById('des-people').value = pl.people || '';
12908
document.getElementById('des-gravity').value = String(pl.jumpsToClear != null ? pl.jumpsToClear : 2);
12962
document.getElementById('des-gravity').value = String(Math.max(2, pl.jumpsToClear != null ? pl.jumpsToClear : 2));
12909
12963
document.getElementById('des-air').value = String(pl.fallTime != null ? pl.fallTime : 3);
12910
12964
document.getElementById('des-mass').value = String(pl.riseTime != null ? pl.riseTime : 1.5);
12911
12965
document.getElementById('designer-edit-title').textContent = (typeof I18n !== 'undefined') ? I18n.t('designer.editTitle') : 'Edit planet';
@@ -12933,7 +12987,7 @@ Designer.openEdit = function (id)
12933
12987
12934
12988
Designer.draftPlanet = function ()
12935
12989
{
12936
var jumps = clampNum(document.getElementById('des-gravity').value, 1, 4, 2);
12990
var jumps = clampNum(document.getElementById('des-gravity').value, 2, 4, 2);
12937
12991
var fall = clampNum(document.getElementById('des-air').value, 1, 5, 3);
12938
12992
var rise = clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5);
12939
12993
var colors = [];
@@ -12968,8 +13022,10 @@ Designer.syncPreview = function ()
12968
13022
{
12969
13023
var p = Designer.draftPlanet();
12970
13024
var d = (typeof Planet !== 'undefined' && Planet.displayValues) ? Planet.displayValues(p) : null;
12971
setText('des-gravity-val', Number(document.getElementById('des-gravity').value).toFixed(1)
12972
+ (d ? ' · g ' + d.gravity.toFixed(2) : ''));
13025
// t1199: gravity as a percentage (2.0 = 100 % = 9.81 g).
13026
var gv = clampNum(document.getElementById('des-gravity').value, 2, 4, 2);
13027
setText('des-gravity-val', (typeof Planet !== 'undefined' && Planet.formatGravity)
13028
? Planet.formatGravity(gv) : Math.round((gv - 1) * 100) + '%');
12973
13029
setText('des-air-val', Number(document.getElementById('des-air').value).toFixed(1)
12974
13030
+ (d ? ' · d ' + d.density.toFixed(2) : ''));
12975
13031
setText('des-mass-val', Number(document.getElementById('des-mass').value).toFixed(1)
@@ -13112,7 +13168,7 @@ Designer.save = function ()
13112
13168
id: Designer.editingId || undefined,
13113
13169
name: name,
13114
13170
people: people,
13115
jumpsToClear: clampNum(document.getElementById('des-gravity').value, 1, 4, 2),
13171
jumpsToClear: clampNum(document.getElementById('des-gravity').value, 2, 4, 2),
13116
13172
fallTime: clampNum(document.getElementById('des-air').value, 1, 5, 3),
13117
13173
riseTime: clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5),
13118
13174
colors: Designer.slots.slice()
@@ -23,7 +23,7 @@ var PLANET_CATALOG = {23
"id": "aurel",23
"id": "aurel",24
"name": "Aurel",24
"name": "Aurel",25
"people": "Aurelians",25
"people": "Aurelians",26
"jumpsToClear": 1,26
"jumpsToClear": 2,27
"fallTime": 5,27
"fallTime": 5,28
"riseTime": 3,28
"riseTime": 3,29
"colors": [29
"colors": [@@ -53,7 +53,7 @@ var PLANET_CATALOG = {53
"id": "lunara",53
"id": "lunara",54
"name": "Lunara",54
"name": "Lunara",55
"people": "Lunarites",55
"people": "Lunarites",56
"jumpsToClear": 1,56
"jumpsToClear": 2,57
"fallTime": 2,57
"fallTime": 2,58
"riseTime": 1.2,58
"riseTime": 1.2,59
"colors": [59
"colors": [@@ -143,7 +143,7 @@ var PLANET_CATALOG = {143
"id": "zephyr",143
"id": "zephyr",144
"name": "Zephyr",144
"name": "Zephyr",145
"people": "Zephyrites",145
"people": "Zephyrites",146
"jumpsToClear": 1,146
"jumpsToClear": 2,147
"fallTime": 1.2,147
"fallTime": 1.2,148
"riseTime": 2.8,148
"riseTime": 2.8,149
"colors": [149
"colors": [@@ -1309,7 +1309,8 @@ var I18N_CATALOG = {1309
"offline.defeated.one": "{n} opponent defeated",1309
"offline.defeated.one": "{n} opponent defeated",1310
"offline.defeated.few": "{n} opponents defeated",1310
"offline.defeated.few": "{n} opponents defeated",1311
"offline.defeated.many": "{n} opponents defeated",1311
"offline.defeated.many": "{n} opponents defeated",1312
"offline.defeated.other": "{n} opponents defeated"1312
"offline.defeated.other": "{n} opponents defeated",1313
"stats.gravity": "{pct}% ({g}g)"1313
},1314
},1314
"nl": {1315
"nl": {1315
"menu.play": "Spelen",1316
"menu.play": "Spelen",@@ -1598,7 +1599,8 @@ var I18N_CATALOG = {1598
"offline.defeated.one": "{n} tegenstander verslagen",1599
"offline.defeated.one": "{n} tegenstander verslagen",1599
"offline.defeated.few": "{n} tegenstanders verslagen",1600
"offline.defeated.few": "{n} tegenstanders verslagen",1600
"offline.defeated.many": "{n} tegenstanders verslagen",1601
"offline.defeated.many": "{n} tegenstanders verslagen",1601
"offline.defeated.other": "{n} tegenstanders verslagen"1602
"offline.defeated.other": "{n} tegenstanders verslagen",1603
"stats.gravity": "{pct}% ({g}g)"1602
},1604
},1603
"de": {1605
"de": {1604
"menu.play": "Spielen",1606
"menu.play": "Spielen",@@ -1887,7 +1889,8 @@ var I18N_CATALOG = {1887
"offline.defeated.one": "{n} Gegner besiegt",1889
"offline.defeated.one": "{n} Gegner besiegt",1888
"offline.defeated.few": "{n} Gegner besiegt",1890
"offline.defeated.few": "{n} Gegner besiegt",1889
"offline.defeated.many": "{n} Gegner besiegt",1891
"offline.defeated.many": "{n} Gegner besiegt",1890
"offline.defeated.other": "{n} Gegner besiegt"1892
"offline.defeated.other": "{n} Gegner besiegt",1893
"stats.gravity": "{pct} % ({g} g)"1891
},1894
},1892
"fr": {1895
"fr": {1893
"menu.play": "Jouer",1896
"menu.play": "Jouer",@@ -2176,7 +2179,8 @@ var I18N_CATALOG = {2176
"offline.defeated.one": "{n} adversaire vaincu",2179
"offline.defeated.one": "{n} adversaire vaincu",2177
"offline.defeated.few": "{n} adversaires vaincus",2180
"offline.defeated.few": "{n} adversaires vaincus",2178
"offline.defeated.many": "{n} adversaires vaincus",2181
"offline.defeated.many": "{n} adversaires vaincus",2179
"offline.defeated.other": "{n} adversaires vaincus"2182
"offline.defeated.other": "{n} adversaires vaincus",2183
"stats.gravity": "{pct} % ({g} g)"2180
},2184
},2181
"ja": {2185
"ja": {2182
"menu.play": "プレイ",2186
"menu.play": "プレイ",@@ -2465,7 +2469,8 @@ var I18N_CATALOG = {2465
"offline.defeated.one": "{n}人の相手を倒した",2469
"offline.defeated.one": "{n}人の相手を倒した",2466
"offline.defeated.few": "{n}人の相手を倒した",2470
"offline.defeated.few": "{n}人の相手を倒した",2467
"offline.defeated.many": "{n}人の相手を倒した",2471
"offline.defeated.many": "{n}人の相手を倒した",2468
"offline.defeated.other": "{n}人の相手を倒した"2472
"offline.defeated.other": "{n}人の相手を倒した",2473
"stats.gravity": "{pct}% ({g}g)"2469
},2474
},2470
"zh": {2475
"zh": {2471
"menu.play": "开始游戏",2476
"menu.play": "开始游戏",@@ -2754,7 +2759,8 @@ var I18N_CATALOG = {2754
"offline.defeated.one": "击败了 {n} 名对手",2759
"offline.defeated.one": "击败了 {n} 名对手",2755
"offline.defeated.few": "击败了 {n} 名对手",2760
"offline.defeated.few": "击败了 {n} 名对手",2756
"offline.defeated.many": "击败了 {n} 名对手",2761
"offline.defeated.many": "击败了 {n} 名对手",2757
"offline.defeated.other": "击败了 {n} 名对手"2762
"offline.defeated.other": "击败了 {n} 名对手",2763
"stats.gravity": "{pct}% ({g}g)"2758
},2764
},2759
"ko": {2765
"ko": {2760
"menu.play": "플레이",2766
"menu.play": "플레이",@@ -3043,7 +3049,8 @@ var I18N_CATALOG = {3043
"offline.defeated.one": "상대 {n}명 격파",3049
"offline.defeated.one": "상대 {n}명 격파",3044
"offline.defeated.few": "상대 {n}명 격파",3050
"offline.defeated.few": "상대 {n}명 격파",3045
"offline.defeated.many": "상대 {n}명 격파",3051
"offline.defeated.many": "상대 {n}명 격파",3046
"offline.defeated.other": "상대 {n}명 격파"3052
"offline.defeated.other": "상대 {n}명 격파",3053
"stats.gravity": "{pct}% ({g}g)"3047
},3054
},3048
"pl": {3055
"pl": {3049
"menu.play": "Graj",3056
"menu.play": "Graj",@@ -3332,7 +3339,8 @@ var I18N_CATALOG = {3332
"offline.defeated.one": "{n} pokonany przeciwnik",3339
"offline.defeated.one": "{n} pokonany przeciwnik",3333
"offline.defeated.few": "{n} pokonanych przeciwników",3340
"offline.defeated.few": "{n} pokonanych przeciwników",3334
"offline.defeated.many": "{n} pokonanych przeciwników",3341
"offline.defeated.many": "{n} pokonanych przeciwników",3335
"offline.defeated.other": "{n} pokonanych przeciwników"3342
"offline.defeated.other": "{n} pokonanych przeciwników",3343
"stats.gravity": "{pct} % ({g} g)"3336
},3344
},3337
"ru": {3345
"ru": {3338
"menu.play": "Играть",3346
"menu.play": "Играть",@@ -3621,7 +3629,8 @@ var I18N_CATALOG = {3621
"offline.defeated.one": "{n} противник побеждён",3629
"offline.defeated.one": "{n} противник побеждён",3622
"offline.defeated.few": "{n} противника побеждено",3630
"offline.defeated.few": "{n} противника побеждено",3623
"offline.defeated.many": "{n} противников побеждено",3631
"offline.defeated.many": "{n} противников побеждено",3624
"offline.defeated.other": "{n} противников побеждено"3632
"offline.defeated.other": "{n} противников побеждено",3633
"stats.gravity": "{pct} % ({g} g)"3625
},3634
},3626
"es": {3635
"es": {3627
"menu.play": "Jugar",3636
"menu.play": "Jugar",@@ -3910,7 +3919,8 @@ var I18N_CATALOG = {3910
"offline.defeated.one": "{n} rival derrotado",3919
"offline.defeated.one": "{n} rival derrotado",3911
"offline.defeated.few": "{n} rivales derrotados",3920
"offline.defeated.few": "{n} rivales derrotados",3912
"offline.defeated.many": "{n} rivales derrotados",3921
"offline.defeated.many": "{n} rivales derrotados",3913
"offline.defeated.other": "{n} rivales derrotados"3922
"offline.defeated.other": "{n} rivales derrotados",3923
"stats.gravity": "{pct} % ({g} g)"3914
}3924
}3915
},3925
},3916
"errors": {3926
"errors": {@@ -4465,7 +4475,10 @@ else if (typeof globalThis !== 'undefined')4465
* planet; the numbers and jump-height rules are already applied here so4475
* planet; the numbers and jump-height rules are already applied here so4466
* that later planets only need new data, not new physics code.4476
* that later planets only need new data, not new physics code.4467
*4477
*4468
* Gravity (jumpsToClear): 1 (easy, high jump) .. 4 (hard, short jump).4478
* Gravity (jumpsToClear): 2 (easy, high jump) .. 4 (hard, short jump).4479
* Minimum raised from 1 to 2 in t1199 (GRAVITY_MIN). Shown as a4480
* percentage, linear in the value: pct = (v − 1)·100, so 2 → 100 %4481
* (9.81 g), 3 → 200 % (19.62 g), 4 → 300 % (29.43 g).4469
* A horizontal match of 3 jumps JUMP_HEIGHT_SCALE * FIELD_HEIGHT4482
* A horizontal match of 3 jumps JUMP_HEIGHT_SCALE * FIELD_HEIGHT4470
* / jumpsToClear tiles (JUMP_HEIGHT_SCALE is 1.5 since t1119: the4483
* / jumpsToClear tiles (JUMP_HEIGHT_SCALE is 1.5 since t1119: the4471
* minimum jump is 50% higher). At gravity 1 that is 19.5 tiles, so4484
* minimum jump is 50% higher). At gravity 1 that is 19.5 tiles, so@@ -4517,10 +4530,41 @@ function defaultColors ()4517
];4530
];4518
}4531
}4519
4532
4533
/** t1199: gravity (jumpsToClear) range; values below the minimum clamp up. */4534
var GRAVITY_MIN = 2;4535
var GRAVITY_MAX = 4;4536
/** t1199: g at 100 % (jumpsToClear 2). */4537
var EARTH_G = 9.81;4538
4539
/** t1199: displayed gravity percentage, linear: (v − 1)·100. */4540
function gravityPercent (jumpsToClear)4541
{4542
return Math.round((clamp(jumpsToClear, GRAVITY_MIN, GRAVITY_MAX) - 1) * 100);4543
}4544
4545
/** t1199: displayed g, consistent with the percentage: 9.81·(v − 1). */4546
function gravityG (jumpsToClear)4547
{4548
return EARTH_G * (clamp(jumpsToClear, GRAVITY_MIN, GRAVITY_MAX) - 1);4549
}4550
4551
/** t1199: "100% (9.81g)" style text (i18n template stats.gravity). */4552
function formatGravity (jumpsToClear)4553
{4554
var params = { pct: gravityPercent(jumpsToClear), g: gravityG(jumpsToClear).toFixed(2) };4555
if (typeof I18n !== 'undefined' && I18n.t)4556
{4557
var s = I18n.t('stats.gravity', params);4558
if (s && s !== 'stats.gravity')4559
{ return s; }4560
}4561
return params.pct + '% (' + params.g + 'g)';4562
}4563
4520
function createPlanet (opts)4564
function createPlanet (opts)4521
{4565
{4522
opts = opts || {};4566
opts = opts || {};4523
var jumpsToClear = clamp(opts.jumpsToClear == null ? 2 : opts.jumpsToClear, 1, 4);4567
var jumpsToClear = clamp(opts.jumpsToClear == null ? 2 : opts.jumpsToClear, GRAVITY_MIN, GRAVITY_MAX);4524
var fallTime = clamp(opts.fallTime == null ? 3 : opts.fallTime, 1, 5);4568
var fallTime = clamp(opts.fallTime == null ? 3 : opts.fallTime, 1, 5);4525
var riseTime = clamp(opts.riseTime == null ? 1.5 : opts.riseTime, 0.5, 3);4569
var riseTime = clamp(opts.riseTime == null ? 1.5 : opts.riseTime, 0.5, 3);4526
var colors = opts.colors || defaultColors();4570
var colors = opts.colors || defaultColors();@@ -4670,7 +4714,7 @@ function formatStats (planet)4670
var d = displayValues(planet);4714
var d = displayValues(planet);4671
var power = (typeof I18n !== 'undefined')4715
var power = (typeof I18n !== 'undefined')4672
? I18n.t('stats.powerLabel') : 'Power';4716
? I18n.t('stats.powerLabel') : 'Power';4673
return 'g ' + d.gravity.toFixed(2)4717
return 'g ' + formatGravity(planet.jumpsToClear)4674
+ ' d ' + d.density.toFixed(2)4718
+ ' d ' + d.density.toFixed(2)4675
+ ' F ' + Math.round(d.newtons) + ' N'4719
+ ' F ' + Math.round(d.newtons) + ' N'4676
+ ' ' + power + ' ' + d.power + '%';4720
+ ' ' + power + ' ' + d.power + '%';@@ -4725,6 +4769,9 @@ function launchDeceleration (planet, height)4725
*/4769
*/4726
function power (planet)4770
function power (planet)4727
{4771
{4772
// t1199: scale kept on the old 1..4 axis on purpose, so unchanged4773
// planets keep their Power/miss chance; the 2.0 minimum means the4774
// gravity term is now at least 1/3 (lowest possible Power ≈ 0.11).4728
var gravity = (planet.jumpsToClear - 1) / 3;4775
var gravity = (planet.jumpsToClear - 1) / 3;4729
var air = (5 - planet.fallTime) / 4;4776
var air = (5 - planet.fallTime) / 4;4730
var mass = (3 - planet.riseTime) / 2.5;4777
var mass = (3 - planet.riseTime) / 2.5;@@ -4758,11 +4805,12 @@ function displayPower (planet)4758
*/4805
*/4759
function displayValues (planet)4806
function displayValues (planet)4760
{4807
{4761
var gravity = 9.81 * planet.jumpsToClear / 2;4808
var gravity = gravityG(planet.jumpsToClear);4762
var density = 0.25 + ((5 - planet.fallTime) / 4) * 1.60;4809
var density = 0.25 + ((5 - planet.fallTime) / 4) * 1.60;4763
var newtons = 40 + ((planet.riseTime - 0.5) / 2.5) * 160;4810
var newtons = 40 + ((planet.riseTime - 0.5) / 2.5) * 160;4764
return {4811
return {4765
gravity: gravity,4812
gravity: gravity,4813
gravityPct: gravityPercent(planet.jumpsToClear),4766
density: density,4814
density: density,4767
newtons: newtons,4815
newtons: newtons,4768
power: displayPower(planet),4816
power: displayPower(planet),@@ -4780,6 +4828,12 @@ var Planet = {4780
SPAWN_INTERVAL: 1,4828
SPAWN_INTERVAL: 1,4781
JUMP_VERTICAL_BONUS: 1.2,4829
JUMP_VERTICAL_BONUS: 1.2,4782
JUMP_EXTRA_BLOCK: 0.05,4830
JUMP_EXTRA_BLOCK: 0.05,4831
GRAVITY_MIN: GRAVITY_MIN,4832
GRAVITY_MAX: GRAVITY_MAX,4833
EARTH_G: EARTH_G,4834
gravityPercent: gravityPercent,4835
gravityG: gravityG,4836
formatGravity: formatGravity,4783
createPlanet: createPlanet,4837
createPlanet: createPlanet,4784
defaultPlanet: defaultPlanet,4838
defaultPlanet: defaultPlanet,4785
defaultColors: defaultColors,4839
defaultColors: defaultColors,@@ -12905,7 +12959,7 @@ Designer.openEdit = function (id)12905
}12959
}12906
document.getElementById('des-name').value = pl.name || '';12960
document.getElementById('des-name').value = pl.name || '';12907
document.getElementById('des-people').value = pl.people || '';12961
document.getElementById('des-people').value = pl.people || '';12908
document.getElementById('des-gravity').value = String(pl.jumpsToClear != null ? pl.jumpsToClear : 2);12962
document.getElementById('des-gravity').value = String(Math.max(2, pl.jumpsToClear != null ? pl.jumpsToClear : 2));12909
document.getElementById('des-air').value = String(pl.fallTime != null ? pl.fallTime : 3);12963
document.getElementById('des-air').value = String(pl.fallTime != null ? pl.fallTime : 3);12910
document.getElementById('des-mass').value = String(pl.riseTime != null ? pl.riseTime : 1.5);12964
document.getElementById('des-mass').value = String(pl.riseTime != null ? pl.riseTime : 1.5);12911
document.getElementById('designer-edit-title').textContent = (typeof I18n !== 'undefined') ? I18n.t('designer.editTitle') : 'Edit planet';12965
document.getElementById('designer-edit-title').textContent = (typeof I18n !== 'undefined') ? I18n.t('designer.editTitle') : 'Edit planet';@@ -12933,7 +12987,7 @@ Designer.openEdit = function (id)12933
12987
12934
Designer.draftPlanet = function ()12988
Designer.draftPlanet = function ()12935
{12989
{12936
var jumps = clampNum(document.getElementById('des-gravity').value, 1, 4, 2);12990
var jumps = clampNum(document.getElementById('des-gravity').value, 2, 4, 2);12937
var fall = clampNum(document.getElementById('des-air').value, 1, 5, 3);12991
var fall = clampNum(document.getElementById('des-air').value, 1, 5, 3);12938
var rise = clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5);12992
var rise = clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5);12939
var colors = [];12993
var colors = [];@@ -12968,8 +13022,10 @@ Designer.syncPreview = function ()12968
{13022
{12969
var p = Designer.draftPlanet();13023
var p = Designer.draftPlanet();12970
var d = (typeof Planet !== 'undefined' && Planet.displayValues) ? Planet.displayValues(p) : null;13024
var d = (typeof Planet !== 'undefined' && Planet.displayValues) ? Planet.displayValues(p) : null;12971
setText('des-gravity-val', Number(document.getElementById('des-gravity').value).toFixed(1)13025
// t1199: gravity as a percentage (2.0 = 100 % = 9.81 g).12972
+ (d ? ' · g ' + d.gravity.toFixed(2) : ''));13026
var gv = clampNum(document.getElementById('des-gravity').value, 2, 4, 2);13027
setText('des-gravity-val', (typeof Planet !== 'undefined' && Planet.formatGravity)13028
? Planet.formatGravity(gv) : Math.round((gv - 1) * 100) + '%');12973
setText('des-air-val', Number(document.getElementById('des-air').value).toFixed(1)13029
setText('des-air-val', Number(document.getElementById('des-air').value).toFixed(1)12974
+ (d ? ' · d ' + d.density.toFixed(2) : ''));13030
+ (d ? ' · d ' + d.density.toFixed(2) : ''));12975
setText('des-mass-val', Number(document.getElementById('des-mass').value).toFixed(1)13031
setText('des-mass-val', Number(document.getElementById('des-mass').value).toFixed(1)@@ -13112,7 +13168,7 @@ Designer.save = function ()13112
id: Designer.editingId || undefined,13168
id: Designer.editingId || undefined,13113
name: name,13169
name: name,13114
people: people,13170
people: people,13115
jumpsToClear: clampNum(document.getElementById('des-gravity').value, 1, 4, 2),13171
jumpsToClear: clampNum(document.getElementById('des-gravity').value, 2, 4, 2),13116
fallTime: clampNum(document.getElementById('des-air').value, 1, 5, 3),13172
fallTime: clampNum(document.getElementById('des-air').value, 1, 5, 3),13117
riseTime: clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5),13173
riseTime: clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5),13118
colors: Designer.slots.slice()13174
colors: Designer.slots.slice()@@ -129,7 +129,7 @@
129
129
</label>
130
130
<label class="des-field des-slider">
131
131
<span data-i18n="designer.gravity">Gravity</span>
132
<input id="des-gravity" type="range" min="1" max="4" step="0.1" value="2">
132
<input id="des-gravity" type="range" min="2" max="4" step="0.1" value="2">
133
133
<span id="des-gravity-val" class="des-val"></span>
134
134
</label>
135
135
<label class="des-field des-slider">
@@ -129,7 +129,7 @@129
</label>129
</label>130
<label class="des-field des-slider">130
<label class="des-field des-slider">131
<span data-i18n="designer.gravity">Gravity</span>131
<span data-i18n="designer.gravity">Gravity</span>132
<input id="des-gravity" type="range" min="1" max="4" step="0.1" value="2">132
<input id="des-gravity" type="range" min="2" max="4" step="0.1" value="2">133
<span id="des-gravity-val" class="des-val"></span>133
<span id="des-gravity-val" class="des-val"></span>134
</label>134
</label>135
<label class="des-field des-slider">135
<label class="des-field des-slider">@@ -253,10 +253,10 @@ Aanname:
253
253
254
254
- Een veld is een planeet, met een naam voor de planeet en voor het volk.
255
255
De catalogus staat in `server/lib/planets.json` (bron voor JS én PHP) en
256
telt **12** werelden, van makkelijk (Aurel: gameplay-Power 0, 60 % miss,
257
getoonde Power 0 %) tot moeilijk (Cinder: gameplay-Power 1, 5 % miss,
256
telt **12** werelden, van makkelijk (Aurel: sinds t1199 gameplay-Power
257
1/9, 53,9 % miss, getoonde Power 10 %; eerst 0 / 60 % / 0 %) tot moeilijk (Cinder: gameplay-Power 1, 5 % miss,
258
258
getoonde Power 92 %). Terra (44 % getoonde Power) blijft de standaard.
259
- Zwaartekracht (`jumpsToClear` 1–4): één sprong haalt
259
- Zwaartekracht (`jumpsToClear` 2–4 sinds t1199, eerst 1–4): één sprong haalt
260
260
`1,5 / jumpsToClear` van de veldhoogte (t1119, +50 %). Luchtweerstand
261
261
(`fallTime` 1–5 s tot de bodem voor losse blokjes; een vliegende
262
262
cluster zweeft na de apex in 2× `fallTime` naar beneden, t1122/t1124).
@@ -274,7 +274,7 @@ Aanname:
274
274
planeet voor de blokjes die jij afschiet (niet de lobby-waarde, niet
275
275
de planeet van het doel). De client kan dat niet vervalsen.
276
276
- De vier getallen op de kiezers en in de HUD: `g` als
277
zwaartekrachtsconstante (m/s²), `d` als luchtdichtheid, `F` in newton,
277
zwaartekracht (sinds t1199 als percentage + g, zie t1199), `d` als luchtdichtheid, `F` in newton,
278
278
getoonde Power als percentage. Alleen de getallen, zonder uitleg.
279
279
Verticale match van 3 = 120 % sprong, +5 % per extra blokje (al
280
280
gebouwd, nergens uitgelegd).
@@ -1243,3 +1243,44 @@ few/many). X = alle bots die over alle gespeelde rondes uitgeschakeld
1243
1243
zijn (`OfflineBattle.defeated`, één keer per bot). Aanname: in de
1244
1244
verloren ronde tellen bots die al vóór jou uit waren mee; de rest niet.
1245
1245
“Je hebt ronde N bereikt.” blijft.
1246
1247
## t1199 — Zwaartekracht minimaal 2,0, getoond als percentage
1248
1249
**Minimum.** `jumpsToClear` loopt nu van 2,0 tot 4,0
1250
(`Planet.GRAVITY_MIN`/`GRAVITY_MAX`, `Planets::GRAVITY_MIN`/`MAX`). De
1251
slider in de planeetontwerper begint op 2; client (`createPlanet`) en
1252
server (`Planets::clampGravity`, bij opslaan in `saveCustomPlanet`)
1253
klemmen alles daaronder naar 2.
1254
1255
**Standaardplaneten** die onder 2 zaten zijn naar 2,0 gezet:
1256
Aurel 1 → 2, Lunara 1 → 2, Zephyr 1 → 2 (lucht en massa ongewijzigd).
1257
1258
**Bestaande eigen planeten.** Gekozen: **klemmen bij laden en opslaan**,
1259
geen migratie van de database. Een oude rij met bijv. 1,2 blijft zo in
1260
de database staan, maar komt overal (lijst, lobby-snapshot, spel) als
1261
2,0 terug; zodra de eigenaar hem opnieuw opslaat staat er 2,0. Zo is er
1262
geen eenmalig script nodig en is het gedrag meteen overal gelijk.
1263
1264
**Weergave.** Lineair in de waarde: `pct = (v − 1) × 100`, dus 2,0 =
1265
100 %, 3,0 = 200 %, 4,0 = 300 %. Tim schreef “100% - 9.81g”; het
1266
g-getal is daarom **meegeschaald met het percentage**:
1267
`g = 9,81 × (v − 1)` (2,0 = 9,81 g, 3,0 = 19,62 g, 4,0 = 29,43 g). Zo
1268
betekent 300 % ook echt 3× 9,81. (Vroeger was het `9,81 × v / 2`,
1269
waardoor 4,0 = 19,62 was en dus niet bij 300 % zou passen.) Tekst via
1270
i18n-sleutel `stats.gravity` (`{pct}% ({g}g)`; in de/fr/pl/ru/es met
1271
spatie: `{pct} % ({g} g)`). Kaarten en HUD: `g 100% (9.81g) d … F … N
1272
Power …%`; ontwerper: label “Zwaartekracht” met `100% (9.81g)`.
1273
1274
**Balans / Power.** De Power-formule houdt bewust de oude as
1275
`(v − 1) / 3`. Daardoor houden alle planeten waarvan de fysica niet
1276
veranderde (Terra, Cinder, …) exact dezelfde Power en miss-kans. Alleen
1277
de drie verhoogde planeten worden moeilijker, wat klopt met hun lagere
1278
sprong: Aurel 0 % → 10 % getoonde Power (miss 60 % → 53,9 %), Lunara
1279
45 % → 55 % (33,1 % → 26,9 %), Zephyr 31 % → 42 % (41,1 % → 35,0 %).
1280
Gevolg: de laagst mogelijke Power is nu 1/9 (getoond 10 %, miss ≈ 54 %)
1281
in plaats van 0. Herschalen naar 2–4 zou Terra en alle andere
1282
ongewijzigde planeten juist makkelijker laten lijken (Terra 44 % → 34 %)
1283
zonder dat er iets aan hun spel veranderde; dat vond ik minder logisch.
1284
Aurel blijft de makkelijkste en Cinder de moeilijkste planeet.
1285
Spronghoogte bij 2,0: 1,5 × 13 / 2 = 9,75 tegels (op de oude 1,0 was
1286
dat 19,5); één sprong vanaf de bodem haalt het veld dus niet meer.
@@ -253,10 +253,10 @@ Aanname:253
253
254
- Een veld is een planeet, met een naam voor de planeet en voor het volk.254
- Een veld is een planeet, met een naam voor de planeet en voor het volk.255
De catalogus staat in `server/lib/planets.json` (bron voor JS én PHP) en255
De catalogus staat in `server/lib/planets.json` (bron voor JS én PHP) en256
telt **12** werelden, van makkelijk (Aurel: gameplay-Power 0, 60 % miss,256
telt **12** werelden, van makkelijk (Aurel: sinds t1199 gameplay-Power257
getoonde Power 0 %) tot moeilijk (Cinder: gameplay-Power 1, 5 % miss,257
1/9, 53,9 % miss, getoonde Power 10 %; eerst 0 / 60 % / 0 %) tot moeilijk (Cinder: gameplay-Power 1, 5 % miss,258
getoonde Power 92 %). Terra (44 % getoonde Power) blijft de standaard.258
getoonde Power 92 %). Terra (44 % getoonde Power) blijft de standaard.259
- Zwaartekracht (`jumpsToClear` 1–4): één sprong haalt259
- Zwaartekracht (`jumpsToClear` 2–4 sinds t1199, eerst 1–4): één sprong haalt260
`1,5 / jumpsToClear` van de veldhoogte (t1119, +50 %). Luchtweerstand260
`1,5 / jumpsToClear` van de veldhoogte (t1119, +50 %). Luchtweerstand261
(`fallTime` 1–5 s tot de bodem voor losse blokjes; een vliegende261
(`fallTime` 1–5 s tot de bodem voor losse blokjes; een vliegende262
cluster zweeft na de apex in 2× `fallTime` naar beneden, t1122/t1124).262
cluster zweeft na de apex in 2× `fallTime` naar beneden, t1122/t1124).@@ -274,7 +274,7 @@ Aanname:274
planeet voor de blokjes die jij afschiet (niet de lobby-waarde, niet274
planeet voor de blokjes die jij afschiet (niet de lobby-waarde, niet275
de planeet van het doel). De client kan dat niet vervalsen.275
de planeet van het doel). De client kan dat niet vervalsen.276
- De vier getallen op de kiezers en in de HUD: `g` als276
- De vier getallen op de kiezers en in de HUD: `g` als277
zwaartekrachtsconstante (m/s²), `d` als luchtdichtheid, `F` in newton,277
zwaartekracht (sinds t1199 als percentage + g, zie t1199), `d` als luchtdichtheid, `F` in newton,278
getoonde Power als percentage. Alleen de getallen, zonder uitleg.278
getoonde Power als percentage. Alleen de getallen, zonder uitleg.279
Verticale match van 3 = 120 % sprong, +5 % per extra blokje (al279
Verticale match van 3 = 120 % sprong, +5 % per extra blokje (al280
gebouwd, nergens uitgelegd).280
gebouwd, nergens uitgelegd).@@ -1243,3 +1243,44 @@ few/many). X = alle bots die over alle gespeelde rondes uitgeschakeld1243
zijn (`OfflineBattle.defeated`, één keer per bot). Aanname: in de1243
zijn (`OfflineBattle.defeated`, één keer per bot). Aanname: in de1244
verloren ronde tellen bots die al vóór jou uit waren mee; de rest niet.1244
verloren ronde tellen bots die al vóór jou uit waren mee; de rest niet.1245
“Je hebt ronde N bereikt.” blijft.1245
“Je hebt ronde N bereikt.” blijft.1246
1247
## t1199 — Zwaartekracht minimaal 2,0, getoond als percentage1248
1249
**Minimum.** `jumpsToClear` loopt nu van 2,0 tot 4,01250
(`Planet.GRAVITY_MIN`/`GRAVITY_MAX`, `Planets::GRAVITY_MIN`/`MAX`). De1251
slider in de planeetontwerper begint op 2; client (`createPlanet`) en1252
server (`Planets::clampGravity`, bij opslaan in `saveCustomPlanet`)1253
klemmen alles daaronder naar 2.1254
1255
**Standaardplaneten** die onder 2 zaten zijn naar 2,0 gezet:1256
Aurel 1 → 2, Lunara 1 → 2, Zephyr 1 → 2 (lucht en massa ongewijzigd).1257
1258
**Bestaande eigen planeten.** Gekozen: **klemmen bij laden en opslaan**,1259
geen migratie van de database. Een oude rij met bijv. 1,2 blijft zo in1260
de database staan, maar komt overal (lijst, lobby-snapshot, spel) als1261
2,0 terug; zodra de eigenaar hem opnieuw opslaat staat er 2,0. Zo is er1262
geen eenmalig script nodig en is het gedrag meteen overal gelijk.1263
1264
**Weergave.** Lineair in de waarde: `pct = (v − 1) × 100`, dus 2,0 =1265
100 %, 3,0 = 200 %, 4,0 = 300 %. Tim schreef “100% - 9.81g”; het1266
g-getal is daarom **meegeschaald met het percentage**:1267
`g = 9,81 × (v − 1)` (2,0 = 9,81 g, 3,0 = 19,62 g, 4,0 = 29,43 g). Zo1268
betekent 300 % ook echt 3× 9,81. (Vroeger was het `9,81 × v / 2`,1269
waardoor 4,0 = 19,62 was en dus niet bij 300 % zou passen.) Tekst via1270
i18n-sleutel `stats.gravity` (`{pct}% ({g}g)`; in de/fr/pl/ru/es met1271
spatie: `{pct} % ({g} g)`). Kaarten en HUD: `g 100% (9.81g) d … F … N1272
Power …%`; ontwerper: label “Zwaartekracht” met `100% (9.81g)`.1273
1274
**Balans / Power.** De Power-formule houdt bewust de oude as1275
`(v − 1) / 3`. Daardoor houden alle planeten waarvan de fysica niet1276
veranderde (Terra, Cinder, …) exact dezelfde Power en miss-kans. Alleen1277
de drie verhoogde planeten worden moeilijker, wat klopt met hun lagere1278
sprong: Aurel 0 % → 10 % getoonde Power (miss 60 % → 53,9 %), Lunara1279
45 % → 55 % (33,1 % → 26,9 %), Zephyr 31 % → 42 % (41,1 % → 35,0 %).1280
Gevolg: de laagst mogelijke Power is nu 1/9 (getoond 10 %, miss ≈ 54 %)1281
in plaats van 0. Herschalen naar 2–4 zou Terra en alle andere1282
ongewijzigde planeten juist makkelijker laten lijken (Terra 44 % → 34 %)1283
zonder dat er iets aan hun spel veranderde; dat vond ik minder logisch.1284
Aurel blijft de makkelijkste en Cinder de moeilijkste planeet.1285
Spronghoogte bij 2,0: 1,5 × 13 / 2 = 9,75 tegels (op de oude 1,0 was1286
dat 19,5); één sprong vanaf de bodem haalt het veld dus niet meer.@@ -63,12 +63,24 @@ final class Planets
63
63
return self::byId($id) !== null;
64
64
}
65
65
66
/** t1199: gravity (jumpsToClear) range; lower values clamp up to 2. */
67
public const GRAVITY_MIN = 2.0;
68
public const GRAVITY_MAX = 4.0;
69
/** t1199: g shown at 100 % (jumpsToClear 2); display g = 9.81·(v − 1). */
70
public const EARTH_G = 9.81;
71
72
public static function clampGravity(float $v): float
73
{
74
return self::clamp($v, self::GRAVITY_MIN, self::GRAVITY_MAX);
75
}
76
66
77
/** Difficulty in 0..1. Higher is harder. */
67
78
public static function power(array $planet): float
68
79
{
69
$j = self::clamp((float) ($planet['jumpsToClear'] ?? 2), 1, 4);
80
$j = self::clamp((float) ($planet['jumpsToClear'] ?? 2), self::GRAVITY_MIN, self::GRAVITY_MAX);
70
81
$f = self::clamp((float) ($planet['fallTime'] ?? 3), 1, 5);
71
82
$r = self::clamp((float) ($planet['riseTime'] ?? 1.5), 0.5, 3);
83
// t1199: kept on the old 1..4 axis so unchanged planets keep their Power.
72
84
$gravity = ($j - 1) / 3;
73
85
$air = (5 - $f) / 4;
74
86
$mass = (3 - $r) / 2.5;
@@ -103,11 +115,12 @@ final class Planets
103
115
/** @return array{gravity:float,density:float,newtons:float,power:int,missChance:float} */
104
116
public static function displayValues(array $planet): array
105
117
{
106
$j = self::clamp((float) ($planet['jumpsToClear'] ?? 2), 1, 4);
118
$j = self::clamp((float) ($planet['jumpsToClear'] ?? 2), self::GRAVITY_MIN, self::GRAVITY_MAX);
107
119
$f = self::clamp((float) ($planet['fallTime'] ?? 3), 1, 5);
108
120
$r = self::clamp((float) ($planet['riseTime'] ?? 1.5), 0.5, 3);
109
121
return [
110
'gravity' => 9.81 * $j / 2,
122
'gravity' => self::EARTH_G * ($j - 1),
123
'gravityPct' => (int) round(($j - 1) * 100),
111
124
'density' => 0.25 + ((5 - $f) / 4) * 1.60,
112
125
'newtons' => 40 + (($r - 0.5) / 2.5) * 160,
113
126
'power' => self::displayPower($planet),
@@ -140,7 +153,7 @@ final class Planets
140
153
'id' => (string) $p['id'],
141
154
'name' => (string) $p['name'],
142
155
'people' => (string) $p['people'],
143
'jumpsToClear' => (float) $p['jumpsToClear'],
156
'jumpsToClear' => self::clampGravity((float) $p['jumpsToClear']),
144
157
'fallTime' => (float) $p['fallTime'],
145
158
'riseTime' => (float) $p['riseTime'],
146
159
'miss_chance' => $d['missChance'],
@@ -171,7 +184,7 @@ final class Planets
171
184
'id' => (string) ($p['id'] ?? ''),
172
185
'name' => (string) ($p['name'] ?? ''),
173
186
'people' => (string) ($p['people'] ?? ''),
174
'jumpsToClear' => (float) ($p['jumpsToClear'] ?? 2),
187
'jumpsToClear' => self::clamp((float) ($p['jumpsToClear'] ?? 2), self::GRAVITY_MIN, self::GRAVITY_MAX),
175
188
'fallTime' => (float) ($p['fallTime'] ?? 3),
176
189
'riseTime' => (float) ($p['riseTime'] ?? 1.5),
177
190
'miss_chance' => $d['missChance'],
@@ -63,12 +63,24 @@ final class Planets63
return self::byId($id) !== null;63
return self::byId($id) !== null;64
}64
}65
65
66
/** t1199: gravity (jumpsToClear) range; lower values clamp up to 2. */67
public const GRAVITY_MIN = 2.0;68
public const GRAVITY_MAX = 4.0;69
/** t1199: g shown at 100 % (jumpsToClear 2); display g = 9.81·(v − 1). */70
public const EARTH_G = 9.81;71
72
public static function clampGravity(float $v): float73
{74
return self::clamp($v, self::GRAVITY_MIN, self::GRAVITY_MAX);75
}76
66
/** Difficulty in 0..1. Higher is harder. */77
/** Difficulty in 0..1. Higher is harder. */67
public static function power(array $planet): float78
public static function power(array $planet): float68
{79
{69
$j = self::clamp((float) ($planet['jumpsToClear'] ?? 2), 1, 4);80
$j = self::clamp((float) ($planet['jumpsToClear'] ?? 2), self::GRAVITY_MIN, self::GRAVITY_MAX);70
$f = self::clamp((float) ($planet['fallTime'] ?? 3), 1, 5);81
$f = self::clamp((float) ($planet['fallTime'] ?? 3), 1, 5);71
$r = self::clamp((float) ($planet['riseTime'] ?? 1.5), 0.5, 3);82
$r = self::clamp((float) ($planet['riseTime'] ?? 1.5), 0.5, 3);83
// t1199: kept on the old 1..4 axis so unchanged planets keep their Power.72
$gravity = ($j - 1) / 3;84
$gravity = ($j - 1) / 3;73
$air = (5 - $f) / 4;85
$air = (5 - $f) / 4;74
$mass = (3 - $r) / 2.5;86
$mass = (3 - $r) / 2.5;@@ -103,11 +115,12 @@ final class Planets103
/** @return array{gravity:float,density:float,newtons:float,power:int,missChance:float} */115
/** @return array{gravity:float,density:float,newtons:float,power:int,missChance:float} */104
public static function displayValues(array $planet): array116
public static function displayValues(array $planet): array105
{117
{106
$j = self::clamp((float) ($planet['jumpsToClear'] ?? 2), 1, 4);118
$j = self::clamp((float) ($planet['jumpsToClear'] ?? 2), self::GRAVITY_MIN, self::GRAVITY_MAX);107
$f = self::clamp((float) ($planet['fallTime'] ?? 3), 1, 5);119
$f = self::clamp((float) ($planet['fallTime'] ?? 3), 1, 5);108
$r = self::clamp((float) ($planet['riseTime'] ?? 1.5), 0.5, 3);120
$r = self::clamp((float) ($planet['riseTime'] ?? 1.5), 0.5, 3);109
return [121
return [110
'gravity' => 9.81 * $j / 2,122
'gravity' => self::EARTH_G * ($j - 1),123
'gravityPct' => (int) round(($j - 1) * 100),111
'density' => 0.25 + ((5 - $f) / 4) * 1.60,124
'density' => 0.25 + ((5 - $f) / 4) * 1.60,112
'newtons' => 40 + (($r - 0.5) / 2.5) * 160,125
'newtons' => 40 + (($r - 0.5) / 2.5) * 160,113
'power' => self::displayPower($planet),126
'power' => self::displayPower($planet),@@ -140,7 +153,7 @@ final class Planets140
'id' => (string) $p['id'],153
'id' => (string) $p['id'],141
'name' => (string) $p['name'],154
'name' => (string) $p['name'],142
'people' => (string) $p['people'],155
'people' => (string) $p['people'],143
'jumpsToClear' => (float) $p['jumpsToClear'],156
'jumpsToClear' => self::clampGravity((float) $p['jumpsToClear']),144
'fallTime' => (float) $p['fallTime'],157
'fallTime' => (float) $p['fallTime'],145
'riseTime' => (float) $p['riseTime'],158
'riseTime' => (float) $p['riseTime'],146
'miss_chance' => $d['missChance'],159
'miss_chance' => $d['missChance'],@@ -171,7 +184,7 @@ final class Planets171
'id' => (string) ($p['id'] ?? ''),184
'id' => (string) ($p['id'] ?? ''),172
'name' => (string) ($p['name'] ?? ''),185
'name' => (string) ($p['name'] ?? ''),173
'people' => (string) ($p['people'] ?? ''),186
'people' => (string) ($p['people'] ?? ''),174
'jumpsToClear' => (float) ($p['jumpsToClear'] ?? 2),187
'jumpsToClear' => self::clamp((float) ($p['jumpsToClear'] ?? 2), self::GRAVITY_MIN, self::GRAVITY_MAX),175
'fallTime' => (float) ($p['fallTime'] ?? 3),188
'fallTime' => (float) ($p['fallTime'] ?? 3),176
'riseTime' => (float) ($p['riseTime'] ?? 1.5),189
'riseTime' => (float) ($p['riseTime'] ?? 1.5),177
'miss_chance' => $d['missChance'],190
'miss_chance' => $d['missChance'],@@ -1037,7 +1037,7 @@ SQL);
1037
1037
return $this->transaction(function () use ($userId, $data) {
1038
1038
$name = self::sanitizeName((string) ($data['name'] ?? ''), 'planeetnaam');
1039
1039
$people = self::sanitizeName((string) ($data['people'] ?? ''), 'bevolkingsnaam');
1040
$j = self::clampFloat((float) ($data['jumpsToClear'] ?? 2), 1, 4);
1040
$j = Planets::clampGravity((float) ($data['jumpsToClear'] ?? 2));
1041
1041
$f = self::clampFloat((float) ($data['fallTime'] ?? 3), 1, 5);
1042
1042
$r = self::clampFloat((float) ($data['riseTime'] ?? 1.5), 0.5, 3);
1043
1043
$ids = $data['colors'] ?? $data['blocks'] ?? [];
@@ -1122,7 +1122,8 @@ SQL);
1122
1122
'id' => (string) $row['id'],
1123
1123
'name' => (string) $row['name'],
1124
1124
'people' => (string) $row['people'],
1125
'jumpsToClear' => (float) $row['jumps_to_clear'],
1125
// t1199: old custom planets below 2 clamp up on load.
1126
'jumpsToClear' => Planets::clampGravity((float) $row['jumps_to_clear']),
1126
1127
'fallTime' => (float) $row['fall_time'],
1127
1128
'riseTime' => (float) $row['rise_time'],
1128
1129
'colors' => $colors,
@@ -1037,7 +1037,7 @@ SQL);1037
return $this->transaction(function () use ($userId, $data) {1037
return $this->transaction(function () use ($userId, $data) {1038
$name = self::sanitizeName((string) ($data['name'] ?? ''), 'planeetnaam');1038
$name = self::sanitizeName((string) ($data['name'] ?? ''), 'planeetnaam');1039
$people = self::sanitizeName((string) ($data['people'] ?? ''), 'bevolkingsnaam');1039
$people = self::sanitizeName((string) ($data['people'] ?? ''), 'bevolkingsnaam');1040
$j = self::clampFloat((float) ($data['jumpsToClear'] ?? 2), 1, 4);1040
$j = Planets::clampGravity((float) ($data['jumpsToClear'] ?? 2));1041
$f = self::clampFloat((float) ($data['fallTime'] ?? 3), 1, 5);1041
$f = self::clampFloat((float) ($data['fallTime'] ?? 3), 1, 5);1042
$r = self::clampFloat((float) ($data['riseTime'] ?? 1.5), 0.5, 3);1042
$r = self::clampFloat((float) ($data['riseTime'] ?? 1.5), 0.5, 3);1043
$ids = $data['colors'] ?? $data['blocks'] ?? [];1043
$ids = $data['colors'] ?? $data['blocks'] ?? [];@@ -1122,7 +1122,8 @@ SQL);1122
'id' => (string) $row['id'],1122
'id' => (string) $row['id'],1123
'name' => (string) $row['name'],1123
'name' => (string) $row['name'],1124
'people' => (string) $row['people'],1124
'people' => (string) $row['people'],1125
'jumpsToClear' => (float) $row['jumps_to_clear'],1125
// t1199: old custom planets below 2 clamp up on load.1126
'jumpsToClear' => Planets::clampGravity((float) $row['jumps_to_clear']),1126
'fallTime' => (float) $row['fall_time'],1127
'fallTime' => (float) $row['fall_time'],1127
'riseTime' => (float) $row['rise_time'],1128
'riseTime' => (float) $row['rise_time'],1128
'colors' => $colors,1129
'colors' => $colors,@@ -287,7 +287,8 @@
287
287
"offline.defeated.one": "{n} opponent defeated",
288
288
"offline.defeated.few": "{n} opponents defeated",
289
289
"offline.defeated.many": "{n} opponents defeated",
290
"offline.defeated.other": "{n} opponents defeated"
290
"offline.defeated.other": "{n} opponents defeated",
291
"stats.gravity": "{pct}% ({g}g)"
291
292
},
292
293
"nl": {
293
294
"menu.play": "Spelen",
@@ -576,7 +577,8 @@
576
577
"offline.defeated.one": "{n} tegenstander verslagen",
577
578
"offline.defeated.few": "{n} tegenstanders verslagen",
578
579
"offline.defeated.many": "{n} tegenstanders verslagen",
579
"offline.defeated.other": "{n} tegenstanders verslagen"
580
"offline.defeated.other": "{n} tegenstanders verslagen",
581
"stats.gravity": "{pct}% ({g}g)"
580
582
},
581
583
"de": {
582
584
"menu.play": "Spielen",
@@ -865,7 +867,8 @@
865
867
"offline.defeated.one": "{n} Gegner besiegt",
866
868
"offline.defeated.few": "{n} Gegner besiegt",
867
869
"offline.defeated.many": "{n} Gegner besiegt",
868
"offline.defeated.other": "{n} Gegner besiegt"
870
"offline.defeated.other": "{n} Gegner besiegt",
871
"stats.gravity": "{pct} % ({g} g)"
869
872
},
870
873
"fr": {
871
874
"menu.play": "Jouer",
@@ -1154,7 +1157,8 @@
1154
1157
"offline.defeated.one": "{n} adversaire vaincu",
1155
1158
"offline.defeated.few": "{n} adversaires vaincus",
1156
1159
"offline.defeated.many": "{n} adversaires vaincus",
1157
"offline.defeated.other": "{n} adversaires vaincus"
1160
"offline.defeated.other": "{n} adversaires vaincus",
1161
"stats.gravity": "{pct} % ({g} g)"
1158
1162
},
1159
1163
"ja": {
1160
1164
"menu.play": "プレイ",
@@ -1443,7 +1447,8 @@
1443
1447
"offline.defeated.one": "{n}人の相手を倒した",
1444
1448
"offline.defeated.few": "{n}人の相手を倒した",
1445
1449
"offline.defeated.many": "{n}人の相手を倒した",
1446
"offline.defeated.other": "{n}人の相手を倒した"
1450
"offline.defeated.other": "{n}人の相手を倒した",
1451
"stats.gravity": "{pct}% ({g}g)"
1447
1452
},
1448
1453
"zh": {
1449
1454
"menu.play": "开始游戏",
@@ -1732,7 +1737,8 @@
1732
1737
"offline.defeated.one": "击败了 {n} 名对手",
1733
1738
"offline.defeated.few": "击败了 {n} 名对手",
1734
1739
"offline.defeated.many": "击败了 {n} 名对手",
1735
"offline.defeated.other": "击败了 {n} 名对手"
1740
"offline.defeated.other": "击败了 {n} 名对手",
1741
"stats.gravity": "{pct}% ({g}g)"
1736
1742
},
1737
1743
"ko": {
1738
1744
"menu.play": "플레이",
@@ -2021,7 +2027,8 @@
2021
2027
"offline.defeated.one": "상대 {n}명 격파",
2022
2028
"offline.defeated.few": "상대 {n}명 격파",
2023
2029
"offline.defeated.many": "상대 {n}명 격파",
2024
"offline.defeated.other": "상대 {n}명 격파"
2030
"offline.defeated.other": "상대 {n}명 격파",
2031
"stats.gravity": "{pct}% ({g}g)"
2025
2032
},
2026
2033
"pl": {
2027
2034
"menu.play": "Graj",
@@ -2310,7 +2317,8 @@
2310
2317
"offline.defeated.one": "{n} pokonany przeciwnik",
2311
2318
"offline.defeated.few": "{n} pokonanych przeciwników",
2312
2319
"offline.defeated.many": "{n} pokonanych przeciwników",
2313
"offline.defeated.other": "{n} pokonanych przeciwników"
2320
"offline.defeated.other": "{n} pokonanych przeciwników",
2321
"stats.gravity": "{pct} % ({g} g)"
2314
2322
},
2315
2323
"ru": {
2316
2324
"menu.play": "Играть",
@@ -2599,7 +2607,8 @@
2599
2607
"offline.defeated.one": "{n} противник побеждён",
2600
2608
"offline.defeated.few": "{n} противника побеждено",
2601
2609
"offline.defeated.many": "{n} противников побеждено",
2602
"offline.defeated.other": "{n} противников побеждено"
2610
"offline.defeated.other": "{n} противников побеждено",
2611
"stats.gravity": "{pct} % ({g} g)"
2603
2612
},
2604
2613
"es": {
2605
2614
"menu.play": "Jugar",
@@ -2888,7 +2897,8 @@
2888
2897
"offline.defeated.one": "{n} rival derrotado",
2889
2898
"offline.defeated.few": "{n} rivales derrotados",
2890
2899
"offline.defeated.many": "{n} rivales derrotados",
2891
"offline.defeated.other": "{n} rivales derrotados"
2900
"offline.defeated.other": "{n} rivales derrotados",
2901
"stats.gravity": "{pct} % ({g} g)"
2892
2902
}
2893
2903
},
2894
2904
"errors": {
@@ -287,7 +287,8 @@287
"offline.defeated.one": "{n} opponent defeated",287
"offline.defeated.one": "{n} opponent defeated",288
"offline.defeated.few": "{n} opponents defeated",288
"offline.defeated.few": "{n} opponents defeated",289
"offline.defeated.many": "{n} opponents defeated",289
"offline.defeated.many": "{n} opponents defeated",290
"offline.defeated.other": "{n} opponents defeated"290
"offline.defeated.other": "{n} opponents defeated",291
"stats.gravity": "{pct}% ({g}g)"291
},292
},292
"nl": {293
"nl": {293
"menu.play": "Spelen",294
"menu.play": "Spelen",@@ -576,7 +577,8 @@576
"offline.defeated.one": "{n} tegenstander verslagen",577
"offline.defeated.one": "{n} tegenstander verslagen",577
"offline.defeated.few": "{n} tegenstanders verslagen",578
"offline.defeated.few": "{n} tegenstanders verslagen",578
"offline.defeated.many": "{n} tegenstanders verslagen",579
"offline.defeated.many": "{n} tegenstanders verslagen",579
"offline.defeated.other": "{n} tegenstanders verslagen"580
"offline.defeated.other": "{n} tegenstanders verslagen",581
"stats.gravity": "{pct}% ({g}g)"580
},582
},581
"de": {583
"de": {582
"menu.play": "Spielen",584
"menu.play": "Spielen",@@ -865,7 +867,8 @@865
"offline.defeated.one": "{n} Gegner besiegt",867
"offline.defeated.one": "{n} Gegner besiegt",866
"offline.defeated.few": "{n} Gegner besiegt",868
"offline.defeated.few": "{n} Gegner besiegt",867
"offline.defeated.many": "{n} Gegner besiegt",869
"offline.defeated.many": "{n} Gegner besiegt",868
"offline.defeated.other": "{n} Gegner besiegt"870
"offline.defeated.other": "{n} Gegner besiegt",871
"stats.gravity": "{pct} % ({g} g)"869
},872
},870
"fr": {873
"fr": {871
"menu.play": "Jouer",874
"menu.play": "Jouer",@@ -1154,7 +1157,8 @@1154
"offline.defeated.one": "{n} adversaire vaincu",1157
"offline.defeated.one": "{n} adversaire vaincu",1155
"offline.defeated.few": "{n} adversaires vaincus",1158
"offline.defeated.few": "{n} adversaires vaincus",1156
"offline.defeated.many": "{n} adversaires vaincus",1159
"offline.defeated.many": "{n} adversaires vaincus",1157
"offline.defeated.other": "{n} adversaires vaincus"1160
"offline.defeated.other": "{n} adversaires vaincus",1161
"stats.gravity": "{pct} % ({g} g)"1158
},1162
},1159
"ja": {1163
"ja": {1160
"menu.play": "プレイ",1164
"menu.play": "プレイ",@@ -1443,7 +1447,8 @@1443
"offline.defeated.one": "{n}人の相手を倒した",1447
"offline.defeated.one": "{n}人の相手を倒した",1444
"offline.defeated.few": "{n}人の相手を倒した",1448
"offline.defeated.few": "{n}人の相手を倒した",1445
"offline.defeated.many": "{n}人の相手を倒した",1449
"offline.defeated.many": "{n}人の相手を倒した",1446
"offline.defeated.other": "{n}人の相手を倒した"1450
"offline.defeated.other": "{n}人の相手を倒した",1451
"stats.gravity": "{pct}% ({g}g)"1447
},1452
},1448
"zh": {1453
"zh": {1449
"menu.play": "开始游戏",1454
"menu.play": "开始游戏",@@ -1732,7 +1737,8 @@1732
"offline.defeated.one": "击败了 {n} 名对手",1737
"offline.defeated.one": "击败了 {n} 名对手",1733
"offline.defeated.few": "击败了 {n} 名对手",1738
"offline.defeated.few": "击败了 {n} 名对手",1734
"offline.defeated.many": "击败了 {n} 名对手",1739
"offline.defeated.many": "击败了 {n} 名对手",1735
"offline.defeated.other": "击败了 {n} 名对手"1740
"offline.defeated.other": "击败了 {n} 名对手",1741
"stats.gravity": "{pct}% ({g}g)"1736
},1742
},1737
"ko": {1743
"ko": {1738
"menu.play": "플레이",1744
"menu.play": "플레이",@@ -2021,7 +2027,8 @@2021
"offline.defeated.one": "상대 {n}명 격파",2027
"offline.defeated.one": "상대 {n}명 격파",2022
"offline.defeated.few": "상대 {n}명 격파",2028
"offline.defeated.few": "상대 {n}명 격파",2023
"offline.defeated.many": "상대 {n}명 격파",2029
"offline.defeated.many": "상대 {n}명 격파",2024
"offline.defeated.other": "상대 {n}명 격파"2030
"offline.defeated.other": "상대 {n}명 격파",2031
"stats.gravity": "{pct}% ({g}g)"2025
},2032
},2026
"pl": {2033
"pl": {2027
"menu.play": "Graj",2034
"menu.play": "Graj",@@ -2310,7 +2317,8 @@2310
"offline.defeated.one": "{n} pokonany przeciwnik",2317
"offline.defeated.one": "{n} pokonany przeciwnik",2311
"offline.defeated.few": "{n} pokonanych przeciwników",2318
"offline.defeated.few": "{n} pokonanych przeciwników",2312
"offline.defeated.many": "{n} pokonanych przeciwników",2319
"offline.defeated.many": "{n} pokonanych przeciwników",2313
"offline.defeated.other": "{n} pokonanych przeciwników"2320
"offline.defeated.other": "{n} pokonanych przeciwników",2321
"stats.gravity": "{pct} % ({g} g)"2314
},2322
},2315
"ru": {2323
"ru": {2316
"menu.play": "Играть",2324
"menu.play": "Играть",@@ -2599,7 +2607,8 @@2599
"offline.defeated.one": "{n} противник побеждён",2607
"offline.defeated.one": "{n} противник побеждён",2600
"offline.defeated.few": "{n} противника побеждено",2608
"offline.defeated.few": "{n} противника побеждено",2601
"offline.defeated.many": "{n} противников побеждено",2609
"offline.defeated.many": "{n} противников побеждено",2602
"offline.defeated.other": "{n} противников побеждено"2610
"offline.defeated.other": "{n} противников побеждено",2611
"stats.gravity": "{pct} % ({g} g)"2603
},2612
},2604
"es": {2613
"es": {2605
"menu.play": "Jugar",2614
"menu.play": "Jugar",@@ -2888,7 +2897,8 @@2888
"offline.defeated.one": "{n} rival derrotado",2897
"offline.defeated.one": "{n} rival derrotado",2889
"offline.defeated.few": "{n} rivales derrotados",2898
"offline.defeated.few": "{n} rivales derrotados",2890
"offline.defeated.many": "{n} rivales derrotados",2899
"offline.defeated.many": "{n} rivales derrotados",2891
"offline.defeated.other": "{n} rivales derrotados"2900
"offline.defeated.other": "{n} rivales derrotados",2901
"stats.gravity": "{pct} % ({g} g)"2892
}2902
}2893
},2903
},2894
"errors": {2904
"errors": {@@ -19,7 +19,7 @@
19
19
"id": "aurel",
20
20
"name": "Aurel",
21
21
"people": "Aurelians",
22
"jumpsToClear": 1,
22
"jumpsToClear": 2,
23
23
"fallTime": 5,
24
24
"riseTime": 3,
25
25
"colors": [
@@ -49,7 +49,7 @@
49
49
"id": "lunara",
50
50
"name": "Lunara",
51
51
"people": "Lunarites",
52
"jumpsToClear": 1,
52
"jumpsToClear": 2,
53
53
"fallTime": 2,
54
54
"riseTime": 1.2,
55
55
"colors": [
@@ -139,7 +139,7 @@
139
139
"id": "zephyr",
140
140
"name": "Zephyr",
141
141
"people": "Zephyrites",
142
"jumpsToClear": 1,
142
"jumpsToClear": 2,
143
143
"fallTime": 1.2,
144
144
"riseTime": 2.8,
145
145
"colors": [
@@ -19,7 +19,7 @@19
"id": "aurel",19
"id": "aurel",20
"name": "Aurel",20
"name": "Aurel",21
"people": "Aurelians",21
"people": "Aurelians",22
"jumpsToClear": 1,22
"jumpsToClear": 2,23
"fallTime": 5,23
"fallTime": 5,24
"riseTime": 3,24
"riseTime": 3,25
"colors": [25
"colors": [@@ -49,7 +49,7 @@49
"id": "lunara",49
"id": "lunara",50
"name": "Lunara",50
"name": "Lunara",51
"people": "Lunarites",51
"people": "Lunarites",52
"jumpsToClear": 1,52
"jumpsToClear": 2,53
"fallTime": 2,53
"fallTime": 2,54
"riseTime": 1.2,54
"riseTime": 1.2,55
"colors": [55
"colors": [@@ -139,7 +139,7 @@139
"id": "zephyr",139
"id": "zephyr",140
"name": "Zephyr",140
"name": "Zephyr",141
"people": "Zephyrites",141
"people": "Zephyrites",142
"jumpsToClear": 1,142
"jumpsToClear": 2,143
"fallTime": 1.2,143
"fallTime": 1.2,144
"riseTime": 2.8,144
"riseTime": 2.8,145
"colors": [145
"colors": [@@ -197,13 +197,26 @@ expect($none === [] || $none[0]['miss'] === true, 'no living target after oppone
197
197
echo "\nPlanets and per-sender Power miss\n";
198
198
expect(count(Planets::all()) >= 8 && count(Planets::all()) <= 12, 'catalog has 8–12 planets');
199
199
expect(Planets::known('terra') && Planets::known('cinder') && Planets::known('aurel'), 'terra, cinder, aurel exist');
200
expect(almostEqual(Planets::power(Planets::byId('aurel')), 0.0), 'Aurel power 0');
201
expect(almostEqual(Planets::missChance(Planets::byId('aurel')), 0.60), 'Aurel miss 60%');
200
expect(almostEqual(Planets::power(Planets::byId('aurel')), 1 / 9), 'Aurel power 1/9 (gravity 2 since t1199)');
201
expect(almostEqual(Planets::missChance(Planets::byId('aurel')), 0.60 - 0.55 / 9), 'Aurel miss ~53.9%');
202
202
expect(almostEqual(Planets::power(Planets::byId('cinder')), 1.0), 'Cinder power 1');
203
203
expect(almostEqual(Planets::missChance(Planets::byId('cinder')), 0.05), 'Cinder miss 5%');
204
204
$td = Planets::displayValues(Planets::byId('terra'));
205
205
expect(almostEqual($td['gravity'], 9.81) && almostEqual($td['density'], 1.05) && (int) round($td['newtons']) === 104 && $td['power'] === 44, 'Terra display g/d/F/Power');
206
expect(Planets::displayPower(Planets::byId('aurel')) === 0, 'Aurel displayed Power 0');
206
expect(Planets::displayPower(Planets::byId('aurel')) === 10, 'Aurel displayed Power 10');
207
208
echo "\nGravity minimum 2 (t1199)\n";
209
foreach (Planets::all() as $pl) {
210
expect((float) $pl['jumpsToClear'] >= 2.0, 'catalog gravity >= 2: ' . $pl['id']);
211
}
212
foreach (['aurel', 'lunara', 'zephyr'] as $pid) {
213
expect(almostEqual((float) Planets::byId($pid)['jumpsToClear'], 2.0), "$pid raised to 2.0");
214
}
215
expect(Planets::GRAVITY_MIN === 2.0 && Planets::GRAVITY_MAX === 4.0, 'gravity range constants');
216
expect(almostEqual(Planets::clampGravity(1.0), 2.0) && almostEqual(Planets::clampGravity(3.3), 3.3) && almostEqual(Planets::clampGravity(9), 4.0), 'clampGravity');
217
$tdG = Planets::displayValues(['jumpsToClear' => 4, 'fallTime' => 3, 'riseTime' => 1.5]);
218
expect(almostEqual($tdG['gravity'], 29.43) && $tdG['gravityPct'] === 300, 'gravity 4 shows 300% / 29.43 g');
219
expect(Planets::displayValues(Planets::byId('terra'))['gravityPct'] === 100, 'Terra 100%');
207
220
expect(Planets::displayPower(Planets::byId('cinder')) === 92, 'Cinder displayed Power 92 (5% miss)');
208
221
expect(Planets::displayValues(Planets::byId('cinder'))['power'] === 92, 'Cinder displayValues Power 92');
209
222
@@ -216,7 +229,7 @@ $byId = [];
216
229
foreach ($presented['players'] as $plr) { $byId[$plr['id']] = $plr; }
217
230
expect($byId['local:test_user_1']['planet']['id'] === 'aurel', 'host planet aurel');
218
231
expect($byId['local:test_user_2']['planet']['id'] === 'cinder', 'guest planet cinder');
219
expect(almostEqual($byId['local:test_user_1']['planet']['miss_chance'], 0.60), 'host miss from Aurel Power');
232
expect(almostEqual($byId['local:test_user_1']['planet']['miss_chance'], 0.60 - 0.55 / 9), 'host miss from Aurel Power');
220
233
expect(almostEqual($byId['local:test_user_2']['planet']['miss_chance'], 0.05), 'guest miss from Cinder Power');
221
234
222
235
$store->setPlanet('local:test_user_1', 'wisp');
@@ -434,6 +447,20 @@ expect($snap['owner_id'] === $u, 'owner_id set');
434
447
$listed = $ptsStore->listCustomPlanets($u);
435
448
expect(count($listed) === 1, 'owner lists the planet');
436
449
450
echo "Custom planet gravity clamp (t1199)\n";
451
$low = $ptsStore->saveCustomPlanet($u, [
452
'name' => 'Lowgrav', 'people' => 'Floaters',
453
'jumpsToClear' => 1, 'fallTime' => 3, 'riseTime' => 1.5,
454
'colors' => $terraIds,
455
]);
456
expect(almostEqual((float) $low['jumpsToClear'], 2.0), 'saving gravity 1 stores 2');
457
$rawPdo = new PDO('sqlite:' . $tmp . '/meteors.sqlite');
458
$rawPdo->exec("UPDATE custom_planets SET jumps_to_clear = 1.2 WHERE id = '" . $low['id'] . "'");
459
$lowList = array_values(array_filter($ptsStore->listCustomPlanets($u), fn($pl) => $pl['id'] === $low['id']));
460
expect(count($lowList) === 1 && almostEqual((float) $lowList[0]['jumpsToClear'], 2.0), 'an old row with 1.2 loads as 2');
461
$ptsStore->deleteCustomPlanet($u, $low['id']);
462
463
437
464
echo "Last chosen planet (t1196)\n";
438
465
expect($ptsStore->lastPlanet($u) === null, 'no last planet stored yet');
439
466
expect($ptsStore->profilePayload($u)['last_planet'] === null, 'payload last_planet null');
@@ -197,13 +197,26 @@ expect($none === [] || $none[0]['miss'] === true, 'no living target after oppone197
echo "\nPlanets and per-sender Power miss\n";197
echo "\nPlanets and per-sender Power miss\n";198
expect(count(Planets::all()) >= 8 && count(Planets::all()) <= 12, 'catalog has 8–12 planets');198
expect(count(Planets::all()) >= 8 && count(Planets::all()) <= 12, 'catalog has 8–12 planets');199
expect(Planets::known('terra') && Planets::known('cinder') && Planets::known('aurel'), 'terra, cinder, aurel exist');199
expect(Planets::known('terra') && Planets::known('cinder') && Planets::known('aurel'), 'terra, cinder, aurel exist');200
expect(almostEqual(Planets::power(Planets::byId('aurel')), 0.0), 'Aurel power 0');200
expect(almostEqual(Planets::power(Planets::byId('aurel')), 1 / 9), 'Aurel power 1/9 (gravity 2 since t1199)');201
expect(almostEqual(Planets::missChance(Planets::byId('aurel')), 0.60), 'Aurel miss 60%');201
expect(almostEqual(Planets::missChance(Planets::byId('aurel')), 0.60 - 0.55 / 9), 'Aurel miss ~53.9%');202
expect(almostEqual(Planets::power(Planets::byId('cinder')), 1.0), 'Cinder power 1');202
expect(almostEqual(Planets::power(Planets::byId('cinder')), 1.0), 'Cinder power 1');203
expect(almostEqual(Planets::missChance(Planets::byId('cinder')), 0.05), 'Cinder miss 5%');203
expect(almostEqual(Planets::missChance(Planets::byId('cinder')), 0.05), 'Cinder miss 5%');204
$td = Planets::displayValues(Planets::byId('terra'));204
$td = Planets::displayValues(Planets::byId('terra'));205
expect(almostEqual($td['gravity'], 9.81) && almostEqual($td['density'], 1.05) && (int) round($td['newtons']) === 104 && $td['power'] === 44, 'Terra display g/d/F/Power');205
expect(almostEqual($td['gravity'], 9.81) && almostEqual($td['density'], 1.05) && (int) round($td['newtons']) === 104 && $td['power'] === 44, 'Terra display g/d/F/Power');206
expect(Planets::displayPower(Planets::byId('aurel')) === 0, 'Aurel displayed Power 0');206
expect(Planets::displayPower(Planets::byId('aurel')) === 10, 'Aurel displayed Power 10');207
208
echo "\nGravity minimum 2 (t1199)\n";209
foreach (Planets::all() as $pl) {210
expect((float) $pl['jumpsToClear'] >= 2.0, 'catalog gravity >= 2: ' . $pl['id']);211
}212
foreach (['aurel', 'lunara', 'zephyr'] as $pid) {213
expect(almostEqual((float) Planets::byId($pid)['jumpsToClear'], 2.0), "$pid raised to 2.0");214
}215
expect(Planets::GRAVITY_MIN === 2.0 && Planets::GRAVITY_MAX === 4.0, 'gravity range constants');216
expect(almostEqual(Planets::clampGravity(1.0), 2.0) && almostEqual(Planets::clampGravity(3.3), 3.3) && almostEqual(Planets::clampGravity(9), 4.0), 'clampGravity');217
$tdG = Planets::displayValues(['jumpsToClear' => 4, 'fallTime' => 3, 'riseTime' => 1.5]);218
expect(almostEqual($tdG['gravity'], 29.43) && $tdG['gravityPct'] === 300, 'gravity 4 shows 300% / 29.43 g');219
expect(Planets::displayValues(Planets::byId('terra'))['gravityPct'] === 100, 'Terra 100%');207
expect(Planets::displayPower(Planets::byId('cinder')) === 92, 'Cinder displayed Power 92 (5% miss)');220
expect(Planets::displayPower(Planets::byId('cinder')) === 92, 'Cinder displayed Power 92 (5% miss)');208
expect(Planets::displayValues(Planets::byId('cinder'))['power'] === 92, 'Cinder displayValues Power 92');221
expect(Planets::displayValues(Planets::byId('cinder'))['power'] === 92, 'Cinder displayValues Power 92');209
222
@@ -216,7 +229,7 @@ $byId = [];216
foreach ($presented['players'] as $plr) { $byId[$plr['id']] = $plr; }229
foreach ($presented['players'] as $plr) { $byId[$plr['id']] = $plr; }217
expect($byId['local:test_user_1']['planet']['id'] === 'aurel', 'host planet aurel');230
expect($byId['local:test_user_1']['planet']['id'] === 'aurel', 'host planet aurel');218
expect($byId['local:test_user_2']['planet']['id'] === 'cinder', 'guest planet cinder');231
expect($byId['local:test_user_2']['planet']['id'] === 'cinder', 'guest planet cinder');219
expect(almostEqual($byId['local:test_user_1']['planet']['miss_chance'], 0.60), 'host miss from Aurel Power');232
expect(almostEqual($byId['local:test_user_1']['planet']['miss_chance'], 0.60 - 0.55 / 9), 'host miss from Aurel Power');220
expect(almostEqual($byId['local:test_user_2']['planet']['miss_chance'], 0.05), 'guest miss from Cinder Power');233
expect(almostEqual($byId['local:test_user_2']['planet']['miss_chance'], 0.05), 'guest miss from Cinder Power');221
234
222
$store->setPlanet('local:test_user_1', 'wisp');235
$store->setPlanet('local:test_user_1', 'wisp');@@ -434,6 +447,20 @@ expect($snap['owner_id'] === $u, 'owner_id set');434
$listed = $ptsStore->listCustomPlanets($u);447
$listed = $ptsStore->listCustomPlanets($u);435
expect(count($listed) === 1, 'owner lists the planet');448
expect(count($listed) === 1, 'owner lists the planet');436
449
450
echo "Custom planet gravity clamp (t1199)\n";451
$low = $ptsStore->saveCustomPlanet($u, [452
'name' => 'Lowgrav', 'people' => 'Floaters',453
'jumpsToClear' => 1, 'fallTime' => 3, 'riseTime' => 1.5,454
'colors' => $terraIds,455
]);456
expect(almostEqual((float) $low['jumpsToClear'], 2.0), 'saving gravity 1 stores 2');457
$rawPdo = new PDO('sqlite:' . $tmp . '/meteors.sqlite');458
$rawPdo->exec("UPDATE custom_planets SET jumps_to_clear = 1.2 WHERE id = '" . $low['id'] . "'");459
$lowList = array_values(array_filter($ptsStore->listCustomPlanets($u), fn($pl) => $pl['id'] === $low['id']));460
expect(count($lowList) === 1 && almostEqual((float) $lowList[0]['jumpsToClear'], 2.0), 'an old row with 1.2 loads as 2');461
$ptsStore->deleteCustomPlanet($u, $low['id']);462
463
437
echo "Last chosen planet (t1196)\n";464
echo "Last chosen planet (t1196)\n";438
expect($ptsStore->lastPlanet($u) === null, 'no last planet stored yet');465
expect($ptsStore->lastPlanet($u) === null, 'no last planet stored yet');439
expect($ptsStore->profilePayload($u)['last_planet'] === null, 'payload last_planet null');466
expect($ptsStore->profilePayload($u)['last_planet'] === null, 'payload last_planet null');@@ -194,7 +194,7 @@ Designer.openEdit = function (id)
194
194
}
195
195
document.getElementById('des-name').value = pl.name || '';
196
196
document.getElementById('des-people').value = pl.people || '';
197
document.getElementById('des-gravity').value = String(pl.jumpsToClear != null ? pl.jumpsToClear : 2);
197
document.getElementById('des-gravity').value = String(Math.max(2, pl.jumpsToClear != null ? pl.jumpsToClear : 2));
198
198
document.getElementById('des-air').value = String(pl.fallTime != null ? pl.fallTime : 3);
199
199
document.getElementById('des-mass').value = String(pl.riseTime != null ? pl.riseTime : 1.5);
200
200
document.getElementById('designer-edit-title').textContent = (typeof I18n !== 'undefined') ? I18n.t('designer.editTitle') : 'Edit planet';
@@ -222,7 +222,7 @@ Designer.openEdit = function (id)
222
222
223
223
Designer.draftPlanet = function ()
224
224
{
225
var jumps = clampNum(document.getElementById('des-gravity').value, 1, 4, 2);
225
var jumps = clampNum(document.getElementById('des-gravity').value, 2, 4, 2);
226
226
var fall = clampNum(document.getElementById('des-air').value, 1, 5, 3);
227
227
var rise = clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5);
228
228
var colors = [];
@@ -257,8 +257,10 @@ Designer.syncPreview = function ()
257
257
{
258
258
var p = Designer.draftPlanet();
259
259
var d = (typeof Planet !== 'undefined' && Planet.displayValues) ? Planet.displayValues(p) : null;
260
setText('des-gravity-val', Number(document.getElementById('des-gravity').value).toFixed(1)
261
+ (d ? ' · g ' + d.gravity.toFixed(2) : ''));
260
// t1199: gravity as a percentage (2.0 = 100 % = 9.81 g).
261
var gv = clampNum(document.getElementById('des-gravity').value, 2, 4, 2);
262
setText('des-gravity-val', (typeof Planet !== 'undefined' && Planet.formatGravity)
263
? Planet.formatGravity(gv) : Math.round((gv - 1) * 100) + '%');
262
264
setText('des-air-val', Number(document.getElementById('des-air').value).toFixed(1)
263
265
+ (d ? ' · d ' + d.density.toFixed(2) : ''));
264
266
setText('des-mass-val', Number(document.getElementById('des-mass').value).toFixed(1)
@@ -401,7 +403,7 @@ Designer.save = function ()
401
403
id: Designer.editingId || undefined,
402
404
name: name,
403
405
people: people,
404
jumpsToClear: clampNum(document.getElementById('des-gravity').value, 1, 4, 2),
406
jumpsToClear: clampNum(document.getElementById('des-gravity').value, 2, 4, 2),
405
407
fallTime: clampNum(document.getElementById('des-air').value, 1, 5, 3),
406
408
riseTime: clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5),
407
409
colors: Designer.slots.slice()
@@ -194,7 +194,7 @@ Designer.openEdit = function (id)194
}194
}195
document.getElementById('des-name').value = pl.name || '';195
document.getElementById('des-name').value = pl.name || '';196
document.getElementById('des-people').value = pl.people || '';196
document.getElementById('des-people').value = pl.people || '';197
document.getElementById('des-gravity').value = String(pl.jumpsToClear != null ? pl.jumpsToClear : 2);197
document.getElementById('des-gravity').value = String(Math.max(2, pl.jumpsToClear != null ? pl.jumpsToClear : 2));198
document.getElementById('des-air').value = String(pl.fallTime != null ? pl.fallTime : 3);198
document.getElementById('des-air').value = String(pl.fallTime != null ? pl.fallTime : 3);199
document.getElementById('des-mass').value = String(pl.riseTime != null ? pl.riseTime : 1.5);199
document.getElementById('des-mass').value = String(pl.riseTime != null ? pl.riseTime : 1.5);200
document.getElementById('designer-edit-title').textContent = (typeof I18n !== 'undefined') ? I18n.t('designer.editTitle') : 'Edit planet';200
document.getElementById('designer-edit-title').textContent = (typeof I18n !== 'undefined') ? I18n.t('designer.editTitle') : 'Edit planet';@@ -222,7 +222,7 @@ Designer.openEdit = function (id)222
222
223
Designer.draftPlanet = function ()223
Designer.draftPlanet = function ()224
{224
{225
var jumps = clampNum(document.getElementById('des-gravity').value, 1, 4, 2);225
var jumps = clampNum(document.getElementById('des-gravity').value, 2, 4, 2);226
var fall = clampNum(document.getElementById('des-air').value, 1, 5, 3);226
var fall = clampNum(document.getElementById('des-air').value, 1, 5, 3);227
var rise = clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5);227
var rise = clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5);228
var colors = [];228
var colors = [];@@ -257,8 +257,10 @@ Designer.syncPreview = function ()257
{257
{258
var p = Designer.draftPlanet();258
var p = Designer.draftPlanet();259
var d = (typeof Planet !== 'undefined' && Planet.displayValues) ? Planet.displayValues(p) : null;259
var d = (typeof Planet !== 'undefined' && Planet.displayValues) ? Planet.displayValues(p) : null;260
setText('des-gravity-val', Number(document.getElementById('des-gravity').value).toFixed(1)260
// t1199: gravity as a percentage (2.0 = 100 % = 9.81 g).261
+ (d ? ' · g ' + d.gravity.toFixed(2) : ''));261
var gv = clampNum(document.getElementById('des-gravity').value, 2, 4, 2);262
setText('des-gravity-val', (typeof Planet !== 'undefined' && Planet.formatGravity)263
? Planet.formatGravity(gv) : Math.round((gv - 1) * 100) + '%');262
setText('des-air-val', Number(document.getElementById('des-air').value).toFixed(1)264
setText('des-air-val', Number(document.getElementById('des-air').value).toFixed(1)263
+ (d ? ' · d ' + d.density.toFixed(2) : ''));265
+ (d ? ' · d ' + d.density.toFixed(2) : ''));264
setText('des-mass-val', Number(document.getElementById('des-mass').value).toFixed(1)266
setText('des-mass-val', Number(document.getElementById('des-mass').value).toFixed(1)@@ -401,7 +403,7 @@ Designer.save = function ()401
id: Designer.editingId || undefined,403
id: Designer.editingId || undefined,402
name: name,404
name: name,403
people: people,405
people: people,404
jumpsToClear: clampNum(document.getElementById('des-gravity').value, 1, 4, 2),406
jumpsToClear: clampNum(document.getElementById('des-gravity').value, 2, 4, 2),405
fallTime: clampNum(document.getElementById('des-air').value, 1, 5, 3),407
fallTime: clampNum(document.getElementById('des-air').value, 1, 5, 3),406
riseTime: clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5),408
riseTime: clampNum(document.getElementById('des-mass').value, 0.5, 3, 1.5),407
colors: Designer.slots.slice()409
colors: Designer.slots.slice()@@ -7,7 +7,10 @@
7
7
* planet; the numbers and jump-height rules are already applied here so
8
8
* that later planets only need new data, not new physics code.
9
9
*
10
* Gravity (jumpsToClear): 1 (easy, high jump) .. 4 (hard, short jump).
10
* Gravity (jumpsToClear): 2 (easy, high jump) .. 4 (hard, short jump).
11
* Minimum raised from 1 to 2 in t1199 (GRAVITY_MIN). Shown as a
12
* percentage, linear in the value: pct = (v − 1)·100, so 2 → 100 %
13
* (9.81 g), 3 → 200 % (19.62 g), 4 → 300 % (29.43 g).
11
14
* A horizontal match of 3 jumps JUMP_HEIGHT_SCALE * FIELD_HEIGHT
12
15
* / jumpsToClear tiles (JUMP_HEIGHT_SCALE is 1.5 since t1119: the
13
16
* minimum jump is 50% higher). At gravity 1 that is 19.5 tiles, so
@@ -59,10 +62,41 @@ function defaultColors ()
59
62
];
60
63
}
61
64
65
/** t1199: gravity (jumpsToClear) range; values below the minimum clamp up. */
66
var GRAVITY_MIN = 2;
67
var GRAVITY_MAX = 4;
68
/** t1199: g at 100 % (jumpsToClear 2). */
69
var EARTH_G = 9.81;
70
71
/** t1199: displayed gravity percentage, linear: (v − 1)·100. */
72
function gravityPercent (jumpsToClear)
73
{
74
return Math.round((clamp(jumpsToClear, GRAVITY_MIN, GRAVITY_MAX) - 1) * 100);
75
}
76
77
/** t1199: displayed g, consistent with the percentage: 9.81·(v − 1). */
78
function gravityG (jumpsToClear)
79
{
80
return EARTH_G * (clamp(jumpsToClear, GRAVITY_MIN, GRAVITY_MAX) - 1);
81
}
82
83
/** t1199: "100% (9.81g)" style text (i18n template stats.gravity). */
84
function formatGravity (jumpsToClear)
85
{
86
var params = { pct: gravityPercent(jumpsToClear), g: gravityG(jumpsToClear).toFixed(2) };
87
if (typeof I18n !== 'undefined' && I18n.t)
88
{
89
var s = I18n.t('stats.gravity', params);
90
if (s && s !== 'stats.gravity')
91
{ return s; }
92
}
93
return params.pct + '% (' + params.g + 'g)';
94
}
95
62
96
function createPlanet (opts)
63
97
{
64
98
opts = opts || {};
65
var jumpsToClear = clamp(opts.jumpsToClear == null ? 2 : opts.jumpsToClear, 1, 4);
99
var jumpsToClear = clamp(opts.jumpsToClear == null ? 2 : opts.jumpsToClear, GRAVITY_MIN, GRAVITY_MAX);
66
100
var fallTime = clamp(opts.fallTime == null ? 3 : opts.fallTime, 1, 5);
67
101
var riseTime = clamp(opts.riseTime == null ? 1.5 : opts.riseTime, 0.5, 3);
68
102
var colors = opts.colors || defaultColors();
@@ -212,7 +246,7 @@ function formatStats (planet)
212
246
var d = displayValues(planet);
213
247
var power = (typeof I18n !== 'undefined')
214
248
? I18n.t('stats.powerLabel') : 'Power';
215
return 'g ' + d.gravity.toFixed(2)
249
return 'g ' + formatGravity(planet.jumpsToClear)
216
250
+ ' d ' + d.density.toFixed(2)
217
251
+ ' F ' + Math.round(d.newtons) + ' N'
218
252
+ ' ' + power + ' ' + d.power + '%';
@@ -267,6 +301,9 @@ function launchDeceleration (planet, height)
267
301
*/
268
302
function power (planet)
269
303
{
304
// t1199: scale kept on the old 1..4 axis on purpose, so unchanged
305
// planets keep their Power/miss chance; the 2.0 minimum means the
306
// gravity term is now at least 1/3 (lowest possible Power ≈ 0.11).
270
307
var gravity = (planet.jumpsToClear - 1) / 3;
271
308
var air = (5 - planet.fallTime) / 4;
272
309
var mass = (3 - planet.riseTime) / 2.5;
@@ -300,11 +337,12 @@ function displayPower (planet)
300
337
*/
301
338
function displayValues (planet)
302
339
{
303
var gravity = 9.81 * planet.jumpsToClear / 2;
340
var gravity = gravityG(planet.jumpsToClear);
304
341
var density = 0.25 + ((5 - planet.fallTime) / 4) * 1.60;
305
342
var newtons = 40 + ((planet.riseTime - 0.5) / 2.5) * 160;
306
343
return {
307
344
gravity: gravity,
345
gravityPct: gravityPercent(planet.jumpsToClear),
308
346
density: density,
309
347
newtons: newtons,
310
348
power: displayPower(planet),
@@ -322,6 +360,12 @@ var Planet = {
322
360
SPAWN_INTERVAL: 1,
323
361
JUMP_VERTICAL_BONUS: 1.2,
324
362
JUMP_EXTRA_BLOCK: 0.05,
363
GRAVITY_MIN: GRAVITY_MIN,
364
GRAVITY_MAX: GRAVITY_MAX,
365
EARTH_G: EARTH_G,
366
gravityPercent: gravityPercent,
367
gravityG: gravityG,
368
formatGravity: formatGravity,
325
369
createPlanet: createPlanet,
326
370
defaultPlanet: defaultPlanet,
327
371
defaultColors: defaultColors,
@@ -7,7 +7,10 @@7
* planet; the numbers and jump-height rules are already applied here so7
* planet; the numbers and jump-height rules are already applied here so8
* that later planets only need new data, not new physics code.8
* that later planets only need new data, not new physics code.9
*9
*10
* Gravity (jumpsToClear): 1 (easy, high jump) .. 4 (hard, short jump).10
* Gravity (jumpsToClear): 2 (easy, high jump) .. 4 (hard, short jump).11
* Minimum raised from 1 to 2 in t1199 (GRAVITY_MIN). Shown as a12
* percentage, linear in the value: pct = (v − 1)·100, so 2 → 100 %13
* (9.81 g), 3 → 200 % (19.62 g), 4 → 300 % (29.43 g).11
* A horizontal match of 3 jumps JUMP_HEIGHT_SCALE * FIELD_HEIGHT14
* A horizontal match of 3 jumps JUMP_HEIGHT_SCALE * FIELD_HEIGHT12
* / jumpsToClear tiles (JUMP_HEIGHT_SCALE is 1.5 since t1119: the15
* / jumpsToClear tiles (JUMP_HEIGHT_SCALE is 1.5 since t1119: the13
* minimum jump is 50% higher). At gravity 1 that is 19.5 tiles, so16
* minimum jump is 50% higher). At gravity 1 that is 19.5 tiles, so@@ -59,10 +62,41 @@ function defaultColors ()59
];62
];60
}63
}61
64
65
/** t1199: gravity (jumpsToClear) range; values below the minimum clamp up. */66
var GRAVITY_MIN = 2;67
var GRAVITY_MAX = 4;68
/** t1199: g at 100 % (jumpsToClear 2). */69
var EARTH_G = 9.81;70
71
/** t1199: displayed gravity percentage, linear: (v − 1)·100. */72
function gravityPercent (jumpsToClear)73
{74
return Math.round((clamp(jumpsToClear, GRAVITY_MIN, GRAVITY_MAX) - 1) * 100);75
}76
77
/** t1199: displayed g, consistent with the percentage: 9.81·(v − 1). */78
function gravityG (jumpsToClear)79
{80
return EARTH_G * (clamp(jumpsToClear, GRAVITY_MIN, GRAVITY_MAX) - 1);81
}82
83
/** t1199: "100% (9.81g)" style text (i18n template stats.gravity). */84
function formatGravity (jumpsToClear)85
{86
var params = { pct: gravityPercent(jumpsToClear), g: gravityG(jumpsToClear).toFixed(2) };87
if (typeof I18n !== 'undefined' && I18n.t)88
{89
var s = I18n.t('stats.gravity', params);90
if (s && s !== 'stats.gravity')91
{ return s; }92
}93
return params.pct + '% (' + params.g + 'g)';94
}95
62
function createPlanet (opts)96
function createPlanet (opts)63
{97
{64
opts = opts || {};98
opts = opts || {};65
var jumpsToClear = clamp(opts.jumpsToClear == null ? 2 : opts.jumpsToClear, 1, 4);99
var jumpsToClear = clamp(opts.jumpsToClear == null ? 2 : opts.jumpsToClear, GRAVITY_MIN, GRAVITY_MAX);66
var fallTime = clamp(opts.fallTime == null ? 3 : opts.fallTime, 1, 5);100
var fallTime = clamp(opts.fallTime == null ? 3 : opts.fallTime, 1, 5);67
var riseTime = clamp(opts.riseTime == null ? 1.5 : opts.riseTime, 0.5, 3);101
var riseTime = clamp(opts.riseTime == null ? 1.5 : opts.riseTime, 0.5, 3);68
var colors = opts.colors || defaultColors();102
var colors = opts.colors || defaultColors();@@ -212,7 +246,7 @@ function formatStats (planet)212
var d = displayValues(planet);246
var d = displayValues(planet);213
var power = (typeof I18n !== 'undefined')247
var power = (typeof I18n !== 'undefined')214
? I18n.t('stats.powerLabel') : 'Power';248
? I18n.t('stats.powerLabel') : 'Power';215
return 'g ' + d.gravity.toFixed(2)249
return 'g ' + formatGravity(planet.jumpsToClear)216
+ ' d ' + d.density.toFixed(2)250
+ ' d ' + d.density.toFixed(2)217
+ ' F ' + Math.round(d.newtons) + ' N'251
+ ' F ' + Math.round(d.newtons) + ' N'218
+ ' ' + power + ' ' + d.power + '%';252
+ ' ' + power + ' ' + d.power + '%';@@ -267,6 +301,9 @@ function launchDeceleration (planet, height)267
*/301
*/268
function power (planet)302
function power (planet)269
{303
{304
// t1199: scale kept on the old 1..4 axis on purpose, so unchanged305
// planets keep their Power/miss chance; the 2.0 minimum means the306
// gravity term is now at least 1/3 (lowest possible Power ≈ 0.11).270
var gravity = (planet.jumpsToClear - 1) / 3;307
var gravity = (planet.jumpsToClear - 1) / 3;271
var air = (5 - planet.fallTime) / 4;308
var air = (5 - planet.fallTime) / 4;272
var mass = (3 - planet.riseTime) / 2.5;309
var mass = (3 - planet.riseTime) / 2.5;@@ -300,11 +337,12 @@ function displayPower (planet)300
*/337
*/301
function displayValues (planet)338
function displayValues (planet)302
{339
{303
var gravity = 9.81 * planet.jumpsToClear / 2;340
var gravity = gravityG(planet.jumpsToClear);304
var density = 0.25 + ((5 - planet.fallTime) / 4) * 1.60;341
var density = 0.25 + ((5 - planet.fallTime) / 4) * 1.60;305
var newtons = 40 + ((planet.riseTime - 0.5) / 2.5) * 160;342
var newtons = 40 + ((planet.riseTime - 0.5) / 2.5) * 160;306
return {343
return {307
gravity: gravity,344
gravity: gravity,345
gravityPct: gravityPercent(planet.jumpsToClear),308
density: density,346
density: density,309
newtons: newtons,347
newtons: newtons,310
power: displayPower(planet),348
power: displayPower(planet),@@ -322,6 +360,12 @@ var Planet = {322
SPAWN_INTERVAL: 1,360
SPAWN_INTERVAL: 1,323
JUMP_VERTICAL_BONUS: 1.2,361
JUMP_VERTICAL_BONUS: 1.2,324
JUMP_EXTRA_BLOCK: 0.05,362
JUMP_EXTRA_BLOCK: 0.05,363
GRAVITY_MIN: GRAVITY_MIN,364
GRAVITY_MAX: GRAVITY_MAX,365
EARTH_G: EARTH_G,366
gravityPercent: gravityPercent,367
gravityG: gravityG,368
formatGravity: formatGravity,325
createPlanet: createPlanet,369
createPlanet: createPlanet,326
defaultPlanet: defaultPlanet,370
defaultPlanet: defaultPlanet,327
defaultColors: defaultColors,371
defaultColors: defaultColors,@@ -10,10 +10,14 @@ describe('Outgoing shots and incoming garbage', () =>
10
10
{
11
11
const g = makeGame({
12
12
noSpawn: true,
13
planetOpts: { jumpsToClear: 1, fallTime: 5, riseTime: 0.5 }
13
planetOpts: { jumpsToClear: 2, fallTime: 5, riseTime: 0.5 }
14
14
});
15
placeRow(g, 0, [0, 1, 2], 0);
16
g.place(1, 1, 4);
15
// t1199: minimum gravity is 2 (9.75-tile jump), so the match sits on
16
// a non-matching support stack and one jump still clears the field.
17
for (let y = 0; y < 4; y++)
18
for (const c of [0, 1, 2]) g.place(c, y, 1 + (c + y) % 3);
19
placeRow(g, 4, [0, 1, 2], 0);
20
g.place(1, 5, 4);
17
21
g.resolveMatches();
18
22
assert.equal(g.consumeOutgoingShots().length, 0);
19
23
g.step(2, 1 / 120);
@@ -81,7 +85,8 @@ describe('Outgoing shots and incoming garbage', () =>
81
85
const cinder = new GameCore(Planet.planetById('cinder'), Math.random);
82
86
assert.ok(Math.abs(cinder.missChance - 0.05) < 1e-12);
83
87
const aurel = new GameCore(Planet.planetById('aurel'), Math.random);
84
assert.ok(Math.abs(aurel.missChance - 0.60) < 1e-12);
88
assert.ok(Math.abs(aurel.missChance - Planet.missChance(Planet.planetById('aurel'))) < 1e-12);
89
assert.ok(Math.abs(aurel.missChance - (0.60 - 0.55 / 9)) < 1e-12, 'Aurel at gravity 2 (t1199)');
85
90
});
86
91
87
92
it('fieldSnapshot lists every block for opponent miniatures', () =>
@@ -10,10 +10,14 @@ describe('Outgoing shots and incoming garbage', () =>10
{10
{11
const g = makeGame({11
const g = makeGame({12
noSpawn: true,12
noSpawn: true,13
planetOpts: { jumpsToClear: 1, fallTime: 5, riseTime: 0.5 }13
planetOpts: { jumpsToClear: 2, fallTime: 5, riseTime: 0.5 }14
});14
});15
placeRow(g, 0, [0, 1, 2], 0);15
// t1199: minimum gravity is 2 (9.75-tile jump), so the match sits on16
g.place(1, 1, 4);16
// a non-matching support stack and one jump still clears the field.17
for (let y = 0; y < 4; y++)18
for (const c of [0, 1, 2]) g.place(c, y, 1 + (c + y) % 3);19
placeRow(g, 4, [0, 1, 2], 0);20
g.place(1, 5, 4);17
g.resolveMatches();21
g.resolveMatches();18
assert.equal(g.consumeOutgoingShots().length, 0);22
assert.equal(g.consumeOutgoingShots().length, 0);19
g.step(2, 1 / 120);23
g.step(2, 1 / 120);@@ -81,7 +85,8 @@ describe('Outgoing shots and incoming garbage', () =>81
const cinder = new GameCore(Planet.planetById('cinder'), Math.random);85
const cinder = new GameCore(Planet.planetById('cinder'), Math.random);82
assert.ok(Math.abs(cinder.missChance - 0.05) < 1e-12);86
assert.ok(Math.abs(cinder.missChance - 0.05) < 1e-12);83
const aurel = new GameCore(Planet.planetById('aurel'), Math.random);87
const aurel = new GameCore(Planet.planetById('aurel'), Math.random);84
assert.ok(Math.abs(aurel.missChance - 0.60) < 1e-12);88
assert.ok(Math.abs(aurel.missChance - Planet.missChance(Planet.planetById('aurel'))) < 1e-12);89
assert.ok(Math.abs(aurel.missChance - (0.60 - 0.55 / 9)) < 1e-12, 'Aurel at gravity 2 (t1199)');85
});90
});86
91
87
it('fieldSnapshot lists every block for opponent miniatures', () =>92
it('fieldSnapshot lists every block for opponent miniatures', () =>@@ -3,6 +3,7 @@
3
3
const { describe, it } = require('node:test');
4
4
const assert = require('node:assert/strict');
5
5
const Planet = require('../src/planet.js');
6
const almost = (a, b, eps) => Math.abs(a - b) <= eps;
6
7
7
8
describe('Planet field and defaults', () =>
8
9
{
@@ -29,7 +30,9 @@ describe('Planet field and defaults', () =>
29
30
it('clamps gravity, air and mass to the stage-3 ranges', () =>
30
31
{
31
32
const lo = Planet.createPlanet({ jumpsToClear: 0, fallTime: 0, riseTime: 0 });
32
assert.equal(lo.jumpsToClear, 1);
33
assert.equal(lo.jumpsToClear, 2, 'gravity minimum is 2 since t1199');
34
assert.equal(Planet.createPlanet({ jumpsToClear: 1.5 }).jumpsToClear, 2);
35
assert.equal(Planet.createPlanet({ jumpsToClear: 2.4 }).jumpsToClear, 2.4);
33
36
assert.equal(lo.fallTime, 1);
34
37
assert.equal(lo.riseTime, 0.5);
35
38
@@ -79,10 +82,10 @@ describe('Jump height rules', () =>
79
82
assert.ok(Math.abs(Planet.jumpHeight(planet, 6, true) - base * (1.2 + 0.15)) < 1e-12);
80
83
});
81
84
82
it('at min gravity one horizontal-3 jump is 50% taller than the field', () =>
85
it('at min gravity (2, t1199) one horizontal-3 jump is 75% of the field', () =>
83
86
{
84
const easy = Planet.createPlanet({ jumpsToClear: 1 });
85
assert.equal(Planet.jumpHeight(easy, 3, false), 1.5 * 13);
87
const easy = Planet.createPlanet({ jumpsToClear: 2 });
88
assert.equal(Planet.jumpHeight(easy, 3, false), 1.5 * 13 / 2);
86
89
assert.equal(Planet.JUMP_HEIGHT_SCALE, 1.5);
87
90
});
88
91
@@ -142,11 +145,15 @@ describe('Launch and fall physics parameters', () =>
142
145
143
146
describe('Power and display values', () =>
144
147
{
145
it('easiest planet has power 0 and 60% miss chance', () =>
148
it('easiest planet (gravity 2 since t1199) has power 1/9, ~54% miss, shown as 10%', () =>
146
149
{
147
const easy = Planet.createPlanet({ jumpsToClear: 1, fallTime: 5, riseTime: 3 });
148
assert.equal(Planet.power(easy), 0);
149
assert.equal(Planet.missChance(easy), 0.60);
150
const easy = Planet.createPlanet({ jumpsToClear: 2, fallTime: 5, riseTime: 3 });
151
assert.ok(Math.abs(Planet.power(easy) - 1 / 9) < 1e-12);
152
assert.ok(Math.abs(Planet.missChance(easy) - (0.60 - 0.55 / 9)) < 1e-12);
153
assert.equal(Planet.displayPower(easy), 10);
154
// The Power scale itself is unchanged: an unclamped gravity-1 input
155
// would still be 0 (the formula keeps its old 1..4 axis).
156
assert.equal(Planet.power({ jumpsToClear: 1, fallTime: 5, riseTime: 3 }), 0);
150
157
});
151
158
152
159
it('hardest planet has power 1 and 5% miss chance', () =>
@@ -171,12 +178,11 @@ describe('Power and display values', () =>
171
178
172
179
it('displayed Power is 1 − missChance / 0.60, so 0% miss shows as 100% Power', () =>
173
180
{
174
const easy = Planet.createPlanet({ jumpsToClear: 1, fallTime: 5, riseTime: 3 });
181
const easy = { jumpsToClear: 1, fallTime: 5, riseTime: 3 }; // formula input, not a real planet (t1199)
175
182
const hard = Planet.createPlanet({ jumpsToClear: 4, fallTime: 1, riseTime: 0.5 });
176
183
const terra = Planet.defaultPlanet();
177
184
// 60% miss → 0% Power; 5% miss → 92% (not 100 — the floor is 5%, not 0).
178
185
assert.equal(Planet.displayPower(easy), 0);
179
assert.equal(Planet.displayValues(easy).power, 0);
180
186
assert.equal(Planet.displayPower(hard), Math.round((1 - 0.05 / 0.60) * 100));
181
187
assert.equal(Planet.displayPower(hard), 92);
182
188
const terraMiss = Planet.missChance(terra);
@@ -224,15 +230,75 @@ describe('Planet catalog', () =>
224
230
assert.equal(Planet.planetById('cinder').name, 'Cinder');
225
231
});
226
232
227
it('Aurel is the easiest (gameplay Power 0, 60% miss, shown as 0%) and Cinder the hardest (gameplay Power 1, 5% miss, shown as 92%)', () =>
233
it('Aurel is the easiest (gravity 2 since t1199: Power 1/9, shown as 10%) and Cinder the hardest (gameplay Power 1, 5% miss, shown as 92%)', () =>
228
234
{
229
235
const aurel = Planet.planetById('aurel');
230
236
const cinder = Planet.planetById('cinder');
231
assert.equal(Planet.power(aurel), 0);
232
assert.equal(Planet.missChance(aurel), 0.60);
237
assert.equal(aurel.jumpsToClear, 2);
238
assert.ok(Math.abs(Planet.power(aurel) - 1 / 9) < 1e-12);
239
for (const p of Planet.officialPlanets()) assert.ok(Planet.power(p) >= Planet.power(aurel) - 1e-12, p.id);
233
240
assert.ok(Math.abs(Planet.power(cinder) - 1) < 1e-12);
234
241
assert.ok(Math.abs(Planet.missChance(cinder) - 0.05) < 1e-12);
235
assert.equal(Planet.displayValues(aurel).power, 0);
242
assert.equal(Planet.displayValues(aurel).power, 10);
236
243
assert.equal(Planet.displayValues(cinder).power, 92);
237
244
});
238
245
});
246
247
describe('Gravity minimum and percentage display (t1199)', () =>
248
{
249
it('constants: range 2..4, 9.81 g at 100%', () =>
250
{
251
assert.equal(Planet.GRAVITY_MIN, 2);
252
assert.equal(Planet.GRAVITY_MAX, 4);
253
assert.equal(Planet.EARTH_G, 9.81);
254
});
255
256
it('percentage is linear: (v − 1)·100, so 2 → 100%, 3 → 200%, 4 → 300%', () =>
257
{
258
assert.equal(Planet.gravityPercent(2), 100);
259
assert.equal(Planet.gravityPercent(2.5), 150);
260
assert.equal(Planet.gravityPercent(3), 200);
261
assert.equal(Planet.gravityPercent(4), 300);
262
assert.equal(Planet.gravityPercent(1), 100, 'below the minimum shows the minimum');
263
});
264
265
it('g follows the percentage: 9.81·(v − 1)', () =>
266
{
267
assert.ok(almost(Planet.gravityG(2), 9.81, 1e-12));
268
assert.ok(almost(Planet.gravityG(3), 19.62, 1e-12));
269
assert.ok(almost(Planet.gravityG(4), 29.43, 1e-12));
270
assert.ok(almost(Planet.displayValues(Planet.defaultPlanet()).gravity, 9.81, 1e-12));
271
assert.equal(Planet.displayValues(Planet.createPlanet({ jumpsToClear: 4 })).gravityPct, 300);
272
});
273
274
it('stats text shows "g 100% (9.81g)" for Terra and 300% for Cinder', () =>
275
{
276
assert.ok(Planet.formatStats(Planet.defaultPlanet()).startsWith('g 100% (9.81g) '));
277
assert.ok(Planet.formatStats(Planet.planetById('cinder')).startsWith('g 300% (29.43g) '));
278
assert.equal(Planet.formatGravity(2.5), '150% (14.71g)');
279
});
280
281
it('every standard planet has gravity ≥ 2', () =>
282
{
283
for (const p of Planet.officialPlanets()) assert.ok(p.jumpsToClear >= 2, p.id);
284
const raw = require('../server/lib/planets.json').planets;
285
for (const p of raw) assert.ok(p.jumpsToClear >= 2, 'catalog ' + p.id);
286
for (const id of ['aurel', 'lunara', 'zephyr']) assert.equal(Planet.planetById(id).jumpsToClear, 2, id);
287
});
288
289
it('a saved custom planet below 2 loads as 2', () =>
290
{
291
const p = Planet.planetFromData({ id: 'c_old', name: 'Oud', people: 'Ouden', jumpsToClear: 1, fallTime: 3, riseTime: 1.5, custom: true });
292
assert.equal(p.jumpsToClear, 2);
293
});
294
295
it('i18n has stats.gravity in every language', () =>
296
{
297
const cat = require('../server/lib/i18n.json');
298
for (const loc of cat.localeIds)
299
{
300
const s = cat.locales[loc]['stats.gravity'];
301
assert.ok(s && s.includes('{pct}') && s.includes('{g}'), loc);
302
}
303
});
304
});
@@ -3,6 +3,7 @@3
const { describe, it } = require('node:test');3
const { describe, it } = require('node:test');4
const assert = require('node:assert/strict');4
const assert = require('node:assert/strict');5
const Planet = require('../src/planet.js');5
const Planet = require('../src/planet.js');6
const almost = (a, b, eps) => Math.abs(a - b) <= eps;6
7
7
describe('Planet field and defaults', () =>8
describe('Planet field and defaults', () =>8
{9
{@@ -29,7 +30,9 @@ describe('Planet field and defaults', () =>29
it('clamps gravity, air and mass to the stage-3 ranges', () =>30
it('clamps gravity, air and mass to the stage-3 ranges', () =>30
{31
{31
const lo = Planet.createPlanet({ jumpsToClear: 0, fallTime: 0, riseTime: 0 });32
const lo = Planet.createPlanet({ jumpsToClear: 0, fallTime: 0, riseTime: 0 });32
assert.equal(lo.jumpsToClear, 1);33
assert.equal(lo.jumpsToClear, 2, 'gravity minimum is 2 since t1199');34
assert.equal(Planet.createPlanet({ jumpsToClear: 1.5 }).jumpsToClear, 2);35
assert.equal(Planet.createPlanet({ jumpsToClear: 2.4 }).jumpsToClear, 2.4);33
assert.equal(lo.fallTime, 1);36
assert.equal(lo.fallTime, 1);34
assert.equal(lo.riseTime, 0.5);37
assert.equal(lo.riseTime, 0.5);35
38
@@ -79,10 +82,10 @@ describe('Jump height rules', () =>79
assert.ok(Math.abs(Planet.jumpHeight(planet, 6, true) - base * (1.2 + 0.15)) < 1e-12);82
assert.ok(Math.abs(Planet.jumpHeight(planet, 6, true) - base * (1.2 + 0.15)) < 1e-12);80
});83
});81
84
82
it('at min gravity one horizontal-3 jump is 50% taller than the field', () =>85
it('at min gravity (2, t1199) one horizontal-3 jump is 75% of the field', () =>83
{86
{84
const easy = Planet.createPlanet({ jumpsToClear: 1 });87
const easy = Planet.createPlanet({ jumpsToClear: 2 });85
assert.equal(Planet.jumpHeight(easy, 3, false), 1.5 * 13);88
assert.equal(Planet.jumpHeight(easy, 3, false), 1.5 * 13 / 2);86
assert.equal(Planet.JUMP_HEIGHT_SCALE, 1.5);89
assert.equal(Planet.JUMP_HEIGHT_SCALE, 1.5);87
});90
});88
91
@@ -142,11 +145,15 @@ describe('Launch and fall physics parameters', () =>142
145
143
describe('Power and display values', () =>146
describe('Power and display values', () =>144
{147
{145
it('easiest planet has power 0 and 60% miss chance', () =>148
it('easiest planet (gravity 2 since t1199) has power 1/9, ~54% miss, shown as 10%', () =>146
{149
{147
const easy = Planet.createPlanet({ jumpsToClear: 1, fallTime: 5, riseTime: 3 });150
const easy = Planet.createPlanet({ jumpsToClear: 2, fallTime: 5, riseTime: 3 });148
assert.equal(Planet.power(easy), 0);151
assert.ok(Math.abs(Planet.power(easy) - 1 / 9) < 1e-12);149
assert.equal(Planet.missChance(easy), 0.60);152
assert.ok(Math.abs(Planet.missChance(easy) - (0.60 - 0.55 / 9)) < 1e-12);153
assert.equal(Planet.displayPower(easy), 10);154
// The Power scale itself is unchanged: an unclamped gravity-1 input155
// would still be 0 (the formula keeps its old 1..4 axis).156
assert.equal(Planet.power({ jumpsToClear: 1, fallTime: 5, riseTime: 3 }), 0);150
});157
});151
158
152
it('hardest planet has power 1 and 5% miss chance', () =>159
it('hardest planet has power 1 and 5% miss chance', () =>@@ -171,12 +178,11 @@ describe('Power and display values', () =>171
178
172
it('displayed Power is 1 − missChance / 0.60, so 0% miss shows as 100% Power', () =>179
it('displayed Power is 1 − missChance / 0.60, so 0% miss shows as 100% Power', () =>173
{180
{174
const easy = Planet.createPlanet({ jumpsToClear: 1, fallTime: 5, riseTime: 3 });181
const easy = { jumpsToClear: 1, fallTime: 5, riseTime: 3 }; // formula input, not a real planet (t1199)175
const hard = Planet.createPlanet({ jumpsToClear: 4, fallTime: 1, riseTime: 0.5 });182
const hard = Planet.createPlanet({ jumpsToClear: 4, fallTime: 1, riseTime: 0.5 });176
const terra = Planet.defaultPlanet();183
const terra = Planet.defaultPlanet();177
// 60% miss → 0% Power; 5% miss → 92% (not 100 — the floor is 5%, not 0).184
// 60% miss → 0% Power; 5% miss → 92% (not 100 — the floor is 5%, not 0).178
assert.equal(Planet.displayPower(easy), 0);185
assert.equal(Planet.displayPower(easy), 0);179
assert.equal(Planet.displayValues(easy).power, 0);180
assert.equal(Planet.displayPower(hard), Math.round((1 - 0.05 / 0.60) * 100));186
assert.equal(Planet.displayPower(hard), Math.round((1 - 0.05 / 0.60) * 100));181
assert.equal(Planet.displayPower(hard), 92);187
assert.equal(Planet.displayPower(hard), 92);182
const terraMiss = Planet.missChance(terra);188
const terraMiss = Planet.missChance(terra);@@ -224,15 +230,75 @@ describe('Planet catalog', () =>224
assert.equal(Planet.planetById('cinder').name, 'Cinder');230
assert.equal(Planet.planetById('cinder').name, 'Cinder');225
});231
});226
232
227
it('Aurel is the easiest (gameplay Power 0, 60% miss, shown as 0%) and Cinder the hardest (gameplay Power 1, 5% miss, shown as 92%)', () =>233
it('Aurel is the easiest (gravity 2 since t1199: Power 1/9, shown as 10%) and Cinder the hardest (gameplay Power 1, 5% miss, shown as 92%)', () =>228
{234
{229
const aurel = Planet.planetById('aurel');235
const aurel = Planet.planetById('aurel');230
const cinder = Planet.planetById('cinder');236
const cinder = Planet.planetById('cinder');231
assert.equal(Planet.power(aurel), 0);237
assert.equal(aurel.jumpsToClear, 2);232
assert.equal(Planet.missChance(aurel), 0.60);238
assert.ok(Math.abs(Planet.power(aurel) - 1 / 9) < 1e-12);239
for (const p of Planet.officialPlanets()) assert.ok(Planet.power(p) >= Planet.power(aurel) - 1e-12, p.id);233
assert.ok(Math.abs(Planet.power(cinder) - 1) < 1e-12);240
assert.ok(Math.abs(Planet.power(cinder) - 1) < 1e-12);234
assert.ok(Math.abs(Planet.missChance(cinder) - 0.05) < 1e-12);241
assert.ok(Math.abs(Planet.missChance(cinder) - 0.05) < 1e-12);235
assert.equal(Planet.displayValues(aurel).power, 0);242
assert.equal(Planet.displayValues(aurel).power, 10);236
assert.equal(Planet.displayValues(cinder).power, 92);243
assert.equal(Planet.displayValues(cinder).power, 92);237
});244
});238
});245
});246
247
describe('Gravity minimum and percentage display (t1199)', () =>248
{249
it('constants: range 2..4, 9.81 g at 100%', () =>250
{251
assert.equal(Planet.GRAVITY_MIN, 2);252
assert.equal(Planet.GRAVITY_MAX, 4);253
assert.equal(Planet.EARTH_G, 9.81);254
});255
256
it('percentage is linear: (v − 1)·100, so 2 → 100%, 3 → 200%, 4 → 300%', () =>257
{258
assert.equal(Planet.gravityPercent(2), 100);259
assert.equal(Planet.gravityPercent(2.5), 150);260
assert.equal(Planet.gravityPercent(3), 200);261
assert.equal(Planet.gravityPercent(4), 300);262
assert.equal(Planet.gravityPercent(1), 100, 'below the minimum shows the minimum');263
});264
265
it('g follows the percentage: 9.81·(v − 1)', () =>266
{267
assert.ok(almost(Planet.gravityG(2), 9.81, 1e-12));268
assert.ok(almost(Planet.gravityG(3), 19.62, 1e-12));269
assert.ok(almost(Planet.gravityG(4), 29.43, 1e-12));270
assert.ok(almost(Planet.displayValues(Planet.defaultPlanet()).gravity, 9.81, 1e-12));271
assert.equal(Planet.displayValues(Planet.createPlanet({ jumpsToClear: 4 })).gravityPct, 300);272
});273
274
it('stats text shows "g 100% (9.81g)" for Terra and 300% for Cinder', () =>275
{276
assert.ok(Planet.formatStats(Planet.defaultPlanet()).startsWith('g 100% (9.81g) '));277
assert.ok(Planet.formatStats(Planet.planetById('cinder')).startsWith('g 300% (29.43g) '));278
assert.equal(Planet.formatGravity(2.5), '150% (14.71g)');279
});280
281
it('every standard planet has gravity ≥ 2', () =>282
{283
for (const p of Planet.officialPlanets()) assert.ok(p.jumpsToClear >= 2, p.id);284
const raw = require('../server/lib/planets.json').planets;285
for (const p of raw) assert.ok(p.jumpsToClear >= 2, 'catalog ' + p.id);286
for (const id of ['aurel', 'lunara', 'zephyr']) assert.equal(Planet.planetById(id).jumpsToClear, 2, id);287
});288
289
it('a saved custom planet below 2 loads as 2', () =>290
{291
const p = Planet.planetFromData({ id: 'c_old', name: 'Oud', people: 'Ouden', jumpsToClear: 1, fallTime: 3, riseTime: 1.5, custom: true });292
assert.equal(p.jumpsToClear, 2);293
});294
295
it('i18n has stats.gravity in every language', () =>296
{297
const cat = require('../server/lib/i18n.json');298
for (const loc of cat.localeIds)299
{300
const s = cat.locales[loc]['stats.gravity'];301
assert.ok(s && s.includes('{pct}') && s.includes('{g}'), loc);302
}303
});304
});@@ -10,16 +10,20 @@ describe('Points, landing and recolor', () =>
10
10
{
11
11
const g = makeGame({
12
12
noSpawn: true,
13
planetOpts: { jumpsToClear: 1, fallTime: 5, riseTime: 0.5 }
13
planetOpts: { jumpsToClear: 2, fallTime: 5, riseTime: 0.5 }
14
14
});
15
placeRow(g, 0, [0, 1, 2], 0);
16
const carried = g.place(1, 1, 4);
15
// t1199: minimum gravity is 2 (9.75-tile jump), so the match sits on
16
// a non-matching support stack and one jump still clears the field.
17
for (let y = 0; y < 4; y++)
18
for (const c of [0, 1, 2]) g.place(c, y, 1 + (c + y) % 3);
19
placeRow(g, 4, [0, 1, 2], 0);
20
const carried = g.place(1, 5, 4);
17
21
g.resolveMatches();
18
22
assert.equal(g.score, 0);
19
23
g.step(2, 1 / 120);
20
24
assert.equal(g.blocks.filter((b) => b.state === 'flying').length, 0);
21
25
assert.equal(g.score, 4, '3 rockets + 1 carried');
22
assert.equal(g.blockAt(1, 1), null);
26
assert.equal(g.blockAt(1, 5), null);
23
27
assert.ok(!g.blocks.includes(carried) && carried.y >= g.height || g.score === 4);
24
28
});
25
29
@@ -10,16 +10,20 @@ describe('Points, landing and recolor', () =>10
{10
{11
const g = makeGame({11
const g = makeGame({12
noSpawn: true,12
noSpawn: true,13
planetOpts: { jumpsToClear: 1, fallTime: 5, riseTime: 0.5 }13
planetOpts: { jumpsToClear: 2, fallTime: 5, riseTime: 0.5 }14
});14
});15
placeRow(g, 0, [0, 1, 2], 0);15
// t1199: minimum gravity is 2 (9.75-tile jump), so the match sits on16
const carried = g.place(1, 1, 4);16
// a non-matching support stack and one jump still clears the field.17
for (let y = 0; y < 4; y++)18
for (const c of [0, 1, 2]) g.place(c, y, 1 + (c + y) % 3);19
placeRow(g, 4, [0, 1, 2], 0);20
const carried = g.place(1, 5, 4);17
g.resolveMatches();21
g.resolveMatches();18
assert.equal(g.score, 0);22
assert.equal(g.score, 0);19
g.step(2, 1 / 120);23
g.step(2, 1 / 120);20
assert.equal(g.blocks.filter((b) => b.state === 'flying').length, 0);24
assert.equal(g.blocks.filter((b) => b.state === 'flying').length, 0);21
assert.equal(g.score, 4, '3 rockets + 1 carried');25
assert.equal(g.score, 4, '3 rockets + 1 carried');22
assert.equal(g.blockAt(1, 1), null);26
assert.equal(g.blockAt(1, 5), null);23
assert.ok(!g.blocks.includes(carried) && carried.y >= g.height || g.score === 4);27
assert.ok(!g.blocks.includes(carried) && carried.y >= g.height || g.score === 4);24
});28
});25
29