volleyballsimtypes 0.0.165 → 0.0.166

package/dist/cjs/src/data/models/performance-stats.d.ts

@@ -1,37 +1,48 @@
 import * as Sequelize from 'sequelize';
-import { Model, Optional } from 'sequelize';
+import { Model } from 'sequelize';
 import { PlayerId, PlayerModel } from '.';
 export interface PerformanceStatsAttributes {
     player_id: string;
     setting: number;
-    pass: number;
-    reception: number;
+    serve: number;
     spike: number;
+    quick: number;
+    power: number;
+    awareness: number;
+    attack: number;
     back_attack: number;
-    jump: number;
+    reception: number;
+    overhand: number;
+    bump: number;
     block: number;
-    awareness: number;
-    serve: number;
-    stamina: number;
+    read: number;
+    commit: number;
+    focus: number;
     defense: number;
+    stamina: number;
 }
 export type PerformanceStatsPk = 'player_id';
 export type PerformanceStatsId = PerformanceStatsModel[PerformanceStatsPk];
-export type PerformanceStatsOptionalAttributes = 'setting' | 'pass' | 'reception' | 'spike' | 'back_attack' | 'jump' | 'block' | 'awareness' | 'serve' | 'stamina' | 'defense';
-export type PerformanceStatsCreationAttributes = Optional<PerformanceStatsAttributes, PerformanceStatsOptionalAttributes>;
+export type PerformanceStatsCreationAttributes = PerformanceStatsAttributes;
 export declare class PerformanceStatsModel extends Model<PerformanceStatsAttributes, PerformanceStatsCreationAttributes> implements PerformanceStatsAttributes {
     player_id: string;
     setting: number;
-    pass: number;
-    reception: number;
+    serve: number;
     spike: number;
+    quick: number;
+    power: number;
+    awareness: number;
+    attack: number;
     back_attack: number;
-    jump: number;
+    reception: number;
+    overhand: number;
+    bump: number;
     block: number;
-    awareness: number;
-    serve: number;
-    stamina: number;
+    read: number;
+    commit: number;
+    focus: number;
     defense: number;
+    stamina: number;
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

package/dist/cjs/src/data/models/performance-stats.js

@@ -19,17 +19,32 @@ class PerformanceStatsModel extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: 0
             },
-            pass: {
+            serve: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             },
-            reception: {
+            spike: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             },
-            spike: {
+            quick: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
+            },
+            power: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
+            },
+            awareness: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
+            },
+            attack: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
@@ -39,7 +54,17 @@ class PerformanceStatsModel extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: 0
             },
-            jump: {
+            reception: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
+            },
+            overhand: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
+            },
+            bump: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
@@ -49,17 +74,17 @@ class PerformanceStatsModel extends sequelize_1.Model {
                 allowNull: false,
                 defaultValue: 0
             },
-            awareness: {
+            read: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             },
-            serve: {
+            commit: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
             },
