volleyballsimtypes 0.0.79 → 0.0.81

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

@@ -1,5 +1,5 @@
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
-import { Player } from '../player';
+import { Player, Trait } from '../player';
 export declare enum BlockFailureEnum {
     NO_FAILURE = 0,
     FAULT = 1,
@@ -24,6 +24,6 @@ export declare class Block extends InPlayEvent {
     readonly type: BlockTypeEnum;
     readonly blockers: Player[];
     constructor({ id, order, score, player, target, failure, type, modifier, eventType, blockers, activeTraits }: BlockOpts);
-    static getScore(blockers: Player[], modifier: number): number;
+    static getScore(blockers: Player[], modifier: number, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Block = exports.BlockTypeEnum = exports.BlockFailureEnum = void 0;
 const in_play_event_1 = require("./in-play-event");
+const player_1 = require("../player");
 var BlockFailureEnum;
 (function (BlockFailureEnum) {
     BlockFailureEnum[BlockFailureEnum["NO_FAILURE"] = 0] = "NO_FAILURE";
@@ -25,7 +26,7 @@ class Block extends in_play_event_1.InPlayEvent {
         this.failure = failure;
         this.blockers = blockers;
     }
-    static getScore(blockers, modifier) {
+    static getScore(blockers, modifier, activeTraits) {
         const type = blockers.length;
         if (blockers.length > 3)
             throw new Error('UNKNOWN_TYPE');
@@ -49,7 +50,16 @@ class Block extends in_play_event_1.InPlayEvent {
             return score + Block.calculateScore(player.stats, 'BLOCK', BlockTypeEnum[type]);
         }, 0);
         const avg = total / blockers.length;
-        return avg * bmod * modifier;
+        let score = avg * bmod * modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === player_1.Trait.MOVING_WALL: {
+                    score *= player_1.Trait.MOVING_WALL.modifier;
+                    break;
+                }
+            }
+        }
+        return score;
     }
 }
 exports.Block = Block;

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

@@ -23,7 +23,7 @@ const uuid_1 = require("uuid");
             eventType: rally_event_1.EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [],
-            score: block_1.Block.getScore([], 1),
+            score: block_1.Block.getScore([], 1, []),
             activeTraits: []
         });
         block = new block_1.Block({
@@ -36,7 +36,7 @@ const uuid_1 = require("uuid");
             eventType: rally_event_1.EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [__stubs__1.player],
-            score: block_1.Block.getScore([__stubs__1.player], 1),
+            score: block_1.Block.getScore([__stubs__1.player], 1, []),
             activeTraits: []
         });
         double = new block_1.Block({
@@ -49,7 +49,7 @@ const uuid_1 = require("uuid");
             eventType: rally_event_1.EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [__stubs__1.player, __stubs__1.player],
-            score: block_1.Block.getScore([__stubs__1.player, __stubs__1.player], 1),
+            score: block_1.Block.getScore([__stubs__1.player, __stubs__1.player], 1, []),
             activeTraits: []
         });
         triple = new block_1.Block({
@@ -62,7 +62,7 @@ const uuid_1 = require("uuid");
             eventType: rally_event_1.EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [__stubs__1.player, __stubs__1.player, __stubs__1.player],
-            score: block_1.Block.getScore([__stubs__1.player, __stubs__1.player, __stubs__1.player], 1),
+            score: block_1.Block.getScore([__stubs__1.player, __stubs__1.player, __stubs__1.player], 1, []),
             activeTraits: []
         });
         failed = new block_1.Block({
@@ -75,7 +75,7 @@ const uuid_1 = require("uuid");
             eventType: rally_event_1.EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [__stubs__1.player],
-            score: block_1.Block.getScore([__stubs__1.player], 1),
+            score: block_1.Block.getScore([__stubs__1.player], 1, []),
             activeTraits: []
         });
     });
