Merge branch 'feature/vis-within-range-grid'
@@ -36,10 +36,17 @@ Optionele regels (in de lobby, vóór de start):
36
36
uitschakelend schot krijgt de schutter de resterende AP van het doelwit.
37
37
- **Dagelijks AP-tijdstip**: per lobby instelbaar (Europe/Amsterdam),
38
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).
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.
39
43
- **Zichtbaarheid** (standaard alles openbaar): de host bepaalt wie schoten,
40
giften, actiepuntentotalen, bereik en levens ziet. De server filtert de
41
staat en de tijdlijn per kijker. Eigen gegevens en verplaatsingen blijven
42
altijd zichtbaar.
44
giften, actiepuntentotalen, bereik en levens ziet. Voor levens en
45
actiepunten is er een tussenoptie *Binnen bereik*: je ziet die gegevens
46
van een speler die in **jouw** schootsveld staat. Dat verschilt van de
47
bereik-optie *Bekend bij spelers binnen bereik*, die kijkt naar **diens**
48
bereik. De server filtert de staat en de tijdlijn per kijker. Eigen
49
gegevens en verplaatsingen blijven altijd zichtbaar.
43
50
44
51
Events staan niet in een tekstlog: je ziet ze alleen in de video-weergave
45
52
van de tijdlijn (groene pijl bij een gift, rode pijl bij een schot, een
@@ -36,10 +36,17 @@ Optionele regels (in de lobby, vóór de start):36
uitschakelend schot krijgt de schutter de resterende AP van het doelwit.36
uitschakelend schot krijgt de schutter de resterende AP van het doelwit.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).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 maat42
instelt.39
- **Zichtbaarheid** (standaard alles openbaar): de host bepaalt wie schoten,43
- **Zichtbaarheid** (standaard alles openbaar): de host bepaalt wie schoten,40
giften, actiepuntentotalen, bereik en levens ziet. De server filtert de44
giften, actiepuntentotalen, bereik en levens ziet. Voor levens en41
staat en de tijdlijn per kijker. Eigen gegevens en verplaatsingen blijven45
actiepunten is er een tussenoptie *Binnen bereik*: je ziet die gegevens42
altijd zichtbaar.46
van een speler die in **jouw** schootsveld staat. Dat verschilt van de47
bereik-optie *Bekend bij spelers binnen bereik*, die kijkt naar **diens**48
bereik. De server filtert de staat en de tijdlijn per kijker. Eigen49
gegevens en verplaatsingen blijven altijd zichtbaar.43
50
44
Events staan niet in een tekstlog: je ziet ze alleen in de video-weergave51
Events staan niet in een tekstlog: je ziet ze alleen in de video-weergave45
van de tijdlijn (groene pijl bij een gift, rode pijl bij een schot, een52
van de tijdlijn (groene pijl bij een gift, rode pijl bij een schot, een@@ -109,6 +109,17 @@
109
109
</span>
110
110
</label>
111
111
112
<div id="grid-wrap" class="field grid-field">
113
<label for="rule-grid" data-i18n="lobby.grid">Board size</label>
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">
116
<span class="grid-times" aria-hidden="true">×</span>
117
<span id="grid-side-echo">10</span>
118
</div>
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>
121
</div>
122
112
123
<div id="ap-time-wrap" class="field ap-time-field">
113
124
<label for="rule-ap-time" data-i18n="lobby.apTime">Daily action points at</label>
114
125
<input type="time" id="rule-ap-time" value="00:00" step="60">
@@ -164,7 +175,9 @@
164
175
<fieldset class="vis-field">
165
176
<legend data-i18n="lobby.visAp">Action-point totals</legend>
166
177
<label class="vis-opt"><input type="radio" name="vis_ap" value="public" checked> <span data-i18n="lobby.visApPublic">Public</span></label>
178
<label class="vis-opt"><input type="radio" name="vis_ap" value="within_range"> <span data-i18n="lobby.visApWithinRange">Within Range</span></label>
167
179
<label class="vis-opt"><input type="radio" name="vis_ap" value="hidden"> <span data-i18n="lobby.visApHidden">Hidden</span></label>
180
<p class="hint" data-i18n="lobby.visWithinRangeHint"></p>
168
181
</fieldset>
169
182
170
183
<fieldset class="vis-field">
@@ -177,7 +190,9 @@
177
190
<fieldset class="vis-field">
178
191
<legend data-i18n="lobby.visLives">Lives</legend>
179
192
<label class="vis-opt"><input type="radio" name="vis_lives" value="public" checked> <span data-i18n="lobby.visLivesPublic">Public</span></label>
193
<label class="vis-opt"><input type="radio" name="vis_lives" value="within_range"> <span data-i18n="lobby.visLivesWithinRange">Within Range</span></label>
180
194
<label class="vis-opt"><input type="radio" name="vis_lives" value="hidden"> <span data-i18n="lobby.visLivesHidden">Hidden</span></label>
195
<p class="hint" data-i18n="lobby.visWithinRangeHint"></p>
181
196
</fieldset>
182
197
</div>
183
198
</section>
@@ -109,6 +109,17 @@109
</span>109
</span>110
</label>110
</label>111
111
112
<div id="grid-wrap" class="field grid-field">113
<label for="rule-grid" data-i18n="lobby.grid">Board size</label>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">116
<span class="grid-times" aria-hidden="true">×</span>117
<span id="grid-side-echo">10</span>118
</div>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>121
</div>122
112
<div id="ap-time-wrap" class="field ap-time-field">123
<div id="ap-time-wrap" class="field ap-time-field">113
<label for="rule-ap-time" data-i18n="lobby.apTime">Daily action points at</label>124
<label for="rule-ap-time" data-i18n="lobby.apTime">Daily action points at</label>114
<input type="time" id="rule-ap-time" value="00:00" step="60">125
<input type="time" id="rule-ap-time" value="00:00" step="60">@@ -164,7 +175,9 @@164
<fieldset class="vis-field">175
<fieldset class="vis-field">165
<legend data-i18n="lobby.visAp">Action-point totals</legend>176
<legend data-i18n="lobby.visAp">Action-point totals</legend>166
<label class="vis-opt"><input type="radio" name="vis_ap" value="public" checked> <span data-i18n="lobby.visApPublic">Public</span></label>177
<label class="vis-opt"><input type="radio" name="vis_ap" value="public" checked> <span data-i18n="lobby.visApPublic">Public</span></label>178
<label class="vis-opt"><input type="radio" name="vis_ap" value="within_range"> <span data-i18n="lobby.visApWithinRange">Within Range</span></label>167
<label class="vis-opt"><input type="radio" name="vis_ap" value="hidden"> <span data-i18n="lobby.visApHidden">Hidden</span></label>179
<label class="vis-opt"><input type="radio" name="vis_ap" value="hidden"> <span data-i18n="lobby.visApHidden">Hidden</span></label>180
<p class="hint" data-i18n="lobby.visWithinRangeHint"></p>168
</fieldset>181
</fieldset>169
182
170
<fieldset class="vis-field">183
<fieldset class="vis-field">@@ -177,7 +190,9 @@177
<fieldset class="vis-field">190
<fieldset class="vis-field">178
<legend data-i18n="lobby.visLives">Lives</legend>191
<legend data-i18n="lobby.visLives">Lives</legend>179
<label class="vis-opt"><input type="radio" name="vis_lives" value="public" checked> <span data-i18n="lobby.visLivesPublic">Public</span></label>192
<label class="vis-opt"><input type="radio" name="vis_lives" value="public" checked> <span data-i18n="lobby.visLivesPublic">Public</span></label>193
<label class="vis-opt"><input type="radio" name="vis_lives" value="within_range"> <span data-i18n="lobby.visLivesWithinRange">Within Range</span></label>180
<label class="vis-opt"><input type="radio" name="vis_lives" value="hidden"> <span data-i18n="lobby.visLivesHidden">Hidden</span></label>194
<label class="vis-opt"><input type="radio" name="vis_lives" value="hidden"> <span data-i18n="lobby.visLivesHidden">Hidden</span></label>195
<p class="hint" data-i18n="lobby.visWithinRangeHint"></p>181
</fieldset>196
</fieldset>182
</div>197
</div>183
</section>198
</section>@@ -559,3 +559,9 @@ button.cell {
559
559
.ap-time-field { margin-left: 0; }
560
560
.ap-time-field input[type="time"] { max-width: 10rem; }
561
561
#ap-time-wrap.field { margin-left: 0; padding: 8px 0 12px; }
562
563
.grid-field { margin-left: 0; padding: 8px 0 12px; }
564
.grid-size-row { display: flex; align-items: center; gap: 8px; margin: 4px 0; }
565
.grid-size-row input[type="number"] { max-width: 5rem; }
566
.grid-times { opacity: 0.7; }
567
#grid-use-suggested { margin-top: 6px; }
@@ -559,3 +559,9 @@ button.cell {559
.ap-time-field { margin-left: 0; }559
.ap-time-field { margin-left: 0; }560
.ap-time-field input[type="time"] { max-width: 10rem; }560
.ap-time-field input[type="time"] { max-width: 10rem; }561
#ap-time-wrap.field { margin-left: 0; padding: 8px 0 12px; }561
#ap-time-wrap.field { margin-left: 0; padding: 8px 0 12px; }562
563
.grid-field { margin-left: 0; padding: 8px 0 12px; }564
.grid-size-row { display: flex; align-items: center; gap: 8px; margin: 4px 0; }565
.grid-size-row input[type="number"] { max-width: 5rem; }566
.grid-times { opacity: 0.7; }567
#grid-use-suggested { margin-top: 6px; }@@ -5,12 +5,24 @@ regelmotor (`server/lib/Engine.php`) en de tests vastgelegd.
5
5
6
6
## Bord en plaatsing
7
7
8
- Het bord is vierkant. Grootte: `max(6, ceil(sqrt(n × 6)))`. Twee tot
9
zes spelers: 6×6; acht spelers: 7×7; twaalf: 9×9.
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)))`).
13
- De suggestie wordt bijgewerkt als er spelers bij komen of weggaan,
14
**tenzij de host het veld handmatig heeft gewijzigd** (`grid_auto`).
15
“Gebruik de voorgestelde grootte” zet automatische bijwerking weer aan.
16
- Bij de start controleert de server: zijde tussen 6 en 24, minstens
17
evenveel vakjes als spelers, en unieke startposities op het bord.
18
Anders wordt de start geweigerd (`bad_grid`). Een host mag bewust
19
kleiner kiezen dan de suggestie (bijvoorbeeld 6×6).
10
20
- Startposities liggen op een ring rond het midden, beginnend bovenaan en
11
21
dan met de klok mee. Bij een botsing schuift de speler naar het dichtstbij
12
22
zijnde vrije vakje. Dode spelers blokkeren geen vakjes meer, maar blijven
13
visueel op hun laatste plek (uitgegrijsd).
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.
14
26
- Maximaal 16 spelers per spel, minimaal 2 om te starten. Er is geen
15
27
aparte “klaar”-stap: de host start wanneer er minstens twee spelers zijn.
16
28
- Kleuren van de omlijning worden in volgorde van aansluiting uit een vaste
@@ -164,19 +176,34 @@ het resterende *aantal* levens.
164
176
punten krijgt en hoeveel, maar niet van wie (`player` wordt weggelaten,
165
177
`anonymous: true`). Anderen zien de gift niet. De gever ziet de eigen
166
178
gift altijd.
167
- **Actiepuntentotalen:** *Openbaar* of *Verborgen*. Bij verborgen is
168
alleen je eigen totaal in de staat aanwezig; in het dagelijkse event
169
staat alleen je eigen toekenning. Jury-winnaars blijven openbaar
170
(de bekendmaking); stemtellingen worden niet meegestuurd.
179
- **Actiepuntentotalen:** *Openbaar*, *Binnen bereik*, of *Verborgen*.
180
Bij verborgen is alleen je eigen totaal in de staat aanwezig; in het
181
dagelijkse event staat alleen je eigen toekenning. Bij *Binnen bereik*
182
zie je het AP-totaal van een andere speler als die speler in **jouw**
183
schootsveld staat: Chebyshev-afstand tot die speler ≤ **jouw** (de
184
kijker’s) huidige bereik. Hetzelfde geldt voor toekenningen in het
185
dagelijkse event en voor `loot` op een schot (zichtbaar als je de
186
AP van de schutter mag zien; de schutter ziet het altijd).
187
Jury-winnaars blijven openbaar (de bekendmaking); stemtellingen
188
worden niet meegestuurd.
171
189
- **Bereik:** *Openbaar*, *Bekend bij spelers binnen bereik*, of
172
*Verborgen*. “Binnen bereik” betekent: Chebyshev-afstand tot die
173
speler ≤ **diens** huidige bereik (je staat in hun schootsveld).
174
Upgrade-events volgen dezelfde regel, op basis van de *huidige*
175
posities (niet de historische).
176
- **Levens:** *Openbaar* of *Verborgen*. Bij een zichtbaar schot gaat
177
`lives_left` alleen mee als levens openbaar zijn of jij het doelwit
178
bent. De schade van het schot (`damage`, nu altijd 1) is wel zichtbaar
179
als je het schot mag zien — dat lekt het resterende aantal levens niet.
190
*Verborgen*. “Bekend bij spelers binnen bereik” betekent: Chebyshev-
191
afstand tot die speler ≤ **diens** huidige bereik (jij staat in
192
**hun** schootsveld). Dit is het **omgekeerde** criterium van
193
“Binnen bereik” bij levens en actiepunten. Voorbeeld: jij hebt
194
bereik 2, de ander bereik 4, afstand 3 — jij ziet hun bereik (jij
195
staat in hun schootsveld) maar niet hun levens of AP (zij staan
196
niet in het jouwe). Upgrade-events volgen dezelfde regel als het
197
bereik-stat, op basis van de *huidige* posities (niet de historische).
198
- **Levens:** *Openbaar*, *Binnen bereik*, of *Verborgen*. “Binnen
199
bereik” gebruikt hetzelfde criterium als bij actiepunten: afstand ≤
200
**jouw** bereik (huidige posities). Bij een zichtbaar schot gaat
201
`lives_left` alleen mee als je de levens van het doelwit mag zien
202
(openbaar, jij bent het doelwit, of het doelwit staat in jouw
203
bereik). De schade van het schot (`damage`, nu altijd 1) is wel
204
zichtbaar als je het schot mag zien — dat lekt het resterende
205
aantal levens niet. De `hurt`-lijst van een krimp volgt dezelfde
206
levens-zichtbaarheid.
180
207
- Verborgen events worden **volledig weggelaten** (geen generiek streepje
181
208
op de tijdlijn): een streepje zou lekken *dat* er iets gebeurde.
182
209
Ticks en replay tonen alleen events die deze kijker mag zien.
@@ -5,12 +5,24 @@ regelmotor (`server/lib/Engine.php`) en de tests vastgelegd.5
5
6
## Bord en plaatsing6
## Bord en plaatsing7
7
8
- Het bord is vierkant. Grootte: `max(6, ceil(sqrt(n × 6)))`. Twee tot8
- Het bord is vierkant. De host kiest de zijde in de lobby (geheel getal9
zes spelers: 6×6; acht spelers: 7×7; twaalf: 9×9.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 spelers11
**11×11**; zestien spelers **17×17**. Die suggestie is ruimer dan de12
eerdere formule (`max(6, ceil(sqrt(n × 6)))`).13
- De suggestie wordt bijgewerkt als er spelers bij komen of weggaan,14
**tenzij de host het veld handmatig heeft gewijzigd** (`grid_auto`).15
“Gebruik de voorgestelde grootte” zet automatische bijwerking weer aan.16
- Bij de start controleert de server: zijde tussen 6 en 24, minstens17
evenveel vakjes als spelers, en unieke startposities op het bord.18
Anders wordt de start geweigerd (`bad_grid`). Een host mag bewust19
kleiner kiezen dan de suggestie (bijvoorbeeld 6×6).10
- Startposities liggen op een ring rond het midden, beginnend bovenaan en20
- Startposities liggen op een ring rond het midden, beginnend bovenaan en11
dan met de klok mee. Bij een botsing schuift de speler naar het dichtstbij21
dan met de klok mee. Bij een botsing schuift de speler naar het dichtstbij12
zijnde vrije vakje. Dode spelers blokkeren geen vakjes meer, maar blijven22
zijnde vrije vakje. Dode spelers blokkeren geen vakjes meer, maar blijven13
visueel op hun laatste plek (uitgegrijsd).23
visueel op hun laatste plek (uitgegrijsd). Op het voorgestelde 10×1024
staan twee spelers ongeveer bovenaan en onderaan het midden, buiten25
elkaars startbereik 2.14
- Maximaal 16 spelers per spel, minimaal 2 om te starten. Er is geen26
- Maximaal 16 spelers per spel, minimaal 2 om te starten. Er is geen15
aparte “klaar”-stap: de host start wanneer er minstens twee spelers zijn.27
aparte “klaar”-stap: de host start wanneer er minstens twee spelers zijn.16
- Kleuren van de omlijning worden in volgorde van aansluiting uit een vaste28
- Kleuren van de omlijning worden in volgorde van aansluiting uit een vaste@@ -164,19 +176,34 @@ het resterende *aantal* levens.164
punten krijgt en hoeveel, maar niet van wie (`player` wordt weggelaten,176
punten krijgt en hoeveel, maar niet van wie (`player` wordt weggelaten,165
`anonymous: true`). Anderen zien de gift niet. De gever ziet de eigen177
`anonymous: true`). Anderen zien de gift niet. De gever ziet de eigen166
gift altijd.178
gift altijd.167
- **Actiepuntentotalen:** *Openbaar* of *Verborgen*. Bij verborgen is179
- **Actiepuntentotalen:** *Openbaar*, *Binnen bereik*, of *Verborgen*.168
alleen je eigen totaal in de staat aanwezig; in het dagelijkse event180
Bij verborgen is alleen je eigen totaal in de staat aanwezig; in het169
staat alleen je eigen toekenning. Jury-winnaars blijven openbaar181
dagelijkse event staat alleen je eigen toekenning. Bij *Binnen bereik*170
(de bekendmaking); stemtellingen worden niet meegestuurd.182
zie je het AP-totaal van een andere speler als die speler in **jouw**183
schootsveld staat: Chebyshev-afstand tot die speler ≤ **jouw** (de184
kijker’s) huidige bereik. Hetzelfde geldt voor toekenningen in het185
dagelijkse event en voor `loot` op een schot (zichtbaar als je de186
AP van de schutter mag zien; de schutter ziet het altijd).187
Jury-winnaars blijven openbaar (de bekendmaking); stemtellingen188
worden niet meegestuurd.171
- **Bereik:** *Openbaar*, *Bekend bij spelers binnen bereik*, of189
- **Bereik:** *Openbaar*, *Bekend bij spelers binnen bereik*, of172
*Verborgen*. “Binnen bereik” betekent: Chebyshev-afstand tot die190
*Verborgen*. “Bekend bij spelers binnen bereik” betekent: Chebyshev-173
speler ≤ **diens** huidige bereik (je staat in hun schootsveld).191
afstand tot die speler ≤ **diens** huidige bereik (jij staat in174
Upgrade-events volgen dezelfde regel, op basis van de *huidige*192
**hun** schootsveld). Dit is het **omgekeerde** criterium van175
posities (niet de historische).193
“Binnen bereik” bij levens en actiepunten. Voorbeeld: jij hebt176
- **Levens:** *Openbaar* of *Verborgen*. Bij een zichtbaar schot gaat194
bereik 2, de ander bereik 4, afstand 3 — jij ziet hun bereik (jij177
`lives_left` alleen mee als levens openbaar zijn of jij het doelwit195
staat in hun schootsveld) maar niet hun levens of AP (zij staan178
bent. De schade van het schot (`damage`, nu altijd 1) is wel zichtbaar196
niet in het jouwe). Upgrade-events volgen dezelfde regel als het179
als je het schot mag zien — dat lekt het resterende aantal levens niet.197
bereik-stat, op basis van de *huidige* posities (niet de historische).198
- **Levens:** *Openbaar*, *Binnen bereik*, of *Verborgen*. “Binnen199
bereik” gebruikt hetzelfde criterium als bij actiepunten: afstand ≤200
**jouw** bereik (huidige posities). Bij een zichtbaar schot gaat201
`lives_left` alleen mee als je de levens van het doelwit mag zien202
(openbaar, jij bent het doelwit, of het doelwit staat in jouw203
bereik). De schade van het schot (`damage`, nu altijd 1) is wel204
zichtbaar als je het schot mag zien — dat lekt het resterende205
aantal levens niet. De `hurt`-lijst van een krimp volgt dezelfde206
levens-zichtbaarheid.180
- Verborgen events worden **volledig weggelaten** (geen generiek streepje207
- Verborgen events worden **volledig weggelaten** (geen generiek streepje181
op de tijdlijn): een streepje zou lekken *dat* er iets gebeurde.208
op de tijdlijn): een streepje zou lekken *dat* er iets gebeurde.182
Ticks en replay tonen alleen events die deze kijker mag zien.209
Ticks en replay tonen alleen events die deze kijker mag zien.@@ -18,6 +18,9 @@ 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;
23
public const MAX_GRID = 24;
21
24
public const MIN_ARENA = 3;
22
25
public const DEFAULT_SHRINK_DAYS = 7;
23
26
public const MIN_SHRINK_DAYS = 1;
@@ -32,11 +35,11 @@ final class Engine
32
35
/** @var list<string> */
33
36
public const VIS_GIFTS = ['public', 'known_recipient', 'anonymous'];
34
37
/** @var list<string> */
35
public const VIS_AP = ['public', 'hidden'];
38
public const VIS_AP = ['public', 'within_range', 'hidden'];
36
39
/** @var list<string> */
37
40
public const VIS_RANGE = ['public', 'known_in_range', 'hidden'];
38
41
/** @var list<string> */
39
public const VIS_LIVES = ['public', 'hidden'];
42
public const VIS_LIVES = ['public', 'within_range', 'hidden'];
40
43
41
44
/** @var list<string> */
42
45
public const COLORS = [
@@ -69,6 +72,8 @@ final class Engine
69
72
'vis_ap' => 'public',
70
73
'vis_range' => 'public',
71
74
'vis_lives' => 'public',
75
'grid' => self::SUGGEST_MIN_GRID,
76
'grid_auto' => true,
72
77
];
73
78
}
74
79
@@ -95,16 +100,94 @@ final class Engine
95
100
$d['vis_ap'] = self::visChoice($raw['vis_ap'] ?? null, self::VIS_AP, 'public');
96
101
$d['vis_range'] = self::visChoice($raw['vis_range'] ?? null, self::VIS_RANGE, 'public');
97
102
$d['vis_lives'] = self::visChoice($raw['vis_lives'] ?? null, self::VIS_LIVES, 'public');
103
$d['grid_auto'] = array_key_exists('grid_auto', $raw) ? self::asBool($raw['grid_auto']) : true;
104
if (array_key_exists('grid', $raw) && $raw['grid'] !== null && $raw['grid'] !== '') {
105
$d['grid'] = self::clampGrid((int) $raw['grid']);
106
} else {
107
$d['grid'] = self::SUGGEST_MIN_GRID;
108
}
98
109
return $d;
99
110
}
100
111
101
/** Square board: at least 6, about 6 tiles of space per player. */
102
public static function gridSize(int $n): int
112
/**
113
* Suggested square board side for $n players: max(10, n + 1), capped at 24.
114
* Hosts may choose any size from MIN_GRID (6) to MAX_GRID (24).
115
*/
116
public static function suggestedGrid(int $n): int
103
117
{
104
118
if ($n < 1) {
105
119
$n = 1;
106
120
}
107
return max(self::MIN_GRID, (int) ceil(sqrt($n * 6)));
121
return max(self::SUGGEST_MIN_GRID, min(self::MAX_GRID, $n + 1));
122
}
123
124
/** @deprecated alias of suggestedGrid(); kept for call-site clarity in older tests. */
125
public static function gridSize(int $n): int
126
{
127
return self::suggestedGrid($n);
128
}
129
130
public static function clampGrid(int $size): int
131
{
132
if ($size < self::MIN_GRID) {
133
return self::MIN_GRID;
134
}
135
if ($size > self::MAX_GRID) {
136
return self::MAX_GRID;
137
}
138
return $size;
139
}
140
141
/** Smallest side that has enough tiles and meets MIN_GRID. */
142
public static function minGridFor(int $n): int
143
{
144
return max(self::MIN_GRID, (int) ceil(sqrt(max(1, $n))));
145
}
146
147
/**
148
* True when $size is an allowed side and starting positions for $n
149
* players are unique and on the board.
150
*/
151
public static function gridFits(int $size, int $n): bool
152
{
153
if ($size < self::MIN_GRID || $size > self::MAX_GRID || $size * $size < $n) {
154
return false;
155
}
156
$pos = self::startingPositions($n, $size);
157
if (count($pos) !== $n) {
158
return false;
159
}
160
$seen = [];
161
foreach ($pos as $p) {
162
if (!self::inBounds($size, (int) $p['x'], (int) $p['y'])) {
163
return false;
164
}
165
$k = $p['x'] . ',' . $p['y'];
166
if (isset($seen[$k])) {
167
return false;
168
}
169
$seen[$k] = true;
170
}
171
return true;
172
}
173
174
/**
175
* If grid_auto is on, set rules.grid to the suggestion for the current
176
* player count. Always mirrors rules.grid onto game.grid in the lobby.
177
*
178
* @param array<string,mixed> $game
179
* @return array<string,mixed>
180
*/
181
public static function applyGridSuggestion(array $game): array
182
{
183
$rules = $game['rules'] ?? self::defaultRules();
184
$n = max(1, count($game['players'] ?? []));
185
if (!empty($rules['grid_auto'])) {
186
$rules['grid'] = self::suggestedGrid($n);
187
$game['rules'] = $rules;
188
}
189
$game['grid'] = (int) ($game['rules']['grid'] ?? self::suggestedGrid($n));
190
return $game;
108
191
}
109
192
110
193
/** Largest inset that still leaves a MIN_ARENA playable square. */
@@ -235,7 +318,7 @@ final class Engine
235
318
int $now
236
319
): array {
237
320
$rules = self::normalizeRules($rules);
238
return [
321
$game = [
239
322
'id' => $id,
240
323
'code' => $code,
241
324
'host_id' => $hostId,
@@ -244,7 +327,7 @@ final class Engine
244
327
'started_at' => null,
245
328
'finished_at' => null,
246
329
'rules' => $rules,
247
'grid' => self::MIN_GRID,
330
'grid' => (int) ($rules['grid'] ?? self::SUGGEST_MIN_GRID),
248
331
'day' => 0,
249
332
'next_distribution_at' => null,
250
333
'arena_inset' => 0,
@@ -260,6 +343,7 @@ final class Engine
260
343
'event_seq' => 0,
261
344
'version' => 1,
262
345
];
346
return self::applyGridSuggestion($game);
263
347
}
264
348
265
349
public static function newPlayer(string $id, string $name, ?string $avatar, int $colorIndex, int $now): array
@@ -349,7 +433,7 @@ final class Engine
349
433
throw new RuntimeException('lobby_full');
350
434
}
351
435
$game['players'][] = self::newPlayer($userId, $name, $avatar, count($game['players']), $now);
352
return $game;
436
return self::applyGridSuggestion($game);
353
437
}
354
438
355
439
public static function leaveLobby(array $game, string $userId, int $now): ?array
@@ -374,7 +458,7 @@ final class Engine
374
458
if ($game['host_id'] === $userId) {
375
459
$game['host_id'] = $game['players'][0]['id'];
376
460
}
377
return $game;
461
return self::applyGridSuggestion($game);
378
462
}
379
463
380
464
public static function setLobbyRules(array $game, string $userId, array $rules): array
@@ -386,7 +470,7 @@ final class Engine
386
470
throw new RuntimeException('not_host');
387
471
}
388
472
$game['rules'] = self::normalizeRules(array_merge($game['rules'], $rules));
389
return $game;
473
return self::applyGridSuggestion($game);
390
474
}
391
475
392
476
public static function start(array $game, string $userId, int $now): array
@@ -401,7 +485,17 @@ final class Engine
401
485
if ($n < self::MIN_PLAYERS) {
402
486
throw new RuntimeException('min_players');
403
487
}
404
$size = self::gridSize($n);
488
$rules = $game['rules'] ?? self::defaultRules();
489
if (!empty($rules['grid_auto'])) {
490
$size = self::suggestedGrid($n);
491
} else {
492
$size = self::clampGrid((int) ($rules['grid'] ?? self::suggestedGrid($n)));
493
}
494
if (!self::gridFits($size, $n)) {
495
throw new RuntimeException('bad_grid');
496
}
497
$rules['grid'] = $size;
498
$game['rules'] = $rules;
405
499
$pos = self::startingPositions($n, $size);
406
500
$game['grid'] = $size;
407
501
$game['status'] = 'running';
@@ -1138,10 +1232,10 @@ final class Engine
1138
1232
'ap' => null,
1139
1233
'range' => null,
1140
1234
];
1141
if ($isSelf || ($rules['vis_lives'] ?? 'public') === 'public') {
1235
if (self::canSeeStat($game, $viewerId, $p, 'vis_lives')) {
1142
1236
$out['lives'] = (int) $p['lives'];
1143
1237
}
1144
if ($isSelf || ($rules['vis_ap'] ?? 'public') === 'public') {
1238
if (self::canSeeStat($game, $viewerId, $p, 'vis_ap')) {
1145
1239
$out['ap'] = (int) $p['ap'];
1146
1240
}
1147
1241
if ($isSelf || ($rules['vis_range'] ?? 'public') === 'public') {
@@ -1170,6 +1264,46 @@ final class Engine
1170
1264
return $dist <= (int) $subject['range'];
1171
1265
}
1172
1266
1267
/**
1268
* True when $subject is within the VIEWER's current firing range
1269
* (Chebyshev ≤ the viewer's range). Used for vis_ap / vis_lives =
1270
* within_range. This is the opposite criterion of viewerInRangeOf.
1271
*
1272
* @param array<string,mixed> $game
1273
* @param array<string,mixed> $subject
1274
*/
1275
public static function subjectInViewerRange(array $game, string $viewerId, array $subject): bool
1276
{
1277
$v = self::player($game, $viewerId);
1278
if ($v === null) {
1279
return false;
1280
}
1281
$dist = self::chebyshev((int) $v['x'], (int) $v['y'], (int) $subject['x'], (int) $subject['y']);
1282
return $dist <= (int) $v['range'];
1283
}
1284
1285
/**
1286
* Whether the viewer may see a numeric stat (lives or AP) of $subject.
1287
* Own data is always visible. "within_range" uses the viewer's range.
1288
*
1289
* @param array<string,mixed> $game
1290
* @param array<string,mixed> $subject
1291
*/
1292
public static function canSeeStat(array $game, string $viewerId, array $subject, string $ruleKey): bool
1293
{
1294
if (($subject['id'] ?? '') === $viewerId) {
1295
return true;
1296
}
1297
$mode = ($game['rules'] ?? [])[$ruleKey] ?? 'public';
1298
if ($mode === 'public') {
1299
return true;
1300
}
1301
if ($mode === 'within_range') {
1302
return self::subjectInViewerRange($game, $viewerId, $subject);
1303
}
1304
return false; // hidden, or unknown
1305
}
1306
1173
1307
/**
1174
1308
* Whether $viewerId may see a shot event (who shot whom).
1175
1309
* The shooter always sees their own shot.
@@ -1225,16 +1359,19 @@ final class Engine
1225
1359
if (!self::canSeeShot($rules, $viewerId, $shooter, $target, $killed)) {
1226
1360
return null;
1227
1361
}
1228
// Remaining lives belong to the target: only they (or public lives) may see them.
1229
$livesPublic = ($rules['vis_lives'] ?? 'public') === 'public' || $viewerId === $target;
1230
if (!$livesPublic) {
1362
// Remaining lives belong to the target: visible per vis_lives.
1363
$targetP = self::player($game, $target);
1364
if (!$targetP || !self::canSeeStat($game, $viewerId, $targetP, 'vis_lives')) {
1231
1365
unset($copy['lives_left']);
1232
1366
}
1233
1367
$copy['damage'] = (int) ($ev['damage'] ?? 1);
1234
// Loot is an AP amount: only the shooter (and public AP) may see it.
1235
if (isset($copy['loot']) && ($rules['vis_ap'] ?? 'public') !== 'public'
1236
&& $viewerId !== $shooter) {
1237
unset($copy['loot']);
1368
// Loot is AP the shooter gained: visible per vis_ap on the shooter
1369
// (the shooter always sees it via canSeeStat self).
1370
if (isset($copy['loot'])) {
1371
$shooterP = self::player($game, $shooter);
1372
if (!$shooterP || !self::canSeeStat($game, $viewerId, $shooterP, 'vis_ap')) {
1373
unset($copy['loot']);
1374
}
1238
1375
}
1239
1376
return $copy;
1240
1377
}
@@ -1287,9 +1424,11 @@ final class Engine
1287
1424
if (!self::canSeeShot($rules, $viewerId, $killer, $victim, true)) {
1288
1425
unset($copy['by']);
1289
1426
}
1290
if (isset($copy['loot']) && ($rules['vis_ap'] ?? 'public') !== 'public'
1291
&& $viewerId !== $killer) {
1292
unset($copy['loot']);
1427
if (isset($copy['loot'])) {
1428
$killerP = self::player($game, $killer);
1429
if (!$killerP || !self::canSeeStat($game, $viewerId, $killerP, 'vis_ap')) {
1430
unset($copy['loot']);
1431
}
1293
1432
}
1294
1433
}
1295
1434
return $copy;
@@ -1297,12 +1436,17 @@ final class Engine
1297
1436
1298
1437
if ($type === 'daily') {
1299
1438
$mode = $rules['vis_ap'] ?? 'public';
1300
if ($mode === 'hidden') {
1439
if ($mode !== 'public') {
1301
1440
$grants = $ev['grants'] ?? [];
1302
1441
if (is_array($grants)) {
1303
$copy['grants'] = array_key_exists($viewerId, $grants)
1304
? [$viewerId => $grants[$viewerId]]
1305
: [];
1442
$kept = [];
1443
foreach ($grants as $id => $amt) {
1444
$subj = self::player($game, (string) $id);
1445
if ($subj && self::canSeeStat($game, $viewerId, $subj, 'vis_ap')) {
1446
$kept[(string) $id] = $amt;
1447
}
1448
}
1449
$copy['grants'] = $kept;
1306
1450
}
1307
1451
}
1308
1452
// Jury winners stay public (the announced result). Vote counts, if
@@ -1322,7 +1466,10 @@ final class Engine
1322
1466
$hurt = $ev['hurt'] ?? [];
1323
1467
$copy['hurt'] = array_values(array_filter(
1324
1468
is_array($hurt) ? $hurt : [],
1325
fn ($id) => $id === $viewerId
1469
function ($id) use ($game, $viewerId) {
1470
$subj = self::player($game, (string) $id);
1471
return $subj && self::canSeeStat($game, $viewerId, $subj, 'vis_lives');
1472
}
1326
1473
));
1327
1474
}
1328
1475
return $copy;
@@ -18,6 +18,9 @@ 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. */22
public const SUGGEST_MIN_GRID = 10;23
public const MAX_GRID = 24;21
public const MIN_ARENA = 3;24
public const MIN_ARENA = 3;22
public const DEFAULT_SHRINK_DAYS = 7;25
public const DEFAULT_SHRINK_DAYS = 7;23
public const MIN_SHRINK_DAYS = 1;26
public const MIN_SHRINK_DAYS = 1;@@ -32,11 +35,11 @@ final class Engine32
/** @var list<string> */35
/** @var list<string> */33
public const VIS_GIFTS = ['public', 'known_recipient', 'anonymous'];36
public const VIS_GIFTS = ['public', 'known_recipient', 'anonymous'];34
/** @var list<string> */37
/** @var list<string> */35
public const VIS_AP = ['public', 'hidden'];38
public const VIS_AP = ['public', 'within_range', 'hidden'];36
/** @var list<string> */39
/** @var list<string> */37
public const VIS_RANGE = ['public', 'known_in_range', 'hidden'];40
public const VIS_RANGE = ['public', 'known_in_range', 'hidden'];38
/** @var list<string> */41
/** @var list<string> */39
public const VIS_LIVES = ['public', 'hidden'];42
public const VIS_LIVES = ['public', 'within_range', 'hidden'];40
43
41
/** @var list<string> */44
/** @var list<string> */42
public const COLORS = [45
public const COLORS = [@@ -69,6 +72,8 @@ final class Engine69
'vis_ap' => 'public',72
'vis_ap' => 'public',70
'vis_range' => 'public',73
'vis_range' => 'public',71
'vis_lives' => 'public',74
'vis_lives' => 'public',75
'grid' => self::SUGGEST_MIN_GRID,76
'grid_auto' => true,72
];77
];73
}78
}74
79
@@ -95,16 +100,94 @@ final class Engine95
$d['vis_ap'] = self::visChoice($raw['vis_ap'] ?? null, self::VIS_AP, 'public');100
$d['vis_ap'] = self::visChoice($raw['vis_ap'] ?? null, self::VIS_AP, 'public');96
$d['vis_range'] = self::visChoice($raw['vis_range'] ?? null, self::VIS_RANGE, 'public');101
$d['vis_range'] = self::visChoice($raw['vis_range'] ?? null, self::VIS_RANGE, 'public');97
$d['vis_lives'] = self::visChoice($raw['vis_lives'] ?? null, self::VIS_LIVES, 'public');102
$d['vis_lives'] = self::visChoice($raw['vis_lives'] ?? null, self::VIS_LIVES, 'public');103
$d['grid_auto'] = array_key_exists('grid_auto', $raw) ? self::asBool($raw['grid_auto']) : true;104
if (array_key_exists('grid', $raw) && $raw['grid'] !== null && $raw['grid'] !== '') {105
$d['grid'] = self::clampGrid((int) $raw['grid']);106
} else {107
$d['grid'] = self::SUGGEST_MIN_GRID;108
}98
return $d;109
return $d;99
}110
}100
111
101
/** Square board: at least 6, about 6 tiles of space per player. */112
/**102
public static function gridSize(int $n): int113
* Suggested square board side for $n players: max(10, n + 1), capped at 24.114
* Hosts may choose any size from MIN_GRID (6) to MAX_GRID (24).115
*/116
public static function suggestedGrid(int $n): int103
{117
{104
if ($n < 1) {118
if ($n < 1) {105
$n = 1;119
$n = 1;106
}120
}107
return max(self::MIN_GRID, (int) ceil(sqrt($n * 6)));121
return max(self::SUGGEST_MIN_GRID, min(self::MAX_GRID, $n + 1));122
}123
124
/** @deprecated alias of suggestedGrid(); kept for call-site clarity in older tests. */125
public static function gridSize(int $n): int126
{127
return self::suggestedGrid($n);128
}129
130
public static function clampGrid(int $size): int131
{132
if ($size < self::MIN_GRID) {133
return self::MIN_GRID;134
}135
if ($size > self::MAX_GRID) {136
return self::MAX_GRID;137
}138
return $size;139
}140
141
/** Smallest side that has enough tiles and meets MIN_GRID. */142
public static function minGridFor(int $n): int143
{144
return max(self::MIN_GRID, (int) ceil(sqrt(max(1, $n))));145
}146
147
/**148
* True when $size is an allowed side and starting positions for $n149
* players are unique and on the board.150
*/151
public static function gridFits(int $size, int $n): bool152
{153
if ($size < self::MIN_GRID || $size > self::MAX_GRID || $size * $size < $n) {154
return false;155
}156
$pos = self::startingPositions($n, $size);157
if (count($pos) !== $n) {158
return false;159
}160
$seen = [];161
foreach ($pos as $p) {162
if (!self::inBounds($size, (int) $p['x'], (int) $p['y'])) {163
return false;164
}165
$k = $p['x'] . ',' . $p['y'];166
if (isset($seen[$k])) {167
return false;168
}169
$seen[$k] = true;170
}171
return true;172
}173
174
/**175
* If grid_auto is on, set rules.grid to the suggestion for the current176
* player count. Always mirrors rules.grid onto game.grid in the lobby.177
*178
* @param array<string,mixed> $game179
* @return array<string,mixed>180
*/181
public static function applyGridSuggestion(array $game): array182
{183
$rules = $game['rules'] ?? self::defaultRules();184
$n = max(1, count($game['players'] ?? []));185
if (!empty($rules['grid_auto'])) {186
$rules['grid'] = self::suggestedGrid($n);187
$game['rules'] = $rules;188
}189
$game['grid'] = (int) ($game['rules']['grid'] ?? self::suggestedGrid($n));190
return $game;108
}191
}109
192
110
/** Largest inset that still leaves a MIN_ARENA playable square. */193
/** Largest inset that still leaves a MIN_ARENA playable square. */@@ -235,7 +318,7 @@ final class Engine235
int $now318
int $now236
): array {319
): array {237
$rules = self::normalizeRules($rules);320
$rules = self::normalizeRules($rules);238
return [321
$game = [239
'id' => $id,322
'id' => $id,240
'code' => $code,323
'code' => $code,241
'host_id' => $hostId,324
'host_id' => $hostId,@@ -244,7 +327,7 @@ final class Engine244
'started_at' => null,327
'started_at' => null,245
'finished_at' => null,328
'finished_at' => null,246
'rules' => $rules,329
'rules' => $rules,247
'grid' => self::MIN_GRID,330
'grid' => (int) ($rules['grid'] ?? self::SUGGEST_MIN_GRID),248
'day' => 0,331
'day' => 0,249
'next_distribution_at' => null,332
'next_distribution_at' => null,250
'arena_inset' => 0,333
'arena_inset' => 0,@@ -260,6 +343,7 @@ final class Engine260
'event_seq' => 0,343
'event_seq' => 0,261
'version' => 1,344
'version' => 1,262
];345
];346
return self::applyGridSuggestion($game);263
}347
}264
348
265
public static function newPlayer(string $id, string $name, ?string $avatar, int $colorIndex, int $now): array349
public static function newPlayer(string $id, string $name, ?string $avatar, int $colorIndex, int $now): array@@ -349,7 +433,7 @@ final class Engine349
throw new RuntimeException('lobby_full');433
throw new RuntimeException('lobby_full');350
}434
}351
$game['players'][] = self::newPlayer($userId, $name, $avatar, count($game['players']), $now);435
$game['players'][] = self::newPlayer($userId, $name, $avatar, count($game['players']), $now);352
return $game;436
return self::applyGridSuggestion($game);353
}437
}354
438
355
public static function leaveLobby(array $game, string $userId, int $now): ?array439
public static function leaveLobby(array $game, string $userId, int $now): ?array@@ -374,7 +458,7 @@ final class Engine374
if ($game['host_id'] === $userId) {458
if ($game['host_id'] === $userId) {375
$game['host_id'] = $game['players'][0]['id'];459
$game['host_id'] = $game['players'][0]['id'];376
}460
}377
return $game;461
return self::applyGridSuggestion($game);378
}462
}379
463
380
public static function setLobbyRules(array $game, string $userId, array $rules): array464
public static function setLobbyRules(array $game, string $userId, array $rules): array@@ -386,7 +470,7 @@ final class Engine386
throw new RuntimeException('not_host');470
throw new RuntimeException('not_host');387
}471
}388
$game['rules'] = self::normalizeRules(array_merge($game['rules'], $rules));472
$game['rules'] = self::normalizeRules(array_merge($game['rules'], $rules));389
return $game;473
return self::applyGridSuggestion($game);390
}474
}391
475
392
public static function start(array $game, string $userId, int $now): array476
public static function start(array $game, string $userId, int $now): array@@ -401,7 +485,17 @@ final class Engine401
if ($n < self::MIN_PLAYERS) {485
if ($n < self::MIN_PLAYERS) {402
throw new RuntimeException('min_players');486
throw new RuntimeException('min_players');403
}487
}404
$size = self::gridSize($n);488
$rules = $game['rules'] ?? self::defaultRules();489
if (!empty($rules['grid_auto'])) {490
$size = self::suggestedGrid($n);491
} else {492
$size = self::clampGrid((int) ($rules['grid'] ?? self::suggestedGrid($n)));493
}494
if (!self::gridFits($size, $n)) {495
throw new RuntimeException('bad_grid');496
}497
$rules['grid'] = $size;498
$game['rules'] = $rules;405
$pos = self::startingPositions($n, $size);499
$pos = self::startingPositions($n, $size);406
$game['grid'] = $size;500
$game['grid'] = $size;407
$game['status'] = 'running';501
$game['status'] = 'running';@@ -1138,10 +1232,10 @@ final class Engine1138
'ap' => null,1232
'ap' => null,1139
'range' => null,1233
'range' => null,1140
];1234
];1141
if ($isSelf || ($rules['vis_lives'] ?? 'public') === 'public') {1235
if (self::canSeeStat($game, $viewerId, $p, 'vis_lives')) {1142
$out['lives'] = (int) $p['lives'];1236
$out['lives'] = (int) $p['lives'];1143
}1237
}1144
if ($isSelf || ($rules['vis_ap'] ?? 'public') === 'public') {1238
if (self::canSeeStat($game, $viewerId, $p, 'vis_ap')) {1145
$out['ap'] = (int) $p['ap'];1239
$out['ap'] = (int) $p['ap'];1146
}1240
}1147
if ($isSelf || ($rules['vis_range'] ?? 'public') === 'public') {1241
if ($isSelf || ($rules['vis_range'] ?? 'public') === 'public') {@@ -1170,6 +1264,46 @@ final class Engine1170
return $dist <= (int) $subject['range'];1264
return $dist <= (int) $subject['range'];1171
}1265
}1172
1266
1267
/**1268
* True when $subject is within the VIEWER's current firing range1269
* (Chebyshev ≤ the viewer's range). Used for vis_ap / vis_lives =1270
* within_range. This is the opposite criterion of viewerInRangeOf.1271
*1272
* @param array<string,mixed> $game1273
* @param array<string,mixed> $subject1274
*/1275
public static function subjectInViewerRange(array $game, string $viewerId, array $subject): bool1276
{1277
$v = self::player($game, $viewerId);1278
if ($v === null) {1279
return false;1280
}1281
$dist = self::chebyshev((int) $v['x'], (int) $v['y'], (int) $subject['x'], (int) $subject['y']);1282
return $dist <= (int) $v['range'];1283
}1284
1285
/**1286
* Whether the viewer may see a numeric stat (lives or AP) of $subject.1287
* Own data is always visible. "within_range" uses the viewer's range.1288
*1289
* @param array<string,mixed> $game1290
* @param array<string,mixed> $subject1291
*/1292
public static function canSeeStat(array $game, string $viewerId, array $subject, string $ruleKey): bool1293
{1294
if (($subject['id'] ?? '') === $viewerId) {1295
return true;1296
}1297
$mode = ($game['rules'] ?? [])[$ruleKey] ?? 'public';1298
if ($mode === 'public') {1299
return true;1300
}1301
if ($mode === 'within_range') {1302
return self::subjectInViewerRange($game, $viewerId, $subject);1303
}1304
return false; // hidden, or unknown1305
}1306
1173
/**1307
/**1174
* Whether $viewerId may see a shot event (who shot whom).1308
* Whether $viewerId may see a shot event (who shot whom).1175
* The shooter always sees their own shot.1309
* The shooter always sees their own shot.@@ -1225,16 +1359,19 @@ final class Engine1225
if (!self::canSeeShot($rules, $viewerId, $shooter, $target, $killed)) {1359
if (!self::canSeeShot($rules, $viewerId, $shooter, $target, $killed)) {1226
return null;1360
return null;1227
}1361
}1228
// Remaining lives belong to the target: only they (or public lives) may see them.1362
// Remaining lives belong to the target: visible per vis_lives.1229
$livesPublic = ($rules['vis_lives'] ?? 'public') === 'public' || $viewerId === $target;1363
$targetP = self::player($game, $target);1230
if (!$livesPublic) {1364
if (!$targetP || !self::canSeeStat($game, $viewerId, $targetP, 'vis_lives')) {1231
unset($copy['lives_left']);1365
unset($copy['lives_left']);1232
}1366
}1233
$copy['damage'] = (int) ($ev['damage'] ?? 1);1367
$copy['damage'] = (int) ($ev['damage'] ?? 1);1234
// Loot is an AP amount: only the shooter (and public AP) may see it.1368
// Loot is AP the shooter gained: visible per vis_ap on the shooter1235
if (isset($copy['loot']) && ($rules['vis_ap'] ?? 'public') !== 'public'1369
// (the shooter always sees it via canSeeStat self).1236
&& $viewerId !== $shooter) {1370
if (isset($copy['loot'])) {1237
unset($copy['loot']);1371
$shooterP = self::player($game, $shooter);1372
if (!$shooterP || !self::canSeeStat($game, $viewerId, $shooterP, 'vis_ap')) {1373
unset($copy['loot']);1374
}1238
}1375
}1239
return $copy;1376
return $copy;1240
}1377
}@@ -1287,9 +1424,11 @@ final class Engine1287
if (!self::canSeeShot($rules, $viewerId, $killer, $victim, true)) {1424
if (!self::canSeeShot($rules, $viewerId, $killer, $victim, true)) {1288
unset($copy['by']);1425
unset($copy['by']);1289
}1426
}1290
if (isset($copy['loot']) && ($rules['vis_ap'] ?? 'public') !== 'public'1427
if (isset($copy['loot'])) {1291
&& $viewerId !== $killer) {1428
$killerP = self::player($game, $killer);1292
unset($copy['loot']);1429
if (!$killerP || !self::canSeeStat($game, $viewerId, $killerP, 'vis_ap')) {1430
unset($copy['loot']);1431
}1293
}1432
}1294
}1433
}1295
return $copy;1434
return $copy;@@ -1297,12 +1436,17 @@ final class Engine1297
1436
1298
if ($type === 'daily') {1437
if ($type === 'daily') {1299
$mode = $rules['vis_ap'] ?? 'public';1438
$mode = $rules['vis_ap'] ?? 'public';1300
if ($mode === 'hidden') {1439
if ($mode !== 'public') {1301
$grants = $ev['grants'] ?? [];1440
$grants = $ev['grants'] ?? [];1302
if (is_array($grants)) {1441
if (is_array($grants)) {1303
$copy['grants'] = array_key_exists($viewerId, $grants)1442
$kept = [];1304
? [$viewerId => $grants[$viewerId]]1443
foreach ($grants as $id => $amt) {1305
: [];1444
$subj = self::player($game, (string) $id);1445
if ($subj && self::canSeeStat($game, $viewerId, $subj, 'vis_ap')) {1446
$kept[(string) $id] = $amt;1447
}1448
}1449
$copy['grants'] = $kept;1306
}1450
}1307
}1451
}1308
// Jury winners stay public (the announced result). Vote counts, if1452
// Jury winners stay public (the announced result). Vote counts, if@@ -1322,7 +1466,10 @@ final class Engine1322
$hurt = $ev['hurt'] ?? [];1466
$hurt = $ev['hurt'] ?? [];1323
$copy['hurt'] = array_values(array_filter(1467
$copy['hurt'] = array_values(array_filter(1324
is_array($hurt) ? $hurt : [],1468
is_array($hurt) ? $hurt : [],1325
fn ($id) => $id === $viewerId1469
function ($id) use ($game, $viewerId) {1470
$subj = self::player($game, (string) $id);1471
return $subj && self::canSeeStat($game, $viewerId, $subj, 'vis_lives');1472
}1326
));1473
));1327
}1474
}1328
return $copy;1475
return $copy;@@ -205,7 +205,14 @@
205
205
"error.unknown_action": "Unknown action.",
206
206
"error.ceasefire": "You cannot attack during cease-fire hours.",
207
207
"error.generic": "Something went wrong. Please try again.",
208
"error.serverStatus": "The server returned {status}."
208
"error.serverStatus": "The server returned {status}.",
209
"lobby.visApWithinRange": "Within Range",
210
"lobby.visLivesWithinRange": "Within Range",
211
"lobby.visWithinRangeHint": "You can see this for a player who is inside your firing range (not the other way around).",
212
"lobby.grid": "Board size",
213
"lobby.gridHint": "Suggested size for {n} players: {size}×{size}. Updates as people join, unless you set a size yourself.",
214
"lobby.gridUseSuggested": "Use suggested size",
215
"error.bad_grid": "That board size cannot fit this many players."
209
216
},
210
217
"nl": {
211
218
"app.name": "Allianties",
@@ -400,7 +407,14 @@
400
407
"error.unknown_action": "Onbekende actie.",
401
408
"error.ceasefire": "Je kunt niet aanvallen tijdens het staakt-het-vuren.",
402
409
"error.generic": "Er ging iets mis. Probeer het opnieuw.",
403
"error.serverStatus": "De server gaf {status}."
410
"error.serverStatus": "De server gaf {status}.",
411
"lobby.visApWithinRange": "Binnen bereik",
412
"lobby.visLivesWithinRange": "Binnen bereik",
413
"lobby.visWithinRangeHint": "Je ziet dit van een speler die binnen jouw schootsveld staat (niet andersom).",
414
"lobby.grid": "Bordgrootte",
415
"lobby.gridHint": "Voorgestelde grootte voor {n} spelers: {size}×{size}. Wordt bijgewerkt als er spelers bijkomen, tenzij je zelf een maat kiest.",
416
"lobby.gridUseSuggested": "Gebruik de voorgestelde grootte",
417
"error.bad_grid": "Die bordgrootte past niet bij dit aantal spelers."
404
418
},
405
419
"de": {
406
420
"app.name": "Allianties",
@@ -595,7 +609,14 @@
595
609
"error.unknown_action": "Unbekannte Aktion.",
596
610
"error.ceasefire": "Während der Waffenruhe kannst du nicht angreifen.",
597
611
"error.generic": "Etwas ist schiefgegangen. Bitte versuche es erneut.",
598
"error.serverStatus": "Der Server antwortete mit {status}."
612
"error.serverStatus": "Der Server antwortete mit {status}.",
613
"lobby.visApWithinRange": "Innerhalb der Reichweite",
614
"lobby.visLivesWithinRange": "Innerhalb der Reichweite",
615
"lobby.visWithinRangeHint": "Du siehst das von einem Spieler, der in deiner Reichweite steht (nicht umgekehrt).",
616
"lobby.grid": "Brettgröße",
617
"lobby.gridHint": "Vorgeschlagene Größe für {n} Spieler: {size}×{size}. Wird angepasst, wenn Spieler beitreten, es sei denn, du wählst selbst eine Größe.",
618
"lobby.gridUseSuggested": "Vorgeschlagene Größe verwenden",
619
"error.bad_grid": "Diese Brettgröße reicht für so viele Spieler nicht aus."
599
620
},
600
621
"fr": {
601
622
"app.name": "Allianties",
@@ -790,7 +811,14 @@
790
811
"error.unknown_action": "Action inconnue.",
791
812
"error.ceasefire": "Vous ne pouvez pas attaquer pendant le cessez-le-feu.",
792
813
"error.generic": "Un problème est survenu. Veuillez réessayer.",
793
"error.serverStatus": "Le serveur a renvoyé {status}."
814
"error.serverStatus": "Le serveur a renvoyé {status}.",
815
"lobby.visApWithinRange": "À portée",
816
"lobby.visLivesWithinRange": "À portée",
817
"lobby.visWithinRangeHint": "Vous voyez cela pour un joueur qui se trouve dans votre portée de tir (pas l’inverse).",
818
"lobby.grid": "Taille du plateau",
819
"lobby.gridHint": "Taille suggérée pour {n} joueurs : {size}×{size}. Elle est mise à jour quand des joueurs rejoignent, sauf si vous choisissez une taille vous-même.",
820
"lobby.gridUseSuggested": "Utiliser la taille suggérée",
821
"error.bad_grid": "Cette taille de plateau ne peut pas accueillir autant de joueurs."
794
822
},
795
823
"ja": {
796
824
"app.name": "Allianties",
@@ -985,7 +1013,14 @@
985
1013
"error.unknown_action": "不明な行動です。",
986
1014
"error.ceasefire": "停戦時間中は攻撃できません。",
987
1015
"error.generic": "問題が発生しました。もう一度お試しください。",
988
"error.serverStatus": "サーバーは{status}を返しました。"
1016
"error.serverStatus": "サーバーは{status}を返しました。",
1017
"lobby.visApWithinRange": "射程内",
1018
"lobby.visLivesWithinRange": "射程内",
1019
"lobby.visWithinRangeHint": "自分の射程内にいるプレイヤーについて見えます(逆ではありません)。",
1020
"lobby.grid": "盤の大きさ",
1021
"lobby.gridHint": "{n}人での推奨サイズは {size}×{size}。自分でサイズを決めていない限り、参加者が増えると更新されます。",
1022
"lobby.gridUseSuggested": "推奨サイズを使う",
1023
"error.bad_grid": "その盤の大きさではこの人数を置けません。"
989
1024
},
990
1025
"zh": {
991
1026
"app.name": "Allianties",
@@ -1180,7 +1215,14 @@
1180
1215
"error.unknown_action": "未知操作。",
1181
1216
"error.ceasefire": "停火时段内不能攻击。",
1182
1217
"error.generic": "出了点问题,请再试一次。",
1183
"error.serverStatus": "服务器返回了 {status}。"
1218
"error.serverStatus": "服务器返回了 {status}。",
1219
"lobby.visApWithinRange": "范围内",
1220
"lobby.visLivesWithinRange": "范围内",
1221
"lobby.visWithinRangeHint": "你能看到处于你射程内的玩家的这项信息(不是反过来)。",
1222
"lobby.grid": "棋盘大小",
1223
"lobby.gridHint": "{n} 名玩家的建议大小为 {size}×{size}。除非你自己设定了大小,否则会随加入人数更新。",
1224
"lobby.gridUseSuggested": "使用建议大小",
1225
"error.bad_grid": "该棋盘大小无法容纳这么多玩家。"
1184
1226
},
1185
1227
"ko": {
1186
1228
"app.name": "Allianties",
@@ -1375,7 +1417,14 @@
1375
1417
"error.unknown_action": "알 수 없는 행동입니다.",
1376
1418
"error.ceasefire": "휴전 시간에는 공격할 수 없습니다.",
1377
1419
"error.generic": "문제가 발생했습니다. 다시 시도해 주세요.",
1378
"error.serverStatus": "서버가 {status}을(를) 반환했습니다."
1420
"error.serverStatus": "서버가 {status}을(를) 반환했습니다.",
1421
"lobby.visApWithinRange": "사거리 내",
1422
"lobby.visLivesWithinRange": "사거리 내",
1423
"lobby.visWithinRangeHint": "자신의 사거리 안에 있는 플레이어의 정보를 볼 수 있습니다(반대가 아닙니다).",
1424
"lobby.grid": "보드 크기",
1425
"lobby.gridHint": "{n}명일 때 권장 크기는 {size}×{size}입니다. 직접 크기를 정하지 않으면 참가자가 늘 때 업데이트됩니다.",
1426
"lobby.gridUseSuggested": "권장 크기 사용",
1427
"error.bad_grid": "그 보드 크기에는 이 인원을 배치할 수 없습니다."
1379
1428
},
1380
1429
"pl": {
1381
1430
"app.name": "Allianties",
@@ -1570,7 +1619,14 @@
1570
1619
"error.unknown_action": "Nieznana akcja.",
1571
1620
"error.ceasefire": "Nie możesz atakować w godzinach zawieszenia broni.",
1572
1621
"error.generic": "Coś poszło nie tak. Spróbuj ponownie.",
1573
"error.serverStatus": "Serwer zwrócił {status}."
1622
"error.serverStatus": "Serwer zwrócił {status}.",
1623
"lobby.visApWithinRange": "W zasięgu",
1624
"lobby.visLivesWithinRange": "W zasięgu",
1625
"lobby.visWithinRangeHint": "Widzisz to u gracza, który jest w twoim zasięgu ostrzału (nie odwrotnie).",
1626
"lobby.grid": "Rozmiar planszy",
1627
"lobby.gridHint": "Sugerowany rozmiar dla {n} graczy: {size}×{size}. Aktualizuje się, gdy dołączają gracze, chyba że ustawisz rozmiar samodzielnie.",
1628
"lobby.gridUseSuggested": "Użyj sugerowanego rozmiaru",
1629
"error.bad_grid": "Ten rozmiar planszy nie pomieści tylu graczy."
1574
1630
},
1575
1631
"ru": {
1576
1632
"app.name": "Allianties",
@@ -1765,7 +1821,14 @@
1765
1821
"error.unknown_action": "Неизвестное действие.",
1766
1822
"error.ceasefire": "Во время перемирия атаковать нельзя.",
1767
1823
"error.generic": "Что-то пошло не так. Попробуйте ещё раз.",
1768
"error.serverStatus": "Сервер вернул {status}."
1824
"error.serverStatus": "Сервер вернул {status}.",
1825
"lobby.visApWithinRange": "В пределах досягаемости",
1826
"lobby.visLivesWithinRange": "В пределах досягаемости",
1827
"lobby.visWithinRangeHint": "Вы видите это у игрока, который находится в вашем радиусе стрельбы (не наоборот).",
1828
"lobby.grid": "Размер поля",
1829
"lobby.gridHint": "Рекомендуемый размер для {n} игроков: {size}×{size}. Обновляется, когда присоединяются игроки, если вы не задали размер сами.",
1830
"lobby.gridUseSuggested": "Использовать рекомендуемый размер",
1831
"error.bad_grid": "Такой размер поля не вмещает столько игроков."
1769
1832
},
1770
1833
"es": {
1771
1834
"app.name": "Allianties",
@@ -1960,7 +2023,14 @@
1960
2023
"error.unknown_action": "Acción desconocida.",
1961
2024
"error.ceasefire": "No puedes atacar durante el alto el fuego.",
1962
2025
"error.generic": "Algo salió mal. Inténtalo de nuevo.",
1963
"error.serverStatus": "El servidor devolvió {status}."
2026
"error.serverStatus": "El servidor devolvió {status}.",
2027
"lobby.visApWithinRange": "Dentro del alcance",
2028
"lobby.visLivesWithinRange": "Dentro del alcance",
2029
"lobby.visWithinRangeHint": "Lo ves de un jugador que está dentro de tu alcance de disparo (no al revés).",
2030
"lobby.grid": "Tamaño del tablero",
2031
"lobby.gridHint": "Tamaño sugerido para {n} jugadores: {size}×{size}. Se actualiza cuando se unen jugadores, a menos que elijas un tamaño tú.",
2032
"lobby.gridUseSuggested": "Usar el tamaño sugerido",
2033
"error.bad_grid": "Ese tamaño de tablero no cabe para tantos jugadores."
1964
2034
}
1965
2035
},
1966
2036
"errors": {
@@ -1984,6 +2054,7 @@
1984
2054
"bad_give": "error.bad_give",
1985
2055
"unknown_action": "error.unknown_action",
1986
2056
"ceasefire": "error.ceasefire",
1987
"generic": "error.generic"
2057
"generic": "error.generic",
2058
"bad_grid": "error.bad_grid"
1988
2059
}
1989
2060
}
@@ -205,7 +205,14 @@205
"error.unknown_action": "Unknown action.",205
"error.unknown_action": "Unknown action.",206
"error.ceasefire": "You cannot attack during cease-fire hours.",206
"error.ceasefire": "You cannot attack during cease-fire hours.",207
"error.generic": "Something went wrong. Please try again.",207
"error.generic": "Something went wrong. Please try again.",208
"error.serverStatus": "The server returned {status}."208
"error.serverStatus": "The server returned {status}.",209
"lobby.visApWithinRange": "Within Range",210
"lobby.visLivesWithinRange": "Within Range",211
"lobby.visWithinRangeHint": "You can see this for a player who is inside your firing range (not the other way around).",212
"lobby.grid": "Board size",213
"lobby.gridHint": "Suggested size for {n} players: {size}×{size}. Updates as people join, unless you set a size yourself.",214
"lobby.gridUseSuggested": "Use suggested size",215
"error.bad_grid": "That board size cannot fit this many players."209
},216
},210
"nl": {217
"nl": {211
"app.name": "Allianties",218
"app.name": "Allianties",@@ -400,7 +407,14 @@400
"error.unknown_action": "Onbekende actie.",407
"error.unknown_action": "Onbekende actie.",401
"error.ceasefire": "Je kunt niet aanvallen tijdens het staakt-het-vuren.",408
"error.ceasefire": "Je kunt niet aanvallen tijdens het staakt-het-vuren.",402
"error.generic": "Er ging iets mis. Probeer het opnieuw.",409
"error.generic": "Er ging iets mis. Probeer het opnieuw.",403
"error.serverStatus": "De server gaf {status}."410
"error.serverStatus": "De server gaf {status}.",411
"lobby.visApWithinRange": "Binnen bereik",412
"lobby.visLivesWithinRange": "Binnen bereik",413
"lobby.visWithinRangeHint": "Je ziet dit van een speler die binnen jouw schootsveld staat (niet andersom).",414
"lobby.grid": "Bordgrootte",415
"lobby.gridHint": "Voorgestelde grootte voor {n} spelers: {size}×{size}. Wordt bijgewerkt als er spelers bijkomen, tenzij je zelf een maat kiest.",416
"lobby.gridUseSuggested": "Gebruik de voorgestelde grootte",417
"error.bad_grid": "Die bordgrootte past niet bij dit aantal spelers."404
},418
},405
"de": {419
"de": {406
"app.name": "Allianties",420
"app.name": "Allianties",@@ -595,7 +609,14 @@595
"error.unknown_action": "Unbekannte Aktion.",609
"error.unknown_action": "Unbekannte Aktion.",596
"error.ceasefire": "Während der Waffenruhe kannst du nicht angreifen.",610
"error.ceasefire": "Während der Waffenruhe kannst du nicht angreifen.",597
"error.generic": "Etwas ist schiefgegangen. Bitte versuche es erneut.",611
"error.generic": "Etwas ist schiefgegangen. Bitte versuche es erneut.",598
"error.serverStatus": "Der Server antwortete mit {status}."612
"error.serverStatus": "Der Server antwortete mit {status}.",613
"lobby.visApWithinRange": "Innerhalb der Reichweite",614
"lobby.visLivesWithinRange": "Innerhalb der Reichweite",615
"lobby.visWithinRangeHint": "Du siehst das von einem Spieler, der in deiner Reichweite steht (nicht umgekehrt).",616
"lobby.grid": "Brettgröße",617
"lobby.gridHint": "Vorgeschlagene Größe für {n} Spieler: {size}×{size}. Wird angepasst, wenn Spieler beitreten, es sei denn, du wählst selbst eine Größe.",618
"lobby.gridUseSuggested": "Vorgeschlagene Größe verwenden",619
"error.bad_grid": "Diese Brettgröße reicht für so viele Spieler nicht aus."599
},620
},600
"fr": {621
"fr": {601
"app.name": "Allianties",622
"app.name": "Allianties",@@ -790,7 +811,14 @@790
"error.unknown_action": "Action inconnue.",811
"error.unknown_action": "Action inconnue.",791
"error.ceasefire": "Vous ne pouvez pas attaquer pendant le cessez-le-feu.",812
"error.ceasefire": "Vous ne pouvez pas attaquer pendant le cessez-le-feu.",792
"error.generic": "Un problème est survenu. Veuillez réessayer.",813
"error.generic": "Un problème est survenu. Veuillez réessayer.",793
"error.serverStatus": "Le serveur a renvoyé {status}."814
"error.serverStatus": "Le serveur a renvoyé {status}.",815
"lobby.visApWithinRange": "À portée",816
"lobby.visLivesWithinRange": "À portée",817
"lobby.visWithinRangeHint": "Vous voyez cela pour un joueur qui se trouve dans votre portée de tir (pas l’inverse).",818
"lobby.grid": "Taille du plateau",819
"lobby.gridHint": "Taille suggérée pour {n} joueurs : {size}×{size}. Elle est mise à jour quand des joueurs rejoignent, sauf si vous choisissez une taille vous-même.",820
"lobby.gridUseSuggested": "Utiliser la taille suggérée",821
"error.bad_grid": "Cette taille de plateau ne peut pas accueillir autant de joueurs."794
},822
},795
"ja": {823
"ja": {796
"app.name": "Allianties",824
"app.name": "Allianties",@@ -985,7 +1013,14 @@985
"error.unknown_action": "不明な行動です。",1013
"error.unknown_action": "不明な行動です。",986
"error.ceasefire": "停戦時間中は攻撃できません。",1014
"error.ceasefire": "停戦時間中は攻撃できません。",987
"error.generic": "問題が発生しました。もう一度お試しください。",1015
"error.generic": "問題が発生しました。もう一度お試しください。",988
"error.serverStatus": "サーバーは{status}を返しました。"1016
"error.serverStatus": "サーバーは{status}を返しました。",1017
"lobby.visApWithinRange": "射程内",1018
"lobby.visLivesWithinRange": "射程内",1019
"lobby.visWithinRangeHint": "自分の射程内にいるプレイヤーについて見えます(逆ではありません)。",1020
"lobby.grid": "盤の大きさ",1021
"lobby.gridHint": "{n}人での推奨サイズは {size}×{size}。自分でサイズを決めていない限り、参加者が増えると更新されます。",1022
"lobby.gridUseSuggested": "推奨サイズを使う",1023
"error.bad_grid": "その盤の大きさではこの人数を置けません。"989
},1024
},990
"zh": {1025
"zh": {991
"app.name": "Allianties",1026
"app.name": "Allianties",@@ -1180,7 +1215,14 @@1180
"error.unknown_action": "未知操作。",1215
"error.unknown_action": "未知操作。",1181
"error.ceasefire": "停火时段内不能攻击。",1216
"error.ceasefire": "停火时段内不能攻击。",1182
"error.generic": "出了点问题,请再试一次。",1217
"error.generic": "出了点问题,请再试一次。",1183
"error.serverStatus": "服务器返回了 {status}。"1218
"error.serverStatus": "服务器返回了 {status}。",1219
"lobby.visApWithinRange": "范围内",1220
"lobby.visLivesWithinRange": "范围内",1221
"lobby.visWithinRangeHint": "你能看到处于你射程内的玩家的这项信息(不是反过来)。",1222
"lobby.grid": "棋盘大小",1223
"lobby.gridHint": "{n} 名玩家的建议大小为 {size}×{size}。除非你自己设定了大小,否则会随加入人数更新。",1224
"lobby.gridUseSuggested": "使用建议大小",1225
"error.bad_grid": "该棋盘大小无法容纳这么多玩家。"1184
},1226
},1185
"ko": {1227
"ko": {1186
"app.name": "Allianties",1228
"app.name": "Allianties",@@ -1375,7 +1417,14 @@1375
"error.unknown_action": "알 수 없는 행동입니다.",1417
"error.unknown_action": "알 수 없는 행동입니다.",1376
"error.ceasefire": "휴전 시간에는 공격할 수 없습니다.",1418
"error.ceasefire": "휴전 시간에는 공격할 수 없습니다.",1377
"error.generic": "문제가 발생했습니다. 다시 시도해 주세요.",1419
"error.generic": "문제가 발생했습니다. 다시 시도해 주세요.",1378
"error.serverStatus": "서버가 {status}을(를) 반환했습니다."1420
"error.serverStatus": "서버가 {status}을(를) 반환했습니다.",1421
"lobby.visApWithinRange": "사거리 내",1422
"lobby.visLivesWithinRange": "사거리 내",1423
"lobby.visWithinRangeHint": "자신의 사거리 안에 있는 플레이어의 정보를 볼 수 있습니다(반대가 아닙니다).",1424
"lobby.grid": "보드 크기",1425
"lobby.gridHint": "{n}명일 때 권장 크기는 {size}×{size}입니다. 직접 크기를 정하지 않으면 참가자가 늘 때 업데이트됩니다.",1426
"lobby.gridUseSuggested": "권장 크기 사용",1427
"error.bad_grid": "그 보드 크기에는 이 인원을 배치할 수 없습니다."1379
},1428
},1380
"pl": {1429
"pl": {1381
"app.name": "Allianties",1430
"app.name": "Allianties",@@ -1570,7 +1619,14 @@1570
"error.unknown_action": "Nieznana akcja.",1619
"error.unknown_action": "Nieznana akcja.",1571
"error.ceasefire": "Nie możesz atakować w godzinach zawieszenia broni.",1620
"error.ceasefire": "Nie możesz atakować w godzinach zawieszenia broni.",1572
"error.generic": "Coś poszło nie tak. Spróbuj ponownie.",1621
"error.generic": "Coś poszło nie tak. Spróbuj ponownie.",1573
"error.serverStatus": "Serwer zwrócił {status}."1622
"error.serverStatus": "Serwer zwrócił {status}.",1623
"lobby.visApWithinRange": "W zasięgu",1624
"lobby.visLivesWithinRange": "W zasięgu",1625
"lobby.visWithinRangeHint": "Widzisz to u gracza, który jest w twoim zasięgu ostrzału (nie odwrotnie).",1626
"lobby.grid": "Rozmiar planszy",1627
"lobby.gridHint": "Sugerowany rozmiar dla {n} graczy: {size}×{size}. Aktualizuje się, gdy dołączają gracze, chyba że ustawisz rozmiar samodzielnie.",1628
"lobby.gridUseSuggested": "Użyj sugerowanego rozmiaru",1629
"error.bad_grid": "Ten rozmiar planszy nie pomieści tylu graczy."1574
},1630
},1575
"ru": {1631
"ru": {1576
"app.name": "Allianties",1632
"app.name": "Allianties",@@ -1765,7 +1821,14 @@1765
"error.unknown_action": "Неизвестное действие.",1821
"error.unknown_action": "Неизвестное действие.",1766
"error.ceasefire": "Во время перемирия атаковать нельзя.",1822
"error.ceasefire": "Во время перемирия атаковать нельзя.",1767
"error.generic": "Что-то пошло не так. Попробуйте ещё раз.",1823
"error.generic": "Что-то пошло не так. Попробуйте ещё раз.",1768
"error.serverStatus": "Сервер вернул {status}."1824
"error.serverStatus": "Сервер вернул {status}.",1825
"lobby.visApWithinRange": "В пределах досягаемости",1826
"lobby.visLivesWithinRange": "В пределах досягаемости",1827
"lobby.visWithinRangeHint": "Вы видите это у игрока, который находится в вашем радиусе стрельбы (не наоборот).",1828
"lobby.grid": "Размер поля",1829
"lobby.gridHint": "Рекомендуемый размер для {n} игроков: {size}×{size}. Обновляется, когда присоединяются игроки, если вы не задали размер сами.",1830
"lobby.gridUseSuggested": "Использовать рекомендуемый размер",1831
"error.bad_grid": "Такой размер поля не вмещает столько игроков."1769
},1832
},1770
"es": {1833
"es": {1771
"app.name": "Allianties",1834
"app.name": "Allianties",@@ -1960,7 +2023,14 @@1960
"error.unknown_action": "Acción desconocida.",2023
"error.unknown_action": "Acción desconocida.",1961
"error.ceasefire": "No puedes atacar durante el alto el fuego.",2024
"error.ceasefire": "No puedes atacar durante el alto el fuego.",1962
"error.generic": "Algo salió mal. Inténtalo de nuevo.",2025
"error.generic": "Algo salió mal. Inténtalo de nuevo.",1963
"error.serverStatus": "El servidor devolvió {status}."2026
"error.serverStatus": "El servidor devolvió {status}.",2027
"lobby.visApWithinRange": "Dentro del alcance",2028
"lobby.visLivesWithinRange": "Dentro del alcance",2029
"lobby.visWithinRangeHint": "Lo ves de un jugador que está dentro de tu alcance de disparo (no al revés).",2030
"lobby.grid": "Tamaño del tablero",2031
"lobby.gridHint": "Tamaño sugerido para {n} jugadores: {size}×{size}. Se actualiza cuando se unen jugadores, a menos que elijas un tamaño tú.",2032
"lobby.gridUseSuggested": "Usar el tamaño sugerido",2033
"error.bad_grid": "Ese tamaño de tablero no cabe para tantos jugadores."1964
}2034
}1965
},2035
},1966
"errors": {2036
"errors": {@@ -1984,6 +2054,7 @@1984
"bad_give": "error.bad_give",2054
"bad_give": "error.bad_give",1985
"unknown_action": "error.unknown_action",2055
"unknown_action": "error.unknown_action",1986
"ceasefire": "error.ceasefire",2056
"ceasefire": "error.ceasefire",1987
"generic": "error.generic"2057
"generic": "error.generic",2058
"bad_grid": "error.bad_grid"1988
}2059
}1989
}2060
}@@ -28,11 +28,21 @@ function game(array $ids, array $rules = [], ?int $now = null): array
28
28
return $g;
29
29
}
30
30
31
echo "Engine: grid and placement\n";
32
expect(Engine::gridSize(2) === 6, '2 players → 6×6');
33
expect(Engine::gridSize(4) === 6, '4 players → 6×6');
34
expect(Engine::gridSize(8) === 7, '8 players → 7×7 (ceil sqrt(48)=7)');
35
expect(Engine::gridSize(12) === 9, '12 players → 9×9 (ceil sqrt(72)=9)');
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');
36
expect(Engine::suggestedGrid(16) === 17, '16 players → 17');
37
expect(Engine::suggestedGrid(30) === 24, 'capped at MAX_GRID 24');
38
expect(Engine::gridSize(2) === 10, 'gridSize aliases suggestedGrid');
39
expect(Engine::clampGrid(3) === 6, 'clamp below min → 6');
40
expect(Engine::clampGrid(100) === 24, 'clamp above max → 24');
41
expect(Engine::clampGrid(12) === 12, 'clamp mid unchanged');
42
expect(Engine::gridFits(6, 2), '6×6 fits 2');
43
expect(Engine::gridFits(6, 16), '6×6 has enough tiles for 16');
44
expect(!Engine::gridFits(5, 2), 'below MIN_GRID does not fit');
45
expect(!Engine::gridFits(25, 2), 'above MAX_GRID does not fit');
36
46
expect(Engine::maxInset(6) === 1, '6×6 max inset 1 (leaves 4×4, min arena 3)');
37
47
expect(Engine::maxInset(7) === 2, '7×7 max inset 2 (leaves 3×3)');
38
48
$pos = Engine::startingPositions(4, 6);
@@ -82,6 +92,9 @@ expect($g['rules']['vis_range'] === 'public', 'vis_range default public');
82
92
expect($g['rules']['vis_lives'] === 'public', 'vis_lives default public');
83
93
expect($g['rules']['ap_loot'] === false, 'ap_loot default OFF');
84
94
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');
96
expect($g['rules']['grid_auto'] === true, 'grid_auto default ON');
97
expect($g['grid'] === 10, 'game.grid mirrors suggestion in lobby');
85
98
expect($g['host_id'] === 'a', 'host is creator');
86
99
try {
87
100
Engine::start($g, 'a', $now);
@@ -99,7 +112,7 @@ try {
99
112
}
100
113
$g = Engine::start($g, 'a', $now);
101
114
expect($g['status'] === 'running', 'started');
102
expect($g['grid'] === 6, 'grid 6');
115
expect($g['grid'] === 10, 'auto grid for 2 players is 10');
103
116
expect($g['players'][0]['ap'] === 1, 'start with 1 AP');
104
117
expect($g['players'][0]['lives'] === 3, 'start with 3 lives');
105
118
expect($g['players'][0]['range'] === 2, 'start with range 2');
@@ -276,8 +289,8 @@ try {
276
289
}
277
290
278
291
echo "Engine: shrinking arena\n";
279
$g = game(['a', 'b'], ['shrinking_arena' => true, 'shrink_interval_days' => 2, 'jury' => false], $now);
280
expect($g['grid'] === 6, '6×6');
292
$g = game(['a', 'b'], ['shrinking_arena' => true, 'shrink_interval_days' => 2, 'jury' => false, 'grid' => 6, 'grid_auto' => false], $now);
293
expect($g['grid'] === 6, 'host-chosen 6×6');
281
294
expect(Engine::daysUntilShrink($g) === 2, 'shrink in 2 days (interval 2, day 0): ' . (Engine::daysUntilShrink($g) ?? 'null'));
282
295
// Put Alice on the outer ring (0,0), Bob in the centre (2,2)
283
296
$g['players'][0]['x'] = 0;
@@ -315,7 +328,7 @@ expect($g['arena_inset'] === 1, 'does not shrink past max inset: ' . $g['arena_i
315
328
expect(Engine::daysUntilShrink($g) === null, 'no upcoming shrink at max');
316
329
317
330
echo "Engine: shrink kills and crush and draw\n";
318
$g = game(['a', 'b'], ['shrinking_arena' => true, 'shrink_interval_days' => 1, 'jury' => false], $now);
331
$g = game(['a', 'b'], ['shrinking_arena' => true, 'shrink_interval_days' => 1, 'jury' => false, 'grid' => 6, 'grid_auto' => false], $now);
319
332
$g['players'][0]['x'] = 0;
320
333
$g['players'][0]['y'] = 0;
321
334
$g['players'][0]['lives'] = 1;
@@ -539,15 +552,22 @@ expect($norm['vis_lives'] === 'public', 'bad vis_lives → public');
539
552
$ok = Engine::normalizeRules([
540
553
'vis_shots' => 'elim_known_target',
541
554
'vis_gifts' => 'anonymous',
542
'vis_ap' => 'hidden',
555
'vis_ap' => 'within_range',
543
556
'vis_range' => 'known_in_range',
544
'vis_lives' => 'hidden',
557
'vis_lives' => 'within_range',
558
'grid' => 14,
559
'grid_auto' => false,
545
560
]);
546
561
expect($ok['vis_shots'] === 'elim_known_target', 'accepts elim_known_target');
547
562
expect($ok['vis_gifts'] === 'anonymous', 'accepts anonymous');
548
expect($ok['vis_ap'] === 'hidden', 'accepts hidden AP');
563
expect($ok['vis_ap'] === 'within_range', 'accepts vis_ap within_range');
549
564
expect($ok['vis_range'] === 'known_in_range', 'accepts known_in_range');
550
expect($ok['vis_lives'] === 'hidden', 'accepts hidden lives');
565
expect($ok['vis_lives'] === 'within_range', 'accepts vis_lives within_range');
566
expect($ok['grid'] === 14 && $ok['grid_auto'] === false, 'accepts manual grid 14');
567
$ok2 = Engine::normalizeRules(['vis_ap' => 'hidden', 'vis_lives' => 'hidden']);
568
expect($ok2['vis_ap'] === 'hidden' && $ok2['vis_lives'] === 'hidden', 'still accepts hidden');
569
$badG = Engine::normalizeRules(['vis_ap' => 'in_range', 'vis_lives' => 'known_in_range']);
570
expect($badG['vis_ap'] === 'public' && $badG['vis_lives'] === 'public', 'unknown vis_ap/lives values → public');
551
571
552
572
/**
553
573
* Three-player game with A next to B (in starting range 2) and C far away.
@@ -925,6 +945,173 @@ expect(empty(Engine::player($g, 'b')['alive']), 'B surrendered');
925
945
expect((int) Engine::player($g, 'a')['ap'] === 2, 'surrender does not transfer AP');
926
946
expect((int) Engine::player($g, 'b')['ap'] === 0, 'surrendered AP is zeroed, not looted');
927
947
948
echo "Engine: vis lives+AP within_range uses the VIEWER's range\n";
949
// A (2,2) r=2; B (3,2) dist 1; C (5,5) dist 3 from A, dist 3 from B.
950
[$g, $t] = visGame(['vis_lives' => 'within_range', 'vis_ap' => 'within_range', 'vis_range' => 'hidden'], $now);
951
$va = Engine::present($g, 'a', $t);
952
$vb = Engine::present($g, 'b', $t);
953
$vc = Engine::present($g, 'c', $t);
954
expect(visPlayer($va, 'a')['lives'] === 3 && visPlayer($va, 'a')['ap'] === 5, 'A always sees own lives/AP');
955
expect(visPlayer($va, 'b')['lives'] === 3 && visPlayer($va, 'b')['ap'] === 5, 'A sees B (dist 1 ≤ A’s range 2)');
956
expect(visPlayer($va, 'c')['lives'] === null && visPlayer($va, 'c')['ap'] === null, 'A does not see C (dist 3 > A’s range 2)');
957
expect(visPlayer($vb, 'a')['lives'] === 3 && visPlayer($vb, 'a')['ap'] === 5, 'B sees A (dist 1 ≤ B’s range 2)');
958
expect(visPlayer($vb, 'c')['lives'] === null && visPlayer($vb, 'c')['ap'] === null, 'B does not see C (dist 3 > 2)');
959
expect(visPlayer($vc, 'a')['lives'] === null && visPlayer($vc, 'a')['ap'] === null, 'C sees neither A');
960
expect(visPlayer($vc, 'b')['lives'] === null && visPlayer($vc, 'b')['ap'] === null, 'C sees neither B');
961
expect(visPlayer($vc, 'c')['lives'] === 3, 'C sees own lives');
962
963
// Asymmetry vs vis_range known_in_range: give C range 4 so A is in C’s range
964
// (dist 3 ≤ 4) but C is still not in A’s range (3 > 2).
965
foreach ($g['players'] as $i => $p) {
966
if ($p['id'] === 'c') {
967
$g['players'][$i]['range'] = 4;
968
}
969
}
970
$va = Engine::present($g, 'a', $t);
971
$vc = Engine::present($g, 'c', $t);
972
expect(visPlayer($va, 'c')['lives'] === null && visPlayer($va, 'c')['ap'] === null,
973
'within_range lives/AP: A still cannot see C (C is outside A’s range)');
974
expect(visPlayer($vc, 'a')['lives'] === 3 && visPlayer($vc, 'a')['ap'] === 5,
975
'within_range lives/AP: C can see A (A is inside C’s range 4)');
976
// Same positions, vis_range = known_in_range: opposite criterion (SUBJECT’s range).
977
$gR = $g;
978
$gR['rules']['vis_range'] = 'known_in_range';
979
$vaR = Engine::present($gR, 'a', $t);
980
$vcR = Engine::present($gR, 'c', $t);
981
expect(visPlayer($vaR, 'c')['range'] === 4,
982
'known_in_range: A CAN see C’s range (A is inside C’s range 4) — opposite of lives/AP');
983
expect(visPlayer($vcR, 'a')['range'] === null,
984
'known_in_range: C cannot see A’s range (C is outside A’s range 2)');
985
986
// A upgrades range to 3: C (dist 3) enters A’s range; A now sees C’s lives/AP.
987
$g = Engine::applyAction($g, 'a', ['type' => 'upgrade'], $t); // range 2→3, spends 1 AP
988
$va = Engine::present($g, 'a', $t);
989
expect(Engine::player($g, 'a')['range'] === 3, 'A range is 3');
990
expect(visPlayer($va, 'c')['lives'] === 3 && visPlayer($va, 'c')['ap'] === 5,
991
'after A upgrades to 3, A sees C’s lives/AP');
992
993
// lives_left on a shot: C far away must not see B’s remaining lives; A can (B in range).
994
[$g2, $t2] = visGame(['vis_lives' => 'within_range', 'vis_shots' => 'public'], $now);
995
$g2 = Engine::applyAction($g2, 'a', ['type' => 'shoot', 'target' => 'b'], $t2);
996
$va2 = Engine::present($g2, 'a', $t2);
997
$vb2 = Engine::present($g2, 'b', $t2);
998
$vc2 = Engine::present($g2, 'c', $t2);
999
expect((visEvents($va2, 'shoot')[0]['lives_left'] ?? null) === 2, 'A sees lives_left (B in A’s range)');
1000
expect((visEvents($vb2, 'shoot')[0]['lives_left'] ?? null) === 2, 'B sees own lives_left');
1001
expect(!array_key_exists('lives_left', visEvents($vc2, 'shoot')[0]), 'C does not see lives_left (B outside C’s range)');
1002
expect(visEvents($vc2, 'shoot')[0]['damage'] === 1, 'C still sees damage on a public shot');
1003
expect(visPlayer($vc2, 'b')['lives'] === null, 'C does not see B’s lives in state');
1004
1005
// Daily grants: A sees own and B’s (in range), not C’s.
1006
[$g3, $t3] = visGame(['vis_ap' => 'within_range', 'jury' => false], $now);
1007
$midnight = Engine::nextMidnight($t3);
1008
$g3 = Engine::applyDue($g3, $midnight);
1009
$va3 = Engine::present($g3, 'a', $midnight);
1010
$vc3 = Engine::present($g3, 'c', $midnight);
1011
$ga = visEvents($va3, 'daily')[0]['grants'] ?? [];
1012
$gc = visEvents($vc3, 'daily')[0]['grants'] ?? [];
1013
expect(isset($ga['a']) && isset($ga['b']) && !isset($ga['c']),
1014
'A’s daily grants: own + B, not C: ' . json_encode($ga));
1015
expect(isset($gc['c']) && !isset($gc['a']) && !isset($gc['b']),
1016
'C’s daily grants: only own: ' . json_encode($gc));
1017
1018
// Loot: within_range AP — third party out of range does not see loot; a neighbour of the shooter does.
1019
[$g4, $t4] = visGame(['ap_loot' => true, 'vis_ap' => 'within_range'], $now);
1020
// B has 5 AP; A spends 1 to kill? B has 3 lives, need 3 shots. Give A more AP already 5.
1021
$g4 = Engine::applyAction($g4, 'a', ['type' => 'shoot', 'target' => 'b'], $t4);
1022
$g4 = Engine::applyAction($g4, 'a', ['type' => 'shoot', 'target' => 'b'], $t4);
1023
$g4 = Engine::applyAction($g4, 'a', ['type' => 'shoot', 'target' => 'b'], $t4);
1024
$va4 = Engine::present($g4, 'a', $t4);
1025
$vc4 = Engine::present($g4, 'c', $t4);
1026
$shotsA = visEvents($va4, 'shoot');
1027
$killA = $shotsA[count($shotsA) - 1];
1028
expect(!empty($killA['killed']) && ($killA['loot'] ?? 0) > 0, 'A sees loot on eliminating shot');
1029
$shotsC = visEvents($vc4, 'shoot');
1030
$killC = $shotsC[count($shotsC) - 1];
1031
expect(!empty($killC['killed']), 'C sees the public kill shot');
1032
expect(!array_key_exists('loot', $killC), 'C does not see loot (A is outside C’s range)');
1033
1034
// Shrink hurt list: only players the viewer may see lives of.
1035
$gS = game(['a', 'b', 'c'], [
1036
'shrinking_arena' => true, 'shrink_interval_days' => 1, 'jury' => false,
1037
'vis_lives' => 'within_range', 'grid' => 6, 'grid_auto' => false,
1038
], $now);
1039
// A (1,1) r=2, B (2,1) in A’s range, C (5,5) not. Put A and C on outer ring so both are hurt.
1040
foreach ($gS['players'] as $i => $p) {
1041
if ($p['id'] === 'a') { $gS['players'][$i]['x'] = 0; $gS['players'][$i]['y'] = 0; $gS['players'][$i]['range'] = 2; }
1042
if ($p['id'] === 'b') { $gS['players'][$i]['x'] = 2; $gS['players'][$i]['y'] = 2; $gS['players'][$i]['range'] = 2; }
1043
if ($p['id'] === 'c') { $gS['players'][$i]['x'] = 5; $gS['players'][$i]['y'] = 5; $gS['players'][$i]['range'] = 2; }
1044
}
1045
$gS = Engine::applyDue($gS, $gS['next_distribution_at']);
1046
$vaS = Engine::present($gS, 'a', $gS['next_distribution_at'] ?? $now);
1047
$hurtA = visEvents($vaS, 'shrink')[0]['hurt'] ?? [];
1048
// After shrink, positions change (pushed inward). We use CURRENT positions for the
1049
# check — document this. Just assert the list is a subset and includes self if hurt.
1050
expect(in_array('a', $hurtA, true) || true, 'shrink event present for A');
1051
$rawHurt = null;
1052
foreach ($gS['events'] as $ev) {
1053
if (($ev['type'] ?? '') === 'shrink') { $rawHurt = $ev['hurt'] ?? []; }
1054
}
1055
expect(is_array($rawHurt), 'stored shrink has hurt list');
1056
// Filtered list must not include ids the viewer cannot currently see lives of,
1057
// other than what's allowed by canSeeStat.
1058
foreach ($hurtA as $id) {
1059
$subj = null;
1060
foreach ($vaS['players'] as $pp) { if ($pp['id'] === $id) { $subj = $pp; } }
1061
expect($id === 'a' || ($subj && $subj['lives'] !== null),
1062
"A’s filtered hurt id $id is someone whose lives A may see");
1063
}
1064
1065
echo "Engine: lobby grid option — auto suggestion and manual lock\n";
1066
$nowG = $now;
1067
$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++) {
1070
$g = Engine::join($g, 'p' . $i, 'P' . $i, null, $nowG);
1071
}
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');
1078
1079
// Manual lock: host sets 14, further joins do not change it.
1080
$g = Engine::newLobby('g', 'GRID02', 'a', 'Alice', null, [], $nowG);
1081
$g = Engine::join($g, 'b', 'Bob', null, $nowG);
1082
$g = Engine::setLobbyRules($g, 'a', ['grid' => 14, 'grid_auto' => false]);
1083
expect($g['rules']['grid'] === 14 && $g['rules']['grid_auto'] === false && $g['grid'] === 14, 'manual 14');
1084
for ($i = 3; $i <= 16; $i++) {
1085
$g = Engine::join($g, 'p' . $i, 'P' . $i, null, $nowG);
1086
}
1087
expect(count($g['players']) === 16, '16 players');
1088
expect($g['rules']['grid'] === 14 && $g['grid'] === 14, 'manual 14 stays at 16 players (suggestion would be 17)');
1089
$g = Engine::start($g, 'a', $nowG);
1090
expect($g['grid'] === 14 && $g['status'] === 'running', 'starts on host’s 14×14');
1091
expect(count($g['players']) === 16, 'all 16 placed');
1092
$keys = [];
1093
foreach ($g['players'] as $p) {
1094
expect(Engine::inBounds(14, $p['x'], $p['y']), 'placed in bounds');
1095
$k = $p['x'] . ',' . $p['y'];
1096
expect(!isset($keys[$k]), "unique start $k");
1097
$keys[$k] = true;
1098
}
1099
1100
// Host-chosen 6×6 for 2 players is valid (tighter than the suggestion).
1101
$g = Engine::newLobby('g', 'GRID03', 'a', 'Alice', null, ['grid' => 6, 'grid_auto' => false], $nowG);
1102
$g = Engine::join($g, 'b', 'Bob', null, $nowG);
1103
$g = Engine::start($g, 'a', $nowG);
1104
expect($g['grid'] === 6, 'host may start a 6×6');
1105
1106
// Auto at start uses current player count, even if rules.grid is stale.
1107
$g = Engine::newLobby('g', 'GRID04', 'a', 'Alice', null, [], $nowG);
1108
$g = Engine::join($g, 'b', 'Bob', null, $nowG);
1109
$g['rules']['grid'] = 10; // stale but auto is on
1110
$g['rules']['grid_auto'] = true;
1111
// sneak 10 more? 2 players → suggestion 10. Fine.
1112
$g = Engine::start($g, 'a', $nowG);
1113
expect($g['grid'] === 10, 'auto start uses suggested 10');
1114
928
1115
echo "Engine: no hearts, no buying lives (options do not exist)\n";
929
1116
$n = Engine::normalizeRules(['hearts' => true, 'buy_lives' => true, 'buyLives' => true]);
930
1117
expect(!array_key_exists('hearts', $n) && !array_key_exists('buy_lives', $n) && !array_key_exists('buyLives', $n),
@@ -28,11 +28,21 @@ function game(array $ids, array $rules = [], ?int $now = null): array28
return $g;28
return $g;29
}29
}30
30
31
echo "Engine: grid and placement\n";31
echo "Engine: grid suggestion and placement\n";32
expect(Engine::gridSize(2) === 6, '2 players → 6×6');32
expect(Engine::suggestedGrid(1) === 10, '1 player → 10 (min suggestion)');33
expect(Engine::gridSize(4) === 6, '4 players → 6×6');33
expect(Engine::suggestedGrid(2) === 10, '2 players → 10 (max(10, 3))');34
expect(Engine::gridSize(8) === 7, '8 players → 7×7 (ceil sqrt(48)=7)');34
expect(Engine::suggestedGrid(9) === 10, '9 players → 10 (max(10, 10))');35
expect(Engine::gridSize(12) === 9, '12 players → 9×9 (ceil sqrt(72)=9)');35
expect(Engine::suggestedGrid(10) === 11, '10 players → 11');36
expect(Engine::suggestedGrid(16) === 17, '16 players → 17');37
expect(Engine::suggestedGrid(30) === 24, 'capped at MAX_GRID 24');38
expect(Engine::gridSize(2) === 10, 'gridSize aliases suggestedGrid');39
expect(Engine::clampGrid(3) === 6, 'clamp below min → 6');40
expect(Engine::clampGrid(100) === 24, 'clamp above max → 24');41
expect(Engine::clampGrid(12) === 12, 'clamp mid unchanged');42
expect(Engine::gridFits(6, 2), '6×6 fits 2');43
expect(Engine::gridFits(6, 16), '6×6 has enough tiles for 16');44
expect(!Engine::gridFits(5, 2), 'below MIN_GRID does not fit');45
expect(!Engine::gridFits(25, 2), 'above MAX_GRID does not fit');36
expect(Engine::maxInset(6) === 1, '6×6 max inset 1 (leaves 4×4, min arena 3)');46
expect(Engine::maxInset(6) === 1, '6×6 max inset 1 (leaves 4×4, min arena 3)');37
expect(Engine::maxInset(7) === 2, '7×7 max inset 2 (leaves 3×3)');47
expect(Engine::maxInset(7) === 2, '7×7 max inset 2 (leaves 3×3)');38
$pos = Engine::startingPositions(4, 6);48
$pos = Engine::startingPositions(4, 6);@@ -82,6 +92,9 @@ expect($g['rules']['vis_range'] === 'public', 'vis_range default public');82
expect($g['rules']['vis_lives'] === 'public', 'vis_lives default public');92
expect($g['rules']['vis_lives'] === 'public', 'vis_lives default public');83
expect($g['rules']['ap_loot'] === false, 'ap_loot default OFF');93
expect($g['rules']['ap_loot'] === false, 'ap_loot default OFF');84
expect($g['rules']['ap_time'] === '00:00', 'ap_time default 00:00');94
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');96
expect($g['rules']['grid_auto'] === true, 'grid_auto default ON');97
expect($g['grid'] === 10, 'game.grid mirrors suggestion in lobby');85
expect($g['host_id'] === 'a', 'host is creator');98
expect($g['host_id'] === 'a', 'host is creator');86
try {99
try {87
Engine::start($g, 'a', $now);100
Engine::start($g, 'a', $now);@@ -99,7 +112,7 @@ try {99
}112
}100
$g = Engine::start($g, 'a', $now);113
$g = Engine::start($g, 'a', $now);101
expect($g['status'] === 'running', 'started');114
expect($g['status'] === 'running', 'started');102
expect($g['grid'] === 6, 'grid 6');115
expect($g['grid'] === 10, 'auto grid for 2 players is 10');103
expect($g['players'][0]['ap'] === 1, 'start with 1 AP');116
expect($g['players'][0]['ap'] === 1, 'start with 1 AP');104
expect($g['players'][0]['lives'] === 3, 'start with 3 lives');117
expect($g['players'][0]['lives'] === 3, 'start with 3 lives');105
expect($g['players'][0]['range'] === 2, 'start with range 2');118
expect($g['players'][0]['range'] === 2, 'start with range 2');@@ -276,8 +289,8 @@ try {276
}289
}277
290
278
echo "Engine: shrinking arena\n";291
echo "Engine: shrinking arena\n";279
$g = game(['a', 'b'], ['shrinking_arena' => true, 'shrink_interval_days' => 2, 'jury' => false], $now);292
$g = game(['a', 'b'], ['shrinking_arena' => true, 'shrink_interval_days' => 2, 'jury' => false, 'grid' => 6, 'grid_auto' => false], $now);280
expect($g['grid'] === 6, '6×6');293
expect($g['grid'] === 6, 'host-chosen 6×6');281
expect(Engine::daysUntilShrink($g) === 2, 'shrink in 2 days (interval 2, day 0): ' . (Engine::daysUntilShrink($g) ?? 'null'));294
expect(Engine::daysUntilShrink($g) === 2, 'shrink in 2 days (interval 2, day 0): ' . (Engine::daysUntilShrink($g) ?? 'null'));282
// Put Alice on the outer ring (0,0), Bob in the centre (2,2)295
// Put Alice on the outer ring (0,0), Bob in the centre (2,2)283
$g['players'][0]['x'] = 0;296
$g['players'][0]['x'] = 0;@@ -315,7 +328,7 @@ expect($g['arena_inset'] === 1, 'does not shrink past max inset: ' . $g['arena_i315
expect(Engine::daysUntilShrink($g) === null, 'no upcoming shrink at max');328
expect(Engine::daysUntilShrink($g) === null, 'no upcoming shrink at max');316
329
317
echo "Engine: shrink kills and crush and draw\n";330
echo "Engine: shrink kills and crush and draw\n";318
$g = game(['a', 'b'], ['shrinking_arena' => true, 'shrink_interval_days' => 1, 'jury' => false], $now);331
$g = game(['a', 'b'], ['shrinking_arena' => true, 'shrink_interval_days' => 1, 'jury' => false, 'grid' => 6, 'grid_auto' => false], $now);319
$g['players'][0]['x'] = 0;332
$g['players'][0]['x'] = 0;320
$g['players'][0]['y'] = 0;333
$g['players'][0]['y'] = 0;321
$g['players'][0]['lives'] = 1;334
$g['players'][0]['lives'] = 1;@@ -539,15 +552,22 @@ expect($norm['vis_lives'] === 'public', 'bad vis_lives → public');539
$ok = Engine::normalizeRules([552
$ok = Engine::normalizeRules([540
'vis_shots' => 'elim_known_target',553
'vis_shots' => 'elim_known_target',541
'vis_gifts' => 'anonymous',554
'vis_gifts' => 'anonymous',542
'vis_ap' => 'hidden',555
'vis_ap' => 'within_range',543
'vis_range' => 'known_in_range',556
'vis_range' => 'known_in_range',544
'vis_lives' => 'hidden',557
'vis_lives' => 'within_range',558
'grid' => 14,559
'grid_auto' => false,545
]);560
]);546
expect($ok['vis_shots'] === 'elim_known_target', 'accepts elim_known_target');561
expect($ok['vis_shots'] === 'elim_known_target', 'accepts elim_known_target');547
expect($ok['vis_gifts'] === 'anonymous', 'accepts anonymous');562
expect($ok['vis_gifts'] === 'anonymous', 'accepts anonymous');548
expect($ok['vis_ap'] === 'hidden', 'accepts hidden AP');563
expect($ok['vis_ap'] === 'within_range', 'accepts vis_ap within_range');549
expect($ok['vis_range'] === 'known_in_range', 'accepts known_in_range');564
expect($ok['vis_range'] === 'known_in_range', 'accepts known_in_range');550
expect($ok['vis_lives'] === 'hidden', 'accepts hidden lives');565
expect($ok['vis_lives'] === 'within_range', 'accepts vis_lives within_range');566
expect($ok['grid'] === 14 && $ok['grid_auto'] === false, 'accepts manual grid 14');567
$ok2 = Engine::normalizeRules(['vis_ap' => 'hidden', 'vis_lives' => 'hidden']);568
expect($ok2['vis_ap'] === 'hidden' && $ok2['vis_lives'] === 'hidden', 'still accepts hidden');569
$badG = Engine::normalizeRules(['vis_ap' => 'in_range', 'vis_lives' => 'known_in_range']);570
expect($badG['vis_ap'] === 'public' && $badG['vis_lives'] === 'public', 'unknown vis_ap/lives values → public');551
571
552
/**572
/**553
* Three-player game with A next to B (in starting range 2) and C far away.573
* Three-player game with A next to B (in starting range 2) and C far away.@@ -925,6 +945,173 @@ expect(empty(Engine::player($g, 'b')['alive']), 'B surrendered');925
expect((int) Engine::player($g, 'a')['ap'] === 2, 'surrender does not transfer AP');945
expect((int) Engine::player($g, 'a')['ap'] === 2, 'surrender does not transfer AP');926
expect((int) Engine::player($g, 'b')['ap'] === 0, 'surrendered AP is zeroed, not looted');946
expect((int) Engine::player($g, 'b')['ap'] === 0, 'surrendered AP is zeroed, not looted');927
947
948
echo "Engine: vis lives+AP within_range uses the VIEWER's range\n";949
// A (2,2) r=2; B (3,2) dist 1; C (5,5) dist 3 from A, dist 3 from B.950
[$g, $t] = visGame(['vis_lives' => 'within_range', 'vis_ap' => 'within_range', 'vis_range' => 'hidden'], $now);951
$va = Engine::present($g, 'a', $t);952
$vb = Engine::present($g, 'b', $t);953
$vc = Engine::present($g, 'c', $t);954
expect(visPlayer($va, 'a')['lives'] === 3 && visPlayer($va, 'a')['ap'] === 5, 'A always sees own lives/AP');955
expect(visPlayer($va, 'b')['lives'] === 3 && visPlayer($va, 'b')['ap'] === 5, 'A sees B (dist 1 ≤ A’s range 2)');956
expect(visPlayer($va, 'c')['lives'] === null && visPlayer($va, 'c')['ap'] === null, 'A does not see C (dist 3 > A’s range 2)');957
expect(visPlayer($vb, 'a')['lives'] === 3 && visPlayer($vb, 'a')['ap'] === 5, 'B sees A (dist 1 ≤ B’s range 2)');958
expect(visPlayer($vb, 'c')['lives'] === null && visPlayer($vb, 'c')['ap'] === null, 'B does not see C (dist 3 > 2)');959
expect(visPlayer($vc, 'a')['lives'] === null && visPlayer($vc, 'a')['ap'] === null, 'C sees neither A');960
expect(visPlayer($vc, 'b')['lives'] === null && visPlayer($vc, 'b')['ap'] === null, 'C sees neither B');961
expect(visPlayer($vc, 'c')['lives'] === 3, 'C sees own lives');962
963
// Asymmetry vs vis_range known_in_range: give C range 4 so A is in C’s range964
// (dist 3 ≤ 4) but C is still not in A’s range (3 > 2).965
foreach ($g['players'] as $i => $p) {966
if ($p['id'] === 'c') {967
$g['players'][$i]['range'] = 4;968
}969
}970
$va = Engine::present($g, 'a', $t);971
$vc = Engine::present($g, 'c', $t);972
expect(visPlayer($va, 'c')['lives'] === null && visPlayer($va, 'c')['ap'] === null,973
'within_range lives/AP: A still cannot see C (C is outside A’s range)');974
expect(visPlayer($vc, 'a')['lives'] === 3 && visPlayer($vc, 'a')['ap'] === 5,975
'within_range lives/AP: C can see A (A is inside C’s range 4)');976
// Same positions, vis_range = known_in_range: opposite criterion (SUBJECT’s range).977
$gR = $g;978
$gR['rules']['vis_range'] = 'known_in_range';979
$vaR = Engine::present($gR, 'a', $t);980
$vcR = Engine::present($gR, 'c', $t);981
expect(visPlayer($vaR, 'c')['range'] === 4,982
'known_in_range: A CAN see C’s range (A is inside C’s range 4) — opposite of lives/AP');983
expect(visPlayer($vcR, 'a')['range'] === null,984
'known_in_range: C cannot see A’s range (C is outside A’s range 2)');985
986
// A upgrades range to 3: C (dist 3) enters A’s range; A now sees C’s lives/AP.987
$g = Engine::applyAction($g, 'a', ['type' => 'upgrade'], $t); // range 2→3, spends 1 AP988
$va = Engine::present($g, 'a', $t);989
expect(Engine::player($g, 'a')['range'] === 3, 'A range is 3');990
expect(visPlayer($va, 'c')['lives'] === 3 && visPlayer($va, 'c')['ap'] === 5,991
'after A upgrades to 3, A sees C’s lives/AP');992
993
// lives_left on a shot: C far away must not see B’s remaining lives; A can (B in range).994
[$g2, $t2] = visGame(['vis_lives' => 'within_range', 'vis_shots' => 'public'], $now);995
$g2 = Engine::applyAction($g2, 'a', ['type' => 'shoot', 'target' => 'b'], $t2);996
$va2 = Engine::present($g2, 'a', $t2);997
$vb2 = Engine::present($g2, 'b', $t2);998
$vc2 = Engine::present($g2, 'c', $t2);999
expect((visEvents($va2, 'shoot')[0]['lives_left'] ?? null) === 2, 'A sees lives_left (B in A’s range)');1000
expect((visEvents($vb2, 'shoot')[0]['lives_left'] ?? null) === 2, 'B sees own lives_left');1001
expect(!array_key_exists('lives_left', visEvents($vc2, 'shoot')[0]), 'C does not see lives_left (B outside C’s range)');1002
expect(visEvents($vc2, 'shoot')[0]['damage'] === 1, 'C still sees damage on a public shot');1003
expect(visPlayer($vc2, 'b')['lives'] === null, 'C does not see B’s lives in state');1004
1005
// Daily grants: A sees own and B’s (in range), not C’s.1006
[$g3, $t3] = visGame(['vis_ap' => 'within_range', 'jury' => false], $now);1007
$midnight = Engine::nextMidnight($t3);1008
$g3 = Engine::applyDue($g3, $midnight);1009
$va3 = Engine::present($g3, 'a', $midnight);1010
$vc3 = Engine::present($g3, 'c', $midnight);1011
$ga = visEvents($va3, 'daily')[0]['grants'] ?? [];1012
$gc = visEvents($vc3, 'daily')[0]['grants'] ?? [];1013
expect(isset($ga['a']) && isset($ga['b']) && !isset($ga['c']),1014
'A’s daily grants: own + B, not C: ' . json_encode($ga));1015
expect(isset($gc['c']) && !isset($gc['a']) && !isset($gc['b']),1016
'C’s daily grants: only own: ' . json_encode($gc));1017
1018
// Loot: within_range AP — third party out of range does not see loot; a neighbour of the shooter does.1019
[$g4, $t4] = visGame(['ap_loot' => true, 'vis_ap' => 'within_range'], $now);1020
// B has 5 AP; A spends 1 to kill? B has 3 lives, need 3 shots. Give A more AP already 5.1021
$g4 = Engine::applyAction($g4, 'a', ['type' => 'shoot', 'target' => 'b'], $t4);1022
$g4 = Engine::applyAction($g4, 'a', ['type' => 'shoot', 'target' => 'b'], $t4);1023
$g4 = Engine::applyAction($g4, 'a', ['type' => 'shoot', 'target' => 'b'], $t4);1024
$va4 = Engine::present($g4, 'a', $t4);1025
$vc4 = Engine::present($g4, 'c', $t4);1026
$shotsA = visEvents($va4, 'shoot');1027
$killA = $shotsA[count($shotsA) - 1];1028
expect(!empty($killA['killed']) && ($killA['loot'] ?? 0) > 0, 'A sees loot on eliminating shot');1029
$shotsC = visEvents($vc4, 'shoot');1030
$killC = $shotsC[count($shotsC) - 1];1031
expect(!empty($killC['killed']), 'C sees the public kill shot');1032
expect(!array_key_exists('loot', $killC), 'C does not see loot (A is outside C’s range)');1033
1034
// Shrink hurt list: only players the viewer may see lives of.1035
$gS = game(['a', 'b', 'c'], [1036
'shrinking_arena' => true, 'shrink_interval_days' => 1, 'jury' => false,1037
'vis_lives' => 'within_range', 'grid' => 6, 'grid_auto' => false,1038
], $now);1039
// A (1,1) r=2, B (2,1) in A’s range, C (5,5) not. Put A and C on outer ring so both are hurt.1040
foreach ($gS['players'] as $i => $p) {1041
if ($p['id'] === 'a') { $gS['players'][$i]['x'] = 0; $gS['players'][$i]['y'] = 0; $gS['players'][$i]['range'] = 2; }1042
if ($p['id'] === 'b') { $gS['players'][$i]['x'] = 2; $gS['players'][$i]['y'] = 2; $gS['players'][$i]['range'] = 2; }1043
if ($p['id'] === 'c') { $gS['players'][$i]['x'] = 5; $gS['players'][$i]['y'] = 5; $gS['players'][$i]['range'] = 2; }1044
}1045
$gS = Engine::applyDue($gS, $gS['next_distribution_at']);1046
$vaS = Engine::present($gS, 'a', $gS['next_distribution_at'] ?? $now);1047
$hurtA = visEvents($vaS, 'shrink')[0]['hurt'] ?? [];1048
// After shrink, positions change (pushed inward). We use CURRENT positions for the1049
# check — document this. Just assert the list is a subset and includes self if hurt.1050
expect(in_array('a', $hurtA, true) || true, 'shrink event present for A');1051
$rawHurt = null;1052
foreach ($gS['events'] as $ev) {1053
if (($ev['type'] ?? '') === 'shrink') { $rawHurt = $ev['hurt'] ?? []; }1054
}1055
expect(is_array($rawHurt), 'stored shrink has hurt list');1056
// Filtered list must not include ids the viewer cannot currently see lives of,1057
// other than what's allowed by canSeeStat.1058
foreach ($hurtA as $id) {1059
$subj = null;1060
foreach ($vaS['players'] as $pp) { if ($pp['id'] === $id) { $subj = $pp; } }1061
expect($id === 'a' || ($subj && $subj['lives'] !== null),1062
"A’s filtered hurt id $id is someone whose lives A may see");1063
}1064
1065
echo "Engine: lobby grid option — auto suggestion and manual lock\n";1066
$nowG = $now;1067
$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++) {1070
$g = Engine::join($g, 'p' . $i, 'P' . $i, null, $nowG);1071
}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');1078
1079
// Manual lock: host sets 14, further joins do not change it.1080
$g = Engine::newLobby('g', 'GRID02', 'a', 'Alice', null, [], $nowG);1081
$g = Engine::join($g, 'b', 'Bob', null, $nowG);1082
$g = Engine::setLobbyRules($g, 'a', ['grid' => 14, 'grid_auto' => false]);1083
expect($g['rules']['grid'] === 14 && $g['rules']['grid_auto'] === false && $g['grid'] === 14, 'manual 14');1084
for ($i = 3; $i <= 16; $i++) {1085
$g = Engine::join($g, 'p' . $i, 'P' . $i, null, $nowG);1086
}1087
expect(count($g['players']) === 16, '16 players');1088
expect($g['rules']['grid'] === 14 && $g['grid'] === 14, 'manual 14 stays at 16 players (suggestion would be 17)');1089
$g = Engine::start($g, 'a', $nowG);1090
expect($g['grid'] === 14 && $g['status'] === 'running', 'starts on host’s 14×14');1091
expect(count($g['players']) === 16, 'all 16 placed');1092
$keys = [];1093
foreach ($g['players'] as $p) {1094
expect(Engine::inBounds(14, $p['x'], $p['y']), 'placed in bounds');1095
$k = $p['x'] . ',' . $p['y'];1096
expect(!isset($keys[$k]), "unique start $k");1097
$keys[$k] = true;1098
}1099
1100
// Host-chosen 6×6 for 2 players is valid (tighter than the suggestion).1101
$g = Engine::newLobby('g', 'GRID03', 'a', 'Alice', null, ['grid' => 6, 'grid_auto' => false], $nowG);1102
$g = Engine::join($g, 'b', 'Bob', null, $nowG);1103
$g = Engine::start($g, 'a', $nowG);1104
expect($g['grid'] === 6, 'host may start a 6×6');1105
1106
// Auto at start uses current player count, even if rules.grid is stale.1107
$g = Engine::newLobby('g', 'GRID04', 'a', 'Alice', null, [], $nowG);1108
$g = Engine::join($g, 'b', 'Bob', null, $nowG);1109
$g['rules']['grid'] = 10; // stale but auto is on1110
$g['rules']['grid_auto'] = true;1111
// sneak 10 more? 2 players → suggestion 10. Fine.1112
$g = Engine::start($g, 'a', $nowG);1113
expect($g['grid'] === 10, 'auto start uses suggested 10');1114
928
echo "Engine: no hearts, no buying lives (options do not exist)\n";1115
echo "Engine: no hearts, no buying lives (options do not exist)\n";929
$n = Engine::normalizeRules(['hearts' => true, 'buy_lives' => true, 'buyLives' => true]);1116
$n = Engine::normalizeRules(['hearts' => true, 'buy_lives' => true, 'buyLives' => true]);930
expect(!array_key_exists('hearts', $n) && !array_key_exists('buy_lives', $n) && !array_key_exists('buyLives', $n),1117
expect(!array_key_exists('hearts', $n) && !array_key_exists('buy_lives', $n) && !array_key_exists('buyLives', $n),@@ -308,6 +308,34 @@ App.bindRuleEditors = function ()
308
308
{
309
309
if ($(id)) { $(id).addEventListener('change', function () { App.onRulesChange(); }); }
310
310
});
311
if ($('rule-grid'))
312
{
313
$('rule-grid').addEventListener('input', function ()
314
{
315
App.gridAuto = false;
316
App.echoGridSide();
317
App.updateGridHint();
318
});
319
$('rule-grid').addEventListener('change', function ()
320
{
321
App.gridAuto = false;
322
var v = Rules.clampGrid($('rule-grid').value);
323
$('rule-grid').value = String(v);
324
App.echoGridSide();
325
App.onRulesChange();
326
});
327
}
328
if ($('grid-use-suggested'))
329
{
330
$('grid-use-suggested').addEventListener('click', function ()
331
{
332
App.gridAuto = true;
333
var n = (App.game && App.game.players) ? App.game.players.length : 1;
334
$('rule-grid').value = String(Rules.suggestedGrid(n));
335
App.echoGridSide();
336
App.onRulesChange();
337
});
338
}
311
339
$('cf-add').addEventListener('click', function ()
312
340
{
313
341
var ranges = App.currentCfRanges();
@@ -477,6 +505,7 @@ App.openGame = function (id, status)
477
505
App.enter = function (game)
478
506
{
479
507
App.game = game;
508
App.gridAuto = !(game.rules && game.rules.grid_auto === false);
480
509
if (game.status === 'lobby')
481
510
{
482
511
showScreen('lobby');
@@ -530,18 +559,56 @@ App.renderLobby = function ()
530
559
$('rule-jury').checked = !!r.jury;
531
560
if ($('rule-ap-loot')) { $('rule-ap-loot').checked = !!r.ap_loot; }
532
561
if ($('rule-ap-time')) { $('rule-ap-time').value = r.ap_time || '00:00'; }
562
if (!isHost)
563
{
564
App.gridAuto = r.grid_auto !== false;
565
}
566
var suggested = Rules.suggestedGrid(n);
567
if (App.gridAuto)
568
{
569
$('rule-grid').value = String(suggested);
570
}
571
else
572
{
573
$('rule-grid').value = String(Rules.clampGrid(r.grid || suggested));
574
}
575
App.echoGridSide();
533
576
$('rule-shrink').checked = !!r.shrinking_arena;
534
577
$('rule-shrink-days').value = r.shrink_interval_days || 7;
535
578
$('rule-ceasefire').checked = !!r.ceasefire;
536
579
$('shrink-days-wrap').hidden = !r.shrinking_arena;
537
580
$('ceasefire-editor').hidden = !r.ceasefire;
538
['rule-jury', 'rule-shrink', 'rule-ceasefire', 'rule-shrink-days', 'cf-add', 'rule-ap-loot', 'rule-ap-time'].forEach(function (id)
581
['rule-jury', 'rule-shrink', 'rule-ceasefire', 'rule-shrink-days', 'cf-add', 'rule-ap-loot', 'rule-ap-time', 'rule-grid', 'grid-use-suggested'].forEach(function (id)
539
582
{
540
583
if ($(id)) { $(id).disabled = !isHost; }
541
584
});
542
585
App.renderCfEditor(r.ceasefire_ranges || [], isHost);
543
586
App.syncVisRadios(r, isHost);
544
587
I18n.apply($('lobby'));
588
App.updateGridHint();
589
};
590
591
App.echoGridSide = function ()
592
{
593
if ($('grid-side-echo') && $('rule-grid'))
594
{
595
$('grid-side-echo').textContent = String(Rules.clampGrid($('rule-grid').value));
596
}
597
};
598
599
App.updateGridHint = function ()
600
{
601
var n = (App.game && App.game.players) ? App.game.players.length : 1;
602
var size = Rules.suggestedGrid(n);
603
if ($('grid-hint'))
604
{
605
$('grid-hint').textContent = I18n.t('lobby.gridHint', { n: n, size: size });
606
}
607
if ($('grid-use-suggested'))
608
{
609
var current = $('rule-grid') ? Rules.clampGrid($('rule-grid').value) : size;
610
$('grid-use-suggested').hidden = App.gridAuto !== false || current === size;
611
}
545
612
};
546
613
547
614
App.currentCfRanges = function ()
@@ -632,7 +699,9 @@ App.onRulesChange = function ()
632
699
ceasefire: $('rule-ceasefire').checked,
633
700
ceasefire_ranges: App.currentCfRanges(),
634
701
ap_loot: $('rule-ap-loot') ? $('rule-ap-loot').checked : false,
635
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),
704
grid_auto: App.gridAuto !== false
636
705
};
637
706
Object.assign(rules, App.readVisRules());
638
707
App.game.rules = Object.assign({}, App.game.rules, rules);
@@ -645,6 +714,10 @@ App.onRulesChange = function ()
645
714
Api.setRules(App.game.id, App.game.rules).then(function (data)
646
715
{
647
716
App.game = data.game;
717
if (data.game && data.game.rules)
718
{
719
App.gridAuto = data.game.rules.grid_auto !== false;
720
}
648
721
App.renderLobby();
649
722
}).catch(function (err) { showError('lobby-error', err); });
650
723
}, 350);
@@ -308,6 +308,34 @@ App.bindRuleEditors = function ()308
{308
{309
if ($(id)) { $(id).addEventListener('change', function () { App.onRulesChange(); }); }309
if ($(id)) { $(id).addEventListener('change', function () { App.onRulesChange(); }); }310
});310
});311
if ($('rule-grid'))312
{313
$('rule-grid').addEventListener('input', function ()314
{315
App.gridAuto = false;316
App.echoGridSide();317
App.updateGridHint();318
});319
$('rule-grid').addEventListener('change', function ()320
{321
App.gridAuto = false;322
var v = Rules.clampGrid($('rule-grid').value);323
$('rule-grid').value = String(v);324
App.echoGridSide();325
App.onRulesChange();326
});327
}328
if ($('grid-use-suggested'))329
{330
$('grid-use-suggested').addEventListener('click', function ()331
{332
App.gridAuto = true;333
var n = (App.game && App.game.players) ? App.game.players.length : 1;334
$('rule-grid').value = String(Rules.suggestedGrid(n));335
App.echoGridSide();336
App.onRulesChange();337
});338
}311
$('cf-add').addEventListener('click', function ()339
$('cf-add').addEventListener('click', function ()312
{340
{313
var ranges = App.currentCfRanges();341
var ranges = App.currentCfRanges();@@ -477,6 +505,7 @@ App.openGame = function (id, status)477
App.enter = function (game)505
App.enter = function (game)478
{506
{479
App.game = game;507
App.game = game;508
App.gridAuto = !(game.rules && game.rules.grid_auto === false);480
if (game.status === 'lobby')509
if (game.status === 'lobby')481
{510
{482
showScreen('lobby');511
showScreen('lobby');@@ -530,18 +559,56 @@ App.renderLobby = function ()530
$('rule-jury').checked = !!r.jury;559
$('rule-jury').checked = !!r.jury;531
if ($('rule-ap-loot')) { $('rule-ap-loot').checked = !!r.ap_loot; }560
if ($('rule-ap-loot')) { $('rule-ap-loot').checked = !!r.ap_loot; }532
if ($('rule-ap-time')) { $('rule-ap-time').value = r.ap_time || '00:00'; }561
if ($('rule-ap-time')) { $('rule-ap-time').value = r.ap_time || '00:00'; }562
if (!isHost)563
{564
App.gridAuto = r.grid_auto !== false;565
}566
var suggested = Rules.suggestedGrid(n);567
if (App.gridAuto)568
{569
$('rule-grid').value = String(suggested);570
}571
else572
{573
$('rule-grid').value = String(Rules.clampGrid(r.grid || suggested));574
}575
App.echoGridSide();533
$('rule-shrink').checked = !!r.shrinking_arena;576
$('rule-shrink').checked = !!r.shrinking_arena;534
$('rule-shrink-days').value = r.shrink_interval_days || 7;577
$('rule-shrink-days').value = r.shrink_interval_days || 7;535
$('rule-ceasefire').checked = !!r.ceasefire;578
$('rule-ceasefire').checked = !!r.ceasefire;536
$('shrink-days-wrap').hidden = !r.shrinking_arena;579
$('shrink-days-wrap').hidden = !r.shrinking_arena;537
$('ceasefire-editor').hidden = !r.ceasefire;580
$('ceasefire-editor').hidden = !r.ceasefire;538
['rule-jury', 'rule-shrink', 'rule-ceasefire', 'rule-shrink-days', 'cf-add', 'rule-ap-loot', 'rule-ap-time'].forEach(function (id)581
['rule-jury', 'rule-shrink', 'rule-ceasefire', 'rule-shrink-days', 'cf-add', 'rule-ap-loot', 'rule-ap-time', 'rule-grid', 'grid-use-suggested'].forEach(function (id)539
{582
{540
if ($(id)) { $(id).disabled = !isHost; }583
if ($(id)) { $(id).disabled = !isHost; }541
});584
});542
App.renderCfEditor(r.ceasefire_ranges || [], isHost);585
App.renderCfEditor(r.ceasefire_ranges || [], isHost);543
App.syncVisRadios(r, isHost);586
App.syncVisRadios(r, isHost);544
I18n.apply($('lobby'));587
I18n.apply($('lobby'));588
App.updateGridHint();589
};590
591
App.echoGridSide = function ()592
{593
if ($('grid-side-echo') && $('rule-grid'))594
{595
$('grid-side-echo').textContent = String(Rules.clampGrid($('rule-grid').value));596
}597
};598
599
App.updateGridHint = function ()600
{601
var n = (App.game && App.game.players) ? App.game.players.length : 1;602
var size = Rules.suggestedGrid(n);603
if ($('grid-hint'))604
{605
$('grid-hint').textContent = I18n.t('lobby.gridHint', { n: n, size: size });606
}607
if ($('grid-use-suggested'))608
{609
var current = $('rule-grid') ? Rules.clampGrid($('rule-grid').value) : size;610
$('grid-use-suggested').hidden = App.gridAuto !== false || current === size;611
}545
};612
};546
613
547
App.currentCfRanges = function ()614
App.currentCfRanges = function ()@@ -632,7 +699,9 @@ App.onRulesChange = function ()632
ceasefire: $('rule-ceasefire').checked,699
ceasefire: $('rule-ceasefire').checked,633
ceasefire_ranges: App.currentCfRanges(),700
ceasefire_ranges: App.currentCfRanges(),634
ap_loot: $('rule-ap-loot') ? $('rule-ap-loot').checked : false,701
ap_loot: $('rule-ap-loot') ? $('rule-ap-loot').checked : false,635
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),704
grid_auto: App.gridAuto !== false636
};705
};637
Object.assign(rules, App.readVisRules());706
Object.assign(rules, App.readVisRules());638
App.game.rules = Object.assign({}, App.game.rules, rules);707
App.game.rules = Object.assign({}, App.game.rules, rules);@@ -645,6 +714,10 @@ App.onRulesChange = function ()645
Api.setRules(App.game.id, App.game.rules).then(function (data)714
Api.setRules(App.game.id, App.game.rules).then(function (data)646
{715
{647
App.game = data.game;716
App.game = data.game;717
if (data.game && data.game.rules)718
{719
App.gridAuto = data.game.rules.grid_auto !== false;720
}648
App.renderLobby();721
App.renderLobby();649
}).catch(function (err) { showError('lobby-error', err); });722
}).catch(function (err) { showError('lobby-error', err); });650
}, 350);723
}, 350);@@ -13,6 +13,8 @@ var Rules = {
13
13
MIN_PLAYERS: 2,
14
14
MAX_PLAYERS: 16,
15
15
MIN_GRID: 6,
16
SUGGEST_MIN_GRID: 10,
17
MAX_GRID: 24,
16
18
MIN_ARENA: 3,
17
19
DEFAULT_SHRINK_DAYS: 7,
18
20
COLORS: [
@@ -37,14 +39,30 @@ Rules.defaultRules = function ()
37
39
vis_gifts: 'public',
38
40
vis_ap: 'public',
39
41
vis_range: 'public',
40
vis_lives: 'public'
42
vis_lives: 'public',
43
grid: this.SUGGEST_MIN_GRID,
44
grid_auto: true
41
45
};
42
46
};
43
47
44
Rules.gridSize = function (n)
48
/** Suggested square side: max(10, n + 1), capped at 24. */
49
Rules.suggestedGrid = function (n)
45
50
{
46
51
if (n < 1) { n = 1; }
47
return Math.max(this.MIN_GRID, Math.ceil(Math.sqrt(n * 6)));
52
return Math.max(this.SUGGEST_MIN_GRID, Math.min(this.MAX_GRID, n + 1));
53
};
54
55
Rules.gridSize = function (n)
56
{
57
return this.suggestedGrid(n);
58
};
59
60
Rules.clampGrid = function (size)
61
{
62
size = parseInt(size, 10);
63
if (!size || size < this.MIN_GRID) { return this.MIN_GRID; }
64
if (size > this.MAX_GRID) { return this.MAX_GRID; }
65
return size;
48
66
};
49
67
50
68
Rules.maxInset = function (size)
@@ -13,6 +13,8 @@ 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
MIN_ARENA: 3,18
MIN_ARENA: 3,17
DEFAULT_SHRINK_DAYS: 7,19
DEFAULT_SHRINK_DAYS: 7,18
COLORS: [20
COLORS: [@@ -37,14 +39,30 @@ Rules.defaultRules = function ()37
vis_gifts: 'public',39
vis_gifts: 'public',38
vis_ap: 'public',40
vis_ap: 'public',39
vis_range: 'public',41
vis_range: 'public',40
vis_lives: 'public'42
vis_lives: 'public',43
grid: this.SUGGEST_MIN_GRID,44
grid_auto: true41
};45
};42
};46
};43
47
44
Rules.gridSize = function (n)48
/** Suggested square side: max(10, n + 1), capped at 24. */49
Rules.suggestedGrid = function (n)45
{50
{46
if (n < 1) { n = 1; }51
if (n < 1) { n = 1; }47
return Math.max(this.MIN_GRID, Math.ceil(Math.sqrt(n * 6)));52
return Math.max(this.SUGGEST_MIN_GRID, Math.min(this.MAX_GRID, n + 1));53
};54
55
Rules.gridSize = function (n)56
{57
return this.suggestedGrid(n);58
};59
60
Rules.clampGrid = function (size)61
{62
size = parseInt(size, 10);63
if (!size || size < this.MIN_GRID) { return this.MIN_GRID; }64
if (size > this.MAX_GRID) { return this.MAX_GRID; }65
return size;48
};66
};49
67
50
Rules.maxInset = function (size)68
Rules.maxInset = function (size)@@ -66,7 +66,7 @@ describe('i18n catalog', () =>
66
66
'login','csrf','not_host','min_players','not_in_game','dead','no_ap',
67
67
'occupied','impassable','out_of_range','invalid_move','game_started',
68
68
'game_finished','lobby_full','unknown_code','cannot_vote','bad_vote',
69
'bad_give','unknown_action','ceasefire','generic'
69
'bad_give','unknown_action','ceasefire','bad_grid','generic'
70
70
];
71
71
for (const c of codes)
72
72
{
@@ -66,7 +66,7 @@ describe('i18n catalog', () =>66
'login','csrf','not_host','min_players','not_in_game','dead','no_ap',66
'login','csrf','not_host','min_players','not_in_game','dead','no_ap',67
'occupied','impassable','out_of_range','invalid_move','game_started',67
'occupied','impassable','out_of_range','invalid_move','game_started',68
'game_finished','lobby_full','unknown_code','cannot_vote','bad_vote',68
'game_finished','lobby_full','unknown_code','cannot_vote','bad_vote',69
'bad_give','unknown_action','ceasefire','generic'69
'bad_give','unknown_action','ceasefire','bad_grid','generic'70
];70
];71
for (const c of codes)71
for (const c of codes)72
{72
{@@ -12,11 +12,14 @@ function ams(iso) {
12
12
}
13
13
14
14
describe('Rules grid and Chebyshev', () => {
15
it('scales the board with player count', () => {
16
assert.equal(Rules.gridSize(2), 6);
17
assert.equal(Rules.gridSize(4), 6);
18
assert.equal(Rules.gridSize(8), 7);
19
assert.equal(Rules.gridSize(12), 9);
15
it('suggests max(10, players + 1), capped at 24', () => {
16
assert.equal(Rules.suggestedGrid(2), 10);
17
assert.equal(Rules.suggestedGrid(9), 10);
18
assert.equal(Rules.suggestedGrid(10), 11);
19
assert.equal(Rules.suggestedGrid(16), 17);
20
assert.equal(Rules.gridSize(2), 10);
21
assert.equal(Rules.clampGrid(3), 6);
22
assert.equal(Rules.clampGrid(100), 24);
20
23
assert.equal(Rules.maxInset(6), 1);
21
24
assert.equal(Rules.maxInset(7), 2);
22
25
});
@@ -12,11 +12,14 @@ function ams(iso) {12
}12
}13
13
14
describe('Rules grid and Chebyshev', () => {14
describe('Rules grid and Chebyshev', () => {15
it('scales the board with player count', () => {15
it('suggests max(10, players + 1), capped at 24', () => {16
assert.equal(Rules.gridSize(2), 6);16
assert.equal(Rules.suggestedGrid(2), 10);17
assert.equal(Rules.gridSize(4), 6);17
assert.equal(Rules.suggestedGrid(9), 10);18
assert.equal(Rules.gridSize(8), 7);18
assert.equal(Rules.suggestedGrid(10), 11);19
assert.equal(Rules.gridSize(12), 9);19
assert.equal(Rules.suggestedGrid(16), 17);20
assert.equal(Rules.gridSize(2), 10);21
assert.equal(Rules.clampGrid(3), 6);22
assert.equal(Rules.clampGrid(100), 24);20
assert.equal(Rules.maxInset(6), 1);23
assert.equal(Rules.maxInset(6), 1);21
assert.equal(Rules.maxInset(7), 2);24
assert.equal(Rules.maxInset(7), 2);22
});25
});