volleyballsimtypes 0.0.98 → 0.0.100

package/dist/cjs/src/api/events.d.ts

@@ -14,8 +14,6 @@ export interface APISubstitution extends APIEvent {
 }
 export interface APIInPlayEvent extends APIEvent {
     readonly target: CourtTargetEnum;
-    readonly modifier: number;
-    readonly score: number;
 }
 export interface APIScore extends APIEvent {
     readonly teamId: string;

package/dist/cjs/src/data/init-models.js

@@ -9,7 +9,6 @@ function initModels(sequelize) {
     const Draft = models_1.DraftModel.initModel(sequelize);
     const DraftPick = models_1.DraftPickModel.initModel(sequelize);
     const Event = models_1.EventModel.initModel(sequelize);
-    const EventTrait = models_1.EventTraitModel.initModel(sequelize);
     const Iteration = models_1.IterationModel.initModel(sequelize);
     const League = models_1.LeagueModel.initModel(sequelize);
     const LiberoReplacement = models_1.LiberoReplacementModel.initModel(sequelize);
@@ -47,7 +46,6 @@ function initModels(sequelize) {
     Block.belongsTo(Player, { as: 'Blocker_3', foreignKey: 'blocker_3' });
     Block.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Block.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Block.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'block_id' });
     Coach.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Coach.hasMany(Team, { as: 'Teams', foreignKey: 'coach_id' });
     Country.hasMany(Coach, { as: 'Coaches', foreignKey: 'country_id' });
@@ -56,12 +54,6 @@ function initModels(sequelize) {
     Country.hasMany(Team, { as: 'Teams', foreignKey: 'country_id' });
     Event.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Event.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    EventTrait.belongsTo(Block, { as: 'Block', foreignKey: 'block_id' });
-    EventTrait.belongsTo(Reception, { as: 'Reception', foreignKey: 'reception_id' });
-    EventTrait.belongsTo(Serve, { as: 'Serve', foreignKey: 'serve_id' });
-    EventTrait.belongsTo(Set, { as: 'Set', foreignKey: 'set_id' });
-    EventTrait.belongsTo(Spike, { as: 'Spike', foreignKey: 'spike_id' });
-    EventTrait.belongsTo(Trait, { as: 'Trait', foreignKey: 'trait_id' });
     Iteration.hasMany(Season, { as: 'Seasons', foreignKey: 'iteration' });
     Iteration.hasOne(Tournament, { as: 'Tournament', foreignKey: 'iteration' });
     League.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
@@ -169,7 +161,6 @@ function initModels(sequelize) {
     RallyPosition.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
     Reception.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Reception.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Reception.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'reception_id' });
     Score.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Score.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
     Score.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
@@ -190,13 +181,10 @@ function initModels(sequelize) {
     SeasonTeams.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Serve.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Serve.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Serve.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'serve_id' });
     Set.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Set.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Set.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'set_id' });
     Spike.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Spike.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Spike.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'spike_id' });
     Substitution.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Substitution.belongsTo(Player, { as: 'playerOut', foreignKey: 'player_out' });
     Substitution.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
@@ -259,7 +247,6 @@ function initModels(sequelize) {
         otherKey: 'player_id'
     });
     Trait.hasMany(PlayerTrait, { as: 'PlayerTraits', foreignKey: 'trait_id' });
