volleyballsimtypes 0.0.173 → 0.0.175

package/dist/cjs/src/data/transformers/match-set-stats.d.ts

@@ -1,5 +1,5 @@
 import { MatchSetStatsAttributes, MatchSetStatsModel } from '../models';
 import { SetStatistics } from '../../service';
 declare function transformToAttributes(stats: SetStatistics, setId: string): MatchSetStatsAttributes;
-declare function transformToObject(model: MatchSetStatsModel): SetStatistics;
+declare function transformToObject(model: MatchSetStatsModel, index: number): SetStatistics;
 export { transformToObject as transformToMatchSetStats, transformToAttributes as transformFromMatchSetStats };

package/dist/cjs/src/data/transformers/match-set-stats.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformFromMatchSetStats = exports.transformToMatchSetStats = void 0;
-const _1 = require(".");
 function transformToAttributes(stats, setId) {
     return {
-        player_id: stats.player.id,
+        player_id: stats.playerId,
         match_set_id: setId,
         aces: stats.ace,
         assists: stats.assists,
@@ -26,7 +25,7 @@ function transformToAttributes(stats, setId) {
     };
 }
 exports.transformFromMatchSetStats = transformToAttributes;
-function transformToObject(model) {
+function transformToObject(model, index) {
     return {
         set: {
             success: model.set_success,
@@ -55,7 +54,9 @@ function transformToObject(model) {
         assists: model.assists,
         ralliesPlayed: model.rallies_played,
         attempts: model.attempts,
-        player: (0, _1.transformToPlayer)(model.player)
+        playerId: model.player_id,
+        order: index,
+        setsPlayed: 0
     };
 }
 exports.transformToMatchSetStats = transformToObject;

package/dist/cjs/src/data/transformers/player.d.ts

@@ -1,5 +1,7 @@
 import { PlayerAttributes, PlayerModel } from '../models';
-import { Player } from '../../service';
+import { Player, SetStatistics } from '../../service';
 declare function transformToAttributes(player: Player): PlayerAttributes;
 declare function transformToObject(model: PlayerModel): Player;
+export declare function calculateMatchStats(gameStats: SetStatistics[]): SetStatistics;
+export declare function reduceStatsFn(acc: SetStatistics, current: SetStatistics): SetStatistics;
 export { transformToObject as transformToPlayer, transformToAttributes as transformFromPlayer };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformFromPlayer = exports.transformToPlayer = void 0;
+exports.transformFromPlayer = exports.transformToPlayer = exports.reduceStatsFn = exports.calculateMatchStats = void 0;
 const service_1 = require("../../service");
 const _1 = require(".");
 function transformToAttributes(player) {
@@ -17,6 +17,10 @@ function transformToAttributes(player) {
 }
 exports.transformFromPlayer = transformToAttributes;
 function transformToObject(model) {
+    const gameStats = (model.MatchSetStats ?? []).map(_1.transformToMatchSetStats);
+    if (gameStats.length > 0) {
+        gameStats.push(calculateMatchStats(gameStats));
+    }
     return new service_1.Player({
         id: model.player_id,
         name: {
@@ -27,7 +31,51 @@ function transformToObject(model) {
         roles: model.roles,
         traits: model.traits,
         stats: (0, _1.transformToPerformanceStats)(model.PerformanceStat),
-        rarity: model.rarity
+        rarity: model.rarity,
+        gameStats
     });
 }
 exports.transformToPlayer = transformToObject;
+function calculateMatchStats(gameStats) {
+    const emptyStats = {
+        playerId: gameStats[0].playerId,
+        attempts: 0,
+        contacts: 0,
+        ralliesPlayed: 0,
+        serve: { success: 0, error: 0 },
+        reception: { success: 0, error: 0 },
+        set: { success: 0, error: 0 },
+        attack: { success: 0, error: 0 },
+        block: { success: 0, error: 0 },
+        kills: 0,
+        killBlocks: 0,
+        ace: 0,
+        assists: 0,
+        order: gameStats.length,
+        setsPlayed: 0
+    };
+    return gameStats.reduce(reduceStatsFn, emptyStats);
+}
+exports.calculateMatchStats = calculateMatchStats;
+function reduceStatsFn(acc, current) {
+    acc.attempts += current.attempts;
+    acc.contacts += current.contacts;
+    acc.ralliesPlayed += current.ralliesPlayed;
+    acc.kills += current.kills;
+    acc.killBlocks += current.killBlocks;
+    acc.ace += current.ace;
+    acc.assists += current.assists;
+    acc.serve.success += current.serve.success;
+    acc.serve.error += current.serve.error;
+    acc.reception.success += current.reception.success;
+    acc.reception.error += current.reception.error;
+    acc.set.success += current.set.success;
+    acc.set.error += current.set.error;
+    acc.attack.success += current.attack.success;
+    acc.attack.error += current.attack.error;
+    acc.block.success += current.block.success;
+    acc.block.error += current.block.error;
+    acc.setsPlayed++;
+    return acc;
+}
+exports.reduceStatsFn = reduceStatsFn;

package/dist/cjs/src/data/transformers/team.d.ts

@@ -1,5 +1,5 @@
 import { Team } from '../../service';
 import { TeamAttributes, TeamModel } from '../models';
 declare function transformToAttributes(team: Team): TeamAttributes;
-declare function transformToObject(team: TeamModel): Team;
+declare function transformToObject(model: TeamModel): Team;
 export { transformToObject as transformToTeam, transformToAttributes as transformFromTeam };

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

@@ -16,15 +16,16 @@ function transformToAttributes(team) {
     };
 }
 exports.transformFromTeam = transformToAttributes;
-function transformToObject(team) {
+function transformToObject(model) {
     return new service_1.Team({
-        id: team.team_id,
-        name: team.name,
-        shortName: team.short_name,
-        country: team.country != null ? (0, _1.transformToCountry)(team.country) : undefined,
-        coach: team.coach != null ? (0, _1.transformToCoach)(team.coach) : undefined,
-        roster: (team.PlayerTeams ?? []).map((pt) => (0, _1.transformToPlayer)(pt.player)),
-        rating: team.rating
+        id: model.team_id,
+        name: model.name,
+        shortName: model.short_name,
+        country: model.country != null ? (0, _1.transformToCountry)(model.country) : undefined,
+        coach: model.coach != null ? (0, _1.transformToCoach)(model.coach) : undefined,
+        roster: (model.PlayerTeams ?? []).map((pt) => (0, _1.transformToPlayer)(pt.player)),
+        league: model.league != null ? (0, _1.transformToLeague)(model.league) : undefined,
+        rating: model.rating
     });
 }
 exports.transformToTeam = transformToObject;

package/dist/cjs/src/service/match/match-set.d.ts

@@ -1,6 +1,5 @@
 import { PlayerPosition, Rally } from './rally';
 import { MatchTeam } from './match-team';
-import { Player } from '../player';
 declare enum ScoreThreshold {
     SET = 25,
     TIE_BREAK = 15
@@ -21,7 +20,8 @@ export interface EventStat {
     error: number;
 }
 export interface SetStatistics {
-    player: Player;
+    readonly playerId: string;
+    order: number;
     ace: number;
     attempts: number;
     contacts: number;
@@ -34,6 +34,7 @@ export interface SetStatistics {
     kills: number;
     killBlocks: number;
     assists: number;
+    setsPlayed: number;
 }
 export declare class MatchSet {
     readonly id: string;
@@ -52,7 +53,7 @@ export declare class MatchSet {
     increaseScore(team: MatchTeam): void;
     addRally(rally: Rally): void;
     /**
-     * Has a team reached at least 25 points and is the score difference between both teams at least 2?
+     * Has a team reached at least 25 points, and is the score difference between both teams at least 2?
      * @returns boolean
      */
     isOver(): boolean;

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

@@ -40,7 +40,7 @@ class MatchSet {
         this.rallies.push(rally);
     }
     /**
-     * Has a team reached at least 25 points and is the score difference between both teams at least 2?
+     * Has a team reached at least 25 points, and is the score difference between both teams at least 2?
      * @returns boolean
      */
     isOver() {

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

@@ -4,6 +4,7 @@ import { Country } from '../country';
 import { Rarity } from './rarity';
 import { Stats } from './stats';
 import { Role } from './role';
+import { SetStatistics } from '../match';
 export declare class Stat {
     readonly name: Stats;
     readonly value: number;
@@ -21,6 +22,7 @@ interface PlayerParams {
     readonly roles: Role[];
     readonly traits: Trait[];
     readonly rarity: Rarity;
+    readonly gameStats?: SetStatistics[];
 }
 export declare class Name {
     readonly first: string;
@@ -40,7 +42,8 @@ export declare class Player {
     readonly traits: Trait[];
     readonly generalStats: Stat[];
     readonly rarity: Rarity;
-    constructor({ id, name, country, stats, roles, traits, rarity }: PlayerParams);
+    readonly gameStats?: SetStatistics[];
+    constructor({ id, name, country, stats, roles, traits, rarity, gameStats }: PlayerParams);
     static sortPlayers(roles: Role[]): (p1: Player, p2: Player) => number;
     static compareStats(p1: Player, p2: Player): number;
     toString(): string;

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

@@ -25,7 +25,7 @@ class Name {
 }
 exports.Name = Name;
 class Player {
-    constructor({ id, name, country, stats, roles, traits, rarity }) {
+    constructor({ id, name, country, stats, roles, traits, rarity, gameStats }) {
         (0, utils_1.validateUUID)(id);
         this.id = id;
         this.name = name;
@@ -34,6 +34,7 @@ class Player {
         this.roles = roles;
         this.traits = traits;
         this.rarity = rarity;
+        this.gameStats = gameStats;
         this.generalStats = Object.values(stats_1.StatsEnum).map((stat) => ({
             name: stat,
             value: (0, stats_1.calculateStatScore)(stats, stat)

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

@@ -40,9 +40,15 @@ function assignRoles(stats) {
     if (scores[1].score >= 75) {
         out.push(scores[1].role);
     }
-    if (scores[2].score >= 85) {
+    if (scores[2].score >= 82) {
         out.push(scores[2].role);
     }
+    if (scores[3].score >= 89) {
+        out.push(scores[3].role);
+    }
+    if (scores[4].score >= 95) {
+        out.push(scores[4].role);
+    }
     return out;
 }
 exports.assignRoles = assignRoles;

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

@@ -38,10 +38,11 @@ function getMultipliers(statName, performanceStats) {
         case StatsEnum.RECEIVE:
             return {
                 reception: 0.75,
-                overhand: 0.025,
+                overhand: 0.015,
                 bump: 0.15,
-                focus: 0.025,
-                defense: 0.05
+                focus: 0.015,
+                defense: 0.055,
+                reflex: 0.015
             };
         case StatsEnum.SERVE:
             return {
@@ -54,8 +55,9 @@ function getMultipliers(statName, performanceStats) {
                 block: 0.65,
                 read: performanceStats == null ? 0.125 : performanceStats.read > performanceStats.commit ? 0.2 : 0.05,
                 commit: performanceStats == null ? 0.125 : performanceStats.commit > performanceStats.read ? 0.2 : 0.05,
-                focus: 0.05,
-                defense: 0.05
+                focus: 0.04,
+                defense: 0.04,
+                reflex: 0.02
             };
         case StatsEnum.STAMINA:
             return { stamina: 1 };

package/dist/esm/src/data/transformers/match-set-stats.d.ts

@@ -1,5 +1,5 @@
 import { MatchSetStatsAttributes, MatchSetStatsModel } from '../models';
 import { SetStatistics } from '../../service';
 declare function transformToAttributes(stats: SetStatistics, setId: string): MatchSetStatsAttributes;
-declare function transformToObject(model: MatchSetStatsModel): SetStatistics;
+declare function transformToObject(model: MatchSetStatsModel, index: number): SetStatistics;
 export { transformToObject as transformToMatchSetStats, transformToAttributes as transformFromMatchSetStats };

package/dist/esm/src/data/transformers/match-set-stats.js

@@ -1,7 +1,6 @@
-import { transformToPlayer } from '.';
 function transformToAttributes(stats, setId) {
     return {
-        player_id: stats.player.id,
+        player_id: stats.playerId,
         match_set_id: setId,
         aces: stats.ace,
         assists: stats.assists,
@@ -22,7 +21,7 @@ function transformToAttributes(stats, setId) {
         kill_blocks: stats.killBlocks
     };
 }
-function transformToObject(model) {
+function transformToObject(model, index) {
     return {
         set: {
             success: model.set_success,
@@ -51,7 +50,9 @@ function transformToObject(model) {
         assists: model.assists,
         ralliesPlayed: model.rallies_played,
         attempts: model.attempts,
-        player: transformToPlayer(model.player)
+        playerId: model.player_id,
+        order: index,
+        setsPlayed: 0
     };
 }
 export { transformToObject as transformToMatchSetStats, transformToAttributes as transformFromMatchSetStats };

package/dist/esm/src/data/transformers/player.d.ts

@@ -1,5 +1,7 @@
 import { PlayerAttributes, PlayerModel } from '../models';
-import { Player } from '../../service';
+import { Player, SetStatistics } from '../../service';
 declare function transformToAttributes(player: Player): PlayerAttributes;
 declare function transformToObject(model: PlayerModel): Player;
+export declare function calculateMatchStats(gameStats: SetStatistics[]): SetStatistics;
+export declare function reduceStatsFn(acc: SetStatistics, current: SetStatistics): SetStatistics;
 export { transformToObject as transformToPlayer, transformToAttributes as transformFromPlayer };

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

@@ -1,5 +1,5 @@
 import { Player } from '../../service';
-import { transformFromPerformanceStats, transformToCountry, transformToPerformanceStats } from '.';
+import { transformFromPerformanceStats, transformToCountry, transformToMatchSetStats, transformToPerformanceStats } from '.';
 function transformToAttributes(player) {
     return {
         player_id: player.id,
@@ -13,6 +13,10 @@ function transformToAttributes(player) {
     };
 }
 function transformToObject(model) {
+    const gameStats = (model.MatchSetStats ?? []).map(transformToMatchSetStats);
+    if (gameStats.length > 0) {
+        gameStats.push(calculateMatchStats(gameStats));
+    }
     return new Player({
         id: model.player_id,
         name: {
@@ -23,7 +27,49 @@ function transformToObject(model) {
         roles: model.roles,
         traits: model.traits,
         stats: transformToPerformanceStats(model.PerformanceStat),
-        rarity: model.rarity
+        rarity: model.rarity,
+        gameStats
     });
 }
+export function calculateMatchStats(gameStats) {
+    const emptyStats = {
+        playerId: gameStats[0].playerId,
+        attempts: 0,
+        contacts: 0,
+        ralliesPlayed: 0,
+        serve: { success: 0, error: 0 },
+        reception: { success: 0, error: 0 },
+        set: { success: 0, error: 0 },
+        attack: { success: 0, error: 0 },
+        block: { success: 0, error: 0 },
+        kills: 0,
+        killBlocks: 0,
+        ace: 0,
+        assists: 0,
+        order: gameStats.length,
+        setsPlayed: 0
+    };
+    return gameStats.reduce(reduceStatsFn, emptyStats);
+}
+export function reduceStatsFn(acc, current) {
+    acc.attempts += current.attempts;
+    acc.contacts += current.contacts;
+    acc.ralliesPlayed += current.ralliesPlayed;
+    acc.kills += current.kills;
+    acc.killBlocks += current.killBlocks;
+    acc.ace += current.ace;
+    acc.assists += current.assists;
+    acc.serve.success += current.serve.success;
+    acc.serve.error += current.serve.error;
+    acc.reception.success += current.reception.success;
+    acc.reception.error += current.reception.error;
+    acc.set.success += current.set.success;
+    acc.set.error += current.set.error;
+    acc.attack.success += current.attack.success;
+    acc.attack.error += current.attack.error;
+    acc.block.success += current.block.success;
+    acc.block.error += current.block.error;
+    acc.setsPlayed++;
+    return acc;
+}
 export { transformToObject as transformToPlayer, transformToAttributes as transformFromPlayer };

package/dist/esm/src/data/transformers/team.d.ts

@@ -1,5 +1,5 @@
 import { Team } from '../../service';
 import { TeamAttributes, TeamModel } from '../models';
 declare function transformToAttributes(team: Team): TeamAttributes;
-declare function transformToObject(team: TeamModel): Team;
+declare function transformToObject(model: TeamModel): Team;
 export { transformToObject as transformToTeam, transformToAttributes as transformFromTeam };

package/dist/esm/src/data/transformers/team.js

@@ -1,5 +1,5 @@
 import { Team } from '../../service';
-import { transformFromCoach, transformToCoach, transformToCountry, transformToPlayer } from '.';
+import { transformFromCoach, transformToCoach, transformToCountry, transformToLeague, transformToPlayer } from '.';
 function transformToAttributes(team) {
     return {
         team_id: team.id,
@@ -12,15 +12,16 @@ function transformToAttributes(team) {
         rating: team.rating
     };
 }
-function transformToObject(team) {
+function transformToObject(model) {
     return new Team({
-        id: team.team_id,
-        name: team.name,
-        shortName: team.short_name,
-        country: team.country != null ? transformToCountry(team.country) : undefined,
-        coach: team.coach != null ? transformToCoach(team.coach) : undefined,
-        roster: (team.PlayerTeams ?? []).map((pt) => transformToPlayer(pt.player)),
-        rating: team.rating
+        id: model.team_id,
+        name: model.name,
+        shortName: model.short_name,
+        country: model.country != null ? transformToCountry(model.country) : undefined,
+        coach: model.coach != null ? transformToCoach(model.coach) : undefined,
+        roster: (model.PlayerTeams ?? []).map((pt) => transformToPlayer(pt.player)),
+        league: model.league != null ? transformToLeague(model.league) : undefined,
+        rating: model.rating
     });
 }
 export { transformToObject as transformToTeam, transformToAttributes as transformFromTeam };

package/dist/esm/src/service/match/match-set.d.ts

@@ -1,6 +1,5 @@
 import { PlayerPosition, Rally } from './rally';
 import { MatchTeam } from './match-team';
-import { Player } from '../player';
 declare enum ScoreThreshold {
     SET = 25,
     TIE_BREAK = 15
@@ -21,7 +20,8 @@ export interface EventStat {
     error: number;
 }
 export interface SetStatistics {
-    player: Player;
+    readonly playerId: string;
+    order: number;
     ace: number;
     attempts: number;
     contacts: number;
@@ -34,6 +34,7 @@ export interface SetStatistics {
     kills: number;
     killBlocks: number;
     assists: number;
+    setsPlayed: number;
 }
 export declare class MatchSet {
     readonly id: string;
@@ -52,7 +53,7 @@ export declare class MatchSet {
     increaseScore(team: MatchTeam): void;
     addRally(rally: Rally): void;
     /**
-     * Has a team reached at least 25 points and is the score difference between both teams at least 2?
+     * Has a team reached at least 25 points, and is the score difference between both teams at least 2?
      * @returns boolean
      */
     isOver(): boolean;

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

@@ -37,7 +37,7 @@ export class MatchSet {
         this.rallies.push(rally);
     }
     /**
-     * Has a team reached at least 25 points and is the score difference between both teams at least 2?
+     * Has a team reached at least 25 points, and is the score difference between both teams at least 2?
      * @returns boolean
      */
     isOver() {

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

@@ -4,6 +4,7 @@ import { Country } from '../country';
 import { Rarity } from './rarity';
 import { Stats } from './stats';
 import { Role } from './role';
+import { SetStatistics } from '../match';
 export declare class Stat {
     readonly name: Stats;
     readonly value: number;
@@ -21,6 +22,7 @@ interface PlayerParams {
     readonly roles: Role[];
     readonly traits: Trait[];
     readonly rarity: Rarity;
+    readonly gameStats?: SetStatistics[];
 }
 export declare class Name {
     readonly first: string;
@@ -40,7 +42,8 @@ export declare class Player {
     readonly traits: Trait[];
     readonly generalStats: Stat[];
     readonly rarity: Rarity;
-    constructor({ id, name, country, stats, roles, traits, rarity }: PlayerParams);
+    readonly gameStats?: SetStatistics[];
+    constructor({ id, name, country, stats, roles, traits, rarity, gameStats }: PlayerParams);
     static sortPlayers(roles: Role[]): (p1: Player, p2: Player) => number;
     static compareStats(p1: Player, p2: Player): number;
     toString(): string;

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

@@ -20,7 +20,7 @@ export class Name {
     }
 }
 export class Player {
-    constructor({ id, name, country, stats, roles, traits, rarity }) {
+    constructor({ id, name, country, stats, roles, traits, rarity, gameStats }) {
         validateUUID(id);
         this.id = id;
         this.name = name;
@@ -29,6 +29,7 @@ export class Player {
         this.roles = roles;
         this.traits = traits;
         this.rarity = rarity;
+        this.gameStats = gameStats;
         this.generalStats = Object.values(StatsEnum).map((stat) => ({
             name: stat,
             value: calculateStatScore(stats, stat)

package/dist/esm/src/service/player/role.js

@@ -33,8 +33,14 @@ export function assignRoles(stats) {
     if (scores[1].score >= 75) {
         out.push(scores[1].role);
     }
-    if (scores[2].score >= 85) {
+    if (scores[2].score >= 82) {
         out.push(scores[2].role);
     }
+    if (scores[3].score >= 89) {
+        out.push(scores[3].role);
+    }
+    if (scores[4].score >= 95) {
+        out.push(scores[4].role);
+    }
     return out;
 }

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

@@ -34,10 +34,11 @@ export function getMultipliers(statName, performanceStats) {
         case StatsEnum.RECEIVE:
             return {
                 reception: 0.75,
-                overhand: 0.025,
+                overhand: 0.015,
                 bump: 0.15,
-                focus: 0.025,
-                defense: 0.05
+                focus: 0.015,
+                defense: 0.055,
+                reflex: 0.015
             };
         case StatsEnum.SERVE:
             return {
@@ -50,8 +51,9 @@ export function getMultipliers(statName, performanceStats) {
                 block: 0.65,
                 read: performanceStats == null ? 0.125 : performanceStats.read > performanceStats.commit ? 0.2 : 0.05,
                 commit: performanceStats == null ? 0.125 : performanceStats.commit > performanceStats.read ? 0.2 : 0.05,
-                focus: 0.05,
-                defense: 0.05
+                focus: 0.04,
+                defense: 0.04,
+                reflex: 0.02
             };
         case StatsEnum.STAMINA:
             return { stamina: 1 };

package/package.json

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