volleyballsimtypes 0.0.396 → 0.0.398

package/dist/cjs/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, 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, PinchCondition, RotationSystemEnum, SubBand } 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, 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, PinchCondition, RotationSystemEnum, SubBand, SubMode } from '../service';
 export type Rally = DataProps<_Rally> & {
     homePlayerPosition: PlayerPosition[];
     awayPlayerPosition: PlayerPosition[];
@@ -59,8 +59,9 @@ export interface StartingLineup {
 export interface ApiDesignatedSub {
     starterId: string;
     benchId?: string;
-    isPinchServer: boolean;
-    fatigueBand?: SubBand;
+    mode: SubMode;
+    fatigueBand?: EnergyBand;
+    fatigueBandsBySet?: EnergyBand[];
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
 }

package/dist/cjs/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, PinchCondition, RotationSystemEnum, SubBand } from '../../service';
+import { ConditionLogic, CourtPosition, EnergyBand, PinchCondition, RotationSystemEnum, SubBand, SubMode } from '../../service';
 export interface TacticsLineupAttributes {
     [CourtPosition.LIBERO_ZONE]?: PlayerId;
     [CourtPosition.LEFT_BACK]: PlayerId;
@@ -16,8 +16,10 @@ export type PinchServerSubsAttributes = Record<PlayerId, PlayerId>;
 export interface DesignatedSubAttributes {
     starterId: PlayerId;
     benchId?: PlayerId;
-    isPinchServer: boolean;
+    mode?: SubMode;
+    isPinchServer?: boolean;
     fatigueBand?: SubBand;
+    fatigueBandsBySet?: EnergyBand[];
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
 }

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

@@ -3,6 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformToTactics = transformToObject;
 exports.transformFromTactics = transformToAttributes;
 const service_1 = require("../../service");
+// Back-compat: new rows persist `mode`; rows written before the mode change persist `isPinchServer` (+ a
+// 'NEVER' fatigueBand for the old "never fatigue-sub" state). Derive the mode so existing data keeps working
+// until the next tactics save rewrites it in the new shape.
+function subModeFromAttributes(d) {
+    if (d.mode != null)
+        return d.mode;
+    if (d.isPinchServer === true)
+        return 'PINCH';
+    if (d.fatigueBand === 'NEVER')
+        return 'NEVER';
+    return 'FATIGUE';
+}
 function findPlayer(id, roster) {
     const player = roster.find((p) => p.id === id);
     if (player == null)
@@ -45,8 +57,9 @@ function transformToAttributes(tactics, teamId) {
         designated_subs: tactics.designatedSubs.map(ds => ({
             starterId: ds.starter.id,
             benchId: ds.bench?.id,
-            isPinchServer: ds.isPinchServer,
+            mode: ds.mode,
             fatigueBand: ds.fatigueBand,
+            fatigueBandsBySet: ds.fatigueBandsBySet,
             conditions: ds.conditions,
             conditionLogic: ds.conditionLogic
         })),
@@ -76,8 +89,9 @@ function transformToObject(model, roster) {
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starter: findPlayer(d.starterId, roster),
             bench: d.benchId != null ? findPlayer(d.benchId, roster) : undefined,
-            isPinchServer: d.isPinchServer,
-            fatigueBand: d.fatigueBand,
+            mode: subModeFromAttributes(d),
+            fatigueBand: d.fatigueBand === 'NEVER' ? undefined : d.fatigueBand,
+            fatigueBandsBySet: d.fatigueBandsBySet,
             conditions: d.conditions,
             conditionLogic: d.conditionLogic
         })),

package/dist/cjs/src/service/team/designated-sub.d.ts

@@ -1,11 +1,12 @@
 import { Player } from '../player';
-import { SubBand } from './energy-band';
+import { EnergyBand, SubMode } from './energy-band';
 import { ConditionLogic, PinchCondition } from './pinch-condition';
 export interface DesignatedSub {
     readonly starter: Player;
     readonly bench?: Player;
-    readonly isPinchServer: boolean;
-    readonly fatigueBand?: SubBand;
+    readonly mode: SubMode;
+    readonly fatigueBand?: EnergyBand;
+    readonly fatigueBandsBySet?: EnergyBand[];
     readonly conditions?: PinchCondition[];
     readonly conditionLogic?: ConditionLogic;
 }

package/dist/cjs/src/service/team/energy-band.d.ts

@@ -5,4 +5,6 @@ export declare enum EnergyBand {
     EXHAUSTED = "EXHAUSTED"
 }
 export type SubBand = EnergyBand | 'NEVER';
+export type SubMode = 'FATIGUE' | 'PINCH' | 'NEVER';
+export declare const SUB_MODES: readonly SubMode[];
 export declare const ENERGY_BAND_ORDER: readonly EnergyBand[];

package/dist/cjs/src/service/team/energy-band.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENERGY_BAND_ORDER = exports.EnergyBand = void 0;
+exports.ENERGY_BAND_ORDER = exports.SUB_MODES = exports.EnergyBand = void 0;
 // The named fatigue bands a player's energy falls into. The numeric cutoffs and per-band performance
 // multipliers live in the simulator (VolleyballSim court-player.ts ENERGY_BANDS); this enum is the shared
 // vocabulary used by tactics configuration (substitution thresholds) and, later, the UI.
@@ -11,6 +11,7 @@ var EnergyBand;
     EnergyBand["TIRED"] = "TIRED";
     EnergyBand["EXHAUSTED"] = "EXHAUSTED";
 })(EnergyBand || (exports.EnergyBand = EnergyBand = {}));
