volleyballsimtypes 0.0.427 → 0.0.429

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

@@ -114,6 +114,13 @@ export interface Tactics {
     designatedSetters: string[];
     offensivePreferences: ApiOffensivePreference[];
 }
+export interface ApiLineupPreset {
+    presetId: string;
+    name: string;
+    isActive: boolean;
+    orderIndex: number;
+    config: Tactics;
+}
 export type Team = Omit<DataProps<_Team>, 'roster' | '_rating' | 'rating' | 'tactics'> & {
     roster: Player[];
     rating: {

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

@@ -7,6 +7,7 @@ function initModels(sequelize) {
     const Scout = models_1.ScoutModel.initModel(sequelize);
     const CurrencyTransaction = models_1.CurrencyTransactionModel.initModel(sequelize);
     const Tactics = models_1.TacticsModel.initModel(sequelize);
+    const LineupPreset = models_1.LineupPresetModel.initModel(sequelize);
     const AuthUser = models_1.AuthUserModel.initModel(sequelize);
     const UserCurrency = models_1.UserCurrencyModel.initModel(sequelize);
     const UserPlayerProgress = models_1.UserPlayerProgressModel.initModel(sequelize);
@@ -199,6 +200,10 @@ function initModels(sequelize) {
     Team.hasOne(Scout, { as: 'Scout', foreignKey: 'team_id' });
     Scout.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Team.hasOne(Tactics, { as: 'tactics', foreignKey: 'team_id' });
+    // Lineup presets are loaded only by the management API; deliberately NOT in Team.defaultScope so the
+    // simulator's team loads are unchanged (it reads the active config from the mirrored Tactics row).
+    Team.hasMany(LineupPreset, { as: 'lineupPresets', foreignKey: 'team_id' });
+    LineupPreset.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Team.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Team.belongsToMany(Competition, {
         as: 'Competitions',
@@ -270,6 +275,7 @@ function initModels(sequelize) {
         Team,
         TeamReplacement,
         Tactics,
+        LineupPreset,
         UserTeam,
         UserCurrency,
         UserPlayerProgress,

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

@@ -33,6 +33,7 @@ export * from './scout';
 export * from './team';
 export * from './team-replacement';
 export * from './tactics';
+export * from './lineup-preset';
 export * from './user-currency';
 export * from './user-player-progress';
 export * from './gacha-pity';

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

@@ -49,6 +49,7 @@ __exportStar(require("./scout"), exports);
 __exportStar(require("./team"), exports);
 __exportStar(require("./team-replacement"), exports);
 __exportStar(require("./tactics"), exports);
+__exportStar(require("./lineup-preset"), exports);
 __exportStar(require("./user-currency"), exports);
 __exportStar(require("./user-player-progress"), exports);
 __exportStar(require("./gacha-pity"), exports);

package/dist/cjs/src/data/models/lineup-preset.d.ts

@@ -0,0 +1,29 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+import { TeamId, TeamModel } from '.';
+import type { Tactics as ApiTactics } from '../../api';
+export interface LineupPresetAttributes {
+    preset_id: string;
+    team_id: string;
+    name: string;
+    is_active: boolean;
+    order_index: number;
+    config: ApiTactics;
+}
+export type LineupPresetPk = 'preset_id';
+export type LineupPresetId = LineupPresetModel[LineupPresetPk];
+export type LineupPresetOptionalAttributes = 'preset_id' | 'is_active';
+export type LineupPresetCreationAttributes = Optional<LineupPresetAttributes, LineupPresetOptionalAttributes>;
+export declare class LineupPresetModel extends Model<LineupPresetAttributes, LineupPresetCreationAttributes> implements LineupPresetAttributes {
+    preset_id: string;
+    team_id: string;
+    name: string;
+    is_active: boolean;
+    order_index: number;
+    config: ApiTactics;
+    team: TeamModel;
+    getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
+    setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;
+    createTeam: Sequelize.BelongsToCreateAssociationMixin<TeamModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof LineupPresetModel;
+}

package/dist/cjs/src/data/models/lineup-preset.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LineupPresetModel = void 0;
+const sequelize_1 = require("sequelize");
+class LineupPresetModel extends sequelize_1.Model {
+    static initModel(sequelize) {
+        return LineupPresetModel.init({
+            preset_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                defaultValue: sequelize_1.DataTypes.UUIDV4
+            },
+            team_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'Team',
+                    key: 'team_id'
+                }
+            },
+            name: {
+                type: sequelize_1.DataTypes.STRING,
+                allowNull: false
+            },
+            is_active: {
+                type: sequelize_1.DataTypes.BOOLEAN,
+                allowNull: false,
+                defaultValue: false
+            },
+            order_index: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false
+            },
+            config: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: false
+            }
+        }, {
+            sequelize,
+            tableName: 'LineupPreset',
+            schema: 'public',
+            timestamps: false,
+            indexes: [
+                {
+                    name: 'LineupPreset_pk',
+                    unique: true,
+                    fields: [
+                        { name: 'preset_id' }
+                    ]
+                },
+                {
+                    name: 'LineupPreset_team_id_idx',
+                    fields: [
+                        { name: 'team_id' }
+                    ]
+                },
+                {
+                    // At most one active preset per team.
+                    name: 'LineupPreset_one_active_per_team',
+                    unique: true,
+                    fields: [
+                        { name: 'team_id' }
+                    ],
+                    where: { is_active: true }
+                }
+            ]
+        });
+    }
+}
+exports.LineupPresetModel = LineupPresetModel;

package/dist/cjs/src/data/transformers/index.d.ts

@@ -26,4 +26,5 @@ export * from './national';
 export * from './national-match';
 export * from './team';
 export * from './tactics';
+export * from './lineup-preset';
 export * from './vper';

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

@@ -42,4 +42,5 @@ __exportStar(require("./national"), exports);
 __exportStar(require("./national-match"), exports);
 __exportStar(require("./team"), exports);
 __exportStar(require("./tactics"), exports);
+__exportStar(require("./lineup-preset"), exports);
 __exportStar(require("./vper"), exports);

package/dist/cjs/src/data/transformers/lineup-preset.d.ts

@@ -0,0 +1,4 @@
+import { LineupPresetModel } from '../models';
+import type { ApiLineupPreset } from '../../api';
+declare function transformToObject(model: LineupPresetModel): ApiLineupPreset;
+export { transformToObject as transformToLineupPreset };

package/dist/cjs/src/data/transformers/lineup-preset.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformToLineupPreset = transformToObject;
+// `config` is already stored as the API Tactics DTO, so a preset row maps to its API shape with no hydration.
+function transformToObject(model) {
+    return {
+        presetId: model.preset_id,
+        name: model.name,
+        isActive: model.is_active,
+        orderIndex: model.order_index,
+        config: model.config
+    };
+}

package/dist/cjs/src/data/transformers/lineup-preset.test.d.ts

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

package/dist/cjs/src/data/transformers/lineup-preset.test.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const lineup_preset_1 = require("./lineup-preset");
+(0, globals_1.describe)('transformToLineupPreset()', () => {
+    (0, globals_1.it)('maps preset columns to the API shape and passes config through by reference', () => {
+        const config = { lineup: { bench: [] }, substitutionBand: 'TIRED' };
+        const preset = (0, lineup_preset_1.transformToLineupPreset)({
+            preset_id: 'p1',
+            team_id: 't1',
+            name: 'Starters',
+            is_active: true,
+            order_index: 2,
+            config
+        });
+        (0, globals_1.expect)(preset).toEqual({
+            presetId: 'p1',
+            name: 'Starters',
+            isActive: true,
+            orderIndex: 2,
+            config
+        });
+        (0, globals_1.expect)(preset.config).toBe(config);
+    });
+});

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

@@ -1,5 +1,7 @@
 import { TacticsAttributes, TacticsModel } from '../models';
 import { Player, Tactics } from '../../service';
+import type { Tactics as ApiTactics } from '../../api';
 declare function transformToAttributes(tactics: Tactics, teamId: string): TacticsAttributes;
 declare function transformToObject(model: TacticsModel, roster: Player[]): Tactics;
-export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics };
+declare function tacticsColumnsToApiDto(model: TacticsModel): ApiTactics;
+export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics, tacticsColumnsToApiDto };

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformToTactics = transformToObject;
 exports.transformFromTactics = transformToAttributes;