@@ -97,7 +97,7 @@ const uuid_1 = require("uuid");
         (0, globals_1.expect)(failed.score).toBe(7);
     });
     (0, globals_1.test)('Should throw Error when getting score with invalid amount of blockers', () => {
-        function score() { block_1.Block.getScore([__stubs__1.player, __stubs__1.player, __stubs__1.player, __stubs__1.player, __stubs__1.player], 1); }
+        function score() { block_1.Block.getScore([__stubs__1.player, __stubs__1.player, __stubs__1.player, __stubs__1.player, __stubs__1.player], 1, []); }
         (0, globals_1.expect)(score).toThrow(/^UNKNOWN_TYPE$/);
     });
 });

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

@@ -1,4 +1,4 @@
-import { PerformanceStats } from '../player';
+import { PerformanceStats, Trait } from '../player';
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
 export declare enum ReceptionTypeEnum {
     DIG = 0,
@@ -21,6 +21,6 @@ export declare class Reception extends InPlayEvent {
     readonly failure: ReceptionFailureEnum;
     readonly type: ReceptionTypeEnum;
     constructor({ id, order, score, player, target, failure, type, eventType, modifier, activeTraits }: ReceptionOpts);
-    static getScore(stats: PerformanceStats, type: ReceptionTypeEnum, modifier: number): number;
+    static getScore(stats: PerformanceStats, type: ReceptionTypeEnum, modifier: number, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Reception = exports.ReceptionFailureEnum = exports.ReceptionTypeEnum = void 0;
+const player_1 = require("../player");
 const in_play_event_1 = require("./in-play-event");
 var ReceptionTypeEnum;
 (function (ReceptionTypeEnum) {
@@ -23,8 +24,17 @@ class Reception extends in_play_event_1.InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    static getScore(stats, type, modifier) {
-        return Reception.calculateScore(stats, 'RECEPTION', ReceptionTypeEnum[type]) * modifier;
+    static getScore(stats, type, modifier, activeTraits) {
+        let score = Reception.calculateScore(stats, 'RECEPTION', ReceptionTypeEnum[type]) * modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === player_1.Trait.GUARDIAN: {
+                    score *= player_1.Trait.GUARDIAN.modifier;
+                    break;
+                }
+            }
+        }
+        return score;
     }
 }
 exports.Reception = Reception;

package/dist/cjs/src/service/event/reception.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 Reception types', () => {
-        (0, globals_1.expect)(reception_1.Reception.getScore(reception.player.stats, reception.type, 1)).toBe(4);
-        (0, globals_1.expect)(reception_1.Reception.getScore(failed.player.stats, failed.type, 1)).toBe(3);
+        (0, globals_1.expect)(reception_1.Reception.getScore(reception.player.stats, reception.type, 1, [])).toBe(4);
+        (0, globals_1.expect)(reception_1.Reception.getScore(failed.player.stats, failed.type, 1, [])).toBe(3);
     });
 });

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

@@ -31,6 +31,7 @@ class Serve extends in_play_event_1.InPlayEvent {
             switch (true) {
                 case trait === player_1.Trait.METEOR_SERVE: {
                     score *= player_1.Trait.METEOR_SERVE.modifier;
+                    break;
                 }
             }
         }

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

