Merge branch 'main' into fix/remove-operator-hud-layout

src/ui/applicationShell.js

@@ -1598,7 +1598,7 @@ export class StyleManager extends ShellFacade {
    * 2. Crossfades the new shader stage intensity to 1.
    * 3. Applies style preset defaults (bloom/sharpen/HUD) if applyPreset is true.
    * 4. Updates button highlights, style indicator, slider panel, HUD, and detection overlay.
-   * @param {string} styleName - Target style ('normal'|'retro'|'surveillance'|'thermal'|'anime'|'noir'|'snow').
+   * @param {string} styleName - Target style ('normal'|'retro'|'surveillance'|'thermal'|'anime'|'noir').
    * @param {object} [options]
    * @param {boolean} [options.applyPreset=true] - Whether to apply STYLE_PRESET_DEFAULTS for the new style.
    * @param {boolean} [options.userInitiated=false] - Whether a direct user preset choice owns the Cyber exit style.

src/ui/applicationShortcuts.js

@@ -5,7 +5,6 @@ const STYLE_KEYS = Object.freeze({
   4: 'thermal',
   5: 'anime',
   6: 'noir',
-  7: 'snow',
 });
 
 /**

src/ui/cockpitInstruments.js

@@ -268,7 +268,6 @@ export function setVisionMode(mode, { revealParameters = false } = {}) {
     thermal: t('FLIR'),
     anime: t('ANIME'),
     noir: t('NOIR'),
-    snow: t('SNOW'),
   };
   const names = {
     optical: t('Normal'),
@@ -277,7 +276,6 @@ export function setVisionMode(mode, { revealParameters = false } = {}) {
     thermal: t('Thermal'),
     anime: t('Anime'),
     noir: t('Noir'),
-    snow: t('Snow'),
   };
   if (this.visionCurrent) {
     this.visionCurrent.dataset.cockpitVision = next;

src/ui/cyberTheme.test.mjs

@@ -106,7 +106,6 @@ test('visual styles retain Cyber through real preset application without droppin
     'normal',
     'noir',
     'anime',
-    'snow',
     'thermal',
     'retro',
   ]) {
@@ -163,8 +162,8 @@ test('a preset explicitly selected in Cyber survives exit and resets for re-entr
   owner.setStyle('noir');
 
   owner._setHudVariant('cyber', { applyVisualDefaults: true });
-  owner.setStyle('snow', { userInitiated: true });
-  assert.equal(owner.activeStyle, 'snow');
+  owner.setStyle('anime', { userInitiated: true });
+  assert.equal(owner.activeStyle, 'anime');
   assert.equal(owner._preCyberStyle, 'noir');
   assert.equal(owner._cyberStyleUserSelected, true);
 
@@ -180,9 +179,9 @@ test('a preset explicitly selected in Cyber survives exit and resets for re-entr
   // A later untouched Cyber round trip restores the new pre-Cyber preset.
   owner._setHudVariant('cyber', { applyVisualDefaults: true });
   assert.equal(owner.activeStyle, 'thermal');
-  assert.equal(owner._preCyberStyle, 'snow');
+  assert.equal(owner._preCyberStyle, 'anime');
   owner._setHudVariant('minimal', { applyVisualDefaults: true });
-  assert.equal(owner.activeStyle, 'snow');
+  assert.equal(owner.activeStyle, 'anime');
 });
 
 test('an explicit same-value FLIR choice is preserved on Cyber exit', (t) => {
@@ -201,11 +200,11 @@ test('an authoritative same-Cyber reset clears local preset ownership', (t) => {
   const { owner } = styleOwner(t, 'tactical');
   owner.setStyle('noir');
   owner._setHudVariant('cyber', { applyVisualDefaults: true });
-  owner.setStyle('snow', { userInitiated: true });
+  owner.setStyle('anime', { userInitiated: true });
   assert.equal(owner._cyberStyleUserSelected, true);
 
   owner._setHudVariant('cyber');
-  assert.equal(owner.activeStyle, 'snow');
+  assert.equal(owner.activeStyle, 'anime');
   assert.equal(owner._preCyberStyle, null);
   assert.equal(owner._cyberStyleUserSelected, false);
   owner._setHudVariant('minimal', { applyVisualDefaults: true });
@@ -227,10 +226,10 @@ test('Display and voice HUD routes preserve explicit Cyber entry and exit author
   const display = makeOwner();
   const hudLayout = new EventTarget();
   hudLayout.value = 'cyber';
-  const snowButton = new EventTarget();
-  snowButton.dataset = { style: 'snow' };
+  const animeButton = new EventTarget();
+  animeButton.dataset = { style: 'anime' };
   const controls = bindDisplayControls({
-    elements: { hudLayout, styleButtons: [snowButton] },
+    elements: { hudLayout, styleButtons: [animeButton] },
     actions: {
       setHudLayout: (value) => display.owner.setHudLayout(value),
       setStyle: (value) =>
@@ -264,7 +263,7 @@ test('Display and voice HUD routes preserve explicit Cyber entry and exit author
   assert.equal(entered.ok, true);
   assert.equal(voice.hud.getVariant(), 'cyber');
   assert.equal(voice.owner.activeStyle, 'thermal');
-  const selected = await runVoiceAction('set_visual_style', { style: 'snow' });
+  const selected = await runVoiceAction('set_visual_style', { style: 'anime' });
   assert.equal(selected.ok, true);
   assert.equal(voice.owner.activeStyle, 'snow');
   const exited = await runVoiceAction('set_hud', { layout: 'minimal' });
@@ -302,11 +301,18 @@ test('scope choice and expanded feather survive every HUD layout and both restor
   assert.equal(owner._scopeFeatherSlider.value, '200');
 });
 
+test('a scene shot saved with the retired Snow style plays on Normal', async (t) => {
+  const { owner } = styleOwner(t, 'tactical');
+  owner.setStyle('noir');
+  await owner.applyVisualState({ style: 'snow' });
+  assert.equal(owner.activeStyle, 'normal');
+});
+
 test('scene and share HUD transitions do not restore a local pre-Cyber preset', async (t) => {
   const { owner, hud } = styleOwner(t, 'tactical');
   owner.setStyle('noir');
   owner._setHudVariant('cyber', { applyVisualDefaults: true });
-  owner.setStyle('snow', { userInitiated: true });
+  owner.setStyle('anime', { userInitiated: true });
   assert.equal(owner._cyberStyleUserSelected, true);
 
   await owner.applyVisualState({ style: 'retro', hud: { variant: 'cyber' } });
@@ -320,7 +326,7 @@ test('scene and share HUD transitions do not restore a local pre-Cyber preset',
   owner.setStyle('surveillance');
   owner._setHudVariant('cyber', { applyVisualDefaults: true });
   assert.equal(owner._preCyberStyle, 'surveillance');
-  owner.setStyle('snow', { userInitiated: true });
+  owner.setStyle('anime', { userInitiated: true });
   await owner.restoreShareState({
     style: 'thermal',
     hudVariant: 'cyber',

src/ui/scenePresentation.js

@@ -12,7 +12,6 @@ const STYLE_LABELS = Object.freeze({
   thermal: msg('FLIR'),
   anime: msg('ANIME'),
   noir: msg('NOIR'),
-  snow: msg('SNOW'),
 });
 
 const DETECTION_MODE_LABELS = Object.freeze({

src/ui/styles/cyber.css

@@ -747,12 +747,6 @@
   .btn-icon::before {
   content: '◐';
 }
-:root[data-ui-theme='cyber']
-  #command-dock
-  .style-btn[data-style='snow']
-  .btn-icon::before {
-  content: '❄︎';
-}
 
 :root[data-ui-theme='cyber'] :where(#bloom-toggle, #sharpen-toggle) {
   font-size: 0;

src/ui/templates/command-dock.html

@@ -43,11 +43,6 @@
           <span class="btn-label" data-i18n>Noir</span>
           <span class="btn-key">6</span>
         </button>
-        <button class="style-btn" data-style="snow" title="Add a cold, snowy whiteout treatment to the scene." data-i18n-title>
-          <span class="btn-icon">❄</span>
-          <span class="btn-label" data-i18n>Snow</span>
-          <span class="btn-key">7</span>
-        </button>
       </div>
       <section class="map-source-section" aria-labelledby="map-source-label">
         <div class="map-source-heading">

src/ui/visualEffects.test.mjs

@@ -77,7 +77,7 @@ test('construction is inert and initialization creates one owned pipeline', () =
   assert.equal(f.frames.size, 0);
   f.effects.initStyles();
   f.effects.initPostProcess();
-  assert.equal(f.stages.size, 7);
+  assert.equal(f.stages.size, 6);
   assert.ok(
     Object.values(f.effects.stages).every(
       (stage) => !stage.enabled && stage.uniforms.intensity === 0,
@@ -85,7 +85,7 @@ test('construction is inert and initialization creates one owned pipeline', () =
   );
   f.effects.initStyles();
   f.effects.initPostProcess();
-  assert.equal(f.stages.size, 7);
+  assert.equal(f.stages.size, 6);
   f.effects.destroy();
 });
 
@@ -252,7 +252,7 @@ test('stop revokes pending work immediately but retains stages until final destr
   assert.equal(f.frames.size, 0);
   assert.equal(
     f.stages.size,
-    7,
+    6,
     'Context and Cockpit may still be releasing these stages',
   );
   const intensity = f.effects.stages.retro.uniforms.intensity;
@@ -281,7 +281,7 @@ test('destroying one instance does not remove another pipeline or clock', () =>
   a.effects.destroy();
   b.tick(250);
   assert.equal(a.stages.size, 0);
-  assert.equal(b.stages.size, 6);
+  assert.equal(b.stages.size, 5);
   assert.equal(b.effects.stages.retro.uniforms.intensity, 0.5);
   b.effects.destroy();
 });

src/ui/visualInput.test.mjs

@@ -73,13 +73,13 @@ function shortcuts() {
   return { documentRef, searchInput, calls, controller, press };
 }
 
-test('number keys retain the seven style mappings', () => {
+test('number keys retain the six style mappings', () => {
   const f = shortcuts();
   for (const key of ['1', '2', '3', '4', '5', '6', '7', '8', 'Space'])
     f.press(key);
   assert.deepEqual(
     f.calls,
-    ['normal', 'retro', 'surveillance', 'thermal', 'anime', 'noir', 'snow'].map(
+    ['normal', 'retro', 'surveillance', 'thermal', 'anime', 'noir'].map(
       (style) => ['setStyle', style],
     ),
   );

src/ui/visualPresets.js

@@ -1,7 +1,6 @@
 import { retroShader } from '../styles/retro.js';
 import { animeShader } from '../styles/anime.js';
 import { noirShader } from '../styles/noir.js';
-import { snowShader } from '../styles/snow.js';
 import { nightVisionShader } from '../styles/surveillance.js';
 import { thermalShader } from '../styles/thermal.js';
 import { BLOOM_INTENSITY_DEFAULT } from '../bloom.js';
@@ -16,7 +15,6 @@ export const STYLES = {
   thermal: thermalShader,
   anime: animeShader,
   noir: noirShader,
-  snow: snowShader,
 };
 
 /**
@@ -156,5 +154,4 @@ export const STYLE_STATUS_LABELS = {
   thermal: msg('FLIR'),
   anime: msg('ANIME'),
   noir: msg('NOIR'),
-  snow: msg('SNOW'),
 };

src/ui/visualSettings.js

@@ -1,6 +1,7 @@
 import { clampScopeFeatherPct } from '../scopeMaskPolicy.js';
 import { syncScopeControls } from './displayControls.js';
 import { STYLE_STATUS_LABELS } from './visualPresets.js';
+import { RETIRED_STYLES } from '../visualStylePolicy.js';
 import { syncSegmentedControl } from './segmentedControl.js';
 import { t } from '../i18n/index.js';
 import { UiLifetime } from './uiLifetime.js';
@@ -1272,8 +1273,9 @@ export class VisualSettings {
     const superseded = () => typeof isCurrent === 'function' && !isCurrent();
     if (superseded()) return false;
 
-    if (state.style && state.style !== this.activeStyle) {
-      this.setStyle(state.style, { applyPreset: false });
+    const style = RETIRED_STYLES.includes(state.style) ? 'normal' : state.style;
+    if (style && style !== this.activeStyle) {
+      this.setStyle(style, { applyPreset: false });
     }
 
     const bloomState = state.bloom || {};