+exports.tacticsColumnsToApiDto = tacticsColumnsToApiDto;
 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
@@ -137,3 +138,40 @@ function transformToObject(model, roster) {
         }))
     });
 }
+// Serialize a Tactics ROW (db columns) straight to the API Tactics DTO (player references stay as ids; no
+// roster needed). Used to seed a lineup preset's `config` from the existing single tactics row (backfill) and
+// to keep the active preset and the mirrored Tactics row in the same shape. Applies the same legacy fixups as
+// the service transformer: resolve the designated-sub `mode` and drop a legacy 'NEVER' fatigueBand.
+function tacticsColumnsToApiDto(model) {
+    return {
+        lineup: model.lineup,
+        substitutionTolerance: model.substitution_tolerance,
+        liberoReplacements: model.libero_replacements,
+        pinchServerSubs: model.pinch_server_subs,
+        receiveRotationOffset: model.receive_rotation_offset,
+        substitutionBand: model.substitution_band,
+        secondLibero: model.second_libero,
+        liberoSub: model.libero_sub,
+        liberoReplacementSets: model.libero_replacement_sets,
+        designatedSubs: (model.designated_subs ?? []).map(d => ({
+            starterId: d.starterId,
+            benchId: d.benchId,
+            mode: subModeFromAttributes(d),
+            fatigueBand: d.fatigueBand === 'NEVER' ? undefined : d.fatigueBand,
+            benchFatigueBand: d.benchFatigueBand,
+            conditions: d.conditions,
+            conditionLogic: d.conditionLogic,
+            sets: d.sets?.map(s => ({
+                mode: s.mode,
+                benchId: s.benchId,
+                fatigueBand: s.fatigueBand,
+                benchFatigueBand: s.benchFatigueBand,
+                conditions: s.conditions,
+                conditionLogic: s.conditionLogic
+            }))
+        })),
+        rotationSystem: model.rotation_system,
+        designatedSetters: model.designated_setters,
+        offensivePreferences: model.offensive_preferences
+    };
+}

package/dist/cjs/src/data/transformers/tactics.test.d.ts

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

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

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const tactics_1 = require("./tactics");
+const service_1 = require("../../service");
+// Minimal TacticsModel-shaped object; cast through unknown since the transformer only reads columns.
+function makeTactics(designatedSubs) {
+    return {
+        team_id: 'team-1',
+        substitution_tolerance: 10,
+        lineup: {
+            [service_1.CourtPosition.LEFT_FRONT]: 'lf',
+            [service_1.CourtPosition.MIDDLE_FRONT]: 'mf',
+            [service_1.CourtPosition.RIGHT_FRONT]: 'rf',
+            [service_1.CourtPosition.LEFT_BACK]: 'lb',
+            [service_1.CourtPosition.MIDDLE_BACK]: 'mb',
+            [service_1.CourtPosition.RIGHT_BACK]: 'rb',
+            bench: ['b1', 'b2']
+        },
+        libero_replacements: ['lf'],
+        pinch_server_subs: { starter1: 'server1' },
+        receive_rotation_offset: true,
+        designated_subs: designatedSubs,
+        substitution_band: service_1.EnergyBand.TIRED,
+        second_libero: undefined,
+        libero_sub: undefined,
+        libero_replacement_sets: undefined,
+        rotation_system: '5-1',
+        designated_setters: ['lf'],
+        offensive_preferences: [{ rotation: 1, order: ['lf', 'rf'] }]
+    };
+}
+(0, globals_1.describe)('tacticsColumnsToApiDto()', () => {
+    (0, globals_1.it)('passes scalar/array columns through to the API DTO shape', () => {
+        const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([]));
+        (0, globals_1.expect)(dto.substitutionTolerance).toBe(10);
+        (0, globals_1.expect)(dto.receiveRotationOffset).toBe(true);
+        (0, globals_1.expect)(dto.substitutionBand).toBe(service_1.EnergyBand.TIRED);
+        (0, globals_1.expect)(dto.rotationSystem).toBe('5-1');
+        (0, globals_1.expect)(dto.liberoReplacements).toEqual(['lf']);
+        (0, globals_1.expect)(dto.pinchServerSubs).toEqual({ starter1: 'server1' });
+        (0, globals_1.expect)(dto.lineup.bench).toEqual(['b1', 'b2']);
+        (0, globals_1.expect)(dto.offensivePreferences).toEqual([{ rotation: 1, order: ['lf', 'rf'] }]);
+    });
+    (0, globals_1.it)("resolves a legacy isPinchServer entry to mode 'PINCH'", () => {
+        const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([
+            { starterId: 's1', benchId: 'b1', isPinchServer: true, conditions: [{ type: 'ASAP' }] }
+        ]));
+        (0, globals_1.expect)(dto.designatedSubs[0].mode).toBe('PINCH');
+    });
+    (0, globals_1.it)("resolves a legacy 'NEVER' fatigueBand to mode NEVER and drops the band", () => {
+        const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([
+            { starterId: 's1', fatigueBand: 'NEVER' }
+        ]));
+        (0, globals_1.expect)(dto.designatedSubs[0].mode).toBe('NEVER');
+        (0, globals_1.expect)(dto.designatedSubs[0].fatigueBand).toBeUndefined();
+    });
+    (0, globals_1.it)('passes a fatigue entry with its own bands through unchanged', () => {
+        const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([
+            { starterId: 's1', benchId: 'b1', mode: 'FATIGUE', fatigueBand: service_1.EnergyBand.WORN, benchFatigueBand: service_1.EnergyBand.TIRED }
+        ]));
+        (0, globals_1.expect)(dto.designatedSubs[0].mode).toBe('FATIGUE');
+        (0, globals_1.expect)(dto.designatedSubs[0].fatigueBand).toBe(service_1.EnergyBand.WORN);
+        (0, globals_1.expect)(dto.designatedSubs[0].benchFatigueBand).toBe(service_1.EnergyBand.TIRED);
+    });
+});

package/dist/cjs/src/service/event/reception.d.ts

@@ -3,9 +3,10 @@ export declare enum ReceptionTypeEnum {
     DIG = 0,
     OVERHAND = 1,
     ONE_HAND = 2,
-    OTHER_BODY_PART = 3
+    OTHER_BODY_PART = 3,
+    NO_TOUCH = 4
 }
