volleyballsimtypes 0.0.74 → 0.0.76

package/dist/esm/src/service/match/court-target.test.js

@@ -1,35 +1,35 @@
 import { describe, expect, test } from '@jest/globals';
-import { CourtTarget } from './court-target';
+import { CourtTargetEnum } from './court-target-enum';
 describe('CourtTarget Test Module', () => {
     // getSidePosition Tests
     test('Should get correct court position', () => {
         for (let i = 1; i < 7; i++) {
-            expect(CourtTarget.getSidePosition(i)).toBe(i);
-            expect(CourtTarget.getSidePosition(i + 6)).toBe(i);
+            expect(CourtTargetEnum.getSidePosition(i)).toBe(i);
+            expect(CourtTargetEnum.getSidePosition(i + 6)).toBe(i);
         }
     });
     test('Should throw Error when position is out of bounds', () => {
-        function position() { CourtTarget.getSidePosition(0); }
+        function position() { CourtTargetEnum.getSidePosition(0); }
         expect(position).toThrow(/^POSITION_INDEX_OUT_OF_BOUNDS$/);
     });
     // getTeamSide Tests
     test('Should return team positions', () => {
-        const positions = CourtTarget.getTeamSide();
-        expect(positions[0]).toBe(CourtTarget.TEAM_RIGHT_BACK);
-        expect(positions[1]).toBe(CourtTarget.TEAM_RIGHT_FRONT);
-        expect(positions[2]).toBe(CourtTarget.TEAM_MIDDLE_FRONT);
-        expect(positions[3]).toBe(CourtTarget.TEAM_LEFT_FRONT);
-        expect(positions[4]).toBe(CourtTarget.TEAM_LEFT_BACK);
-        expect(positions[5]).toBe(CourtTarget.TEAM_MIDDLE_BACK);
+        const positions = CourtTargetEnum.getTeamSide();
+        expect(positions[0]).toBe(CourtTargetEnum.TEAM_RIGHT_BACK);
+        expect(positions[1]).toBe(CourtTargetEnum.TEAM_RIGHT_FRONT);
+        expect(positions[2]).toBe(CourtTargetEnum.TEAM_MIDDLE_FRONT);
+        expect(positions[3]).toBe(CourtTargetEnum.TEAM_LEFT_FRONT);
+        expect(positions[4]).toBe(CourtTargetEnum.TEAM_LEFT_BACK);
+        expect(positions[5]).toBe(CourtTargetEnum.TEAM_MIDDLE_BACK);
     });
     // getOpponentSide Tests
     test('Should return opponent team positions', () => {
-        const positions = CourtTarget.getOpponentSide();
-        expect(positions[0]).toBe(CourtTarget.OPPONENT_RIGHT_BACK);
-        expect(positions[1]).toBe(CourtTarget.OPPONENT_RIGHT_FRONT);
-        expect(positions[2]).toBe(CourtTarget.OPPONENT_MIDDLE_FRONT);
-        expect(positions[3]).toBe(CourtTarget.OPPONENT_LEFT_FRONT);
-        expect(positions[4]).toBe(CourtTarget.OPPONENT_LEFT_BACK);
-        expect(positions[5]).toBe(CourtTarget.OPPONENT_MIDDLE_BACK);
+        const positions = CourtTargetEnum.getOpponentSide();
+        expect(positions[0]).toBe(CourtTargetEnum.OPPONENT_RIGHT_BACK);
+        expect(positions[1]).toBe(CourtTargetEnum.OPPONENT_RIGHT_FRONT);
+        expect(positions[2]).toBe(CourtTargetEnum.OPPONENT_MIDDLE_FRONT);
+        expect(positions[3]).toBe(CourtTargetEnum.OPPONENT_LEFT_FRONT);
+        expect(positions[4]).toBe(CourtTargetEnum.OPPONENT_LEFT_BACK);
+        expect(positions[5]).toBe(CourtTargetEnum.OPPONENT_MIDDLE_BACK);
     });
 });

package/dist/esm/src/service/match/index.d.ts

@@ -1,8 +1,7 @@
-import { Match } from './match';
-import { MatchRating } from './match-rating';
-import { EventStat, MatchSet, MatchSetState, SetStatistics } from './match-set';
-import { PlayerPosition, Rally, RallyState } from './rally';
-import { CourtPosition, CourtRow } from './court-position';
-import { CourtTarget } from './court-target';
-import { MatchTeam } from './match-team';
-export { CourtPosition, CourtRow, CourtTarget, EventStat, Match, MatchSet, MatchRating, MatchSetState, MatchTeam, PlayerPosition, Rally, RallyState, SetStatistics, };
+export * from './match';
+export * from './match-rating';
+export * from './match-set';
+export * from './rally';
+export * from './court-position';
+export * from './court-target-enum';
+export * from './match-team';

