volleyballsimtypes 0.0.493 → 0.0.495

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CompetitionChampionAttributes, CompetitionChampionId, CompetitionChampionModel, CompetitionMVPAttributes, CompetitionMVPId, CompetitionMVPModel, CompetitionMatchAttributes, CompetitionMatchId, CompetitionMatchModel, CompetitionStandingsAttributes, CompetitionStandingsId, CompetitionStandingsModel, CompetitionTeamsAttributes, CompetitionTeamsId, CompetitionTeamsModel, PromotionMatchAttributes, PromotionMatchId, PromotionMatchModel, RegionQualifierAttributes, RegionQualifierId, RegionQualifierModel, NationalCountryAttributes, NationalCountryId, NationalCountryModel, DivisionSeasonAttributes, DivisionSeasonId, DivisionSeasonModel, IterationId, IterationModel, TeamId, TeamModel } from '.';
+import { CompetitionChampionAttributes, CompetitionChampionId, CompetitionChampionModel, CompetitionMVPAttributes, CompetitionMVPId, CompetitionMVPModel, CompetitionMatchAttributes, CompetitionMatchId, CompetitionMatchModel, CompetitionStandingsAttributes, CompetitionStandingsId, CompetitionStandingsModel, CompetitionTeamsAttributes, CompetitionTeamsId, CompetitionTeamsModel, PromotionMatchAttributes, PromotionMatchId, PromotionMatchModel, RegionQualifierAttributes, RegionQualifierId, RegionQualifierModel, NationalCountryAttributes, NationalCountryId, NationalCountryModel, EventCompetitionAttributes, EventCompetitionId, EventCompetitionModel, DivisionSeasonAttributes, DivisionSeasonId, DivisionSeasonModel, IterationId, IterationModel, TeamId, TeamModel } from '.';
 import { Status } from '../common';
 export interface CompetitionAttributes {
     competition_id: string;
@@ -15,6 +15,8 @@ export interface CompetitionAttributes {
     CompetitionTeams?: CompetitionTeamsAttributes[];
     RegionQualifier?: RegionQualifierAttributes;
     NationalCountry?: NationalCountryAttributes;
+    /** Set only on an EVENT competition: which event it belongs to, and which stage of it. */
+    EventCompetition?: EventCompetitionAttributes;
     UpperPromotionMatches?: PromotionMatchAttributes[];
     LowerPromotionMatches?: PromotionMatchAttributes[];
 }
@@ -72,6 +74,10 @@ export declare class CompetitionModel extends Model<CompetitionAttributes, Compe
     getNationalCountry: Sequelize.HasOneGetAssociationMixin<NationalCountryModel>;
     setNationalCountry: Sequelize.HasOneSetAssociationMixin<NationalCountryModel, NationalCountryId>;
     createNationalCountry: Sequelize.HasOneCreateAssociationMixin<NationalCountryModel>;
+    EventCompetition: EventCompetitionModel;
+    getEventCompetition: Sequelize.HasOneGetAssociationMixin<EventCompetitionModel>;
+    setEventCompetition: Sequelize.HasOneSetAssociationMixin<EventCompetitionModel, EventCompetitionId>;
+    createEventCompetition: Sequelize.HasOneCreateAssociationMixin<EventCompetitionModel>;
     UpperPromotionMatches: PromotionMatchModel[];
     getUpperPromotionMatches: Sequelize.HasManyGetAssociationsMixin<PromotionMatchModel>;
     setUpperPromotionMatches: Sequelize.HasManySetAssociationsMixin<PromotionMatchModel, PromotionMatchId>;

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

@@ -1,11 +1,39 @@
 import { Rarity } from './rarity';
+import { Role } from './role';
 import { Stats } from './stats';
 import { DeclineProfile } from './decline';
 export type TrainingFocus = Stats;
+export declare const FOCUS_WEIGHT = 0.5;
+interface ImprovementFloors {
+    /** Mean generated sum of all 18 performance stats. */
+    all: number;
+    /** Mean generated sum of each training focus's pool, keyed by focus name. */
+    focus: Record<string, number>;
+}
 export declare function getStatCap(rarity: Rarity): number;
-export declare function getImprovementFloor(rarity: Rarity): number;
-export declare function getImprovementThreshold(statTotal: number, rarity: Rarity): number;
+/**
+ * The DB column names of a training focus's pool: exactly the stats `selectImprovableStat` can raise under
+ * that focus, so the band and the pool are the same set by construction.
+ */
+export declare function focusPoolColumns(focus: TrainingFocus): string[];
+/**
+ * Where a freshly generated player of this rarity and role starts, in both bands.
+ *
+ * Roles matter: at LEGENDARY the mean generated 18-stat sum runs 846 for an outside hitter against 1099 for a
+ * libero, a fifth of the band, so one floor per rarity would hand some roles a free head start. An unknown
+ * role falls back to the mean across that rarity's roles rather than throwing, because a player whose role
+ * enum has changed underneath us should still be able to train.
+ */
+export declare function getImprovementFloors(rarity: Rarity, role: Role): ImprovementFloors;
+/**
+ * Exp needed for this player's next +1, before the coach multiplier.
+ *
+ * `stats` is keyed by DB COLUMN name (back_attack, not backAttack), the same shape `selectImprovableStat`
+ * takes, so a caller passes one object to both.
+ */
+export declare function getImprovementThreshold(stats: Record<string, number>, rarity: Rarity, role: Role, focus: TrainingFocus): number;
 export declare function getCoachMultiplier(rarity: Rarity): number;
 export declare function matchExperience(pointsPlayed: number): number;
 export declare function experienceGained(pointsPlayed: number, age: number, profile: DeclineProfile): number;
 export declare function selectImprovableStat(rarity: Rarity, trainingFocus: TrainingFocus, currentStats: Record<string, number>): string | null;
+export {};

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

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FOCUS_WEIGHT = void 0;
 exports.getStatCap = getStatCap;
-exports.getImprovementFloor = getImprovementFloor;
+exports.focusPoolColumns = focusPoolColumns;
+exports.getImprovementFloors = getImprovementFloors;
 exports.getImprovementThreshold = getImprovementThreshold;
 exports.getCoachMultiplier = getCoachMultiplier;
 exports.matchExperience = matchExperience;
@@ -12,43 +14,126 @@ const rarity_1 = require("./rarity");
 const performance_stats_1 = require("./performance-stats");
 const stats_1 = require("./stats");
 const decline_1 = require("./decline");
-// ── 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;
+// ── Improvement threshold curve (two normalized bands) ────────────────────────
+// The exp a player needs to gain +1 stat, from their position in TWO bands measured as raw stat sums:
+//
+//   focus band  the stats in the coach's training-focus pool   [floor, poolSize * cap]
+//   all-18 band every performance stat                         [floor, 18 * cap]
+//
+// Both floors are the mean a freshly generated player of that rarity AND role spawns with (see
+// improvement-floors.json), so a fresh player sits at the bottom of both and improves fastest.
+//
+// Why the focus band: the price must respond to what is actually being trained. The previous curve read only
+// the core-6 sum (attack + serve + block + reception + setting + stamina), but the stat that goes up is picked
+// from the focus pool, and most pools barely touch those six. Production measured 74% of all improvements
+// landing on stats the price could not see, so a typical player gained ~4.5 stat points per point of price
+// escalation while a STAMINA-focus player paid full price every time. A focus pool is exactly the keys
+// getMultipliers gives that focus, the same set selectImprovableStat can raise, so the two cannot drift apart
+// and every upgrade a focus can produce now moves its band by exactly 1.
+//
+// Why sums and not the weighted composite (calculateStatScore): with a sum every upgrade moves the band by
+// exactly 1, so exp per raw stat point comes out equal across focuses (measured 443/445/446/443/444/448). The
+// weighted composite put those 16x apart, because a 6-stat pool moves a weighted average six times slower than
+// a 1-stat pool. Sums are also integers, so no rounding step and no dependence on the conditional power/quick
+// and read/commit weight swap.
+//
+// Why the all-18 band on top: the focus band alone is resettable by switching focus, so rotating the coach
+// focus would be strictly dominant (measured 294 lifetime stat points against a specialist's 176). The all-18
+// sum is monotone under every strategy and cannot be reset. FOCUS_WEIGHT blends the two, trading "training a
+// strength is expensive" against "the focus strategy should not decide a career"; they are the same lever and
+// cannot be separated. At 0.5 the strategy spread is 1.67x and the focus price ratio 1.57x.
+//
+// Threshold runs from CURVE_BASE at both floors to CURVE_BASE + CURVE_SCALAR at both ceilings; CURVE_EXPONENT
+// keeps players fast through most of the band and slows them sharply only near the top.
+//
+// BASE and SCALAR were retuned from 180/800 to 130/400 when the second band was added, to hold career-long
+// development at its previous level. Pricing every focus-pool upgrade instead of only the ~26% that touched
+// the core 6 makes the average player climb their curve far faster, and at the old 180/800 that cut career
+// stat gains by ~32% across every rarity (measured: ~253 lifetime ups down to ~176). That would have been a
+// large balance change nobody asked for on top of the fix. At 130/400 lifetime ups land at ~247, within a few
+// percent of the old curve, so the only behaviour that actually changes is WHICH stats drive the price.
+const CURVE_BASE = 130;
+const CURVE_SCALAR = 400;
 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
-};
+exports.FOCUS_WEIGHT = 0.5;
 const statCaps = stat_config_1.statCapsJSON;
