volleyballsimtypes 0.0.500 → 0.0.502

package/dist/cjs/src/data/models/box-score.d.ts

@@ -7,12 +7,15 @@ export interface BoxScoreAttributes {
     attack_attempts: number;
     attack_kills: number;
     attack_errors: number;
+    attack_blocked: number;
     serve_attempts: number;
     serve_aces: number;
     serve_errors: number;
     reception_attempts: number;
     reception_perfect: number;
     reception_positive: number;
+    reception_ok: number;
+    reception_negative: number;
     reception_overpasses: number;
     reception_errors: number;
     block_solo: number;
@@ -23,6 +26,9 @@ export interface BoxScoreAttributes {
     setting_errors: number;
     setting_pass: number;
     defense_digs: number;
+    defense_digs_perfect: number;
+    defense_digs_mediocre: number;
+    defense_digs_bad: number;
     defense_errors: number;
     misc_points_played: number;
     misc_points_won_on_court: number;
@@ -39,12 +45,15 @@ export declare class BoxScoreModel extends Model<BoxScoreAttributes, BoxScoreCre
     attack_attempts: number;
     attack_kills: number;
     attack_errors: number;
+    attack_blocked: number;
     serve_attempts: number;
     serve_aces: number;
     serve_errors: number;
     reception_attempts: number;
     reception_perfect: number;
     reception_positive: number;
+    reception_ok: number;
+    reception_negative: number;
     reception_overpasses: number;
     reception_errors: number;
     block_solo: number;
@@ -55,6 +64,9 @@ export declare class BoxScoreModel extends Model<BoxScoreAttributes, BoxScoreCre
     setting_errors: number;
     setting_pass: number;
     defense_digs: number;
+    defense_digs_perfect: number;
+    defense_digs_mediocre: number;
+    defense_digs_bad: number;
     defense_errors: number;
     misc_points_played: number;
     misc_points_won_on_court: number;

package/dist/cjs/src/data/models/box-score.js

@@ -39,6 +39,11 @@ class BoxScoreModel extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: 0
             },
+            attack_blocked: {
+                type: sequelize_1.DataTypes.SMALLINT,
+                allowNull: false,
+                defaultValue: 0
+            },
             // Serve
             serve_attempts: {
                 type: sequelize_1.DataTypes.SMALLINT,
@@ -71,6 +76,16 @@ class BoxScoreModel extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: 0
             },
+            reception_ok: {
+                type: sequelize_1.DataTypes.SMALLINT,
+                allowNull: false,
+                defaultValue: 0
+            },
+            reception_negative: {
+                type: sequelize_1.DataTypes.SMALLINT,
+                allowNull: false,
+                defaultValue: 0
+            },
             reception_overpasses: {
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,
@@ -124,6 +139,21 @@ class BoxScoreModel extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: 0
             },
+            defense_digs_perfect: {
+                type: sequelize_1.DataTypes.SMALLINT,
+                allowNull: false,
+                defaultValue: 0
+            },
+            defense_digs_mediocre: {
+                type: sequelize_1.DataTypes.SMALLINT,
+                allowNull: false,
+                defaultValue: 0
+            },
+            defense_digs_bad: {
+                type: sequelize_1.DataTypes.SMALLINT,
+                allowNull: false,
+                defaultValue: 0
+            },
             defense_errors: {
                 type: sequelize_1.DataTypes.SMALLINT,
                 allowNull: false,

package/dist/cjs/src/data/models/views/box-score-totals.d.ts

@@ -6,12 +6,15 @@ export interface BoxScoreTotalsAttributes {
     attack_attempts: number;
     attack_kills: number;
     attack_errors: number;
+    attack_blocked: number;
     serve_attempts: number;
     serve_aces: number;
     serve_errors: number;
     reception_attempts: number;
     reception_perfect: number;
     reception_positive: number;
+    reception_ok: number;
+    reception_negative: number;
     reception_overpasses: number;
     reception_errors: number;
     block_solo: number;
@@ -22,6 +25,9 @@ export interface BoxScoreTotalsAttributes {
     setting_errors: number;
     setting_pass: number;
     defense_digs: number;
+    defense_digs_perfect: number;
+    defense_digs_mediocre: number;
+    defense_digs_bad: number;
     defense_errors: number;
     misc_points_played: number;
     misc_points_won_on_court: number;
@@ -39,12 +45,15 @@ export declare class BoxScoreTotalsModel extends Model<BoxScoreTotalsAttributes,
     attack_attempts: number;
     attack_kills: number;
     attack_errors: number;
+    attack_blocked: number;
     serve_attempts: number;
     serve_aces: number;
     serve_errors: number;
     reception_attempts: number;
     reception_perfect: number;
     reception_positive: number;
+    reception_ok: number;
+    reception_negative: number;
     reception_overpasses: number;
     reception_errors: number;
     block_solo: number;
@@ -55,6 +64,9 @@ export declare class BoxScoreTotalsModel extends Model<BoxScoreTotalsAttributes,
     setting_errors: number;
     setting_pass: number;
     defense_digs: number;
+    defense_digs_perfect: number;
+    defense_digs_mediocre: number;
+    defense_digs_bad: number;
     defense_errors: number;
     misc_points_played: number;
     misc_points_won_on_court: number;

package/dist/cjs/src/data/models/views/box-score-totals.js

@@ -26,6 +26,10 @@ class BoxScoreTotalsModel extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false
             },
+            attack_blocked: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false
+            },
             serve_attempts: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false
@@ -50,6 +54,14 @@ class BoxScoreTotalsModel extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false
             },
+            reception_ok: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false
+            },
+            reception_negative: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false
+            },
             reception_overpasses: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false