package/dist/esm/src/service/match/index.js

@@ -1,8 +1,7 @@
-import { Match } from './match';
-import { MatchRating } from './match-rating';
-import { MatchSet, MatchSetState } from './match-set';
-import { Rally, RallyState } from './rally';
-import { CourtPosition, CourtRow } from './court-position';
-import { CourtTarget } from './court-target';
-import { MatchTeam } from './match-team';
-export { CourtPosition, CourtRow, CourtTarget, Match, MatchSet, MatchRating, MatchSetState, MatchTeam, Rally, RallyState, };
+export * from './match';
+export * from './match-rating';
+export * from './match-set';
+export * from './rally';
+export * from './court-position';
+export * from './court-target-enum';
+export * from './match-team';

package/dist/esm/src/service/match/rally.js

@@ -1,5 +1,5 @@
 import { validateUUID } from '../utils';
-import { EventType } from '../event/rally-event';
+import { EventTypeEnum } from '../event/rally-event';
 export var RallyState;
 (function (RallyState) {
     RallyState[RallyState["NEW"] = 0] = "NEW";
@@ -33,7 +33,7 @@ export class Rally {
         return this._state;
     }
     get score() {
-        return this.events.find(e => e.eventType === EventType.SCORE);
+        return this.events.find(e => e.eventType === EventTypeEnum.SCORE);
     }
     isOver() {
         return this._state === RallyState.FINISHED;

package/dist/esm/src/service/match/rally.test.js

@@ -1,7 +1,7 @@
 import { describe, expect, test } from '@jest/globals';
 import { Rally, RallyState } from './rally';
 import { score, serve } from '../event/__stubs__';
-import { EventType } from '../event/rally-event';
+import { EventTypeEnum } from '../event/rally-event';
 import { team } from '../team/__stubs__';
 describe('Rally Test Module', () => {
     let rally;
@@ -44,7 +44,7 @@ describe('Rally Test Module', () => {
     test('Should add event to event array', () => {
         expect(rally.events.length).toBe(0);
         rally.addEvent(serve);
-        expect(rally.events.at(-1)?.eventType).toBe(EventType.SERVE);
+        expect(rally.events.at(-1)?.eventType).toBe(EventTypeEnum.SERVE);
     });
     // isOver Tests
     test('Should return false if rally state is not FINISHED', () => {
@@ -66,7 +66,7 @@ describe('Rally Test Module', () => {
     test('Should return Score if events array contains a Score', () => {
         rally.addEvent(score);
         expect(rally.score).not.toBeUndefined();
-        expect(rally.score?.eventType).toBe(EventType.SCORE);
+        expect(rally.score?.eventType).toBe(EventTypeEnum.SCORE);
     });
     // RallyState Tests
     test('Should get next state', () => {

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

@@ -1,6 +1,5 @@
-import { Name, Player, Stat } from './player';
-import { PerformanceStats } from './performance-stats';
-import { Role } from './role';
-import { Trait } from './trait';
-import { GeneralStat } from './stats';
-export { Player, PerformanceStats, GeneralStat, Name, Stat, Role, Trait };
+export * from './player';
+export * from './performance-stats';
+export * from './role';
+export * from './trait';
+export * from './stats';

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

@@ -1,6 +1,5 @@
-import { Player } from './player';
-import { PerformanceStats } from './performance-stats';
-import { Role } from './role';
-import { Trait } from './trait';
-import { GeneralStat } from './stats';
-export { Player, PerformanceStats, GeneralStat, Role, Trait };
+export * from './player';
+export * from './performance-stats';
+export * from './role';
+export * from './trait';
+export * from './stats';

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

@@ -1,13 +1,15 @@
 import { PerformanceStats } from './performance-stats';
-export declare enum Role {
-    SETTER = "Setter",
-    LIBERO = "Libero",
-    OUTSIDE_HITTER = "Outside Hitter",
-    OPPOSITE_HITTER = "Opposite Hitter",
-    MIDDLE_BLOCKER = "Middle Blocker",
-    DEFENSIVE_SPECIALIST = "Defensive Specialist"
-}
-export declare namespace Role {
-    function getRoles(): Role[];
-    function calculateScore(stats: PerformanceStats, role: Role): number;
+export declare class Role {
+    readonly name: string;
+    static readonly SETTER: Role;
+    static readonly LIBERO: Role;
+    static readonly OUTSIDE_HITTER: Role;
+    static readonly OPPOSITE_HITTER: Role;
+    static readonly MIDDLE_BLOCKER: Role;
+    static readonly DEFENSIVE_SPECIALIST: Role;
+    private static readonly ROLES;
+    private constructor();
+    static getRoles(): Role[];
+    static calculateScore(stats: PerformanceStats, role: Role): number;
+    static assignRoles(stats: PerformanceStats): Role[];
 }

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

@@ -1,28 +1,39 @@
 import roleWeights from '../../../data/role.formula.json';
-export var Role;
-(function (Role) {
-    Role["SETTER"] = "Setter";
-    Role["LIBERO"] = "Libero";
-    Role["OUTSIDE_HITTER"] = "Outside Hitter";
-    Role["OPPOSITE_HITTER"] = "Opposite Hitter";
-    Role["MIDDLE_BLOCKER"] = "Middle Blocker";
-    Role["DEFENSIVE_SPECIALIST"] = "Defensive Specialist";
-})(Role || (Role = {}));
-// eslint-disable-next-line @typescript-eslint/no-namespace
-(function (Role) {
-    const ROLES = [Role.LIBERO, Role.SETTER, Role.OPPOSITE_HITTER, Role.OUTSIDE_HITTER, Role.MIDDLE_BLOCKER,
-        Role.DEFENSIVE_SPECIALIST];
-    function getRoles() {
-        return [...ROLES];
+export class Role {
+    constructor(name) {
+        this.name = name;
     }
-    Role.getRoles = getRoles;
-    function calculateScore(stats, role) {
-        const weights = roleWeights.find(r => r.role === role);
+    static getRoles() {
+        return [...Role.ROLES];
+    }
+    static calculateScore(stats, role) {
+        const weights = roleWeights.find(r => r.role === role.name);
         if (weights == null)
             throw new Error('COULD_NOT_FIND_ROLE_WEIGHT');
         const score = Object.entries(weights.weight)
             .reduce((score, [key, value]) => score + (stats[key] * weights.weight[key]), 0);
         return Math.round(score);
     }
-    Role.calculateScore = calculateScore;
-})(Role || (Role = {}));
+    static assignRoles(stats) {
+        const scores = this.getRoles().map(role => ({
+            role,
+            score: this.calculateScore(stats, role)
+        })).sort((x, y) => y.score - x.score);
+        const out = [scores[0].role];
+        if (scores[1].score >= 60) {
+            out.push(scores[1].role);
+        }
+        if (scores[2].score >= 70) {
+            out.push(scores[2].role);
+        }
+        return out;
+    }
+}
+Role.SETTER = new Role('Setter');
+Role.LIBERO = new Role('Libero');
+Role.OUTSIDE_HITTER = new Role('Outside Hitter');
+Role.OPPOSITE_HITTER = new Role('Opposite Hitter');
+Role.MIDDLE_BLOCKER = new Role('Middle Blocker');
+Role.DEFENSIVE_SPECIALIST = new Role('Defensive Specialist');
+Role.ROLES = [Role.LIBERO, Role.SETTER, Role.OPPOSITE_HITTER, Role.OUTSIDE_HITTER, Role.MIDDLE_BLOCKER,
+    Role.DEFENSIVE_SPECIALIST];

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

@@ -37,15 +37,18 @@ export class Trait {
             .slice(0, traitCount);
     }
 }
+// A Setter gets a bonus to their score and the receiving attacker gets a bonus as well.
+// Stacks with attacker bonus
 Trait.MASTER_MIND = new Trait({
     name: 'Master Mind',
     roles: [Role.SETTER],
     modifier: 1.25,
-    chance: 0.15,
+    chance: 0.25,
     statThreshold: 80,
     stat: GeneralStat.ATTACK,
     weight: 10
 });
+// Will always participate in blocking regardless of chance
 Trait.MOVING_WALL = new Trait({
     name: 'Moving Wall',
     roles: [Role.MIDDLE_BLOCKER, Role.DEFENSIVE_SPECIALIST],
@@ -55,6 +58,7 @@ Trait.MOVING_WALL = new Trait({
     stat: GeneralStat.DEFENSE,
     weight: 5
 });
+// On attack, will always pick the worst receiver
 Trait.MARKSMAN = new Trait({
     name: 'Marksman',
     roles: [Role.OUTSIDE_HITTER, Role.OPPOSITE_HITTER, Role.SETTER],
@@ -64,15 +68,17 @@ Trait.MARKSMAN = new Trait({
     stat: GeneralStat.ATTACK,
     weight: 5
 });
+// Increases the score of the serve by 25% when serve type is Jumping.
 Trait.METEOR_SERVE = new Trait({
     name: 'Meteor Serve',
     roles: [Role.OUTSIDE_HITTER, Role.OPPOSITE_HITTER, Role.SETTER, Role.DEFENSIVE_SPECIALIST, Role.MIDDLE_BLOCKER],
-    modifier: 1.33,
-    chance: 0.25,
+    modifier: 1.25,
+    chance: 0.1,
     statThreshold: 75,
     stat: GeneralStat.SERVE,
     weight: 10
 });
+// Has a 50% chance of taking an action without decreasing energy.
 Trait.VIGOROUS = new Trait({
     name: 'Vigorous',
     roles: [],
@@ -82,12 +88,13 @@ Trait.VIGOROUS = new Trait({
     stat: GeneralStat.PHYSICAL,
     weight: 1
 });
+// Takes place of the receiver and increases reception score by 25%. Can only trigger in back-row.
 Trait.GUARDIAN = new Trait({
     name: 'Guardian',
     roles: [Role.DEFENSIVE_SPECIALIST, Role.LIBERO],
-    chance: 0.33,
+    chance: 0.25,
     statThreshold: 75,
-    modifier: 1.2,
+    modifier: 1.25,
     stat: GeneralStat.DEFENSE,
     weight: 10
 });

package/dist/esm/src/service/team/index.d.ts

@@ -1,2 +1 @@
-import { Team } from './team';
-export { Team };
+export * from './team';

package/dist/esm/src/service/team/index.js

@@ -1,2 +1 @@
-import { Team } from './team';
-export { Team };
+export * from './team';

package/package.json

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

package/dist/cjs/src/service/match/court-target.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CourtTarget = void 0;
-var CourtTarget;
-(function (CourtTarget) {
-    CourtTarget[CourtTarget["NO_TARGET"] = 0] = "NO_TARGET";
-    CourtTarget[CourtTarget["OPPONENT_RIGHT_BACK"] = 7] = "OPPONENT_RIGHT_BACK";
-    CourtTarget[CourtTarget["OPPONENT_MIDDLE_BACK"] = 12] = "OPPONENT_MIDDLE_BACK";
-    CourtTarget[CourtTarget["OPPONENT_LEFT_BACK"] = 11] = "OPPONENT_LEFT_BACK";
-    CourtTarget[CourtTarget["OPPONENT_RIGHT_FRONT"] = 8] = "OPPONENT_RIGHT_FRONT";
-    CourtTarget[CourtTarget["OPPONENT_MIDDLE_FRONT"] = 9] = "OPPONENT_MIDDLE_FRONT";
-    CourtTarget[CourtTarget["OPPONENT_LEFT_FRONT"] = 10] = "OPPONENT_LEFT_FRONT";
-    // --------------------------------------------------------------------------------
-    CourtTarget[CourtTarget["TEAM_LEFT_FRONT"] = 4] = "TEAM_LEFT_FRONT";
-    CourtTarget[CourtTarget["TEAM_MIDDLE_FRONT"] = 3] = "TEAM_MIDDLE_FRONT";
-    CourtTarget[CourtTarget["TEAM_RIGHT_FRONT"] = 2] = "TEAM_RIGHT_FRONT";
-    CourtTarget[CourtTarget["TEAM_LEFT_BACK"] = 5] = "TEAM_LEFT_BACK";
-    CourtTarget[CourtTarget["TEAM_MIDDLE_BACK"] = 6] = "TEAM_MIDDLE_BACK";
-    CourtTarget[CourtTarget["TEAM_RIGHT_BACK"] = 1] = "TEAM_RIGHT_BACK";
-})(CourtTarget = exports.CourtTarget || (exports.CourtTarget = {}));
-// eslint-disable-next-line @typescript-eslint/no-namespace
-(function (CourtTarget) {
-    function getTeamSide() {
-        return [CourtTarget.TEAM_RIGHT_BACK, CourtTarget.TEAM_RIGHT_FRONT, CourtTarget.TEAM_MIDDLE_FRONT,
-            CourtTarget.TEAM_LEFT_FRONT, CourtTarget.TEAM_LEFT_BACK, CourtTarget.TEAM_MIDDLE_BACK];
-    }
-    CourtTarget.getTeamSide = getTeamSide;
-    function getOpponentSide() {
-        return [CourtTarget.OPPONENT_RIGHT_BACK, CourtTarget.OPPONENT_RIGHT_FRONT, CourtTarget.OPPONENT_MIDDLE_FRONT,
-            CourtTarget.OPPONENT_LEFT_FRONT, CourtTarget.OPPONENT_LEFT_BACK, CourtTarget.OPPONENT_MIDDLE_BACK];
-    }
-    CourtTarget.getOpponentSide = getOpponentSide;
-    function getSidePosition(position) {
-        if (position < 1 || position > 12)
-            throw new Error('POSITION_INDEX_OUT_OF_BOUNDS');
-        if (position > 6)
-            return position - 6;
-        else
-            return position;
-    }
-    CourtTarget.getSidePosition = getSidePosition;
-})(CourtTarget = exports.CourtTarget || (exports.CourtTarget = {}));

package/dist/esm/src/service/match/court-target.js

@@ -1,39 +0,0 @@
-export var CourtTarget;
-(function (CourtTarget) {
-    CourtTarget[CourtTarget["NO_TARGET"] = 0] = "NO_TARGET";
-    CourtTarget[CourtTarget["OPPONENT_RIGHT_BACK"] = 7] = "OPPONENT_RIGHT_BACK";
-    CourtTarget[CourtTarget["OPPONENT_MIDDLE_BACK"] = 12] = "OPPONENT_MIDDLE_BACK";
-    CourtTarget[CourtTarget["OPPONENT_LEFT_BACK"] = 11] = "OPPONENT_LEFT_BACK";
-    CourtTarget[CourtTarget["OPPONENT_RIGHT_FRONT"] = 8] = "OPPONENT_RIGHT_FRONT";
-    CourtTarget[CourtTarget["OPPONENT_MIDDLE_FRONT"] = 9] = "OPPONENT_MIDDLE_FRONT";
-    CourtTarget[CourtTarget["OPPONENT_LEFT_FRONT"] = 10] = "OPPONENT_LEFT_FRONT";
-    // --------------------------------------------------------------------------------
-    CourtTarget[CourtTarget["TEAM_LEFT_FRONT"] = 4] = "TEAM_LEFT_FRONT";
-    CourtTarget[CourtTarget["TEAM_MIDDLE_FRONT"] = 3] = "TEAM_MIDDLE_FRONT";
-    CourtTarget[CourtTarget["TEAM_RIGHT_FRONT"] = 2] = "TEAM_RIGHT_FRONT";
-    CourtTarget[CourtTarget["TEAM_LEFT_BACK"] = 5] = "TEAM_LEFT_BACK";
-    CourtTarget[CourtTarget["TEAM_MIDDLE_BACK"] = 6] = "TEAM_MIDDLE_BACK";
-    CourtTarget[CourtTarget["TEAM_RIGHT_BACK"] = 1] = "TEAM_RIGHT_BACK";
-})(CourtTarget || (CourtTarget = {}));
-// eslint-disable-next-line @typescript-eslint/no-namespace
-(function (CourtTarget) {
-    function getTeamSide() {
-        return [CourtTarget.TEAM_RIGHT_BACK, CourtTarget.TEAM_RIGHT_FRONT, CourtTarget.TEAM_MIDDLE_FRONT,
-            CourtTarget.TEAM_LEFT_FRONT, CourtTarget.TEAM_LEFT_BACK, CourtTarget.TEAM_MIDDLE_BACK];
-    }
-    CourtTarget.getTeamSide = getTeamSide;
-    function getOpponentSide() {
-        return [CourtTarget.OPPONENT_RIGHT_BACK, CourtTarget.OPPONENT_RIGHT_FRONT, CourtTarget.OPPONENT_MIDDLE_FRONT,
-            CourtTarget.OPPONENT_LEFT_FRONT, CourtTarget.OPPONENT_LEFT_BACK, CourtTarget.OPPONENT_MIDDLE_BACK];
-    }
-    CourtTarget.getOpponentSide = getOpponentSide;
-    function getSidePosition(position) {
-        if (position < 1 || position > 12)
-            throw new Error('POSITION_INDEX_OUT_OF_BOUNDS');
-        if (position > 6)
-            return position - 6;
-        else
-            return position;
-    }
-    CourtTarget.getSidePosition = getSidePosition;
-})(CourtTarget || (CourtTarget = {}));