volleyballsimtypes 0.0.76 → 0.0.77

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

@@ -1,6 +1,5 @@
 import { PerformanceStats } from './performance-stats';
 export declare class Role {
-    readonly name: string;
     static readonly SETTER: Role;
     static readonly LIBERO: Role;
     static readonly OUTSIDE_HITTER: Role;
@@ -8,6 +7,7 @@ export declare class Role {
     static readonly MIDDLE_BLOCKER: Role;
     static readonly DEFENSIVE_SPECIALIST: Role;
     private static readonly ROLES;
+    readonly name: string;
     private constructor();
     static getRoles(): Role[];
     static calculateScore(stats: PerformanceStats, role: Role): number;

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

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

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

@@ -15,18 +15,18 @@ class Team {
         this.country = country;
         this.league = league;
     }
-    isPlayerInRoster(player) {
-        return this.roster.some(p => p.id === player.id);
-    }
-    toString() {
-        return `${this.name} [${this.shortName}] (${this.country?.name}) ELO=${this._rating}`;
-    }
     get rating() {
         return this._rating;
     }
     set rating(value) {
         this._rating = value;
     }
+    isPlayerInRoster(player) {
+        return this.roster.some(p => p.id === player.id);
+    }
+    toString() {
+        return `${this.name} [${this.shortName}] (${this.country?.name}) ELO=${this._rating}`;
+    }
     updateRating(ratingChange) {
         if (Math.abs(ratingChange) > match_1.MatchRating.K)
             throw new Error(`INVALID RATING CHANGE: ${ratingChange}`);

package/dist/esm/src/data/index.d.ts

@@ -1,4 +1,3 @@
-export type { MatchRatingCreationAttributes, MatchRatingId, MatchRatingPk, DraftPk, DraftId, DraftCreationAttributes, DraftPickCreationAttributes, DraftPickId, DraftPickPk, PlayerTeamCreationAttributes, PlayerTeamId, PlayerTeamOptionalAttributes, PlayerTeamPk, BlockCreationAttributes, BlockFailure, BlockId, BlockPk, BlockType, CoachCreationAttributes, CoachId, CoachPk, CountryCreationAttributes, CountryId, CountryPk, CourtPositionType, CourtTarget, EventCreationAttributes, EventId, EventPk, EventType, FormationType, LeagueCreationAttributes, LeagueId, LeaguePk, LiberoReplacementCreationAttributes, LiberoReplacementId, LiberoReplacementPk, LiberoReplacementType, MatchCreationAttributes, MatchId, MatchPk, MatchSetCreationAttributes, MatchSetId, MatchSetPk, MatchSetStatsCreationAttributes, MatchSetStatsId, MatchSetStatsPk, PerformanceStatsCreationAttributes, PerformanceStatsId, PerformanceStatsPk, PlayerCreationAttributes, PlayerId, PlayerPk, RallyCreationAttributes, RallyId, RallyPk, RallyPositionCreationAttributes, RallyPositionId, RallyPositionPk, ReceptionCreationAttributes, ReceptionFailure, ReceptionId, ReceptionPk, ReceptionType, RoleType, ScoreCreationAttributes, ScoreId, ScorePk, SeasonCreationAttributes, SeasonId, SeasonMatchCreationAttributes, SeasonMatchId, SeasonMatchPk, SeasonPk, SeasonTeamsCreationAttributes, SeasonTeamsId, SeasonTeamsPk, ServeCreationAttributes, ServeFailure, ServeId, ServePk, ServeType, SetCreationAttributes, SetFailure, SetId, SetPk, SetType, Side, SpikeCreationAttributes, SpikeFailure, SpikeId, SpikePk, SpikeType, SubstitutionCreationAttributes, SubstitutionId, SubstitutionPk, TeamCreationAttributes, TeamId, TeamPk, TournamentCreationAttributes, TournamentId, TournamentMatchCreationAttributes, TournamentMatchId, TournamentMatchPk, TournamentPk, TournamentStage, TournamentTeamsCreationAttributes, TournamentTeamsId, TournamentTeamsPk, TraitType, IterationPk, IterationCreationAttributes, IterationId, UserCreationAttributes, UserOptionalAttributes, UserRole, UserId, UserPk } from './models';
-export { UserAttributes, UserModel, MatchRatingModel, MatchRatingAttributes, DraftModel, DraftAttributes, DraftPickAttributes, DraftPickModel, PlayerTeamModel, PlayerTeamAttributes, BlockAttributes, BlockModel, BlockOptionalAttributes, CoachAttributes, CoachModel, CoachOptionalAttributes, CountryAttributes, CountryModel, EventAttributes, EventModel, LeagueAttributes, LeagueModel, LiberoReplacementAttributes, LiberoReplacementModel, MatchAttributes, MatchModel, MatchSetAttributes, MatchSetModel, MatchSetOptionalAttributes, MatchSetStatsAttributes, MatchSetStatsModel, MatchSetStatsOptionalAttributes, PerformanceStatsAttributes, PerformanceStatsModel, PerformanceStatsOptionalAttributes, PlayerAttributes, PlayerModel, RallyAttributes, RallyModel, RallyPositionAttributes, RallyPositionModel, ReceptionAttributes, ReceptionModel, ScoreAttributes, ScoreModel, SeasonAttributes, SeasonMatchAttributes, SeasonMatchModel, SeasonModel, SeasonTeamsAttributes, SeasonTeamsModel, ServeAttributes, ServeModel, SetAttributes, SetModel, SpikeAttributes, SpikeModel, SubstitutionAttributes, SubstitutionModel, TeamAttributes, TeamModel, TournamentAttributes, TournamentMatchAttributes, TournamentMatchModel, TournamentModel, TournamentOptionalAttributes, TournamentTeamsAttributes, TournamentTeamsModel, IterationModel, IterationAttributes } from './models';
+export * from './models';
 export * from './transformers';
 export { initModels } from './init-models';

package/dist/esm/src/data/index.js

@@ -1,3 +1,3 @@
-export { UserModel, MatchRatingModel, DraftModel, DraftPickModel, PlayerTeamModel, BlockModel, CoachModel, CountryModel, EventModel, LeagueModel, LiberoReplacementModel, MatchModel, MatchSetModel, MatchSetStatsModel, PerformanceStatsModel, PlayerModel, RallyModel, RallyPositionModel, ReceptionModel, ScoreModel, SeasonMatchModel, SeasonModel, SeasonTeamsModel, ServeModel, SetModel, SpikeModel, SubstitutionModel, TeamModel, TournamentMatchModel, TournamentModel, TournamentTeamsModel, IterationModel } from './models';
+export * from './models';
 export * from './transformers';
 export { initModels } from './init-models';

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import type { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitType } from '.';
 export interface BlockAttributes {
     event_id: string;
     rally_id: string;
@@ -15,6 +15,7 @@ export interface BlockAttributes {
     blocker_3?: string;
     modifier: number;
     score: number;
+    active_traits: TraitType[];
 }
 export type BlockType = 'NO_BLOCKER' | 'SINGLE' | 'DOUBLE' | 'TRIPLE';
 export type BlockFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'WIPE' | 'TOOL';
@@ -36,6 +37,7 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     blocker_3?: string;
     modifier: number;
     score: number;
+    active_traits: TraitType[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

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

@@ -74,21 +74,22 @@ export class BlockModel extends Model {
             score: {
                 type: DataTypes.REAL,
                 allowNull: false
+            },
+            active_traits: {
+                type: DataTypes.ARRAY(DataTypes.ENUM('MARKSMAN', 'MOVING_WALL', 'MASTER_MIND', 'METEOR_SERVE', 'VIGOROUS', 'GUARDIAN')),
+                allowNull: false,
+                defaultValue: [[]]
             }
         }, {
             sequelize,
             tableName: 'Block',
             schema: 'public',
             timestamps: false,
-            indexes: [
-                {
+            indexes: [{
                     name: 'Block_pk',
                     unique: true,
-                    fields: [
-                        { name: 'event_id' }
-                    ]
-                }
-            ]
+                    fields: [{ name: 'event_id' }]
+                }]
         });
     }
 }

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

@@ -1,12 +1,13 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import type { PlayerId, PlayerModel, RallyId, RallyModel } from '.';
+import { PlayerId, PlayerModel, RallyId, RallyModel, TraitType } 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';
@@ -19,6 +20,7 @@ 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,21 +30,22 @@ 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,
             tableName: 'Event',
             schema: 'public',
             timestamps: false,
-            indexes: [
-                {
+            indexes: [{
                     name: 'Event_pk',
                     unique: true,
-                    fields: [
-                        { name: 'event_id' }
-                    ]
-                }
-            ]
+                    fields: [{ name: 'event_id' }]
+                }]
         });
     }
 }

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

