volleyballsimtypes 0.0.492 → 0.0.494

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/competition/event-draft.d.ts

@@ -1,46 +1,55 @@
 import { Country } from '../country';
 import { Player, Rarity, Role } from '../player';
-/** 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. */
+/**
+ * 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. */
 export declare const PACK_SIZE = 4;
 /**
- * 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.
+ * 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.
  *
  * 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.
+ * 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.
  */
 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 far a pack's players may sit from the median for their rarity, as a fraction of the role score.
- *
- * The whole point of a generated draft is that the material is comparable: without this, one entrant opens a
- * pack of duds while another opens a pack of stars and the event is decided before a ball is served. A player
- * whose role score falls outside the band is rerolled.
+ * 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 PACK_QUALITY_TOLERANCE = 0.08;
-export interface PackQualityBand {
-    readonly role: Role;
-    readonly min: number;
-    readonly max: number;
-}
+export declare const TARGETED_PACK_COUNT: number;
+/** How many players the free pack offers: one per position. */
+export declare const FREE_PACK_SIZE: number;
 /**
- * The in-band range for a role at a rarity, measured from a sample of freshly generated players rather than
- * from hardcoded numbers, so it tracks the generator instead of drifting away from it whenever stats are
- * retuned. Deterministic enough in aggregate: the sample is large and the band is a fraction of its median.
+ * How hard each rarity's recruits are skewed toward the top of their range when drafted in an event.
+ *
+ * Owner decision (2026-07-23): commons and rares are generated NEAR THEIR BEST, so a lower-rarity event still
+ * fields strong squads, while legendaries (and up) stay uniform, so a legendary event fields average
+ * legendaries rather than peak ones. The number is a generator skew strength (see randomIntSkewed): 0 is the
+ * plain uniform draw, and 2 was measured to land the typical common/rare recruit around the 80th percentile of
+ * its normal role-score distribution (the top fifth) while keeping real spread and never forcing a maxed
+ * player. This replaces the old reject-and-reroll fairness band: the skew lives in the generator, so the
+ * material is comparable in one draw.
  */
-export declare function packQualityBand(country: Country, rarity: Rarity, role: Role, sampleSize?: number): PackQualityBand;
+export declare const EVENT_DRAFT_TOP_SKEW: Record<Rarity, number>;
 /**
- * The players a pack offers: `PACK_SIZE` of the pack's role at the event's rarity, every one of them inside
- * the fairness band.
+ * 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.
  *
- * `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).
+ * 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.
  */
-export declare function generatePack(country: Country, rarity: Rarity, packRole: DraftRole, band: (role: Role) => PackQualityBand, pickRole: (roles: readonly Role[]) => Role): Player[];
+export declare function generatePack(country: Country, rarity: Rarity, packRole: DraftRole): 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,80 +1,92 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PACK_QUALITY_TOLERANCE = exports.DRAFT_SQUAD_SIZE = exports.DRAFT_PLAN = exports.PACK_SIZE = void 0;
-exports.packQualityBand = packQualityBand;
+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.generatePack = generatePack;
 exports.draftPackRole = draftPackRole;
 exports.isDraftComplete = isDraftComplete;
 const player_1 = require("../player");
-/** How many players an opened pack offers. */
+// 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. */
 exports.PACK_SIZE = 4;
 /**
- * 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.
+ * 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.
  *
  * 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.
+ * 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.
  */
 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,
-    'ANY'
+    exports.FREE_PACK_ROLE
 ];
 /** The size of a drafted squad: one pick per pack. */
 exports.DRAFT_SQUAD_SIZE = exports.DRAFT_PLAN.length;
-/** The role a free pack rolls its choices at, so an ANY pack still offers a coherent set. */
+/**
+ * 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.
+ */
 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 far a pack's players may sit from the median for their rarity, as a fraction of the role score.
+ * How hard each rarity's recruits are skewed toward the top of their range when drafted in an event.
  *
- * The whole point of a generated draft is that the material is comparable: without this, one entrant opens a
- * pack of duds while another opens a pack of stars and the event is decided before a ball is served. A player
- * whose role score falls outside the band is rerolled.
+ * Owner decision (2026-07-23): commons and rares are generated NEAR THEIR BEST, so a lower-rarity event still
+ * fields strong squads, while legendaries (and up) stay uniform, so a legendary event fields average
+ * legendaries rather than peak ones. The number is a generator skew strength (see randomIntSkewed): 0 is the
+ * plain uniform draw, and 2 was measured to land the typical common/rare recruit around the 80th percentile of
+ * its normal role-score distribution (the top fifth) while keeping real spread and never forcing a maxed
+ * player. This replaces the old reject-and-reroll fairness band: the skew lives in the generator, so the
+ * material is comparable in one draw.
  */
-exports.PACK_QUALITY_TOLERANCE = 0.08;
-/** Give up rerolling after this many attempts and take what we have, so generation can never spin forever. */
-const MAX_REROLLS = 40;
-/**
- * The in-band range for a role at a rarity, measured from a sample of freshly generated players rather than
- * from hardcoded numbers, so it tracks the generator instead of drifting away from it whenever stats are
- * retuned. Deterministic enough in aggregate: the sample is large and the band is a fraction of its median.
- */
-function packQualityBand(country, rarity, role, sampleSize = 60) {
-    const scores = Array.from({ length: sampleSize }, () => (0, player_1.calculateRoleScore)(player_1.PlayerGenerator.generatePlayer(country, rarity, role, false, 1).stats, role)).sort((a, b) => a - b);
-    const median = scores[Math.floor(scores.length / 2)];
-    return {
-        role,
-        min: median * (1 - exports.PACK_QUALITY_TOLERANCE),
-        max: median * (1 + exports.PACK_QUALITY_TOLERANCE)
-    };
-}
+exports.EVENT_DRAFT_TOP_SKEW = {
+    [player_1.RarityEnum.COMMON]: 2,
+    [player_1.RarityEnum.RARE]: 2,
+    [player_1.RarityEnum.LEGENDARY]: 0,
+    [player_1.RarityEnum.MYTHIC]: 0,
+    [player_1.RarityEnum.SPECIAL]: 0
+};
 /**
- * The players a pack offers: `PACK_SIZE` of the pack's role at the event's rarity, every one of them inside
- * the fairness band.
+ * 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.
  *
- * `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).
+ * 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.
  */