+exports.SUB_MODES = ['FATIGUE', 'PINCH', 'NEVER'];
 // Ordered best -> worst. Used to compare "is this player at-or-below the configured sub band".
 exports.ENERGY_BAND_ORDER = [
     EnergyBand.ENERGETIC,

package/dist/cjs/src/service/team/pinch-condition.d.ts

@@ -5,7 +5,8 @@ export declare enum PinchConditionType {
     SCORE_DIFF = "SCORE_DIFF",// team trailing/leading by at least `points`
     AFTER_ROTATIONS = "AFTER_ROTATIONS",// from the team's Nth serve turn in the set onward
     FROM_SET = "FROM_SET",// only set N or later
-    MIN_OWN_SCORE = "MIN_OWN_SCORE"
+    MIN_OWN_SCORE = "MIN_OWN_SCORE",// only once own score >= N
+    MIN_OPPONENT_SCORE = "MIN_OPPONENT_SCORE"
 }
 export declare enum OpponentRelation {
     AHEAD = "AHEAD",
@@ -45,7 +46,11 @@ export interface MinOwnScoreCondition {
     readonly type: PinchConditionType.MIN_OWN_SCORE;
     readonly score: number;
 }
-export type PinchCondition = AsapCondition | TeamSetPointCondition | OpponentSetPointCondition | ScoreDiffCondition | AfterRotationsCondition | FromSetCondition | MinOwnScoreCondition;
+export interface MinOpponentScoreCondition {
+    readonly type: PinchConditionType.MIN_OPPONENT_SCORE;
+    readonly score: number;
+}
+export type PinchCondition = AsapCondition | TeamSetPointCondition | OpponentSetPointCondition | ScoreDiffCondition | AfterRotationsCondition | FromSetCondition | MinOwnScoreCondition | MinOpponentScoreCondition;
 export type ConditionLogic = 'ALL' | 'ANY';
 export interface PinchSetState {
     readonly ownScore: number;

package/dist/cjs/src/service/team/pinch-condition.js

@@ -12,7 +12,8 @@ var PinchConditionType;
     PinchConditionType["SCORE_DIFF"] = "SCORE_DIFF";
     PinchConditionType["AFTER_ROTATIONS"] = "AFTER_ROTATIONS";
     PinchConditionType["FROM_SET"] = "FROM_SET";
-    PinchConditionType["MIN_OWN_SCORE"] = "MIN_OWN_SCORE"; // only once own score >= N
+    PinchConditionType["MIN_OWN_SCORE"] = "MIN_OWN_SCORE";
+    PinchConditionType["MIN_OPPONENT_SCORE"] = "MIN_OPPONENT_SCORE"; // only once opponent score >= N
 })(PinchConditionType || (exports.PinchConditionType = PinchConditionType = {}));
 var OpponentRelation;
 (function (OpponentRelation) {

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

@@ -25,13 +25,26 @@ export declare const PinchConditionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<
 }, z.core.$strip>, z.ZodObject<{
     type: z.ZodLiteral<PinchConditionType.MIN_OWN_SCORE>;
     score: z.ZodNumber;
+}, z.core.$strip>, z.ZodObject<{
+    type: z.ZodLiteral<PinchConditionType.MIN_OPPONENT_SCORE>;
+    score: z.ZodNumber;
 }, z.core.$strip>], "type">;
 export declare const ConditionLogicSchema: z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>;
+export declare const SubModeSchema: z.ZodEnum<{
+    NEVER: "NEVER";
+    FATIGUE: "FATIGUE";
+    PINCH: "PINCH";
+}>;
 export declare const DesignatedSubSchema: z.ZodObject<{
     starter: z.ZodCustom<Player, Player>;
     bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-    isPinchServer: z.ZodBoolean;
-    fatigueBand: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<typeof EnergyBand>, z.ZodLiteral<"NEVER">]>>;
+    mode: z.ZodEnum<{
+        NEVER: "NEVER";
+        FATIGUE: "FATIGUE";
+        PINCH: "PINCH";
+    }>;
+    fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+    fatigueBandsBySet: z.ZodOptional<z.ZodArray<z.ZodEnum<typeof EnergyBand>>>;
     conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
         type: z.ZodLiteral<PinchConditionType.ASAP>;
     }, z.core.$strip>, z.ZodObject<{
@@ -54,6 +67,9 @@ export declare const DesignatedSubSchema: z.ZodObject<{
     }, z.core.$strip>, z.ZodObject<{
         type: z.ZodLiteral<PinchConditionType.MIN_OWN_SCORE>;
         score: z.ZodNumber;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<PinchConditionType.MIN_OPPONENT_SCORE>;
+        score: z.ZodNumber;
     }, z.core.$strip>], "type">>>;
     conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
 }, z.core.$strip>;