-export type ReceptionType = ReceptionTypeEnum.DIG | ReceptionTypeEnum.OVERHAND | ReceptionTypeEnum.ONE_HAND | ReceptionTypeEnum.OTHER_BODY_PART;
+export type ReceptionType = ReceptionTypeEnum.DIG | ReceptionTypeEnum.OVERHAND | ReceptionTypeEnum.ONE_HAND | ReceptionTypeEnum.OTHER_BODY_PART | ReceptionTypeEnum.NO_TOUCH;
 export declare enum ReceptionFailureEnum {
     NO_FAILURE = 0,
     FAULT = 1,

package/dist/cjs/src/service/event/reception.js

@@ -10,6 +10,9 @@ var ReceptionTypeEnum;
     ReceptionTypeEnum[ReceptionTypeEnum["OVERHAND"] = 1] = "OVERHAND";
     ReceptionTypeEnum[ReceptionTypeEnum["ONE_HAND"] = 2] = "ONE_HAND";
     ReceptionTypeEnum[ReceptionTypeEnum["OTHER_BODY_PART"] = 3] = "OTHER_BODY_PART";
+    // The ball was never touched: a serve so good (vs the receiver's reflex) it drops untouched for a
+    // clean ace. Booked as the server's ace only, with no reception attempt/error charged to the passer.
+    ReceptionTypeEnum[ReceptionTypeEnum["NO_TOUCH"] = 4] = "NO_TOUCH";
 })(ReceptionTypeEnum || (exports.ReceptionTypeEnum = ReceptionTypeEnum = {}));
 var ReceptionFailureEnum;
 (function (ReceptionFailureEnum) {

package/dist/cjs/src/service/event/schemas/reception.z.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReceptionInputSchema = void 0;
 const zod_1 = require("zod");
 const player_1 = require("../../player");
-const receptionTypeValues = [0, 1, 2, 3];
+const receptionTypeValues = [0, 1, 2, 3, 4];
 const receptionFailureValues = [0, 1, 2, 3, 4];
 const courtTargetValues = Array.from({ length: 13 }, (_, i) => i);
 exports.ReceptionInputSchema = zod_1.z.object({

package/dist/cjs/src/service/event/schemas/reception.z.test.d.ts

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

package/dist/cjs/src/service/event/schemas/reception.z.test.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const reception_z_1 = require("./reception.z");
+const base = {
+    playerId: '11111111-1111-4111-8111-111111111111',
+    score: 10,
+    target: 5,
+    activeTraits: [],
+    failure: 2,
+    type: 0
+};
+(0, globals_1.describe)('ReceptionInputSchema', () => {
+    (0, globals_1.it)('accepts every reception type 0-4 (incl. NO_TOUCH = 4)', () => {
+        for (const type of [0, 1, 2, 3, 4]) {
+            (0, globals_1.expect)(reception_z_1.ReceptionInputSchema.safeParse({ ...base, type }).success).toBe(true);
+        }
+    });
+    (0, globals_1.it)('rejects an out-of-range reception type', () => {
+        (0, globals_1.expect)(reception_z_1.ReceptionInputSchema.safeParse({ ...base, type: 5 }).success).toBe(false);
+        (0, globals_1.expect)(reception_z_1.ReceptionInputSchema.safeParse({ ...base, type: -1 }).success).toBe(false);
+    });
+    (0, globals_1.it)('rejects an out-of-range reception failure', () => {
+        (0, globals_1.expect)(reception_z_1.ReceptionInputSchema.safeParse({ ...base, failure: 5 }).success).toBe(false);
+    });
+    (0, globals_1.it)('rejects an out-of-range court target', () => {
+        (0, globals_1.expect)(reception_z_1.ReceptionInputSchema.safeParse({ ...base, target: 13 }).success).toBe(false);
+    });
+});

package/dist/cjs/src/service/player/improvement.d.ts

@@ -4,6 +4,7 @@ import { DeclineProfile } from './decline';
 export type TrainingFocus = Stats;
 export declare function getStatCap(rarity: Rarity): number;
 export declare function getRarityMultiplier(rarity: Rarity): number;
+export declare function getImprovementFloor(rarity: Rarity): number;
 export declare function getImprovementThreshold(statTotal: number, rarity: Rarity): number;
 export declare function getCoachMultiplier(rarity: Rarity): number;
 export declare function matchExperience(pointsPlayed: number): number;

package/dist/cjs/src/service/player/improvement.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStatCap = getStatCap;
 exports.getRarityMultiplier = getRarityMultiplier;
+exports.getImprovementFloor = getImprovementFloor;
 exports.getImprovementThreshold = getImprovementThreshold;
 exports.getCoachMultiplier = getCoachMultiplier;
 exports.matchExperience = matchExperience;
@@ -12,9 +13,26 @@ const rarity_1 = require("./rarity");
 const performance_stats_1 = require("./performance-stats");
 const stats_1 = require("./stats");
 const decline_1 = require("./decline");
-const CURVE_BASE = 100;
-const CURVE_SCALAR = 0.098;
-const CURVE_EXPONENT = 1.5;
+// ── Improvement threshold curve (normalize-to-band) ───────────────────────────
+// The exp a player needs to gain +1 stat. Every rarity improves on ONE shared curve, but measured against
+// ITS OWN range: a freshly generated player sits at the floor (improves the fastest) and the stat cap is the
+// ceiling (improves the slowest). `frac` is the player's position from floor to ceiling, so the same relative
+// progress costs the same for every rarity -- rarer players are no longer penalised for their higher skill
+// floor (which is what the old rarity-multiplier divisor failed to offset). Threshold runs from CURVE_BASE at
+// the floor to CURVE_BASE + CURVE_SCALAR at the cap; CURVE_EXPONENT keeps players fast through most of the
+// band and slows them sharply only near the cap.
+const CURVE_BASE = 180;
+const CURVE_SCALAR = 800;
+const CURVE_EXPONENT = 2;
+// Per-rarity floor of the curve: the mean generated core-6 total (attack + serve + block + reception +
+// setting + stamina) for that rarity, measured from PlayerGenerator. The ceiling is 6 * cap.
+const IMPROVEMENT_FLOOR = {
+    [rarity_1.RarityEnum.COMMON]: 180,
+    [rarity_1.RarityEnum.RARE]: 296,
+    [rarity_1.RarityEnum.LEGENDARY]: 346,
+    [rarity_1.RarityEnum.MYTHIC]: 432,
+    [rarity_1.RarityEnum.SPECIAL]: 501
+};
 const statCaps = stat_config_1.statCapsJSON;
 function getStatCap(rarity) {
     const entry = statCaps.find(e => e.rarity === rarity);
@@ -22,16 +40,25 @@ function getStatCap(rarity) {
         throw new Error(`UNKNOWN_RARITY: ${rarity}`);
     return entry.cap;
 }
+// Retained for config/reference. No longer used by the improvement curve -- superseded by IMPROVEMENT_FLOOR,
+// which is the per-rarity adjustment now.
 function getRarityMultiplier(rarity) {
     const entry = statCaps.find(e => e.rarity === rarity);
     if (entry == null)
         throw new Error(`UNKNOWN_RARITY: ${rarity}`);
     return entry.rarityMultiplier;
 }
+function getImprovementFloor(rarity) {
+    const floor = IMPROVEMENT_FLOOR[rarity];
+    if (floor == null)
+        throw new Error(`UNKNOWN_RARITY: ${rarity}`);
+    return floor;
+}
 function getImprovementThreshold(statTotal, rarity) {
-    const rarityMultiplier = getRarityMultiplier(rarity);
-    const raw = CURVE_BASE + CURVE_SCALAR * Math.pow(Math.max(0, statTotal - 6), CURVE_EXPONENT);
-    return Math.round(raw / rarityMultiplier);
+    const floor = getImprovementFloor(rarity);
+    const span = 6 * getStatCap(rarity) - floor;
+    const frac = span <= 0 ? 1 : Math.max(0, Math.min(1, (statTotal - floor) / span));
+    return Math.round(CURVE_BASE + CURVE_SCALAR * Math.pow(frac, CURVE_EXPONENT));
 }
 const COACH_MULTIPLIERS = {
     [rarity_1.RarityEnum.COMMON]: 2.0,

package/dist/cjs/src/service/player/improvement.test.js

@@ -37,24 +37,55 @@ const decline_1 = require("./decline");
 });
 // ─── getImprovementThreshold ──────────────────────────────────────────────────
 (0, globals_1.describe)('getImprovementThreshold()', () => {
-    (0, globals_1.it)('at statTotal=6 the curve exponent term is 0 → threshold = round(100 / rarityMultiplier)', () => {
-        // COMMON (multiplier 1.0): round(100 / 1.0) = 100
-        (0, globals_1.expect)((0, improvement_1.getImprovementThreshold)(6, rarity_1.RarityEnum.COMMON)).toBe(100);
-        // LEGENDARY (multiplier 1.3): round(100 / 1.3) = 77
-        (0, globals_1.expect)((0, improvement_1.getImprovementThreshold)(6, rarity_1.RarityEnum.LEGENDARY)).toBe(Math.round(100 / 1.3));
-    });
-    (0, globals_1.it)('threshold increases as statTotal grows beyond 6', () => {
-        const low = (0, improvement_1.getImprovementThreshold)(10, rarity_1.RarityEnum.COMMON);
-        const high = (0, improvement_1.getImprovementThreshold)(50, rarity_1.RarityEnum.COMMON);
+    (0, globals_1.it)('at or below the floor the threshold is CURVE_BASE (180) — the fastest pace', () => {
+        // A freshly generated player sits ~at the floor → frac 0 → threshold = 180 for every rarity.
+        (0, globals_1.expect)((0, improvement_1.getImprovementThreshold)((0, improvement_1.getImprovementFloor)(rarity_1.RarityEnum.COMMON), rarity_1.RarityEnum.COMMON)).toBe(180);
+        (0, globals_1.expect)((0, improvement_1.getImprovementThreshold)(0, rarity_1.RarityEnum.SPECIAL)).toBe(180);
+    });
+    (0, globals_1.it)('at the ceiling (6 × cap) the threshold is CURVE_BASE + CURVE_SCALAR (980) — the slowest pace', () => {
+        (0, globals_1.expect)((0, improvement_1.getImprovementThreshold)(6 * (0, improvement_1.getStatCap)(rarity_1.RarityEnum.COMMON), rarity_1.RarityEnum.COMMON)).toBe(980);
+        (0, globals_1.expect)((0, improvement_1.getImprovementThreshold)(6 * (0, improvement_1.getStatCap)(rarity_1.RarityEnum.SPECIAL), rarity_1.RarityEnum.SPECIAL)).toBe(980);
+    });
+    (0, globals_1.it)('threshold increases as statTotal climbs from the floor toward the cap', () => {
+        const floor = (0, improvement_1.getImprovementFloor)(rarity_1.RarityEnum.COMMON);
+        const low = (0, improvement_1.getImprovementThreshold)(floor + 10, rarity_1.RarityEnum.COMMON);
+        const high = (0, improvement_1.getImprovementThreshold)(floor + 120, rarity_1.RarityEnum.COMMON);
         (0, globals_1.expect)(high).toBeGreaterThan(low);
     });
-    (0, globals_1.it)('higher rarity multiplier yields lower threshold (easier improvement)', () => {
-        const common = (0, improvement_1.getImprovementThreshold)(30, rarity_1.RarityEnum.COMMON);
-        const legendary = (0, improvement_1.getImprovementThreshold)(30, rarity_1.RarityEnum.LEGENDARY);
-        (0, globals_1.expect)(legendary).toBeLessThan(common);
+    (0, globals_1.it)('is equivalent across rarities at the same position within their band', () => {
+        // Halfway from floor to ceiling must cost the same for every rarity — the whole point of the rework.
+        const midThreshold = (rarity) => {
+            const floor = (0, improvement_1.getImprovementFloor)(rarity);
+            const mid = floor + (6 * (0, improvement_1.getStatCap)(rarity) - floor) / 2;
+            return (0, improvement_1.getImprovementThreshold)(mid, rarity);
+        };
+        const common = midThreshold(rarity_1.RarityEnum.COMMON);
+        (0, globals_1.expect)(midThreshold(rarity_1.RarityEnum.RARE)).toBe(common);
+        (0, globals_1.expect)(midThreshold(rarity_1.RarityEnum.LEGENDARY)).toBe(common);
+        (0, globals_1.expect)(midThreshold(rarity_1.RarityEnum.SPECIAL)).toBe(common);
     });
     (0, globals_1.it)('returns an integer (Math.round applied)', () => {
-        (0, globals_1.expect)(Number.isInteger((0, improvement_1.getImprovementThreshold)(20, rarity_1.RarityEnum.RARE))).toBe(true);
+        (0, globals_1.expect)(Number.isInteger((0, improvement_1.getImprovementThreshold)(200, rarity_1.RarityEnum.RARE))).toBe(true);
+    });
+});
+// ─── getImprovementFloor ──────────────────────────────────────────────────────
+(0, globals_1.describe)('getImprovementFloor()', () => {
+    globals_1.it.each([
+        [rarity_1.RarityEnum.COMMON, 180],
+        [rarity_1.RarityEnum.RARE, 296],
+        [rarity_1.RarityEnum.LEGENDARY, 346],
+        [rarity_1.RarityEnum.MYTHIC, 432],
+        [rarity_1.RarityEnum.SPECIAL, 501]
+    ])('%s → floor %i', (rarity, expected) => {
+        (0, globals_1.expect)((0, improvement_1.getImprovementFloor)(rarity)).toBe(expected);
+    });
+    (0, globals_1.it)('throws UNKNOWN_RARITY for an unrecognised rarity string', () => {
+        (0, globals_1.expect)(() => (0, improvement_1.getImprovementFloor)('DIVINE')).toThrow('UNKNOWN_RARITY');
+    });
+    (0, globals_1.it)('every floor is below its rarity ceiling (6 × cap)', () => {
+        for (const rarity of [rarity_1.RarityEnum.COMMON, rarity_1.RarityEnum.RARE, rarity_1.RarityEnum.LEGENDARY, rarity_1.RarityEnum.MYTHIC, rarity_1.RarityEnum.SPECIAL]) {
+            (0, globals_1.expect)((0, improvement_1.getImprovementFloor)(rarity)).toBeLessThan(6 * (0, improvement_1.getStatCap)(rarity));
+        }
     });
 });
 // ─── getCoachMultiplier ───────────────────────────────────────────────────────

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

@@ -73,6 +73,25 @@ const test_helpers_1 = require("../../test-helpers");
         });
         (0, globals_1.expect)(res.success).toBe(true);
     });
+    (0, globals_1.it)("accepts a fatigue-mode entry with the substitute's own benchFatigueBand", () => {
+        const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
+            starter,
+            bench,
+            mode: 'FATIGUE',
+            fatigueBand: energy_band_1.EnergyBand.WORN,
+            benchFatigueBand: energy_band_1.EnergyBand.TIRED
+        });
+        (0, globals_1.expect)(res.success).toBe(true);
+    });
+    (0, globals_1.it)('rejects benchFatigueBand = NEVER (only the team default band may be NEVER)', () => {
+        const res = designated_sub_z_1.DesignatedSubSchema.safeParse({
+            starter,
+            bench,
+            mode: 'FATIGUE',
+            benchFatigueBand: 'NEVER'
+        });
+        (0, globals_1.expect)(res.success).toBe(false);
+    });
     (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,

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

@@ -114,6 +114,13 @@ export interface Tactics {
     designatedSetters: string[];
     offensivePreferences: ApiOffensivePreference[];
 }
+export interface ApiLineupPreset {
+    presetId: string;
+    name: string;
+    isActive: boolean;
+    orderIndex: number;
+    config: Tactics;
+}
 export type Team = Omit<DataProps<_Team>, 'roster' | '_rating' | 'rating' | 'tactics'> & {
     roster: Player[];
     rating: {

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

@@ -1,9 +1,10 @@
-import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, ScoutModel, BoxScoreTotalsModel, CompetitionChampionModel, CurrencyTransactionModel, GachaPityModel, GachaPullHistoryModel, WishlistModel, UserSettingsModel, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel, AppConfigModel, LegacyTeamFlagModel } from './models';
+import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, ScoutModel, BoxScoreTotalsModel, CompetitionChampionModel, CurrencyTransactionModel, GachaPityModel, GachaPullHistoryModel, WishlistModel, UserSettingsModel, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, LineupPresetModel, 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);
     const CurrencyTransaction = CurrencyTransactionModel.initModel(sequelize);
     const Tactics = TacticsModel.initModel(sequelize);
+    const LineupPreset = LineupPresetModel.initModel(sequelize);
     const AuthUser = AuthUserModel.initModel(sequelize);
     const UserCurrency = UserCurrencyModel.initModel(sequelize);
     const UserPlayerProgress = UserPlayerProgressModel.initModel(sequelize);
@@ -196,6 +197,10 @@ export function initModels(sequelize) {
     Team.hasOne(Scout, { as: 'Scout', foreignKey: 'team_id' });
     Scout.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Team.hasOne(Tactics, { as: 'tactics', foreignKey: 'team_id' });
+    // Lineup presets are loaded only by the management API; deliberately NOT in Team.defaultScope so the
+    // simulator's team loads are unchanged (it reads the active config from the mirrored Tactics row).
+    Team.hasMany(LineupPreset, { as: 'lineupPresets', foreignKey: 'team_id' });
+    LineupPreset.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Team.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Team.belongsToMany(Competition, {
         as: 'Competitions',
@@ -267,6 +272,7 @@ export function initModels(sequelize) {
         Team,
         TeamReplacement,
         Tactics,
+        LineupPreset,
         UserTeam,
         UserCurrency,
         UserPlayerProgress,

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

@@ -33,6 +33,7 @@ export * from './scout';
 export * from './team';
 export * from './team-replacement';
 export * from './tactics';
+export * from './lineup-preset';
 export * from './user-currency';
 export * from './user-player-progress';
 export * from './gacha-pity';

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

@@ -33,6 +33,7 @@ export * from './scout';
 export * from './team';
 export * from './team-replacement';
 export * from './tactics';
+export * from './lineup-preset';
 export * from './user-currency';
 export * from './user-player-progress';
 export * from './gacha-pity';

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

@@ -0,0 +1,29 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+import { TeamId, TeamModel } from '.';
+import type { Tactics as ApiTactics } from '../../api';
+export interface LineupPresetAttributes {
+    preset_id: string;
+    team_id: string;
+    name: string;
+    is_active: boolean;
+    order_index: number;
+    config: ApiTactics;
+}
+export type LineupPresetPk = 'preset_id';
+export type LineupPresetId = LineupPresetModel[LineupPresetPk];
+export type LineupPresetOptionalAttributes = 'preset_id' | 'is_active';
+export type LineupPresetCreationAttributes = Optional<LineupPresetAttributes, LineupPresetOptionalAttributes>;
+export declare class LineupPresetModel extends Model<LineupPresetAttributes, LineupPresetCreationAttributes> implements LineupPresetAttributes {
+    preset_id: string;
+    team_id: string;
+    name: string;
+    is_active: boolean;
+    order_index: number;
+    config: ApiTactics;
+    team: TeamModel;
+    getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
+    setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;
+    createTeam: Sequelize.BelongsToCreateAssociationMixin<TeamModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof LineupPresetModel;
+}

package/dist/esm/src/data/models/lineup-preset.js

@@ -0,0 +1,67 @@
+import { DataTypes, Model } from 'sequelize';
+export class LineupPresetModel extends Model {
+    static initModel(sequelize) {
+        return LineupPresetModel.init({
+            preset_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                defaultValue: DataTypes.UUIDV4
+            },
+            team_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'Team',
+                    key: 'team_id'
+                }
+            },
+            name: {
+                type: DataTypes.STRING,
+                allowNull: false
+            },
+            is_active: {
+                type: DataTypes.BOOLEAN,
+                allowNull: false,
+                defaultValue: false
+            },
+            order_index: {
+                type: DataTypes.INTEGER,
+                allowNull: false
+            },
+            config: {
+                type: DataTypes.JSONB,
+                allowNull: false
+            }
+        }, {
+            sequelize,
+            tableName: 'LineupPreset',
+            schema: 'public',
+            timestamps: false,
+            indexes: [
+                {
+                    name: 'LineupPreset_pk',
+                    unique: true,
+                    fields: [
+                        { name: 'preset_id' }
+                    ]
+                },
+                {
+                    name: 'LineupPreset_team_id_idx',
+                    fields: [
+                        { name: 'team_id' }
+                    ]
+                },
+                {
+                    // At most one active preset per team.
+                    name: 'LineupPreset_one_active_per_team',
+                    unique: true,
+                    fields: [
+                        { name: 'team_id' }
+                    ],
+                    where: { is_active: true }
+                }
+            ]
+        });
+    }
+}

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

@@ -26,4 +26,5 @@ export * from './national';
 export * from './national-match';
 export * from './team';
 export * from './tactics';
+export * from './lineup-preset';
 export * from './vper';

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

@@ -26,4 +26,5 @@ export * from './national';
 export * from './national-match';
 export * from './team';
 export * from './tactics';
+export * from './lineup-preset';
 export * from './vper';

package/dist/esm/src/data/transformers/lineup-preset.d.ts

@@ -0,0 +1,4 @@
+import { LineupPresetModel } from '../models';
+import type { ApiLineupPreset } from '../../api';
+declare function transformToObject(model: LineupPresetModel): ApiLineupPreset;
+export { transformToObject as transformToLineupPreset };

package/dist/esm/src/data/transformers/lineup-preset.js

@@ -0,0 +1,11 @@
+// `config` is already stored as the API Tactics DTO, so a preset row maps to its API shape with no hydration.
+function transformToObject(model) {
+    return {
+        presetId: model.preset_id,
+        name: model.name,
+        isActive: model.is_active,
+        orderIndex: model.order_index,
+        config: model.config
+    };
+}
+export { transformToObject as transformToLineupPreset };

package/dist/esm/src/data/transformers/lineup-preset.test.d.ts

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

package/dist/esm/src/data/transformers/lineup-preset.test.js

@@ -0,0 +1,23 @@
+import { describe, it, expect } from '@jest/globals';
+import { transformToLineupPreset } from './lineup-preset';
+describe('transformToLineupPreset()', () => {
+    it('maps preset columns to the API shape and passes config through by reference', () => {
+        const config = { lineup: { bench: [] }, substitutionBand: 'TIRED' };
+        const preset = transformToLineupPreset({
+            preset_id: 'p1',
+            team_id: 't1',
+            name: 'Starters',
+            is_active: true,
+            order_index: 2,
+            config
+        });
+        expect(preset).toEqual({
+            presetId: 'p1',
+            name: 'Starters',
+            isActive: true,
+            orderIndex: 2,
+            config
+        });
+        expect(preset.config).toBe(config);
+    });
+});

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

@@ -1,5 +1,7 @@
 import { TacticsAttributes, TacticsModel } from '../models';
 import { Player, Tactics } from '../../service';
+import type { Tactics as ApiTactics } from '../../api';
 declare function transformToAttributes(tactics: Tactics, teamId: string): TacticsAttributes;
 declare function transformToObject(model: TacticsModel, roster: Player[]): Tactics;
-export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics };
+declare function tacticsColumnsToApiDto(model: TacticsModel): ApiTactics;
+export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics, tacticsColumnsToApiDto };

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

@@ -133,4 +133,41 @@ function transformToObject(model, roster) {
         }))
     });
 }