-function generatePack(country, rarity, packRole, band, pickRole) {
-    const role = packRole === 'ANY' ? pickRole(ANY_PACK_ROLES) : packRole;
-    const { min, max } = band(role);
-    const players = [];
-    for (let i = 0; i < exports.PACK_SIZE; i++) {
-        let player = player_1.PlayerGenerator.generatePlayer(country, rarity, role, false, 1);
-        for (let attempt = 0; attempt < MAX_REROLLS; attempt++) {
-            const score = (0, player_1.calculateRoleScore)(player.stats, role);
-            if (score >= min && score <= max)
-                break;
-            player = player_1.PlayerGenerator.generatePlayer(country, rarity, role, false, 1);
-        }
-        players.push(player);
-    }
-    return players;
+function generatePack(country, rarity, 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));
 }
 /** 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,29 +5,55 @@ 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)();
+// 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) {
+    const sorted = [...values].sort((a, b) => a - b);
+    return sorted[Math.floor(sorted.length / 2)];
+}
+function percentile(values, p) {
+    const sorted = [...values].sort((a, b) => a - b);
+    return sorted[Math.floor((sorted.length - 1) * p)];
+}
+/** Role scores of `n` recruits drawn the way the DRAFT does (generatePack applies EVENT_DRAFT_TOP_SKEW). */
+function draftScores(rarity, role, n) {
+    const out = [];
+    while (out.length < n) {
+        for (const p of (0, event_draft_1.generatePack)(COUNTRY, rarity, role))
+            out.push((0, player_1.calculateRoleScore)(p.stats, role));
+    }
+    return out.slice(0, n);
+}
+/** Role scores of `n` recruits drawn UNIFORMLY (the generator's historic behaviour, skew 0). */
+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 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)('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)('guarantees a positionally valid squad', () => {
+    (0, globals_1.it)('fills every position outright, then adds the free pick on top', () => {
         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(3);
+        (0, globals_1.expect)(counts[player_1.RoleEnum.MIDDLE_BLOCKER]).toBe(4);
         (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);
-        // 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);
+        // 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);
     });
     (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++) {
@@ -39,53 +65,70 @@ const COUNTRY = (0, test_helpers_1.makeCountry)();
     });
 });
 (0, globals_1.describe)('generatePack()', () => {
-    const first = (roles) => roles[0];
-    globals_1.it.each([player_1.RarityEnum.COMMON, player_1.RarityEnum.RARE, player_1.RarityEnum.LEGENDARY])('offers %s players of the pack role, all inside the fairness band', (rarity) => {
+    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 band = (0, event_draft_1.packQualityBand)(COUNTRY, rarity, role);
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, rarity, role, () => band, first);
+        const pack = (0, event_draft_1.generatePack)(COUNTRY, rarity, role);
         (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);
-            const score = (0, player_1.calculateRoleScore)(player.stats, role);
-            (0, globals_1.expect)(score).toBeGreaterThanOrEqual(band.min);
-            (0, globals_1.expect)(score).toBeLessThanOrEqual(band.max);
         }
     });
-    (0, globals_1.it)('keeps two packs of the same role comparable', () => {
-        const role = player_1.RoleEnum.MIDDLE_BLOCKER;
-        const band = (0, event_draft_1.packQualityBand)(COUNTRY, player_1.RarityEnum.RARE, role);
-        const score = (p) => (0, player_1.calculateRoleScore)(p.stats, role);
-        const a = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.RARE, role, () => band, first).map(score);
-        const b = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.RARE, role, () => band, first).map(score);
-        // The point of the band: the best pack cannot run away from the worst one.
-        const spread = Math.max(...a, ...b) - Math.min(...a, ...b);
-        (0, globals_1.expect)(spread).toBeLessThanOrEqual(band.max - band.min);
+    (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());
     });
-    (0, globals_1.it)('rolls a free pack at the role it is handed', () => {
-        const band = (0, event_draft_1.packQualityBand)(COUNTRY, player_1.RarityEnum.COMMON, player_1.RoleEnum.LIBERO);
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.COMMON, 'ANY', () => band, () => player_1.RoleEnum.LIBERO);
-        (0, globals_1.expect)(pack).toHaveLength(event_draft_1.PACK_SIZE);
+    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);
         for (const player of pack)
-            (0, globals_1.expect)(player.roles).toContain(player_1.RoleEnum.LIBERO);
+            (0, globals_1.expect)(player.rarity).toBe(rarity);
     });
