volleyballsimtypes 0.0.494 → 0.0.495

package/dist/cjs/src/service/competition/event-draft.d.ts

@@ -1,35 +1,19 @@
 import { Country } from '../country';
 import { Player, Rarity, Role } from '../player';
-/**
- * The pack that is not targeted at a position: the single free pick at the end. Stored on the pack row and
- * read by the view to label it, so it is a named constant rather than a bare string in three repos.
- */
-export declare const FREE_PACK_ROLE = "ANY";
-/** A pack targets one role, or the free pick. */
-export type DraftRole = Role | typeof FREE_PACK_ROLE;
-/** How many players a role-targeted pack offers. */
+/** A pack targets one role, or ANY for the single free pick at the end. */
+export type DraftRole = Role | 'ANY';
+/** How many players an opened pack offers. */
 export declare const PACK_SIZE = 4;
 /**
- * The pack sequence, in the order they are opened. One pick each, so this is also the squad: a full
- * 14-player team by position (2 setters, 4 outsides, 4 middles, 2 opposites, 2 liberos), and then a
- * fifteenth free pick on top of it.
+ * The pack sequence, in the order they are opened. One pick each, so this is also the squad: 2 setters,
+ * 4 outsides, 3 middles, 2 opposites, 2 liberos, plus one free pick, for a squad of 14 like every other team.
  *
  * Role-targeted rather than free choice on purpose: it makes a positionally valid squad impossible to get
- * wrong, so nobody drafts six liberos and then cannot field a legal lineup. The fourteen targeted packs
- * stand on their own as a complete squad, which is why the free pick can be a genuine bonus rather than a
- * slot the squad depends on.
+ * wrong, so nobody drafts six liberos and then cannot field a legal lineup.
  */
 export declare const DRAFT_PLAN: readonly DraftRole[];
 /** The size of a drafted squad: one pick per pack. */
 export declare const DRAFT_SQUAD_SIZE: number;
-/**
- * How many packs are targeted at a position, which is every pack but the free one. Derived rather than typed
- * out because the copy describing the draft quotes it, and prose that repeats a constant is prose that drifts
- * away from it.
- */
-export declare const TARGETED_PACK_COUNT: number;
-/** How many players the free pack offers: one per position. */
-export declare const FREE_PACK_SIZE: number;
 /**
  * How hard each rarity's recruits are skewed toward the top of their range when drafted in an event.
  *
@@ -43,13 +27,14 @@ export declare const FREE_PACK_SIZE: number;
  */
 export declare const EVENT_DRAFT_TOP_SKEW: Record<Rarity, number>;
 /**
- * The players a pack offers, at the event's rarity. A role-targeted pack offers `PACK_SIZE` of that one role;
- * the free pack offers `FREE_PACK_SIZE`, one per position, so the choice is which position to add to.
+ * The players a pack offers: `PACK_SIZE` of the pack's role at the event's rarity. The lower rarities are
+ * generated with a top-end skew (EVENT_DRAFT_TOP_SKEW) so their recruits cluster near the best; legendaries
+ * are left uniform.
  *
- * The lower rarities are generated with a top-end skew (EVENT_DRAFT_TOP_SKEW) so their recruits cluster near
- * the best; legendaries are left uniform.
+ * `pickRole` decides what an ANY pack rolls; it is passed in rather than chosen here so the caller controls the
+ * randomness (and a test can make it deterministic).
  */
-export declare function generatePack(country: Country, rarity: Rarity, packRole: DraftRole): Player[];
+export declare function generatePack(country: Country, rarity: Rarity, packRole: DraftRole, pickRole: (roles: readonly Role[]) => Role): Player[];
 /** The role of the pack at `index`, or undefined once the draft is complete. */
 export declare function draftPackRole(index: number): DraftRole | undefined;
 export declare function isDraftComplete(picks: number): boolean;

package/dist/cjs/src/service/competition/event-draft.js

@@ -1,61 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVENT_DRAFT_TOP_SKEW = exports.FREE_PACK_SIZE = exports.TARGETED_PACK_COUNT = exports.DRAFT_SQUAD_SIZE = exports.DRAFT_PLAN = exports.PACK_SIZE = exports.FREE_PACK_ROLE = void 0;
+exports.EVENT_DRAFT_TOP_SKEW = exports.DRAFT_SQUAD_SIZE = exports.DRAFT_PLAN = exports.PACK_SIZE = void 0;
 exports.generatePack = generatePack;
 exports.draftPackRole = draftPackRole;
 exports.isDraftComplete = isDraftComplete;
 const player_1 = require("../player");