@@ -1,62 +1,32 @@
-export type { BlockCreationAttributes, BlockFailure, BlockId, BlockOptionalAttributes, BlockPk, BlockType } from './block';
-export { BlockAttributes, BlockModel } from './block';
-export type { CoachCreationAttributes, CoachId, CoachOptionalAttributes, CoachPk, FormationType } from './coach';
-export { CoachAttributes, CoachModel } from './coach';
-export type { CountryCreationAttributes, CountryId, CountryPk } from './country';
-export { CountryAttributes, CountryModel } from './country';
-export type { DraftCreationAttributes, DraftId, DraftPk } from './draft';
-export { DraftAttributes, DraftModel } from './draft';
-export type { DraftPickCreationAttributes, DraftPickId, DraftPickPk } from './draft-pick';
-export { DraftPickAttributes, DraftPickModel } from './draft-pick';
-export type { PlayerTeamCreationAttributes, PlayerTeamId, PlayerTeamOptionalAttributes, PlayerTeamPk } from './player-team';
-export { PlayerTeamAttributes, PlayerTeamModel } from './player-team';
-export type { CourtTarget, EventCreationAttributes, EventId, EventPk, EventType } from './event';
-export { EventAttributes, EventModel } from './event';
-export type { IterationCreationAttributes, IterationId, IterationPk } from './iteration';
-export { IterationAttributes, IterationModel } from './iteration';
-export type { LeagueCreationAttributes, LeagueId, LeaguePk } from './league';
-export { LeagueAttributes, LeagueModel } from './league';
-export type { LiberoReplacementCreationAttributes, LiberoReplacementId, LiberoReplacementPk, LiberoReplacementType } from './libero-replacement';
-export { LiberoReplacementAttributes, LiberoReplacementModel } from './libero-replacement';
-export type { MatchCreationAttributes, MatchId, MatchPk } from './match';
-export { MatchAttributes, MatchModel } from './match';
-export type { MatchSetCreationAttributes, MatchSetId, MatchSetOptionalAttributes, MatchSetPk } from './match-set';
-export { MatchSetAttributes, MatchSetModel } from './match-set';
-export type { MatchSetStatsCreationAttributes, MatchSetStatsId, MatchSetStatsOptionalAttributes, MatchSetStatsPk } from './match-set-stats';
-export { MatchSetStatsAttributes, MatchSetStatsModel } from './match-set-stats';
-export type { PerformanceStatsCreationAttributes, PerformanceStatsId, PerformanceStatsOptionalAttributes, PerformanceStatsPk } from './performance-stats';
-export { PerformanceStatsAttributes, PerformanceStatsModel } from './performance-stats';
-export type { PlayerCreationAttributes, PlayerId, PlayerPk, RoleType, TraitType } from './player';
-export { PlayerAttributes, PlayerModel } from './player';
-export { RallyAttributes, RallyCreationAttributes, RallyId, RallyModel, RallyPk } from './rally';
-export { CourtPositionType, RallyPositionAttributes, RallyPositionCreationAttributes, RallyPositionId, RallyPositionModel, RallyPositionPk, Side } from './rally-position';
-export type { ReceptionCreationAttributes, ReceptionFailure, ReceptionId, ReceptionPk, ReceptionType } from './reception';
-export { ReceptionAttributes, ReceptionModel } from './reception';
-export type { ScoreCreationAttributes, ScoreId, ScorePk } from './score';
-export { ScoreAttributes, ScoreModel } from './score';
-export type { SeasonCreationAttributes, SeasonId, SeasonPk } from './season';
-export { SeasonAttributes, SeasonModel } from './season';
-export type { SeasonTeamsCreationAttributes, SeasonTeamsId, SeasonTeamsPk } from './season-teams';
-export { SeasonTeamsAttributes, SeasonTeamsModel } from './season-teams';
-export type { SeasonMatchCreationAttributes, SeasonMatchId, SeasonMatchPk } from './season-match';
-export { SeasonMatchAttributes, SeasonMatchModel } from './season-match';
-export type { ServeCreationAttributes, ServeFailure, ServeId, ServePk, ServeType } from './serve';
-export { ServeAttributes, ServeModel } from './serve';
-export type { SetCreationAttributes, SetFailure, SetId, SetPk, SetType } from './set';
-export { SetAttributes, SetModel } from './set';
-export type { SpikeCreationAttributes, SpikeFailure, SpikeId, SpikePk, SpikeType } from './spike';
-export { SpikeAttributes, SpikeModel } from './spike';
-export type { SubstitutionCreationAttributes, SubstitutionId, SubstitutionPk } from './substitution';
-export { SubstitutionAttributes, SubstitutionModel } from './substitution';
-export type { TeamCreationAttributes, TeamId, TeamPk } from './team';
-export { TeamAttributes, TeamModel } from './team';
-export type { TournamentCreationAttributes, TournamentId, TournamentOptionalAttributes, TournamentPk } from './tournament';
-export { TournamentAttributes, TournamentModel } from './tournament';
-export type { TournamentMatchCreationAttributes, TournamentMatchId, TournamentMatchPk, TournamentStage } from './tournament-match';
-export { TournamentMatchAttributes, TournamentMatchModel } from './tournament-match';
-export type { TournamentTeamsCreationAttributes, TournamentTeamsId, TournamentTeamsPk } from './tournament-teams';
-export { TournamentTeamsAttributes, TournamentTeamsModel } from './tournament-teams';
-export type { MatchRatingCreationAttributes, MatchRatingId, MatchRatingPk } from './match-rating';
-export { MatchRatingAttributes, MatchRatingModel } from './match-rating';
-export type { UserCreationAttributes, UserId, UserOptionalAttributes, UserPk, UserRole } from './user';
-export { UserAttributes, UserModel } from './user';
+export * from './block';
+export * from './coach';
+export * from './country';
+export * from './draft';
+export * from './draft-pick';
+export * from './event';
+export * from './iteration';
+export * from './league';
+export * from './libero-replacement';
+export * from './match';
+export * from './match-rating';
+export * from './match-set';
+export * from './match-set-stats';
+export * from './performance-stats';
+export * from './player';
+export * from './player-team';
+export * from './rally';
+export * from './rally-position';
+export * from './reception';
+export * from './score';
+export * from './season';
+export * from './season-match';
+export * from './season-teams';
+export * from './serve';
+export * from './set';
+export * from './spike';
+export * from './substitution';
+export * from './team';
+export * from './tournament';
+export * from './tournament-match';
+export * from './tournament-teams';
+export * from './user';

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