package/dist/cjs/src/service/team/schemas/designated-sub.z.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DesignatedSubSchema = exports.ConditionLogicSchema = exports.PinchConditionSchema = exports.SubBandSchema = void 0;
+exports.DesignatedSubSchema = exports.SubModeSchema = exports.ConditionLogicSchema = exports.PinchConditionSchema = exports.SubBandSchema = void 0;
 const zod_1 = require("zod");
 const player_1 = require("../../player");
 const energy_band_1 = require("../energy-band");
@@ -16,18 +16,21 @@ exports.PinchConditionSchema = zod_1.z.discriminatedUnion('type', [
     zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.SCORE_DIFF), direction: zod_1.z.nativeEnum(pinch_condition_1.ScoreDirection), points: zod_1.z.number().int().min(1).max(25) }),
     zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.AFTER_ROTATIONS), rotations: zod_1.z.number().int().min(1).max(6) }),
     zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.FROM_SET), set: zod_1.z.number().int().min(1).max(5) }),
-    zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.MIN_OWN_SCORE), score: zod_1.z.number().int().min(0).max(40) })
+    zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.MIN_OWN_SCORE), score: zod_1.z.number().int().min(0).max(40) }),
+    zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.MIN_OPPONENT_SCORE), score: zod_1.z.number().int().min(0).max(40) })
 ]);
 exports.ConditionLogicSchema = zod_1.z.union([zod_1.z.literal('ALL'), zod_1.z.literal('ANY')]);
+exports.SubModeSchema = zod_1.z.enum(['FATIGUE', 'PINCH', 'NEVER']);
 exports.DesignatedSubSchema = zod_1.z.object({
     starter: playerInstanceSchema,
     bench: playerInstanceSchema.optional(),
-    isPinchServer: zod_1.z.boolean(),
-    fatigueBand: exports.SubBandSchema.optional(),
+    mode: exports.SubModeSchema,
+    fatigueBand: zod_1.z.nativeEnum(energy_band_1.EnergyBand).optional(),
+    fatigueBandsBySet: zod_1.z.array(zod_1.z.nativeEnum(energy_band_1.EnergyBand)).max(5).optional(),
     conditions: zod_1.z.array(exports.PinchConditionSchema).optional(),
     conditionLogic: exports.ConditionLogicSchema.optional()
 }).superRefine((data, ctx) => {
-    if (data.isPinchServer) {
+    if (data.mode === 'PINCH') {
         // Pinch mode needs a designated bench player (the server) and at least one condition.
         if (data.bench == null) {
             ctx.addIssue({ code: 'custom', message: 'PINCH_SERVER_REQUIRES_BENCH', path: ['bench'] });

package/dist/cjs/src/service/team/schemas/designated-sub.z.test.js

@@ -67,7 +67,7 @@ const test_helpers_1 = require("../../test-helpers");
         const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
             starter,
             bench,
-            isPinchServer: false,
+            mode: 'FATIGUE',
             fatigueBand: energy_band_1.EnergyBand.TIRED
         });
         (0, globals_1.expect)(res.success).toBe(true);
@@ -75,15 +75,29 @@ const test_helpers_1 = require("../../test-helpers");
     (0, globals_1.it)('accepts a fatigue-mode entry with no bench (falls back to closest sub)', () => {
         const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
             starter,
-            isPinchServer: false
+            mode: 'FATIGUE'
         });
         (0, globals_1.expect)(res.success).toBe(true);
     });
+    (0, globals_1.it)('accepts a never-mode entry with no bench, band, or conditions', () => {
+        const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
+            starter,
+            mode: 'NEVER'
+        });
+        (0, globals_1.expect)(res.success).toBe(true);
+    });
+    (0, globals_1.it)('rejects an unknown mode', () => {
+        const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
+            starter,
+            mode: 'SOMETIMES'
+        });
+        (0, globals_1.expect)(res.success).toBe(false);
+    });
     (0, globals_1.it)('accepts a pinch-mode entry with a bench server and conditions', () => {
         const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
             starter,
             bench,
-            isPinchServer: true,
+            mode: 'PINCH',
             conditions: [{ type: pinch_condition_1.PinchConditionType.ASAP }],
             conditionLogic: 'ALL'
         });