@@ -1,4 +1,4 @@
-import { PerformanceStats } from '../player';
+import { PerformanceStats, Trait } from '../player';
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
 export declare enum SetTypeEnum {
     OVERHAND = 0,
@@ -21,6 +21,6 @@ export declare class Set extends InPlayEvent {
     readonly failure: SetFailureEnum;
     readonly type: SetTypeEnum;
     constructor({ id, order, score, player, target, failure, type, eventType, modifier, activeTraits }: SetOpts);
-    static getScore(stats: PerformanceStats, type: SetTypeEnum, modifier: number): number;
+    static getScore(stats: PerformanceStats, type: SetTypeEnum, modifier: number, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Set = exports.SetFailureEnum = exports.SetTypeEnum = void 0;
+const player_1 = require("../player");
 const in_play_event_1 = require("./in-play-event");
 var SetTypeEnum;
 (function (SetTypeEnum) {
@@ -23,8 +24,22 @@ class Set extends in_play_event_1.InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    static getScore(stats, type, modifier) {
-        return Set.calculateScore(stats, 'SET', SetTypeEnum[type]) * modifier;
+    static getScore(stats, type, modifier, activeTraits) {
+        let score = Set.calculateScore(stats, 'SET', SetTypeEnum[type]) * modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === player_1.Trait.MASTER_MIND: {
+                    score *= player_1.Trait.MASTER_MIND.modifier;
+                    break;
+                }
+                case trait === player_1.Trait.MARKSMAN: {
+                    if ([SetTypeEnum.DUMP, SetTypeEnum.SPIKE].includes(type))
+                        score *= player_1.Trait.MARKSMAN.modifier;
+                    break;
+                }
+            }
+        }
+        return score;
     }
 }
 exports.Set = Set;

package/dist/cjs/src/service/event/set.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 Set types', () => {
-        (0, globals_1.expect)(set_1.Set.getScore(set.player.stats, set.type, 1)).toBe(3);
-        (0, globals_1.expect)(set_1.Set.getScore(failed.player.stats, failed.type, 1)).toBe(6);
+        (0, globals_1.expect)(set_1.Set.getScore(set.player.stats, set.type, 1, [])).toBe(3);
+        (0, globals_1.expect)(set_1.Set.getScore(failed.player.stats, failed.type, 1, [])).toBe(6);
     });
 });

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

@@ -1,5 +1,5 @@
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
-import { Player } from '../player';
+import { Player, Trait } from '../player';
 export declare enum SpikeTypeEnum {
     CROSS_SHOT = 0,
     LINE_SHOT = 1,
@@ -23,6 +23,6 @@ export declare class Spike extends InPlayEvent {
     readonly failure: SpikeFailureEnum;
     readonly type: SpikeTypeEnum;
     constructor({ id, order, score, player, target, failure, type, eventType, modifier, activeTraits }: SpikeOpts);
-    static getScore(player: Player, type: SpikeTypeEnum, modifier: number, isBackRow: boolean): number;
+    static getScore(player: Player, type: SpikeTypeEnum, modifier: number, isBackRow: boolean, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Spike = exports.SpikeFailureEnum = exports.SpikeTypeEnum = void 0;
 const in_play_event_1 = require("./in-play-event");
+const player_1 = require("../player");
 var SpikeTypeEnum;
 (function (SpikeTypeEnum) {
     SpikeTypeEnum[SpikeTypeEnum["CROSS_SHOT"] = 0] = "CROSS_SHOT";
@@ -25,12 +26,25 @@ class Spike extends in_play_event_1.InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    static getScore(player, type, modifier, isBackRow) {
+    static getScore(player, type, modifier, isBackRow, activeTraits) {
         let score = Spike.calculateScore(player.stats, 'SPIKE', SpikeTypeEnum[type]);
         if (![SpikeTypeEnum.DOWN_BALL, SpikeTypeEnum.OVERHAND, SpikeTypeEnum.TIP].includes(type) && isBackRow) {
             score = score * 0.7 + player.stats.backAttack * 0.3;
         }
-        return score * modifier;
+        score *= modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === player_1.Trait.MASTER_MIND: {
+                    score *= player_1.Trait.MASTER_MIND.modifier;
+                    break;
+                }
+                case trait === player_1.Trait.MARKSMAN: {
+                    score *= player_1.Trait.MARKSMAN.modifier;
+                    break;
+                }
+            }
+        }
+        return score;
     }
 }
 exports.Spike = Spike;

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

@@ -20,7 +20,7 @@ const uuid_1 = require("uuid");
             type: spike_1.SpikeTypeEnum.CROSS_SHOT,
             eventType: rally_event_1.EventTypeEnum.SPIKE,
             modifier: 1,
-            score: spike_1.Spike.getScore(__stubs__1.player, spike_1.SpikeTypeEnum.CROSS_SHOT, 1, false),
+            score: spike_1.Spike.getScore(__stubs__1.player, spike_1.SpikeTypeEnum.CROSS_SHOT, 1, false, []),
             activeTraits: []
         });
         failed = new spike_1.Spike({
@@ -32,7 +32,7 @@ const uuid_1 = require("uuid");
             type: spike_1.SpikeTypeEnum.TIP,
             eventType: rally_event_1.EventTypeEnum.SPIKE,
             modifier: 1,
-            score: spike_1.Spike.getScore(__stubs__1.player, spike_1.SpikeTypeEnum.TIP, 1, false),
+            score: spike_1.Spike.getScore(__stubs__1.player, spike_1.SpikeTypeEnum.TIP, 1, false, []),
             activeTraits: []
         });
         backAttack = new spike_1.Spike({
@@ -44,7 +44,7 @@ const uuid_1 = require("uuid");
             type: spike_1.SpikeTypeEnum.CROSS_SHOT,
             eventType: rally_event_1.EventTypeEnum.SPIKE,
             modifier: 1,
-            score: spike_1.Spike.getScore(__stubs__1.player, spike_1.SpikeTypeEnum.CROSS_SHOT, 1, true),
+            score: spike_1.Spike.getScore(__stubs__1.player, spike_1.SpikeTypeEnum.CROSS_SHOT, 1, true, []),
             activeTraits: []
         });
     });

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