@@ -90,6 +102,18 @@ class BoxScoreTotalsModel extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false
             },
+            defense_digs_perfect: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false
+            },
+            defense_digs_mediocre: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false
+            },
+            defense_digs_bad: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false
+            },
             defense_errors: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false

package/dist/cjs/src/data/transformers/box-score.js

@@ -10,12 +10,15 @@ function transformToAttributes(boxScore) {
         attack_attempts: boxScore.attack.attempts,
         attack_kills: boxScore.attack.kills,
         attack_errors: boxScore.attack.errors,
+        attack_blocked: boxScore.attack.blocked,
         serve_attempts: boxScore.serve.attempts,
         serve_aces: boxScore.serve.aces,
         serve_errors: boxScore.serve.errors,
         reception_attempts: boxScore.reception.attempts,
         reception_perfect: boxScore.reception.perfect,
         reception_positive: boxScore.reception.positive,
+        reception_ok: boxScore.reception.ok,
+        reception_negative: boxScore.reception.negative,
         reception_overpasses: boxScore.reception.overpasses,
         reception_errors: boxScore.reception.errors,
         block_solo: boxScore.block.solo,
@@ -26,6 +29,9 @@ function transformToAttributes(boxScore) {
         setting_errors: boxScore.setting.errors,
         setting_pass: boxScore.setting.pass,
         defense_digs: boxScore.defense.digs,
+        defense_digs_perfect: boxScore.defense.digsPerfect,
+        defense_digs_mediocre: boxScore.defense.digsMediocre,
+        defense_digs_bad: boxScore.defense.digsBad,
         defense_errors: boxScore.defense.errors,
         misc_points_played: boxScore.misc.pointsPlayed,
         misc_points_won_on_court: boxScore.misc.pointsWonOnCourt,
@@ -41,7 +47,8 @@ function transformToObject(model) {
         attack: {
             attempts: model.attack_attempts,
             kills: model.attack_kills,
-            errors: model.attack_errors
+            errors: model.attack_errors,
+            blocked: model.attack_blocked
         },
         serve: {
             attempts: model.serve_attempts,
@@ -52,6 +59,8 @@ function transformToObject(model) {
             attempts: model.reception_attempts,
             perfect: model.reception_perfect,
             positive: model.reception_positive,
+            ok: model.reception_ok,
+            negative: model.reception_negative,
             overpasses: model.reception_overpasses,
             errors: model.reception_errors
         },
@@ -68,6 +77,9 @@ function transformToObject(model) {
         },
         defense: {
             digs: model.defense_digs,
+            digsPerfect: model.defense_digs_perfect,
+            digsMediocre: model.defense_digs_mediocre,
+            digsBad: model.defense_digs_bad,
             errors: model.defense_errors
         },
         misc: {

package/dist/cjs/src/data/transformers/player.js

@@ -37,7 +37,8 @@ function transformToBoxScoreTotals(model) {
         attack: {
             attempts: toNumberStrict(model.attack_attempts, 'attack_attempts'),
             kills: toNumberStrict(model.attack_kills, 'attack_kills'),
-            errors: toNumberStrict(model.attack_errors, 'attack_errors')
+            errors: toNumberStrict(model.attack_errors, 'attack_errors'),
+            blocked: toNumberStrict(model.attack_blocked, 'attack_blocked')
         },
         serve: {
             attempts: toNumberStrict(model.serve_attempts, 'serve_attempts'),
@@ -48,6 +49,8 @@ function transformToBoxScoreTotals(model) {
             attempts: toNumberStrict(model.reception_attempts, 'reception_attempts'),
             perfect: toNumberStrict(model.reception_perfect, 'reception_perfect'),
             positive: toNumberStrict(model.reception_positive, 'reception_positive'),
+            ok: toNumberStrict(model.reception_ok, 'reception_ok'),
+            negative: toNumberStrict(model.reception_negative, 'reception_negative'),
             overpasses: toNumberStrict(model.reception_overpasses, 'reception_overpasses'),
             errors: toNumberStrict(model.reception_errors, 'reception_errors')
         },
@@ -64,6 +67,9 @@ function transformToBoxScoreTotals(model) {
         },
         defense: {
             digs: toNumberStrict(model.defense_digs, 'defense_digs'),
+            digsPerfect: toNumberStrict(model.defense_digs_perfect, 'defense_digs_perfect'),
+            digsMediocre: toNumberStrict(model.defense_digs_mediocre, 'defense_digs_mediocre'),
+            digsBad: toNumberStrict(model.defense_digs_bad, 'defense_digs_bad'),
             errors: toNumberStrict(model.defense_errors, 'defense_errors')
         },
         misc: {

package/dist/cjs/src/data/transformers/rally-event-positional.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cjs/src/data/transformers/rally-event-positional.test.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const uuid_1 = require("uuid");
+const service_1 = require("../../service");
+const rally_event_1 = require("./rally-event");
+(0, globals_1.describe)('rally-event compact round trip -- positional fields (coords / speed / dig quality)', () => {
+    const playerId = (0, uuid_1.v4)();
+    const roster = [playerId];
+    const playerIndex = new Map(roster.map((id, i) => [id, i]));
+    (0, globals_1.it)('packs contact/landing/speed and round-trips them, 2-dp rounded', () => {
+        const spike = service_1.Spike.create({
+            playerId,
+            score: 60,
+            target: 4,
+            failure: service_1.SpikeFailureEnum.NO_FAILURE,
+            type: service_1.SpikeTypeEnum.CROSS_SHOT,
+            contact: { x: 1.234, y: -0.5 },
+            landing: { x: -2.5, y: 6.789 },
+            speed: 92.456
+        });
+        const compact = (0, rally_event_1.transformToCompact)(spike, playerIndex);
+        (0, globals_1.expect)(compact.c).toEqual([1.23, -0.5]);
+        (0, globals_1.expect)(compact.g).toEqual([-2.5, 6.79]);
+        (0, globals_1.expect)(compact.v).toBe(92.46);
+        const decoded = (0, rally_event_1.transformToSpike)(compact, roster);
+        (0, globals_1.expect)(decoded.contact).toEqual({ x: 1.23, y: -0.5 });
+        (0, globals_1.expect)(decoded.landing).toEqual({ x: -2.5, y: 6.79 });
+        (0, globals_1.expect)(decoded.speed).toBe(92.46);
+    });
+    (0, globals_1.it)('packs dig quality on a reception and round-trips it', () => {
+        const dig = service_1.Reception.create({
+            playerId,
+            score: 40,
+            target: 3,
+            failure: service_1.ReceptionFailureEnum.NO_FAILURE,
+            type: service_1.ReceptionTypeEnum.DIG,
+            digQuality: service_1.DigQualityEnum.MEDIOCRE
+        });
+        const compact = (0, rally_event_1.transformToCompact)(dig, playerIndex);
+        (0, globals_1.expect)(compact.q).toBe(service_1.DigQualityEnum.MEDIOCRE);
+        const decoded = (0, rally_event_1.transformToReception)(compact, roster);
+        (0, globals_1.expect)(decoded.digQuality).toBe(service_1.DigQualityEnum.MEDIOCRE);
+    });
+    (0, globals_1.it)('omits the positional keys when absent, and a legacy event decodes them as undefined', () => {
+        const spike = service_1.Spike.create({ playerId, score: 60, target: 4, failure: service_1.SpikeFailureEnum.NO_FAILURE, type: service_1.SpikeTypeEnum.CROSS_SHOT });
+        const compact = (0, rally_event_1.transformToCompact)(spike, playerIndex);
+        (0, globals_1.expect)('c' in compact).toBe(false);
+        (0, globals_1.expect)('v' in compact).toBe(false);
+        (0, globals_1.expect)('q' in compact).toBe(false);
+        const decoded = (0, rally_event_1.transformToSpike)(compact, roster);
+        (0, globals_1.expect)(decoded.contact).toBeUndefined();
+        (0, globals_1.expect)(decoded.speed).toBeUndefined();
+        (0, globals_1.expect)(decoded.digQuality).toBeUndefined();
+    });
+});

package/dist/cjs/src/data/transformers/rally-event.d.ts

@@ -13,6 +13,10 @@ export interface CompactEvent {
     i?: number;
     h?: number;
     m?: number;
+    c?: number[];
+    g?: number[];
+    v?: number;
+    q?: number;
 }
 export declare function transformToCompact(evt: RallyEvent, playerIndex: Map<string, number>): CompactEvent;
 export declare function transformToBlock(event: CompactEvent, roster: string[]): Block;

package/dist/cjs/src/data/transformers/rally-event.js

@@ -10,6 +10,20 @@ exports.transformToSpike = transformToSpike;
 exports.transformToFreeBall = transformToFreeBall;
 exports.transformToSubstitution = transformToSubstitution;
 const service_1 = require("../../service");
+// Rebuild the optional positional fields (contact / landing / speed / digQuality) from a compact event, for the
+// event .create() inputs. Loosely typed since create() validates via its Zod schema.
+function positionalFromCompact(e) {
+    const out = {};
+    if (e.c != null)
+        out.contact = { x: e.c[0], y: e.c[1] };
+    if (e.g != null)
+        out.landing = { x: e.g[0], y: e.g[1] };
+    if (e.v != null)
+        out.speed = e.v;
+    if (e.q != null)
+        out.digQuality = e.q;
+    return out;
+}
 // Incident packing for the compact key 'i': values below 10 are injury severities, 10+ are knock tiers.
 function incidentToCompact(incident) {
     if (incident == null)
@@ -42,6 +56,14 @@ function transformToCompact(evt, playerIndex) {
                 out.h = playerIndex.get(evt.incident.playerId);
             }
         }
+        if (evt.contact != null)
+            out.c = [evt.contact.x, evt.contact.y];
+        if (evt.landing != null)
+            out.g = [evt.landing.x, evt.landing.y];
+        if (evt.speed != null)
+            out.v = evt.speed;
+        if (evt.digQuality != null)
+            out.q = evt.digQuality;
         if (evt instanceof service_1.Block) {
             out.b = evt.blockers.map(id => playerIndex.get(id));
         }
@@ -68,7 +90,8 @@ function transformToBlock(event, roster) {
         target: event.a,
         blockers: (event.b ?? []).map(i => roster[i]),
         score: event.s,
-        incident: incidentFromCompact(event.i, event.h, roster)
+        incident: incidentFromCompact(event.i, event.h, roster),
+        ...positionalFromCompact(event)
     });
 }
 function transformToLiberoReplacement(event, roster) {
@@ -85,7 +108,8 @@ function transformToReception(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i, event.h, roster)
+        incident: incidentFromCompact(event.i, event.h, roster),
+        ...positionalFromCompact(event)
     });
 }
 function transformToServe(event, roster) {
@@ -95,7 +119,8 @@ function transformToServe(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i, event.h, roster)
+        incident: incidentFromCompact(event.i, event.h, roster),
+        ...positionalFromCompact(event)
     });
 }
 function transformToSet(event, roster) {
@@ -106,7 +131,8 @@ function transformToSet(event, roster) {
         target: event.a,
         score: event.s,
         incident: incidentFromCompact(event.i, event.h, roster),
-        tempo: event.m
+        tempo: event.m,
+        ...positionalFromCompact(event)
     });
 }
 function transformToSpike(event, roster) {
@@ -116,7 +142,8 @@ function transformToSpike(event, roster) {
         playerId: roster[event.p],
         target: event.a,
         score: event.s,
-        incident: incidentFromCompact(event.i, event.h, roster)
+        incident: incidentFromCompact(event.i, event.h, roster),
+        ...positionalFromCompact(event)
     });
 }
 // FreeBall (Last Resort save) is a plain InPlayEvent with no incident of its own, so it decodes from f/t/a/s
