volleyballsimtypes 0.0.481 → 0.0.482

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 = [], systemSets, offensivePreferenceSets, replaceKnockedImmediately = {}, injuryReplacements = [], liberoInjury }) {
+    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 }) {
         this.lineup = lineup;
         this.liberoReplacements = liberoReplacements;
         this.receiveRotationOffset = receiveRotationOffset;
@@ -35,6 +35,8 @@ class Tactics {
         this.replaceKnockedImmediately = replaceKnockedImmediately;
         this.injuryReplacements = injuryReplacements;
         this.liberoInjury = liberoInjury;
+        this.blockingPreferences = blockingPreferences;
+        this.blockingPreferenceSets = blockingPreferenceSets;
     }
     findPlayerInLineup(id) {
         if (this.lineup.bench.some(p => p.id === id))

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

@@ -1,4 +1,4 @@
-import { BoxScore, DataProps, DeclineStatus, Division as _Division, League as _League, Match as _Match, MatchSet as _MatchSet, Player as _Player, PlayerPosition, Qualifier as _Qualifier, QualifierMatch as _QualifierMatch, Rally as _Rally, RallyEvent as _RallyEvent, PointBreakdown, RallyMetrics, Season as _Season, Standing as _Standing, Team as _Team, Tournament as _Tournament, TournamentMatch as _TournamentMatch, National as _National, NationalMatch as _NationalMatch, Country as _Country, CourtPosition, ConditionLogic, EnergyBand, LiberoSubMode, MatchForfeitType, PerformanceStats, PinchCondition, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../service';
+import { BoxScore, DataProps, DeclineStatus, Division as _Division, League as _League, Match as _Match, MatchSet as _MatchSet, Player as _Player, PlayerPosition, Qualifier as _Qualifier, QualifierMatch as _QualifierMatch, Rally as _Rally, RallyEvent as _RallyEvent, PointBreakdown, RallyMetrics, Season as _Season, Standing as _Standing, Team as _Team, Tournament as _Tournament, TournamentMatch as _TournamentMatch, National as _National, NationalMatch as _NationalMatch, Country as _Country, CourtPosition, ConditionLogic, EnergyBand, LiberoSubMode, MatchForfeitType, PerformanceStats, PinchCondition, RoleEnum, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../service';
 export type Rally = DataProps<_Rally> & {
     homePlayerPosition: PlayerPosition[];
     awayPlayerPosition: PlayerPosition[];
@@ -108,9 +108,13 @@ export interface ApiDesignatedSub {
 }
 export interface ApiOffensivePreference {
     rotation: number;
-    order: string[];
+    weights: Record<string, number>;
     tempos?: Record<string, 'FAST' | 'HIGH'>;
 }
+export interface ApiBlockingPreference {
+    rotation: number;
+    targets: Record<string, RoleEnum>;
+}
 export interface ApiSystemSet {
     rotationSystem: RotationSystemEnum;
     designatedSetters: string[];
@@ -148,6 +152,8 @@ export interface Tactics {
     offensivePreferences: ApiOffensivePreference[];
     systemSets?: ApiSystemSet[];
     offensivePreferenceSets?: ApiOffensivePreference[][];
+    blockingPreferences: ApiBlockingPreference[];
+    blockingPreferenceSets?: ApiBlockingPreference[][];
     replaceKnockedImmediately?: Record<string, boolean>;
     injuryReplacements?: ApiInjuryReplacement[];
     liberoInjury?: ApiLiberoInjury;

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

@@ -1,7 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
 import { PlayerId, TeamId, TeamModel } from '.';
-import { ConditionLogic, CourtPosition, EnergyBand, LiberoSubMode, PinchCondition, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../../service';
+import { ConditionLogic, CourtPosition, EnergyBand, LiberoSubMode, PinchCondition, RoleEnum, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../../service';
 export interface TacticsLineupAttributes {
     [CourtPosition.LIBERO_ZONE]?: PlayerId;
     [CourtPosition.LEFT_BACK]: PlayerId;
@@ -41,9 +41,13 @@ export interface DesignatedSubAttributes {
 }
 export interface OffensivePreferenceAttributes {
     rotation: number;
-    order: PlayerId[];
+    weights: Record<PlayerId, number>;
     tempos?: Record<PlayerId, 'FAST' | 'HIGH'>;
 }
+export interface BlockingPreferenceAttributes {
+    rotation: number;
+    targets: Record<PlayerId, RoleEnum>;
+}
 export interface SystemSetAttributes {
     rotationSystem: RotationSystemEnum;
     designatedSetters: PlayerId[];
@@ -85,10 +89,12 @@ export interface TacticsAttributes {
     replace_knocked_immediately?: Record<PlayerId, boolean>;
     injury_replacements?: InjuryReplacementAttributes[];
     libero_injury?: LiberoInjuryAttributes;
+    blocking_preferences: BlockingPreferenceAttributes[];
+    blocking_preference_sets?: BlockingPreferenceAttributes[][];
 }
 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' | 'replace_knocked_immediately' | 'injury_replacements' | 'libero_injury';
+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';
 export type TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
@@ -108,6 +114,8 @@ export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreati
     replace_knocked_immediately?: Record<PlayerId, boolean>;
     injury_replacements?: InjuryReplacementAttributes[];
     libero_injury?: LiberoInjuryAttributes;
+    blocking_preferences: BlockingPreferenceAttributes[];
+    blocking_preference_sets?: BlockingPreferenceAttributes[][];
     team: TeamModel;
     getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;

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

@@ -83,6 +83,15 @@ export class TacticsModel extends Model {
             libero_injury: {
                 type: DataTypes.JSONB,
                 allowNull: true
+            },
+            blocking_preferences: {
+                type: DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: []
+            },
+            blocking_preference_sets: {
+                type: DataTypes.JSONB,
+                allowNull: true
             }
         }, {
             sequelize,

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

@@ -86,7 +86,7 @@ function transformToAttributes(tactics, teamId) {
         designated_setters: tactics.designatedSetters.map((s) => s.id),
         offensive_preferences: tactics.offensivePreferences.map(p => ({
             rotation: p.rotation,
-            order: p.order.map((a) => a.id),
+            weights: p.weights,
             tempos: p.tempos
         })),
         system_sets: tactics.systemSets?.map(s => ({
@@ -95,9 +95,11 @@ function transformToAttributes(tactics, teamId) {
         })),
         offensive_preference_sets: tactics.offensivePreferenceSets?.map(prefs => prefs.map(p => ({
             rotation: p.rotation,
-            order: p.order.map((a) => a.id),
+            weights: p.weights,
             tempos: p.tempos
         }))),
+        blocking_preferences: tactics.blockingPreferences.map(p => ({ rotation: p.rotation, targets: p.targets })),
+        blocking_preference_sets: tactics.blockingPreferenceSets?.map(prefs => prefs.map(p => ({ rotation: p.rotation, targets: p.targets }))),
         replace_knocked_immediately: tactics.replaceKnockedImmediately,
         injury_replacements: tactics.injuryReplacements.map(ir => ({
             starterId: ir.starter.id,
@@ -186,7 +188,7 @@ function transformToObject(model, roster) {
         designatedSetters: (model.designated_setters ?? []).map((id) => findPlayer(id, roster)),
         offensivePreferences: (model.offensive_preferences ?? []).map(p => ({
             rotation: p.rotation,
-            order: p.order.map((id) => findPlayer(id, roster)),
+            weights: p.weights,
             tempos: p.tempos
         })),
         systemSets: model.system_sets?.map(s => ({
@@ -195,9 +197,11 @@ function transformToObject(model, roster) {
         })),
         offensivePreferenceSets: model.offensive_preference_sets?.map(prefs => prefs.map(p => ({
             rotation: p.rotation,
-            order: p.order.map((id) => findPlayer(id, roster)),
+            weights: p.weights,
             tempos: p.tempos
         }))),
+        blockingPreferences: (model.blocking_preferences ?? []).map(p => ({ rotation: p.rotation, targets: p.targets })),
+        blockingPreferenceSets: model.blocking_preference_sets?.map(prefs => prefs.map(p => ({ rotation: p.rotation, targets: p.targets }))),
         // LENIENT: keep only boolean entries keyed by a court starter or, when a second libero exists, the starting
         // libero (the libero knock toggle is an L2-only feature, owner 2026-07-06) so stale jsonb (an ex-starter's
         // key, a non-boolean value, a libero key left after the L2 was removed) can never fail schema validation
@@ -354,6 +358,8 @@ function tacticsColumnsToApiDto(model) {
         offensivePreferences: model.offensive_preferences,
         systemSets: model.system_sets,
         offensivePreferenceSets: model.offensive_preference_sets,
+        blockingPreferences: model.blocking_preferences,
+        blockingPreferenceSets: model.blocking_preference_sets,
         // Same stale-data policy as the heals below: only boolean entries keyed by a court starter or, when a second
         // libero exists, the starting libero (the libero knock toggle is an L2-only feature, owner 2026-07-06)
         // survive; an empty map surfaces as absent (missing key = ON).
@@ -459,6 +465,8 @@ function apiTacticsConfigToAttributes(config, teamId) {
         offensive_preferences: config.offensivePreferences,
         system_sets: config.systemSets,
         offensive_preference_sets: config.offensivePreferenceSets,
+        blocking_preferences: config.blockingPreferences ?? [],
+        blocking_preference_sets: config.blockingPreferenceSets,
         replace_knocked_immediately: config.replaceKnockedImmediately,
         injury_replacements: config.injuryReplacements,
         libero_injury: config.liberoInjury

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

@@ -1,6 +1,6 @@
 import { describe, it, expect } from '@jest/globals';
 import { tacticsColumnsToApiDto, transformFromTactics, transformToTactics } from './tactics';
-import { CourtPosition, EnergyBand, RotationSystemEnum, Tactics } from '../../service';
+import { CourtPosition, EnergyBand, RoleEnum, RotationSystemEnum, Tactics } from '../../service';
 import { makeCountry, makePlayer } from '../../service/test-helpers';
 // Minimal TacticsModel-shaped object; cast through unknown since the transformer only reads columns.
 function makeTactics(designatedSubs) {
@@ -24,7 +24,8 @@ function makeTactics(designatedSubs) {
         libero_replacement_sets: undefined,
         rotation_system: '5-1',
         designated_setters: ['lf'],
-        offensive_preferences: [{ rotation: 1, order: ['lf', 'rf'] }]
+        offensive_preferences: [{ rotation: 1, weights: { lf: 60, rf: 40 } }],
+        blocking_preferences: []
     };
 }
 describe('tacticsColumnsToApiDto()', () => {
@@ -35,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, order: ['lf', 'rf'] }]);
+        expect(dto.offensivePreferences).toEqual([{ rotation: 1, weights: { lf: 60, rf: 40 } }]);
     });
     it("resolves a legacy isPinchServer entry to mode 'PINCH'", () => {
         const dto = tacticsColumnsToApiDto(makeTactics([
@@ -125,10 +126,10 @@ 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, order: ['rf', 'mf'] }]];
+        model.offensive_preference_sets = [[{ rotation: 1, weights: { rf: 55, mf: 45 } }]];
         const dto = tacticsColumnsToApiDto(model);
         expect(dto.systemSets).toEqual([{ rotationSystem: '5-1', designatedSetters: ['lf'] }]);
-        expect(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, order: ['rf', 'mf'] }]]);
+        expect(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, weights: { rf: 55, mf: 45 } }]]);
     });
     it('leaves the per-set DTO fields undefined when the columns are absent', () => {
         const dto = tacticsColumnsToApiDto(makeTactics([]));
@@ -152,7 +153,7 @@ describe('per-set tactics — service <-> row round-trip', () => {
             { rotationSystem: RotationSystemEnum.FIVE_ONE, designatedSetters: [p1] },
             { rotationSystem: RotationSystemEnum.SIX_ZERO, designatedSetters: [] }
         ],
-        offensivePreferenceSets: [[{ rotation: 1, order: [p2, p3] }]]
+        offensivePreferenceSets: [[{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }]]
     });
     it('transformFromTactics writes the per-set overrides as id-based jsonb columns', () => {
         const attrs = transformFromTactics(tactics, 'team-1');
@@ -160,7 +161,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, order: [p2.id, p3.id] }]]);
+        expect(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }]]);
     });
     it('transformToTactics resolves the stored ids back to roster players', () => {
         const attrs = transformFromTactics(tactics, 'team-1');
@@ -168,7 +169,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].order.map(p => p.id)).toEqual([p2.id, p3.id]);
+        expect(back.offensivePreferenceSets?.[0][0].weights).toEqual({ [p2.id]: 60, [p3.id]: 40 });
     });
     it('omits the per-set columns entirely for an all-sets config', () => {
         const flat = Tactics.create({
@@ -186,15 +187,28 @@ 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, order: [p2, p3], tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
         });
         const attrs = transformFromTactics(withTempos, 'team-1');
         expect(attrs.offensive_preferences).toEqual([
-            { rotation: 1, order: [p2.id, p3.id], tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }
+            { rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }
         ]);
         const back = transformToTactics(attrs, roster);
         expect(back.offensivePreferences[0].tempos).toEqual({ [p2.id]: 'FAST', [p3.id]: 'HIGH' });
     });
+    it('round-trips blocking preferences as id-keyed function maps', () => {
+        const withBlocking = Tactics.create({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: [],
+            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: RoleEnum.OUTSIDE_HITTER, [p3.id]: RoleEnum.MIDDLE_BLOCKER } }]
+        });
+        const attrs = transformFromTactics(withBlocking, 'team-1');
+        expect(attrs.blocking_preferences).toEqual([
+            { rotation: 1, targets: { [p4.id]: RoleEnum.OUTSIDE_HITTER, [p3.id]: RoleEnum.MIDDLE_BLOCKER } }
+        ]);
+        const back = transformToTactics(attrs, roster);
+        expect(back.blockingPreferences[0].targets).toEqual({ [p4.id]: RoleEnum.OUTSIDE_HITTER, [p3.id]: RoleEnum.MIDDLE_BLOCKER });
+    });
 });
 describe('libero injuries — service <-> row round-trip + lenient heal', () => {
     const country = makeCountry();

package/dist/esm/src/service/team/blocking-preference.d.ts

@@ -0,0 +1,5 @@
+import { LineupFunction } from './lineup-function';
+export interface BlockingPreference {
+    readonly rotation: number;
+    readonly targets: Record<string, LineupFunction>;
+}

package/dist/esm/src/service/team/blocking-preference.js

@@ -0,0 +1 @@
+export {};

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

@@ -11,5 +11,6 @@ export * from './rotation-system';
 export * from './lineup-function';
 export * from './base-position';
 export * from './offensive-preference';
+export * from './blocking-preference';
 export * from './injury-replacement';
 export * from './libero-injury';

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

@@ -11,5 +11,6 @@ export * from './rotation-system';
 export * from './lineup-function';
 export * from './base-position';
 export * from './offensive-preference';
+export * from './blocking-preference';
 export * from './injury-replacement';
 export * from './libero-injury';

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

@@ -1,7 +1,6 @@
-import { Player } from '../player';
 export type TempoPreference = 'FAST' | 'HIGH';
 export interface OffensivePreference {
     readonly rotation: number;
-    readonly order: Player[];
+    readonly weights: Record<string, number>;
     readonly tempos?: Record<string, TempoPreference>;
 }

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

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { Player } from '../../player';
+import { Player, RoleEnum } from '../../player';
 import { EnergyBand } from '../energy-band';
 import { RotationSystemEnum } from '../rotation-system';
 export declare const TacticsInputSchema: z.ZodObject<{
@@ -269,7 +269,7 @@ 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;
-        order: z.ZodArray<z.ZodCustom<Player, Player>>;
+        weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
         tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
             FAST: "FAST";
             HIGH: "HIGH";
@@ -281,12 +281,20 @@ export declare const TacticsInputSchema: z.ZodObject<{
     }, z.core.$strip>>>;
     offensivePreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
         rotation: z.ZodNumber;
-        order: z.ZodArray<z.ZodCustom<Player, Player>>;
+        weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
         tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
             FAST: "FAST";
             HIGH: "HIGH";
         }>>>;
     }, z.core.$strip>>>>;
+    blockingPreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
+        rotation: z.ZodNumber;
+        targets: z.ZodRecord<z.ZodString, z.ZodEnum<typeof RoleEnum> & z.ZodType<RoleEnum.SETTER | RoleEnum.OUTSIDE_HITTER | RoleEnum.OPPOSITE_HITTER | RoleEnum.MIDDLE_BLOCKER, RoleEnum, z.core.$ZodTypeInternals<RoleEnum.SETTER | RoleEnum.OUTSIDE_HITTER | RoleEnum.OPPOSITE_HITTER | RoleEnum.MIDDLE_BLOCKER, RoleEnum>>>;
+    }, z.core.$strip>>>;
+    blockingPreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
+        rotation: z.ZodNumber;
+        targets: z.ZodRecord<z.ZodString, z.ZodEnum<typeof RoleEnum> & z.ZodType<RoleEnum.SETTER | RoleEnum.OUTSIDE_HITTER | RoleEnum.OPPOSITE_HITTER | RoleEnum.MIDDLE_BLOCKER, RoleEnum, z.core.$ZodTypeInternals<RoleEnum.SETTER | RoleEnum.OUTSIDE_HITTER | RoleEnum.OPPOSITE_HITTER | RoleEnum.MIDDLE_BLOCKER, RoleEnum>>>;
+    }, z.core.$strip>>>>;
     replaceKnockedImmediately: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
     injuryReplacements: z.ZodDefault<z.ZodArray<z.ZodObject<{
         starter: z.ZodCustom<Player, Player>;

package/dist/esm/src/service/team/schemas/tactics.z.js

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { Player } from '../../player';
+import { Player, RoleEnum } from '../../player';
 import { EnergyBand } from '../energy-band';
 import { RotationSystemEnum, setterCountFor } from '../rotation-system';
 import { DesignatedSubSchema, SubBandSchema } from './designated-sub.z';
@@ -47,14 +47,23 @@ const lineupSchema = z.object({
 });
 // Per-player tempo preference (set-tempo rework): absent key = Auto.
 const tempoPreferenceSchema = z.enum(['FAST', 'HIGH']);
-// One rotation's ranked attacker priority. `rotation` is the main setter's rotational slot (1..6); `order` lists
-// the attackers ranked best-first. `tempos` optionally forces a per-starter tempo (Auto when absent). Cross-field
-// checks (starters only in both order and tempos, no dupes) live in the superRefine below.
+// One rotation's attacker weighting. `rotation` is the main setter's rotational slot (1..6); `weights` maps each
+// attacker's starter id to an integer percentage share (values sum to 100; 0 removes an attacker). `tempos`
+// optionally forces a per-starter tempo (Auto when absent). Cross-field checks (keys are starters, weights sum to
+// 100) live in the superRefine below.
 const offensivePreferenceSchema = z.object({
     rotation: z.number().int().min(1).max(6),
-    order: z.array(playerInstanceSchema),
+    weights: z.record(z.string(), z.number().int().min(0)),
     tempos: z.record(z.string(), tempoPreferenceSchema).optional()
 });
+// The opposing attacking functions a dedicated blocker can commit to: every RoleEnum except the libero.
+const blockingFunctionSchema = z.nativeEnum(RoleEnum).refine((v) => v !== RoleEnum.LIBERO, { message: 'BLOCKING_TARGET_CANNOT_BE_LIBERO' });
+// One rotation's dedicated-blocking assignments: `targets` maps my front-row starter ids to the opposing function
+// each commits to block. Cross-field checks (keys are starters) live in the superRefine below.
+const blockingPreferenceSchema = z.object({
+    rotation: z.number().int().min(1).max(6),
+    targets: z.record(z.string(), blockingFunctionSchema)
+});
 // One set's rotation-system override (per-set tactics): system + its designated setters travel together.
 const systemSetSchema = z.object({
     rotationSystem: z.nativeEnum(RotationSystemEnum),
@@ -82,6 +91,9 @@ export const TacticsInputSchema = z.object({
     // validated with the same cross-field rules as the flat fields (see superRefine below).
     systemSets: z.array(systemSetSchema).max(5).optional(),
     offensivePreferenceSets: z.array(z.array(offensivePreferenceSchema)).max(5).optional(),
+    // Blocking preferences (dedicated blocking). Defaults keep every existing Tactics.create({...}) call valid.
+    blockingPreferences: z.array(blockingPreferenceSchema).default([]),
+    blockingPreferenceSets: z.array(z.array(blockingPreferenceSchema)).max(5).optional(),
     // Injuries. Defaults keep every existing Tactics.create({...}) call valid. replaceKnockedImmediately is
     // PER STARTER (owner order 2026-07-05): keyed by starter id, missing key = ON; keys validated against the
     // lineup in the superRefine below. injuryReplacements is the per-starter explicit replacement mapping
@@ -150,16 +162,17 @@ export const TacticsInputSchema = z.object({
                 ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_DUPLICATE_ROTATION', path });
             }
             seenRotations.add(pref.rotation);
-            const ids = pref.order.map(p => p.id);
-            if (new Set(ids).size !== ids.length) {
-                ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_DUPLICATE_ATTACKER', path });
-            }
-            for (const id of ids) {
+            // Weight keys are on-court starters, and the percentages must sum to exactly 100 (0 removes an attacker).
+            for (const id of Object.keys(pref.weights)) {
                 if (!starterIds.has(id)) {
                     ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_ATTACKER_NOT_A_STARTER', path });
                 }
             }
-            // Tempo preference keys are starter ids too (same rule as order).
+            const total = Object.values(pref.weights).reduce((sum, w) => sum + w, 0);
+            if (total !== 100) {
+                ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_WEIGHTS_MUST_SUM_TO_100', path });
+            }
+            // Tempo preference keys are starter ids too.
             for (const id of Object.keys(pref.tempos ?? {})) {
                 if (!starterIds.has(id)) {
                     ctx.addIssue({ code: 'custom', message: 'OFFENSIVE_PREFERENCE_TEMPO_NOT_A_STARTER', path });
@@ -167,6 +180,22 @@ export const TacticsInputSchema = z.object({
             }
         }
     };
+    // Blocking preferences: unique rotations; each assignment keys an on-court starter (the UI only offers front-row
+    // players, the schema checks starters). The target function is validated by blockingFunctionSchema.
+    const validateBlockingPreferences = (preferences, path) => {
+        const seenRotations = new Set();
+        for (const pref of preferences) {
+            if (seenRotations.has(pref.rotation)) {
+                ctx.addIssue({ code: 'custom', message: 'BLOCKING_PREFERENCE_DUPLICATE_ROTATION', path });
+            }
+            seenRotations.add(pref.rotation);
+            for (const id of Object.keys(pref.targets)) {
+                if (!starterIds.has(id)) {
+                    ctx.addIssue({ code: 'custom', message: 'BLOCKING_PREFERENCE_BLOCKER_NOT_A_STARTER', path });
+                }
+            }
+        }
+    };
     validateSystem(data.rotationSystem, data.designatedSetters, ['designatedSetters']);
     for (const [i, systemSet] of (data.systemSets ?? []).entries()) {
         validateSystem(systemSet.rotationSystem, systemSet.designatedSetters, ['systemSets', i]);
@@ -175,6 +204,10 @@ export const TacticsInputSchema = z.object({
     for (const [i, preferences] of (data.offensivePreferenceSets ?? []).entries()) {
         validateOffensivePreferences(preferences, ['offensivePreferenceSets', i]);
     }
+    validateBlockingPreferences(data.blockingPreferences, ['blockingPreferences']);
+    for (const [i, preferences] of (data.blockingPreferenceSets ?? []).entries()) {
+        validateBlockingPreferences(preferences, ['blockingPreferenceSets', i]);
+    }
     // Second libero (L2). The second libero is a reserve (not a starter, the libero, or a bench player). A swap
     // rule (FATIGUE/ALWAYS in any set) needs someone to swap in, so it requires a second libero, and a second
     // libero needs a starting libero to replace ("no L2 without an L"). Per-set libero replacements, like the

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

@@ -1,5 +1,6 @@
 import { describe, it, expect } from '@jest/globals';
 import { TacticsInputSchema } from './tactics.z';
+import { RoleEnum } from '../../player';
 import { makeCountry, makePlayer } from '../../test-helpers';
 describe('TacticsInputSchema — second libero rules', () => {
     const country = makeCountry();
@@ -93,7 +94,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
                 { rotationSystem: '4-2', designatedSetters: [p1, p4] }
             ],
             offensivePreferenceSets: [
-                [{ rotation: 1, order: [p2, p3] }],
+                [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 } }],
                 []
             ]
         }));
@@ -102,7 +103,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     it('carries the per-set fields through Tactics.create parsing', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
             systemSets: [{ rotationSystem: '5-1', designatedSetters: [p1] }],
-            offensivePreferenceSets: [[{ rotation: 2, order: [p3] }]]
+            offensivePreferenceSets: [[{ rotation: 2, weights: { [p3.id]: 100 } }]]
         }));
         expect(res.success).toBe(true);
         if (res.success) {
@@ -151,7 +152,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     });
     it('rejects a per-set preferences list with a duplicate rotation', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferenceSets: [[{ rotation: 1, order: [p2] }, { rotation: 1, order: [p3] }]]
+            offensivePreferenceSets: [[{ rotation: 1, weights: { [p2.id]: 100 } }, { rotation: 1, weights: { [p3.id]: 100 } }]]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -159,18 +160,27 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
             expect(issue?.path).toEqual(['offensivePreferenceSets', 0]);
         }
     });
-    it('rejects a per-set preferences order that lists a non-starter', () => {
+    it('rejects a per-set preferences map that keys a non-starter', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferenceSets: [[{ rotation: 1, order: [reserve] }]]
+            offensivePreferenceSets: [[{ rotation: 1, weights: { [reserve.id]: 100 } }]]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
             expect(res.error.issues.some(i => i.message === 'OFFENSIVE_PREFERENCE_ATTACKER_NOT_A_STARTER')).toBe(true);
         }
     });
+    it('rejects offensive preference weights that do not sum to 100', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 50, [p3.id]: 40 } }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'OFFENSIVE_PREFERENCE_WEIGHTS_MUST_SUM_TO_100')).toBe(true);
+        }
+    });
     it('accepts offensive preferences with a starter-keyed tempos map', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, order: [p2, p3], tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 60, [p3.id]: 40 }, tempos: { [p2.id]: 'FAST', [p3.id]: 'HIGH' } }]
         }));
         expect(res.success).toBe(true);
         if (res.success) {
@@ -179,7 +189,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     });
     it('rejects a tempos map keyed by a non-starter', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, order: [p2], tempos: { [reserve.id]: 'FAST' } }]
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 100 }, tempos: { [reserve.id]: 'FAST' } }]
         }));
         expect(res.success).toBe(false);
         if (!res.success) {
@@ -188,7 +198,7 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
     });
     it('rejects an invalid tempo value', () => {
         const res = TacticsInputSchema.safeParse(baseInput({
-            offensivePreferences: [{ rotation: 1, order: [p2], tempos: { [p2.id]: 'SLOW' } }]
+            offensivePreferences: [{ rotation: 1, weights: { [p2.id]: 100 }, tempos: { [p2.id]: 'SLOW' } }]
         }));
         expect(res.success).toBe(false);
     });
