volleyballsimtypes 0.0.166 → 0.0.168

package/dist/cjs/src/data/init-models.js

@@ -22,11 +22,9 @@ function initModels(sequelize) {
     const PerformanceStats = models_1.PerformanceStatsModel.initModel(sequelize);
     const Player = models_1.PlayerModel.initModel(sequelize);
     const PlayerTeam = models_1.PlayerTeamModel.initModel(sequelize);
-    const PlayerTrait = models_1.PlayerTraitModel.initModel(sequelize);
     const Rally = models_1.RallyModel.initModel(sequelize);
     const SetPosition = models_1.SetPositionModel.initModel(sequelize);
     const Team = models_1.TeamModel.initModel(sequelize);
-    const Trait = models_1.TraitModel.initModel(sequelize);
     const User = models_1.UserModel.initModel(sequelize);
     Coach.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Coach.hasMany(Team, { as: 'Teams', foreignKey: 'coach_id' });
@@ -115,22 +113,13 @@ function initModels(sequelize) {
         foreignKey: 'player_id',
         otherKey: 'team_id'
     });
-    Player.belongsToMany(Trait, {
-        as: 'Traits',
-        through: PlayerTrait,
-        foreignKey: 'player_id',
-        otherKey: 'trait_id'
-    });
     Player.hasMany(MatchSetStats, { as: 'MatchSetStats', foreignKey: 'player_id' });
     Player.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'player_id' });
-    Player.hasMany(PlayerTrait, { as: 'PlayerTraits', foreignKey: 'player_id' });
     Player.hasMany(SetPosition, { as: 'SetPositions', foreignKey: 'player_id' });
     Player.hasOne(DraftPick, { as: 'DraftPick', foreignKey: 'player_id' });
     Player.hasOne(PerformanceStats, { as: 'PerformanceStat', foreignKey: 'player_id' });
     PlayerTeam.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     PlayerTeam.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
-    PlayerTrait.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
-    PlayerTrait.belongsTo(Trait, { as: 'trait', foreignKey: 'trait_id' });
     Rally.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
     Rally.belongsTo(Team, { as: 'ServingTeam', foreignKey: 'serving_team' });
     SetPosition.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
@@ -165,13 +154,6 @@ function initModels(sequelize) {
     Team.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'team_id' });
     Team.hasMany(Rally, { as: 'Rallies', foreignKey: 'serving_team' });
     Team.hasMany(MatchResult, { as: 'WonMatches', foreignKey: 'winner_team_id' });
