Use Tim's grid suggestion: max(6 + ceil(n/2), n + 1).
Suggested square side is now max(6 + ceil(players/2), players + 1), capped at 24 (2p→7, 6p→9, 10p→11, 14p→15). Document that ceil rounds halves upward. Tests and lobby defaults follow.
@@ -37,9 +37,9 @@ Optionele regels (in de lobby, vóór de start):
37
37
- **Dagelijks AP-tijdstip**: per lobby instelbaar (Europe/Amsterdam),
38
38
standaard 00:00. Jury en krimp vallen samen met dit tijdstip.
39
39
- **Bordgrootte**: de host kiest de zijde van het vierkante bord (6–24).
40
De suggestie is `max(10, aantal spelers + 1)` (bij 2–9 spelers: 10×10)
41
en wordt bijgewerkt als er mensen joinen, tenzij de host zelf een maat
42
instelt.
40
De suggestie is `max(6 + ceil(n / 2), n + 1)` (2 spelers: 7×7; 6: 9×9;
41
10: 11×11; 14: 15×15) en wordt bijgewerkt als er mensen joinen, tenzij
42
de host zelf een maat instelt. `ceil` rondt halven naar boven af.
43
43
- **Zichtbaarheid** (standaard alles openbaar): de host bepaalt wie schoten,
44
44
giften, actiepuntentotalen, bereik en levens ziet. Voor levens en
45
45
actiepunten is er een tussenoptie *Binnen bereik*: je ziet die gegevens
@@ -37,9 +37,9 @@ Optionele regels (in de lobby, vóór de start):37
- **Dagelijks AP-tijdstip**: per lobby instelbaar (Europe/Amsterdam),37
- **Dagelijks AP-tijdstip**: per lobby instelbaar (Europe/Amsterdam),38
standaard 00:00. Jury en krimp vallen samen met dit tijdstip.38
standaard 00:00. Jury en krimp vallen samen met dit tijdstip.39
- **Bordgrootte**: de host kiest de zijde van het vierkante bord (6–24).39
- **Bordgrootte**: de host kiest de zijde van het vierkante bord (6–24).40
De suggestie is `max(10, aantal spelers + 1)` (bij 2–9 spelers: 10×10)40
De suggestie is `max(6 + ceil(n / 2), n + 1)` (2 spelers: 7×7; 6: 9×9;41
en wordt bijgewerkt als er mensen joinen, tenzij de host zelf een maat41
10: 11×11; 14: 15×15) en wordt bijgewerkt als er mensen joinen, tenzij42
instelt.42
de host zelf een maat instelt. `ceil` rondt halven naar boven af.43
- **Zichtbaarheid** (standaard alles openbaar): de host bepaalt wie schoten,43
- **Zichtbaarheid** (standaard alles openbaar): de host bepaalt wie schoten,44
giften, actiepuntentotalen, bereik en levens ziet. Voor levens en44
giften, actiepuntentotalen, bereik en levens ziet. Voor levens en45
actiepunten is er een tussenoptie *Binnen bereik*: je ziet die gegevens45
actiepunten is er een tussenoptie *Binnen bereik*: je ziet die gegevens@@ -112,9 +112,9 @@
112
112
<div id="grid-wrap" class="field grid-field">
113
113
<label for="rule-grid" data-i18n="lobby.grid">Board size</label>
114
114
<div class="grid-size-row">
115
<input type="number" id="rule-grid" min="6" max="24" value="10" step="1" inputmode="numeric" aria-describedby="grid-hint">
115
<input type="number" id="rule-grid" min="6" max="24" value="7" step="1" inputmode="numeric" aria-describedby="grid-hint">
116
116
<span class="grid-times" aria-hidden="true">×</span>
117
<span id="grid-side-echo">10</span>
117
<span id="grid-side-echo">7</span>
118
118
</div>
119
119
<small id="grid-hint" data-i18n="lobby.gridHint"></small>
120
120
<button type="button" id="grid-use-suggested" class="btn-secondary" hidden data-i18n="lobby.gridUseSuggested">Use suggested size</button>
@@ -112,9 +112,9 @@112
<div id="grid-wrap" class="field grid-field">112
<div id="grid-wrap" class="field grid-field">113
<label for="rule-grid" data-i18n="lobby.grid">Board size</label>113
<label for="rule-grid" data-i18n="lobby.grid">Board size</label>114
<div class="grid-size-row">114
<div class="grid-size-row">115
<input type="number" id="rule-grid" min="6" max="24" value="10" step="1" inputmode="numeric" aria-describedby="grid-hint">115
<input type="number" id="rule-grid" min="6" max="24" value="7" step="1" inputmode="numeric" aria-describedby="grid-hint">116
<span class="grid-times" aria-hidden="true">×</span>116
<span class="grid-times" aria-hidden="true">×</span>117
<span id="grid-side-echo">10</span>117
<span id="grid-side-echo">7</span>118
</div>118
</div>119
<small id="grid-hint" data-i18n="lobby.gridHint"></small>119
<small id="grid-hint" data-i18n="lobby.gridHint"></small>120
<button type="button" id="grid-use-suggested" class="btn-secondary" hidden data-i18n="lobby.gridUseSuggested">Use suggested size</button>120
<button type="button" id="grid-use-suggested" class="btn-secondary" hidden data-i18n="lobby.gridUseSuggested">Use suggested size</button>@@ -6,10 +6,12 @@ regelmotor (`server/lib/Engine.php`) en de tests vastgelegd.
6
6
## Bord en plaatsing
7
7
8
8
- Het bord is vierkant. De host kiest de zijde in de lobby (geheel getal
9
van **6 tot 24**). De voorgestelde grootte is `max(10, aantal spelers + 1)`,
10
met een maximum van 24: twee tot negen spelers **10×10**; tien spelers
11
**11×11**; zestien spelers **17×17**. Die suggestie is ruimer dan de
12
eerdere formule (`max(6, ceil(sqrt(n × 6)))`).
9
van **6 tot 24**). De voorgestelde grootte is
10
`max(6 + ceil(n / 2), n + 1)`, met een maximum van 24. `ceil` rondt
11
halven naar boven af (bij oneven n: drie spelers → `ceil(1,5) = 2` →
12
zijde 8). Voorbeelden: 2 spelers **7×7**; 3 spelers **8×8**; 6 spelers
13
**9×9**; 10 spelers **11×11**; 14 spelers **15×15**; 16 spelers
14
**17×17**. Voor n ≤ 10 overheerst `6 + ceil(n/2)`; daarna `n + 1`.
13
15
- De suggestie wordt bijgewerkt als er spelers bij komen of weggaan,
14
16
**tenzij de host het veld handmatig heeft gewijzigd** (`grid_auto`).
15
17
“Gebruik de voorgestelde grootte” zet automatische bijwerking weer aan.
@@ -20,9 +22,9 @@ regelmotor (`server/lib/Engine.php`) en de tests vastgelegd.
20
22
- Startposities liggen op een ring rond het midden, beginnend bovenaan en
21
23
dan met de klok mee. Bij een botsing schuift de speler naar het dichtstbij
22
24
zijnde vrije vakje. Dode spelers blokkeren geen vakjes meer, maar blijven
23
visueel op hun laatste plek (uitgegrijsd). Op het voorgestelde 10×10
24
staan twee spelers ongeveer bovenaan en onderaan het midden, buiten
25
elkaars startbereik 2.
25
visueel op hun laatste plek (uitgegrijsd). Op het voorgestelde 7×7
26
voor twee spelers staan ze ongeveer bovenaan en onderaan het midden,
27
buiten elkaars startbereik 2.
26
28
- Maximaal 16 spelers per spel, minimaal 2 om te starten. Er is geen
27
29
aparte “klaar”-stap: de host start wanneer er minstens twee spelers zijn.
28
30
- Kleuren van de omlijning worden in volgorde van aansluiting uit een vaste
@@ -6,10 +6,12 @@ regelmotor (`server/lib/Engine.php`) en de tests vastgelegd.6
## Bord en plaatsing6
## Bord en plaatsing7
7
8
- Het bord is vierkant. De host kiest de zijde in de lobby (geheel getal8
- Het bord is vierkant. De host kiest de zijde in de lobby (geheel getal9
van **6 tot 24**). De voorgestelde grootte is `max(10, aantal spelers + 1)`,9
van **6 tot 24**). De voorgestelde grootte is10
met een maximum van 24: twee tot negen spelers **10×10**; tien spelers10
`max(6 + ceil(n / 2), n + 1)`, met een maximum van 24. `ceil` rondt11
**11×11**; zestien spelers **17×17**. Die suggestie is ruimer dan de11
halven naar boven af (bij oneven n: drie spelers → `ceil(1,5) = 2` →12
eerdere formule (`max(6, ceil(sqrt(n × 6)))`).12
zijde 8). Voorbeelden: 2 spelers **7×7**; 3 spelers **8×8**; 6 spelers13
**9×9**; 10 spelers **11×11**; 14 spelers **15×15**; 16 spelers14
**17×17**. Voor n ≤ 10 overheerst `6 + ceil(n/2)`; daarna `n + 1`.13
- De suggestie wordt bijgewerkt als er spelers bij komen of weggaan,15
- De suggestie wordt bijgewerkt als er spelers bij komen of weggaan,14
**tenzij de host het veld handmatig heeft gewijzigd** (`grid_auto`).16
**tenzij de host het veld handmatig heeft gewijzigd** (`grid_auto`).15
“Gebruik de voorgestelde grootte” zet automatische bijwerking weer aan.17
“Gebruik de voorgestelde grootte” zet automatische bijwerking weer aan.@@ -20,9 +22,9 @@ regelmotor (`server/lib/Engine.php`) en de tests vastgelegd.20
- Startposities liggen op een ring rond het midden, beginnend bovenaan en22
- Startposities liggen op een ring rond het midden, beginnend bovenaan en21
dan met de klok mee. Bij een botsing schuift de speler naar het dichtstbij23
dan met de klok mee. Bij een botsing schuift de speler naar het dichtstbij22
zijnde vrije vakje. Dode spelers blokkeren geen vakjes meer, maar blijven24
zijnde vrije vakje. Dode spelers blokkeren geen vakjes meer, maar blijven23
visueel op hun laatste plek (uitgegrijsd). Op het voorgestelde 10×1025
visueel op hun laatste plek (uitgegrijsd). Op het voorgestelde 7×724
staan twee spelers ongeveer bovenaan en onderaan het midden, buiten26
voor twee spelers staan ze ongeveer bovenaan en onderaan het midden,25
elkaars startbereik 2.27
buiten elkaars startbereik 2.26
- Maximaal 16 spelers per spel, minimaal 2 om te starten. Er is geen28
- Maximaal 16 spelers per spel, minimaal 2 om te starten. Er is geen27
aparte “klaar”-stap: de host start wanneer er minstens twee spelers zijn.29
aparte “klaar”-stap: de host start wanneer er minstens twee spelers zijn.28
- Kleuren van de omlijning worden in volgorde van aansluiting uit een vaste30
- Kleuren van de omlijning worden in volgorde van aansluiting uit een vaste@@ -18,8 +18,7 @@ final class Engine
18
18
public const MIN_PLAYERS = 2;
19
19
public const MAX_PLAYERS = 16;
20
20
public const MIN_GRID = 6;
21
/** Suggested side is max(SUGGEST_MIN_GRID, playerCount + 1), capped at MAX_GRID. */
22
public const SUGGEST_MIN_GRID = 10;
21
/** Suggested side: max(6 + ceil(n/2), n + 1), capped at MAX_GRID. */
23
22
public const MAX_GRID = 24;
24
23
public const MIN_ARENA = 3;
25
24
public const DEFAULT_SHRINK_DAYS = 7;
@@ -72,7 +71,7 @@ final class Engine
72
71
'vis_ap' => 'public',
73
72
'vis_range' => 'public',
74
73
'vis_lives' => 'public',
75
'grid' => self::SUGGEST_MIN_GRID,
74
'grid' => self::suggestedGrid(1),
76
75
'grid_auto' => true,
77
76
];
78
77
}
@@ -104,13 +103,15 @@ final class Engine
104
103
if (array_key_exists('grid', $raw) && $raw['grid'] !== null && $raw['grid'] !== '') {
105
104
$d['grid'] = self::clampGrid((int) $raw['grid']);
106
105
} else {
107
$d['grid'] = self::SUGGEST_MIN_GRID;
106
$d['grid'] = self::suggestedGrid(1);
108
107
}
109
108
return $d;
110
109
}
111
110
112
111
/**
113
* Suggested square board side for $n players: max(10, n + 1), capped at 24.
112
* Suggested square board side for $n players:
113
* max(6 + ceil(n / 2), n + 1), capped at MAX_GRID (24).
114
* ceil() rounds halves upward (3 players: ceil(1.5) = 2 → side 8).
114
115
* Hosts may choose any size from MIN_GRID (6) to MAX_GRID (24).
115
116
*/
116
117
public static function suggestedGrid(int $n): int
@@ -118,7 +119,8 @@ final class Engine
118
119
if ($n < 1) {
119
120
$n = 1;
120
121
}
121
return max(self::SUGGEST_MIN_GRID, min(self::MAX_GRID, $n + 1));
122
$side = max(6 + (int) ceil($n / 2.0), $n + 1);
123
return min(self::MAX_GRID, $side);
122
124
}
123
125
124
126
/** @deprecated alias of suggestedGrid(); kept for call-site clarity in older tests. */
@@ -327,7 +329,7 @@ final class Engine
327
329
'started_at' => null,
328
330
'finished_at' => null,
329
331
'rules' => $rules,
330
'grid' => (int) ($rules['grid'] ?? self::SUGGEST_MIN_GRID),
332
'grid' => (int) ($rules['grid'] ?? self::suggestedGrid(1)),
331
333
'day' => 0,
332
334
'next_distribution_at' => null,
333
335
'arena_inset' => 0,
@@ -18,8 +18,7 @@ final class Engine18
public const MIN_PLAYERS = 2;18
public const MIN_PLAYERS = 2;19
public const MAX_PLAYERS = 16;19
public const MAX_PLAYERS = 16;20
public const MIN_GRID = 6;20
public const MIN_GRID = 6;21
/** Suggested side is max(SUGGEST_MIN_GRID, playerCount + 1), capped at MAX_GRID. */21
/** Suggested side: max(6 + ceil(n/2), n + 1), capped at MAX_GRID. */22
public const SUGGEST_MIN_GRID = 10;23
public const MAX_GRID = 24;22
public const MAX_GRID = 24;24
public const MIN_ARENA = 3;23
public const MIN_ARENA = 3;25
public const DEFAULT_SHRINK_DAYS = 7;24
public const DEFAULT_SHRINK_DAYS = 7;@@ -72,7 +71,7 @@ final class Engine72
'vis_ap' => 'public',71
'vis_ap' => 'public',73
'vis_range' => 'public',72
'vis_range' => 'public',74
'vis_lives' => 'public',73
'vis_lives' => 'public',75
'grid' => self::SUGGEST_MIN_GRID,74
'grid' => self::suggestedGrid(1),76
'grid_auto' => true,75
'grid_auto' => true,77
];76
];78
}77
}@@ -104,13 +103,15 @@ final class Engine104
if (array_key_exists('grid', $raw) && $raw['grid'] !== null && $raw['grid'] !== '') {103
if (array_key_exists('grid', $raw) && $raw['grid'] !== null && $raw['grid'] !== '') {105
$d['grid'] = self::clampGrid((int) $raw['grid']);104
$d['grid'] = self::clampGrid((int) $raw['grid']);106
} else {105
} else {107
$d['grid'] = self::SUGGEST_MIN_GRID;106
$d['grid'] = self::suggestedGrid(1);108
}107
}109
return $d;108
return $d;110
}109
}111
110
112
/**111
/**113
* Suggested square board side for $n players: max(10, n + 1), capped at 24.112
* Suggested square board side for $n players:113
* max(6 + ceil(n / 2), n + 1), capped at MAX_GRID (24).114
* ceil() rounds halves upward (3 players: ceil(1.5) = 2 → side 8).114
* Hosts may choose any size from MIN_GRID (6) to MAX_GRID (24).115
* Hosts may choose any size from MIN_GRID (6) to MAX_GRID (24).115
*/116
*/116
public static function suggestedGrid(int $n): int117
public static function suggestedGrid(int $n): int@@ -118,7 +119,8 @@ final class Engine118
if ($n < 1) {119
if ($n < 1) {119
$n = 1;120
$n = 1;120
}121
}121
return max(self::SUGGEST_MIN_GRID, min(self::MAX_GRID, $n + 1));122
$side = max(6 + (int) ceil($n / 2.0), $n + 1);123
return min(self::MAX_GRID, $side);122
}124
}123
125
124
/** @deprecated alias of suggestedGrid(); kept for call-site clarity in older tests. */126
/** @deprecated alias of suggestedGrid(); kept for call-site clarity in older tests. */@@ -327,7 +329,7 @@ final class Engine327
'started_at' => null,329
'started_at' => null,328
'finished_at' => null,330
'finished_at' => null,329
'rules' => $rules,331
'rules' => $rules,330
'grid' => (int) ($rules['grid'] ?? self::SUGGEST_MIN_GRID),332
'grid' => (int) ($rules['grid'] ?? self::suggestedGrid(1)),331
'day' => 0,333
'day' => 0,332
'next_distribution_at' => null,334
'next_distribution_at' => null,333
'arena_inset' => 0,335
'arena_inset' => 0,@@ -29,13 +29,17 @@ function game(array $ids, array $rules = [], ?int $now = null): array
29
29
}
30
30
31
31
echo "Engine: grid suggestion and placement\n";
32
expect(Engine::suggestedGrid(1) === 10, '1 player → 10 (min suggestion)');
33
expect(Engine::suggestedGrid(2) === 10, '2 players → 10 (max(10, 3))');
34
expect(Engine::suggestedGrid(9) === 10, '9 players → 10 (max(10, 10))');
35
expect(Engine::suggestedGrid(10) === 11, '10 players → 11');
32
// max(6 + ceil(n/2), n + 1), cap 24. ceil rounds halves up.
33
expect(Engine::suggestedGrid(1) === 7, '1 player → 7 (max(6+ceil(0.5), 2) = max(7, 2))');
34
expect(Engine::suggestedGrid(2) === 7, '2 players → 7 (max(6+1, 3))');
35
expect(Engine::suggestedGrid(3) === 8, '3 players → 8 (ceil(1.5)=2, max(8, 4))');
36
expect(Engine::suggestedGrid(6) === 9, '6 players → 9 (max(6+3, 7))');
37
expect(Engine::suggestedGrid(9) === 11, '9 players → 11 (ceil(4.5)=5, max(11, 10))');
38
expect(Engine::suggestedGrid(10) === 11, '10 players → 11 (max(6+5, 11))');
39
expect(Engine::suggestedGrid(14) === 15, '14 players → 15 (max(6+7, 15))');
36
40
expect(Engine::suggestedGrid(16) === 17, '16 players → 17');
37
41
expect(Engine::suggestedGrid(30) === 24, 'capped at MAX_GRID 24');
38
expect(Engine::gridSize(2) === 10, 'gridSize aliases suggestedGrid');
42
expect(Engine::gridSize(2) === 7, 'gridSize aliases suggestedGrid');
39
43
expect(Engine::clampGrid(3) === 6, 'clamp below min → 6');
40
44
expect(Engine::clampGrid(100) === 24, 'clamp above max → 24');
41
45
expect(Engine::clampGrid(12) === 12, 'clamp mid unchanged');
@@ -92,9 +96,9 @@ expect($g['rules']['vis_range'] === 'public', 'vis_range default public');
92
96
expect($g['rules']['vis_lives'] === 'public', 'vis_lives default public');
93
97
expect($g['rules']['ap_loot'] === false, 'ap_loot default OFF');
94
98
expect($g['rules']['ap_time'] === '00:00', 'ap_time default 00:00');
95
expect($g['rules']['grid'] === 10, 'lobby suggested grid 10 for 1 player');
99
expect($g['rules']['grid'] === 7, 'lobby suggested grid 7 for 1 player');
96
100
expect($g['rules']['grid_auto'] === true, 'grid_auto default ON');
97
expect($g['grid'] === 10, 'game.grid mirrors suggestion in lobby');
101
expect($g['grid'] === 7, 'game.grid mirrors suggestion in lobby');
98
102
expect($g['host_id'] === 'a', 'host is creator');
99
103
try {
100
104
Engine::start($g, 'a', $now);
@@ -112,7 +116,7 @@ try {
112
116
}
113
117
$g = Engine::start($g, 'a', $now);
114
118
expect($g['status'] === 'running', 'started');
115
expect($g['grid'] === 10, 'auto grid for 2 players is 10');
119
expect($g['grid'] === 7, 'auto grid for 2 players is 7');
116
120
expect($g['players'][0]['ap'] === 1, 'start with 1 AP');
117
121
expect($g['players'][0]['lives'] === 3, 'start with 3 lives');
118
122
expect($g['players'][0]['range'] === 2, 'start with range 2');
@@ -1065,16 +1069,24 @@ foreach ($hurtA as $id) {
1065
1069
echo "Engine: lobby grid option — auto suggestion and manual lock\n";
1066
1070
$nowG = $now;
1067
1071
$g = Engine::newLobby('g', 'GRID01', 'a', 'Alice', null, [], $nowG);
1068
expect($g['grid'] === 10 && $g['rules']['grid_auto'] === true, 'new lobby 10 and auto');
1069
for ($i = 2; $i <= 9; $i++) {
1072
expect($g['grid'] === 7 && $g['rules']['grid_auto'] === true, 'new lobby 7 and auto');
1073
$g = Engine::join($g, 'p2', 'P2', null, $nowG);
1074
expect($g['rules']['grid'] === 7 && count($g['players']) === 2, '2 players still 7');
1075
$g = Engine::join($g, 'p3', 'P3', null, $nowG);
1076
expect($g['rules']['grid'] === 8, '3rd player bumps to 8 (ceil(1.5)=2)');
1077
$g = Engine::join($g, 'p4', 'P4', null, $nowG);
1078
expect($g['rules']['grid'] === 8, '4 players stay 8');
1079
$g = Engine::join($g, 'p5', 'P5', null, $nowG);
1080
expect($g['rules']['grid'] === 9, '5th player bumps to 9');
1081
for ($i = 6; $i <= 10; $i++) {
1070
1082
$g = Engine::join($g, 'p' . $i, 'P' . $i, null, $nowG);
1071
1083
}
1072
expect(count($g['players']) === 9, '9 players');
1073
expect($g['rules']['grid'] === 10 && $g['grid'] === 10, 'still 10 at 9 players (max(10,10))');
1074
$g = Engine::join($g, 'p10', 'P10', null, $nowG);
1075
expect($g['rules']['grid'] === 11 && $g['grid'] === 11, '10th player bumps suggestion to 11');
1076
$g = Engine::leaveLobby($g, 'p10', $nowG);
1077
expect($g['rules']['grid'] === 10, 'leave drops suggestion back to 10');
1084
expect(count($g['players']) === 10, '10 players');
1085
expect($g['rules']['grid'] === 11 && $g['grid'] === 11, '10 players → 11');
1086
$g = Engine::join($g, 'p11', 'P11', null, $nowG);
1087
expect($g['rules']['grid'] === 12 && $g['grid'] === 12, '11th player bumps suggestion to 12');
1088
$g = Engine::leaveLobby($g, 'p11', $nowG);
1089
expect($g['rules']['grid'] === 11 && count($g['players']) === 10, 'leave drops suggestion back to 11');
1078
1090
1079
1091
// Manual lock: host sets 14, further joins do not change it.
1080
1092
$g = Engine::newLobby('g', 'GRID02', 'a', 'Alice', null, [], $nowG);
@@ -1106,11 +1118,10 @@ expect($g['grid'] === 6, 'host may start a 6×6');
1106
1118
// Auto at start uses current player count, even if rules.grid is stale.
1107
1119
$g = Engine::newLobby('g', 'GRID04', 'a', 'Alice', null, [], $nowG);
1108
1120
$g = Engine::join($g, 'b', 'Bob', null, $nowG);
1109
$g['rules']['grid'] = 10; // stale but auto is on
1121
$g['rules']['grid'] = 10; // stale; auto is on so start must use suggestion
1110
1122
$g['rules']['grid_auto'] = true;
1111
// sneak 10 more? 2 players → suggestion 10. Fine.
1112
1123
$g = Engine::start($g, 'a', $nowG);
1113
expect($g['grid'] === 10, 'auto start uses suggested 10');
1124
expect($g['grid'] === 7, 'auto start uses suggested 7 for 2 players');
1114
1125
1115
1126
echo "Engine: no hearts, no buying lives (options do not exist)\n";
1116
1127
$n = Engine::normalizeRules(['hearts' => true, 'buy_lives' => true, 'buyLives' => true]);
@@ -29,13 +29,17 @@ function game(array $ids, array $rules = [], ?int $now = null): array29
}29
}30
30
31
echo "Engine: grid suggestion and placement\n";31
echo "Engine: grid suggestion and placement\n";32
expect(Engine::suggestedGrid(1) === 10, '1 player → 10 (min suggestion)');32
// max(6 + ceil(n/2), n + 1), cap 24. ceil rounds halves up.33
expect(Engine::suggestedGrid(2) === 10, '2 players → 10 (max(10, 3))');33
expect(Engine::suggestedGrid(1) === 7, '1 player → 7 (max(6+ceil(0.5), 2) = max(7, 2))');34
expect(Engine::suggestedGrid(9) === 10, '9 players → 10 (max(10, 10))');34
expect(Engine::suggestedGrid(2) === 7, '2 players → 7 (max(6+1, 3))');35
expect(Engine::suggestedGrid(10) === 11, '10 players → 11');35
expect(Engine::suggestedGrid(3) === 8, '3 players → 8 (ceil(1.5)=2, max(8, 4))');36
expect(Engine::suggestedGrid(6) === 9, '6 players → 9 (max(6+3, 7))');37
expect(Engine::suggestedGrid(9) === 11, '9 players → 11 (ceil(4.5)=5, max(11, 10))');38
expect(Engine::suggestedGrid(10) === 11, '10 players → 11 (max(6+5, 11))');39
expect(Engine::suggestedGrid(14) === 15, '14 players → 15 (max(6+7, 15))');36
expect(Engine::suggestedGrid(16) === 17, '16 players → 17');40
expect(Engine::suggestedGrid(16) === 17, '16 players → 17');37
expect(Engine::suggestedGrid(30) === 24, 'capped at MAX_GRID 24');41
expect(Engine::suggestedGrid(30) === 24, 'capped at MAX_GRID 24');38
expect(Engine::gridSize(2) === 10, 'gridSize aliases suggestedGrid');42
expect(Engine::gridSize(2) === 7, 'gridSize aliases suggestedGrid');39
expect(Engine::clampGrid(3) === 6, 'clamp below min → 6');43
expect(Engine::clampGrid(3) === 6, 'clamp below min → 6');40
expect(Engine::clampGrid(100) === 24, 'clamp above max → 24');44
expect(Engine::clampGrid(100) === 24, 'clamp above max → 24');41
expect(Engine::clampGrid(12) === 12, 'clamp mid unchanged');45
expect(Engine::clampGrid(12) === 12, 'clamp mid unchanged');@@ -92,9 +96,9 @@ expect($g['rules']['vis_range'] === 'public', 'vis_range default public');92
expect($g['rules']['vis_lives'] === 'public', 'vis_lives default public');96
expect($g['rules']['vis_lives'] === 'public', 'vis_lives default public');93
expect($g['rules']['ap_loot'] === false, 'ap_loot default OFF');97
expect($g['rules']['ap_loot'] === false, 'ap_loot default OFF');94
expect($g['rules']['ap_time'] === '00:00', 'ap_time default 00:00');98
expect($g['rules']['ap_time'] === '00:00', 'ap_time default 00:00');95
expect($g['rules']['grid'] === 10, 'lobby suggested grid 10 for 1 player');99
expect($g['rules']['grid'] === 7, 'lobby suggested grid 7 for 1 player');96
expect($g['rules']['grid_auto'] === true, 'grid_auto default ON');100
expect($g['rules']['grid_auto'] === true, 'grid_auto default ON');97
expect($g['grid'] === 10, 'game.grid mirrors suggestion in lobby');101
expect($g['grid'] === 7, 'game.grid mirrors suggestion in lobby');98
expect($g['host_id'] === 'a', 'host is creator');102
expect($g['host_id'] === 'a', 'host is creator');99
try {103
try {100
Engine::start($g, 'a', $now);104
Engine::start($g, 'a', $now);@@ -112,7 +116,7 @@ try {112
}116
}113
$g = Engine::start($g, 'a', $now);117
$g = Engine::start($g, 'a', $now);114
expect($g['status'] === 'running', 'started');118
expect($g['status'] === 'running', 'started');115
expect($g['grid'] === 10, 'auto grid for 2 players is 10');119
expect($g['grid'] === 7, 'auto grid for 2 players is 7');116
expect($g['players'][0]['ap'] === 1, 'start with 1 AP');120
expect($g['players'][0]['ap'] === 1, 'start with 1 AP');117
expect($g['players'][0]['lives'] === 3, 'start with 3 lives');121
expect($g['players'][0]['lives'] === 3, 'start with 3 lives');118
expect($g['players'][0]['range'] === 2, 'start with range 2');122
expect($g['players'][0]['range'] === 2, 'start with range 2');@@ -1065,16 +1069,24 @@ foreach ($hurtA as $id) {1065
echo "Engine: lobby grid option — auto suggestion and manual lock\n";1069
echo "Engine: lobby grid option — auto suggestion and manual lock\n";1066
$nowG = $now;1070
$nowG = $now;1067
$g = Engine::newLobby('g', 'GRID01', 'a', 'Alice', null, [], $nowG);1071
$g = Engine::newLobby('g', 'GRID01', 'a', 'Alice', null, [], $nowG);1068
expect($g['grid'] === 10 && $g['rules']['grid_auto'] === true, 'new lobby 10 and auto');1072
expect($g['grid'] === 7 && $g['rules']['grid_auto'] === true, 'new lobby 7 and auto');1069
for ($i = 2; $i <= 9; $i++) {1073
$g = Engine::join($g, 'p2', 'P2', null, $nowG);1074
expect($g['rules']['grid'] === 7 && count($g['players']) === 2, '2 players still 7');1075
$g = Engine::join($g, 'p3', 'P3', null, $nowG);1076
expect($g['rules']['grid'] === 8, '3rd player bumps to 8 (ceil(1.5)=2)');1077
$g = Engine::join($g, 'p4', 'P4', null, $nowG);1078
expect($g['rules']['grid'] === 8, '4 players stay 8');1079
$g = Engine::join($g, 'p5', 'P5', null, $nowG);1080
expect($g['rules']['grid'] === 9, '5th player bumps to 9');1081
for ($i = 6; $i <= 10; $i++) {1070
$g = Engine::join($g, 'p' . $i, 'P' . $i, null, $nowG);1082
$g = Engine::join($g, 'p' . $i, 'P' . $i, null, $nowG);1071
}1083
}1072
expect(count($g['players']) === 9, '9 players');1084
expect(count($g['players']) === 10, '10 players');1073
expect($g['rules']['grid'] === 10 && $g['grid'] === 10, 'still 10 at 9 players (max(10,10))');1085
expect($g['rules']['grid'] === 11 && $g['grid'] === 11, '10 players → 11');1074
$g = Engine::join($g, 'p10', 'P10', null, $nowG);1086
$g = Engine::join($g, 'p11', 'P11', null, $nowG);1075
expect($g['rules']['grid'] === 11 && $g['grid'] === 11, '10th player bumps suggestion to 11');1087
expect($g['rules']['grid'] === 12 && $g['grid'] === 12, '11th player bumps suggestion to 12');1076
$g = Engine::leaveLobby($g, 'p10', $nowG);1088
$g = Engine::leaveLobby($g, 'p11', $nowG);1077
expect($g['rules']['grid'] === 10, 'leave drops suggestion back to 10');1089
expect($g['rules']['grid'] === 11 && count($g['players']) === 10, 'leave drops suggestion back to 11');1078
1090
1079
// Manual lock: host sets 14, further joins do not change it.1091
// Manual lock: host sets 14, further joins do not change it.1080
$g = Engine::newLobby('g', 'GRID02', 'a', 'Alice', null, [], $nowG);1092
$g = Engine::newLobby('g', 'GRID02', 'a', 'Alice', null, [], $nowG);@@ -1106,11 +1118,10 @@ expect($g['grid'] === 6, 'host may start a 6×6');1106
// Auto at start uses current player count, even if rules.grid is stale.1118
// Auto at start uses current player count, even if rules.grid is stale.1107
$g = Engine::newLobby('g', 'GRID04', 'a', 'Alice', null, [], $nowG);1119
$g = Engine::newLobby('g', 'GRID04', 'a', 'Alice', null, [], $nowG);1108
$g = Engine::join($g, 'b', 'Bob', null, $nowG);1120
$g = Engine::join($g, 'b', 'Bob', null, $nowG);1109
$g['rules']['grid'] = 10; // stale but auto is on1121
$g['rules']['grid'] = 10; // stale; auto is on so start must use suggestion1110
$g['rules']['grid_auto'] = true;1122
$g['rules']['grid_auto'] = true;1111
// sneak 10 more? 2 players → suggestion 10. Fine.1112
$g = Engine::start($g, 'a', $nowG);1123
$g = Engine::start($g, 'a', $nowG);1113
expect($g['grid'] === 10, 'auto start uses suggested 10');1124
expect($g['grid'] === 7, 'auto start uses suggested 7 for 2 players');1114
1125
1115
echo "Engine: no hearts, no buying lives (options do not exist)\n";1126
echo "Engine: no hearts, no buying lives (options do not exist)\n";1116
$n = Engine::normalizeRules(['hearts' => true, 'buy_lives' => true, 'buyLives' => true]);1127
$n = Engine::normalizeRules(['hearts' => true, 'buy_lives' => true, 'buyLives' => true]);@@ -700,7 +700,7 @@ App.onRulesChange = function ()
700
700
ceasefire_ranges: App.currentCfRanges(),
701
701
ap_loot: $('rule-ap-loot') ? $('rule-ap-loot').checked : false,
702
702
ap_time: ($('rule-ap-time') && $('rule-ap-time').value) ? $('rule-ap-time').value : '00:00',
703
grid: Rules.clampGrid($('rule-grid') ? $('rule-grid').value : Rules.SUGGEST_MIN_GRID),
703
grid: Rules.clampGrid($('rule-grid') ? $('rule-grid').value : Rules.suggestedGrid(1)),
704
704
grid_auto: App.gridAuto !== false
705
705
};
706
706
Object.assign(rules, App.readVisRules());
@@ -700,7 +700,7 @@ App.onRulesChange = function ()700
ceasefire_ranges: App.currentCfRanges(),700
ceasefire_ranges: App.currentCfRanges(),701
ap_loot: $('rule-ap-loot') ? $('rule-ap-loot').checked : false,701
ap_loot: $('rule-ap-loot') ? $('rule-ap-loot').checked : false,702
ap_time: ($('rule-ap-time') && $('rule-ap-time').value) ? $('rule-ap-time').value : '00:00',702
ap_time: ($('rule-ap-time') && $('rule-ap-time').value) ? $('rule-ap-time').value : '00:00',703
grid: Rules.clampGrid($('rule-grid') ? $('rule-grid').value : Rules.SUGGEST_MIN_GRID),703
grid: Rules.clampGrid($('rule-grid') ? $('rule-grid').value : Rules.suggestedGrid(1)),704
grid_auto: App.gridAuto !== false704
grid_auto: App.gridAuto !== false705
};705
};706
Object.assign(rules, App.readVisRules());706
Object.assign(rules, App.readVisRules());@@ -13,7 +13,6 @@ var Rules = {
13
13
MIN_PLAYERS: 2,
14
14
MAX_PLAYERS: 16,
15
15
MIN_GRID: 6,
16
SUGGEST_MIN_GRID: 10,
17
16
MAX_GRID: 24,
18
17
MIN_ARENA: 3,
19
18
DEFAULT_SHRINK_DAYS: 7,
@@ -40,16 +39,17 @@ Rules.defaultRules = function ()
40
39
vis_ap: 'public',
41
40
vis_range: 'public',
42
41
vis_lives: 'public',
43
grid: this.SUGGEST_MIN_GRID,
42
grid: this.suggestedGrid(1),
44
43
grid_auto: true
45
44
};
46
45
};
47
46
48
/** Suggested square side: max(10, n + 1), capped at 24. */
47
/** Suggested square side: max(6 + ceil(n/2), n + 1), capped at 24. */
49
48
Rules.suggestedGrid = function (n)
50
49
{
51
50
if (n < 1) { n = 1; }
52
return Math.max(this.SUGGEST_MIN_GRID, Math.min(this.MAX_GRID, n + 1));
51
var side = Math.max(6 + Math.ceil(n / 2), n + 1);
52
return Math.min(this.MAX_GRID, side);
53
53
};
54
54
55
55
Rules.gridSize = function (n)
@@ -13,7 +13,6 @@ var Rules = {13
MIN_PLAYERS: 2,13
MIN_PLAYERS: 2,14
MAX_PLAYERS: 16,14
MAX_PLAYERS: 16,15
MIN_GRID: 6,15
MIN_GRID: 6,16
SUGGEST_MIN_GRID: 10,17
MAX_GRID: 24,16
MAX_GRID: 24,18
MIN_ARENA: 3,17
MIN_ARENA: 3,19
DEFAULT_SHRINK_DAYS: 7,18
DEFAULT_SHRINK_DAYS: 7,@@ -40,16 +39,17 @@ Rules.defaultRules = function ()40
vis_ap: 'public',39
vis_ap: 'public',41
vis_range: 'public',40
vis_range: 'public',42
vis_lives: 'public',41
vis_lives: 'public',43
grid: this.SUGGEST_MIN_GRID,42
grid: this.suggestedGrid(1),44
grid_auto: true43
grid_auto: true45
};44
};46
};45
};47
46
48
/** Suggested square side: max(10, n + 1), capped at 24. */47
/** Suggested square side: max(6 + ceil(n/2), n + 1), capped at 24. */49
Rules.suggestedGrid = function (n)48
Rules.suggestedGrid = function (n)50
{49
{51
if (n < 1) { n = 1; }50
if (n < 1) { n = 1; }52
return Math.max(this.SUGGEST_MIN_GRID, Math.min(this.MAX_GRID, n + 1));51
var side = Math.max(6 + Math.ceil(n / 2), n + 1);52
return Math.min(this.MAX_GRID, side);53
};53
};54
54
55
Rules.gridSize = function (n)55
Rules.gridSize = function (n)@@ -12,12 +12,15 @@ function ams(iso) {
12
12
}
13
13
14
14
describe('Rules grid and Chebyshev', () => {
15
it('suggests max(10, players + 1), capped at 24', () => {
16
assert.equal(Rules.suggestedGrid(2), 10);
17
assert.equal(Rules.suggestedGrid(9), 10);
15
it('suggests max(6 + ceil(n/2), n + 1), capped at 24', () => {
16
assert.equal(Rules.suggestedGrid(2), 7);
17
assert.equal(Rules.suggestedGrid(3), 8); // ceil(1.5) = 2
18
assert.equal(Rules.suggestedGrid(6), 9);
18
19
assert.equal(Rules.suggestedGrid(10), 11);
20
assert.equal(Rules.suggestedGrid(14), 15);
19
21
assert.equal(Rules.suggestedGrid(16), 17);
20
assert.equal(Rules.gridSize(2), 10);
22
assert.equal(Rules.suggestedGrid(30), 24);
23
assert.equal(Rules.gridSize(2), 7);
21
24
assert.equal(Rules.clampGrid(3), 6);
22
25
assert.equal(Rules.clampGrid(100), 24);
23
26
assert.equal(Rules.maxInset(6), 1);
@@ -12,12 +12,15 @@ function ams(iso) {12
}12
}13
13
14
describe('Rules grid and Chebyshev', () => {14
describe('Rules grid and Chebyshev', () => {15
it('suggests max(10, players + 1), capped at 24', () => {15
it('suggests max(6 + ceil(n/2), n + 1), capped at 24', () => {16
assert.equal(Rules.suggestedGrid(2), 10);16
assert.equal(Rules.suggestedGrid(2), 7);17
assert.equal(Rules.suggestedGrid(9), 10);17
assert.equal(Rules.suggestedGrid(3), 8); // ceil(1.5) = 218
assert.equal(Rules.suggestedGrid(6), 9);18
assert.equal(Rules.suggestedGrid(10), 11);19
assert.equal(Rules.suggestedGrid(10), 11);20
assert.equal(Rules.suggestedGrid(14), 15);19
assert.equal(Rules.suggestedGrid(16), 17);21
assert.equal(Rules.suggestedGrid(16), 17);20
assert.equal(Rules.gridSize(2), 10);22
assert.equal(Rules.suggestedGrid(30), 24);23
assert.equal(Rules.gridSize(2), 7);21
assert.equal(Rules.clampGrid(3), 6);24
assert.equal(Rules.clampGrid(3), 6);22
assert.equal(Rules.clampGrid(100), 24);25
assert.equal(Rules.clampGrid(100), 24);23
assert.equal(Rules.maxInset(6), 1);26
assert.equal(Rules.maxInset(6), 1);