-export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics };
+// Serialize a Tactics ROW (db columns) straight to the API Tactics DTO (player references stay as ids; no
+// roster needed). Used to seed a lineup preset's `config` from the existing single tactics row (backfill) and
+// to keep the active preset and the mirrored Tactics row in the same shape. Applies the same legacy fixups as
+// the service transformer: resolve the designated-sub `mode` and drop a legacy 'NEVER' fatigueBand.
+function tacticsColumnsToApiDto(model) {
+    return {
+        lineup: model.lineup,
+        substitutionTolerance: model.substitution_tolerance,
+        liberoReplacements: model.libero_replacements,
+        pinchServerSubs: model.pinch_server_subs,
+        receiveRotationOffset: model.receive_rotation_offset,
+        substitutionBand: model.substitution_band,
+        secondLibero: model.second_libero,
+        liberoSub: model.libero_sub,
+        liberoReplacementSets: model.libero_replacement_sets,
+        designatedSubs: (model.designated_subs ?? []).map(d => ({
+            starterId: d.starterId,
+            benchId: d.benchId,
+            mode: subModeFromAttributes(d),
+            fatigueBand: d.fatigueBand === 'NEVER' ? undefined : d.fatigueBand,
+            benchFatigueBand: d.benchFatigueBand,
+            conditions: d.conditions,
+            conditionLogic: d.conditionLogic,
+            sets: d.sets?.map(s => ({
+                mode: s.mode,
+                benchId: s.benchId,
+                fatigueBand: s.fatigueBand,
+                benchFatigueBand: s.benchFatigueBand,
+                conditions: s.conditions,
+                conditionLogic: s.conditionLogic
+            }))
+        })),
+        rotationSystem: model.rotation_system,
+        designatedSetters: model.designated_setters,
+        offensivePreferences: model.offensive_preferences
+    };
+}
+export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics, tacticsColumnsToApiDto };