-// The event draft. An entrant does not bring their own squad: they open a fixed sequence of role-targeted
-// packs, keep one player from each, and the resulting team is thrown away when the event ends.
-//
-// This module is pure: the pack sequence and pack generation. Persistence (which packs a user has opened, what
-// they picked) lives in the API, because the draft is user-driven rather than scheduled.
-/**
- * The pack that is not targeted at a position: the single free pick at the end. Stored on the pack row and
- * read by the view to label it, so it is a named constant rather than a bare string in three repos.
- */
-exports.FREE_PACK_ROLE = 'ANY';
-/** How many players a role-targeted pack offers. */
+/** How many players an opened pack offers. */
 exports.PACK_SIZE = 4;
 /**
- * The pack sequence, in the order they are opened. One pick each, so this is also the squad: a full
- * 14-player team by position (2 setters, 4 outsides, 4 middles, 2 opposites, 2 liberos), and then a
- * fifteenth free pick on top of it.
+ * The pack sequence, in the order they are opened. One pick each, so this is also the squad: 2 setters,
+ * 4 outsides, 3 middles, 2 opposites, 2 liberos, plus one free pick, for a squad of 14 like every other team.
  *
  * Role-targeted rather than free choice on purpose: it makes a positionally valid squad impossible to get
- * wrong, so nobody drafts six liberos and then cannot field a legal lineup. The fourteen targeted packs
- * stand on their own as a complete squad, which is why the free pick can be a genuine bonus rather than a
- * slot the squad depends on.
+ * wrong, so nobody drafts six liberos and then cannot field a legal lineup.
  */
 exports.DRAFT_PLAN = [
     player_1.RoleEnum.SETTER, player_1.RoleEnum.SETTER,
     player_1.RoleEnum.OUTSIDE_HITTER, player_1.RoleEnum.OUTSIDE_HITTER, player_1.RoleEnum.OUTSIDE_HITTER, player_1.RoleEnum.OUTSIDE_HITTER,
-    player_1.RoleEnum.MIDDLE_BLOCKER, player_1.RoleEnum.MIDDLE_BLOCKER, player_1.RoleEnum.MIDDLE_BLOCKER, player_1.RoleEnum.MIDDLE_BLOCKER,
+    player_1.RoleEnum.MIDDLE_BLOCKER, player_1.RoleEnum.MIDDLE_BLOCKER, player_1.RoleEnum.MIDDLE_BLOCKER,
     player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.OPPOSITE_HITTER,
     player_1.RoleEnum.LIBERO, player_1.RoleEnum.LIBERO,
-    exports.FREE_PACK_ROLE
+    'ANY'
 ];
 /** The size of a drafted squad: one pick per pack. */
 exports.DRAFT_SQUAD_SIZE = exports.DRAFT_PLAN.length;
-/**
- * How many packs are targeted at a position, which is every pack but the free one. Derived rather than typed
- * out because the copy describing the draft quotes it, and prose that repeats a constant is prose that drifts
- * away from it.
- */
-exports.TARGETED_PACK_COUNT = exports.DRAFT_PLAN.filter(role => role !== exports.FREE_PACK_ROLE).length;
-/**
- * The free pack offers one player per position, in this order, so the entrant chooses which position to
- * strengthen rather than being handed a position at random.
- *
- * It used to roll ONE role at random and offer four of it, which meant a 1-in-5 lottery decided whether an
- * entrant ended up with a third setter or a fifth outside. The squad is complete without this pick now, so
- * offering the whole board is both fairer and the point of calling it free.
- */
+/** The role a free pack rolls its choices at, so an ANY pack still offers a coherent set. */
 const ANY_PACK_ROLES = [
     player_1.RoleEnum.SETTER, player_1.RoleEnum.OUTSIDE_HITTER, player_1.RoleEnum.MIDDLE_BLOCKER, player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.LIBERO
 ];
-/** How many players the free pack offers: one per position. */
-exports.FREE_PACK_SIZE = ANY_PACK_ROLES.length;
 /**
  * How hard each rarity's recruits are skewed toward the top of their range when drafted in an event.
  *
@@ -75,18 +47,17 @@ exports.EVENT_DRAFT_TOP_SKEW = {
     [player_1.RarityEnum.SPECIAL]: 0
 };
 /**
- * The players a pack offers, at the event's rarity. A role-targeted pack offers `PACK_SIZE` of that one role;
- * the free pack offers `FREE_PACK_SIZE`, one per position, so the choice is which position to add to.
+ * The players a pack offers: `PACK_SIZE` of the pack's role at the event's rarity. The lower rarities are
+ * generated with a top-end skew (EVENT_DRAFT_TOP_SKEW) so their recruits cluster near the best; legendaries
+ * are left uniform.
  *
- * The lower rarities are generated with a top-end skew (EVENT_DRAFT_TOP_SKEW) so their recruits cluster near
- * the best; legendaries are left uniform.
+ * `pickRole` decides what an ANY pack rolls; it is passed in rather than chosen here so the caller controls the
+ * randomness (and a test can make it deterministic).
  */