-    Trait.belongsToMany(Player, {
-        as: 'Players',
-        through: PlayerTrait,
-        foreignKey: 'trait_id',
-        otherKey: 'player_id'
-    });
-    Trait.hasMany(PlayerTrait, { as: 'PlayerTraits', foreignKey: 'trait_id' });
     return {
         Coach,
         Competition,
@@ -181,7 +163,6 @@ function initModels(sequelize) {
         Country,
         Draft,
         DraftPick,
-        Event,
         Iteration,
         League,
         LeagueSeason,
@@ -193,11 +174,9 @@ function initModels(sequelize) {
         PerformanceStats,
         Player,
         PlayerTeam,
-        PlayerTrait,
         Rally,
         SetPosition,
         Team,
-        Trait,
         User
     };
 }

package/dist/cjs/src/data/models/index.d.ts

@@ -17,9 +17,7 @@ export * from './match-set-stats';
 export * from './performance-stats';
 export * from './player';
 export * from './player-team';
-export * from './player-trait';
 export * from './rally';
 export * from './set-position';
 export * from './team';
-export * from './trait';
 export * from './user';

package/dist/cjs/src/data/models/index.js

@@ -33,9 +33,7 @@ __exportStar(require("./match-set-stats"), exports);
 __exportStar(require("./performance-stats"), exports);
 __exportStar(require("./player"), exports);
 __exportStar(require("./player-team"), exports);
-__exportStar(require("./player-trait"), exports);
 __exportStar(require("./rally"), exports);
 __exportStar(require("./set-position"), exports);
 __exportStar(require("./team"), exports);
-__exportStar(require("./trait"), exports);
 __exportStar(require("./user"), exports);

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

@@ -20,6 +20,7 @@ export interface PerformanceStatsAttributes {
     focus: number;
     defense: number;
     stamina: number;
+    saving: number;
 }
 export type PerformanceStatsPk = 'player_id';
 export type PerformanceStatsId = PerformanceStatsModel[PerformanceStatsPk];
@@ -43,6 +44,7 @@ export declare class PerformanceStatsModel extends Model<PerformanceStatsAttribu
     focus: number;
     defense: number;
     stamina: number;
+    saving: number;
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

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

@@ -98,6 +98,11 @@ class PerformanceStatsModel extends sequelize_1.Model {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false,
                 defaultValue: 0
+            },
+            saving: {
+                type: sequelize_1.DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
             }
         }, {
             sequelize,

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

@@ -1,11 +1,12 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, MatchSetStatsAttributes, MatchSetStatsId, MatchSetStatsModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, PlayerTraitId, PlayerTraitModel, SetPositionId, SetPositionModel, TeamId, TeamModel, TraitId, TraitModel } from '.';
-import { Rarity } from '../../service';
+import { CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, MatchSetStatsAttributes, MatchSetStatsId, MatchSetStatsModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, SetPositionId, SetPositionModel, TeamId, TeamModel } from '.';
+import { Rarity, Role, Trait } from '../../service';
 export interface PlayerAttributes {
     player_id: string;
-    roles: RoleType[];
-    rarity: PlayerRarity;
+    roles: Role[];
+    traits: Trait[];
+    rarity: Rarity;
     first_name: string;
     last_name: string;
     country_id: string;
@@ -13,14 +14,13 @@ export interface PlayerAttributes {
     MatchSetStats?: MatchSetStatsAttributes[];
 }
 export type PlayerPk = 'player_id';
-export type RoleType = 'SETTER' | 'LIBERO' | 'OUTSIDE_HITTER' | 'OPPOSITE_HITTER' | 'MIDDLE_BLOCKER';
-export type PlayerRarity = Rarity.COMMON | Rarity.RARE | Rarity.LEGENDARY | Rarity.MYTHIC | Rarity.SPECIAL;
 export type PlayerId = PlayerModel[PlayerPk];
 export type PlayerCreationAttributes = PlayerAttributes;
 export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationAttributes> implements PlayerAttributes {
     player_id: string;
-    roles: RoleType[];
-    rarity: PlayerRarity;
+    roles: Role[];
+    traits: Trait[];
+    rarity: Rarity;
     first_name: string;
     last_name: string;
     country_id: string;
@@ -80,17 +80,6 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     hasPlayerTeam: Sequelize.HasManyHasAssociationMixin<PlayerTeamModel, PlayerTeamId>;
     hasPlayerTeams: Sequelize.HasManyHasAssociationsMixin<PlayerTeamModel, PlayerTeamId>;
     countPlayerTeams: Sequelize.HasManyCountAssociationsMixin;
-    PlayerTraits: PlayerTraitModel[];
-    getPlayerTraits: Sequelize.HasManyGetAssociationsMixin<PlayerTraitModel>;
-    setPlayerTraits: Sequelize.HasManySetAssociationsMixin<PlayerTraitModel, PlayerTraitId>;
-    addPlayerTrait: Sequelize.HasManyAddAssociationMixin<PlayerTraitModel, PlayerTraitId>;
-    addPlayerTraits: Sequelize.HasManyAddAssociationsMixin<PlayerTraitModel, PlayerTraitId>;
-    createPlayerTrait: Sequelize.HasManyCreateAssociationMixin<PlayerTraitModel>;
-    removePlayerTrait: Sequelize.HasManyRemoveAssociationMixin<PlayerTraitModel, PlayerTraitId>;
-    removePlayerTraits: Sequelize.HasManyRemoveAssociationsMixin<PlayerTraitModel, PlayerTraitId>;
-    hasPlayerTrait: Sequelize.HasManyHasAssociationMixin<PlayerTraitModel, PlayerTraitId>;
-    hasPlayerTraits: Sequelize.HasManyHasAssociationsMixin<PlayerTraitModel, PlayerTraitId>;
-    countPlayerTraits: Sequelize.HasManyCountAssociationsMixin;
     SetPositions: SetPositionModel[];
     getSetPositions: Sequelize.HasManyGetAssociationsMixin<SetPositionModel>;
     setSetPositions: Sequelize.HasManySetAssociationsMixin<SetPositionModel, SetPositionId>;
@@ -113,16 +102,5 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     hasTeam: Sequelize.BelongsToManyHasAssociationMixin<TeamModel, TeamId>;
     hasTeams: Sequelize.BelongsToManyHasAssociationsMixin<TeamModel, TeamId>;
     countTeams: Sequelize.BelongsToManyCountAssociationsMixin;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof PlayerModel;
 }

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

@@ -12,11 +12,15 @@ class PlayerModel extends sequelize_1.Model {
                 primaryKey: true
             },
             roles: {
-                type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.ENUM('SETTER', 'LIBERO', 'OUTSIDE_HITTER', 'OPPOSITE_HITTER', 'MIDDLE_BLOCKER')),
+                type: sequelize_1.DataTypes.ARRAY(service_1.RoleDataType),
+                allowNull: false
+            },
+            traits: {
+                type: sequelize_1.DataTypes.ARRAY(service_1.TraitDataType),
                 allowNull: false
             },
             rarity: {
-                type: sequelize_1.DataTypes.ENUM(...Object.values(service_1.Rarity)),
+                type: sequelize_1.DataTypes.ENUM(service_1.RarityDataType),
                 allowNull: false
             },
             first_name: {

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

@@ -16,10 +16,8 @@ export * from './performance-stats';
 export * from './player';
 export * from './rally';
 export * from './set-position';
-export * from './role';
 export * from './season';
 export * from './season-match';
 export * from './player-team';
 export * from './match-rating';
 export * from './team';
-export * from './trait';

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

@@ -32,10 +32,8 @@ __exportStar(require("./performance-stats"), exports);
 __exportStar(require("./player"), exports);
 __exportStar(require("./rally"), exports);
 __exportStar(require("./set-position"), exports);
-__exportStar(require("./role"), exports);
 __exportStar(require("./season"), exports);
 __exportStar(require("./season-match"), exports);
 __exportStar(require("./player-team"), exports);
 __exportStar(require("./match-rating"), exports);
 __exportStar(require("./team"), exports);
-__exportStar(require("./trait"), exports);

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

@@ -21,7 +21,8 @@ function transformToAttributes(player) {
         bump: player.stats.bump,
         setting: player.stats.setting,
         spike: player.stats.spike,
-        stamina: player.stats.stamina
+        stamina: player.stats.stamina,
+        saving: player.stats.saving
     };
 }
 exports.transformFromPerformanceStats = transformToAttributes;
