volleyballsimtypes 0.0.515 → 0.0.516

package/dist/cjs/src/service/team/schemas/tactics.z.test.js

@@ -96,7 +96,7 @@ const test_helpers_1 = require("../../test-helpers");
                 { rotationSystem: '4-2', designatedSetters: [p1, p4] }
             ],
             offensivePreferenceSets: [
-                [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }],
+                [{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' } }],
                 []
             ]
         }));
@@ -105,7 +105,7 @@ const test_helpers_1 = require("../../test-helpers");
     (0, globals_1.it)('carries the per-set fields through Tactics.create parsing', () => {
         const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
             systemSets: [{ rotationSystem: '5-1', designatedSetters: [p1] }],
-            offensivePreferenceSets: [[{ rotation: 2, weights: { [p3.id]: 100 } }]]
+            offensivePreferenceSets: [[{ rotation: 2, priorities: { [p3.id]: 'HIGH' } }]]
         }));
         (0, globals_1.expect)(res.success).toBe(true);
         if (res.success) {
@@ -154,7 +154,7 @@ const test_helpers_1 = require("../../test-helpers");
     });
     (0, globals_1.it)('rejects a per-set preferences list with a duplicate rotation', () => {
         const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
-            offensivePreferenceSets: [[{ rotation: 1, weights: { [p2.id]: 100 } }, { rotation: 1, weights: { [p3.id]: 100 } }]]
+            offensivePreferenceSets: [[{ rotation: 1, priorities: { [p2.id]: 'HIGH' } }, { rotation: 1, priorities: { [p3.id]: 'HIGH' } }]]
         }));
         (0, globals_1.expect)(res.success).toBe(false);
         if (!res.success) {
@@ -164,25 +164,38 @@ const test_helpers_1 = require("../../test-helpers");
     });
     (0, globals_1.it)('rejects a per-set preferences map that keys a non-starter', () => {
         const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
-            offensivePreferenceSets: [[{ rotation: 1, weights: { [reserve.id]: 100 } }]]
+            offensivePreferenceSets: [[{ rotation: 1, priorities: { [reserve.id]: 'HIGH' } }]]
         }));
         (0, globals_1.expect)(res.success).toBe(false);
         if (!res.success) {
             (0, globals_1.expect)(res.error.issues.some(i => i.message === 'OFFENSIVE_PREFERENCE_ATTACKER_NOT_A_STARTER')).toBe(true);
         }
     });
-    (0, globals_1.it)('rejects offensive preference weights that do not sum to 100', () => {
+    (0, globals_1.it)('accepts offensive priorities with no sum constraint', () => {
         const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 50, [p3.id]: 40 } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'LOW' } }]
+        }));
+        (0, globals_1.expect)(res.success).toBe(true);
+    });
+    (0, globals_1.it)('rejects an invalid attack priority value', () => {
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'MEGA' } }]
         }));
         (0, globals_1.expect)(res.success).toBe(false);
-        if (!res.success) {
-            (0, globals_1.expect)(res.error.issues.some(i => i.message === 'OFFENSIVE_PREFERENCE_WEIGHTS_MUST_SUM_TO_100')).toBe(true);
-        }
+    });
+    (0, globals_1.it)('accepts a priority / tempo / no-block keyed by a designated substitute', () => {
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [reserve] },
+            designatedSubs: [{ starter: p2, bench: reserve }],
+            offensivePreferences: [{ rotation: 1, priorities: { [reserve.id]: 'HIGH' }, tempos: { [reserve.id]: 'FAST' } }],
+            blockingPreferences: [{ rotation: 1, commit: {}, noBlock: { DEF_L: [reserve.id], DEF_M: [], DEF_R: [] } }],
+            basePositions: { coords: {}, receive: {}, receiveByPlayer: { 1: { [reserve.id]: false } } }
+        }));
+        (0, globals_1.expect)(res.success).toBe(true);
     });
     (0, globals_1.it)('accepts offensive preferences with a starter-keyed tempos map', () => {
         const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
-            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' } }]
         }));
         (0, globals_1.expect)(res.success).toBe(true);
         if (res.success) {
@@ -191,7 +204,7 @@ const test_helpers_1 = require("../../test-helpers");
     });
     (0, globals_1.it)('rejects a tempos map keyed by a non-starter', () => {
         const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 100 }, tempos: { [reserve.id]: 'FAST' } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH' }, tempos: { [reserve.id]: 'FAST' } }]
         }));
         (0, globals_1.expect)(res.success).toBe(false);
         if (!res.success) {
@@ -200,7 +213,7 @@ const test_helpers_1 = require("../../test-helpers");
     });
     (0, globals_1.it)('rejects an invalid tempo value', () => {
         const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 100 }, tempos: { [p2.id]: 'SLOW' } }]