-function generatePack(country, rarity, packRole) {
+function generatePack(country, rarity, packRole, pickRole) {
+    const role = packRole === 'ANY' ? pickRole(ANY_PACK_ROLES) : packRole;
     const skew = exports.EVENT_DRAFT_TOP_SKEW[rarity] ?? 0;
-    const roll = (role) => player_1.PlayerGenerator.generatePlayer(country, rarity, role, false, 1, skew);
-    if (packRole === exports.FREE_PACK_ROLE)
-        return ANY_PACK_ROLES.map(roll);
-    return Array.from({ length: exports.PACK_SIZE }, () => roll(packRole));
+    return Array.from({ length: exports.PACK_SIZE }, () => player_1.PlayerGenerator.generatePlayer(country, rarity, role, false, 1, skew));
 }
 /** The role of the pack at `index`, or undefined once the draft is complete. */
 function draftPackRole(index) {

package/dist/cjs/src/service/competition/event-draft.test.js

@@ -5,6 +5,7 @@ const event_draft_1 = require("./event-draft");
 const player_1 = require("../player");
 const test_helpers_1 = require("../test-helpers");
 const COUNTRY = (0, test_helpers_1.makeCountry)();
+const first = (roles) => roles[0];
 // Aggregate helpers: skew is statistical, so the behaviour tests use large samples and generous margins to stay
 // off the flaky edge while still failing loudly if the skew were removed.
 function median(values) {
@@ -19,7 +20,7 @@ function percentile(values, p) {
 function draftScores(rarity, role, n) {
     const out = [];
     while (out.length < n) {
-        for (const p of (0, event_draft_1.generatePack)(COUNTRY, rarity, role))
+        for (const p of (0, event_draft_1.generatePack)(COUNTRY, rarity, role, first))
             out.push((0, player_1.calculateRoleScore)(p.stats, role));
     }
     return out.slice(0, n);
@@ -29,31 +30,28 @@ function uniformScores(rarity, role, n) {
     return Array.from({ length: n }, () => (0, player_1.calculateRoleScore)(player_1.PlayerGenerator.generatePlayer(COUNTRY, rarity, role, false, 1, 0).stats, role));
 }
 (0, globals_1.describe)('DRAFT_PLAN', () => {
-    (0, globals_1.it)('drafts a 15-player squad, one pick per pack', () => {
-        (0, globals_1.expect)(event_draft_1.DRAFT_SQUAD_SIZE).toBe(15);
-        (0, globals_1.expect)(event_draft_1.DRAFT_PLAN).toHaveLength(15);
+    (0, globals_1.it)('drafts a full 14-player squad, one pick per pack', () => {
+        (0, globals_1.expect)(event_draft_1.DRAFT_SQUAD_SIZE).toBe(14);
+        (0, globals_1.expect)(event_draft_1.DRAFT_PLAN).toHaveLength(14);
     });
-    (0, globals_1.it)('fills every position outright, then adds the free pick on top', () => {
+    (0, globals_1.it)('guarantees a positionally valid squad', () => {
         const counts = event_draft_1.DRAFT_PLAN.reduce((acc, role) => {
             acc[role] = (acc[role] ?? 0) + 1;
             return acc;
         }, {});
         (0, globals_1.expect)(counts[player_1.RoleEnum.SETTER]).toBe(2);
         (0, globals_1.expect)(counts[player_1.RoleEnum.OUTSIDE_HITTER]).toBe(4);
-        (0, globals_1.expect)(counts[player_1.RoleEnum.MIDDLE_BLOCKER]).toBe(4);
+        (0, globals_1.expect)(counts[player_1.RoleEnum.MIDDLE_BLOCKER]).toBe(3);
         (0, globals_1.expect)(counts[player_1.RoleEnum.OPPOSITE_HITTER]).toBe(2);
         (0, globals_1.expect)(counts[player_1.RoleEnum.LIBERO]).toBe(2);
         (0, globals_1.expect)(counts.ANY).toBe(1);
-        // The targeted packs alone are a complete 14-player squad, so the free pick adds to a squad that is
-        // already legal rather than filling a hole in it.
-        const targeted = event_draft_1.DRAFT_PLAN.filter(role => role !== event_draft_1.FREE_PACK_ROLE);
-        (0, globals_1.expect)(targeted).toHaveLength(14);
-        (0, globals_1.expect)(event_draft_1.TARGETED_PACK_COUNT).toBe(14);
-        (0, globals_1.expect)(event_draft_1.TARGETED_PACK_COUNT).toBe(event_draft_1.DRAFT_SQUAD_SIZE - 1);
-    });
-    (0, globals_1.it)('puts the free pick last, so nothing after it depends on what was taken', () => {
-        (0, globals_1.expect)(event_draft_1.DRAFT_PLAN[event_draft_1.DRAFT_PLAN.length - 1]).toBe(event_draft_1.FREE_PACK_ROLE);
-        (0, globals_1.expect)(event_draft_1.DRAFT_PLAN.filter(role => role === event_draft_1.FREE_PACK_ROLE)).toHaveLength(1);
+        // Enough for a legal starting six plus a libero, whatever the free pack is spent on: a 5-1 needs a setter,
+        // two middles, two outsides and an opposite on court, and a libero off it.
+        (0, globals_1.expect)(counts[player_1.RoleEnum.SETTER]).toBeGreaterThanOrEqual(1);
+        (0, globals_1.expect)(counts[player_1.RoleEnum.MIDDLE_BLOCKER]).toBeGreaterThanOrEqual(2);
+        (0, globals_1.expect)(counts[player_1.RoleEnum.OUTSIDE_HITTER]).toBeGreaterThanOrEqual(2);
+        (0, globals_1.expect)(counts[player_1.RoleEnum.OPPOSITE_HITTER]).toBeGreaterThanOrEqual(1);
+        (0, globals_1.expect)(counts[player_1.RoleEnum.LIBERO]).toBeGreaterThanOrEqual(1);
     });
     (0, globals_1.it)('walks pack by pack and then reports the draft complete', () => {
         for (let i = 0; i < event_draft_1.DRAFT_SQUAD_SIZE; i++) {
@@ -67,32 +65,18 @@ function uniformScores(rarity, role, n) {
 (0, globals_1.describe)('generatePack()', () => {
     globals_1.it.each([player_1.RarityEnum.COMMON, player_1.RarityEnum.RARE, player_1.RarityEnum.LEGENDARY])('offers %s players of the pack role', (rarity) => {
         const role = player_1.RoleEnum.OUTSIDE_HITTER;
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, rarity, role);
+        const pack = (0, event_draft_1.generatePack)(COUNTRY, rarity, role, first);
         (0, globals_1.expect)(pack).toHaveLength(event_draft_1.PACK_SIZE);
         for (const player of pack) {
             (0, globals_1.expect)(player.rarity).toBe(rarity);
             (0, globals_1.expect)(player.roles).toContain(role);
         }
     });
-    (0, globals_1.it)('offers one player per position in the free pack, so every position is on the board', () => {
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.COMMON, event_draft_1.FREE_PACK_ROLE);
-        (0, globals_1.expect)(pack).toHaveLength(event_draft_1.FREE_PACK_SIZE);
-        (0, globals_1.expect)(event_draft_1.FREE_PACK_SIZE).toBe(5);
-        // The primary role is the one the pack was rolled at, and all five positions appear exactly once.
-        const primary = pack.map(p => p.roles[0]);
-        (0, globals_1.expect)([...primary].sort()).toEqual([
-            player_1.RoleEnum.LIBERO, player_1.RoleEnum.MIDDLE_BLOCKER, player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.OUTSIDE_HITTER, player_1.RoleEnum.SETTER
-        ].sort());
-    });
-    globals_1.it.each([player_1.RarityEnum.COMMON, player_1.RarityEnum.RARE, player_1.RarityEnum.LEGENDARY])('rolls the free pack at the event rarity (%s), like every other pack', (rarity) => {
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, rarity, event_draft_1.FREE_PACK_ROLE);
-        (0, globals_1.expect)(pack).toHaveLength(event_draft_1.FREE_PACK_SIZE);
+    (0, globals_1.it)('rolls a free (ANY) pack at the role it is handed', () => {
+        const pack = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.COMMON, 'ANY', () => player_1.RoleEnum.LIBERO);
+        (0, globals_1.expect)(pack).toHaveLength(event_draft_1.PACK_SIZE);
         for (const player of pack)
-            (0, globals_1.expect)(player.rarity).toBe(rarity);
-    });
-    (0, globals_1.it)('never offers the same player twice in a free pack', () => {
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.RARE, event_draft_1.FREE_PACK_ROLE);
-        (0, globals_1.expect)(new Set(pack.map(p => p.id)).size).toBe(event_draft_1.FREE_PACK_SIZE);
+            (0, globals_1.expect)(player.roles).toContain(player_1.RoleEnum.LIBERO);
     });
 });
 (0, globals_1.describe)('EVENT_DRAFT_TOP_SKEW', () => {

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);