@@ -43,7 +44,8 @@ function transformToObject(model) {
         commit: model.commit,
         focus: model.focus,
         defense: model.defense,
-        stamina: model.stamina
+        stamina: model.stamina,
+        saving: model.saving
     });
 }
 exports.transformToPerformanceStats = transformToObject;

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

@@ -9,7 +9,8 @@ function transformToAttributes(player) {
         country_id: player.country.id,
         first_name: player.name.first,
         last_name: player.name.last,
-        roles: player.roles.map(_1.transformFromRole),
+        roles: player.roles,
+        traits: player.traits,
         PerformanceStat: (0, _1.transformFromPerformanceStats)(player),
         rarity: player.rarity
     };
@@ -23,8 +24,8 @@ function transformToObject(model) {
             last: model.last_name
         },
         country: (0, _1.transformToCountry)(model.country),
-        roles: model.roles.map(_1.transformToRole),
-        traits: model.Traits.map(_1.transformToTrait),
+        roles: model.roles,
+        traits: model.traits,
         stats: (0, _1.transformToPerformanceStats)(model.PerformanceStat),
         rarity: model.rarity
     });

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

@@ -1,3 +1,2 @@
 export * from './service';
 export * from './data';
-export * from './formula';

package/dist/cjs/src/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./service"), exports);
 __exportStar(require("./data"), exports);