@@ -1,32 +1,32 @@
-export { BlockModel } from './block';
-export { CoachModel } from './coach';
-export { CountryModel } from './country';
-export { DraftModel } from './draft';
-export { DraftPickModel } from './draft-pick';
-export { PlayerTeamModel } from './player-team';
-export { EventModel } from './event';
-export { IterationModel } from './iteration';
-export { LeagueModel } from './league';
-export { LiberoReplacementModel } from './libero-replacement';
-export { MatchModel } from './match';
-export { MatchSetModel } from './match-set';
-export { MatchSetStatsModel } from './match-set-stats';
-export { PerformanceStatsModel } from './performance-stats';
-export { PlayerModel } from './player';
-export { RallyModel } from './rally';
-export { RallyPositionModel } from './rally-position';
-export { ReceptionModel } from './reception';
-export { ScoreModel } from './score';
-export { SeasonModel } from './season';
-export { SeasonTeamsModel } from './season-teams';
-export { SeasonMatchModel } from './season-match';
-export { ServeModel } from './serve';
-export { SetModel } from './set';
-export { SpikeModel } from './spike';
-export { SubstitutionModel } from './substitution';
-export { TeamModel } from './team';
-export { TournamentModel } from './tournament';
-export { TournamentMatchModel } from './tournament-match';
-export { TournamentTeamsModel } from './tournament-teams';
-export { MatchRatingModel } from './match-rating';
-export { UserModel } from './user';
+export * from './block';
+export * from './coach';
+export * from './country';
+export * from './draft';
+export * from './draft-pick';
+export * from './event';
+export * from './iteration';
+export * from './league';
+export * from './libero-replacement';
+export * from './match';
+export * from './match-rating';
+export * from './match-set';
+export * from './match-set-stats';
+export * from './performance-stats';
+export * from './player';
+export * from './player-team';
+export * from './rally';
+export * from './rally-position';
+export * from './reception';
+export * from './score';
+export * from './season';
+export * from './season-match';
+export * from './season-teams';
+export * from './serve';
+export * from './set';
+export * from './spike';
+export * from './substitution';
+export * from './team';
+export * from './tournament';
+export * from './tournament-match';
+export * from './tournament-teams';
+export * from './user';

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