+const floorEntries = stat_config_1.improvementFloorsJSON.floors;
+const KEY_TO_COLUMN = {
+    setting: 'setting',
+    serve: 'serve',
+    spike: 'spike',
+    quick: 'quick',
+    power: 'power',
+    awareness: 'awareness',
+    attack: 'attack',
+    backAttack: 'back_attack',
+    reception: 'reception',
+    overhand: 'overhand',
+    bump: 'bump',
+    block: 'block',
+    read: 'read',
+    commit: 'commit',
+    focus: 'focus',
+    defense: 'defense',
+    stamina: 'stamina',
+    reflex: 'reflex'
+};
+const ALL_COLUMNS = performance_stats_1.performanceStatKeys.map(key => KEY_TO_COLUMN[key]);
 function getStatCap(rarity) {
     const entry = statCaps.find(e => e.rarity === rarity);
     if (entry == null)
         throw new Error(`UNKNOWN_RARITY: ${rarity}`);
     return entry.cap;
 }
-function getImprovementFloor(rarity) {
-    const floor = IMPROVEMENT_FLOOR[rarity];
-    if (floor == null)
+/**
+ * The DB column names of a training focus's pool: exactly the stats `selectImprovableStat` can raise under
+ * that focus, so the band and the pool are the same set by construction.
+ */
+function focusPoolColumns(focus) {
+    return Object.keys((0, stats_1.getMultipliers)(focus)).map(key => KEY_TO_COLUMN[key]);
+}
+/**
+ * Where a freshly generated player of this rarity and role starts, in both bands.
+ *
+ * Roles matter: at LEGENDARY the mean generated 18-stat sum runs 846 for an outside hitter against 1099 for a
+ * libero, a fifth of the band, so one floor per rarity would hand some roles a free head start. An unknown
+ * role falls back to the mean across that rarity's roles rather than throwing, because a player whose role
+ * enum has changed underneath us should still be able to train.
+ */
+function getImprovementFloors(rarity, role) {
+    const exact = floorEntries.find(e => e.rarity === rarity && e.role === role);
+    if (exact != null)
+        return { all: exact.all, focus: exact.focus };
+    const forRarity = floorEntries.filter(e => e.rarity === rarity);
+    if (forRarity.length === 0)
         throw new Error(`UNKNOWN_RARITY: ${rarity}`);
-    return floor;
+    const focus = {};
+    for (const key of Object.keys(forRarity[0].focus)) {
+        focus[key] = forRarity.reduce((sum, e) => sum + e.focus[key], 0) / forRarity.length;
+    }
+    return { all: forRarity.reduce((sum, e) => sum + e.all, 0) / forRarity.length, focus };
 }
-function getImprovementThreshold(statTotal, rarity) {
-    const floor = getImprovementFloor(rarity);
-    const span = 6 * getStatCap(rarity) - floor;
-    const frac = span <= 0 ? 1 : Math.max(0, Math.min(1, (statTotal - floor) / span));
+function bandFraction(value, floor, ceiling) {
+    const span = ceiling - floor;
+    if (span <= 0)
+        return 1;
+    return Math.max(0, Math.min(1, (value - floor) / span));
+}
+/**
+ * Exp needed for this player's next +1, before the coach multiplier.
+ *
+ * `stats` is keyed by DB COLUMN name (back_attack, not backAttack), the same shape `selectImprovableStat`
+ * takes, so a caller passes one object to both.
+ */
+function getImprovementThreshold(stats, rarity, role, focus) {
+    const cap = getStatCap(rarity);
+    const floors = getImprovementFloors(rarity, role);
+    const poolColumns = focusPoolColumns(focus);
+    const focusSum = poolColumns.reduce((sum, column) => sum + (stats[column] ?? 0), 0);
+    const focusFrac = bandFraction(focusSum, floors.focus[focus] ?? 0, poolColumns.length * cap);
+    const allSum = ALL_COLUMNS.reduce((sum, column) => sum + (stats[column] ?? 0), 0);
+    const allFrac = bandFraction(allSum, floors.all, ALL_COLUMNS.length * cap);
+    const frac = exports.FOCUS_WEIGHT * focusFrac + (1 - exports.FOCUS_WEIGHT) * allFrac;
     return Math.round(CURVE_BASE + CURVE_SCALAR * Math.pow(frac, CURVE_EXPONENT));
 }
 const COACH_MULTIPLIERS = {
@@ -81,26 +166,6 @@ function matchExperience(pointsPlayed) {
 function experienceGained(pointsPlayed, age, profile) {
     return Math.round(matchExperience(pointsPlayed) * (0, decline_1.youthMultiplier)(age, profile));
 }
-const KEY_TO_COLUMN = {
-    setting: 'setting',
-    serve: 'serve',
-    spike: 'spike',
-    quick: 'quick',
-    power: 'power',
-    awareness: 'awareness',
-    attack: 'attack',
-    backAttack: 'back_attack',
-    reception: 'reception',
-    overhand: 'overhand',
-    bump: 'bump',
-    block: 'block',
-    read: 'read',
-    commit: 'commit',
-    focus: 'focus',
-    defense: 'defense',
-    stamina: 'stamina',
-    reflex: 'reflex'
-};
 function selectImprovableStat(rarity, trainingFocus, currentStats) {
     const cap = getStatCap(rarity);
     const multipliers = (0, stats_1.getMultipliers)(trainingFocus);

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

@@ -2,9 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const globals_1 = require("@jest/globals");
 const rarity_1 = require("./rarity");
+const role_1 = require("./role");
 const improvement_1 = require("./improvement");
 const stats_1 = require("./stats");
 const decline_1 = require("./decline");
+const ALL_RARITIES = [rarity_1.RarityEnum.COMMON, rarity_1.RarityEnum.RARE, rarity_1.RarityEnum.LEGENDARY, rarity_1.RarityEnum.MYTHIC, rarity_1.RarityEnum.SPECIAL];
+const ALL_FOCI = [stats_1.StatsEnum.ATTACK, stats_1.StatsEnum.SET, stats_1.StatsEnum.RECEIVE, stats_1.StatsEnum.SERVE, stats_1.StatsEnum.BLOCK, stats_1.StatsEnum.STAMINA];
+const ALL_ROLES = [role_1.RoleEnum.SETTER, role_1.RoleEnum.OUTSIDE_HITTER, role_1.RoleEnum.MIDDLE_BLOCKER, role_1.RoleEnum.OPPOSITE_HITTER, role_1.RoleEnum.LIBERO];
 // ─── getStatCap ───────────────────────────────────────────────────────────────
 (0, globals_1.describe)('getStatCap()', () => {
     globals_1.it.each([
@@ -22,56 +26,129 @@ const decline_1 = require("./decline");
 });
 // ─── getImprovementThreshold ──────────────────────────────────────────────────
 (0, globals_1.describe)('getImprovementThreshold()', () => {
-    (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)('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)('at or below both floors the threshold is CURVE_BASE (130), the fastest pace, for every rarity and focus', () => {
+        // Zeros sit under both floors, so both fracs clamp to 0. A freshly generated player is at ~this point.
+        for (const rarity of ALL_RARITIES) {
+            for (const focus of ALL_FOCI) {
+                (0, globals_1.expect)(`${rarity}/${focus}: ${(0, improvement_1.getImprovementThreshold)(allStats(0), rarity, role_1.RoleEnum.SETTER, focus)}`)
+                    .toBe(`${rarity}/${focus}: 130`);
+            }
+        }
+    });
+    (0, globals_1.it)('at both ceilings the threshold is CURVE_BASE + CURVE_SCALAR (530), the slowest pace', () => {
+        // Every stat at the cap puts the focus pool at poolSize * cap and the sheet at 18 * cap: both fracs = 1.
+        for (const rarity of ALL_RARITIES) {
+            for (const focus of ALL_FOCI) {
+                (0, globals_1.expect)(`${rarity}/${focus}: ${(0, improvement_1.getImprovementThreshold)(allStats((0, improvement_1.getStatCap)(rarity)), rarity, role_1.RoleEnum.SETTER, focus)}`)
+                    .toBe(`${rarity}/${focus}: 530`);
+            }
+        }
+    });
+    (0, globals_1.it)('weights the focus band by FOCUS_WEIGHT and the all-18 band by the remainder', () => {
+        // STAMINA's pool is the single `stamina` stat, so capping it alone maxes the focus band while leaving the
+        // 18-stat sum (= cap) far under the all-18 floor. frac = FOCUS_WEIGHT * 1 + (1 - FOCUS_WEIGHT) * 0.
+        const cap = (0, improvement_1.getStatCap)(rarity_1.RarityEnum.LEGENDARY);
+        const stats = { ...allStats(0), stamina: cap };
+        const expected = Math.round(130 + 400 * Math.pow(improvement_1.FOCUS_WEIGHT, 2));
+        (0, globals_1.expect)((0, improvement_1.getImprovementThreshold)(stats, rarity_1.RarityEnum.LEGENDARY, role_1.RoleEnum.SETTER, stats_1.StatsEnum.STAMINA)).toBe(expected);
+    });
+    (0, globals_1.it)('consults the all-18 band too, not only the focus pool', () => {
+        // Focus pool parked at zero, everything else at the cap: the focus band contributes nothing, so any rise
+        // above CURVE_BASE can only have come from the all-18 band.
+        const cap = (0, improvement_1.getStatCap)(rarity_1.RarityEnum.LEGENDARY);
+        const stats = { ...allStats(cap), stamina: 0 };
+        (0, globals_1.expect)((0, improvement_1.getImprovementThreshold)(stats, rarity_1.RarityEnum.LEGENDARY, role_1.RoleEnum.SETTER, stats_1.StatsEnum.STAMINA))
+            .toBeGreaterThan(130);
+    });
+    (0, globals_1.it)('never decreases after a +1 on any stat, so training can never make the next step cheaper', () => {
+        // A non-monotone curve would be a free-exp loop. Both bands are plain sums, so this must hold everywhere.
+        const columns = Object.keys(allStats(0));
+        for (const rarity of ALL_RARITIES) {
+            const cap = (0, improvement_1.getStatCap)(rarity);
+            for (const focus of ALL_FOCI) {
+                for (let trial = 0; trial < 40; trial++) {
+                    const stats = {};
+                    for (const column of columns)
+                        stats[column] = 1 + Math.floor(Math.random() * cap);
+                    const before = (0, improvement_1.getImprovementThreshold)(stats, rarity, role_1.RoleEnum.LIBERO, focus);
+                    for (const column of columns) {
+                        const old = stats[column];
+                        stats[column] = old + 1;
+                        const after = (0, improvement_1.getImprovementThreshold)(stats, rarity, role_1.RoleEnum.LIBERO, focus);
+                        stats[column] = old;
+                        (0, globals_1.expect)(`${rarity}/${focus}/${column}: ${after >= before ? 'ok' : `DROPPED ${before} -> ${after}`}`)
+                            .toBe(`${rarity}/${focus}/${column}: ok`);
+                    }
+                }
+            }
+        }
+    });
+    (0, globals_1.it)('prices the same stats differently by role, because the floors are per role', () => {
+        // At LEGENDARY an outside hitter's all-18 floor is far below a libero's, so identical stats leave the OH
+        // further up their band and therefore more expensive to train.
+        const stats = allStats(50);
+        const outsideHitter = (0, improvement_1.getImprovementThreshold)(stats, rarity_1.RarityEnum.LEGENDARY, role_1.RoleEnum.OUTSIDE_HITTER, stats_1.StatsEnum.ATTACK);
+        const libero = (0, improvement_1.getImprovementThreshold)(stats, rarity_1.RarityEnum.LEGENDARY, role_1.RoleEnum.LIBERO, stats_1.StatsEnum.ATTACK);
+        (0, globals_1.expect)((0, improvement_1.getImprovementFloors)(rarity_1.RarityEnum.LEGENDARY, role_1.RoleEnum.OUTSIDE_HITTER).all)
+            .toBeLessThan((0, improvement_1.getImprovementFloors)(rarity_1.RarityEnum.LEGENDARY, role_1.RoleEnum.LIBERO).all);
+        (0, globals_1.expect)(outsideHitter).toBeGreaterThan(libero);
     });
     (0, globals_1.it)('returns an integer (Math.round applied)', () => {
-        (0, globals_1.expect)(Number.isInteger((0, improvement_1.getImprovementThreshold)(200, rarity_1.RarityEnum.RARE))).toBe(true);
+        (0, globals_1.expect)(Number.isInteger((0, improvement_1.getImprovementThreshold)(allStats(40), rarity_1.RarityEnum.RARE, role_1.RoleEnum.SETTER, stats_1.StatsEnum.ATTACK))).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);
+// ─── getImprovementFloors ─────────────────────────────────────────────────────
+(0, globals_1.describe)('getImprovementFloors()', () => {
+    (0, globals_1.it)('returns an all-18 floor and one floor per training focus for every rarity and role', () => {
+        for (const rarity of ALL_RARITIES) {
+            for (const role of ALL_ROLES) {
+                const floors = (0, improvement_1.getImprovementFloors)(rarity, role);
+                (0, globals_1.expect)(floors.all).toBeGreaterThan(0);
+                for (const focus of ALL_FOCI) {
+                    (0, globals_1.expect)(`${rarity}/${role}/${focus}: ${floors.focus[focus] > 0 ? 'present' : 'MISSING'}`)
+                        .toBe(`${rarity}/${role}/${focus}: present`);
+                }
+            }
+        }
+    });
+    (0, globals_1.it)('keeps every floor below its ceiling, so no band is degenerate', () => {
+        for (const rarity of ALL_RARITIES) {
+            const cap = (0, improvement_1.getStatCap)(rarity);
+            for (const role of ALL_ROLES) {
+                const floors = (0, improvement_1.getImprovementFloors)(rarity, role);
+                (0, globals_1.expect)(floors.all).toBeLessThan(18 * cap);
+                for (const focus of ALL_FOCI) {
+                    (0, globals_1.expect)(`${rarity}/${role}/${focus}`).toBe(`${rarity}/${role}/${focus}`);
+                    (0, globals_1.expect)(floors.focus[focus]).toBeLessThan((0, improvement_1.focusPoolColumns)(focus).length * cap);
+                }
+            }
+        }
+    });
+    (0, globals_1.it)('falls back to the rarity mean for an unknown role rather than throwing', () => {
+        // A player whose role enum changed underneath us must still be able to train.
+        const fallback = (0, improvement_1.getImprovementFloors)(rarity_1.RarityEnum.LEGENDARY, 'WING_SPIKER');
+        const known = ALL_ROLES.map(role => (0, improvement_1.getImprovementFloors)(rarity_1.RarityEnum.LEGENDARY, role).all);
+        (0, globals_1.expect)(fallback.all).toBeCloseTo(known.reduce((a, b) => a + b, 0) / known.length, 6);
     });
     (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.expect)(() => (0, improvement_1.getImprovementFloors)('DIVINE', role_1.RoleEnum.SETTER)).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));
+});
+// ─── focusPoolColumns ─────────────────────────────────────────────────────────
+(0, globals_1.describe)('focusPoolColumns()', () => {
+    (0, globals_1.it)('is exactly the set of stats that focus can raise, so band and pool cannot drift apart', () => {
+        for (const focus of ALL_FOCI) {
+            const fromMultipliers = Object.keys((0, stats_1.getMultipliers)(focus))
+                .map(key => (key === 'backAttack' ? 'back_attack' : key))
+                .sort();
+            (0, globals_1.expect)(`${focus}: ${(0, improvement_1.focusPoolColumns)(focus).slice().sort().join(',')}`)
+                .toBe(`${focus}: ${fromMultipliers.join(',')}`);
         }
     });
+    (0, globals_1.it)('uses DB column names, not PerformanceStats keys', () => {
+        (0, globals_1.expect)((0, improvement_1.focusPoolColumns)(stats_1.StatsEnum.ATTACK)).toContain('back_attack');
+        (0, globals_1.expect)((0, improvement_1.focusPoolColumns)(stats_1.StatsEnum.ATTACK)).not.toContain('backAttack');
+    });
 });
 // ─── getCoachMultiplier ───────────────────────────────────────────────────────
 (0, globals_1.describe)('getCoachMultiplier()', () => {

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

@@ -17,7 +17,11 @@ exports.PinchConditionSchema = zod_1.z.discriminatedUnion('type', [
     // SCORE_DIFF / MIN_OWN_SCORE / MIN_OPPONENT_SCORE carry an optional comparison direction ("Or more" AT_LEAST,
     // the default; "Or less" AT_MOST). Absent = AT_LEAST so existing conditions keep their `>=` behavior.
     zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.SCORE_DIFF), direction: zod_1.z.nativeEnum(pinch_condition_1.ScoreDirection), points: zod_1.z.number().int().min(1).max(25), comparison: zod_1.z.nativeEnum(pinch_condition_1.Comparison).optional() }),
-    zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.AFTER_ROTATIONS), rotations: zod_1.z.number().int().min(1).max(6) }),
+    // `rotations` counts the team's SERVE TURNS in the set (CourtTeam.gainServe, incremented once per sideout
+    // won), not a rotation position, so it is NOT bounded by the six rotation slots. Prod: a team averages 14.1
+    // serve turns per set, p99 22, max 31, and 99.4% of team-sets exceed 6. The old max of 6 made the condition
+    // unable to express anything past the first third of a set.
+    zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.AFTER_ROTATIONS), rotations: zod_1.z.number().int().min(1).max(99) }),
     zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.FROM_SET), set: zod_1.z.number().int().min(1).max(5) }),
     zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.MIN_OWN_SCORE), score: zod_1.z.number().int().min(0).max(40), comparison: zod_1.z.nativeEnum(pinch_condition_1.Comparison).optional() }),
     zod_1.z.object({ type: zod_1.z.literal(pinch_condition_1.PinchConditionType.MIN_OPPONENT_SCORE), score: zod_1.z.number().int().min(0).max(40), comparison: zod_1.z.nativeEnum(pinch_condition_1.Comparison).optional() }),

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

