volleyballsimtypes 0.0.515 → 0.0.517

package/dist/cjs/src/api/index.d.ts

@@ -97,7 +97,7 @@ export interface ApiDesignatedSub extends ApiSetSubConfig {
 }
 export interface ApiOffensivePreference {
     rotation: number;
-    weights: Record<string, number>;
+    priorities: Record<string, 'HIGH' | 'MID' | 'LOW' | 'NONE'>;
     tempos?: Record<string, 'FAST' | 'HIGH'>;
 }
 export interface ApiBlockingPreference {
@@ -137,10 +137,10 @@ export interface Tactics {
     liberoReplacementSets?: string[][];
     rotationSystem: RotationSystemEnum;
     designatedSetters: string[];
+    emergencySetterOrder: string[];
     offensivePreferences: ApiOffensivePreference[];
     systemSets?: ApiSystemSet[];
     offensivePreferenceSets?: ApiOffensivePreference[][];
-    serveAttackShares?: Record<string, number>;
     basePositions?: BaseConfig;
     blockingPreferences: ApiBlockingPreference[];
     blockingPreferenceSets?: ApiBlockingPreference[][];

package/dist/cjs/src/api/tactics-player-refs.d.ts

@@ -2,8 +2,8 @@ import type { Tactics } from '.';
 /**
  * Every player id a tactics config references, anywhere: the six court slots and the libero, the bench, libero
  * replacements (flat and per-set), the second libero, designated subs and their per-set overrides, designated
- * setters (flat and per-set), the keys of the offensive-weight map, the blocking commit + no-block ids, injury
- * replacements and the libero-injury reserves.
+ * setters (flat and per-set), the emergency setter order, the keys of the offensive-weight map, the blocking
+ * commit + no-block ids, injury replacements and the libero-injury reserves.
  *
  * There is exactly ONE implementation of this on purpose. It backs three rules that must agree or a player
  * slips through: the dismiss/retire guard (a referenced player cannot be removed), the event rarity check

package/dist/cjs/src/api/tactics-player-refs.js

@@ -4,8 +4,8 @@ exports.collectTacticsPlayerIds = collectTacticsPlayerIds;
 /**
  * Every player id a tactics config references, anywhere: the six court slots and the libero, the bench, libero
  * replacements (flat and per-set), the second libero, designated subs and their per-set overrides, designated
- * setters (flat and per-set), the keys of the offensive-weight map, the blocking commit + no-block ids, injury
- * replacements and the libero-injury reserves.
+ * setters (flat and per-set), the emergency setter order, the keys of the offensive-weight map, the blocking
+ * commit + no-block ids, injury replacements and the libero-injury reserves.
  *
  * There is exactly ONE implementation of this on purpose. It backs three rules that must agree or a player
  * slips through: the dismiss/retire guard (a referenced player cannot be removed), the event rarity check
@@ -26,9 +26,10 @@ function collectTacticsPlayerIds(config) {
         config.secondLibero,
         ...((config.liberoReplacementSets ?? []).flat()),
         ...(config.designatedSetters ?? []),
-        ...((config.offensivePreferences ?? []).flatMap(p => Object.keys(p.weights))),
+        ...(config.emergencySetterOrder ?? []),
+        ...((config.offensivePreferences ?? []).flatMap(p => Object.keys(p.priorities))),
         ...((config.systemSets ?? []).flatMap(s => s.designatedSetters)),
-        ...((config.offensivePreferenceSets ?? []).flat().flatMap(p => Object.keys(p.weights))),
+        ...((config.offensivePreferenceSets ?? []).flat().flatMap(p => Object.keys(p.priorities))),
         ...((config.blockingPreferences ?? []).flatMap(p => [...Object.keys(p.commit ?? {}), ...Object.values(p.noBlock ?? {}).flat()])),
         ...((config.blockingPreferenceSets ?? []).flat().flatMap(p => [...Object.keys(p.commit ?? {}), ...Object.values(p.noBlock ?? {}).flat()])),
         // Injury replacements reference reserves (roster players outside the lineup); roster membership is the only

package/dist/cjs/src/data/models/tactics.d.ts

@@ -31,7 +31,7 @@ export interface DesignatedSubAttributes extends SetSubConfigAttributes {
 }
 export interface OffensivePreferenceAttributes {
     rotation: number;
-    weights: Record<PlayerId, number>;
+    priorities: Record<PlayerId, 'HIGH' | 'MID' | 'LOW' | 'NONE'>;
     tempos?: Record<PlayerId, 'FAST' | 'HIGH'>;
 }
 export interface BlockingPreferenceAttributes {
@@ -74,10 +74,10 @@ export interface TacticsAttributes {
     libero_replacement_sets?: PlayerId[][];
     rotation_system: RotationSystemEnum;
     designated_setters: PlayerId[];
+    emergency_setter_order: PlayerId[];
     offensive_preferences: OffensivePreferenceAttributes[];
     system_sets?: SystemSetAttributes[];
     offensive_preference_sets?: OffensivePreferenceAttributes[][];
-    serve_attack_shares: Record<PlayerId, number>;
     replace_knocked_immediately?: Record<PlayerId, boolean>;
     injury_replacements?: InjuryReplacementAttributes[];
     libero_injury?: LiberoInjuryAttributes;
@@ -87,7 +87,7 @@ export interface TacticsAttributes {
 }
 export type TacticsPk = 'team_id';
 export type TacticsId = TacticsModel[TacticsPk];
-export type TacticsOptionalAttributes = 'lineup' | 'libero_replacements' | 'receive_rotation_offset' | 'designated_subs' | 'substitution_band' | 'second_libero' | 'libero_sub' | 'libero_replacement_sets' | 'rotation_system' | 'designated_setters' | 'offensive_preferences' | 'system_sets' | 'offensive_preference_sets' | 'serve_attack_shares' | 'replace_knocked_immediately' | 'injury_replacements' | 'libero_injury' | 'blocking_preferences' | 'blocking_preference_sets' | 'base_positions';
+export type TacticsOptionalAttributes = 'lineup' | 'libero_replacements' | 'receive_rotation_offset' | 'designated_subs' | 'substitution_band' | 'second_libero' | 'libero_sub' | 'libero_replacement_sets' | 'rotation_system' | 'designated_setters' | 'emergency_setter_order' | 'offensive_preferences' | 'system_sets' | 'offensive_preference_sets' | 'replace_knocked_immediately' | 'injury_replacements' | 'libero_injury' | 'blocking_preferences' | 'blocking_preference_sets' | 'base_positions';
 export type TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
@@ -101,10 +101,10 @@ export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreati
     libero_replacement_sets?: PlayerId[][];
     rotation_system: RotationSystemEnum;
     designated_setters: PlayerId[];
+    emergency_setter_order: PlayerId[];
     offensive_preferences: OffensivePreferenceAttributes[];
     system_sets?: SystemSetAttributes[];
     offensive_preference_sets?: OffensivePreferenceAttributes[][];
-    serve_attack_shares: Record<PlayerId, number>;
     replace_knocked_immediately?: Record<PlayerId, boolean>;
     injury_replacements?: InjuryReplacementAttributes[];
     libero_injury?: LiberoInjuryAttributes;

package/dist/cjs/src/data/models/tactics.js

@@ -62,6 +62,11 @@ class TacticsModel extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: []
             },
+            emergency_setter_order: {
+                type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.UUID),
+                allowNull: false,
+                defaultValue: []
+            },
             offensive_preferences: {
                 type: sequelize_1.DataTypes.JSONB,
                 allowNull: false,
@@ -75,11 +80,6 @@ class TacticsModel extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.JSONB,
                 allowNull: true
             },
-            serve_attack_shares: {
-                type: sequelize_1.DataTypes.JSONB,
-                allowNull: false,
-                defaultValue: {}
-            },
             replace_knocked_immediately: {
                 type: sequelize_1.DataTypes.JSONB,
                 allowNull: true

package/dist/cjs/src/data/transformers/tactics.js

@@ -71,9 +71,10 @@ function transformToAttributes(tactics, teamId) {
         })),
         rotation_system: tactics.rotationSystem,
         designated_setters: tactics.designatedSetters.map((s) => s.id),
+        emergency_setter_order: tactics.emergencySetterOrder.map((p) => p.id),
         offensive_preferences: tactics.offensivePreferences.map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         })),
         system_sets: tactics.systemSets?.map(s => ({
@@ -82,10 +83,9 @@ function transformToAttributes(tactics, teamId) {
         })),
         offensive_preference_sets: tactics.offensivePreferenceSets?.map(prefs => prefs.map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         }))),
-        serve_attack_shares: tactics.serveAttackShares ?? {},
         base_positions: tactics.basePositions,
         blocking_preferences: tactics.blockingPreferences.map(p => ({ rotation: p.rotation, commit: p.commit, noBlock: p.noBlock })),
         blocking_preference_sets: tactics.blockingPreferenceSets?.map(prefs => prefs.map(p => ({ rotation: p.rotation, commit: p.commit, noBlock: p.noBlock }))),
@@ -179,9 +179,30 @@ function transformToObject(model, roster) {
         })),
         rotationSystem: model.rotation_system,
         designatedSetters: (model.designated_setters ?? []).map((id) => findPlayer(id, roster)),
+        // LENIENT (roster.find): the coach-ranked emergency-setter chain. Keep only ids still on the roster, inside the
+        // squad pool (starters + starting libero + L2 + bench), and NOT a current designated setter (setters are pinned
+        // ahead of this list, never stored inside it), first-occurrence-wins on duplicates. So stale jsonb (a departed
+        // player, a promoted setter, a non-pool id) can never fail schema validation and crash a team load; the next
+        // tactics save rewrites it cleanly.
+        emergencySetterOrder: (() => {
+            const poolIds = new Set([...inLineupIds, ...(secondLibero != null ? [secondLibero.id] : [])]);
+            const setterIds = new Set(model.designated_setters ?? []);
+            const seen = new Set();
+            const healed = [];
+            for (const id of model.emergency_setter_order ?? []) {
+                if (setterIds.has(id) || seen.has(id) || !poolIds.has(id))
+                    continue;
+                const p = roster.find((x) => x.id === id);
+                if (p == null)
+                    continue;
+                seen.add(id);
+                healed.push(p);
+            }
+            return healed;
+        })(),
         offensivePreferences: (model.offensive_preferences ?? []).map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         })),
         systemSets: model.system_sets?.map(s => ({
@@ -190,24 +211,9 @@ function transformToObject(model, roster) {
         })),
         offensivePreferenceSets: model.offensive_preference_sets?.map(prefs => prefs.map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         }))),
-        // LENIENT: keep only serve shares keyed by a current libero-replacement (flat or per-set) with a value in the
-        // 0-100 band, so a stale key (a released player, or a libero-replacement config change) can never fail schema
-        // validation and crash a team load; a dropped key = no serve share.
-        serveAttackShares: (() => {
-            const liberoReplacementIds = new Set([
-                ...model.libero_replacements,
-                ...(model.libero_replacement_sets ?? []).flat()
-            ]);
-            const healed = {};
-            for (const [id, value] of Object.entries(model.serve_attack_shares ?? {})) {
-                if (liberoReplacementIds.has(id) && typeof value === 'number' && value >= 0 && value <= 100)
-                    healed[id] = value;
-            }
-            return healed;
-        })(),
         basePositions: model.base_positions ?? undefined,
         blockingPreferences: (model.blocking_preferences ?? []).map(p => ({ rotation: p.rotation, commit: p.commit, noBlock: p.noBlock })),
         blockingPreferenceSets: model.blocking_preference_sets?.map(prefs => prefs.map(p => ({ rotation: p.rotation, commit: p.commit, noBlock: p.noBlock }))),
@@ -351,24 +357,25 @@ function tacticsColumnsToApiDto(model) {
         }),
         rotationSystem: model.rotation_system,
         designatedSetters: model.designated_setters,
+        // Same stale-data policy: drop any emergency-setter id the service load would drop (a current designated
+        // setter, or one outside the squad pool) so the UI never reloads and re-emits a rejected entry. Roster
+        // membership can't be checked here (ids only); the service heal covers that.
+        emergencySetterOrder: (() => {
+            const poolIds = new Set([...lineupIds, ...(validSecondLibero != null ? [validSecondLibero] : [])]);
+            const setterIds = new Set(model.designated_setters ?? []);
+            const seen = new Set();
+            const healed = [];
+            for (const id of model.emergency_setter_order ?? []) {
+                if (setterIds.has(id) || seen.has(id) || !poolIds.has(id))
+                    continue;
+                seen.add(id);
+                healed.push(id);
+            }
+            return healed;
+        })(),
         offensivePreferences: model.offensive_preferences,
         systemSets: model.system_sets,
         offensivePreferenceSets: model.offensive_preference_sets,
-        // Same stale-data policy as the heals below: only serve shares keyed by a current libero-replacement (flat or
-        // per-set) with a value in the 0-100 band survive; an empty map surfaces as absent so the UI never reloads and
-        // re-emits a stale key.
-        serveAttackShares: (() => {
-            const liberoReplacementIds = new Set([
-                ...model.libero_replacements,
-                ...(model.libero_replacement_sets ?? []).flat()
-            ]);
-            const healed = {};
-            for (const [id, value] of Object.entries(model.serve_attack_shares ?? {})) {
-                if (liberoReplacementIds.has(id) && typeof value === 'number' && value >= 0 && value <= 100)
-                    healed[id] = value;
-            }
-            return Object.keys(healed).length > 0 ? healed : undefined;
-        })(),
         basePositions: model.base_positions ?? undefined,
         blockingPreferences: model.blocking_preferences,
         blockingPreferenceSets: model.blocking_preference_sets,
@@ -474,10 +481,10 @@ function apiTacticsConfigToAttributes(config, teamId) {
         libero_replacement_sets: config.liberoReplacementSets,
         rotation_system: config.rotationSystem,
         designated_setters: config.designatedSetters,
+        emergency_setter_order: config.emergencySetterOrder ?? [],
         offensive_preferences: config.offensivePreferences,
         system_sets: config.systemSets,
         offensive_preference_sets: config.offensivePreferenceSets,
-        serve_attack_shares: config.serveAttackShares ?? {},
         base_positions: config.basePositions,
         blocking_preferences: config.blockingPreferences ?? [],
         blocking_preference_sets: config.blockingPreferenceSets,

package/dist/cjs/src/data/transformers/tactics.test.js

@@ -26,7 +26,7 @@ function makeTactics(designatedSubs) {
         libero_replacement_sets: undefined,
         rotation_system: '5-1',
         designated_setters: ['lf'],
-        offensive_preferences: [{ rotation: 1, weights: { lf: 60, rf: 40 } }],
+        offensive_preferences: [{ rotation: 1, priorities: { lf: 'HIGH', rf: 'MID' } }],
         blocking_preferences: []
     };
 }
@@ -38,7 +38,7 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(dto.rotationSystem).toBe('5-1');
         (0, globals_1.expect)(dto.liberoReplacements).toEqual(['lf']);
         (0, globals_1.expect)(dto.lineup.bench).toEqual(['b1', 'b2']);
-        (0, globals_1.expect)(dto.offensivePreferences).toEqual([{ rotation: 1, weights: { lf: 60, rf: 40 } }]);
+        (0, globals_1.expect)(dto.offensivePreferences).toEqual([{ rotation: 1, priorities: { lf: 'HIGH', rf: 'MID' } }]);
     });
     (0, globals_1.it)('converts a legacy isPinchServer entry to a unified pinch server (conditions kept, no mode)', () => {
         const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([
@@ -133,32 +133,16 @@ function makeTactics(designatedSubs) {
     (0, globals_1.it)('passes per-set tactics columns through to the API DTO shape', () => {
         const model = makeTactics([]);
         model.system_sets = [{ rotationSystem: service_1.RotationSystemEnum.FIVE_ONE, designatedSetters: ['lf'] }];
-        model.offensive_preference_sets = [[{ rotation: 1, weights: { rf: 55, mf: 45 } }]];
+        model.offensive_preference_sets = [[{ rotation: 1, priorities: { rf: 'HIGH', mf: 'MID' } }]];
         const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
         (0, globals_1.expect)(dto.systemSets).toEqual([{ rotationSystem: '5-1', designatedSetters: ['lf'] }]);
-        (0, globals_1.expect)(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, weights: { rf: 55, mf: 45 } }]]);
+        (0, globals_1.expect)(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, priorities: { rf: 'HIGH', mf: 'MID' } }]]);
     });
     (0, globals_1.it)('leaves the per-set DTO fields undefined when the columns are absent', () => {
         const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([]));
         (0, globals_1.expect)(dto.systemSets).toBeUndefined();
         (0, globals_1.expect)(dto.offensivePreferenceSets).toBeUndefined();
     });
-    (0, globals_1.it)('surfaces serve attack shares keyed by a libero replacement', () => {
-        const model = makeTactics([]);
-        model.serve_attack_shares = { lf: 30 }; // lf is the configured libero_replacement
-        const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
-        (0, globals_1.expect)(dto.serveAttackShares).toEqual({ lf: 30 });
-    });
-    (0, globals_1.it)('drops a serve attack share keyed by a non-libero-replacement (stale heal)', () => {
-        const model = makeTactics([]);
-        model.serve_attack_shares = { lf: 30, rf: 40 }; // rf is not in libero_replacements (['lf'])
-        const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
-        (0, globals_1.expect)(dto.serveAttackShares).toEqual({ lf: 30 });
-    });
-    (0, globals_1.it)('leaves serveAttackShares undefined when the column is empty', () => {
-        const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([]));
-        (0, globals_1.expect)(dto.serveAttackShares).toBeUndefined();
-    });
 });
 (0, globals_1.describe)('per-set tactics — service <-> row round-trip', () => {
     const country = (0, test_helpers_1.makeCountry)();
@@ -176,7 +160,7 @@ function makeTactics(designatedSubs) {
             { rotationSystem: service_1.RotationSystemEnum.FIVE_ONE, designatedSetters: [p1] },
             { rotationSystem: service_1.RotationSystemEnum.SIX_ZERO, designatedSetters: [] }
         ],
-        offensivePreferenceSets: [[{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }]]
+        offensivePreferenceSets: [[{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' } }]]
     });
     (0, globals_1.it)('transformFromTactics writes the per-set overrides as id-based jsonb columns', () => {
         const attrs = (0, tactics_1.transformFromTactics)(tactics, 'team-1');
@@ -184,7 +168,7 @@ function makeTactics(designatedSubs) {
             { rotationSystem: '5-1', designatedSetters: [p1.id] },
             { rotationSystem: '6-0', designatedSetters: [] }
         ]);
-        (0, globals_1.expect)(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }]]);
+        (0, globals_1.expect)(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' } }]]);
     });
     (0, globals_1.it)('transformToTactics resolves the stored ids back to roster players', () => {
         const attrs = (0, tactics_1.transformFromTactics)(tactics, 'team-1');
@@ -192,7 +176,7 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(back.systemSets?.[0].rotationSystem).toBe(service_1.RotationSystemEnum.FIVE_ONE);
         (0, globals_1.expect)(back.systemSets?.[0].designatedSetters[0].id).toBe(p1.id);
         (0, globals_1.expect)(back.systemSets?.[1].designatedSetters).toEqual([]);
-        (0, globals_1.expect)(back.offensivePreferenceSets?.[0][0].weights).toEqual({ [p2.id]: 60, [p3.id]: 40 });
+        (0, globals_1.expect)(back.offensivePreferenceSets?.[0][0].priorities).toEqual({ [p2.id]: 'HIGH', [p3.id]: 'MID' });
     });
     (0, globals_1.it)('omits the per-set columns entirely for an all-sets config', () => {
         const flat = service_1.Tactics.create({
@@ -206,27 +190,6 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(back.systemSets).toBeUndefined();
         (0, globals_1.expect)(back.offensivePreferenceSets).toBeUndefined();
     });
-    (0, globals_1.it)('round-trips serve attack shares keyed by a libero replacement', () => {
-        const withServe = service_1.Tactics.create({
-            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
-            liberoReplacements: [p5],
-            serveAttackShares: { [p5.id]: 35 }
-        });
-        const attrs = (0, tactics_1.transformFromTactics)(withServe, 'team-1');
-        (0, globals_1.expect)(attrs.serve_attack_shares).toEqual({ [p5.id]: 35 });
-        const back = (0, tactics_1.transformToTactics)(attrs, roster);
-        (0, globals_1.expect)(back.serveAttackShares).toEqual({ [p5.id]: 35 });
-    });
-    (0, globals_1.it)('drops a stale serve attack share key on load (lenient heal, no crash)', () => {
-        const attrs = (0, tactics_1.transformFromTactics)(service_1.Tactics.create({
-            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
-            liberoReplacements: [p5],
-            serveAttackShares: { [p5.id]: 35 }
-        }), 'team-1');
-        attrs.libero_replacements = [];
-        const back = (0, tactics_1.transformToTactics)(attrs, roster);
-        (0, globals_1.expect)(back.serveAttackShares).toEqual({});
-    });
     (0, globals_1.it)('round-trips base positions (coords + reception participation)', () => {
         const config = {
             coords: { RECEIVE: { 1: { 5: { d: 5.5, r: -3 }, 6: { d: 6.5, r: 0 } } }, DEFENCE: { 3: { 2: { d: 0.9, r: 3 } } } },
@@ -255,11 +218,11 @@ function makeTactics(designatedSubs) {
         const withTempos = service_1.Tactics.create({
             lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
             liberoReplacements: [],
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
         });
         const attrs = (0, tactics_1.transformFromTactics)(withTempos, 'team-1');
         (0, globals_1.expect)(attrs.offensive_preferences).toEqual([
-            { rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }
+            { rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }
         ]);
         const back = (0, tactics_1.transformToTactics)(attrs, roster);
         (0, globals_1.expect)(back.offensivePreferences[0].tempos).toEqual({ [p2.id]: 'FAST', [p3.id]: 'HIGH' });
@@ -298,6 +261,31 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(back.blockingPreferences[0].noBlock).toEqual({ DEF_L: [], DEF_M: [p4.id], DEF_R: [] });
         (0, globals_1.expect)(back.blockingPreferenceSets?.[0][0].noBlock).toEqual({ DEF_L: [p2.id], DEF_M: [], DEF_R: [] });
     });
+    (0, globals_1.it)('round-trips the emergency setter order (non-setter pool members)', () => {
+        const withOrder = service_1.Tactics.create({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: [],
+            emergencySetterOrder: [p2, p3]
+        });
+        const attrs = (0, tactics_1.transformFromTactics)(withOrder, 'team-1');
+        (0, globals_1.expect)(attrs.emergency_setter_order).toEqual([p2.id, p3.id]);
+        const back = (0, tactics_1.transformToTactics)(attrs, roster);
+        (0, globals_1.expect)(back.emergencySetterOrder.map(p => p.id)).toEqual([p2.id, p3.id]);
+    });
+    // The read path must never crash a team load on a stale order. Ids that are gone from the roster, outside the
+    // squad pool, or now a designated setter (setters are pinned, never stored) are silently dropped, order preserved.
+    (0, globals_1.it)('drops emergency-order ids that are gone or a designated setter on read (lenient)', () => {
+        const attrs = (0, tactics_1.transformFromTactics)(service_1.Tactics.create({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: [],
+            rotationSystem: service_1.RotationSystemEnum.FIVE_ONE,
+            designatedSetters: [p1],
+            emergencySetterOrder: [p2]
+        }), 'team-1');
+        attrs.emergency_setter_order = [p1.id, 'gone', p2.id];
+        const back = (0, tactics_1.transformToTactics)(attrs, roster);
+        (0, globals_1.expect)(back.emergencySetterOrder.map(p => p.id)).toEqual([p2.id]);
+    });
 });
 (0, globals_1.describe)('libero injuries — service <-> row round-trip + lenient heal', () => {
     const country = (0, test_helpers_1.makeCountry)();

package/dist/cjs/src/service/team/attack-priority.d.ts

@@ -0,0 +1,3 @@
+export type AttackPriority = 'HIGH' | 'MID' | 'LOW' | 'NONE';
+export declare const ATTACK_PRIORITIES: readonly AttackPriority[];
+export declare const PRIORITY_WEIGHT: Record<AttackPriority, number>;

package/dist/cjs/src/service/team/attack-priority.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PRIORITY_WEIGHT = exports.ATTACK_PRIORITIES = void 0;
+exports.ATTACK_PRIORITIES = ['HIGH', 'MID', 'LOW', 'NONE'];
+// The relative pull of each priority. Tunable in one place; the engine reads these to weight the setter's target.
+exports.PRIORITY_WEIGHT = {
+    HIGH: 20,
+    MID: 10,
+    LOW: 5,
+    NONE: 0
+};

package/dist/cjs/src/service/team/base-config.d.ts

@@ -7,6 +7,7 @@ export interface BaseCoord {
 export interface BaseConfig {
     readonly coords: Record<string, Record<string, Record<string, BaseCoord>>>;
     readonly receive: Record<string, Record<string, boolean>>;
+    readonly receiveByPlayer?: Record<string, Record<string, boolean>>;
     readonly blocking?: Record<string, Record<string, Record<string, boolean>>>;
     readonly attackContact?: Record<string, Record<string, BaseCoord>>;
 }

package/dist/cjs/src/service/team/index.d.ts

@@ -3,6 +3,7 @@ export * from './team-generator';
 export * from './formation';
 export * from './tactics';
 export * from './base-config';
+export * from './attack-priority';
 export * from './default-base-config';
 export * from './receive-overlap';
 export * from './team-name';

package/dist/cjs/src/service/team/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./team-generator"), exports);
 __exportStar(require("./formation"), exports);
 __exportStar(require("./tactics"), exports);
 __exportStar(require("./base-config"), exports);
+__exportStar(require("./attack-priority"), exports);
 __exportStar(require("./default-base-config"), exports);
 __exportStar(require("./receive-overlap"), exports);
 __exportStar(require("./team-name"), exports);

package/dist/cjs/src/service/team/offensive-preference.d.ts

@@ -1,6 +1,7 @@
+import { AttackPriority } from './attack-priority';
 export type TempoPreference = 'FAST' | 'HIGH';
 export interface OffensivePreference {
     readonly rotation: number;
-    readonly weights: Record<string, number>;
+    readonly priorities: Record<string, AttackPriority>;
     readonly tempos?: Record<string, TempoPreference>;
 }

package/dist/cjs/src/service/team/schemas/tactics.z.d.ts

@@ -259,25 +259,35 @@ export declare const TacticsInputSchema: z.ZodObject<{
     liberoReplacementSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodCustom<Player, Player>>>>;
     rotationSystem: z.ZodDefault<z.ZodEnum<typeof RotationSystemEnum>>;
     designatedSetters: z.ZodDefault<z.ZodArray<z.ZodCustom<Player, Player>>>;
+    emergencySetterOrder: z.ZodDefault<z.ZodArray<z.ZodCustom<Player, Player>>>;
     offensivePreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
         rotation: z.ZodNumber;
-        weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
+        priorities: z.ZodRecord<z.ZodString, z.ZodEnum<{
+            HIGH: "HIGH";
+            MID: "MID";
+            LOW: "LOW";
+            NONE: "NONE";
+        }>>;
         tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
-            FAST: "FAST";
             HIGH: "HIGH";
+            FAST: "FAST";
         }>>>;
     }, z.core.$strip>>>;
-    serveAttackShares: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodNumber>>;
     systemSets: z.ZodOptional<z.ZodArray<z.ZodObject<{
         rotationSystem: z.ZodEnum<typeof RotationSystemEnum>;
         designatedSetters: z.ZodArray<z.ZodCustom<Player, Player>>;
     }, z.core.$strip>>>;
     offensivePreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
         rotation: z.ZodNumber;
-        weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
+        priorities: z.ZodRecord<z.ZodString, z.ZodEnum<{
+            HIGH: "HIGH";
+            MID: "MID";
+            LOW: "LOW";
+            NONE: "NONE";
+        }>>;
         tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
-            FAST: "FAST";
             HIGH: "HIGH";
+            FAST: "FAST";
         }>>>;
     }, z.core.$strip>>>>;
     blockingPreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -304,6 +314,7 @@ export declare const TacticsInputSchema: z.ZodObject<{
             r: z.ZodNumber;
         }, z.core.$strip>>>>;
         receive: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>;
+        receiveByPlayer: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>>;
         blocking: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodBoolean>>>>;
         attackContact: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodObject<{
             d: z.ZodNumber;