volleyballsimtypes 0.0.496 → 0.0.498

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

@@ -1,19 +1,35 @@
 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 many packs are targeted at a position, which is every pack but the free one. Derived rather than typed
+ * out because the copy describing the draft quotes it, and prose that repeats a constant is prose that drifts
+ * away from it.
+ */
+export declare const TARGETED_PACK_COUNT: number;
+/** How many players the free pack offers: one per position. */
+export declare const FREE_PACK_SIZE: number;
 /**
  * How hard each rarity's recruits are skewed toward the top of their range when drafted in an event.
  *
@@ -27,14 +43,13 @@ export declare const DRAFT_SQUAD_SIZE: number;
  */
 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. The lower rarities are
- * generated with a top-end skew (EVENT_DRAFT_TOP_SKEW) so their recruits cluster near the best; legendaries
- * are left uniform.
+ * The 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, 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,33 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVENT_DRAFT_TOP_SKEW = exports.DRAFT_SQUAD_SIZE = exports.DRAFT_PLAN = exports.PACK_SIZE = void 0;
+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 hard each rarity's recruits are skewed toward the top of their range when drafted in an event.
  *
@@ -47,17 +75,18 @@ exports.EVENT_DRAFT_TOP_SKEW = {
     [player_1.RarityEnum.SPECIAL]: 0
 };
 /**
- * The players a pack offers: `PACK_SIZE` of the pack's role at the event's rarity. The lower rarities are
- * generated with a top-end skew (EVENT_DRAFT_TOP_SKEW) so their recruits cluster near the best; legendaries
- * are left uniform.
+ * The 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, pickRole) {
-    const role = packRole === 'ANY' ? pickRole(ANY_PACK_ROLES) : packRole;
+function generatePack(country, rarity, packRole) {
     const skew = exports.EVENT_DRAFT_TOP_SKEW[rarity] ?? 0;
-    return Array.from({ length: exports.PACK_SIZE }, () => player_1.PlayerGenerator.generatePlayer(country, rarity, role, false, 1, skew));
+    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,7 +5,6 @@ const event_draft_1 = require("./event-draft");
 const player_1 = require("../player");
 const test_helpers_1 = require("../test-helpers");
 const COUNTRY = (0, test_helpers_1.makeCountry)();
-const first = (roles) => roles[0];
 // Aggregate helpers: skew is statistical, so the behaviour tests use large samples and generous margins to stay
 // off the flaky edge while still failing loudly if the skew were removed.
 function median(values) {
@@ -20,7 +19,7 @@ function percentile(values, p) {
 function draftScores(rarity, role, n) {
     const out = [];
     while (out.length < n) {
-        for (const p of (0, event_draft_1.generatePack)(COUNTRY, rarity, role, first))
+        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);
@@ -30,28 +29,31 @@ 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++) {
@@ -65,18 +67,32 @@ function uniformScores(rarity, role, n) {
 (0, globals_1.describe)('generatePack()', () => {
     globals_1.it.each([player_1.RarityEnum.COMMON, player_1.RarityEnum.RARE, player_1.RarityEnum.LEGENDARY])('offers %s players of the pack role', (rarity) => {
         const role = player_1.RoleEnum.OUTSIDE_HITTER;
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, rarity, role, 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);
         }
     });
-    (0, globals_1.it)('rolls a free (ANY) pack at the role it is handed', () => {
-        const pack = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.COMMON, 'ANY', () => player_1.RoleEnum.LIBERO);
-        (0, globals_1.expect)(pack).toHaveLength(event_draft_1.PACK_SIZE);
+    (0, globals_1.it)('offers one player per position in the free pack, so every position is on the board', () => {
+        const pack = (0, event_draft_1.generatePack)(COUNTRY, player_1.RarityEnum.COMMON, event_draft_1.FREE_PACK_ROLE);
+        (0, globals_1.expect)(pack).toHaveLength(event_draft_1.FREE_PACK_SIZE);
+        (0, globals_1.expect)(event_draft_1.FREE_PACK_SIZE).toBe(5);
+        // The primary role is the one the pack was rolled at, and all five positions appear exactly once.
+        const primary = pack.map(p => p.roles[0]);
+        (0, globals_1.expect)([...primary].sort()).toEqual([
+            player_1.RoleEnum.LIBERO, player_1.RoleEnum.MIDDLE_BLOCKER, player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.OUTSIDE_HITTER, player_1.RoleEnum.SETTER
+        ].sort());
+    });
+    globals_1.it.each([player_1.RarityEnum.COMMON, player_1.RarityEnum.RARE, player_1.RarityEnum.LEGENDARY])('rolls the free pack at the event rarity (%s), like every other pack', (rarity) => {
+        const pack = (0, event_draft_1.generatePack)(COUNTRY, rarity, event_draft_1.FREE_PACK_ROLE);
+        (0, globals_1.expect)(pack).toHaveLength(event_draft_1.FREE_PACK_SIZE);
         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)('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', () => {

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

@@ -31,10 +31,14 @@ function getMultipliers(statName, performanceStats) {
             };
         case StatsEnum.SET:
             return {
-                setting: 0.75,
+                setting: 0.73,
+                // fast-tempo-gates: a setter's `quick` is what lets them run a fast offence, so it belongs in the SET
+                // rating AND in the SET training pool. Without it a setter on SET focus can never raise `quick` (it has
+                // weight 0 in every role too), and their whole tempo game would be fixed forever by a generation roll.
+                quick: 0.07,
                 overhand: 0.1,
-                awareness: 0.075,
-                attack: 0.075
+                awareness: 0.05,
+                attack: 0.05
             };
         case StatsEnum.RECEIVE:
             return {