volleyballsimtypes 0.0.77 → 0.0.79

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

@@ -1,13 +1,12 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { PlayerId, PlayerModel, RallyId, RallyModel, TraitType } from '.';
+import { PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface EventAttributes {
     event_id: string;
     rally_id: string;
     event_type: EventType;
     order: number;
     player_id: string;
-    active_traits: TraitType[];
 }
 export type EventType = 'LIBERO_REPLACEMENT' | 'SUBSTITUTION' | 'SERVE' | 'RECEPTION' | 'SET' | 'SPIKE' | 'BLOCK' | 'SCORE';
 export type CourtTarget = 'NO_TARGET' | 'OPPONENT_RIGHT_BACK' | 'OPPONENT_MIDDLE_BACK' | 'OPPONENT_LEFT_BACK' | 'OPPONENT_RIGHT_FRONT' | 'OPPONENT_MIDDLE_FRONT' | 'OPPONENT_LEFT_FRONT' | 'TEAM_LEFT_FRONT' | 'TEAM_MIDDLE_FRONT' | 'TEAM_RIGHT_FRONT' | 'TEAM_LEFT_BACK' | 'TEAM_MIDDLE_BACK' | 'TEAM_RIGHT_BACK';
@@ -20,7 +19,6 @@ export declare class EventModel extends Model<EventAttributes, EventCreationAttr
     event_type: EventType;
     order: number;
     player_id: string;
-    active_traits: TraitType[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

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

@@ -33,11 +33,6 @@ class EventModel extends sequelize_1.Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            active_traits: {
-                type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.ENUM('MARKSMAN', 'MOVING_WALL', 'MASTER_MIND', 'METEOR_SERVE', 'VIGOROUS', 'GUARDIAN')),
-                allowNull: false,
-                defaultValue: [[]]
             }
         }, {
             sequelize,

package/dist/cjs/src/service/event/serve.d.ts

@@ -1,5 +1,5 @@
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
-import { PerformanceStats } from '../player';
+import { PerformanceStats, Trait } from '../player';
 export declare enum ServeTypeEnum {
     UNDERHAND = 0,
     OVERHAND_TOPSPIN = 1,
@@ -22,6 +22,6 @@ export declare class Serve extends InPlayEvent {
     readonly failure: ServeFailureEnum;
     readonly type: ServeTypeEnum;
     constructor({ id, order, score, player, target, failure, type, eventType, modifier, activeTraits }: ServeOpts);
-    static getScore(stats: PerformanceStats, type: ServeTypeEnum, modifier: number): number;
+    static getScore(stats: PerformanceStats, type: ServeTypeEnum, modifier: number, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Serve = exports.ServeFailureEnum = exports.ServeTypeEnum = void 0;
 const in_play_event_1 = require("./in-play-event");
+const player_1 = require("../player");
 var ServeTypeEnum;
 (function (ServeTypeEnum) {
     ServeTypeEnum[ServeTypeEnum["UNDERHAND"] = 0] = "UNDERHAND";
@@ -24,8 +25,16 @@ class Serve extends in_play_event_1.InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    static getScore(stats, type, modifier) {
-        return Serve.calculateScore(stats, 'SERVE', ServeTypeEnum[type]) * modifier;
+    static getScore(stats, type, modifier, activeTraits) {
+        let score = Serve.calculateScore(stats, 'SERVE', ServeTypeEnum[type]) * modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === player_1.Trait.METEOR_SERVE: {
+                    score *= player_1.Trait.METEOR_SERVE.modifier;
+                }
+            }
+        }
+        return score;
     }
 }
 exports.Serve = Serve;

package/dist/cjs/src/service/event/serve.test.js

@@ -45,7 +45,7 @@ const rally_event_1 = require("./rally-event");
     });
     // getScore Tests
     (0, globals_1.test)('Should get the correct score for all Serve types', () => {
-        (0, globals_1.expect)(serve_1.Serve.getScore(serve.player.stats, serve.type, 1)).toBe(6);
-        (0, globals_1.expect)(serve_1.Serve.getScore(failed.player.stats, failed.type, 1)).toBe(3);
+        (0, globals_1.expect)(serve_1.Serve.getScore(serve.player.stats, serve.type, 1, [])).toBe(6);
+        (0, globals_1.expect)(serve_1.Serve.getScore(failed.player.stats, failed.type, 1, [])).toBe(3);
     });
 });

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

@@ -17,5 +17,5 @@ export declare class Trait {
     readonly weight: number;
     private constructor();
     static getTraits(): Trait[];
-    static assignTraitsToPlayer(roles: Role[], performanceStats: PerformanceStats): Trait[];
+    static assignTraits(roles: Role[], performanceStats: PerformanceStats): Trait[];
 }

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