package/dist/esm/src/data/transformers/tactics.test.d.ts

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

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

@@ -0,0 +1,64 @@
+import { describe, it, expect } from '@jest/globals';
+import { tacticsColumnsToApiDto } from './tactics';
+import { CourtPosition, EnergyBand } from '../../service';
+// Minimal TacticsModel-shaped object; cast through unknown since the transformer only reads columns.
+function makeTactics(designatedSubs) {
+    return {
+        team_id: 'team-1',
+        substitution_tolerance: 10,
+        lineup: {
+            [CourtPosition.LEFT_FRONT]: 'lf',
+            [CourtPosition.MIDDLE_FRONT]: 'mf',
+            [CourtPosition.RIGHT_FRONT]: 'rf',
+            [CourtPosition.LEFT_BACK]: 'lb',
+            [CourtPosition.MIDDLE_BACK]: 'mb',
+            [CourtPosition.RIGHT_BACK]: 'rb',
+            bench: ['b1', 'b2']
+        },
+        libero_replacements: ['lf'],
+        pinch_server_subs: { starter1: 'server1' },
+        receive_rotation_offset: true,
+        designated_subs: designatedSubs,
+        substitution_band: EnergyBand.TIRED,
+        second_libero: undefined,
+        libero_sub: undefined,
+        libero_replacement_sets: undefined,
+        rotation_system: '5-1',
+        designated_setters: ['lf'],
+        offensive_preferences: [{ rotation: 1, order: ['lf', 'rf'] }]
+    };
+}
+describe('tacticsColumnsToApiDto()', () => {
+    it('passes scalar/array columns through to the API DTO shape', () => {
+        const dto = tacticsColumnsToApiDto(makeTactics([]));
+        expect(dto.substitutionTolerance).toBe(10);
+        expect(dto.receiveRotationOffset).toBe(true);
+        expect(dto.substitutionBand).toBe(EnergyBand.TIRED);
+        expect(dto.rotationSystem).toBe('5-1');
+        expect(dto.liberoReplacements).toEqual(['lf']);
+        expect(dto.pinchServerSubs).toEqual({ starter1: 'server1' });
+        expect(dto.lineup.bench).toEqual(['b1', 'b2']);
+        expect(dto.offensivePreferences).toEqual([{ rotation: 1, order: ['lf', 'rf'] }]);
+    });
+    it("resolves a legacy isPinchServer entry to mode 'PINCH'", () => {
+        const dto = tacticsColumnsToApiDto(makeTactics([
+            { starterId: 's1', benchId: 'b1', isPinchServer: true, conditions: [{ type: 'ASAP' }] }
+        ]));
+        expect(dto.designatedSubs[0].mode).toBe('PINCH');
+    });
+    it("resolves a legacy 'NEVER' fatigueBand to mode NEVER and drops the band", () => {
+        const dto = tacticsColumnsToApiDto(makeTactics([
+            { starterId: 's1', fatigueBand: 'NEVER' }
+        ]));
+        expect(dto.designatedSubs[0].mode).toBe('NEVER');
+        expect(dto.designatedSubs[0].fatigueBand).toBeUndefined();
+    });
+    it('passes a fatigue entry with its own bands through unchanged', () => {
+        const dto = tacticsColumnsToApiDto(makeTactics([
+            { starterId: 's1', benchId: 'b1', mode: 'FATIGUE', fatigueBand: EnergyBand.WORN, benchFatigueBand: EnergyBand.TIRED }
+        ]));
+        expect(dto.designatedSubs[0].mode).toBe('FATIGUE');
+        expect(dto.designatedSubs[0].fatigueBand).toBe(EnergyBand.WORN);
+        expect(dto.designatedSubs[0].benchFatigueBand).toBe(EnergyBand.TIRED);
+    });
+});