-    Trait.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'trait_id' });
     return {
         Block,
         Coach,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface BlockAttributes {
     event_id: string;
     rally_id: string;
@@ -13,9 +13,6 @@ export interface BlockAttributes {
     blocker_1?: string;
     blocker_2?: string;
     blocker_3?: string;
-    modifier: number;
-    score: number;
-    EventTraits?: EventTraitAttributes[];
 }
 export type BlockType = 'NO_BLOCKER' | 'SINGLE' | 'DOUBLE' | 'TRIPLE';
 export type BlockFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'WIPE' | 'TOOL';
@@ -35,9 +32,6 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     blocker_1?: string;
     blocker_2?: string;
     blocker_3?: string;
-    modifier: number;
-    score: number;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -58,26 +52,5 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof BlockModel;
 }

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

@@ -69,14 +69,6 @@ class BlockModel extends sequelize_1.Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            modifier: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
             }
         }, {
             sequelize,

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

@@ -4,7 +4,6 @@ export * from './country';
 export * from './draft';
 export * from './draft-pick';
 export * from './event';
-export * from './event-trait';
 export * from './iteration';
 export * from './league';
 export * from './libero-replacement';

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

@@ -20,7 +20,6 @@ __exportStar(require("./country"), exports);
 __exportStar(require("./draft"), exports);
 __exportStar(require("./draft-pick"), exports);
 __exportStar(require("./event"), exports);
-__exportStar(require("./event-trait"), exports);
 __exportStar(require("./iteration"), exports);
 __exportStar(require("./league"), exports);
 __exportStar(require("./libero-replacement"), exports);

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface ReceptionAttributes {
     event_id: string;
     rally_id: string;
@@ -10,9 +10,6 @@ export interface ReceptionAttributes {
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits?: EventTraitAttributes[];
 }
 export type ReceptionFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'BAD_PASS';
 export type ReceptionType = 'DIG' | 'OVERHAND' | 'ONE_HAND' | 'OTHER_BODY_PART';
@@ -28,9 +25,6 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof ReceptionModel;
 }

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

@@ -45,14 +45,6 @@ class ReceptionModel extends sequelize_1.Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            modifier: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface ServeAttributes {
     event_id: string;
     rally_id: string;
@@ -9,10 +9,7 @@ export interface ServeAttributes {
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
     type: ServeType;
-    EventTraits?: EventTraitAttributes[];
 }
 export type ServeFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'NET' | 'OUT_OF_BOUNDS';
 export type ServeType = 'UNDERHAND' | 'OVERHAND_TOPSPIN' | 'OVERHAND_FLOAT' | 'JUMP_TOPSPIN' | 'JUMP_FLOAT';
@@ -27,10 +24,7 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
     type: ServeType;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof ServeModel;
 }

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

@@ -42,14 +42,6 @@ class ServeModel extends sequelize_1.Model {
                     key: 'player_id'
                 }
             },