@@ -5,7 +5,7 @@ export interface IterationAttributes {
     iteration_id: number;
     start_date: Date;
 }
-export type IterationPk = "iteration_id";
+export type IterationPk = 'iteration_id';
 export type IterationId = IterationModel[IterationPk];
 export type IterationCreationAttributes = IterationAttributes;
 export declare class IterationModel extends Model<IterationAttributes, IterationCreationAttributes> implements IterationAttributes {

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

@@ -20,10 +20,10 @@ export class IterationModel extends Model {
             timestamps: false,
             indexes: [
                 {
-                    name: "Iteration_pk",
+                    name: 'Iteration_pk',
                     unique: true,
                     fields: [
-                        { name: "iteration_id" },
+                        { name: 'iteration_id' },
                     ]
                 },
             ]

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import type { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitType } from '.';
 export interface ReceptionAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface ReceptionAttributes {
     player_id: string;
     modifier: number;
     score: number;
+    active_traits: TraitType[];
 }
 export type ReceptionFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'BAD_PASS';
 export type ReceptionType = 'DIG' | 'OVERHAND' | 'ONE_HAND' | 'OTHER_BODY_PART';
@@ -29,6 +30,7 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     player_id: string;
     modifier: number;
     score: number;
+    active_traits: TraitType[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

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

@@ -50,21 +50,22 @@ export class ReceptionModel extends Model {
             score: {
                 type: DataTypes.REAL,
                 allowNull: false
+            },
+            active_traits: {
+                type: DataTypes.ARRAY(DataTypes.ENUM('MARKSMAN', 'MOVING_WALL', 'MASTER_MIND', 'METEOR_SERVE', 'VIGOROUS', 'GUARDIAN')),
+                allowNull: false,
+                defaultValue: [[]]
             }
         }, {
             sequelize,
             tableName: 'Reception',
             schema: 'public',
             timestamps: false,
-            indexes: [
-                {
+            indexes: [{
                     name: 'Reception_pk',
                     unique: true,
-                    fields: [
-                        { name: 'event_id' }
-                    ]
-                }
-            ]
+                    fields: [{ name: 'event_id' }]
+                }]
         });
     }
 }

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import type { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitType } from '.';
 export interface ServeAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface ServeAttributes {
     modifier: number;
     score: number;
     type: ServeType;
+    active_traits: TraitType[];
 }
 export type ServeFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'NET' | 'OUT_OF_BOUNDS';
 export type ServeType = 'UNDERHAND' | 'OVERHAND_TOPSPIN' | 'OVERHAND_FLOAT' | 'JUMP_TOPSPIN' | 'JUMP_FLOAT';