package/dist/esm/src/service/event/reception.d.ts

@@ -3,9 +3,10 @@ export declare enum ReceptionTypeEnum {
     DIG = 0,
     OVERHAND = 1,
     ONE_HAND = 2,
-    OTHER_BODY_PART = 3
+    OTHER_BODY_PART = 3,
+    NO_TOUCH = 4
 }
-export type ReceptionType = ReceptionTypeEnum.DIG | ReceptionTypeEnum.OVERHAND | ReceptionTypeEnum.ONE_HAND | ReceptionTypeEnum.OTHER_BODY_PART;
+export type ReceptionType = ReceptionTypeEnum.DIG | ReceptionTypeEnum.OVERHAND | ReceptionTypeEnum.ONE_HAND | ReceptionTypeEnum.OTHER_BODY_PART | ReceptionTypeEnum.NO_TOUCH;
 export declare enum ReceptionFailureEnum {
     NO_FAILURE = 0,
     FAULT = 1,

package/dist/esm/src/service/event/reception.js

@@ -7,6 +7,9 @@ export var ReceptionTypeEnum;
     ReceptionTypeEnum[ReceptionTypeEnum["OVERHAND"] = 1] = "OVERHAND";
     ReceptionTypeEnum[ReceptionTypeEnum["ONE_HAND"] = 2] = "ONE_HAND";
     ReceptionTypeEnum[ReceptionTypeEnum["OTHER_BODY_PART"] = 3] = "OTHER_BODY_PART";
+    // The ball was never touched: a serve so good (vs the receiver's reflex) it drops untouched for a
+    // clean ace. Booked as the server's ace only, with no reception attempt/error charged to the passer.
+    ReceptionTypeEnum[ReceptionTypeEnum["NO_TOUCH"] = 4] = "NO_TOUCH";
 })(ReceptionTypeEnum || (ReceptionTypeEnum = {}));
 export var ReceptionFailureEnum;
 (function (ReceptionFailureEnum) {

package/dist/esm/src/service/event/schemas/reception.z.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { TraitEnum } from '../../player';
-const receptionTypeValues = [0, 1, 2, 3];
+const receptionTypeValues = [0, 1, 2, 3, 4];
 const receptionFailureValues = [0, 1, 2, 3, 4];
 const courtTargetValues = Array.from({ length: 13 }, (_, i) => i);
 export const ReceptionInputSchema = z.object({

package/dist/esm/src/service/event/schemas/reception.z.test.d.ts

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

package/dist/esm/src/service/event/schemas/reception.z.test.js

@@ -0,0 +1,27 @@
+import { describe, it, expect } from '@jest/globals';
+import { ReceptionInputSchema } from './reception.z';
+const base = {
+    playerId: '11111111-1111-4111-8111-111111111111',
+    score: 10,
+    target: 5,
+    activeTraits: [],
+    failure: 2,
+    type: 0
+};
+describe('ReceptionInputSchema', () => {
+    it('accepts every reception type 0-4 (incl. NO_TOUCH = 4)', () => {
+        for (const type of [0, 1, 2, 3, 4]) {
+            expect(ReceptionInputSchema.safeParse({ ...base, type }).success).toBe(true);
+        }
+    });
+    it('rejects an out-of-range reception type', () => {
+        expect(ReceptionInputSchema.safeParse({ ...base, type: 5 }).success).toBe(false);
+        expect(ReceptionInputSchema.safeParse({ ...base, type: -1 }).success).toBe(false);
+    });
+    it('rejects an out-of-range reception failure', () => {
+        expect(ReceptionInputSchema.safeParse({ ...base, failure: 5 }).success).toBe(false);
+    });
+    it('rejects an out-of-range court target', () => {
+        expect(ReceptionInputSchema.safeParse({ ...base, target: 13 }).success).toBe(false);
+    });
+});

package/dist/esm/src/service/player/improvement.d.ts

@@ -4,6 +4,7 @@ import { DeclineProfile } from './decline';
 export type TrainingFocus = Stats;
 export declare function getStatCap(rarity: Rarity): number;
 export declare function getRarityMultiplier(rarity: Rarity): number;
+export declare function getImprovementFloor(rarity: Rarity): number;
 export declare function getImprovementThreshold(statTotal: number, rarity: Rarity): number;
 export declare function getCoachMultiplier(rarity: Rarity): number;
 export declare function matchExperience(pointsPlayed: number): number;

package/dist/esm/src/service/player/improvement.js

@@ -3,9 +3,26 @@ import { RarityEnum } from './rarity';
 import { performanceStatKeys } from './performance-stats';
 import { getMultipliers } from './stats';
 import { youthMultiplier } from './decline';
-const CURVE_BASE = 100;
-const CURVE_SCALAR = 0.098;
-const CURVE_EXPONENT = 1.5;
+// ── Improvement threshold curve (normalize-to-band) ───────────────────────────
+// The exp a player needs to gain +1 stat. Every rarity improves on ONE shared curve, but measured against
+// ITS OWN range: a freshly generated player sits at the floor (improves the fastest) and the stat cap is the
+// ceiling (improves the slowest). `frac` is the player's position from floor to ceiling, so the same relative
+// progress costs the same for every rarity -- rarer players are no longer penalised for their higher skill
+// floor (which is what the old rarity-multiplier divisor failed to offset). Threshold runs from CURVE_BASE at
+// the floor to CURVE_BASE + CURVE_SCALAR at the cap; CURVE_EXPONENT keeps players fast through most of the
+// band and slows them sharply only near the cap.
+const CURVE_BASE = 180;
+const CURVE_SCALAR = 800;
+const CURVE_EXPONENT = 2;
+// Per-rarity floor of the curve: the mean generated core-6 total (attack + serve + block + reception +
+// setting + stamina) for that rarity, measured from PlayerGenerator. The ceiling is 6 * cap.
+const IMPROVEMENT_FLOOR = {
+    [RarityEnum.COMMON]: 180,
+    [RarityEnum.RARE]: 296,
+    [RarityEnum.LEGENDARY]: 346,
+    [RarityEnum.MYTHIC]: 432,
+    [RarityEnum.SPECIAL]: 501
+};
 const statCaps = statCapsJSON;
 export function getStatCap(rarity) {
     const entry = statCaps.find(e => e.rarity === rarity);
@@ -13,16 +30,25 @@ export function getStatCap(rarity) {
         throw new Error(`UNKNOWN_RARITY: ${rarity}`);
     return entry.cap;
 }
+// Retained for config/reference. No longer used by the improvement curve -- superseded by IMPROVEMENT_FLOOR,
+// which is the per-rarity adjustment now.
 export function getRarityMultiplier(rarity) {
     const entry = statCaps.find(e => e.rarity === rarity);
     if (entry == null)
         throw new Error(`UNKNOWN_RARITY: ${rarity}`);
     return entry.rarityMultiplier;
 }
+export function getImprovementFloor(rarity) {
+    const floor = IMPROVEMENT_FLOOR[rarity];
+    if (floor == null)
+        throw new Error(`UNKNOWN_RARITY: ${rarity}`);
+    return floor;
+}
 export function getImprovementThreshold(statTotal, rarity) {
-    const rarityMultiplier = getRarityMultiplier(rarity);
-    const raw = CURVE_BASE + CURVE_SCALAR * Math.pow(Math.max(0, statTotal - 6), CURVE_EXPONENT);
-    return Math.round(raw / rarityMultiplier);
+    const floor = getImprovementFloor(rarity);
+    const span = 6 * getStatCap(rarity) - floor;
+    const frac = span <= 0 ? 1 : Math.max(0, Math.min(1, (statTotal - floor) / span));
+    return Math.round(CURVE_BASE + CURVE_SCALAR * Math.pow(frac, CURVE_EXPONENT));
 }
 const COACH_MULTIPLIERS = {
     [RarityEnum.COMMON]: 2.0,

package/dist/esm/src/service/player/improvement.test.js

@@ -1,6 +1,6 @@
 import { describe, it, expect } from '@jest/globals';
 import { RarityEnum } from './rarity';
-import { getStatCap, getRarityMultiplier, getImprovementThreshold, getCoachMultiplier, selectImprovableStat, matchExperience, experienceGained } from './improvement';
+import { getStatCap, getRarityMultiplier, getImprovementFloor, getImprovementThreshold, getCoachMultiplier, selectImprovableStat, matchExperience, experienceGained } from './improvement';
 import { StatsEnum } from './stats';
 import { DeclineProfileEnum } from './decline';
 // ─── getStatCap ───────────────────────────────────────────────────────────────
@@ -35,24 +35,55 @@ describe('getRarityMultiplier()', () => {
 });
 // ─── getImprovementThreshold ──────────────────────────────────────────────────
 describe('getImprovementThreshold()', () => {
-    it('at statTotal=6 the curve exponent term is 0 → threshold = round(100 / rarityMultiplier)', () => {
-        // COMMON (multiplier 1.0): round(100 / 1.0) = 100
-        expect(getImprovementThreshold(6, RarityEnum.COMMON)).toBe(100);
-        // LEGENDARY (multiplier 1.3): round(100 / 1.3) = 77
-        expect(getImprovementThreshold(6, RarityEnum.LEGENDARY)).toBe(Math.round(100 / 1.3));
-    });
-    it('threshold increases as statTotal grows beyond 6', () => {
-        const low = getImprovementThreshold(10, RarityEnum.COMMON);
-        const high = getImprovementThreshold(50, RarityEnum.COMMON);
+    it('at or below the floor the threshold is CURVE_BASE (180) — the fastest pace', () => {
+        // A freshly generated player sits ~at the floor → frac 0 → threshold = 180 for every rarity.
+        expect(getImprovementThreshold(getImprovementFloor(RarityEnum.COMMON), RarityEnum.COMMON)).toBe(180);
+        expect(getImprovementThreshold(0, RarityEnum.SPECIAL)).toBe(180);
+    });
+    it('at the ceiling (6 × cap) the threshold is CURVE_BASE + CURVE_SCALAR (980) — the slowest pace', () => {
+        expect(getImprovementThreshold(6 * getStatCap(RarityEnum.COMMON), RarityEnum.COMMON)).toBe(980);
+        expect(getImprovementThreshold(6 * getStatCap(RarityEnum.SPECIAL), RarityEnum.SPECIAL)).toBe(980);
+    });
+    it('threshold increases as statTotal climbs from the floor toward the cap', () => {
+        const floor = getImprovementFloor(RarityEnum.COMMON);
+        const low = getImprovementThreshold(floor + 10, RarityEnum.COMMON);
+        const high = getImprovementThreshold(floor + 120, RarityEnum.COMMON);
         expect(high).toBeGreaterThan(low);
     });
-    it('higher rarity multiplier yields lower threshold (easier improvement)', () => {
-        const common = getImprovementThreshold(30, RarityEnum.COMMON);
-        const legendary = getImprovementThreshold(30, RarityEnum.LEGENDARY);
-        expect(legendary).toBeLessThan(common);
+    it('is equivalent across rarities at the same position within their band', () => {
+        // Halfway from floor to ceiling must cost the same for every rarity — the whole point of the rework.
+        const midThreshold = (rarity) => {
+            const floor = getImprovementFloor(rarity);
+            const mid = floor + (6 * getStatCap(rarity) - floor) / 2;
+            return getImprovementThreshold(mid, rarity);
+        };
+        const common = midThreshold(RarityEnum.COMMON);
+        expect(midThreshold(RarityEnum.RARE)).toBe(common);
+        expect(midThreshold(RarityEnum.LEGENDARY)).toBe(common);
+        expect(midThreshold(RarityEnum.SPECIAL)).toBe(common);
     });
     it('returns an integer (Math.round applied)', () => {
-        expect(Number.isInteger(getImprovementThreshold(20, RarityEnum.RARE))).toBe(true);
+        expect(Number.isInteger(getImprovementThreshold(200, RarityEnum.RARE))).toBe(true);
+    });
+});
+// ─── getImprovementFloor ──────────────────────────────────────────────────────
+describe('getImprovementFloor()', () => {
+    it.each([
+        [RarityEnum.COMMON, 180],
+        [RarityEnum.RARE, 296],
+        [RarityEnum.LEGENDARY, 346],
+        [RarityEnum.MYTHIC, 432],
+        [RarityEnum.SPECIAL, 501]
+    ])('%s → floor %i', (rarity, expected) => {
+        expect(getImprovementFloor(rarity)).toBe(expected);
+    });
+    it('throws UNKNOWN_RARITY for an unrecognised rarity string', () => {
+        expect(() => getImprovementFloor('DIVINE')).toThrow('UNKNOWN_RARITY');
+    });
+    it('every floor is below its rarity ceiling (6 × cap)', () => {
+        for (const rarity of [RarityEnum.COMMON, RarityEnum.RARE, RarityEnum.LEGENDARY, RarityEnum.MYTHIC, RarityEnum.SPECIAL]) {
+            expect(getImprovementFloor(rarity)).toBeLessThan(6 * getStatCap(rarity));
+        }
     });
 });
 // ─── getCoachMultiplier ───────────────────────────────────────────────────────

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

@@ -71,6 +71,25 @@ describe('DesignatedSubSchema', () => {
         });
         expect(res.success).toBe(true);
     });
+    it("accepts a fatigue-mode entry with the substitute's own benchFatigueBand", () => {
+        const res = DesignatedSubSchema.safeParse({
+            starter,
+            bench,
+            mode: 'FATIGUE',
+            fatigueBand: EnergyBand.WORN,
+            benchFatigueBand: EnergyBand.TIRED
+        });
+        expect(res.success).toBe(true);
+    });
+    it('rejects benchFatigueBand = NEVER (only the team default band may be NEVER)', () => {
+        const res = DesignatedSubSchema.safeParse({
+            starter,
+            bench,
+            mode: 'FATIGUE',
+            benchFatigueBand: 'NEVER'
+        });
+        expect(res.success).toBe(false);
+    });
     it('accepts a fatigue-mode entry with no bench (falls back to closest sub)', () => {
         const res = DesignatedSubSchema.safeParse({
             starter,

package/package.json

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