@@ -92,7 +106,7 @@ const test_helpers_1 = require("../../test-helpers");
     (0, globals_1.it)('rejects a pinch-mode entry without a bench server', () => {
         const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
             starter,
-            isPinchServer: true,
+            mode: 'PINCH',
             conditions: [{ type: pinch_condition_1.PinchConditionType.ASAP }]
         });
         (0, globals_1.expect)(res.success).toBe(false);
@@ -104,7 +118,7 @@ const test_helpers_1 = require("../../test-helpers");
         const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
             starter,
             bench,
-            isPinchServer: true,
+            mode: 'PINCH',
             conditions: []
         });
         (0, globals_1.expect)(res.success).toBe(false);
@@ -115,7 +129,7 @@ const test_helpers_1 = require("../../test-helpers");
     (0, globals_1.it)('rejects a starter that is not a Player instance', () => {
         const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
             starter: { id: 'not-a-player' },
-            isPinchServer: false
+            mode: 'FATIGUE'
         });
         (0, globals_1.expect)(res.success).toBe(false);
     });

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

@@ -20,8 +20,13 @@ export declare const TacticsInputSchema: z.ZodObject<{
     designatedSubs: z.ZodDefault<z.ZodArray<z.ZodObject<{
         starter: z.ZodCustom<Player, Player>;
         bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-        isPinchServer: z.ZodBoolean;
-        fatigueBand: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<typeof EnergyBand>, z.ZodLiteral<"NEVER">]>>;
+        mode: z.ZodEnum<{
+            NEVER: "NEVER";
+            FATIGUE: "FATIGUE";
+            PINCH: "PINCH";
+        }>;
+        fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+        fatigueBandsBySet: z.ZodOptional<z.ZodArray<z.ZodEnum<typeof EnergyBand>>>;
         conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
         }, z.core.$strip>, z.ZodObject<{
@@ -44,6 +49,9 @@ export declare const TacticsInputSchema: z.ZodObject<{
         }, z.core.$strip>, z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.MIN_OWN_SCORE>;
             score: z.ZodNumber;
+        }, z.core.$strip>, z.ZodObject<{
+            type: z.ZodLiteral<import("..").PinchConditionType.MIN_OPPONENT_SCORE>;
+            score: z.ZodNumber;
         }, z.core.$strip>], "type">>>;
         conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
     }, z.core.$strip>>>;

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