+            offensivePreferences: [{ rotation: 1, priorities: { [p2.id]: 'HIGH' }, tempos: { [p2.id]: 'SLOW' } }]
         }));
         (0, globals_1.expect)(res.success).toBe(false);
     });
@@ -325,83 +338,3 @@ const test_helpers_1 = require("../../test-helpers");
         (0, globals_1.expect)(res.success).toBe(false);
     });
 });
-(0, globals_1.describe)('TacticsInputSchema — serve attack shares', () => {
-    const country = (0, test_helpers_1.makeCountry)();
-    const p1 = (0, test_helpers_1.makePlayer)(country);
-    const p2 = (0, test_helpers_1.makePlayer)(country);
-    const p3 = (0, test_helpers_1.makePlayer)(country);
-    const p4 = (0, test_helpers_1.makePlayer)(country);
-    const p5 = (0, test_helpers_1.makePlayer)(country);
-    const p6 = (0, test_helpers_1.makePlayer)(country);
-    const reserve = (0, test_helpers_1.makePlayer)(country);
-    // p5 sits at zone 5 (back row) and is the configured libero replacement, so it may carry a serve share.
-    function baseInput(overrides = {}) {
-        return {
-            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
-            liberoReplacements: [p5],
-            ...overrides
-        };
-    }
-    (0, globals_1.it)('accepts a serve share keyed by a libero replacement, value in band', () => {
-        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: 30 } }));
-        (0, globals_1.expect)(res.success).toBe(true);
-        if (res.success)
-            (0, globals_1.expect)(res.data.serveAttackShares[p5.id]).toBe(30);
-    });
-    (0, globals_1.it)('accepts 0 and 100 at the band edges', () => {
-        (0, globals_1.expect)(tactics_z_1.TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: 0 } })).success).toBe(true);
-        (0, globals_1.expect)(tactics_z_1.TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: 100 } })).success).toBe(true);
-    });
-    (0, globals_1.it)('rejects a serve share keyed by a starter who is not a libero replacement', () => {
-        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p2.id]: 30 } }));
-        (0, globals_1.expect)(res.success).toBe(false);
-        if (!res.success) {
-            (0, globals_1.expect)(res.error.issues.some(i => i.message === 'SERVE_ATTACK_SHARE_NOT_A_LIBERO_REPLACEMENT')).toBe(true);
-        }
-    });
-    (0, globals_1.it)('rejects a serve share keyed by a reserve', () => {
-        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [reserve.id]: 30 } }));
-        (0, globals_1.expect)(res.success).toBe(false);
-        if (!res.success) {
-            (0, globals_1.expect)(res.error.issues.some(i => i.message === 'SERVE_ATTACK_SHARE_NOT_A_LIBERO_REPLACEMENT')).toBe(true);
-        }
-    });
-    (0, globals_1.it)('rejects an out-of-band serve share (over 100)', () => {
-        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: 101 } }));
-        (0, globals_1.expect)(res.success).toBe(false);
-        if (!res.success) {
-            (0, globals_1.expect)(res.error.issues.some(i => i.message === 'SERVE_ATTACK_SHARE_OUT_OF_BAND')).toBe(true);
-        }
-    });
-    (0, globals_1.it)('rejects a negative serve share', () => {
-        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({ serveAttackShares: { [p5.id]: -1 } }));
-        (0, globals_1.expect)(res.success).toBe(false);
-        if (!res.success) {
-            (0, globals_1.expect)(res.error.issues.some(i => i.message === 'SERVE_ATTACK_SHARE_OUT_OF_BAND')).toBe(true);
-        }
-    });
-    (0, globals_1.it)('validates independently of the offensive-preference sum-to-100 (never enters that total)', () => {
-        // The other attackers' weights sum to exactly 100; the serve share on the libero replacement is separate
-        // and must not push the rotation over 100 or otherwise fail.
-        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 50, [p3.id]: 50 } }],
-            serveAttackShares: { [p5.id]: 40 }
-        }));
-        (0, globals_1.expect)(res.success).toBe(true);
-    });
-    (0, globals_1.it)('accepts a serve share on a per-set libero replacement', () => {
-        // p6 is a back-row starter made a libero replacement only via liberoReplacementSets.
-        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
-            liberoReplacements: [],
-            liberoReplacementSets: [[p6]],
-            serveAttackShares: { [p6.id]: 25 }
-        }));
-        (0, globals_1.expect)(res.success).toBe(true);
-    });
-    (0, globals_1.it)('defaults serveAttackShares to an empty map when omitted', () => {
-        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput());
-        (0, globals_1.expect)(res.success).toBe(true);
-        if (res.success)
-            (0, globals_1.expect)(res.data.serveAttackShares).toEqual({});
-    });
-});

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