@@ -29,6 +30,7 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     modifier: number;
     score: number;
     type: ServeType;
+    active_traits: TraitType[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

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

@@ -50,21 +50,22 @@ export class ServeModel extends Model {
             type: {
                 type: DataTypes.ENUM('UNDERHAND', 'OVERHAND_TOPSPIN', 'OVERHAND_FLOAT', 'JUMP_TOPSPIN', 'JUMP_FLOAT'),
                 allowNull: false
+            },
+            active_traits: {
+                type: DataTypes.ARRAY(DataTypes.ENUM('MARKSMAN', 'MOVING_WALL', 'MASTER_MIND', 'METEOR_SERVE', 'VIGOROUS', 'GUARDIAN')),
+                allowNull: false,
+                defaultValue: [[]]
             }
         }, {
             sequelize,
             tableName: 'Serve',
             schema: 'public',
             timestamps: false,
-            indexes: [
-                {
+            indexes: [{
                     name: 'Serve_pk',
                     unique: true,
-                    fields: [
-                        { name: 'event_id' }
-                    ]
-                }
-            ]
+                    fields: [{ name: 'event_id' }]
+                }]
         });
     }
 }

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import type { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitType } from '.';
 export interface SetAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface SetAttributes {
     player_id: string;
     modifier: number;
     score: number;
+    active_traits: TraitType[];
 }
 export type SetFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'BAD_PASS';
 export type SetType = 'OVERHAND' | 'UNDERHAND' | 'SPIKE' | 'DUMP';
