volleyballsimtypes 0.0.166 → 0.0.167

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

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RarityRanges = exports.Rarity = void 0;
-var Rarity;
-(function (Rarity) {
-    Rarity["COMMON"] = "COMMON";
-    Rarity["RARE"] = "RARE";
-    Rarity["LEGENDARY"] = "LEGENDARY";
-    Rarity["MYTHIC"] = "MYTHIC";
-    Rarity["SPECIAL"] = "SPECIAL";
-})(Rarity = exports.Rarity || (exports.Rarity = {}));
+exports.RarityDataType = exports.RarityRanges = exports.RarityEnum = void 0;
+const sequelize_1 = require("sequelize");
+var RarityEnum;
+(function (RarityEnum) {
+    RarityEnum["COMMON"] = "COMMON";
+    RarityEnum["RARE"] = "RARE";
+    RarityEnum["LEGENDARY"] = "LEGENDARY";
+    RarityEnum["MYTHIC"] = "MYTHIC";
+    RarityEnum["SPECIAL"] = "SPECIAL";
+})(RarityEnum = exports.RarityEnum || (exports.RarityEnum = {}));
 exports.RarityRanges = {
-    [Rarity.COMMON]: [0, 50],
-    [Rarity.RARE]: [51, 70],
-    [Rarity.LEGENDARY]: [71, 85],
-    [Rarity.MYTHIC]: [86, 98],
-    [Rarity.SPECIAL]: [99, 100]
+    [RarityEnum.COMMON]: [0, 50],
+    [RarityEnum.RARE]: [51, 70],
+    [RarityEnum.LEGENDARY]: [71, 85],
+    [RarityEnum.MYTHIC]: [86, 98],
+    [RarityEnum.SPECIAL]: [99, 100]
 };
+exports.RarityDataType = sequelize_1.DataTypes.ENUM(...Object.values(RarityEnum));

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