@@ -269,23 +269,32 @@ export declare const TeamInputSchema: z.ZodObject<{
         designatedSetters: 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 import("..").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<{
@@ -312,6 +321,7 @@ export declare const TeamInputSchema: 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;

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

@@ -35,7 +35,6 @@ export interface TacticsOpts {
     readonly rotationSystem: RotationSystemEnum;
     readonly designatedSetters: Player[];
     readonly offensivePreferences: OffensivePreference[];
-    readonly serveAttackShares: Record<string, number>;
     readonly systemSets?: SystemSet[];
     readonly offensivePreferenceSets?: OffensivePreference[][];
     readonly replaceKnockedImmediately: Record<string, boolean>;
@@ -57,7 +56,6 @@ export declare class Tactics {
     readonly rotationSystem: RotationSystemEnum;
     readonly designatedSetters: Player[];
     readonly offensivePreferences: OffensivePreference[];
-    readonly serveAttackShares: Record<string, number>;
     readonly systemSets?: SystemSet[];
     readonly offensivePreferenceSets?: OffensivePreference[][];
     readonly replaceKnockedImmediately: Record<string, boolean>;

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

@@ -18,7 +18,7 @@ class Tactics {
         }
         return new Tactics(result.data);
     }
-    constructor({ lineup, liberoReplacements, receiveRotationOffset = false, designatedSubs = [], substitutionBand = energy_band_1.EnergyBand.TIRED, secondLibero, liberoSub, liberoReplacementSets, rotationSystem = rotation_system_1.RotationSystemEnum.SIX_ZERO, designatedSetters = [], offensivePreferences = [], serveAttackShares = {}, systemSets, offensivePreferenceSets, replaceKnockedImmediately = {}, injuryReplacements = [], liberoInjury, blockingPreferences = [], blockingPreferenceSets, basePositions }) {
+    constructor({ lineup, liberoReplacements, receiveRotationOffset = false, designatedSubs = [], substitutionBand = energy_band_1.EnergyBand.TIRED, secondLibero, liberoSub, liberoReplacementSets, rotationSystem = rotation_system_1.RotationSystemEnum.SIX_ZERO, designatedSetters = [], offensivePreferences = [], systemSets, offensivePreferenceSets, replaceKnockedImmediately = {}, injuryReplacements = [], liberoInjury, blockingPreferences = [], blockingPreferenceSets, basePositions }) {
         this.lineup = lineup;
         this.liberoReplacements = liberoReplacements;
         this.receiveRotationOffset = receiveRotationOffset;
@@ -30,7 +30,6 @@ class Tactics {
         this.rotationSystem = rotationSystem;
         this.designatedSetters = designatedSetters;
         this.offensivePreferences = offensivePreferences;
-        this.serveAttackShares = serveAttackShares;
         this.systemSets = systemSets;
         this.offensivePreferenceSets = offensivePreferenceSets;
         this.replaceKnockedImmediately = replaceKnockedImmediately;

package/dist/esm/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 {
@@ -140,7 +140,6 @@ export interface Tactics {
     offensivePreferences: ApiOffensivePreference[];
     systemSets?: ApiSystemSet[];
     offensivePreferenceSets?: ApiOffensivePreference[][];
-    serveAttackShares?: Record<string, number>;
     basePositions?: BaseConfig;
     blockingPreferences: ApiBlockingPreference[];
     blockingPreferenceSets?: ApiBlockingPreference[][];

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

@@ -23,9 +23,9 @@ export function collectTacticsPlayerIds(config) {
         config.secondLibero,
         ...((config.liberoReplacementSets ?? []).flat()),
         ...(config.designatedSetters ?? []),
-        ...((config.offensivePreferences ?? []).flatMap(p => Object.keys(p.weights))),
+        ...((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/esm/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 {
@@ -77,7 +77,6 @@ export interface TacticsAttributes {
     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 +86,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' | '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;
@@ -104,7 +103,6 @@ export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreati
     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/esm/src/data/models/tactics.js

@@ -72,11 +72,6 @@ export class TacticsModel extends Model {
                 type: DataTypes.JSONB,
                 allowNull: true
             },
-            serve_attack_shares: {
-                type: DataTypes.JSONB,
-                allowNull: false,
-                defaultValue: {}
-            },
             replace_knocked_immediately: {
                 type: DataTypes.JSONB,
                 allowNull: true

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

@@ -67,7 +67,7 @@ function transformToAttributes(tactics, teamId) {
         designated_setters: tactics.designatedSetters.map((s) => s.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 => ({
@@ -76,10 +76,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 }))),
@@ -175,7 +174,7 @@ function transformToObject(model, roster) {
         designatedSetters: (model.designated_setters ?? []).map((id) => findPlayer(id, roster)),
         offensivePreferences: (model.offensive_preferences ?? []).map(p => ({
             rotation: p.rotation,
-            weights: p.weights,
+            priorities: p.priorities,
             tempos: p.tempos
         })),
         systemSets: model.system_sets?.map(s => ({
@@ -184,24 +183,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 }))),
@@ -348,21 +332,6 @@ function tacticsColumnsToApiDto(model) {
         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,
@@ -471,7 +440,6 @@ function apiTacticsConfigToAttributes(config, teamId) {
         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/esm/src/data/transformers/tactics.test.js

@@ -24,7 +24,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: []
     };
 }
@@ -36,7 +36,7 @@ describe('tacticsColumnsToApiDto()', () => {
         expect(dto.rotationSystem).toBe('5-1');
         expect(dto.liberoReplacements).toEqual(['lf']);
         expect(dto.lineup.bench).toEqual(['b1', 'b2']);
-        expect(dto.offensivePreferences).toEqual([{ rotation: 1, weights: { lf: 60, rf: 40 } }]);
+        expect(dto.offensivePreferences).toEqual([{ rotation: 1, priorities: { lf: 'HIGH', rf: 'MID' } }]);
     });
     it('converts a legacy isPinchServer entry to a unified pinch server (conditions kept, no mode)', () => {
         const dto = tacticsColumnsToApiDto(makeTactics([
@@ -131,32 +131,16 @@ describe('tacticsColumnsToApiDto()', () => {
     it('passes per-set tactics columns through to the API DTO shape', () => {
         const model = makeTactics([]);
         model.system_sets = [{ rotationSystem: 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 = tacticsColumnsToApiDto(model);
         expect(dto.systemSets).toEqual([{ rotationSystem: '5-1', designatedSetters: ['lf'] }]);
-        expect(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, weights: { rf: 55, mf: 45 } }]]);
+        expect(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, priorities: { rf: 'HIGH', mf: 'MID' } }]]);
     });
     it('leaves the per-set DTO fields undefined when the columns are absent', () => {
         const dto = tacticsColumnsToApiDto(makeTactics([]));
         expect(dto.systemSets).toBeUndefined();
         expect(dto.offensivePreferenceSets).toBeUndefined();
     });
-    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 = tacticsColumnsToApiDto(model);
-        expect(dto.serveAttackShares).toEqual({ lf: 30 });
-    });
-    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 = tacticsColumnsToApiDto(model);
-        expect(dto.serveAttackShares).toEqual({ lf: 30 });
-    });
-    it('leaves serveAttackShares undefined when the column is empty', () => {
-        const dto = tacticsColumnsToApiDto(makeTactics([]));
-        expect(dto.serveAttackShares).toBeUndefined();
-    });
 });
 describe('per-set tactics — service <-> row round-trip', () => {
     const country = makeCountry();
@@ -174,7 +158,7 @@ describe('per-set tactics — service <-> row round-trip', () => {
             { rotationSystem: RotationSystemEnum.FIVE_ONE, designatedSetters: [p1] },
             { rotationSystem: RotationSystemEnum.SIX_ZERO, designatedSetters: [] }
         ],
-        offensivePreferenceSets: [[{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }]]
+        offensivePreferenceSets: [[{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' } }]]
     });
     it('transformFromTactics writes the per-set overrides as id-based jsonb columns', () => {
         const attrs = transformFromTactics(tactics, 'team-1');
@@ -182,7 +166,7 @@ describe('per-set tactics — service <-> row round-trip', () => {
             { rotationSystem: '5-1', designatedSetters: [p1.id] },
             { rotationSystem: '6-0', designatedSetters: [] }
         ]);
-        expect(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }]]);
+        expect(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, priorities: { [p2.id]: 'HIGH', [p3.id]: 'MID' } }]]);
     });
     it('transformToTactics resolves the stored ids back to roster players', () => {
         const attrs = transformFromTactics(tactics, 'team-1');
@@ -190,7 +174,7 @@ describe('per-set tactics — service <-> row round-trip', () => {
         expect(back.systemSets?.[0].rotationSystem).toBe(RotationSystemEnum.FIVE_ONE);
         expect(back.systemSets?.[0].designatedSetters[0].id).toBe(p1.id);
         expect(back.systemSets?.[1].designatedSetters).toEqual([]);
-        expect(back.offensivePreferenceSets?.[0][0].weights).toEqual({ [p2.id]: 60, [p3.id]: 40 });
+        expect(back.offensivePreferenceSets?.[0][0].priorities).toEqual({ [p2.id]: 'HIGH', [p3.id]: 'MID' });
     });
     it('omits the per-set columns entirely for an all-sets config', () => {
         const flat = Tactics.create({
@@ -204,27 +188,6 @@ describe('per-set tactics — service <-> row round-trip', () => {
         expect(back.systemSets).toBeUndefined();
         expect(back.offensivePreferenceSets).toBeUndefined();
     });
-    it('round-trips serve attack shares keyed by a libero replacement', () => {
-        const withServe = Tactics.create({
-            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
-            liberoReplacements: [p5],
-            serveAttackShares: { [p5.id]: 35 }
-        });
-        const attrs = transformFromTactics(withServe, 'team-1');
-        expect(attrs.serve_attack_shares).toEqual({ [p5.id]: 35 });
-        const back = transformToTactics(attrs, roster);
-        expect(back.serveAttackShares).toEqual({ [p5.id]: 35 });
-    });
-    it('drops a stale serve attack share key on load (lenient heal, no crash)', () => {
-        const attrs = transformFromTactics(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 = transformToTactics(attrs, roster);
-        expect(back.serveAttackShares).toEqual({});
-    });
     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 } } } },
@@ -253,11 +216,11 @@ describe('per-set tactics — service <-> row round-trip', () => {
         const withTempos = 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 = transformFromTactics(withTempos, 'team-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 = transformToTactics(attrs, roster);
         expect(back.offensivePreferences[0].tempos).toEqual({ [p2.id]: 'FAST', [p3.id]: 'HIGH' });

package/dist/esm/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/esm/src/service/team/attack-priority.js

@@ -0,0 +1,8 @@
+export const 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.
+export const PRIORITY_WEIGHT = {
+    HIGH: 20,
+    MID: 10,
+    LOW: 5,
+    NONE: 0
+};

package/dist/esm/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/esm/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/esm/src/service/team/index.js

@@ -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/esm/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/esm/src/service/team/schemas/tactics.z.d.ts

@@ -261,23 +261,32 @@ export declare const TacticsInputSchema: z.ZodObject<{
     designatedSetters: 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 +313,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;