@@ -28,8 +28,13 @@ export declare const TeamInputSchema: z.ZodObject<{
         designatedSubs: z.ZodDefault<z.ZodArray<z.ZodObject<{
             starter: z.ZodCustom<Player, Player>;
             bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-            isPinchServer: z.ZodBoolean;
-            fatigueBand: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<typeof import("..").EnergyBand>, z.ZodLiteral<"NEVER">]>>;
+            mode: z.ZodEnum<{
+                NEVER: "NEVER";
+                FATIGUE: "FATIGUE";
+                PINCH: "PINCH";
+            }>;
+            fatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
+            fatigueBandsBySet: z.ZodOptional<z.ZodArray<z.ZodEnum<typeof import("..").EnergyBand>>>;
             conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
             }, z.core.$strip>, z.ZodObject<{
@@ -52,6 +57,9 @@ export declare const TeamInputSchema: z.ZodObject<{
             }, z.core.$strip>, z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.MIN_OWN_SCORE>;
                 score: z.ZodNumber;
+            }, z.core.$strip>, z.ZodObject<{
+                type: z.ZodLiteral<import("..").PinchConditionType.MIN_OPPONENT_SCORE>;
+                score: z.ZodNumber;
             }, z.core.$strip>], "type">>>;
             conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
         }, z.core.$strip>>>;

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, 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, PinchCondition, RotationSystemEnum, SubBand } 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, 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, PinchCondition, RotationSystemEnum, SubBand, SubMode } from '../service';
 export type Rally = DataProps<_Rally> & {
     homePlayerPosition: PlayerPosition[];
     awayPlayerPosition: PlayerPosition[];
@@ -59,8 +59,9 @@ export interface StartingLineup {
 export interface ApiDesignatedSub {
     starterId: string;
     benchId?: string;
-    isPinchServer: boolean;
-    fatigueBand?: SubBand;
+    mode: SubMode;
+    fatigueBand?: EnergyBand;
+    fatigueBandsBySet?: EnergyBand[];
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
 }

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, PinchCondition, RotationSystemEnum, SubBand } from '../../service';
+import { ConditionLogic, CourtPosition, EnergyBand, PinchCondition, RotationSystemEnum, SubBand, SubMode } from '../../service';
 export interface TacticsLineupAttributes {
     [CourtPosition.LIBERO_ZONE]?: PlayerId;
     [CourtPosition.LEFT_BACK]: PlayerId;
@@ -16,8 +16,10 @@ export type PinchServerSubsAttributes = Record<PlayerId, PlayerId>;
 export interface DesignatedSubAttributes {
     starterId: PlayerId;
     benchId?: PlayerId;
-    isPinchServer: boolean;
+    mode?: SubMode;
+    isPinchServer?: boolean;
     fatigueBand?: SubBand;
+    fatigueBandsBySet?: EnergyBand[];
     conditions?: PinchCondition[];
     conditionLogic?: ConditionLogic;
 }

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

@@ -1,4 +1,16 @@
 import { CourtPosition, Tactics } from '../../service';
+// Back-compat: new rows persist `mode`; rows written before the mode change persist `isPinchServer` (+ a
+// 'NEVER' fatigueBand for the old "never fatigue-sub" state). Derive the mode so existing data keeps working
+// until the next tactics save rewrites it in the new shape.
+function subModeFromAttributes(d) {
+    if (d.mode != null)
+        return d.mode;
+    if (d.isPinchServer === true)
+        return 'PINCH';
+    if (d.fatigueBand === 'NEVER')
+        return 'NEVER';
+    return 'FATIGUE';
+}
 function findPlayer(id, roster) {
     const player = roster.find((p) => p.id === id);
     if (player == null)
@@ -41,8 +53,9 @@ function transformToAttributes(tactics, teamId) {
         designated_subs: tactics.designatedSubs.map(ds => ({
             starterId: ds.starter.id,
             benchId: ds.bench?.id,
-            isPinchServer: ds.isPinchServer,
+            mode: ds.mode,
             fatigueBand: ds.fatigueBand,
+            fatigueBandsBySet: ds.fatigueBandsBySet,
             conditions: ds.conditions,
             conditionLogic: ds.conditionLogic
         })),
@@ -72,8 +85,9 @@ function transformToObject(model, roster) {
         designatedSubs: (model.designated_subs ?? []).map(d => ({
             starter: findPlayer(d.starterId, roster),
             bench: d.benchId != null ? findPlayer(d.benchId, roster) : undefined,
-            isPinchServer: d.isPinchServer,
-            fatigueBand: d.fatigueBand,
+            mode: subModeFromAttributes(d),
+            fatigueBand: d.fatigueBand === 'NEVER' ? undefined : d.fatigueBand,
+            fatigueBandsBySet: d.fatigueBandsBySet,
             conditions: d.conditions,
             conditionLogic: d.conditionLogic
         })),

package/dist/esm/src/service/team/designated-sub.d.ts

@@ -1,11 +1,12 @@
 import { Player } from '../player';
-import { SubBand } from './energy-band';
+import { EnergyBand, SubMode } from './energy-band';
 import { ConditionLogic, PinchCondition } from './pinch-condition';
 export interface DesignatedSub {
     readonly starter: Player;
     readonly bench?: Player;
-    readonly isPinchServer: boolean;
-    readonly fatigueBand?: SubBand;
+    readonly mode: SubMode;
+    readonly fatigueBand?: EnergyBand;
+    readonly fatigueBandsBySet?: EnergyBand[];
     readonly conditions?: PinchCondition[];
     readonly conditionLogic?: ConditionLogic;
 }

package/dist/esm/src/service/team/energy-band.d.ts

@@ -5,4 +5,6 @@ export declare enum EnergyBand {
     EXHAUSTED = "EXHAUSTED"
 }
 export type SubBand = EnergyBand | 'NEVER';
+export type SubMode = 'FATIGUE' | 'PINCH' | 'NEVER';
+export declare const SUB_MODES: readonly SubMode[];
 export declare const ENERGY_BAND_ORDER: readonly EnergyBand[];

package/dist/esm/src/service/team/energy-band.js

@@ -8,6 +8,7 @@ export var EnergyBand;
     EnergyBand["TIRED"] = "TIRED";
     EnergyBand["EXHAUSTED"] = "EXHAUSTED";
 })(EnergyBand || (EnergyBand = {}));
+export const SUB_MODES = ['FATIGUE', 'PINCH', 'NEVER'];
 // Ordered best -> worst. Used to compare "is this player at-or-below the configured sub band".
 export const ENERGY_BAND_ORDER = [
     EnergyBand.ENERGETIC,

package/dist/esm/src/service/team/pinch-condition.d.ts

@@ -5,7 +5,8 @@ export declare enum PinchConditionType {
     SCORE_DIFF = "SCORE_DIFF",// team trailing/leading by at least `points`
     AFTER_ROTATIONS = "AFTER_ROTATIONS",// from the team's Nth serve turn in the set onward
     FROM_SET = "FROM_SET",// only set N or later
-    MIN_OWN_SCORE = "MIN_OWN_SCORE"
+    MIN_OWN_SCORE = "MIN_OWN_SCORE",// only once own score >= N
+    MIN_OPPONENT_SCORE = "MIN_OPPONENT_SCORE"
 }
 export declare enum OpponentRelation {
     AHEAD = "AHEAD",
@@ -45,7 +46,11 @@ export interface MinOwnScoreCondition {
     readonly type: PinchConditionType.MIN_OWN_SCORE;
     readonly score: number;
 }
-export type PinchCondition = AsapCondition | TeamSetPointCondition | OpponentSetPointCondition | ScoreDiffCondition | AfterRotationsCondition | FromSetCondition | MinOwnScoreCondition;
+export interface MinOpponentScoreCondition {
+    readonly type: PinchConditionType.MIN_OPPONENT_SCORE;
+    readonly score: number;
+}
+export type PinchCondition = AsapCondition | TeamSetPointCondition | OpponentSetPointCondition | ScoreDiffCondition | AfterRotationsCondition | FromSetCondition | MinOwnScoreCondition | MinOpponentScoreCondition;
 export type ConditionLogic = 'ALL' | 'ANY';
 export interface PinchSetState {
     readonly ownScore: number;

package/dist/esm/src/service/team/pinch-condition.js

@@ -9,7 +9,8 @@ export var PinchConditionType;
     PinchConditionType["SCORE_DIFF"] = "SCORE_DIFF";
     PinchConditionType["AFTER_ROTATIONS"] = "AFTER_ROTATIONS";
     PinchConditionType["FROM_SET"] = "FROM_SET";
-    PinchConditionType["MIN_OWN_SCORE"] = "MIN_OWN_SCORE"; // only once own score >= N
+    PinchConditionType["MIN_OWN_SCORE"] = "MIN_OWN_SCORE";
+    PinchConditionType["MIN_OPPONENT_SCORE"] = "MIN_OPPONENT_SCORE"; // only once opponent score >= N
 })(PinchConditionType || (PinchConditionType = {}));
 export var OpponentRelation;
 (function (OpponentRelation) {

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

@@ -25,13 +25,26 @@ export declare const PinchConditionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<
 }, z.core.$strip>, z.ZodObject<{
     type: z.ZodLiteral<PinchConditionType.MIN_OWN_SCORE>;
     score: z.ZodNumber;
+}, z.core.$strip>, z.ZodObject<{
+    type: z.ZodLiteral<PinchConditionType.MIN_OPPONENT_SCORE>;
+    score: z.ZodNumber;
 }, z.core.$strip>], "type">;
 export declare const ConditionLogicSchema: z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>;
+export declare const SubModeSchema: z.ZodEnum<{
+    NEVER: "NEVER";
+    FATIGUE: "FATIGUE";
+    PINCH: "PINCH";
+}>;
 export declare const DesignatedSubSchema: z.ZodObject<{
     starter: z.ZodCustom<Player, Player>;
     bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-    isPinchServer: z.ZodBoolean;
-    fatigueBand: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<typeof EnergyBand>, z.ZodLiteral<"NEVER">]>>;
+    mode: z.ZodEnum<{
+        NEVER: "NEVER";
+        FATIGUE: "FATIGUE";
+        PINCH: "PINCH";
+    }>;
+    fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+    fatigueBandsBySet: z.ZodOptional<z.ZodArray<z.ZodEnum<typeof EnergyBand>>>;
     conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
         type: z.ZodLiteral<PinchConditionType.ASAP>;
     }, z.core.$strip>, z.ZodObject<{
@@ -54,6 +67,9 @@ export declare const DesignatedSubSchema: z.ZodObject<{
     }, z.core.$strip>, z.ZodObject<{
         type: z.ZodLiteral<PinchConditionType.MIN_OWN_SCORE>;
         score: z.ZodNumber;
+    }, z.core.$strip>, z.ZodObject<{
+        type: z.ZodLiteral<PinchConditionType.MIN_OPPONENT_SCORE>;
+        score: z.ZodNumber;
     }, z.core.$strip>], "type">>>;
     conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
 }, z.core.$strip>;

package/dist/esm/src/service/team/schemas/designated-sub.z.js

@@ -13,18 +13,21 @@ export const PinchConditionSchema = z.discriminatedUnion('type', [
     z.object({ type: z.literal(PinchConditionType.SCORE_DIFF), direction: z.nativeEnum(ScoreDirection), points: z.number().int().min(1).max(25) }),
     z.object({ type: z.literal(PinchConditionType.AFTER_ROTATIONS), rotations: z.number().int().min(1).max(6) }),
     z.object({ type: z.literal(PinchConditionType.FROM_SET), set: z.number().int().min(1).max(5) }),
-    z.object({ type: z.literal(PinchConditionType.MIN_OWN_SCORE), score: z.number().int().min(0).max(40) })
+    z.object({ type: z.literal(PinchConditionType.MIN_OWN_SCORE), score: z.number().int().min(0).max(40) }),
+    z.object({ type: z.literal(PinchConditionType.MIN_OPPONENT_SCORE), score: z.number().int().min(0).max(40) })
 ]);
 export const ConditionLogicSchema = z.union([z.literal('ALL'), z.literal('ANY')]);
+export const SubModeSchema = z.enum(['FATIGUE', 'PINCH', 'NEVER']);
 export const DesignatedSubSchema = z.object({
     starter: playerInstanceSchema,
     bench: playerInstanceSchema.optional(),
-    isPinchServer: z.boolean(),
-    fatigueBand: SubBandSchema.optional(),
+    mode: SubModeSchema,
+    fatigueBand: z.nativeEnum(EnergyBand).optional(),
+    fatigueBandsBySet: z.array(z.nativeEnum(EnergyBand)).max(5).optional(),
     conditions: z.array(PinchConditionSchema).optional(),
     conditionLogic: ConditionLogicSchema.optional()
 }).superRefine((data, ctx) => {
-    if (data.isPinchServer) {
+    if (data.mode === 'PINCH') {
         // Pinch mode needs a designated bench player (the server) and at least one condition.
         if (data.bench == null) {
             ctx.addIssue({ code: 'custom', message: 'PINCH_SERVER_REQUIRES_BENCH', path: ['bench'] });

package/dist/esm/src/service/team/schemas/designated-sub.z.test.js

@@ -65,7 +65,7 @@ describe('DesignatedSubSchema', () => {
         const res = DesignatedSubSchema.safeParse({
             starter,
             bench,
-            isPinchServer: false,
+            mode: 'FATIGUE',
             fatigueBand: EnergyBand.TIRED
         });
         expect(res.success).toBe(true);
@@ -73,15 +73,29 @@ describe('DesignatedSubSchema', () => {
     it('accepts a fatigue-mode entry with no bench (falls back to closest sub)', () => {
         const res = DesignatedSubSchema.safeParse({
             starter,
-            isPinchServer: false
+            mode: 'FATIGUE'
         });
         expect(res.success).toBe(true);
     });
+    it('accepts a never-mode entry with no bench, band, or conditions', () => {
+        const res = DesignatedSubSchema.safeParse({
+            starter,
+            mode: 'NEVER'
+        });
+        expect(res.success).toBe(true);
+    });
+    it('rejects an unknown mode', () => {
+        const res = DesignatedSubSchema.safeParse({
+            starter,
+            mode: 'SOMETIMES'
+        });
+        expect(res.success).toBe(false);
+    });
     it('accepts a pinch-mode entry with a bench server and conditions', () => {
         const res = DesignatedSubSchema.safeParse({
             starter,
             bench,
-            isPinchServer: true,
+            mode: 'PINCH',
             conditions: [{ type: PinchConditionType.ASAP }],
             conditionLogic: 'ALL'
         });
@@ -90,7 +104,7 @@ describe('DesignatedSubSchema', () => {
     it('rejects a pinch-mode entry without a bench server', () => {
         const res = DesignatedSubSchema.safeParse({
             starter,
-            isPinchServer: true,
+            mode: 'PINCH',
             conditions: [{ type: PinchConditionType.ASAP }]
         });
         expect(res.success).toBe(false);
@@ -102,7 +116,7 @@ describe('DesignatedSubSchema', () => {
         const res = DesignatedSubSchema.safeParse({
             starter,
             bench,
-            isPinchServer: true,
+            mode: 'PINCH',
             conditions: []
         });
         expect(res.success).toBe(false);
@@ -113,7 +127,7 @@ describe('DesignatedSubSchema', () => {
     it('rejects a starter that is not a Player instance', () => {
         const res = DesignatedSubSchema.safeParse({
             starter: { id: 'not-a-player' },
-            isPinchServer: false
+            mode: 'FATIGUE'
         });
         expect(res.success).toBe(false);
     });

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

@@ -20,8 +20,13 @@ export declare const TacticsInputSchema: z.ZodObject<{
     designatedSubs: z.ZodDefault<z.ZodArray<z.ZodObject<{
         starter: z.ZodCustom<Player, Player>;
         bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-        isPinchServer: z.ZodBoolean;
-        fatigueBand: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<typeof EnergyBand>, z.ZodLiteral<"NEVER">]>>;
+        mode: z.ZodEnum<{
+            NEVER: "NEVER";
+            FATIGUE: "FATIGUE";
+            PINCH: "PINCH";
+        }>;
+        fatigueBand: z.ZodOptional<z.ZodEnum<typeof EnergyBand>>;
+        fatigueBandsBySet: z.ZodOptional<z.ZodArray<z.ZodEnum<typeof EnergyBand>>>;
         conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
         }, z.core.$strip>, z.ZodObject<{
@@ -44,6 +49,9 @@ export declare const TacticsInputSchema: z.ZodObject<{
         }, z.core.$strip>, z.ZodObject<{
             type: z.ZodLiteral<import("..").PinchConditionType.MIN_OWN_SCORE>;
             score: z.ZodNumber;
+        }, z.core.$strip>, z.ZodObject<{
+            type: z.ZodLiteral<import("..").PinchConditionType.MIN_OPPONENT_SCORE>;
+            score: z.ZodNumber;
         }, z.core.$strip>], "type">>>;
         conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
     }, z.core.$strip>>>;

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

@@ -28,8 +28,13 @@ export declare const TeamInputSchema: z.ZodObject<{
         designatedSubs: z.ZodDefault<z.ZodArray<z.ZodObject<{
             starter: z.ZodCustom<Player, Player>;
             bench: z.ZodOptional<z.ZodCustom<Player, Player>>;
-            isPinchServer: z.ZodBoolean;
-            fatigueBand: z.ZodOptional<z.ZodUnion<readonly [z.ZodEnum<typeof import("..").EnergyBand>, z.ZodLiteral<"NEVER">]>>;
+            mode: z.ZodEnum<{
+                NEVER: "NEVER";
+                FATIGUE: "FATIGUE";
+                PINCH: "PINCH";
+            }>;
+            fatigueBand: z.ZodOptional<z.ZodEnum<typeof import("..").EnergyBand>>;
+            fatigueBandsBySet: z.ZodOptional<z.ZodArray<z.ZodEnum<typeof import("..").EnergyBand>>>;
             conditions: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.ASAP>;
             }, z.core.$strip>, z.ZodObject<{
@@ -52,6 +57,9 @@ export declare const TeamInputSchema: z.ZodObject<{
             }, z.core.$strip>, z.ZodObject<{
                 type: z.ZodLiteral<import("..").PinchConditionType.MIN_OWN_SCORE>;
                 score: z.ZodNumber;
+            }, z.core.$strip>, z.ZodObject<{
+                type: z.ZodLiteral<import("..").PinchConditionType.MIN_OPPONENT_SCORE>;
+                score: z.ZodNumber;
             }, z.core.$strip>], "type">>>;
             conditionLogic: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"ALL">, z.ZodLiteral<"ANY">]>>;
         }, z.core.$strip>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "volleyballsimtypes",
-  "version": "0.0.396",
+  "version": "0.0.398",
   "description": "vbsim types",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",