volleyballsimtypes 0.0.428 → 0.0.430

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/match/match-rating.d.ts

@@ -17,16 +17,14 @@ export declare class MatchRating {
     static readonly C4: number;
     static readonly C5: number;
     static readonly SSV: SetScoreVariant;
-    static readonly LEAGUE_BASE: number;
-    static readonly TIER_PENALTY: number;
+    static readonly LEAGUE_WEIGHT: number;
+    static readonly NATIONAL_WEIGHT: number;
     static readonly QUALIFIER_WEIGHT: number;
     static readonly TOURNAMENT_WEIGHT: number;
-    static readonly NATIONAL_WEIGHT: number;
     readonly match: Match;
     readonly weight: number;
     static create(input: unknown): MatchRating;
     private constructor();
-    private static leagueWeight;
     private static applyBotPenalty;
     private static computeWeight;
     static calculateProbability(z: number): number;

package/dist/cjs/src/service/match/match-rating.js

@@ -21,23 +21,16 @@ class MatchRating {
         this.match = match;
         this.weight = MatchRating.computeWeight(context);
     }
-    static leagueWeight(tier) {
-        return Math.max(MatchRating.TIER_PENALTY, MatchRating.LEAGUE_BASE - MatchRating.TIER_PENALTY * tier);
-    }
     static applyBotPenalty(weight, homeIsBot, awayIsBot) {
         const bots = (homeIsBot ? 1 : 0) + (awayIsBot ? 1 : 0);
         return weight * Math.pow(0.5, bots);
     }
     static computeWeight(context) {
         switch (context.kind) {
-            case 'LEAGUE': {
-                const base = MatchRating.leagueWeight(context.tier);
-                return MatchRating.applyBotPenalty(base, context.homeIsBot, context.awayIsBot);
-            }
-            case 'PROMOTION': {
-                const base = (MatchRating.leagueWeight(context.upperTier) + MatchRating.leagueWeight(context.lowerTier)) / 2;
-                return MatchRating.applyBotPenalty(base, context.homeIsBot, context.awayIsBot);
-            }
+            // Promotion plays at the league weight (it is a league-tier playoff).
+            case 'LEAGUE':
+            case 'PROMOTION':
+                return MatchRating.applyBotPenalty(MatchRating.LEAGUE_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'QUALIFIER':
                 return MatchRating.applyBotPenalty(MatchRating.QUALIFIER_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'TOURNAMENT':
@@ -89,13 +82,10 @@ MatchRating.SSV = {
     '1-3': -1.5,
     '0-3': -2
 };
-// League weight = LEAGUE_BASE - TIER_PENALTY * tier
-// Tier 1 → 35, Tier 2 → 30, Tier 3 → 25, Tier 4 → 20, ...
-MatchRating.LEAGUE_BASE = 40;
-MatchRating.TIER_PENALTY = 5;
-// Regional qualifier — higher prestige than any league tier
-MatchRating.QUALIFIER_WEIGHT = 45;
-// WCC tournament — top of the hierarchy
-MatchRating.TOURNAMENT_WEIGHT = 55;
-// National cup, between qualifier and tournament prestige
-MatchRating.NATIONAL_WEIGHT = 50;
+// FIVB tournament-importance weight: FIVB's "K" in S_after = S_before + K*(R-E)/8 (note the static `K`
+// below is the formula's /8 divisor, NOT this). One flat value per competition, FIVB-style — no per-tier
+// or per-stage scaling, since the rating-gap expected result already rewards beating stronger teams.
+MatchRating.LEAGUE_WEIGHT = 20;
+MatchRating.NATIONAL_WEIGHT = 30;
+MatchRating.QUALIFIER_WEIGHT = 40;
+MatchRating.TOURNAMENT_WEIGHT = 50; // WCC, top of the hierarchy

package/dist/cjs/src/service/match/match-rating.test.js

@@ -37,22 +37,21 @@ const number_utils_1 = require("../utils/number-utils");
         const match = (0, test_helpers_1.makeMatch30)(home, away);
         return match_rating_1.MatchRating.create({ match, context });
     }
-    (0, globals_1.it)('LEAGUE tier 1 → weight = LEAGUE_BASE - TIER_PENALTY * 1 = 35', () => {
-        const mr = makeRating({ kind: 'LEAGUE', tier: 1, homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBe(35);
+    (0, globals_1.it)('LEAGUE → flat LEAGUE_WEIGHT (20), independent of tier', () => {
+        (0, globals_1.expect)(makeRating({ kind: 'LEAGUE', tier: 1, homeIsBot: false, awayIsBot: false }).weight).toBe(20);
+        (0, globals_1.expect)(makeRating({ kind: 'LEAGUE', tier: 7, homeIsBot: false, awayIsBot: false }).weight).toBe(20);
     });
-    (0, globals_1.it)('LEAGUE tier 7 → weight is floored at TIER_PENALTY (5)', () => {
-        // 40 - 5*7 = 5 (minimum is TIER_PENALTY itself)
-        const mr = makeRating({ kind: 'LEAGUE', tier: 7, homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBe(5);
+    (0, globals_1.it)('NATIONAL → weight = NATIONAL_WEIGHT (30)', () => {
+        const mr = makeRating({ kind: 'NATIONAL', homeIsBot: false, awayIsBot: false });
+        (0, globals_1.expect)(mr.weight).toBe(30);
     });
-    (0, globals_1.it)('QUALIFIER → weight = QUALIFIER_WEIGHT (45)', () => {
+    (0, globals_1.it)('QUALIFIER → weight = QUALIFIER_WEIGHT (40)', () => {
         const mr = makeRating({ kind: 'QUALIFIER', homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBe(45);
+        (0, globals_1.expect)(mr.weight).toBe(40);
     });
-    (0, globals_1.it)('TOURNAMENT → weight = TOURNAMENT_WEIGHT (55)', () => {
+    (0, globals_1.it)('TOURNAMENT → weight = TOURNAMENT_WEIGHT (50)', () => {
         const mr = makeRating({ kind: 'TOURNAMENT', homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBe(55);
+        (0, globals_1.expect)(mr.weight).toBe(50);
     });
     (0, globals_1.it)('each bot halves the weight', () => {
         const noBots = makeRating({ kind: 'QUALIFIER', homeIsBot: false, awayIsBot: false });
@@ -61,10 +60,9 @@ const number_utils_1 = require("../utils/number-utils");
         (0, globals_1.expect)(oneBot.weight).toBeCloseTo(noBots.weight * 0.5, 10);
         (0, globals_1.expect)(twoBots.weight).toBeCloseTo(noBots.weight * 0.25, 10);
     });
-    (0, globals_1.it)('PROMOTION weight is the average of the two league tier weights', () => {
-        // upperTier=1 (35), lowerTier=2 (30) → avg = 32.5
+    (0, globals_1.it)('PROMOTION → league weight (20)', () => {
         const mr = makeRating({ kind: 'PROMOTION', upperTier: 1, lowerTier: 2, homeIsBot: false, awayIsBot: false });
-        (0, globals_1.expect)(mr.weight).toBeCloseTo(32.5, 5);
+        (0, globals_1.expect)(mr.weight).toBe(20);
     });
 });
 // ─── getExpectedResult ────────────────────────────────────────────────────────

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/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/match/match-rating.d.ts

@@ -17,16 +17,14 @@ export declare class MatchRating {
     static readonly C4: number;
     static readonly C5: number;
     static readonly SSV: SetScoreVariant;
-    static readonly LEAGUE_BASE: number;
-    static readonly TIER_PENALTY: number;
+    static readonly LEAGUE_WEIGHT: number;
+    static readonly NATIONAL_WEIGHT: number;
     static readonly QUALIFIER_WEIGHT: number;
     static readonly TOURNAMENT_WEIGHT: number;
-    static readonly NATIONAL_WEIGHT: number;
     readonly match: Match;
     readonly weight: number;
     static create(input: unknown): MatchRating;
     private constructor();
-    private static leagueWeight;
     private static applyBotPenalty;
     private static computeWeight;
     static calculateProbability(z: number): number;

package/dist/esm/src/service/match/match-rating.js

@@ -18,23 +18,16 @@ export class MatchRating {
         this.match = match;
         this.weight = MatchRating.computeWeight(context);
     }
-    static leagueWeight(tier) {
-        return Math.max(MatchRating.TIER_PENALTY, MatchRating.LEAGUE_BASE - MatchRating.TIER_PENALTY * tier);
-    }
     static applyBotPenalty(weight, homeIsBot, awayIsBot) {
         const bots = (homeIsBot ? 1 : 0) + (awayIsBot ? 1 : 0);
         return weight * Math.pow(0.5, bots);
     }
     static computeWeight(context) {
         switch (context.kind) {
-            case 'LEAGUE': {
-                const base = MatchRating.leagueWeight(context.tier);
-                return MatchRating.applyBotPenalty(base, context.homeIsBot, context.awayIsBot);
-            }
-            case 'PROMOTION': {
-                const base = (MatchRating.leagueWeight(context.upperTier) + MatchRating.leagueWeight(context.lowerTier)) / 2;
-                return MatchRating.applyBotPenalty(base, context.homeIsBot, context.awayIsBot);
-            }
+            // Promotion plays at the league weight (it is a league-tier playoff).
+            case 'LEAGUE':
+            case 'PROMOTION':
+                return MatchRating.applyBotPenalty(MatchRating.LEAGUE_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'QUALIFIER':
                 return MatchRating.applyBotPenalty(MatchRating.QUALIFIER_WEIGHT, context.homeIsBot, context.awayIsBot);
             case 'TOURNAMENT':
@@ -85,13 +78,10 @@ MatchRating.SSV = {
     '1-3': -1.5,
     '0-3': -2
 };
-// League weight = LEAGUE_BASE - TIER_PENALTY * tier
-// Tier 1 → 35, Tier 2 → 30, Tier 3 → 25, Tier 4 → 20, ...
-MatchRating.LEAGUE_BASE = 40;
-MatchRating.TIER_PENALTY = 5;
-// Regional qualifier — higher prestige than any league tier
-MatchRating.QUALIFIER_WEIGHT = 45;
-// WCC tournament — top of the hierarchy
-MatchRating.TOURNAMENT_WEIGHT = 55;
-// National cup, between qualifier and tournament prestige
-MatchRating.NATIONAL_WEIGHT = 50;
+// FIVB tournament-importance weight: FIVB's "K" in S_after = S_before + K*(R-E)/8 (note the static `K`
+// below is the formula's /8 divisor, NOT this). One flat value per competition, FIVB-style — no per-tier
+// or per-stage scaling, since the rating-gap expected result already rewards beating stronger teams.
+MatchRating.LEAGUE_WEIGHT = 20;
+MatchRating.NATIONAL_WEIGHT = 30;
+MatchRating.QUALIFIER_WEIGHT = 40;
+MatchRating.TOURNAMENT_WEIGHT = 50; // WCC, top of the hierarchy

package/dist/esm/src/service/match/match-rating.test.js

@@ -35,22 +35,21 @@ describe('MatchRating weight computation', () => {
         const match = makeMatch30(home, away);
         return MatchRating.create({ match, context });
     }
-    it('LEAGUE tier 1 → weight = LEAGUE_BASE - TIER_PENALTY * 1 = 35', () => {
-        const mr = makeRating({ kind: 'LEAGUE', tier: 1, homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBe(35);
+    it('LEAGUE → flat LEAGUE_WEIGHT (20), independent of tier', () => {
+        expect(makeRating({ kind: 'LEAGUE', tier: 1, homeIsBot: false, awayIsBot: false }).weight).toBe(20);
+        expect(makeRating({ kind: 'LEAGUE', tier: 7, homeIsBot: false, awayIsBot: false }).weight).toBe(20);
     });
-    it('LEAGUE tier 7 → weight is floored at TIER_PENALTY (5)', () => {
-        // 40 - 5*7 = 5 (minimum is TIER_PENALTY itself)
-        const mr = makeRating({ kind: 'LEAGUE', tier: 7, homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBe(5);
+    it('NATIONAL → weight = NATIONAL_WEIGHT (30)', () => {
+        const mr = makeRating({ kind: 'NATIONAL', homeIsBot: false, awayIsBot: false });
+        expect(mr.weight).toBe(30);
     });
-    it('QUALIFIER → weight = QUALIFIER_WEIGHT (45)', () => {
+    it('QUALIFIER → weight = QUALIFIER_WEIGHT (40)', () => {
         const mr = makeRating({ kind: 'QUALIFIER', homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBe(45);
+        expect(mr.weight).toBe(40);
     });
-    it('TOURNAMENT → weight = TOURNAMENT_WEIGHT (55)', () => {
+    it('TOURNAMENT → weight = TOURNAMENT_WEIGHT (50)', () => {
         const mr = makeRating({ kind: 'TOURNAMENT', homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBe(55);
+        expect(mr.weight).toBe(50);
     });
     it('each bot halves the weight', () => {
         const noBots = makeRating({ kind: 'QUALIFIER', homeIsBot: false, awayIsBot: false });
@@ -59,10 +58,9 @@ describe('MatchRating weight computation', () => {
         expect(oneBot.weight).toBeCloseTo(noBots.weight * 0.5, 10);
         expect(twoBots.weight).toBeCloseTo(noBots.weight * 0.25, 10);
     });
-    it('PROMOTION weight is the average of the two league tier weights', () => {
-        // upperTier=1 (35), lowerTier=2 (30) → avg = 32.5
+    it('PROMOTION → league weight (20)', () => {
         const mr = makeRating({ kind: 'PROMOTION', upperTier: 1, lowerTier: 2, homeIsBot: false, awayIsBot: false });
-        expect(mr.weight).toBeCloseTo(32.5, 5);
+        expect(mr.weight).toBe(20);
     });
 });
 // ─── getExpectedResult ────────────────────────────────────────────────────────

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/package.json

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