volleyballsimtypes 0.0.504 → 0.0.506

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, BlockingAssignment, CourtPosition, ConditionLogic, EnergyBand, MatchForfeitType, PerformanceStats, PinchCondition, RotationSystemEnum, SubBackMode, SubBand } from '../service';
+import { BaseConfig, 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, BlockingAssignment, DefenceFormation, CourtPosition, ConditionLogic, EnergyBand, MatchForfeitType, PerformanceStats, PinchCondition, RotationSystemEnum, SubBackMode, SubBand } from '../service';
 export * from './tactics-player-refs';
 export type Rally = DataProps<_Rally> & {
     homePlayerPosition: PlayerPosition[];
@@ -102,7 +102,7 @@ export interface ApiOffensivePreference {
 }
 export interface ApiBlockingPreference {
     rotation: number;
-    targets: Record<string, BlockingAssignment>;
+    targets: Record<DefenceFormation, Record<string, BlockingAssignment>>;
 }
 export interface ApiSystemSet {
     rotationSystem: RotationSystemEnum;
@@ -140,6 +140,7 @@ export interface Tactics {
     systemSets?: ApiSystemSet[];
     offensivePreferenceSets?: ApiOffensivePreference[][];
     serveAttackShares?: Record<string, number>;
+    basePositions?: BaseConfig;
     blockingPreferences: ApiBlockingPreference[];
     blockingPreferenceSets?: ApiBlockingPreference[][];
     replaceKnockedImmediately?: Record<string, boolean>;

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

@@ -26,8 +26,8 @@ export function collectTacticsPlayerIds(config) {
         ...((config.offensivePreferences ?? []).flatMap(p => Object.keys(p.weights))),
         ...((config.systemSets ?? []).flatMap(s => s.designatedSetters)),
         ...((config.offensivePreferenceSets ?? []).flat().flatMap(p => Object.keys(p.weights))),
-        ...((config.blockingPreferences ?? []).flatMap(p => Object.keys(p.targets))),
-        ...((config.blockingPreferenceSets ?? []).flat().flatMap(p => Object.keys(p.targets))),
+        ...((config.blockingPreferences ?? []).flatMap(p => Object.values(p.targets).flatMap(m => Object.keys(m ?? {})))),
+        ...((config.blockingPreferenceSets ?? []).flat().flatMap(p => Object.values(p.targets).flatMap(m => Object.keys(m ?? {})))),
         // Injury replacements reference reserves (roster players outside the lineup); roster membership is the only
         // player check possible here (the schema enforces the bench/reserve role rules).
         ...((config.injuryReplacements ?? []).flatMap(ir => [ir.starterId, ir.replacementId, ir.benchBackfillId])),

package/dist/esm/src/data/init-models.js

@@ -1,4 +1,4 @@
-import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, ScoutModel, PhysicianModel, PhysiotherapistModel, BoxScoreTotalsModel, CompetitionChampionModel, CurrencyTransactionModel, GachaPityModel, GachaPullHistoryModel, WishlistModel, UserSettingsModel, UserDeviceTokenModel, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, PlayerDeclineLogModel, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, FriendlyModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, LineupPresetModel, MatchPresetModel, EventModel, EventCompetitionModel, EventSquadModel, EventPackModel, EventPackPlayerModel, EventResultModel, EventBotTeamModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel, AppConfigModel, LegacyTeamFlagModel } from './models';
+import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, ScoutModel, PhysicianModel, PhysiotherapistModel, BoxScoreTotalsModel, CompetitionChampionModel, CurrencyTransactionModel, GachaPityModel, GachaPullHistoryModel, WishlistModel, UserSettingsModel, UserDeviceTokenModel, BasePositionPresetModel, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, PlayerDeclineLogModel, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, FriendlyModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, LineupPresetModel, MatchPresetModel, EventModel, EventCompetitionModel, EventSquadModel, EventPackModel, EventPackPlayerModel, EventResultModel, EventBotTeamModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel, AppConfigModel, LegacyTeamFlagModel } from './models';
 export function initModels(sequelize) {
     const Coach = CoachModel.initModel(sequelize);
     const Scout = ScoutModel.initModel(sequelize);
@@ -24,6 +24,7 @@ export function initModels(sequelize) {
     const Wishlist = WishlistModel.initModel(sequelize);
     const UserSettings = UserSettingsModel.initModel(sequelize);
     const UserDeviceToken = UserDeviceTokenModel.initModel(sequelize);
+    const BasePositionPreset = BasePositionPresetModel.initModel(sequelize);
     const Notification = NotificationModel.initModel(sequelize);
     const AuthIdentity = AuthIdentityModel.initModel(sequelize);
     const AuthSession = AuthSessionModel.initModel(sequelize);
@@ -72,8 +73,10 @@ export function initModels(sequelize) {
     AuthUser.hasOne(Wishlist, { as: 'Wishlist', foreignKey: 'user_id' });
     AuthUser.hasOne(UserSettings, { as: 'UserSettings', foreignKey: 'user_id' });
     AuthUser.hasMany(UserDeviceToken, { as: 'UserDeviceTokens', foreignKey: 'user_id' });
+    AuthUser.hasMany(BasePositionPreset, { as: 'BasePositionPresets', foreignKey: 'user_id' });
     AuthUser.hasMany(Notification, { as: 'Notifications', foreignKey: 'user_id' });
     UserDeviceToken.belongsTo(AuthUser, { as: 'user', foreignKey: 'user_id' });
+    BasePositionPreset.belongsTo(AuthUser, { as: 'user', foreignKey: 'user_id' });
     Notification.belongsTo(AuthUser, { as: 'user', foreignKey: 'user_id' });
     AuthUser.hasMany(GachaPullHistory, { as: 'GachaPullHistory', foreignKey: 'user_id' });
     AuthUser.hasMany(UserPullGrant, { as: 'UserPullGrants', foreignKey: 'user_id' });
@@ -351,6 +354,7 @@ export function initModels(sequelize) {
         Wishlist,
         UserSettings,
         UserDeviceToken,
+        BasePositionPreset,
         Notification,
         Coach,
         Scout,

package/dist/esm/src/data/models/base-position-preset.d.ts

@@ -0,0 +1,22 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+import { BaseConfig } from '../../service';
+export interface BasePositionPresetAttributes {
+    preset_id: string;
+    user_id: string;
+    name: string;
+    config: BaseConfig;
+    created_at?: Date;
+}
+export type BasePositionPresetPk = 'preset_id';
+export type BasePositionPresetId = BasePositionPresetModel[BasePositionPresetPk];
+export type BasePositionPresetOptionalAttributes = 'preset_id' | 'created_at';
+export type BasePositionPresetCreationAttributes = Optional<BasePositionPresetAttributes, BasePositionPresetOptionalAttributes>;
+export declare class BasePositionPresetModel extends Model<BasePositionPresetAttributes, BasePositionPresetCreationAttributes> implements BasePositionPresetAttributes {
+    preset_id: string;
+    user_id: string;
+    name: string;
+    config: BaseConfig;
+    created_at?: Date;
+    static initModel(sequelize: Sequelize.Sequelize): typeof BasePositionPresetModel;
+}

package/dist/esm/src/data/models/base-position-preset.js

@@ -0,0 +1,50 @@
+import { DataTypes, Model } from 'sequelize';
+export class BasePositionPresetModel extends Model {
+    static initModel(sequelize) {
+        return BasePositionPresetModel.init({
+            preset_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                defaultValue: DataTypes.UUIDV4
+            },
+            user_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'AuthUser',
+                    key: 'user_id'
+                }
+            },
+            name: {
+                type: DataTypes.STRING,
+                allowNull: false
+            },
+            config: {
+                type: DataTypes.JSONB,
+                allowNull: false
+            },
+            created_at: {
+                type: DataTypes.DATE,
+                allowNull: false,
+                defaultValue: DataTypes.NOW
+            }
+        }, {
+            sequelize,
+            tableName: 'BasePositionPreset',
+            schema: 'public',
+            timestamps: false,
+            indexes: [
+                {
+                    name: 'BasePositionPreset_pk',
+                    unique: true,
+                    fields: [{ name: 'preset_id' }]
+                },
+                {
+                    name: 'BasePositionPreset_user_id_idx',
+                    fields: [{ name: 'user_id' }]
+                }
+            ]
+        });
+    }
+}

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

@@ -38,6 +38,7 @@ export * from './team';
 export * from './team-replacement';
 export * from './tactics';
 export * from './lineup-preset';
+export * from './base-position-preset';
 export * from './event';
 export * from './event-competition';
 export * from './event-bot-team';

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

@@ -38,6 +38,7 @@ export * from './team';
 export * from './team-replacement';
 export * from './tactics';
 export * from './lineup-preset';
+export * from './base-position-preset';
 export * from './event';
 export * from './event-competition';
 export * from './event-bot-team';

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 { BlockingAssignment, ConditionLogic, CourtPosition, EnergyBand, PinchCondition, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../../service';
+import { BaseConfig, BlockingAssignment, ConditionLogic, CourtPosition, DefenceFormation, EnergyBand, PinchCondition, RotationSystemEnum, SubBackMode, SubBand, SubMode } from '../../service';
 export interface TacticsLineupAttributes {
     [CourtPosition.LIBERO_ZONE]?: PlayerId;
     [CourtPosition.LEFT_BACK]: PlayerId;
@@ -36,7 +36,7 @@ export interface OffensivePreferenceAttributes {
 }
 export interface BlockingPreferenceAttributes {
     rotation: number;
-    targets: Record<PlayerId, BlockingAssignment>;
+    targets: Record<DefenceFormation, Record<PlayerId, BlockingAssignment>>;
 }
 export interface SystemSetAttributes {
     rotationSystem: RotationSystemEnum;
@@ -82,10 +82,11 @@ export interface TacticsAttributes {
     libero_injury?: LiberoInjuryAttributes;
     blocking_preferences: BlockingPreferenceAttributes[];
     blocking_preference_sets?: BlockingPreferenceAttributes[][];
+    base_positions?: BaseConfig;
 }
 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';
+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 TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
@@ -108,6 +109,7 @@ export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreati
     libero_injury?: LiberoInjuryAttributes;
     blocking_preferences: BlockingPreferenceAttributes[];
     blocking_preference_sets?: BlockingPreferenceAttributes[][];
+    base_positions?: BaseConfig;
     team: TeamModel;
     getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;

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

@@ -97,6 +97,10 @@ export class TacticsModel extends Model {
             blocking_preference_sets: {
                 type: DataTypes.JSONB,
                 allowNull: true
+            },
+            base_positions: {
+                type: DataTypes.JSONB,
+                allowNull: true
             }
         }, {
             sequelize,

package/dist/esm/src/data/transformers/rally-event-injury.test.js

@@ -39,7 +39,7 @@ describe('rally-event compact round trip — incident marker on the causing even
             score: 62.5,
             target: 4,
             failure: SpikeFailureEnum.NO_FAILURE,
-            type: SpikeTypeEnum.CROSS_SHOT,
+            type: SpikeTypeEnum.SPIKE,
             ...(incident != null ? { incident } : {})
         });
     }

package/dist/esm/src/data/transformers/rally-event-positional.test.js

@@ -12,7 +12,7 @@ describe('rally-event compact round trip -- positional fields (coords / speed /
             score: 60,
             target: 4,
             failure: SpikeFailureEnum.NO_FAILURE,
-            type: SpikeTypeEnum.CROSS_SHOT,
+            type: SpikeTypeEnum.SPIKE,
             contact: { x: 1.234, y: -0.5 },
             landing: { x: -2.5, y: 6.789 },
             speed: 92.456
@@ -41,7 +41,7 @@ describe('rally-event compact round trip -- positional fields (coords / speed /
         expect(decoded.digQuality).toBe(DigQualityEnum.MEDIOCRE);
     });
     it('omits the positional keys when absent, and a legacy event decodes them as undefined', () => {
-        const spike = Spike.create({ playerId, score: 60, target: 4, failure: SpikeFailureEnum.NO_FAILURE, type: SpikeTypeEnum.CROSS_SHOT });
+        const spike = Spike.create({ playerId, score: 60, target: 4, failure: SpikeFailureEnum.NO_FAILURE, type: SpikeTypeEnum.SPIKE });
         const compact = transformToCompact(spike, playerIndex);
         expect('c' in compact).toBe(false);
         expect('v' in compact).toBe(false);
@@ -51,4 +51,12 @@ describe('rally-event compact round trip -- positional fields (coords / speed /
         expect(decoded.speed).toBeUndefined();
         expect(decoded.digQuality).toBeUndefined();
     });
+    it('collapses legacy LINE_SHOT(1)/REVERSE_CROSS(2) to SPIKE(0) on decode (owner 2026-08-03)', () => {
+        // A zone-engine match persisted before the collapse carries type 1 or 2 in its jsonb; decode heals them to
+        // SPIKE so the match still opens. TIP(3) and up are untouched.
+        const base = transformToCompact(Spike.create({ playerId, score: 60, target: 4, failure: SpikeFailureEnum.NO_FAILURE, type: SpikeTypeEnum.SPIKE }), playerIndex);
+        expect(transformToSpike({ ...base, t: 1 }, roster).type).toBe(SpikeTypeEnum.SPIKE);
+        expect(transformToSpike({ ...base, t: 2 }, roster).type).toBe(SpikeTypeEnum.SPIKE);
+        expect(transformToSpike({ ...base, t: 3 }, roster).type).toBe(SpikeTypeEnum.TIP);
+    });
 });

package/dist/esm/src/data/transformers/rally-event.js

@@ -127,7 +127,9 @@ export function transformToSet(event, roster) {
 export function transformToSpike(event, roster) {
     return Spike.create({
         failure: event.f,
-        type: event.t,
+        // Legacy LINE_SHOT(1)/REVERSE_CROSS(2) collapse to SPIKE(0) (owner 2026-08-03): direction is redundant with
+        // the stored contact+landing coords. Maps old zone-engine matches so they keep decoding; new events emit 0/3-6.
+        type: event.t === 1 || event.t === 2 ? 0 : event.t,
         playerId: roster[event.p],
         target: event.a,
         score: event.s,

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

@@ -17,7 +17,7 @@ describe('rally compact round trip — every event type', () => {
         Serve.create({ playerId: pA, target: 6, score: 55, failure: ServeFailureEnum.NO_FAILURE, type: ServeTypeEnum.JUMP_TOPSPIN }),
         Reception.create({ playerId: pB, target: 5, score: 50, failure: ReceptionFailureEnum.NO_FAILURE, type: ReceptionTypeEnum.DIG }),
         VolleySet.create({ playerId: pC, target: 3, score: 48, failure: SetFailureEnum.NO_FAILURE, type: SetTypeEnum.OVERHAND, tempo: SetTempoEnum.FIRST }),
-        Spike.create({ playerId: pA, target: 4, score: 62.5, failure: SpikeFailureEnum.NO_FAILURE, type: SpikeTypeEnum.CROSS_SHOT }),
+        Spike.create({ playerId: pA, target: 4, score: 62.5, failure: SpikeFailureEnum.NO_FAILURE, type: SpikeTypeEnum.SPIKE }),
         Block.create({ playerId: pB, blockers: [pB, pC], target: 8, score: 48, failure: BlockFailureEnum.NO_FAILURE, type: BlockTypeEnum.DOUBLE }),
         FreeBall.create({ playerId: pC, target: 6, score: 45, failure: FreeBallFailureEnum.NO_FAILURE, type: FreeBallTypeEnum.OVER })
     ];
@@ -47,7 +47,7 @@ describe('rally compact round trip — every event type', () => {
         expect(rec.type).toBe(ReceptionTypeEnum.DIG);
         expect(set.type).toBe(SetTypeEnum.OVERHAND);
         expect(set.tempo).toBe(SetTempoEnum.FIRST);
-        expect(spike.type).toBe(SpikeTypeEnum.CROSS_SHOT);
+        expect(spike.type).toBe(SpikeTypeEnum.SPIKE);
         expect(spike.score).toBe(62.5);
         expect(block.type).toBe(BlockTypeEnum.DOUBLE);
         expect(block.blockers).toEqual([pB, pC]);

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

@@ -80,6 +80,7 @@ function transformToAttributes(tactics, teamId) {
             tempos: p.tempos
         }))),
         serve_attack_shares: tactics.serveAttackShares ?? {},
+        base_positions: tactics.basePositions,
         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,
@@ -201,6 +202,7 @@ function transformToObject(model, roster) {
             }
             return healed;
         })(),
+        basePositions: model.base_positions ?? undefined,
         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
@@ -361,6 +363,7 @@ function tacticsColumnsToApiDto(model) {
             }
             return Object.keys(healed).length > 0 ? healed : undefined;
         })(),
+        basePositions: model.base_positions ?? undefined,
         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
@@ -469,6 +472,7 @@ function apiTacticsConfigToAttributes(config, teamId) {
         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,
         replace_knocked_immediately: config.replaceKnockedImmediately,

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

@@ -225,6 +225,30 @@ describe('per-set tactics — service <-> row round-trip', () => {
         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 } } } },
+            receive: { 1: { 5: true, 2: false }, 4: { 6: true } }
+        };
+        const withBases = Tactics.create({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: [],
+            basePositions: config
+        });
+        const attrs = transformFromTactics(withBases, 'team-1');
+        expect(attrs.base_positions).toEqual(config);
+        const back = transformToTactics(attrs, roster);
+        expect(back.basePositions).toEqual(config);
+    });
+    it('leaves basePositions undefined when the column is absent', () => {
+        const attrs = transformFromTactics(Tactics.create({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: []
+        }), 'team-1');
+        expect(attrs.base_positions).toBeUndefined();
+        const back = transformToTactics(attrs, roster);
+        expect(back.basePositions).toBeUndefined();
+    });
     it('round-trips a per-starter tempos map on offensive preferences', () => {
         const withTempos = Tactics.create({
             lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
@@ -238,18 +262,18 @@ describe('per-set tactics — service <-> row round-trip', () => {
         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', () => {
+    it('round-trips blocking preferences as per-defence-side 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 } }]
+            blockingPreferences: [{ rotation: 1, targets: { DEF_L: { [p4.id]: RoleEnum.OUTSIDE_HITTER }, DEF_R: { [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 } }
+            { rotation: 1, targets: { DEF_L: { [p4.id]: RoleEnum.OUTSIDE_HITTER }, DEF_M: {}, DEF_R: { [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 });
+        expect(back.blockingPreferences[0].targets).toEqual({ DEF_L: { [p4.id]: RoleEnum.OUTSIDE_HITTER }, DEF_M: {}, DEF_R: { [p3.id]: RoleEnum.MIDDLE_BLOCKER } });
     });
     // NO_BLOCK rides in the same targets map as a commit assignment, so the transformers copy it wholesale with no
     // mapping code. This pins that: the sentinel must survive the row round-trip verbatim, mixed with a commit, and
@@ -258,17 +282,17 @@ describe('per-set tactics — service <-> row round-trip', () => {
         const withNoBlock = Tactics.create({
             lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
             liberoReplacements: [],
-            blockingPreferences: [{ rotation: 1, targets: { [p4.id]: NO_BLOCK, [p3.id]: RoleEnum.MIDDLE_BLOCKER } }],
-            blockingPreferenceSets: [[{ rotation: 2, targets: { [p2.id]: NO_BLOCK } }]]
+            blockingPreferences: [{ rotation: 1, targets: { DEF_M: { [p4.id]: NO_BLOCK, [p3.id]: RoleEnum.MIDDLE_BLOCKER } } }],
+            blockingPreferenceSets: [[{ rotation: 2, targets: { DEF_L: { [p2.id]: NO_BLOCK } } }]]
         });
         const attrs = transformFromTactics(withNoBlock, 'team-1');
         expect(attrs.blocking_preferences).toEqual([
-            { rotation: 1, targets: { [p4.id]: NO_BLOCK, [p3.id]: RoleEnum.MIDDLE_BLOCKER } }
+            { rotation: 1, targets: { DEF_L: {}, DEF_M: { [p4.id]: NO_BLOCK, [p3.id]: RoleEnum.MIDDLE_BLOCKER }, DEF_R: {} } }
         ]);
-        expect(attrs.blocking_preference_sets).toEqual([[{ rotation: 2, targets: { [p2.id]: NO_BLOCK } }]]);
+        expect(attrs.blocking_preference_sets).toEqual([[{ rotation: 2, targets: { DEF_L: { [p2.id]: NO_BLOCK }, DEF_M: {}, DEF_R: {} } }]]);
         const back = transformToTactics(attrs, roster);
-        expect(back.blockingPreferences[0].targets).toEqual({ [p4.id]: NO_BLOCK, [p3.id]: RoleEnum.MIDDLE_BLOCKER });
-        expect(back.blockingPreferenceSets?.[0][0].targets).toEqual({ [p2.id]: NO_BLOCK });
+        expect(back.blockingPreferences[0].targets).toEqual({ DEF_L: {}, DEF_M: { [p4.id]: NO_BLOCK, [p3.id]: RoleEnum.MIDDLE_BLOCKER }, DEF_R: {} });
+        expect(back.blockingPreferenceSets?.[0][0].targets).toEqual({ DEF_L: { [p2.id]: NO_BLOCK }, DEF_M: {}, DEF_R: {} });
     });
 });
 describe('libero injuries — service <-> row round-trip + lenient heal', () => {

package/dist/esm/src/service/competition/competition-rewards.d.ts

@@ -0,0 +1,20 @@
+export type CompetitionRewardKind = 'REGIONAL' | 'NATIONAL' | 'WCC';
+export interface CompetitionRewardRow {
+    /** Best final position that still earns this row: the "Top N" band. */
+    readonly maxPosition: number;
+    /** Coins awarded by this row alone (the increment, not the running total). */
+    readonly coins: number;
+    /** Recruit-reward pulls awarded by this row alone (the competition's own pull type). */
+    readonly recruits: number;
+}
+/** Per-competition bands, widest band first (the order the docs list them, with a growing cumulative total). */
+export declare const COMPETITION_REWARDS: Readonly<Record<CompetitionRewardKind, readonly CompetitionRewardRow[]>>;
+export interface CompetitionPayout {
+    readonly coins: number;
+    readonly recruits: number;
+}
+/**
+ * Everything a finishing position earns in the given competition: the sum of every band that still includes the
+ * position (cumulative). Positions past the lowest band earn nothing. `position` is the 1-based final placement.
+ */
+export declare function competitionPayoutFor(kind: CompetitionRewardKind, position: number): CompetitionPayout;

package/dist/esm/src/service/competition/competition-rewards.js

@@ -0,0 +1,43 @@
+// What the knockout competitions (Regional Cup, National Cup, WCC) pay out by final placement. Owner-defined
+// 2026-08-07. Like the event and league rewards, these are CUMULATIVE: a finish earns its band and every band
+// below it. Each band gives coins and/or "recruit rewards" (the competition's own pull grant: a Regional
+// recruit is a QUALIFIER pull, a National recruit a NATIONAL pull, a WCC recruit a TOURNAMENT pull). Recruit
+// rewards stack, so a champion collects one per qualifying band.
+//
+// One source of truth for two consumers: the simulator grants from it and the UI competition docs render it.
+/** Per-competition bands, widest band first (the order the docs list them, with a growing cumulative total). */
+export const COMPETITION_REWARDS = {
+    REGIONAL: [
+        { maxPosition: 4, coins: 1000, recruits: 0 },
+        { maxPosition: 3, coins: 0, recruits: 1 },
+        { maxPosition: 2, coins: 1000, recruits: 0 },
+        { maxPosition: 1, coins: 500, recruits: 1 }
+    ],
+    NATIONAL: [
+        { maxPosition: 8, coins: 1000, recruits: 0 },
+        { maxPosition: 4, coins: 500, recruits: 1 },
+        { maxPosition: 2, coins: 500, recruits: 0 },
+        { maxPosition: 1, coins: 0, recruits: 1 }
+    ],
+    WCC: [
+        { maxPosition: 4, coins: 1000, recruits: 0 },
+        { maxPosition: 3, coins: 0, recruits: 1 },
+        { maxPosition: 2, coins: 500, recruits: 1 },
+        { maxPosition: 1, coins: 500, recruits: 1 }
+    ]
+};
+/**
+ * Everything a finishing position earns in the given competition: the sum of every band that still includes the
+ * position (cumulative). Positions past the lowest band earn nothing. `position` is the 1-based final placement.
+ */
+export function competitionPayoutFor(kind, position) {
+    let coins = 0;
+    let recruits = 0;
+    for (const row of COMPETITION_REWARDS[kind]) {
+        if (position <= row.maxPosition) {
+            coins += row.coins;
+            recruits += row.recruits;
+        }
+    }
+    return { coins, recruits };
+}

package/dist/esm/src/service/competition/competition-rewards.test.d.ts

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

package/dist/esm/src/service/competition/competition-rewards.test.js

@@ -0,0 +1,30 @@
+import { describe, it, expect } from '@jest/globals';
+import { competitionPayoutFor, COMPETITION_REWARDS } from './competition-rewards';
+// The cumulative per-position totals the owner specified (2026-08-07): { coins, recruits } a finish earns,
+// summing its band and every band below. Positions past the lowest band earn nothing.
+describe('competitionPayoutFor', () => {
+    const CASES = {
+        // position: [coins, recruits]
+        REGIONAL: { 1: [2500, 2], 2: [2000, 1], 3: [1000, 1], 4: [1000, 0], 5: [0, 0] },
+        NATIONAL: { 1: [2000, 2], 2: [2000, 1], 3: [1500, 1], 4: [1500, 1], 5: [1000, 0], 8: [1000, 0], 9: [0, 0] },
+        WCC: { 1: [2000, 3], 2: [1500, 2], 3: [1000, 1], 4: [1000, 0], 5: [0, 0] }
+    };
+    for (const kind of Object.keys(CASES)) {
+        it(`matches the owner totals for ${kind}`, () => {
+            for (const [pos, [coins, recruits]] of Object.entries(CASES[kind])) {
+                expect(competitionPayoutFor(kind, Number(pos))).toEqual({ coins, recruits });
+            }
+        });
+    }
+    it('champion collects one recruit per qualifying band', () => {
+        expect(competitionPayoutFor('REGIONAL', 1).recruits).toBe(2);
+        expect(competitionPayoutFor('NATIONAL', 1).recruits).toBe(2);
+        expect(competitionPayoutFor('WCC', 1).recruits).toBe(3);
+    });
+    it('champion coin total equals the sum of the band table', () => {
+        const sum = (k) => COMPETITION_REWARDS[k].reduce((s, r) => s + r.coins, 0);
+        expect(competitionPayoutFor('REGIONAL', 1).coins).toBe(sum('REGIONAL'));
+        expect(competitionPayoutFor('NATIONAL', 1).coins).toBe(sum('NATIONAL'));
+        expect(competitionPayoutFor('WCC', 1).coins).toBe(sum('WCC'));
+    });
+});

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

@@ -3,6 +3,8 @@ export * from './season';
 export * from './event-schedule';
 export * from './event-draft';
 export * from './event-rewards';
+export * from './league-rewards';
+export * from './competition-rewards';
 export * from './league';
 export * from './division';
 export * from './iteration';

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

@@ -3,6 +3,8 @@ export * from './season';
 export * from './event-schedule';
 export * from './event-draft';
 export * from './event-rewards';
+export * from './league-rewards';
+export * from './competition-rewards';
 export * from './league';
 export * from './division';
 export * from './iteration';

package/dist/esm/src/service/competition/league-rewards.d.ts

@@ -0,0 +1,21 @@
+export interface LeagueRewardRow {
+    /** Best final position that still earns this row: the "Top N" band. */
+    readonly maxPosition: number;
+    /** Coins awarded by this row alone (the increment, not the running total). */
+    readonly coins: number;
+}
+/** Division tiers that get their own reward table. Tier 3 covers "division 3 and lower". */
+export type LeagueRewardTier = 1 | 2 | 3;
+/**
+ * Per-tier bands, widest band first (the order the standings doc lists them, with a growing cumulative total).
+ * A team earns every row whose band still includes its finishing position, which is what "cumulative" means.
+ */
+export declare const LEAGUE_REWARDS: Readonly<Record<LeagueRewardTier, readonly LeagueRewardRow[]>>;
+/** Clamp any division tier to a reward table: tier 1, tier 2, and tier 3-and-lower share the tier-3 table. */
+export declare function leagueRewardTier(tier: number): LeagueRewardTier;
+/**
+ * Coins a finishing position earns in a division of the given tier: the sum of every band that still includes
+ * the position (cumulative). Positions past the lowest band earn 0. `position` is the 1-based final standings
+ * place.
+ */
+export declare function leaguePayoutFor(tier: number, position: number): number;

package/dist/esm/src/service/competition/league-rewards.js

@@ -0,0 +1,53 @@
+// What a league season pays out at the end, by division tier and final standings position. Owner-defined
+// 2026-08-07. Like the event rewards, these are CUMULATIVE: a team collects its own band and every band below
+// it, so first place collects them all. Positions past the lowest band earn nothing.
+//
+// One source of truth for two consumers: the simulator grants from it (assignSeasonPayoutIfMissing) and the UI
+// standings doc renders it.
+/**
+ * Per-tier bands, widest band first (the order the standings doc lists them, with a growing cumulative total).
+ * A team earns every row whose band still includes its finishing position, which is what "cumulative" means.
+ */
+export const LEAGUE_REWARDS = {
+    1: [
+        { maxPosition: 12, coins: 1000 },
+        { maxPosition: 8, coins: 500 },
+        { maxPosition: 4, coins: 500 },
+        { maxPosition: 3, coins: 250 },
+        { maxPosition: 2, coins: 250 },
+        { maxPosition: 1, coins: 500 }
+    ],
+    2: [
+        { maxPosition: 8, coins: 500 },
+        { maxPosition: 4, coins: 500 },
+        { maxPosition: 2, coins: 250 },
+        { maxPosition: 1, coins: 250 }
+    ],
+    3: [
+        { maxPosition: 4, coins: 500 },
+        { maxPosition: 2, coins: 250 },
+        { maxPosition: 1, coins: 250 }
+    ]
+};
+/** Clamp any division tier to a reward table: tier 1, tier 2, and tier 3-and-lower share the tier-3 table. */
+export function leagueRewardTier(tier) {
+    const t = Math.trunc(tier);
+    if (t <= 1)
+        return 1;
+    if (t === 2)
+        return 2;
+    return 3;
+}
+/**
+ * Coins a finishing position earns in a division of the given tier: the sum of every band that still includes
+ * the position (cumulative). Positions past the lowest band earn 0. `position` is the 1-based final standings
+ * place.
+ */
+export function leaguePayoutFor(tier, position) {
+    let coins = 0;
+    for (const row of LEAGUE_REWARDS[leagueRewardTier(tier)]) {
+        if (position <= row.maxPosition)
+            coins += row.coins;
+    }
+    return coins;
+}

package/dist/esm/src/service/competition/league-rewards.test.d.ts

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