@@ -16,7 +16,7 @@ class Trait {
     static getTraits() {
         return [Trait.GUARDIAN, Trait.MARKSMAN, Trait.METEOR_SERVE, Trait.VIGOROUS, Trait.MOVING_WALL, Trait.MASTER_MIND];
     }
-    static assignTraitsToPlayer(roles, performanceStats) {
+    static assignTraits(roles, performanceStats) {
         const qualifiedTraits = this.getTraits().filter(trait => {
             return (trait.roles.length < 1 || trait.roles.some(role => roles.includes(role))) &&
                 stats_1.GeneralStat.calculateScore(performanceStats, trait.stat) >= trait.statThreshold;
@@ -92,7 +92,7 @@ Trait.VIGOROUS = new Trait({
     stat: stats_1.GeneralStat.PHYSICAL,
     weight: 1
 });
-// Takes place of the receiver and increases reception score by 25%. Can only trigger in back-row.
+// Takes place of the receiver and increases reception score by 25%, guaranteeing success. Can only trigger in back-row.
 Trait.GUARDIAN = new Trait({
     name: 'Guardian',
     roles: [role_1.Role.DEFENSIVE_SPECIALIST, role_1.Role.LIBERO],

package/dist/esm/src/data/models/event.d.ts

@@ -1,13 +1,12 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { PlayerId, PlayerModel, RallyId, RallyModel, TraitType } from '.';
+import { PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface EventAttributes {
     event_id: string;
     rally_id: string;
     event_type: EventType;
     order: number;
     player_id: string;
-    active_traits: TraitType[];
 }
 export type EventType = 'LIBERO_REPLACEMENT' | 'SUBSTITUTION' | 'SERVE' | 'RECEPTION' | 'SET' | 'SPIKE' | 'BLOCK' | 'SCORE';
 export type CourtTarget = 'NO_TARGET' | 'OPPONENT_RIGHT_BACK' | 'OPPONENT_MIDDLE_BACK' | 'OPPONENT_LEFT_BACK' | 'OPPONENT_RIGHT_FRONT' | 'OPPONENT_MIDDLE_FRONT' | 'OPPONENT_LEFT_FRONT' | 'TEAM_LEFT_FRONT' | 'TEAM_MIDDLE_FRONT' | 'TEAM_RIGHT_FRONT' | 'TEAM_LEFT_BACK' | 'TEAM_MIDDLE_BACK' | 'TEAM_RIGHT_BACK';
@@ -20,7 +19,6 @@ export declare class EventModel extends Model<EventAttributes, EventCreationAttr
     event_type: EventType;
     order: number;
     player_id: string;
-    active_traits: TraitType[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

package/dist/esm/src/data/models/event.js

@@ -30,11 +30,6 @@ export class EventModel extends Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            active_traits: {
-                type: DataTypes.ARRAY(DataTypes.ENUM('MARKSMAN', 'MOVING_WALL', 'MASTER_MIND', 'METEOR_SERVE', 'VIGOROUS', 'GUARDIAN')),
-                allowNull: false,
-                defaultValue: [[]]
             }
         }, {
             sequelize,

package/dist/esm/src/service/event/serve.d.ts

@@ -1,5 +1,5 @@
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
-import { PerformanceStats } from '../player';
+import { PerformanceStats, Trait } from '../player';
 export declare enum ServeTypeEnum {
     UNDERHAND = 0,
     OVERHAND_TOPSPIN = 1,
@@ -22,6 +22,6 @@ export declare class Serve extends InPlayEvent {
     readonly failure: ServeFailureEnum;
     readonly type: ServeTypeEnum;
     constructor({ id, order, score, player, target, failure, type, eventType, modifier, activeTraits }: ServeOpts);
-    static getScore(stats: PerformanceStats, type: ServeTypeEnum, modifier: number): number;
+    static getScore(stats: PerformanceStats, type: ServeTypeEnum, modifier: number, activeTraits: Trait[]): number;
 }
 export {};

package/dist/esm/src/service/event/serve.js

@@ -1,4 +1,5 @@
 import { InPlayEvent } from './in-play-event';
+import { Trait } from '../player';
 export var ServeTypeEnum;
 (function (ServeTypeEnum) {
     ServeTypeEnum[ServeTypeEnum["UNDERHAND"] = 0] = "UNDERHAND";
@@ -21,7 +22,15 @@ export class Serve extends InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    static getScore(stats, type, modifier) {
-        return Serve.calculateScore(stats, 'SERVE', ServeTypeEnum[type]) * modifier;
+    static getScore(stats, type, modifier, activeTraits) {
+        let score = Serve.calculateScore(stats, 'SERVE', ServeTypeEnum[type]) * modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === Trait.METEOR_SERVE: {
+                    score *= Trait.METEOR_SERVE.modifier;
+                }
+            }
+        }
+        return score;
     }
 }

package/dist/esm/src/service/event/serve.test.js

@@ -43,7 +43,7 @@ describe('Serve Test Module', () => {
     });
     // getScore Tests
     test('Should get the correct score for all Serve types', () => {
-        expect(Serve.getScore(serve.player.stats, serve.type, 1)).toBe(6);
-        expect(Serve.getScore(failed.player.stats, failed.type, 1)).toBe(3);
+        expect(Serve.getScore(serve.player.stats, serve.type, 1, [])).toBe(6);
+        expect(Serve.getScore(failed.player.stats, failed.type, 1, [])).toBe(3);
     });
 });

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

@@ -17,5 +17,5 @@ export declare class Trait {
     readonly weight: number;
     private constructor();
     static getTraits(): Trait[];
-    static assignTraitsToPlayer(roles: Role[], performanceStats: PerformanceStats): Trait[];
+    static assignTraits(roles: Role[], performanceStats: PerformanceStats): Trait[];
 }

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

@@ -13,7 +13,7 @@ export class Trait {
     static getTraits() {
         return [Trait.GUARDIAN, Trait.MARKSMAN, Trait.METEOR_SERVE, Trait.VIGOROUS, Trait.MOVING_WALL, Trait.MASTER_MIND];
     }
-    static assignTraitsToPlayer(roles, performanceStats) {
+    static assignTraits(roles, performanceStats) {
         const qualifiedTraits = this.getTraits().filter(trait => {
             return (trait.roles.length < 1 || trait.roles.some(role => roles.includes(role))) &&
                 GeneralStat.calculateScore(performanceStats, trait.stat) >= trait.statThreshold;
@@ -88,7 +88,7 @@ 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.
+// Takes place of the receiver and increases reception score by 25%, guaranteeing success. Can only trigger in back-row.
 Trait.GUARDIAN = new Trait({
     name: 'Guardian',
     roles: [Role.DEFENSIVE_SPECIALIST, Role.LIBERO],

package/package.json

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