@@ -206,3 +216,66 @@ describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferen
         }
     });
 });
+describe('TacticsInputSchema — blocking preferences', () => {
+    const country = makeCountry();
+    const p1 = makePlayer(country);
+    const p2 = makePlayer(country);
+    const p3 = makePlayer(country);
+    const p4 = makePlayer(country);
+    const p5 = makePlayer(country);
+    const p6 = makePlayer(country);
+    const reserve = makePlayer(country);
+    // Front-row starters (zones 2/3/4) are p2, p3, p4; the validator only requires target keys to be starters.
+    function baseInput(overrides = {}) {
+        return {
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: [],
+            ...overrides
+        };
+    }
+    it('accepts a blocking preference that keys starters to attacking functions', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: RoleEnum.OUTSIDE_HITTER, [p3.id]: RoleEnum.MIDDLE_BLOCKER } }]
+        }));
+        expect(res.success).toBe(true);
+        if (res.success) {
+            expect(res.data.blockingPreferences[0].targets[p4.id]).toBe(RoleEnum.OUTSIDE_HITTER);
+        }
+    });
+    it('rejects a blocking target that is not a starter', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [{ rotation: 1, targets: { [reserve.id]: RoleEnum.OUTSIDE_HITTER } }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'BLOCKING_PREFERENCE_BLOCKER_NOT_A_STARTER')).toBe(true);
+        }
+    });
+    it('rejects a blocking target function of libero', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: RoleEnum.LIBERO } }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'BLOCKING_TARGET_CANNOT_BE_LIBERO')).toBe(true);
+        }
+    });
+    it('rejects a duplicate rotation in blocking preferences', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferences: [
+                { rotation: 1, targets: { [p4.id]: RoleEnum.OUTSIDE_HITTER } },
+                { rotation: 1, targets: { [p3.id]: RoleEnum.MIDDLE_BLOCKER } }
+            ]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'BLOCKING_PREFERENCE_DUPLICATE_ROTATION')).toBe(true);
+        }
+    });
+    it('accepts per-set blocking preference overrides', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            blockingPreferenceSets: [[{ rotation: 1, targets: { [p4.id]: RoleEnum.OPPOSITE_HITTER } }], []]
+        }));
+        expect(res.success).toBe(true);
+    });
+});

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