-            stamina: {
+            focus: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
@@ -68,6 +93,11 @@ class PerformanceStatsModel extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
+            },
+            stamina: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
             }
         }, {
             sequelize,

package/dist/cjs/src/data/transformers/performance-stats.js

@@ -7,12 +7,18 @@ function transformToAttributes(player) {
         player_id: player.id,
         back_attack: player.stats.backAttack,
         block: player.stats.block,
+        read: player.stats.read,
+        commit: player.stats.commit,
+        focus: player.stats.focus,
         awareness: player.stats.awareness,
         defense: player.stats.defense,
-        jump: player.stats.jump,
-        pass: player.stats.pass,
+        quick: player.stats.quick,
+        power: player.stats.power,
+        attack: player.stats.attack,
         serve: player.stats.serve,
         reception: player.stats.reception,
+        overhand: player.stats.overhand,
+        bump: player.stats.bump,
         setting: player.stats.setting,
         spike: player.stats.spike,
         stamina: player.stats.stamina
@@ -21,17 +27,23 @@ function transformToAttributes(player) {
 exports.transformFromPerformanceStats = transformToAttributes;
 function transformToObject(model) {
     return new service_1.PerformanceStats({
-        awareness: model.awareness,
-        defense: model.defense,
-        jump: model.jump,
-        pass: model.pass,
-        serve: model.serve,
-        reception: model.reception,
         setting: model.setting,
+        serve: model.serve,
         spike: model.spike,
-        stamina: model.stamina,
+        quick: model.quick,
+        power: model.power,
+        awareness: model.awareness,
+        attack: model.attack,
+        backAttack: model.back_attack,
+        reception: model.reception,
+        overhand: model.overhand,
+        bump: model.bump,
         block: model.block,
-        backAttack: model.back_attack
+        read: model.read,
+        commit: model.commit,
+        focus: model.focus,
+        defense: model.defense,
+        stamina: model.stamina
     });
 }
 exports.transformToPerformanceStats = transformToObject;

package/dist/cjs/src/formula/index.d.ts

@@ -1,3 +1,2 @@
 export * from './stats';
-export * from './events';
 export * from './roles';

package/dist/cjs/src/formula/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./stats"), exports);
-__exportStar(require("./events"), exports);
 __exportStar(require("./roles"), exports);

package/dist/cjs/src/formula/role.formula.json

@@ -3,80 +3,110 @@
         "role": "SETTER",
         "weight": {
             "serve": 0.2,
-            "setting": 0.2475,
-            "pass": 0.09,
-            "reception": 0.0825,
-            "spike": 0.075,
+            "stamina": 0.05,
+            "setting": 0.7,
+            "block": 0.05,
+            "spike": 0,
+            "quick": 0,
+            "power": 0,
             "backAttack": 0,
-            "jump": 0.1125,
-            "block": 0,
-            "awareness": 0.1425,
-            "defense": 0,
-            "stamina": 0.05
+            "awareness": 0,
+            "attack": 0,
+            "reception": 0,
+            "overhand": 0,
+            "bump": 0,
+            "read": 0,
+            "commit": 0,
+            "focus": 0,
+            "defense": 0
         }
     },
     {
         "role": "LIBERO",
         "weight": {
-            "serve": 0.02,
-            "setting": 0.045,
-            "pass": 0.095,
-            "reception": 0.33,
             "spike": 0,
+            "quick": 0,
+            "power": 0,
             "backAttack": 0,
-            "jump": 0,
+            "awareness": 0,
+            "attack": 0,
+            "serve": 0,
+            "stamina": 0.15,
+            "setting": 0.15,
+            "reception": 0.7,
+            "overhand": 0,
+            "bump": 0,
             "block": 0,
-            "awareness": 0.14,
-            "defense": 0.33,
-            "stamina": 0.04
+            "read": 0,
+            "commit": 0,
+            "focus": 0,
+            "defense": 0
         }
     },
     {
         "role": "OUTSIDE_HITTER",
         "weight": {
-            "serve": 0.2,
+            "spike": 0.6,
+            "quick": 0,
+            "power": 0,
+            "backAttack": 0.2,
+            "awareness": 0,
+            "attack": 0,
+            "serve": 0.15,
+            "stamina": 0.05,
             "setting": 0,
-            "pass": 0,
-            "reception": 0.075,
-            "spike": 0.2325,
-            "backAttack": 0.105,
-            "jump": 0.15,
-            "block": 0.1125,
-            "awareness": 0.0375,
-            "defense": 0.0375,
-            "stamina": 0.05
+            "reception": 0,
+            "overhand": 0,
+            "bump": 0,
+            "block": 0,
+            "read": 0,
+            "commit": 0,
+            "focus": 0,
+            "defense": 0
         }
     },
     {
         "role": "OPPOSITE_HITTER",
         "weight": {
-            "serve": 0.2,
+            "spike": 0.3,
+            "quick": 0,
+            "power": 0,
+            "backAttack": 0.1,
+            "awareness": 0,
+            "attack": 0,
+            "serve": 0.1,
+            "stamina": 0.1,
             "setting": 0,
-            "pass": 0,
-            "reception": 0.05,
-            "spike": 0.245,
-            "backAttack": 0.12,
-            "jump": 0.155,
-            "block": 0.1050,
-            "awareness": 0.04,
-            "defense": 0.035,
-            "stamina": 0.05
+            "reception": 0.2,
+            "overhand": 0,
+            "bump": 0,
+            "block": 0.2,
+            "read": 0,
+            "commit": 0,
+            "focus": 0,
+            "defense": 0
         }
     },
     {
         "role": "MIDDLE_BLOCKER",
         "weight": {
-            "serve": 0.2,
+            "spike": 0.2,
+            "quick": 0,
+            "power": 0,
+            "backAttack": 0,
+            "awareness": 0,
+            "attack": 0,
+            "serve": 0,
+            "stamina": 0.1,
             "setting": 0,
-            "pass": 0,
             "reception": 0,
-            "spike": 0.09,
-            "backAttack": 0,
-            "jump": 0.24,
-            "block": 0.2475,
-            "awareness": 0.0975,
-            "defense": 0.075,
-            "stamina": 0.05
+            "overhand": 0,
+            "bump": 0,
+            "block": 0.7,
+            "read": 0,
+            "commit": 0,
+            "focus": 0,
+            "defense": 0
         }
     }
 ]

package/dist/cjs/src/formula/roles.d.ts

@@ -1,20 +1,9 @@
+import { PerformanceStatsParams } from '../service';
 export declare const ALL_ROLES: string[];
 export type RolesTuple = typeof ALL_ROLES;
 export type Roles = RolesTuple[number];
 export interface RolesFormula {
-    'role': Roles;
-    'weight': {
-        'serve': number;
-        'setting': number;
-        'pass': number;
-        'reception': number;
-        'spike': number;
-        'backAttack': number;
-        'jump': number;
-        'block': number;
-        'awareness': number;
-        'defense': number;
-        'stamina': number;
-    };
+    role: Roles;
+    weight: PerformanceStatsParams;
 }
 export declare const rolesFormula: RolesFormula[];

package/dist/cjs/src/formula/stats.d.ts

@@ -1,10 +1,6 @@
-import { PerformanceStats, PerformanceStatsParams } from '../service';
+import { PerformanceStats } from '../service';
 export declare const ALL_STATS: string[];
 export type StatsTuple = typeof ALL_STATS;
 export type Stats = StatsTuple[number];
-export interface StatFormula {
-    statName: Stats;
-    weight: PerformanceStatsParams;
-}
-export declare const statsFormula: StatFormula[];
 export declare function calculateScore(performanceStats: PerformanceStats, statName: Stats): number;
+export declare function getMultipliers(statName: Stats, performanceStats?: PerformanceStats): any;

package/dist/cjs/src/formula/stats.js

@@ -1,18 +1,59 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateScore = exports.statsFormula = exports.ALL_STATS = void 0;
-const stat_formula_json_1 = __importDefault(require("./stat.formula.json"));
-exports.ALL_STATS = ['ATTACK', 'DEFENSE', 'SERVE', 'PHYSICAL'];
-exports.statsFormula = stat_formula_json_1.default;
+exports.getMultipliers = exports.calculateScore = exports.ALL_STATS = void 0;
+exports.ALL_STATS = ['ATTACK', 'SET', 'RECEIVE', 'SERVE', 'BLOCK', 'STAMINA'];
 function calculateScore(performanceStats, statName) {
-    const weights = stat_formula_json_1.default.find((s) => s.statName === statName);
-    if (weights == null)
-        throw new Error('COULD_NOT_FIND_ROLE_WEIGHT');
-    const score = Object.entries(weights.weight)
+    const multipliers = getMultipliers(statName, performanceStats);
+    const score = Object.entries(multipliers)
         .reduce((total, [key, value]) => total + value * performanceStats[key], 0);
     return Math.round(score);
 }
 exports.calculateScore = calculateScore;
+function getMultipliers(statName, performanceStats) {
+    switch (statName) {
+        case 'ATTACK':
+            return {
+                spike: 0.55,
+                backAttack: 0.1,
+                power: performanceStats == null ? 0.125 : performanceStats.power > performanceStats.quick ? 0.2 : 0.05,
+                quick: performanceStats == null ? 0.125 : performanceStats.quick > performanceStats.power ? 0.2 : 0.05,
+                awareness: 0.05,
+                attack: 0.05
+            };
+        case 'SET':
+            return {
+                setting: 0.7,
+                overhand: 0.1,
+                bump: 0.05,
+                awareness: 0.075,
+                attack: 0.075
+            };
+        case 'RECEIVE':
+            return {
+                reception: 0.75,
+                overhand: 0.025,
+                bump: 0.15,
+                focus: 0.025,
+                defense: 0.05
+            };
+        case 'SERVE':
+            return {
+                serve: 0.85,
+                awareness: 0.075,
+                attack: 0.075
+            };
+        case 'BLOCK':
+            return {
+                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
+            };
+        case 'STAMINA':
+            return { stamina: 1 };
+        default:
+            throw new Error('INVALID_STAT');
+    }
+}
+exports.getMultipliers = getMultipliers;

package/dist/cjs/src/service/player/performance-stats.d.ts

@@ -1,30 +1,10 @@
-export interface PerformanceStatsParams {
-    readonly setting: number;
-    readonly pass: number;
-    readonly reception: number;
-    readonly spike: number;
-    readonly backAttack: number;
-    readonly jump: number;
-    readonly block: number;
-    readonly awareness: number;
-    readonly serve: number;
-    readonly defense: number;
-    readonly stamina: number;
+export declare const performanceStatKeys: readonly ["setting", "serve", "spike", "quick", "power", "awareness", "attack", "backAttack", "reception", "overhand", "bump", "block", "read", "commit", "focus", "defense", "stamina"];
+export type PerformanceStatsKey = typeof performanceStatKeys[number];
+export type PerformanceStatsParams = Record<PerformanceStatsKey, number>;
+export interface PerformanceStats extends PerformanceStatsParams {
 }
-export type PerformanceStatsKey = keyof PerformanceStatsParams;
 export declare class PerformanceStats {
-    readonly setting: number;
-    readonly pass: number;
-    readonly reception: number;
-    readonly spike: number;
-    readonly backAttack: number;
-    readonly jump: number;
-    readonly block: number;
-    readonly awareness: number;
-    readonly serve: number;
-    readonly defense: number;
-    readonly stamina: number;
     constructor(opts: PerformanceStatsParams);
+    static fromAverage(avg: number): PerformanceStats;
     toString(): string;
-    static fromAverage(average: number): PerformanceStats;
 }

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

@@ -1,38 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PerformanceStats = void 0;
-const utils_1 = require("../utils");
+exports.PerformanceStats = exports.performanceStatKeys = void 0;
+exports.performanceStatKeys = ['setting', 'serve', 'spike', 'quick', 'power', 'awareness', 'attack', 'backAttack',
+    'reception', 'overhand', 'bump', 'block', 'read', 'commit', 'focus', 'defense', 'stamina'];
 class PerformanceStats {
     constructor(opts) {
-        this.serve = opts.serve;
-        this.pass = opts.pass;
-        this.setting = opts.setting;
-        this.reception = opts.reception;
-        this.spike = opts.spike;
-        this.backAttack = opts.backAttack;
-        this.jump = opts.jump;
-        this.block = opts.block;
-        this.awareness = opts.awareness;
-        this.defense = opts.defense;
-        this.stamina = opts.stamina;
+        Object.assign(this, opts);
     }
-    toString() {
-        return (0, utils_1.getKeys)(this).map(key => `${key}: ${this[key]}`).join(', ');
+    static fromAverage(avg) {
+        const opts = Object.fromEntries(exports.performanceStatKeys.map((key) => [key, avg]));
+        return new PerformanceStats(opts);
     }
-    static fromAverage(average) {
-        return new PerformanceStats({
-            setting: average,
-            pass: average,
-            reception: average,
-            spike: average,
-            backAttack: average,
-            jump: average,
-            block: average,
-            awareness: average,
-            serve: average,
-            defense: average,
-            stamina: average
-        });
+    toString() {
+        return exports.performanceStatKeys.map((key) => `${key}: ${this[key]}`)
+            .join(', ');
     }
 }
 exports.PerformanceStats = PerformanceStats;

package/dist/esm/src/data/models/performance-stats.d.ts

@@ -1,37 +1,48 @@
 import * as Sequelize from 'sequelize';
-import { Model, Optional } from 'sequelize';
+import { Model } from 'sequelize';
 import { PlayerId, PlayerModel } from '.';
 export interface PerformanceStatsAttributes {
     player_id: string;
     setting: number;
-    pass: number;
-    reception: number;
+    serve: number;
     spike: number;
+    quick: number;
+    power: number;
+    awareness: number;
+    attack: number;
     back_attack: number;
-    jump: number;
+    reception: number;
+    overhand: number;
+    bump: number;
     block: number;
-    awareness: number;
-    serve: number;
-    stamina: number;
+    read: number;
+    commit: number;
+    focus: number;
     defense: number;
+    stamina: number;
 }
 export type PerformanceStatsPk = 'player_id';
 export type PerformanceStatsId = PerformanceStatsModel[PerformanceStatsPk];
-export type PerformanceStatsOptionalAttributes = 'setting' | 'pass' | 'reception' | 'spike' | 'back_attack' | 'jump' | 'block' | 'awareness' | 'serve' | 'stamina' | 'defense';
-export type PerformanceStatsCreationAttributes = Optional<PerformanceStatsAttributes, PerformanceStatsOptionalAttributes>;
+export type PerformanceStatsCreationAttributes = PerformanceStatsAttributes;
 export declare class PerformanceStatsModel extends Model<PerformanceStatsAttributes, PerformanceStatsCreationAttributes> implements PerformanceStatsAttributes {
     player_id: string;
     setting: number;
-    pass: number;
-    reception: number;
+    serve: number;
     spike: number;
+    quick: number;
+    power: number;
+    awareness: number;
+    attack: number;
     back_attack: number;
-    jump: number;
+    reception: number;
+    overhand: number;
+    bump: number;
     block: number;
-    awareness: number;
-    serve: number;
-    stamina: number;
+    read: number;
+    commit: number;
+    focus: number;
     defense: number;
+    stamina: number;
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;