@@ -32,6 +32,8 @@ const test_helpers_1 = require("../../test-helpers");
         { type: pinch_condition_1.PinchConditionType.OPPONENT_SET_POINT, margin: 1 },
         { type: pinch_condition_1.PinchConditionType.SCORE_DIFF, direction: pinch_condition_1.ScoreDirection.TRAILING, points: 3 },
         { type: pinch_condition_1.PinchConditionType.AFTER_ROTATIONS, rotations: 1 },
+        // A team averages 14 serve turns per set, so a realistic late-set value must validate.
+        { type: pinch_condition_1.PinchConditionType.AFTER_ROTATIONS, rotations: 22 },
         { type: pinch_condition_1.PinchConditionType.FROM_SET, set: 5 },
         { type: pinch_condition_1.PinchConditionType.MIN_OWN_SCORE, score: 20 },
         { type: pinch_condition_1.PinchConditionType.MIN_OPPONENT_SCORE, score: 20 }
@@ -51,7 +53,7 @@ const test_helpers_1 = require("../../test-helpers");
     (0, globals_1.it)('enforces numeric bounds', () => {
         (0, globals_1.expect)(designated_sub_z_1.PinchConditionSchema.safeParse({ type: pinch_condition_1.PinchConditionType.TEAM_SET_POINT, margin: 0, opponent: pinch_condition_1.OpponentRelation.AHEAD }).success).toBe(false);
         (0, globals_1.expect)(designated_sub_z_1.PinchConditionSchema.safeParse({ type: pinch_condition_1.PinchConditionType.TEAM_SET_POINT, margin: 26, opponent: pinch_condition_1.OpponentRelation.AHEAD }).success).toBe(false);
-        (0, globals_1.expect)(designated_sub_z_1.PinchConditionSchema.safeParse({ type: pinch_condition_1.PinchConditionType.AFTER_ROTATIONS, rotations: 7 }).success).toBe(false);
+        (0, globals_1.expect)(designated_sub_z_1.PinchConditionSchema.safeParse({ type: pinch_condition_1.PinchConditionType.AFTER_ROTATIONS, rotations: 100 }).success).toBe(false);
         (0, globals_1.expect)(designated_sub_z_1.PinchConditionSchema.safeParse({ type: pinch_condition_1.PinchConditionType.FROM_SET, set: 6 }).success).toBe(false);
         (0, globals_1.expect)(designated_sub_z_1.PinchConditionSchema.safeParse({ type: pinch_condition_1.PinchConditionType.MIN_OWN_SCORE, score: 41 }).success).toBe(false);
         (0, globals_1.expect)(designated_sub_z_1.PinchConditionSchema.safeParse({ type: pinch_condition_1.PinchConditionType.SCORE_DIFF, direction: pinch_condition_1.ScoreDirection.TRAILING, points: 0 }).success).toBe(false);