-    (0, globals_1.it)('terminates even when nothing can land in band', () => {
-        const impossible = { role: player_1.RoleEnum.SETTER, min: Number.MAX_SAFE_INTEGER, max: Number.MAX_SAFE_INTEGER };
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.COMMON, player_1.RoleEnum.SETTER, () => impossible, first);
-        // Generation gives up rather than spinning: a full pack is still returned.
-        (0, globals_1.expect)(pack).toHaveLength(event_draft_1.PACK_SIZE);
+    (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.describe)('EVENT_DRAFT_TOP_SKEW', () => {
+    (0, globals_1.it)('skews commons and rares toward the top and leaves legendaries (and up) uniform', () => {
+        (0, globals_1.expect)(event_draft_1.EVENT_DRAFT_TOP_SKEW[player_1.RarityEnum.COMMON]).toBeGreaterThan(0);
+        (0, globals_1.expect)(event_draft_1.EVENT_DRAFT_TOP_SKEW[player_1.RarityEnum.RARE]).toBeGreaterThan(0);
+        (0, globals_1.expect)(event_draft_1.EVENT_DRAFT_TOP_SKEW[player_1.RarityEnum.LEGENDARY]).toBe(0);
+        (0, globals_1.expect)(event_draft_1.EVENT_DRAFT_TOP_SKEW[player_1.RarityEnum.MYTHIC]).toBe(0);
+        (0, globals_1.expect)(event_draft_1.EVENT_DRAFT_TOP_SKEW[player_1.RarityEnum.SPECIAL]).toBe(0);
     });
 });
-(0, globals_1.describe)('packQualityBand()', () => {
-    (0, globals_1.it)('brackets the median of what the generator actually produces', () => {
-        const band = (0, event_draft_1.packQualityBand)(COUNTRY, player_1.RarityEnum.LEGENDARY, player_1.RoleEnum.SETTER);
-        (0, globals_1.expect)(band.min).toBeLessThan(band.max);
-        (0, globals_1.expect)(band.min).toBeGreaterThan(0);
+(0, globals_1.describe)('draft skew behaviour', () => {
+    const N = 2500;
+    const role = player_1.RoleEnum.OUTSIDE_HITTER;
+    globals_1.it.each([player_1.RarityEnum.COMMON, player_1.RarityEnum.RARE])('draws %s recruits near the top: the typical recruit outscores a uniform draw, and most land in its top fifth', (rarity) => {
+        const uniform = uniformScores(rarity, role, N);
+        const drafted = draftScores(rarity, role, N);
+        // The 80th percentile of a UNIFORM draw is the entry to the top fifth of the range.
+        const topFifthFloor = percentile(uniform, 0.80);
+        const draftedInTopFifth = drafted.filter(s => s >= topFifthFloor).length / drafted.length;
+        // A uniform draw puts ~20% here; the skew must push well past that (measured ~65-88% at skew 2).
+        (0, globals_1.expect)(draftedInTopFifth).toBeGreaterThan(0.45);
+        // The typical drafted recruit clearly outscores the typical uniform one.
+        (0, globals_1.expect)(median(drafted)).toBeGreaterThan(median(uniform));
+        // But it is a skew, not a clamp to the maximum: recruits still spread out, and the typical one sits
+        // below the best in the sample rather than everyone landing on the ceiling.
+        (0, globals_1.expect)(percentile(drafted, 0.10)).toBeLessThan(percentile(drafted, 0.90));
+        (0, globals_1.expect)(median(drafted)).toBeLessThan(Math.max(...drafted));
     });
-    (0, globals_1.it)('scales with rarity, so a legendary band sits above a common one', () => {
-        const common = (0, event_draft_1.packQualityBand)(COUNTRY, player_1.RarityEnum.COMMON, player_1.RoleEnum.OUTSIDE_HITTER);
-        const legendary = (0, event_draft_1.packQualityBand)(COUNTRY, player_1.RarityEnum.LEGENDARY, player_1.RoleEnum.OUTSIDE_HITTER);
-        (0, globals_1.expect)(legendary.min).toBeGreaterThan(common.max);
+    (0, globals_1.it)('leaves legendary recruits uniform: no top-end lift over a plain draw', () => {
+        const uniform = uniformScores(player_1.RarityEnum.LEGENDARY, role, N);
+        const drafted = draftScores(player_1.RarityEnum.LEGENDARY, role, N);
+        const topFifthFloor = percentile(uniform, 0.80);
+        const draftedInTopFifth = drafted.filter(s => s >= topFifthFloor).length / drafted.length;
+        // Same distribution as uniform (skew 0), so it stays near the ~20% a plain draw produces, nowhere near the
+        // >45% the skewed lower rarities reach.
+        (0, globals_1.expect)(draftedInTopFifth).toBeLessThan(0.35);
     });
 });

package/dist/cjs/src/service/player/player-generator.d.ts

@@ -42,7 +42,7 @@ export declare function rollRarity(pity: PityState, config?: GachaPullConfig): R
 export declare class PlayerGenerator {
     private constructor();
     private static generatePerformance;
-    static generatePlayer(country: Country, _rarity?: Rarity, role?: Role, maxTraits?: boolean, birthIteration?: number): Player;
+    static generatePlayer(country: Country, _rarity?: Rarity, role?: Role, maxTraits?: boolean, birthIteration?: number, topSkew?: number): Player;
     static generatePlayers(count: number, countries: Country[]): Player[];
 }
 export declare function pickPlayerCountry(teamCountry: Country, allCountries: Country[]): Country;

package/dist/cjs/src/service/player/player-generator.js

@@ -209,7 +209,7 @@ function rollRarity(pity, config = WORLD_PULL_CONFIG) {
 /* eslint-disable @typescript-eslint/no-extraneous-class */
 class PlayerGenerator {
     constructor() { }
-    static generatePerformance(rarity, role) {
+    static generatePerformance(rarity, role, topSkew = 0) {
         const ATTACK = (0, stats_1.getMultipliers)(stats_1.StatsEnum.ATTACK);
         const SET = (0, stats_1.getMultipliers)(stats_1.StatsEnum.SET);
         const RECEIVE = (0, stats_1.getMultipliers)(stats_1.StatsEnum.RECEIVE);
@@ -220,8 +220,10 @@ class PlayerGenerator {
                 // Stamina always uses its own per-rarity range (guaranteed floor), regardless of role weight.
                 if (key === 'stamina')
                     return [key, rollStamina(rarity)];
+                // On-role stats drive the role score, so a positive topSkew bends only these toward the top of the
+                // range; off-role stats stay uniform. topSkew defaults to 0 (the historic uniform draw).
                 if (weights[key] > 0)
-                    return [key, (0, node_crypto_1.randomInt)(minValue, maxValue + 1)];
+                    return [key, randomIntSkewed(minValue, maxValue, topSkew)];
                 else
                     return [key, (0, node_crypto_1.randomInt)(rarity_1.RarityRanges.COMMON[0], Math.max(minValue - 1, rarity_1.RarityRanges.COMMON[0] + 1))];
             })));
@@ -315,10 +317,10 @@ class PlayerGenerator {
             }
         }
     }
-    static generatePlayer(country, _rarity, role, maxTraits, birthIteration = 1) {
+    static generatePlayer(country, _rarity, role, maxTraits, birthIteration = 1, topSkew = 0) {
         const rarity = _rarity ?? rollRarity({ legendaryPity: 0, mythicPity: 0, specialPity: 0 }).rarity;
         const name = (0, utils_1.generatePlayerName)(country.locales, 1)[0];
-        const stats = PlayerGenerator.generatePerformance(rarity, role);
+        const stats = PlayerGenerator.generatePerformance(rarity, role, topSkew);
         const roles = (0, role_1.assignRoles)(stats, rarity, role);
         const traits = (0, trait_1.assignTraits)(roles, rarity, maxTraits);
         const birthAge = (0, node_crypto_1.randomInt)(15, 21);
@@ -360,6 +362,21 @@ function rollStamina(rarity) {
     const [low, high] = rarity_1.StaminaRanges[rarity];
     return (0, node_crypto_1.randomInt)(low, high + 1);
 }
+/**
+ * A crypto.randomInt draw over [min, max] inclusive, optionally skewed toward the top.
+ *
+ * skew = 0 is the plain uniform draw the generator has always used. A positive skew bends a uniform fraction
+ * upward with u^(1/(1+skew)), so higher values become progressively likelier while the maximum is never forced,
+ * which keeps the result random rather than a maxed stat. Event drafts use this to make the lower rarities'
+ * recruits cluster near the top of their range (see EVENT_DRAFT_TOP_SKEW).
+ */
+function randomIntSkewed(min, max, skew) {
+    if (skew <= 0 || max <= min)
+        return (0, node_crypto_1.randomInt)(min, max + 1);
+    const u = (0, node_crypto_1.randomInt)(0, 1000001) / 1000000;
+    const frac = Math.pow(u, 1 / (1 + skew));
+    return min + Math.round(frac * (max - min));
+}
 function assignValues(stat, low, high, performance) {
     performance_stats_1.performanceStatKeys.filter((key) => stat[key] != null && stat[key] > 0)
         .forEach((key) => {

package/dist/esm/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/esm/src/service/competition/event-draft.d.ts

@@ -1,46 +1,55 @@
 import { Country } from '../country';
 import { Player, Rarity, Role } from '../player';
-/** 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. */
+/**
+ * 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. */
 export declare const PACK_SIZE = 4;
 /**
- * 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.
+ * 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.
  *
  * 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.
+ * 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.
  */
 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 far a pack's players may sit from the median for their rarity, as a fraction of the role score.
- *
- * The whole point of a generated draft is that the material is comparable: without this, one entrant opens a
- * pack of duds while another opens a pack of stars and the event is decided before a ball is served. A player
- * whose role score falls outside the band is rerolled.
+ * 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 PACK_QUALITY_TOLERANCE = 0.08;
-export interface PackQualityBand {
-    readonly role: Role;
-    readonly min: number;
-    readonly max: number;
-}
+export declare const TARGETED_PACK_COUNT: number;
+/** How many players the free pack offers: one per position. */
+export declare const FREE_PACK_SIZE: number;
 /**
- * The in-band range for a role at a rarity, measured from a sample of freshly generated players rather than
- * from hardcoded numbers, so it tracks the generator instead of drifting away from it whenever stats are
- * retuned. Deterministic enough in aggregate: the sample is large and the band is a fraction of its median.
+ * How hard each rarity's recruits are skewed toward the top of their range when drafted in an event.
+ *
+ * Owner decision (2026-07-23): commons and rares are generated NEAR THEIR BEST, so a lower-rarity event still
+ * fields strong squads, while legendaries (and up) stay uniform, so a legendary event fields average
+ * legendaries rather than peak ones. The number is a generator skew strength (see randomIntSkewed): 0 is the
+ * plain uniform draw, and 2 was measured to land the typical common/rare recruit around the 80th percentile of
+ * its normal role-score distribution (the top fifth) while keeping real spread and never forcing a maxed
+ * player. This replaces the old reject-and-reroll fairness band: the skew lives in the generator, so the
+ * material is comparable in one draw.
  */
-export declare function packQualityBand(country: Country, rarity: Rarity, role: Role, sampleSize?: number): PackQualityBand;
+export declare const EVENT_DRAFT_TOP_SKEW: Record<Rarity, number>;
 /**
- * The players a pack offers: `PACK_SIZE` of the pack's role at the event's rarity, every one of them inside
- * the fairness band.
+ * 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.
  *
- * `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).
+ * 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.
  */
-export declare function generatePack(country: Country, rarity: Rarity, packRole: DraftRole, band: (role: Role) => PackQualityBand, pickRole: (roles: readonly Role[]) => Role): Player[];
+export declare function generatePack(country: Country, rarity: Rarity, packRole: DraftRole): 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/esm/src/service/competition/event-draft.js

@@ -1,73 +1,86 @@
-import { PlayerGenerator, RoleEnum, calculateRoleScore } from '../player';
-/** How many players an opened pack offers. */
+import { PlayerGenerator, RarityEnum, RoleEnum } from '../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.
+ */
+export const FREE_PACK_ROLE = 'ANY';
+/** How many players a role-targeted pack offers. */
 export const PACK_SIZE = 4;
 /**
- * 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.
+ * 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.
  *
  * 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.
+ * 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.
  */
 export const DRAFT_PLAN = [
     RoleEnum.SETTER, RoleEnum.SETTER,
     RoleEnum.OUTSIDE_HITTER, RoleEnum.OUTSIDE_HITTER, RoleEnum.OUTSIDE_HITTER, RoleEnum.OUTSIDE_HITTER,
-    RoleEnum.MIDDLE_BLOCKER, RoleEnum.MIDDLE_BLOCKER, RoleEnum.MIDDLE_BLOCKER,
+    RoleEnum.MIDDLE_BLOCKER, RoleEnum.MIDDLE_BLOCKER, RoleEnum.MIDDLE_BLOCKER, RoleEnum.MIDDLE_BLOCKER,
     RoleEnum.OPPOSITE_HITTER, RoleEnum.OPPOSITE_HITTER,
     RoleEnum.LIBERO, RoleEnum.LIBERO,
-    'ANY'
+    FREE_PACK_ROLE
 ];
 /** The size of a drafted squad: one pick per pack. */
 export const DRAFT_SQUAD_SIZE = DRAFT_PLAN.length;
-/** The role a free pack rolls its choices at, so an ANY pack still offers a coherent set. */
+/**
+ * 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 const TARGETED_PACK_COUNT = DRAFT_PLAN.filter(role => role !== 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.
+ */
 const ANY_PACK_ROLES = [
     RoleEnum.SETTER, RoleEnum.OUTSIDE_HITTER, RoleEnum.MIDDLE_BLOCKER, RoleEnum.OPPOSITE_HITTER, RoleEnum.LIBERO
 ];
+/** How many players the free pack offers: one per position. */
+export const FREE_PACK_SIZE = ANY_PACK_ROLES.length;
 /**
- * How far a pack's players may sit from the median for their rarity, as a fraction of the role score.
+ * How hard each rarity's recruits are skewed toward the top of their range when drafted in an event.
  *
- * The whole point of a generated draft is that the material is comparable: without this, one entrant opens a
- * pack of duds while another opens a pack of stars and the event is decided before a ball is served. A player
- * whose role score falls outside the band is rerolled.
+ * Owner decision (2026-07-23): commons and rares are generated NEAR THEIR BEST, so a lower-rarity event still
+ * fields strong squads, while legendaries (and up) stay uniform, so a legendary event fields average
+ * legendaries rather than peak ones. The number is a generator skew strength (see randomIntSkewed): 0 is the
+ * plain uniform draw, and 2 was measured to land the typical common/rare recruit around the 80th percentile of
+ * its normal role-score distribution (the top fifth) while keeping real spread and never forcing a maxed
+ * player. This replaces the old reject-and-reroll fairness band: the skew lives in the generator, so the
+ * material is comparable in one draw.
  */
-export const PACK_QUALITY_TOLERANCE = 0.08;
-/** Give up rerolling after this many attempts and take what we have, so generation can never spin forever. */
-const MAX_REROLLS = 40;
-/**
- * The in-band range for a role at a rarity, measured from a sample of freshly generated players rather than
- * from hardcoded numbers, so it tracks the generator instead of drifting away from it whenever stats are
- * retuned. Deterministic enough in aggregate: the sample is large and the band is a fraction of its median.
- */
-export function packQualityBand(country, rarity, role, sampleSize = 60) {
-    const scores = Array.from({ length: sampleSize }, () => calculateRoleScore(PlayerGenerator.generatePlayer(country, rarity, role, false, 1).stats, role)).sort((a, b) => a - b);
-    const median = scores[Math.floor(scores.length / 2)];
-    return {
-        role,
-        min: median * (1 - PACK_QUALITY_TOLERANCE),
-        max: median * (1 + PACK_QUALITY_TOLERANCE)
-    };
-}
+export const EVENT_DRAFT_TOP_SKEW = {
+    [RarityEnum.COMMON]: 2,
+    [RarityEnum.RARE]: 2,
+    [RarityEnum.LEGENDARY]: 0,
+    [RarityEnum.MYTHIC]: 0,
+    [RarityEnum.SPECIAL]: 0
+};
 /**
- * The players a pack offers: `PACK_SIZE` of the pack's role at the event's rarity, every one of them inside
- * the fairness band.
+ * 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.
  *
- * `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).
+ * 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.
  */
-export function generatePack(country, rarity, packRole, band, pickRole) {
-    const role = packRole === 'ANY' ? pickRole(ANY_PACK_ROLES) : packRole;
-    const { min, max } = band(role);
-    const players = [];
-    for (let i = 0; i < PACK_SIZE; i++) {
-        let player = PlayerGenerator.generatePlayer(country, rarity, role, false, 1);
-        for (let attempt = 0; attempt < MAX_REROLLS; attempt++) {
-            const score = calculateRoleScore(player.stats, role);
-            if (score >= min && score <= max)
-                break;
-            player = PlayerGenerator.generatePlayer(country, rarity, role, false, 1);
-        }
-        players.push(player);
-    }
-    return players;
+export function generatePack(country, rarity, packRole) {
+    const skew = EVENT_DRAFT_TOP_SKEW[rarity] ?? 0;
+    const roll = (role) => PlayerGenerator.generatePlayer(country, rarity, role, false, 1, skew);
+    if (packRole === FREE_PACK_ROLE)
+        return ANY_PACK_ROLES.map(roll);
+    return Array.from({ length: PACK_SIZE }, () => roll(packRole));
 }
 /** The role of the pack at `index`, or undefined once the draft is complete. */
 export function draftPackRole(index) {

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

@@ -1,31 +1,57 @@
 import { describe, it, expect } from '@jest/globals';
-import { DRAFT_PLAN, DRAFT_SQUAD_SIZE, PACK_SIZE, draftPackRole, generatePack, isDraftComplete, packQualityBand } from './event-draft';
-import { RarityEnum, RoleEnum, calculateRoleScore } from '../player';
+import { DRAFT_PLAN, DRAFT_SQUAD_SIZE, EVENT_DRAFT_TOP_SKEW, FREE_PACK_ROLE, FREE_PACK_SIZE, PACK_SIZE, TARGETED_PACK_COUNT, draftPackRole, generatePack, isDraftComplete } from './event-draft';
+import { PlayerGenerator, RarityEnum, RoleEnum, calculateRoleScore } from '../player';
 import { makeCountry } from '../test-helpers';
 const COUNTRY = makeCountry();
+// 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) {
+    const sorted = [...values].sort((a, b) => a - b);
+    return sorted[Math.floor(sorted.length / 2)];
+}
+function percentile(values, p) {
+    const sorted = [...values].sort((a, b) => a - b);
+    return sorted[Math.floor((sorted.length - 1) * p)];
+}
+/** Role scores of `n` recruits drawn the way the DRAFT does (generatePack applies EVENT_DRAFT_TOP_SKEW). */
+function draftScores(rarity, role, n) {
+    const out = [];
+    while (out.length < n) {
+        for (const p of generatePack(COUNTRY, rarity, role))
+            out.push(calculateRoleScore(p.stats, role));
+    }
+    return out.slice(0, n);
+}
+/** Role scores of `n` recruits drawn UNIFORMLY (the generator's historic behaviour, skew 0). */
+function uniformScores(rarity, role, n) {
+    return Array.from({ length: n }, () => calculateRoleScore(PlayerGenerator.generatePlayer(COUNTRY, rarity, role, false, 1, 0).stats, role));
+}
 describe('DRAFT_PLAN', () => {
-    it('drafts a full 14-player squad, one pick per pack', () => {
-        expect(DRAFT_SQUAD_SIZE).toBe(14);
-        expect(DRAFT_PLAN).toHaveLength(14);
+    it('drafts a 15-player squad, one pick per pack', () => {
+        expect(DRAFT_SQUAD_SIZE).toBe(15);
+        expect(DRAFT_PLAN).toHaveLength(15);
     });
-    it('guarantees a positionally valid squad', () => {
+    it('fills every position outright, then adds the free pick on top', () => {
         const counts = DRAFT_PLAN.reduce((acc, role) => {
             acc[role] = (acc[role] ?? 0) + 1;
             return acc;
         }, {});
         expect(counts[RoleEnum.SETTER]).toBe(2);
         expect(counts[RoleEnum.OUTSIDE_HITTER]).toBe(4);
-        expect(counts[RoleEnum.MIDDLE_BLOCKER]).toBe(3);
+        expect(counts[RoleEnum.MIDDLE_BLOCKER]).toBe(4);
         expect(counts[RoleEnum.OPPOSITE_HITTER]).toBe(2);
         expect(counts[RoleEnum.LIBERO]).toBe(2);
         expect(counts.ANY).toBe(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.
-        expect(counts[RoleEnum.SETTER]).toBeGreaterThanOrEqual(1);
-        expect(counts[RoleEnum.MIDDLE_BLOCKER]).toBeGreaterThanOrEqual(2);
-        expect(counts[RoleEnum.OUTSIDE_HITTER]).toBeGreaterThanOrEqual(2);
-        expect(counts[RoleEnum.OPPOSITE_HITTER]).toBeGreaterThanOrEqual(1);
-        expect(counts[RoleEnum.LIBERO]).toBeGreaterThanOrEqual(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 = DRAFT_PLAN.filter(role => role !== FREE_PACK_ROLE);
+        expect(targeted).toHaveLength(14);
+        expect(TARGETED_PACK_COUNT).toBe(14);
+        expect(TARGETED_PACK_COUNT).toBe(DRAFT_SQUAD_SIZE - 1);
+    });
+    it('puts the free pick last, so nothing after it depends on what was taken', () => {
+        expect(DRAFT_PLAN[DRAFT_PLAN.length - 1]).toBe(FREE_PACK_ROLE);
+        expect(DRAFT_PLAN.filter(role => role === FREE_PACK_ROLE)).toHaveLength(1);
     });
     it('walks pack by pack and then reports the draft complete', () => {
         for (let i = 0; i < DRAFT_SQUAD_SIZE; i++) {
@@ -37,53 +63,70 @@ describe('DRAFT_PLAN', () => {
     });
 });
 describe('generatePack()', () => {
-    const first = (roles) => roles[0];
-    it.each([RarityEnum.COMMON, RarityEnum.RARE, RarityEnum.LEGENDARY])('offers %s players of the pack role, all inside the fairness band', (rarity) => {
+    it.each([RarityEnum.COMMON, RarityEnum.RARE, RarityEnum.LEGENDARY])('offers %s players of the pack role', (rarity) => {
         const role = RoleEnum.OUTSIDE_HITTER;
-        const band = packQualityBand(COUNTRY, rarity, role);
-        const pack = generatePack(COUNTRY, rarity, role, () => band, first);
+        const pack = generatePack(COUNTRY, rarity, role);
         expect(pack).toHaveLength(PACK_SIZE);
         for (const player of pack) {
             expect(player.rarity).toBe(rarity);
             expect(player.roles).toContain(role);
-            const score = calculateRoleScore(player.stats, role);
-            expect(score).toBeGreaterThanOrEqual(band.min);
-            expect(score).toBeLessThanOrEqual(band.max);
         }
     });
-    it('keeps two packs of the same role comparable', () => {
-        const role = RoleEnum.MIDDLE_BLOCKER;
-        const band = packQualityBand(COUNTRY, RarityEnum.RARE, role);
-        const score = (p) => calculateRoleScore(p.stats, role);
-        const a = generatePack(COUNTRY, RarityEnum.RARE, role, () => band, first).map(score);
-        const b = generatePack(COUNTRY, RarityEnum.RARE, role, () => band, first).map(score);
-        // The point of the band: the best pack cannot run away from the worst one.
-        const spread = Math.max(...a, ...b) - Math.min(...a, ...b);
-        expect(spread).toBeLessThanOrEqual(band.max - band.min);
+    it('offers one player per position in the free pack, so every position is on the board', () => {
+        const pack = generatePack(COUNTRY, RarityEnum.COMMON, FREE_PACK_ROLE);
+        expect(pack).toHaveLength(FREE_PACK_SIZE);
+        expect(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]);
+        expect([...primary].sort()).toEqual([
+            RoleEnum.LIBERO, RoleEnum.MIDDLE_BLOCKER, RoleEnum.OPPOSITE_HITTER, RoleEnum.OUTSIDE_HITTER, RoleEnum.SETTER
+        ].sort());
     });
-    it('rolls a free pack at the role it is handed', () => {
-        const band = packQualityBand(COUNTRY, RarityEnum.COMMON, RoleEnum.LIBERO);
-        const pack = generatePack(COUNTRY, RarityEnum.COMMON, 'ANY', () => band, () => RoleEnum.LIBERO);
-        expect(pack).toHaveLength(PACK_SIZE);
+    it.each([RarityEnum.COMMON, RarityEnum.RARE, RarityEnum.LEGENDARY])('rolls the free pack at the event rarity (%s), like every other pack', (rarity) => {
+        const pack = generatePack(COUNTRY, rarity, FREE_PACK_ROLE);
+        expect(pack).toHaveLength(FREE_PACK_SIZE);
         for (const player of pack)
-            expect(player.roles).toContain(RoleEnum.LIBERO);
+            expect(player.rarity).toBe(rarity);
     });
-    it('terminates even when nothing can land in band', () => {
-        const impossible = { role: RoleEnum.SETTER, min: Number.MAX_SAFE_INTEGER, max: Number.MAX_SAFE_INTEGER };
-        const pack = generatePack(COUNTRY, RarityEnum.COMMON, RoleEnum.SETTER, () => impossible, first);
-        // Generation gives up rather than spinning: a full pack is still returned.
-        expect(pack).toHaveLength(PACK_SIZE);
+    it('never offers the same player twice in a free pack', () => {
+        const pack = generatePack(COUNTRY, RarityEnum.RARE, FREE_PACK_ROLE);
+        expect(new Set(pack.map(p => p.id)).size).toBe(FREE_PACK_SIZE);
+    });
+});
+describe('EVENT_DRAFT_TOP_SKEW', () => {
+    it('skews commons and rares toward the top and leaves legendaries (and up) uniform', () => {
+        expect(EVENT_DRAFT_TOP_SKEW[RarityEnum.COMMON]).toBeGreaterThan(0);
+        expect(EVENT_DRAFT_TOP_SKEW[RarityEnum.RARE]).toBeGreaterThan(0);
+        expect(EVENT_DRAFT_TOP_SKEW[RarityEnum.LEGENDARY]).toBe(0);
+        expect(EVENT_DRAFT_TOP_SKEW[RarityEnum.MYTHIC]).toBe(0);
+        expect(EVENT_DRAFT_TOP_SKEW[RarityEnum.SPECIAL]).toBe(0);
     });
 });
-describe('packQualityBand()', () => {
-    it('brackets the median of what the generator actually produces', () => {
-        const band = packQualityBand(COUNTRY, RarityEnum.LEGENDARY, RoleEnum.SETTER);
-        expect(band.min).toBeLessThan(band.max);
-        expect(band.min).toBeGreaterThan(0);
+describe('draft skew behaviour', () => {
+    const N = 2500;
+    const role = RoleEnum.OUTSIDE_HITTER;
+    it.each([RarityEnum.COMMON, RarityEnum.RARE])('draws %s recruits near the top: the typical recruit outscores a uniform draw, and most land in its top fifth', (rarity) => {
+        const uniform = uniformScores(rarity, role, N);
+        const drafted = draftScores(rarity, role, N);
+        // The 80th percentile of a UNIFORM draw is the entry to the top fifth of the range.
+        const topFifthFloor = percentile(uniform, 0.80);
+        const draftedInTopFifth = drafted.filter(s => s >= topFifthFloor).length / drafted.length;
+        // A uniform draw puts ~20% here; the skew must push well past that (measured ~65-88% at skew 2).
+        expect(draftedInTopFifth).toBeGreaterThan(0.45);
+        // The typical drafted recruit clearly outscores the typical uniform one.
+        expect(median(drafted)).toBeGreaterThan(median(uniform));
+        // But it is a skew, not a clamp to the maximum: recruits still spread out, and the typical one sits
+        // below the best in the sample rather than everyone landing on the ceiling.
+        expect(percentile(drafted, 0.10)).toBeLessThan(percentile(drafted, 0.90));
+        expect(median(drafted)).toBeLessThan(Math.max(...drafted));
     });
-    it('scales with rarity, so a legendary band sits above a common one', () => {
-        const common = packQualityBand(COUNTRY, RarityEnum.COMMON, RoleEnum.OUTSIDE_HITTER);
-        const legendary = packQualityBand(COUNTRY, RarityEnum.LEGENDARY, RoleEnum.OUTSIDE_HITTER);
-        expect(legendary.min).toBeGreaterThan(common.max);
+    it('leaves legendary recruits uniform: no top-end lift over a plain draw', () => {
+        const uniform = uniformScores(RarityEnum.LEGENDARY, role, N);
+        const drafted = draftScores(RarityEnum.LEGENDARY, role, N);
+        const topFifthFloor = percentile(uniform, 0.80);
+        const draftedInTopFifth = drafted.filter(s => s >= topFifthFloor).length / drafted.length;
+        // Same distribution as uniform (skew 0), so it stays near the ~20% a plain draw produces, nowhere near the
+        // >45% the skewed lower rarities reach.
+        expect(draftedInTopFifth).toBeLessThan(0.35);
     });
 });

package/dist/esm/src/service/player/player-generator.d.ts

@@ -42,7 +42,7 @@ export declare function rollRarity(pity: PityState, config?: GachaPullConfig): R
 export declare class PlayerGenerator {
     private constructor();
     private static generatePerformance;
-    static generatePlayer(country: Country, _rarity?: Rarity, role?: Role, maxTraits?: boolean, birthIteration?: number): Player;
+    static generatePlayer(country: Country, _rarity?: Rarity, role?: Role, maxTraits?: boolean, birthIteration?: number, topSkew?: number): Player;
     static generatePlayers(count: number, countries: Country[]): Player[];
 }
 export declare function pickPlayerCountry(teamCountry: Country, allCountries: Country[]): Country;

package/dist/esm/src/service/player/player-generator.js

@@ -203,7 +203,7 @@ export function rollRarity(pity, config = WORLD_PULL_CONFIG) {
 /* eslint-disable @typescript-eslint/no-extraneous-class */
 export class PlayerGenerator {
     constructor() { }
-    static generatePerformance(rarity, role) {
+    static generatePerformance(rarity, role, topSkew = 0) {
         const ATTACK = getMultipliers(StatsEnum.ATTACK);
         const SET = getMultipliers(StatsEnum.SET);
         const RECEIVE = getMultipliers(StatsEnum.RECEIVE);
@@ -214,8 +214,10 @@ export class PlayerGenerator {
                 // Stamina always uses its own per-rarity range (guaranteed floor), regardless of role weight.
                 if (key === 'stamina')
                     return [key, rollStamina(rarity)];
+                // On-role stats drive the role score, so a positive topSkew bends only these toward the top of the
+                // range; off-role stats stay uniform. topSkew defaults to 0 (the historic uniform draw).
                 if (weights[key] > 0)
-                    return [key, randomInt(minValue, maxValue + 1)];
+                    return [key, randomIntSkewed(minValue, maxValue, topSkew)];
                 else
                     return [key, randomInt(RarityRanges.COMMON[0], Math.max(minValue - 1, RarityRanges.COMMON[0] + 1))];
             })));
@@ -309,10 +311,10 @@ export class PlayerGenerator {
             }
         }
     }
-    static generatePlayer(country, _rarity, role, maxTraits, birthIteration = 1) {
+    static generatePlayer(country, _rarity, role, maxTraits, birthIteration = 1, topSkew = 0) {
         const rarity = _rarity ?? rollRarity({ legendaryPity: 0, mythicPity: 0, specialPity: 0 }).rarity;
         const name = generatePlayerName(country.locales, 1)[0];
-        const stats = PlayerGenerator.generatePerformance(rarity, role);
+        const stats = PlayerGenerator.generatePerformance(rarity, role, topSkew);
         const roles = assignRoles(stats, rarity, role);
         const traits = assignTraits(roles, rarity, maxTraits);
         const birthAge = randomInt(15, 21);
@@ -353,6 +355,21 @@ function rollStamina(rarity) {
     const [low, high] = StaminaRanges[rarity];
     return randomInt(low, high + 1);
 }
+/**
+ * A crypto.randomInt draw over [min, max] inclusive, optionally skewed toward the top.
+ *
+ * skew = 0 is the plain uniform draw the generator has always used. A positive skew bends a uniform fraction
+ * upward with u^(1/(1+skew)), so higher values become progressively likelier while the maximum is never forced,
+ * which keeps the result random rather than a maxed stat. Event drafts use this to make the lower rarities'
+ * recruits cluster near the top of their range (see EVENT_DRAFT_TOP_SKEW).
+ */
+function randomIntSkewed(min, max, skew) {
+    if (skew <= 0 || max <= min)
+        return randomInt(min, max + 1);
+    const u = randomInt(0, 1000001) / 1000000;
+    const frac = Math.pow(u, 1 / (1 + skew));
+    return min + Math.round(frac * (max - min));
+}
 function assignValues(stat, low, high, performance) {
     performanceStatKeys.filter((key) => stat[key] != null && stat[key] > 0)
         .forEach((key) => {

package/package.json

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