@@ -1,16 +1,17 @@
-import { Roles } from '../../formula';
-import { PerformanceStats } from './performance-stats';
-export declare class Role {
-    static readonly SETTER: Role;
-    static readonly LIBERO: Role;
-    static readonly OUTSIDE_HITTER: Role;
-    static readonly OPPOSITE_HITTER: Role;
-    static readonly MIDDLE_BLOCKER: Role;
-    private static readonly ROLES;
-    readonly name: Roles;
-    private constructor();
-    toString(): string;
-    static getRoles(): Role[];
-    static calculateScore(stats: PerformanceStats, role: Role): number;
-    static assignRoles(stats: PerformanceStats): Role[];
+import { EnumDataType } from 'sequelize';
+import { PerformanceStats, PerformanceStatsParams } from './performance-stats';
+export declare enum RoleEnum {
+    SETTER = "SETTER",
+    LIBERO = "LIBERO",
+    OUTSIDE_HITTER = "OUTSIDE_HITTER",
+    OPPOSITE_HITTER = "OPPOSITE_HITTER",
+    MIDDLE_BLOCKER = "MIDDLE_BLOCKER"
 }
+export type Role = RoleEnum.SETTER | RoleEnum.LIBERO | RoleEnum.MIDDLE_BLOCKER | RoleEnum.OUTSIDE_HITTER | RoleEnum.OPPOSITE_HITTER;
+export declare const RoleDataType: EnumDataType<Role>;
+export interface RolesFormula {
+    role: Role;
+    weight: PerformanceStatsParams;
+}
+export declare function calculateRoleScore(stats: PerformanceStats, role: Role): number;
+export declare function assignRoles(stats: PerformanceStats): Role[];

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

@@ -1,44 +1,48 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Role = void 0;
-const formula_1 = require("../../formula");
-class Role {
-    constructor(name) {
-        this.name = name;
-    }
-    toString() {
-        return this.name;
-    }
-    static getRoles() {
-        return [...Role.ROLES];
-    }
-    static calculateScore(stats, role) {
-        const weights = formula_1.rolesFormula.find(r => r.role === role.name);
-        if (weights == null)
-            throw new Error('COULD_NOT_FIND_ROLE_WEIGHT');
-        const score = Object.entries(weights.weight)
-            .reduce((score, [key, value]) => score + (stats[key] * weights.weight[key]), 0);
-        return Math.round(score);
+exports.assignRoles = exports.calculateRoleScore = exports.RoleDataType = exports.RoleEnum = void 0;
+const sequelize_1 = require("sequelize");
+const roles_json_1 = __importDefault(require("../../stat-config/roles.json"));
+var RoleEnum;
+(function (RoleEnum) {
+    RoleEnum["SETTER"] = "SETTER";
+    RoleEnum["LIBERO"] = "LIBERO";
+    RoleEnum["OUTSIDE_HITTER"] = "OUTSIDE_HITTER";
+    RoleEnum["OPPOSITE_HITTER"] = "OPPOSITE_HITTER";
+    RoleEnum["MIDDLE_BLOCKER"] = "MIDDLE_BLOCKER";
+})(RoleEnum = exports.RoleEnum || (exports.RoleEnum = {}));
+exports.RoleDataType = sequelize_1.DataTypes.ENUM(...Object.values(RoleEnum));
+const rolesFormula = roles_json_1.default;
+function calculateRoleScore(stats, role) {
+    const weights = rolesFormula.find(r => r.role === role);
+    if (weights == null)
+        throw new Error('COULD_NOT_FIND_ROLE_WEIGHT');
+    const score = Object.keys(weights.weight)
+        .reduce((score, key) => {
+        const stat = stats[key];
+        const weight = weights.weight[key];
+        return score + (stat * weight);
+    }, 0);
+    return Math.round(score);
+}
+exports.calculateRoleScore = calculateRoleScore;
+function assignRoles(stats) {
+    const scores = Object.values(RoleEnum)
+        .map((role) => ({
+        role,
+        score: calculateRoleScore(stats, role)
+    }))
+        .sort((x, y) => y.score - x.score);
+    const out = [scores[0].role];
+    if (scores[1].score >= 75) {
+        out.push(scores[1].role);
     }
-    static assignRoles(stats) {
-        const scores = this.getRoles().map(role => ({
-            role,
-            score: this.calculateScore(stats, role)
-        })).sort((x, y) => y.score - x.score);
-        const out = [scores[0].role];
-        if (scores[1].score >= 75) {
-            out.push(scores[1].role);
-        }
-        if (scores[2].score >= 85) {
-            out.push(scores[2].role);
-        }
-        return out;
+    if (scores[2].score >= 85) {
+        out.push(scores[2].role);
     }
+    return out;
 }
-exports.Role = Role;
-Role.SETTER = new Role('SETTER');
-Role.LIBERO = new Role('LIBERO');
-Role.OUTSIDE_HITTER = new Role('OUTSIDE_HITTER');
-Role.OPPOSITE_HITTER = new Role('OPPOSITE_HITTER');
-Role.MIDDLE_BLOCKER = new Role('MIDDLE_BLOCKER');
-Role.ROLES = [Role.LIBERO, Role.SETTER, Role.OPPOSITE_HITTER, Role.OUTSIDE_HITTER, Role.MIDDLE_BLOCKER];
+exports.assignRoles = assignRoles;

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

@@ -0,0 +1,12 @@
+import { PerformanceStats } from './performance-stats';
+export declare enum StatsEnum {
+    ATTACK = "ATTACK",
+    SET = "SET",
+    RECEIVE = "RECEIVE",
+    SERVE = "SERVE",
+    BLOCK = "BLOCK",
+    STAMINA = "STAMINA"
+}
+export type Stats = StatsEnum.ATTACK | StatsEnum.SET | StatsEnum.RECEIVE | StatsEnum.SERVE | StatsEnum.BLOCK | StatsEnum.STAMINA;
+export declare function calculateStatScore(performanceStats: PerformanceStats, statName: Stats): number;
+export declare function getMultipliers(statName: Stats, performanceStats?: PerformanceStats): any;

package/dist/cjs/src/{formula → service/player}/stats.js

@@ -1,17 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMultipliers = exports.calculateScore = exports.ALL_STATS = void 0;
-exports.ALL_STATS = ['ATTACK', 'SET', 'RECEIVE', 'SERVE', 'BLOCK', 'STAMINA'];
-function calculateScore(performanceStats, statName) {
+exports.getMultipliers = exports.calculateStatScore = exports.StatsEnum = void 0;
+var StatsEnum;
+(function (StatsEnum) {
+    StatsEnum["ATTACK"] = "ATTACK";
+    StatsEnum["SET"] = "SET";
+    StatsEnum["RECEIVE"] = "RECEIVE";
+    StatsEnum["SERVE"] = "SERVE";
+    StatsEnum["BLOCK"] = "BLOCK";
+    StatsEnum["STAMINA"] = "STAMINA";
+})(StatsEnum = exports.StatsEnum || (exports.StatsEnum = {}));
+function calculateStatScore(performanceStats, statName) {
     const multipliers = getMultipliers(statName, performanceStats);
     const score = Object.entries(multipliers)
         .reduce((total, [key, value]) => total + value * performanceStats[key], 0);
     return Math.round(score);
 }
-exports.calculateScore = calculateScore;
+exports.calculateStatScore = calculateStatScore;
 function getMultipliers(statName, performanceStats) {
     switch (statName) {
-        case 'ATTACK':
+        case StatsEnum.ATTACK:
             return {
                 spike: 0.55,
                 backAttack: 0.1,
@@ -20,7 +28,7 @@ function getMultipliers(statName, performanceStats) {
                 awareness: 0.05,
                 attack: 0.05
             };
-        case 'SET':
+        case StatsEnum.SET:
             return {
                 setting: 0.7,
                 overhand: 0.1,
@@ -28,7 +36,7 @@ function getMultipliers(statName, performanceStats) {
                 awareness: 0.075,
                 attack: 0.075
             };
-        case 'RECEIVE':
+        case StatsEnum.RECEIVE:
             return {
                 reception: 0.75,
                 overhand: 0.025,
@@ -36,13 +44,13 @@ function getMultipliers(statName, performanceStats) {
                 focus: 0.025,
                 defense: 0.05
             };
-        case 'SERVE':
+        case StatsEnum.SERVE:
             return {
                 serve: 0.85,
                 awareness: 0.075,
                 attack: 0.075
             };
-        case 'BLOCK':
+        case StatsEnum.BLOCK:
             return {
                 block: 0.65,
                 read: performanceStats == null ? 0.125 : performanceStats.read > performanceStats.commit ? 0.2 : 0.05,
@@ -50,7 +58,7 @@ function getMultipliers(statName, performanceStats) {
                 focus: 0.05,
                 defense: 0.05
             };
-        case 'STAMINA':
+        case StatsEnum.STAMINA:
             return { stamina: 1 };
         default:
             throw new Error('INVALID_STAT');

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

@@ -1,22 +1,15 @@
-import * as GeneralStat from '../../formula/stats';
 import { PerformanceStats } from './performance-stats';
 import { Rarity } from './rarity';
-export declare class Trait {
-    static readonly MASTER_MIND: Trait;
-    static readonly MOVING_WALL: Trait;
-    static readonly MARKSMAN: Trait;
-    static readonly METEOR_SERVE: Trait;
-    static readonly VIGOROUS: Trait;
-    static readonly GUARDIAN: Trait;
-    readonly id: string;
-    readonly name: string;
-    readonly modifier: number;
-    readonly chance: number;
-    readonly statThreshold: number;
-    readonly stat: GeneralStat.Stats;
-    readonly weight: number;
-    private constructor();
-    static getTraits(): Trait[];
-    static assignTraits(performanceStats: PerformanceStats, rarity: Rarity): Trait[];
-    toString(): string;
+import { EnumDataType } from 'sequelize';
+export declare enum TraitEnum {
+    MASTER_MIND = "MASTER_MIND",
+    MOVING_WALL = "MOVING_WALL",
+    MARKSMAN = "MARKSMAN",
+    METEOR_SERVE = "METEOR_SERVE",
+    VIGOROUS = "VIGOROUS",
+    GUARDIAN = "GUARDIAN",
+    FLOAT_SERVE = "FLOAT_SERVE"
 }
+export type Trait = TraitEnum.FLOAT_SERVE | TraitEnum.GUARDIAN | TraitEnum.MASTER_MIND | TraitEnum.MOVING_WALL | TraitEnum.MARKSMAN | TraitEnum.METEOR_SERVE | TraitEnum.VIGOROUS;
+export declare const TraitDataType: EnumDataType<Trait>;
+export declare function assignTraits(performanceStats: PerformanceStats, rarity: Rarity): Trait[];

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

@@ -1,148 +1,57 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Trait = void 0;
-const GeneralStat = __importStar(require("../../formula/stats"));
+exports.assignTraits = exports.TraitDataType = exports.TraitEnum = void 0;
 const rarity_1 = require("./rarity");
 const node_crypto_1 = require("node:crypto");
-class Trait {
-    constructor({ id, name, modifier, chance, statThreshold, stat, weight }) {
-        this.id = id;
-        this.name = name;
-        this.modifier = modifier;
-        this.chance = chance;
-        this.statThreshold = statThreshold;
-        this.stat = stat;
-        this.weight = weight;
-    }
-    static getTraits() {
-        return [Trait.GUARDIAN, Trait.MARKSMAN, Trait.METEOR_SERVE, Trait.VIGOROUS, Trait.MOVING_WALL, Trait.MASTER_MIND];
-    }
-    static assignTraits(performanceStats, rarity) {
-        let traitCount;
-        switch (rarity) {
-            case rarity_1.Rarity.COMMON: {
-                traitCount = 0;
-                break;
-            }
-            case rarity_1.Rarity.RARE: {
-                traitCount = (0, node_crypto_1.randomInt)(0, 1);
-                break;
-            }
-            case rarity_1.Rarity.LEGENDARY: {
-                traitCount = (0, node_crypto_1.randomInt)(0, 2);
-                break;
-            }
-            case rarity_1.Rarity.MYTHIC: {
-                traitCount = (0, node_crypto_1.randomInt)(1, 3);
-                break;
-            }
-            case rarity_1.Rarity.SPECIAL: {
-                traitCount = (0, node_crypto_1.randomInt)(2, 3);
-                break;
-            }
-            default:
-                throw new Error('INVALID_RARITY');
+const traits_json_1 = __importDefault(require("../../stat-config/traits.json"));
+const sequelize_1 = require("sequelize");
+const stats_1 = require("./stats");
+const traits = traits_json_1.default;
+var TraitEnum;
+(function (TraitEnum) {
+    TraitEnum["MASTER_MIND"] = "MASTER_MIND";
+    TraitEnum["MOVING_WALL"] = "MOVING_WALL";
+    TraitEnum["MARKSMAN"] = "MARKSMAN";
+    TraitEnum["METEOR_SERVE"] = "METEOR_SERVE";
+    TraitEnum["VIGOROUS"] = "VIGOROUS";
+    TraitEnum["GUARDIAN"] = "GUARDIAN";
+    TraitEnum["FLOAT_SERVE"] = "FLOAT_SERVE";
+})(TraitEnum = exports.TraitEnum || (exports.TraitEnum = {}));
+exports.TraitDataType = sequelize_1.DataTypes.ENUM(...Object.values(TraitEnum));
+function assignTraits(performanceStats, rarity) {
+    let traitCount;
+    switch (rarity) {
+        case rarity_1.RarityEnum.COMMON: {
+            traitCount = 0;
+            break;
         }
-        if (traitCount < 1)
-            return [];
-        const qualifiedTraits = this.getTraits()
-            .filter(trait => GeneralStat.calculateScore(performanceStats, trait.stat) >= trait.statThreshold);
-        return qualifiedTraits.sort((t1, t2) => t2.weight - t1.weight)
-            .slice(0, traitCount);
-    }
-    toString() {
-        return JSON.stringify({
-            name: this.name,
-            modifier: this.modifier,
-            statThreshold: this.statThreshold,
-            chance: this.chance,
-            stat: this.stat,
-            weight: this.weight
-        });
+        case rarity_1.RarityEnum.RARE: {
+            traitCount = (0, node_crypto_1.randomInt)(0, 1);
+            break;
+        }
+        case rarity_1.RarityEnum.LEGENDARY: {
+            traitCount = (0, node_crypto_1.randomInt)(0, 2);
+            break;
+        }
+        case rarity_1.RarityEnum.MYTHIC: {
+            traitCount = (0, node_crypto_1.randomInt)(1, 3);
+            break;
+        }
+        case rarity_1.RarityEnum.SPECIAL: {
+            traitCount = (0, node_crypto_1.randomInt)(2, 3);
+            break;
+        }
+        default:
+            throw new Error('INVALID_RARITY');
     }
+    if (traitCount < 1)
+        return [];
+    return traits.filter((trait) => (0, stats_1.calculateStatScore)(performanceStats, trait.stat) >= trait.statThreshold)
+        .sort((t1, t2) => t2.weight - t1.weight)
+        .map((trait) => trait.name)
+        .slice(0, traitCount);
 }
-exports.Trait = 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',
-    modifier: 1.1,
-    chance: 0.2,
-    statThreshold: 80,
-    stat: 'ATTACK',
-    weight: 10
-});
-// Will always participate in blocking regardless of chance and adds
-Trait.MOVING_WALL = new Trait({
-    id: '304c53f6-5e7a-44d3-9625-f10d8109421a',
-    name: 'Moving Wall',
-    modifier: 1.1,
-    chance: 1,
-    statThreshold: 75,
-    stat: 'DEFENSE',
-    weight: 5
-});
-// 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',
-    modifier: 1.05,
-    chance: 0.3,
-    statThreshold: 75,
-    stat: 'ATTACK',
-    weight: 5
-});
-// Increases the score of the serve by 10% when serve type is Jumping.
-Trait.METEOR_SERVE = new Trait({
-    id: 'c929a79d-5866-40d6-bbd6-b0b67a929c4c',
-    name: 'Meteor Serve',
-    modifier: 1.1,
-    chance: 0.1,
-    statThreshold: 75,
-    stat: 'SERVE',
-    weight: 10
-});
-// Has a 50% chance of taking an action without decreasing energy.
-Trait.VIGOROUS = new Trait({
-    id: 'f9599b87-b3b2-49ce-8224-470f6fe6ed64',
-    name: 'Vigorous',
-    modifier: 1,
-    statThreshold: 60,
-    chance: 0.5,
-    stat: 'PHYSICAL',
-    weight: 1
-});
-// Takes place of the receiver and increases reception score by 15%, guaranteeing success. Can only trigger in back-row.
-Trait.GUARDIAN = new Trait({
-    id: 'c3291953-9256-4559-b5a9-955ccb8f9a6f',
-    name: 'Guardian',
-    chance: 0.2,
-    statThreshold: 75,
-    modifier: 1.15,
-    stat: 'DEFENSE',
-    weight: 10
-});
+exports.assignTraits = assignTraits;

package/dist/cjs/src/{formula/role.formula.json → stat-config/roles.json}

@@ -18,7 +18,8 @@
             "read": 0,
             "commit": 0,
             "focus": 0,
-            "defense": 0
+            "defense": 0,
+            "saving": 0
         }
     },
     {
@@ -40,7 +41,8 @@
             "read": 0,
             "commit": 0,
             "focus": 0,
-            "defense": 0
+            "defense": 0,
+            "saving": 0
         }
     },
     {
@@ -62,7 +64,8 @@
             "read": 0,
             "commit": 0,
             "focus": 0,
-            "defense": 0
+            "defense": 0,
+            "saving": 0
         }
     },
     {
@@ -84,7 +87,8 @@
             "read": 0,
             "commit": 0,
             "focus": 0,
-            "defense": 0
+            "defense": 0,
+            "saving": 0
         }
     },
     {
@@ -106,7 +110,8 @@
             "read": 0,
             "commit": 0,
             "focus": 0,
-            "defense": 0
+            "defense": 0,
+            "saving": 0
         }
     }
 ]

package/dist/cjs/src/stat-config/traits.json

@@ -0,0 +1,58 @@
+[
+    {
+        "name": "MASTER_MIND",
+        "modifier": 1.1,
+        "chance": 0.2,
+        "statThreshold": 80,
+        "stat": "SET",
+        "weight": 10
+    },
+    {
+        "name": "MOVING_WALL",
+        "modifier": 1.1,
+        "chance": 1,
+        "statThreshold": 75,
+        "stat": "BLOCK",
+        "weight": 5
+    },
+    {
+        "name": "MARKSMAN",
+        "modifier": 1.05,
+        "chance": 0.3,
+        "statThreshold": 75,
+        "stat": "ATTACK",
+        "weight": 5
+    },
+    {
+        "name": "METEOR_SERVE",
+        "modifier": 1.1,
+        "chance": 0.1,
+        "statThreshold": 75,
+        "stat": "SERVE",
+        "weight": 10
+    },
+    {
+        "name": "FLOAT_SERVE",
+        "modifier": 1,
+        "chance": 0.5,
+        "statThreshold": 60,
+        "stat": "SERVE",
+        "weight": 10
+    },
+    {
+        "name": "VIGOROUS",
+        "modifier": 1,
+        "statThreshold": 60,
+        "chance": 0.5,
+        "stat": "STAMINA",
+        "weight": 1
+    },
+    {
+        "name": "GUARDIAN",
+        "chance": 0.2,
+        "statThreshold": 75,
+        "modifier": 1.15,
+        "stat": "RECEIVE",
+        "weight": 10
+    }
+]

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

@@ -1,4 +1,4 @@
-import { CoachModel, CompetitionChampionModel, CompetitionMatchModel, CompetitionModel, CompetitionTeamsModel, CountryModel, DraftModel, DraftPickModel, IterationModel, LeagueModel, LeagueSeasonModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, MatchSetStatsModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, PlayerTraitModel, RallyModel, SetPositionModel, TeamModel, TraitModel, UserModel } from './models';
+import { CoachModel, CompetitionChampionModel, CompetitionMatchModel, CompetitionModel, CompetitionTeamsModel, CountryModel, DraftModel, DraftPickModel, IterationModel, LeagueModel, LeagueSeasonModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, MatchSetStatsModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, RallyModel, SetPositionModel, TeamModel, UserModel } from './models';
 export function initModels(sequelize) {
     const Coach = CoachModel.initModel(sequelize);
     const Country = CountryModel.initModel(sequelize);
@@ -19,11 +19,9 @@ export function initModels(sequelize) {
     const PerformanceStats = PerformanceStatsModel.initModel(sequelize);
     const Player = PlayerModel.initModel(sequelize);
     const PlayerTeam = PlayerTeamModel.initModel(sequelize);
-    const PlayerTrait = PlayerTraitModel.initModel(sequelize);
     const Rally = RallyModel.initModel(sequelize);
     const SetPosition = SetPositionModel.initModel(sequelize);
     const Team = TeamModel.initModel(sequelize);
-    const Trait = TraitModel.initModel(sequelize);
     const User = UserModel.initModel(sequelize);
     Coach.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Coach.hasMany(Team, { as: 'Teams', foreignKey: 'coach_id' });
@@ -112,22 +110,13 @@ export function initModels(sequelize) {
         foreignKey: 'player_id',
         otherKey: 'team_id'
     });
-    Player.belongsToMany(Trait, {
-        as: 'Traits',
-        through: PlayerTrait,
-        foreignKey: 'player_id',
-        otherKey: 'trait_id'
-    });
     Player.hasMany(MatchSetStats, { as: 'MatchSetStats', foreignKey: 'player_id' });
     Player.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'player_id' });
-    Player.hasMany(PlayerTrait, { as: 'PlayerTraits', foreignKey: 'player_id' });
     Player.hasMany(SetPosition, { as: 'SetPositions', foreignKey: 'player_id' });
     Player.hasOne(DraftPick, { as: 'DraftPick', foreignKey: 'player_id' });
     Player.hasOne(PerformanceStats, { as: 'PerformanceStat', foreignKey: 'player_id' });
     PlayerTeam.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     PlayerTeam.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
-    PlayerTrait.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
-    PlayerTrait.belongsTo(Trait, { as: 'trait', foreignKey: 'trait_id' });
     Rally.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
     Rally.belongsTo(Team, { as: 'ServingTeam', foreignKey: 'serving_team' });
     SetPosition.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
@@ -162,13 +151,6 @@ export function initModels(sequelize) {
     Team.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'team_id' });
     Team.hasMany(Rally, { as: 'Rallies', foreignKey: 'serving_team' });
     Team.hasMany(MatchResult, { as: 'WonMatches', foreignKey: 'winner_team_id' });
-    Trait.belongsToMany(Player, {
-        as: 'Players',
-        through: PlayerTrait,
-        foreignKey: 'trait_id',
-        otherKey: 'player_id'
-    });
-    Trait.hasMany(PlayerTrait, { as: 'PlayerTraits', foreignKey: 'trait_id' });
     return {
         Coach,
         Competition,
@@ -178,7 +160,6 @@ export function initModels(sequelize) {
         Country,
         Draft,
         DraftPick,
-        Event,
         Iteration,
         League,
         LeagueSeason,
@@ -190,11 +171,9 @@ export function initModels(sequelize) {
         PerformanceStats,
         Player,
         PlayerTeam,
-        PlayerTrait,
         Rally,
         SetPosition,
         Team,
-        Trait,
         User
     };
 }