-            modifier: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
-            },
             type: {
                 type: sequelize_1.DataTypes.ENUM('UNDERHAND', 'OVERHAND_TOPSPIN', 'OVERHAND_FLOAT', 'JUMP_TOPSPIN', 'JUMP_FLOAT'),
                 allowNull: false

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface SetAttributes {
     event_id: string;
     rally_id: string;
@@ -10,9 +10,6 @@ export interface SetAttributes {
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits?: EventTraitAttributes[];
 }
 export type SetFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'BAD_PASS';
 export type SetType = 'OVERHAND' | 'UNDERHAND' | 'SPIKE' | 'DUMP';
@@ -28,9 +25,6 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof SetModel;
 }

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

@@ -45,14 +45,6 @@ class SetModel extends sequelize_1.Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            modifier: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface SpikeAttributes {
     event_id: string;
     rally_id: string;
@@ -10,9 +10,6 @@ export interface SpikeAttributes {
     failure: SpikeFailure;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits?: EventTraitAttributes[];
 }
 export type SpikeType = 'CROSS_SHOT' | 'LINE_SHOT' | 'TOOL_SHOT' | 'TIP' | 'DOWN_BALL' | 'OVERHAND';
 export type SpikeFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'NET';
@@ -28,9 +25,6 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     failure: SpikeFailure;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof SpikeModel;
 }

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

@@ -45,14 +45,6 @@ class SpikeModel extends sequelize_1.Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            modifier: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
             }
         }, {
             sequelize,

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

@@ -1,38 +1,16 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { EventTraitId, EventTraitModel, PlayerId, PlayerModel, PlayerTraitId, PlayerTraitModel } from '.';
+import { PlayerId, PlayerModel, PlayerTraitId, PlayerTraitModel } from '.';
 export interface TraitAttributes {
     trait_id: string;
     name: string;
-    modifier: number;
-    chance: number;
-    threshold: number;
-    weight: number;
-    general_stat: GeneralStatType;
 }
 export type TraitPk = 'trait_id';
 export type TraitId = TraitModel[TraitPk];
 export type TraitCreationAttributes = TraitAttributes;
-export type GeneralStatType = 'Attack' | 'Defense' | 'Physical' | 'Serve';
 export declare class TraitModel extends Model<TraitAttributes, TraitCreationAttributes> implements TraitAttributes {
     trait_id: string;
     name: string;
-    modifier: number;
-    chance: number;
-    threshold: number;
-    weight: number;
-    general_stat: GeneralStatType;
-    EventTraits: EventTraitModel[];
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     Players: PlayerModel[];
     getPlayers: Sequelize.BelongsToManyGetAssociationsMixin<PlayerModel>;
     setPlayers: Sequelize.BelongsToManySetAssociationsMixin<PlayerModel, PlayerId>;

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

@@ -13,26 +13,6 @@ class TraitModel extends sequelize_1.Model {
             name: {
                 type: sequelize_1.DataTypes.STRING,
                 allowNull: false
-            },
-            modifier: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
-            },
-            chance: {
-                type: sequelize_1.DataTypes.REAL,
-                allowNull: false
-            },
-            threshold: {
-                type: sequelize_1.DataTypes.INTEGER,
-                allowNull: false
-            },
-            weight: {
-                type: sequelize_1.DataTypes.INTEGER,
-                allowNull: false
-            },
-            general_stat: {
-                type: sequelize_1.DataTypes.ENUM('Attack', 'Defense', 'Physical', 'Serve'),
-                allowNull: false
             }
         }, {
             sequelize,

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

@@ -42,26 +42,18 @@ function transformFromBlockType(type) {
     return service_1.BlockTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
-    const eventTraits = event.activeTraits.map(trait => ({
-        block_id: event.id,
-        trait_id: trait.id,
-        event_id: event.id
-    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
         rally_id: rallyId,
         order: event.order,
-        modifier: event.modifier,
-        score: event.score,
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToBlockFailure(event.failure),
         type: transformToBlockType(event.type),
         event_type: (0, _1.transformFromEventType)(event.eventType),
         blocker_1: event.blockers[0]?.id,
         blocker_2: event.blockers[1]?.id,
-        blocker_3: event.blockers[2]?.id,
-        EventTraits: eventTraits
+        blocker_3: event.blockers[2]?.id
     };
 }
 exports.transformFromBlock = transformToAttributes;
@@ -73,11 +65,11 @@ function transformToObject(model) {
         type: transformFromBlockType(model.type),
         player: (0, _1.transformToPlayer)(model.player),
         target: (0, _1.transformToCourtTarget)(model.target),
-        modifier: model.modifier,
         order: model.order,
-        score: model.score,
         blockers: [],
-        activeTraits: model.Traits.map(_1.transformToTrait)
+        modifier: 1,
+        score: 1,
+        activeTraits: []
     });
     if (model.Blocker_1 != null)
         block.blockers.push((0, _1.transformToPlayer)(model.Blocker_1));
@@ -96,9 +88,7 @@ function transformToAPIObject(model) {
         type: transformFromBlockType(model.type),
         playerId: model.player_id,
         target: (0, _1.transformToCourtTarget)(model.target),
-        modifier: model.modifier,
         order: model.order,
-        score: model.score,
         blockers: []
     };
     if (model.blocker_1 != null)

package/dist/cjs/src/data/transformers/reception.js

@@ -40,23 +40,15 @@ function transformFromReceptionType(type) {
     return service_1.ReceptionTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
-    const eventTraits = event.activeTraits.map(trait => ({
-        event_id: event.id,
-        reception_id: event.id,
-        trait_id: trait.id
-    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
         rally_id: rallyId,
         order: event.order,
-        modifier: event.modifier,
-        score: event.score,
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToReceptionFailure(event.failure),
         type: transformToReceptionType(event.type),
         event_type: (0, _1.transformFromEventType)(event.eventType),
-        EventTraits: eventTraits
     };
 }
 exports.transformFromReception = transformToAttributes;
@@ -68,10 +60,10 @@ function transformToObject(reception) {
         type: transformFromReceptionType(reception.type),
         player: (0, _1.transformToPlayer)(reception.player),
         target: (0, _1.transformToCourtTarget)(reception.target),
-        modifier: reception.modifier,
         order: reception.order,
-        score: reception.score,
-        activeTraits: reception.Traits.map(_1.transformToTrait)
+        modifier: 1,
+        score: 1,
+        activeTraits: []
     });
 }
 exports.transformToReception = transformToObject;
@@ -83,9 +75,7 @@ function transformToAPIObject(event) {
         type: transformFromReceptionType(event.type),
         playerId: event.player_id,
         target: (0, _1.transformToCourtTarget)(event.target),
-        modifier: event.modifier,
-        order: event.order,
-        score: event.score
+        order: event.order
     };
 }
 exports.transformToAPIReception = transformToAPIObject;