@@ -29,6 +30,7 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     player_id: string;
     modifier: number;
     score: number;
+    active_traits: TraitType[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

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

@@ -50,21 +50,22 @@ export class SetModel extends Model {
             score: {
                 type: DataTypes.REAL,
                 allowNull: false
+            },
+            active_traits: {
+                type: DataTypes.ARRAY(DataTypes.ENUM('MARKSMAN', 'MOVING_WALL', 'MASTER_MIND', 'METEOR_SERVE', 'VIGOROUS', 'GUARDIAN')),
+                allowNull: false,
+                defaultValue: [[]]
             }
         }, {
             sequelize,
             tableName: 'Set',
             schema: 'public',
             timestamps: false,
-            indexes: [
-                {
+            indexes: [{
                     name: 'Set_pk',
                     unique: true,
-                    fields: [
-                        { name: 'event_id' }
-                    ]
-                }
-            ]
+                    fields: [{ name: 'event_id' }]
+                }]
         });
     }
 }

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import type { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitType } from '.';
 export interface SpikeAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface SpikeAttributes {
     player_id: string;
     modifier: number;
     score: number;
+    active_traits: TraitType[];
 }
 export type SpikeType = 'CROSS_SHOT' | 'LINE_SHOT' | 'TOOL_SHOT' | 'TIP' | 'DOWN_BALL' | 'OVERHAND';
 export type SpikeFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'NET';
@@ -29,6 +30,7 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     player_id: string;
     modifier: number;
     score: number;
+    active_traits: TraitType[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;

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

@@ -50,21 +50,22 @@ export class SpikeModel extends Model {
             score: {
                 type: DataTypes.REAL,
                 allowNull: false
+            },
+            active_traits: {
+                type: DataTypes.ARRAY(DataTypes.ENUM('MARKSMAN', 'MOVING_WALL', 'MASTER_MIND', 'METEOR_SERVE', 'VIGOROUS', 'GUARDIAN')),
+                allowNull: false,
+                defaultValue: [[]]
             }
         }, {
             sequelize,
             tableName: 'Spike',
             schema: 'public',
             timestamps: false,
-            indexes: [
-                {
+            indexes: [{
                     name: 'Spike_pk',
                     unique: true,
-                    fields: [
-                        { name: 'event_id' }
-                    ]
-                }
-            ]
+                    fields: [{ name: 'event_id' }]
+                }]
         });
     }
 }

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

@@ -1,5 +1,5 @@
 import { Block, BlockFailureEnum, BlockTypeEnum } from '../../service';
-import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
+import { transformFromCourtTarget, transformFromEventType, transformFromTrait, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
 function transformToBlockFailure(failure) {
     switch (failure) {
         case BlockFailureEnum.NO_FAILURE:
@@ -52,7 +52,8 @@ function transformToAttributes(event, rallyId) {
         event_type: transformFromEventType(event.eventType),
         blocker_1: event.blockers[0]?.id,
         blocker_2: event.blockers[1]?.id,
-        blocker_3: event.blockers[2]?.id
+        blocker_3: event.blockers[2]?.id,
+        active_traits: event.activeTraits.map(transformFromTrait)
     };
 }
 function transformToObject(model) {
@@ -66,7 +67,8 @@ function transformToObject(model) {
         modifier: model.modifier,
         order: model.order,
         score: model.score,
-        blockers: []
+        blockers: [],
+        activeTraits: model.active_traits.map(transformToTrait)
     });
     if (model.Blocker_1 != null)
         block.blockers.push(transformToPlayer(model.Blocker_1));