volleyballsimtypes 0.0.83 → 0.0.84

package/dist/esm/src/data/transformers/trait.js

@@ -1,27 +1,19 @@
 import { Trait } from '../../service';
-import { APITrait } from '../../api';
-function transformToType(trait) {
-    switch (trait.name) {
-        case 'Marksman':
-            return 'MARKSMAN';
-        case 'Master Mind':
-            return 'MASTER_MIND';
-        case 'Moving Wall':
-            return 'MOVING_WALL';
-        case 'Meteor Serve':
-            return 'METEOR_SERVE';
-        case 'Vigorous':
-            return 'VIGOROUS';
-        case 'Guardian':
-            return 'GUARDIAN';
-        default:
-            throw new Error('UNKNOWN_TRAIT');
-    }
+function transformToAttributes(trait) {
+    return {
+        trait_id: trait.id,
+        name: trait.name,
+        modifier: trait.modifier,
+        chance: trait.chance,
+        weight: trait.weight,
+        threshold: trait.statThreshold,
+        general_stat: trait.stat
+    };
 }
-function transformFromType(trait) {
-    return Trait[trait];
+function transformToAPIObject(model) {
+    return { name: model.name };
 }
-function transformToEnum(trait) {
-    return APITrait[trait];
+function transformToObject(model) {
+    return Trait.getTraits().find(trait => trait.id === model.trait_id);
 }
-export { transformToType as transformFromTrait, transformFromType as transformToTrait, transformToEnum as transformToAPITrait };
+export { transformToObject as transformToTrait, transformToAPIObject as transformToAPITrait, transformToAttributes as transformFromTrait };

package/dist/esm/src/service/match/match-set.d.ts

@@ -50,8 +50,8 @@ export declare class MatchSet {
     private readonly scoreThreshold;
     private homeScore;
     private awayScore;
-    constructor({ id, order, isTieBreak, homeLibero, awayLibero, stats, rallies, homeScore, awayScore }: MatchSetOpts);
     private _state;
+    constructor({ id, order, isTieBreak, homeLibero, awayLibero, stats, rallies, homeScore, awayScore }: MatchSetOpts);
     get state(): MatchSetState;
     getHomeScore(): number;
     getAwayScore(): number;

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

@@ -30,8 +30,8 @@ export declare class Rally {
     readonly homePlayerPosition: PlayerPosition[];
     readonly awayPlayerPosition: PlayerPosition[];
     readonly order: number;
-    constructor({ id, order, servingTeam, homePlayerPosition, awayPlayerPosition, events }: RallyOpts);
     private _state;
+    constructor({ id, order, servingTeam, homePlayerPosition, awayPlayerPosition, events }: RallyOpts);
     get state(): RallyState;
     get score(): Score | undefined;
     isOver(): boolean;

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

@@ -1,4 +1,3 @@
-import { Role } from './role';
 import { GeneralStat } from './stats';
 import { PerformanceStats } from './performance-stats';
 export declare class Trait {
@@ -8,8 +7,8 @@ export declare class Trait {
     static readonly METEOR_SERVE: Trait;
     static readonly VIGOROUS: Trait;
     static readonly GUARDIAN: Trait;
+    readonly id: string;
     readonly name: string;
-    readonly roles: Role[];
     readonly modifier: number;
     readonly chance: number;
     readonly statThreshold: number;
@@ -17,5 +16,5 @@ export declare class Trait {
     readonly weight: number;
     private constructor();
     static getTraits(): Trait[];
-    static assignTraits(roles: Role[], performanceStats: PerformanceStats): Trait[];
+    static assignTraits(performanceStats: PerformanceStats): Trait[];
 }

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

@@ -1,9 +1,8 @@
-import { Role } from './role';
 import { GeneralStat } from './stats';
 export class Trait {
-    constructor({ name, roles, modifier, chance, statThreshold, stat, weight }) {
+    constructor({ id, name, modifier, chance, statThreshold, stat, weight }) {
+        this.id = id;
         this.name = name;
-        this.roles = roles;
         this.modifier = modifier;
         this.chance = chance;
         this.statThreshold = statThreshold;
@@ -13,10 +12,9 @@ export class Trait {
     static getTraits() {
         return [Trait.GUARDIAN, Trait.MARKSMAN, Trait.METEOR_SERVE, Trait.VIGOROUS, Trait.MOVING_WALL, Trait.MASTER_MIND];
     }
-    static assignTraits(roles, performanceStats) {
+    static assignTraits(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;
+            return GeneralStat.calculateScore(performanceStats, trait.stat) >= trait.statThreshold;
         });
         const random = Math.random();
         let traitCount;
@@ -40,8 +38,8 @@ export class Trait {
 // 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({
+    id: '0117a315-a743-43e3-9ec2-ad5cf700ef08',
     name: 'Master Mind',
-    roles: [Role.SETTER],
     modifier: 1.25,
     chance: 0.2,
     statThreshold: 80,
@@ -50,8 +48,8 @@ Trait.MASTER_MIND = new Trait({
 });
 // Will always participate in blocking regardless of chance and adds
 Trait.MOVING_WALL = new Trait({
+    id: '304c53f6-5e7a-44d3-9625-f10d8109421a',
     name: 'Moving Wall',
-    roles: [Role.MIDDLE_BLOCKER, Role.DEFENSIVE_SPECIALIST],
     modifier: 1.1,
     chance: 1,
     statThreshold: 75,
@@ -60,8 +58,8 @@ Trait.MOVING_WALL = new Trait({
 });
 // On attack, will always pick the worst receiver and adds a 10% to score
 Trait.MARKSMAN = new Trait({
+    id: 'ace3458e-69ab-487c-a9c0-d656f705d8dd',
     name: 'Marksman',
-    roles: [Role.OUTSIDE_HITTER, Role.OPPOSITE_HITTER, Role.SETTER],
     modifier: 1.1,
     chance: 0.3,
     statThreshold: 75,
@@ -70,8 +68,8 @@ Trait.MARKSMAN = new Trait({
 });
 // Increases the score of the serve by 25% when serve type is Jumping.
 Trait.METEOR_SERVE = new Trait({
+    id: 'c929a79d-5866-40d6-bbd6-b0b67a929c4c',
     name: 'Meteor Serve',
-    roles: [],
     modifier: 1.25,
     chance: 0.1,
     statThreshold: 75,
@@ -80,8 +78,8 @@ Trait.METEOR_SERVE = new Trait({
 });
 // Has a 50% chance of taking an action without decreasing energy.
 Trait.VIGOROUS = new Trait({
+    id: 'f9599b87-b3b2-49ce-8224-470f6fe6ed64',
     name: 'Vigorous',
-    roles: [],
     modifier: 1,
     statThreshold: 60,
     chance: 0.5,
@@ -90,8 +88,8 @@ Trait.VIGOROUS = new Trait({
 });
 // Takes place of the receiver and increases reception score by 25%, guaranteeing success. Can only trigger in back-row.
 Trait.GUARDIAN = new Trait({
+    id: 'c3291953-9256-4559-b5a9-955ccb8f9a6f',
     name: 'Guardian',
-    roles: [Role.DEFENSIVE_SPECIALIST, Role.LIBERO],
     chance: 0.25,
     statThreshold: 75,
     modifier: 1.25,

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

@@ -20,8 +20,8 @@ export declare class Team {
     readonly coach?: Coach;
     readonly league?: League;
     readonly country?: Country;
-    constructor({ id, rating, name, shortName, country, roster, coach, league }: TeamOpts);
     private _rating;
+    constructor({ id, rating, name, shortName, country, roster, coach, league }: TeamOpts);
     get rating(): number;
     set rating(value: number);
     isPlayerInRoster(player: Player): boolean;

package/package.json

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