-__exportStar(require("./formula"), exports);

package/dist/cjs/src/service/coach/formation.js

@@ -19,29 +19,29 @@ exports.Formation = Formation;
 Formation['5-1'] = new Formation({
     name: '5-1',
     initialRotation: {
-        1: [player_1.Role.SETTER],
-        2: [player_1.Role.OUTSIDE_HITTER],
-        3: [player_1.Role.MIDDLE_BLOCKER],
-        4: [player_1.Role.OPPOSITE_HITTER],
-        5: [player_1.Role.OUTSIDE_HITTER],
-        6: [player_1.Role.MIDDLE_BLOCKER]
+        1: [player_1.RoleEnum.SETTER],
+        2: [player_1.RoleEnum.OUTSIDE_HITTER],
+        3: [player_1.RoleEnum.MIDDLE_BLOCKER],
+        4: [player_1.RoleEnum.OPPOSITE_HITTER],
+        5: [player_1.RoleEnum.OUTSIDE_HITTER],
+        6: [player_1.RoleEnum.MIDDLE_BLOCKER]
     },
     base: {
-        1: [player_1.Role.OPPOSITE_HITTER, player_1.Role.SETTER],
-        2: [player_1.Role.OPPOSITE_HITTER],
-        3: [player_1.Role.MIDDLE_BLOCKER],
-        4: [player_1.Role.OUTSIDE_HITTER],
-        5: [player_1.Role.OUTSIDE_HITTER],
-        6: [player_1.Role.LIBERO]
+        1: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
+        2: [player_1.RoleEnum.OPPOSITE_HITTER],
+        3: [player_1.RoleEnum.MIDDLE_BLOCKER],
+        4: [player_1.RoleEnum.OUTSIDE_HITTER],
+        5: [player_1.RoleEnum.OUTSIDE_HITTER],
+        6: [player_1.RoleEnum.LIBERO]
     },
     draftingPriorities: [
-        [player_1.Role.SETTER, player_1.Role.OPPOSITE_HITTER],
-        [player_1.Role.OPPOSITE_HITTER],
-        [player_1.Role.MIDDLE_BLOCKER],
-        [player_1.Role.MIDDLE_BLOCKER],
-        [player_1.Role.OUTSIDE_HITTER],
-        [player_1.Role.OUTSIDE_HITTER],
-        [player_1.Role.LIBERO]
+        [player_1.RoleEnum.SETTER, player_1.RoleEnum.OPPOSITE_HITTER],
+        [player_1.RoleEnum.OPPOSITE_HITTER],
+        [player_1.RoleEnum.MIDDLE_BLOCKER],
+        [player_1.RoleEnum.MIDDLE_BLOCKER],
+        [player_1.RoleEnum.OUTSIDE_HITTER],
+        [player_1.RoleEnum.OUTSIDE_HITTER],
+        [player_1.RoleEnum.LIBERO]
     ],
     liberoSubPriority: {
         MIDDLE_BLOCKER: 1,
@@ -54,29 +54,29 @@ Formation['5-1'] = new Formation({
 Formation['4-2'] = new Formation({
     name: '4-2',
     initialRotation: {
-        1: [player_1.Role.MIDDLE_BLOCKER],
-        2: [player_1.Role.SETTER],
-        3: [player_1.Role.OUTSIDE_HITTER],
-        4: [player_1.Role.MIDDLE_BLOCKER],
-        5: [player_1.Role.SETTER],
-        6: [player_1.Role.OPPOSITE_HITTER]
+        1: [player_1.RoleEnum.MIDDLE_BLOCKER],
+        2: [player_1.RoleEnum.SETTER],
+        3: [player_1.RoleEnum.OUTSIDE_HITTER],
+        4: [player_1.RoleEnum.MIDDLE_BLOCKER],
+        5: [player_1.RoleEnum.SETTER],
+        6: [player_1.RoleEnum.OPPOSITE_HITTER]
     },
     base: {
-        1: [player_1.Role.SETTER],
-        2: [player_1.Role.OPPOSITE_HITTER, player_1.Role.SETTER],
-        3: [player_1.Role.MIDDLE_BLOCKER],
-        4: [player_1.Role.OUTSIDE_HITTER],
-        5: [player_1.Role.OUTSIDE_HITTER],
-        6: [player_1.Role.LIBERO]
+        1: [player_1.RoleEnum.SETTER],
+        2: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
+        3: [player_1.RoleEnum.MIDDLE_BLOCKER],
+        4: [player_1.RoleEnum.OUTSIDE_HITTER],
+        5: [player_1.RoleEnum.OUTSIDE_HITTER],
+        6: [player_1.RoleEnum.LIBERO]
     },
     draftingPriorities: [
-        [player_1.Role.SETTER, player_1.Role.OPPOSITE_HITTER],
-        [player_1.Role.SETTER],
-        [player_1.Role.MIDDLE_BLOCKER],
-        [player_1.Role.MIDDLE_BLOCKER],
-        [player_1.Role.OUTSIDE_HITTER],
-        [player_1.Role.OUTSIDE_HITTER],
-        [player_1.Role.LIBERO]
+        [player_1.RoleEnum.SETTER, player_1.RoleEnum.OPPOSITE_HITTER],
+        [player_1.RoleEnum.SETTER],
+        [player_1.RoleEnum.MIDDLE_BLOCKER],
+        [player_1.RoleEnum.MIDDLE_BLOCKER],
+        [player_1.RoleEnum.OUTSIDE_HITTER],
+        [player_1.RoleEnum.OUTSIDE_HITTER],
+        [player_1.RoleEnum.LIBERO]
     ],
     liberoSubPriority: {
         MIDDLE_BLOCKER: 1,
@@ -89,29 +89,29 @@ Formation['4-2'] = new Formation({
 Formation['6-2'] = new Formation({
     name: '6-2',
     initialRotation: {
-        1: [player_1.Role.OPPOSITE_HITTER, player_1.Role.SETTER],
-        2: [player_1.Role.OUTSIDE_HITTER],
-        3: [player_1.Role.MIDDLE_BLOCKER],
-        4: [player_1.Role.OPPOSITE_HITTER, player_1.Role.SETTER],
-        5: [player_1.Role.OUTSIDE_HITTER],
-        6: [player_1.Role.MIDDLE_BLOCKER]
+        1: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
+        2: [player_1.RoleEnum.OUTSIDE_HITTER],
+        3: [player_1.RoleEnum.MIDDLE_BLOCKER],
+        4: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
+        5: [player_1.RoleEnum.OUTSIDE_HITTER],
+        6: [player_1.RoleEnum.MIDDLE_BLOCKER]
     },
     base: {
-        1: [player_1.Role.SETTER],
-        2: [player_1.Role.OPPOSITE_HITTER, player_1.Role.SETTER],
-        3: [player_1.Role.MIDDLE_BLOCKER],
-        4: [player_1.Role.OUTSIDE_HITTER],
-        5: [player_1.Role.OUTSIDE_HITTER],
-        6: [player_1.Role.LIBERO]
+        1: [player_1.RoleEnum.SETTER],
+        2: [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
+        3: [player_1.RoleEnum.MIDDLE_BLOCKER],
+        4: [player_1.RoleEnum.OUTSIDE_HITTER],
+        5: [player_1.RoleEnum.OUTSIDE_HITTER],
+        6: [player_1.RoleEnum.LIBERO]
     },
     draftingPriorities: [
-        [player_1.Role.SETTER, player_1.Role.OPPOSITE_HITTER],
-        [player_1.Role.OPPOSITE_HITTER, player_1.Role.SETTER],
-        [player_1.Role.MIDDLE_BLOCKER],
-        [player_1.Role.MIDDLE_BLOCKER],
-        [player_1.Role.OUTSIDE_HITTER],
-        [player_1.Role.OUTSIDE_HITTER],
-        [player_1.Role.LIBERO]
+        [player_1.RoleEnum.SETTER, player_1.RoleEnum.OPPOSITE_HITTER],
+        [player_1.RoleEnum.OPPOSITE_HITTER, player_1.RoleEnum.SETTER],
+        [player_1.RoleEnum.MIDDLE_BLOCKER],
+        [player_1.RoleEnum.MIDDLE_BLOCKER],
+        [player_1.RoleEnum.OUTSIDE_HITTER],
+        [player_1.RoleEnum.OUTSIDE_HITTER],
+        [player_1.RoleEnum.LIBERO]
     ],
     liberoSubPriority: {
         MIDDLE_BLOCKER: 1,

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

@@ -1,5 +1,6 @@
 export * from './player';
 export * from './performance-stats';
-export * from './role';
 export * from './trait';
 export * from './rarity';
+export * from './role';
+export * from './stats';

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

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./player"), exports);
 __exportStar(require("./performance-stats"), exports);
-__exportStar(require("./role"), exports);
 __exportStar(require("./trait"), exports);
 __exportStar(require("./rarity"), exports);
+__exportStar(require("./role"), exports);
+__exportStar(require("./stats"), exports);

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

@@ -1,4 +1,4 @@
-export declare const performanceStatKeys: readonly ["setting", "serve", "spike", "quick", "power", "awareness", "attack", "backAttack", "reception", "overhand", "bump", "block", "read", "commit", "focus", "defense", "stamina"];
+export declare const performanceStatKeys: readonly ["setting", "serve", "spike", "quick", "power", "awareness", "attack", "backAttack", "reception", "overhand", "bump", "block", "read", "commit", "focus", "defense", "stamina", "saving"];
 export type PerformanceStatsKey = typeof performanceStatKeys[number];
 export type PerformanceStatsParams = Record<PerformanceStatsKey, number>;
 export interface PerformanceStats extends PerformanceStatsParams {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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'];
+    'reception', 'overhand', 'bump', 'block', 'read', 'commit', 'focus', 'defense', 'stamina', 'saving'];
 class PerformanceStats {
     constructor(opts) {
         Object.assign(this, opts);

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

@@ -1,14 +1,14 @@
 import { PerformanceStats } from './performance-stats';
-import { Role } from './role';
 import { Trait } from './trait';
 import { Country } from '../country';
-import * as GeneralStat from '../../formula/stats';
 import { Rarity } from './rarity';
+import { Stats } from './stats';
+import { Role } from './role';
 export declare class Stat {
-    readonly name: GeneralStat.Stats;
+    readonly name: Stats;
     readonly value: number;
     constructor({ name, value }: {
-        name: GeneralStat.Stats;
+        name: Stats;
         value: number;
     });
     toString(): string;
@@ -43,7 +43,6 @@ export declare class Player {
     constructor({ id, name, country, stats, roles, traits, rarity }: PlayerParams);
     static sortPlayers(roles: Role[]): (p1: Player, p2: Player) => number;
     static compareStats(p1: Player, p2: Player): number;
-    canPlayLibero(): boolean;
     toString(): string;
 }
 export {};

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

@@ -1,32 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Player = exports.Name = exports.Stat = void 0;
-const role_1 = require("./role");
 const utils_1 = require("../utils");
-const GeneralStat = __importStar(require("../../formula/stats"));
+const stats_1 = require("./stats");
+const role_1 = require("./role");
 class Stat {
     constructor({ name, value }) {
         this.name = name;
@@ -57,16 +34,16 @@ class Player {
         this.roles = roles;
         this.traits = traits;
         this.rarity = rarity;
-        this.generalStats = GeneralStat.ALL_STATS.map(stat => ({
+        this.generalStats = Object.values(stats_1.StatsEnum).map((stat) => ({
             name: stat,
-            value: GeneralStat.calculateScore(stats, stat)
+            value: (0, stats_1.calculateStatScore)(stats, stat)
         }));
     }
     // Used as a base sorting function for players
     static sortPlayers(roles) {
         return (p1, p2) => roles.reduce((x, role) => {
-            const p2Score = role_1.Role.calculateScore(p2.stats, role);
-            const p1Score = role_1.Role.calculateScore(p1.stats, role);
+            const p2Score = (0, role_1.calculateRoleScore)(p2.stats, role);
+            const p1Score = (0, role_1.calculateRoleScore)(p1.stats, role);
             return x + p2Score - p1Score;
         }, 0);
     }
@@ -74,17 +51,23 @@ class Player {
         const compareFn = (acc, current) => {
             let x = current.value;
             switch (current.name) {
-                case 'ATTACK':
-                    x *= 0.35;
+                case stats_1.StatsEnum.ATTACK:
+                    x *= 0.19;
                     break;
-                case 'DEFENSE':
-                    x *= 0.35;
+                case stats_1.StatsEnum.SET:
+                    x *= 0.19;
                     break;
-                case 'SERVE':
-                    x *= 0.2;
+                case stats_1.StatsEnum.RECEIVE:
+                    x *= 0.19;
                     break;
-                case 'PHYSICAL':
-                    x *= 0.1;
+                case stats_1.StatsEnum.BLOCK:
+                    x *= 0.19;
+                    break;
+                case stats_1.StatsEnum.SERVE:
+                    x *= 0.19;
+                    break;
+                case stats_1.StatsEnum.STAMINA:
+                    x *= 0.05;
                     break;
                 default:
                     x *= 0;
@@ -95,9 +78,6 @@ class Player {
         const s2 = p2.generalStats.reduce(compareFn, 0);
         return s2 - s1;
     }
-    canPlayLibero() {
-        return this.roles.includes(role_1.Role.LIBERO);
-    }
     toString() {
         return JSON.stringify({
             id: this.id,
@@ -106,7 +86,7 @@ class Player {
             stats: this.stats.toString(),
             rarity: this.rarity,
             roles: `[${this.roles.map(r => r.toString()).join(',')}]`,
-            traits: `[${this.traits.map(r => r.toString()).join(',')}]`,
+            traits: `[${this.traits.map(t => t.toString()).join(',')}]`,
             generalStats: `[${this.generalStats.map(r => r.toString()).join(',')}]`
         });
     }

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

@@ -1,10 +1,12 @@
-export declare enum Rarity {
+import { EnumDataType } from 'sequelize';
+export declare enum RarityEnum {
     COMMON = "COMMON",
     RARE = "RARE",
     LEGENDARY = "LEGENDARY",
     MYTHIC = "MYTHIC",
     SPECIAL = "SPECIAL"
 }
+export type Rarity = RarityEnum.COMMON | RarityEnum.RARE | RarityEnum.LEGENDARY | RarityEnum.MYTHIC | RarityEnum.SPECIAL;
 export declare const RarityRanges: {
     COMMON: number[];
     RARE: number[];
@@ -12,3 +14,4 @@ export declare const RarityRanges: {
     MYTHIC: number[];
     SPECIAL: number[];
 };
+export declare const RarityDataType: EnumDataType<RarityEnum>;