@@ -26,7 +26,7 @@ class Role {
             score: this.calculateScore(stats, role)
         })).sort((x, y) => y.score - x.score);
         const out = [scores[0].role];
-        if (scores[1].score >= 60) {
+        if (scores[1].score >= 65) {
             out.push(scores[1].role);
         }
         if (scores[2].score >= 70) {

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

@@ -47,27 +47,27 @@ Trait.MASTER_MIND = new Trait({
     name: 'Master Mind',
     roles: [role_1.Role.SETTER],
     modifier: 1.25,
-    chance: 0.25,
+    chance: 0.2,
     statThreshold: 80,
     stat: stats_1.GeneralStat.ATTACK,
     weight: 10
 });
-// Will always participate in blocking regardless of chance
+// Will always participate in blocking regardless of chance and adds
 Trait.MOVING_WALL = new Trait({
     name: 'Moving Wall',
     roles: [role_1.Role.MIDDLE_BLOCKER, role_1.Role.DEFENSIVE_SPECIALIST],
-    modifier: 1,
+    modifier: 1.1,
     chance: 1,
     statThreshold: 75,
     stat: stats_1.GeneralStat.DEFENSE,
     weight: 5
 });
-// On attack, will always pick the worst receiver
+// On attack, will always pick the worst receiver and adds a 10% to score
 Trait.MARKSMAN = new Trait({
     name: 'Marksman',
     roles: [role_1.Role.OUTSIDE_HITTER, role_1.Role.OPPOSITE_HITTER, role_1.Role.SETTER],
-    modifier: 1,
-    chance: 0.33,
+    modifier: 1.1,
+    chance: 0.3,
     statThreshold: 75,
     stat: stats_1.GeneralStat.ATTACK,
     weight: 5
@@ -75,7 +75,7 @@ Trait.MARKSMAN = new Trait({
 // Increases the score of the serve by 25% when serve type is Jumping.
 Trait.METEOR_SERVE = new Trait({
     name: 'Meteor Serve',
-    roles: [role_1.Role.OUTSIDE_HITTER, role_1.Role.OPPOSITE_HITTER, role_1.Role.SETTER, role_1.Role.DEFENSIVE_SPECIALIST, role_1.Role.MIDDLE_BLOCKER],
+    roles: [],
     modifier: 1.25,
     chance: 0.1,
     statThreshold: 75,

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

@@ -1,5 +1,5 @@
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
-import { Player } from '../player';
+import { Player, Trait } from '../player';
 export declare enum BlockFailureEnum {
     NO_FAILURE = 0,
     FAULT = 1,
@@ -24,6 +24,6 @@ export declare class Block extends InPlayEvent {
     readonly type: BlockTypeEnum;
     readonly blockers: Player[];
     constructor({ id, order, score, player, target, failure, type, modifier, eventType, blockers, activeTraits }: BlockOpts);
-    static getScore(blockers: Player[], modifier: number): number;
+    static getScore(blockers: Player[], modifier: number, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -1,4 +1,5 @@
 import { InPlayEvent } from './in-play-event';
+import { Trait } from '../player';
 export var BlockFailureEnum;
 (function (BlockFailureEnum) {
     BlockFailureEnum[BlockFailureEnum["NO_FAILURE"] = 0] = "NO_FAILURE";
@@ -22,7 +23,7 @@ export class Block extends InPlayEvent {
         this.failure = failure;
         this.blockers = blockers;
     }
-    static getScore(blockers, modifier) {
+    static getScore(blockers, modifier, activeTraits) {
         const type = blockers.length;
         if (blockers.length > 3)
             throw new Error('UNKNOWN_TYPE');
@@ -46,6 +47,15 @@ export class Block extends InPlayEvent {
             return score + Block.calculateScore(player.stats, 'BLOCK', BlockTypeEnum[type]);
         }, 0);
         const avg = total / blockers.length;
-        return avg * bmod * modifier;
+        let score = avg * bmod * modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === Trait.MOVING_WALL: {
+                    score *= Trait.MOVING_WALL.modifier;
+                    break;
+                }
+            }
+        }
+        return score;
     }
 }

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

@@ -21,7 +21,7 @@ describe('Block Test Module', () => {
             eventType: EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [],
-            score: Block.getScore([], 1),
+            score: Block.getScore([], 1, []),
             activeTraits: []
         });
         block = new Block({
@@ -34,7 +34,7 @@ describe('Block Test Module', () => {
             eventType: EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [player],
-            score: Block.getScore([player], 1),
+            score: Block.getScore([player], 1, []),
             activeTraits: []
         });
         double = new Block({
@@ -47,7 +47,7 @@ describe('Block Test Module', () => {
             eventType: EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [player, player],
-            score: Block.getScore([player, player], 1),
+            score: Block.getScore([player, player], 1, []),
             activeTraits: []
         });
         triple = new Block({
@@ -60,7 +60,7 @@ describe('Block Test Module', () => {
             eventType: EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [player, player, player],
-            score: Block.getScore([player, player, player], 1),
+            score: Block.getScore([player, player, player], 1, []),
             activeTraits: []
         });
         failed = new Block({
@@ -73,7 +73,7 @@ describe('Block Test Module', () => {
             eventType: EventTypeEnum.BLOCK,
             modifier: 1,
             blockers: [player],
-            score: Block.getScore([player], 1),
+            score: Block.getScore([player], 1, []),
             activeTraits: []
         });
     });
@@ -95,7 +95,7 @@ describe('Block Test Module', () => {
         expect(failed.score).toBe(7);
     });
     test('Should throw Error when getting score with invalid amount of blockers', () => {
-        function score() { Block.getScore([player, player, player, player, player], 1); }
+        function score() { Block.getScore([player, player, player, player, player], 1, []); }
         expect(score).toThrow(/^UNKNOWN_TYPE$/);
     });
 });

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

@@ -1,4 +1,4 @@
-import { PerformanceStats } from '../player';
+import { PerformanceStats, Trait } from '../player';
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
 export declare enum ReceptionTypeEnum {
     DIG = 0,
@@ -21,6 +21,6 @@ export declare class Reception extends InPlayEvent {
     readonly failure: ReceptionFailureEnum;
     readonly type: ReceptionTypeEnum;
     constructor({ id, order, score, player, target, failure, type, eventType, modifier, activeTraits }: ReceptionOpts);
-    static getScore(stats: PerformanceStats, type: ReceptionTypeEnum, modifier: number): number;
+    static getScore(stats: PerformanceStats, type: ReceptionTypeEnum, modifier: number, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -1,3 +1,4 @@
+import { Trait } from '../player';
 import { InPlayEvent } from './in-play-event';
 export var ReceptionTypeEnum;
 (function (ReceptionTypeEnum) {
@@ -20,7 +21,16 @@ export class Reception extends InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    static getScore(stats, type, modifier) {
-        return Reception.calculateScore(stats, 'RECEPTION', ReceptionTypeEnum[type]) * modifier;
+    static getScore(stats, type, modifier, activeTraits) {
+        let score = Reception.calculateScore(stats, 'RECEPTION', ReceptionTypeEnum[type]) * modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === Trait.GUARDIAN: {
+                    score *= Trait.GUARDIAN.modifier;
+                    break;
+                }
+            }
+        }
+        return score;
     }
 }

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

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

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

@@ -28,6 +28,7 @@ export class Serve extends InPlayEvent {
             switch (true) {
                 case trait === Trait.METEOR_SERVE: {
                     score *= Trait.METEOR_SERVE.modifier;
+                    break;
                 }
             }
         }

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

@@ -1,4 +1,4 @@
-import { PerformanceStats } from '../player';
+import { PerformanceStats, Trait } from '../player';
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
 export declare enum SetTypeEnum {
     OVERHAND = 0,
@@ -21,6 +21,6 @@ export declare class Set extends InPlayEvent {
     readonly failure: SetFailureEnum;
     readonly type: SetTypeEnum;
     constructor({ id, order, score, player, target, failure, type, eventType, modifier, activeTraits }: SetOpts);
-    static getScore(stats: PerformanceStats, type: SetTypeEnum, modifier: number): number;
+    static getScore(stats: PerformanceStats, type: SetTypeEnum, modifier: number, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -1,3 +1,4 @@
+import { Trait } from '../player';
 import { InPlayEvent } from './in-play-event';
 export var SetTypeEnum;
 (function (SetTypeEnum) {
@@ -20,7 +21,21 @@ export class Set extends InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    static getScore(stats, type, modifier) {
-        return Set.calculateScore(stats, 'SET', SetTypeEnum[type]) * modifier;
+    static getScore(stats, type, modifier, activeTraits) {
+        let score = Set.calculateScore(stats, 'SET', SetTypeEnum[type]) * modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === Trait.MASTER_MIND: {
+                    score *= Trait.MASTER_MIND.modifier;
+                    break;
+                }
+                case trait === Trait.MARKSMAN: {
+                    if ([SetTypeEnum.DUMP, SetTypeEnum.SPIKE].includes(type))
+                        score *= Trait.MARKSMAN.modifier;
+                    break;
+                }
+            }
+        }
+        return score;
     }
 }

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

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

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

@@ -1,5 +1,5 @@
 import { InPlayEvent, InPlayEventOpts } from './in-play-event';
-import { Player } from '../player';
+import { Player, Trait } from '../player';
 export declare enum SpikeTypeEnum {
     CROSS_SHOT = 0,
     LINE_SHOT = 1,
@@ -23,6 +23,6 @@ export declare class Spike extends InPlayEvent {
     readonly failure: SpikeFailureEnum;
     readonly type: SpikeTypeEnum;
     constructor({ id, order, score, player, target, failure, type, eventType, modifier, activeTraits }: SpikeOpts);
-    static getScore(player: Player, type: SpikeTypeEnum, modifier: number, isBackRow: boolean): number;
+    static getScore(player: Player, type: SpikeTypeEnum, modifier: number, isBackRow: boolean, activeTraits: Trait[]): number;
 }
 export {};

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

@@ -1,4 +1,5 @@
 import { InPlayEvent } from './in-play-event';
+import { Trait } from '../player';
 export var SpikeTypeEnum;
 (function (SpikeTypeEnum) {
     SpikeTypeEnum[SpikeTypeEnum["CROSS_SHOT"] = 0] = "CROSS_SHOT";
@@ -22,11 +23,24 @@ export class Spike extends InPlayEvent {
         this.type = type;
         this.failure = failure;
     }
-    static getScore(player, type, modifier, isBackRow) {
+    static getScore(player, type, modifier, isBackRow, activeTraits) {
         let score = Spike.calculateScore(player.stats, 'SPIKE', SpikeTypeEnum[type]);
         if (![SpikeTypeEnum.DOWN_BALL, SpikeTypeEnum.OVERHAND, SpikeTypeEnum.TIP].includes(type) && isBackRow) {
             score = score * 0.7 + player.stats.backAttack * 0.3;
         }
-        return score * modifier;
+        score *= modifier;
+        for (const trait of activeTraits) {
+            switch (true) {
+                case trait === Trait.MASTER_MIND: {
+                    score *= Trait.MASTER_MIND.modifier;
+                    break;
+                }
+                case trait === Trait.MARKSMAN: {
+                    score *= Trait.MARKSMAN.modifier;
+                    break;
+                }
+            }
+        }
+        return score;
     }
 }

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

@@ -18,7 +18,7 @@ describe('Spike Test Module', () => {
             type: SpikeTypeEnum.CROSS_SHOT,
             eventType: EventTypeEnum.SPIKE,
             modifier: 1,
-            score: Spike.getScore(player, SpikeTypeEnum.CROSS_SHOT, 1, false),
+            score: Spike.getScore(player, SpikeTypeEnum.CROSS_SHOT, 1, false, []),
             activeTraits: []
         });
         failed = new Spike({
@@ -30,7 +30,7 @@ describe('Spike Test Module', () => {
             type: SpikeTypeEnum.TIP,
             eventType: EventTypeEnum.SPIKE,
             modifier: 1,
-            score: Spike.getScore(player, SpikeTypeEnum.TIP, 1, false),
+            score: Spike.getScore(player, SpikeTypeEnum.TIP, 1, false, []),
             activeTraits: []
         });
         backAttack = new Spike({
@@ -42,7 +42,7 @@ describe('Spike Test Module', () => {
             type: SpikeTypeEnum.CROSS_SHOT,
             eventType: EventTypeEnum.SPIKE,
             modifier: 1,
-            score: Spike.getScore(player, SpikeTypeEnum.CROSS_SHOT, 1, true),
+            score: Spike.getScore(player, SpikeTypeEnum.CROSS_SHOT, 1, true, []),
             activeTraits: []
         });
     });

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

@@ -20,7 +20,7 @@ export class Role {
             score: this.calculateScore(stats, role)
         })).sort((x, y) => y.score - x.score);
         const out = [scores[0].role];
-        if (scores[1].score >= 60) {
+        if (scores[1].score >= 65) {
             out.push(scores[1].role);
         }
         if (scores[2].score >= 70) {

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

@@ -43,27 +43,27 @@ Trait.MASTER_MIND = new Trait({
     name: 'Master Mind',
     roles: [Role.SETTER],
     modifier: 1.25,
-    chance: 0.25,
+    chance: 0.2,
     statThreshold: 80,
     stat: GeneralStat.ATTACK,
     weight: 10
 });
-// Will always participate in blocking regardless of chance
+// Will always participate in blocking regardless of chance and adds
 Trait.MOVING_WALL = new Trait({
     name: 'Moving Wall',
     roles: [Role.MIDDLE_BLOCKER, Role.DEFENSIVE_SPECIALIST],
-    modifier: 1,
+    modifier: 1.1,
     chance: 1,
     statThreshold: 75,
     stat: GeneralStat.DEFENSE,
     weight: 5
 });
-// On attack, will always pick the worst receiver
+// On attack, will always pick the worst receiver and adds a 10% to score
 Trait.MARKSMAN = new Trait({
     name: 'Marksman',
     roles: [Role.OUTSIDE_HITTER, Role.OPPOSITE_HITTER, Role.SETTER],
-    modifier: 1,
-    chance: 0.33,
+    modifier: 1.1,
+    chance: 0.3,
     statThreshold: 75,
     stat: GeneralStat.ATTACK,
     weight: 5
@@ -71,7 +71,7 @@ Trait.MARKSMAN = new Trait({
 // 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],
+    roles: [],
     modifier: 1.25,
     chance: 0.1,
     statThreshold: 75,

package/package.json

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