@@ -277,7 +277,7 @@ 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;
-            order: z.ZodArray<z.ZodCustom<Player, Player>>;
+            weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
             tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
                 FAST: "FAST";
                 HIGH: "HIGH";
@@ -289,12 +289,20 @@ export declare const TeamInputSchema: z.ZodObject<{
         }, z.core.$strip>>>;
         offensivePreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
             rotation: z.ZodNumber;
-            order: z.ZodArray<z.ZodCustom<Player, Player>>;
+            weights: z.ZodRecord<z.ZodString, z.ZodNumber>;
             tempos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodEnum<{
                 FAST: "FAST";
                 HIGH: "HIGH";
             }>>>;
         }, z.core.$strip>>>>;
+        blockingPreferences: z.ZodDefault<z.ZodArray<z.ZodObject<{
+            rotation: z.ZodNumber;
+            targets: z.ZodRecord<z.ZodString, z.ZodEnum<typeof import("../../player").RoleEnum> & z.ZodType<import("../../player").RoleEnum.SETTER | import("../../player").RoleEnum.OUTSIDE_HITTER | import("../../player").RoleEnum.OPPOSITE_HITTER | import("../../player").RoleEnum.MIDDLE_BLOCKER, import("../../player").RoleEnum, z.core.$ZodTypeInternals<import("../../player").RoleEnum.SETTER | import("../../player").RoleEnum.OUTSIDE_HITTER | import("../../player").RoleEnum.OPPOSITE_HITTER | import("../../player").RoleEnum.MIDDLE_BLOCKER, import("../../player").RoleEnum>>>;
+        }, z.core.$strip>>>;
+        blockingPreferenceSets: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
+            rotation: z.ZodNumber;
+            targets: z.ZodRecord<z.ZodString, z.ZodEnum<typeof import("../../player").RoleEnum> & z.ZodType<import("../../player").RoleEnum.SETTER | import("../../player").RoleEnum.OUTSIDE_HITTER | import("../../player").RoleEnum.OPPOSITE_HITTER | import("../../player").RoleEnum.MIDDLE_BLOCKER, import("../../player").RoleEnum, z.core.$ZodTypeInternals<import("../../player").RoleEnum.SETTER | import("../../player").RoleEnum.OUTSIDE_HITTER | import("../../player").RoleEnum.OPPOSITE_HITTER | import("../../player").RoleEnum.MIDDLE_BLOCKER, import("../../player").RoleEnum>>>;
+        }, z.core.$strip>>>>;
         replaceKnockedImmediately: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodBoolean>>;
         injuryReplacements: z.ZodDefault<z.ZodArray<z.ZodObject<{
             starter: z.ZodCustom<Player, Player>;