@@ -127,7 +154,8 @@ function transformToFreeBall(event, roster) {
         type: event.t,
         playerId: roster[event.p],
         target: event.a,
-        score: event.s
+        score: event.s,
+        ...positionalFromCompact(event)
     });
 }
 function transformToSubstitution(event, roster) {

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

@@ -1,4 +1,4 @@
-export type EventRewardBand = 'PARTICIPATION' | 'TOP_20' | 'TOP_10' | 'TOP_5' | 'TOP_3' | 'TOP_1';
+export type EventRewardBand = 'PARTICIPATION' | 'FINAL_GROUP' | 'TOP_10' | 'TOP_5' | 'TOP_3' | 'TOP_1';
 export interface EventRewardRow {
     readonly band: EventRewardBand;
     /** Best final position that earns this row; PARTICIPATION has none. */
@@ -15,7 +15,8 @@ export interface EventRewardRow {
 export declare const EVENT_REWARDS: readonly EventRewardRow[];
 /**
  * The band a finish falls into. `position` is the place in the FINAL table; null means the team never reached
- * the final, and so does any position past the last banded row, which both count as taking part.
+ * the final (it went out in the group stage) and takes the participation row. The final holds MAX_FINAL_SIZE
+ * teams and the widest banded row (FINAL_GROUP) covers exactly that, so every finalist earns a banded row.
  */
 export declare function eventRewardBandFor(position: number | null): EventRewardBand;
 export interface EventPayout {

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

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EVENT_REWARDS = void 0;
 exports.eventRewardBandFor = eventRewardBandFor;
 exports.eventPayoutFor = eventPayoutFor;
+const event_schedule_1 = require("./event-schedule");
 /**
  * Best band first. A team earns its own row and every row BELOW it, which is what "cumulative" means: first
  * place collects all six.
@@ -17,18 +18,19 @@ exports.EVENT_REWARDS = [
     { band: 'TOP_3', maxPosition: 3, packs: 0, coins: 500 },
     { band: 'TOP_5', maxPosition: 5, packs: 0, coins: 1000 },
     { band: 'TOP_10', maxPosition: 10, packs: 1, coins: 0 },
-    { band: 'TOP_20', maxPosition: 20, packs: 0, coins: 1000 },
+    { band: 'FINAL_GROUP', maxPosition: event_schedule_1.MAX_FINAL_SIZE, packs: 0, coins: 1000 },
     { band: 'PARTICIPATION', maxPosition: null, packs: 1, coins: 1000 }
 ];
 /**
  * The band a finish falls into. `position` is the place in the FINAL table; null means the team never reached
- * the final, and so does any position past the last banded row, which both count as taking part.
+ * the final (it went out in the group stage) and takes the participation row. The final holds MAX_FINAL_SIZE
+ * teams and the widest banded row (FINAL_GROUP) covers exactly that, so every finalist earns a banded row.
  */
 function eventRewardBandFor(position) {
     if (position == null)
         return 'PARTICIPATION';
     // Rows are ordered best-first, so the FIRST row the position satisfies is the narrowest band it earns.
-    // Scanning to the end instead would always land on the widest, handing first place a "top 20" badge.
+    // Scanning to the end instead would always land on the widest, handing first place a "final group" badge.
     for (const row of exports.EVENT_REWARDS) {
         if (row.maxPosition != null && position <= row.maxPosition)
             return row.band;

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

@@ -11,11 +11,11 @@ const event_rewards_1 = require("./event-rewards");
         [5, 'TOP_5'],
         [6, 'TOP_10'],
         [10, 'TOP_10'],
-        [11, 'TOP_20'],
-        [20, 'TOP_20'],
-        // Inside a 24-team final but outside every banded row, so it counts as taking part.
-        [21, 'PARTICIPATION'],
-        [24, 'PARTICIPATION']
+        [11, 'FINAL_GROUP'],
+        [20, 'FINAL_GROUP'],
+        // The final holds 24 teams and FINAL_GROUP covers all of them.
+        [21, 'FINAL_GROUP'],
+        [24, 'FINAL_GROUP']
     ])('places a finish of %i in %s', (position, band) => {
         (0, globals_1.expect)((0, event_rewards_1.eventRewardBandFor)(position)).toBe(band);
     });
@@ -26,9 +26,9 @@ const event_rewards_1 = require("./event-rewards");
 (0, globals_1.describe)('eventPayoutFor()', () => {
     globals_1.it.each([
         // position, packs, coins. Cumulative: every row from Participation down to the finish.
-        [null, 1, 1000], // group stage: 1 pack + 1000
-        [24, 1, 1000], // in the final but outside the top 20: still just participation
-        [20, 1, 2000], // + top 20's 1000
+        [null, 1, 1000], // never reached the final (group stage): 1 pack + 1000
+        [24, 1, 2000], // last of the 24-team final: final group's 1000 on top of participation
+        [20, 1, 2000], // + final group's 1000
         [11, 1, 2000],
         [10, 2, 2000], // + top 10's pack
         [6, 2, 2000],
@@ -50,7 +50,7 @@ const event_rewards_1 = require("./event-rewards");
         }
     });
     (0, globals_1.it)('adds up to the owner-defined table for a winner', () => {
-        // 1x pack + 1000 (participation), +1000 (top 20), +1 pack (top 10), +1000 (top 5), +500 (top 3), +1 pack (top 1)
+        // 1x pack + 1000 (participation), +1000 (final group), +1 pack (top 10), +1000 (top 5), +500 (top 3), +1 pack (top 1)
         const total = event_rewards_1.EVENT_REWARDS.reduce((acc, row) => ({ packs: acc.packs + row.packs, coins: acc.coins + row.coins }), { packs: 0, coins: 0 });
         (0, globals_1.expect)((0, event_rewards_1.eventPayoutFor)(1)).toEqual(total);
         (0, globals_1.expect)(total).toEqual({ packs: 3, coins: 3500 });

package/dist/cjs/src/service/event/block.js

@@ -34,8 +34,8 @@ class Block extends in_play_event_1.InPlayEvent {
         }
         return new Block(result.data);
     }
-    constructor({ score, playerId, target, failure, type, blockers, activeTraits, incident }) {
-        super({ score, playerId, target, activeTraits, incident, eventType });
+    constructor({ score, playerId, target, failure, type, blockers, activeTraits, incident, contact, landing, speed, digQuality }) {
+        super({ score, playerId, target, activeTraits, incident, eventType, contact, landing, speed, digQuality });
         this.type = type;
         this.failure = failure;
         this.blockers = blockers;

package/dist/cjs/src/service/event/free-ball.js

@@ -33,8 +33,8 @@ class FreeBall extends in_play_event_1.InPlayEvent {
         }
         return new FreeBall(result.data);
     }
-    constructor({ score, playerId, target, failure, type, activeTraits }) {
-        super({ score, playerId, target, activeTraits, eventType });
+    constructor({ score, playerId, target, failure, type, activeTraits, contact, landing, speed, digQuality }) {
+        super({ score, playerId, target, activeTraits, eventType, contact, landing, speed, digQuality });
         this.type = type;
         this.failure = failure;
     }

package/dist/cjs/src/service/event/in-play-event.d.ts

@@ -6,11 +6,25 @@ export interface EventIncident {
     readonly severity: number;
     readonly playerId?: string;
 }
+export declare enum DigQualityEnum {
+    PERFECT = 0,
+    MEDIOCRE = 1,
+    BAD = 2
+}
+export type DigQuality = DigQualityEnum.PERFECT | DigQualityEnum.MEDIOCRE | DigQualityEnum.BAD;
+export interface EventCoord {
+    readonly x: number;
+    readonly y: number;
+}
 export interface InPlayEventOpts extends RallyEventOpts {
     readonly target: CourtTarget;
     readonly score: number;
     readonly activeTraits: Trait[];
     readonly incident?: EventIncident;
+    readonly contact?: EventCoord;
+    readonly landing?: EventCoord;
+    readonly speed?: number;
+    readonly digQuality?: DigQuality;
 }
 export declare abstract class InPlayEvent<F, T> extends RallyEvent {
     abstract failure: F;
@@ -19,5 +33,9 @@ export declare abstract class InPlayEvent<F, T> extends RallyEvent {
     readonly score: number;
     readonly activeTraits: Trait[];
     readonly incident?: EventIncident;
-    protected constructor({ eventType, playerId, target, score, activeTraits, incident }: InPlayEventOpts);
+    readonly contact?: EventCoord;
+    readonly landing?: EventCoord;
+    readonly speed?: number;
+    readonly digQuality?: DigQuality;
+    protected constructor({ eventType, playerId, target, score, activeTraits, incident, contact, landing, speed, digQuality }: InPlayEventOpts);
 }

package/dist/cjs/src/service/event/in-play-event.js

@@ -1,14 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InPlayEvent = void 0;
+exports.InPlayEvent = exports.DigQualityEnum = void 0;
 const rally_event_1 = require("./rally-event");
+// The quality of a DEFENSIVE dig (positional engine, effort gating): a PERFECT dig sets up a clean in-system
+// counter, MEDIOCRE is out of position, BAD is a scramble. Persisted on the Reception (dig) event's 'q' key.
+var DigQualityEnum;
+(function (DigQualityEnum) {
+    DigQualityEnum[DigQualityEnum["PERFECT"] = 0] = "PERFECT";
+    DigQualityEnum[DigQualityEnum["MEDIOCRE"] = 1] = "MEDIOCRE";
+    DigQualityEnum[DigQualityEnum["BAD"] = 2] = "BAD";
+})(DigQualityEnum || (exports.DigQualityEnum = DigQualityEnum = {}));
+function roundCoord(c) {
+    return c != null ? { x: Number(c.x.toFixed(2)), y: Number(c.y.toFixed(2)) } : undefined;
+}
 class InPlayEvent extends rally_event_1.RallyEvent {
-    constructor({ eventType, playerId, target, score, activeTraits, incident }) {
+    constructor({ eventType, playerId, target, score, activeTraits, incident, contact, landing, speed, digQuality }) {
         super({ playerId, eventType });
         this.target = target;
         this.score = Number(score.toFixed(2));
         this.activeTraits = activeTraits;
         this.incident = incident;
+        this.contact = roundCoord(contact);
+        this.landing = roundCoord(landing);
+        this.speed = speed != null ? Number(speed.toFixed(2)) : undefined;
+        this.digQuality = digQuality;
     }
 }
 exports.InPlayEvent = InPlayEvent;

package/dist/cjs/src/service/event/reception.js

@@ -36,8 +36,8 @@ class Reception extends in_play_event_1.InPlayEvent {
         }
         return new Reception(result.data);
     }
-    constructor({ score, playerId, target, failure, type, activeTraits, incident }) {
-        super({ score, playerId, target, activeTraits, incident, eventType });
+    constructor({ score, playerId, target, failure, type, activeTraits, incident, contact, landing, speed, digQuality }) {
+        super({ score, playerId, target, activeTraits, incident, eventType, contact, landing, speed, digQuality });
         this.type = type;
         this.failure = failure;
     }

package/dist/cjs/src/service/event/schemas/block.z.d.ts

@@ -1,6 +1,16 @@
 import { z } from 'zod';
 import { TraitEnum } from '../../player';
 export declare const BlockInputSchema: z.ZodObject<{
+    contact: z.ZodOptional<z.ZodObject<{
+        x: z.ZodNumber;
+        y: z.ZodNumber;
+    }, z.core.$strip>>;
+    landing: z.ZodOptional<z.ZodObject<{
+        x: z.ZodNumber;
+        y: z.ZodNumber;
+    }, z.core.$strip>>;
+    speed: z.ZodOptional<z.ZodNumber>;
+    digQuality: z.ZodOptional<z.ZodNumber>;
     playerId: z.ZodUUID;
     score: z.ZodNumber;
     target: z.ZodNumber;