@mtgame/core 0.1.130 → 0.1.132

package/fesm2015/mtgame-core.js

@@ -2799,6 +2799,9 @@ BasketballGameLog = __decorate([
 ], BasketballGameLog);
 
 let GameUser = class GameUser extends BaseModel {
+    get gameUserNumber() {
+        return this.number ? this.number : this.teamUser.number;
+    }
     static toFront(data) { }
     static toBack(data) { }
 };
@@ -4941,37 +4944,48 @@ WaterpoloStatistic = __decorate([
             team_missed_sum: 'teamMissedSum',
             tournament_points: 'tournamentPoints',
             points: 'points',
-            pp_shots: 'ppShots',
             pp_shot_misses: 'ppShotMisses',
             pp_shots_on_goal: 'ppShotsOnGoal',
             pp_shots_blocked: 'ppShotsBlocked',
-            ev_shots: 'evShots',
             ev_shot_misses: 'evShotMisses',
             ev_shots_on_goal: 'evShotsOnGoal',
             ev_shots_blocked: 'evShotsBlocked',
-            sh_shots: 'shShots',
             sh_shot_misses: 'shShotMisses',
             sh_shots_on_goal: 'shShotsOnGoal',
             sh_shots_blocked: 'shShotsBlocked',
-            pp_goals_percent: 'ppGoalsPercent',
+            pp_total_shots_on_goal: 'ppTotalShotsOnGoal',
+            ev_total_shots_on_goal: 'evTotalShotsOnGoal',
+            sh_total_shots_on_goal: 'shTotalShotsOnGoal',
             pp_goals: 'ppGoals',
-            total_pp_goals: 'totalPpGoals',
-            ev_goals_percent: 'evGoalsPercent',
             ev_goals: 'evGoals',
-            total_ev_goals: 'totalEvGoals',
-            sh_goals_percent: 'shGoalsPercent',
-            goals: 'goals',
-            total_goals: 'totalGoals',
             sh_goals: 'shGoals',
-            total_sh_goals: 'totalShGoals',
-            shot_misses: 'shotMisses',
-            shots_on_goal: 'shotsOnGoal',
-            shots_on_goal_percent: 'shotsOnGoalPercent',
-            shots_blocked: 'shotsBlocked',
-            shots: 'shots',
-            total_shots: 'totalShots',
-            goals_percent: 'goalsPercent',
-            total_goals_percent: 'totalGoalsPercent',
+            pp_counterattack_goals: 'ppCounterAttackGoals',
+            pp_counterattack_on_goals: 'ppCounterAttackOnGoals',
+            pp_counterattack_misses: 'ppCounterAttackMisses',
+            ev_counterattack_goals: 'evCounterAttackGoals',
+            ev_counterattack_on_goals: 'evCounterAttackOnGoals',
+            ev_counterattack_misses: 'evCounterAttackMisses',
+            sh_counterattack_goals: 'shCounterAttackGoals',
+            sh_counterattack_on_goals: 'shCounterAttackOnGoals',
+            sh_counterattack_misses: 'shCounterAttackMisses',
+            pp_maneuver_goals: 'ppManeuverGoals',
+            pp_maneuver_on_goals: 'ppManeuverOnGoals',
+            pp_maneuver_misses: 'ppManeuverMisses',
+            ev_maneuver_goals: 'evManeuverGoals',
+            ev_maneuver_on_goals: 'evManeuverOnGoals',
+            ev_maneuver_misses: 'evManeuverMisses',
+            sh_maneuver_goals: 'shManeuverGoals',
+            sh_maneuver_on_goals: 'shManeuverOnGoals',
+            sh_maneuver_misses: 'shManeuverMisses',
+            pp_center_forward_goals: 'ppCenterForwardGoals',
+            pp_center_forward_on_goals: 'ppCenterForwardOnGoals',
+            pp_center_forward_misses: 'ppCenterForwardMisses',
+            ev_center_forward_goals: 'evCenterForwardGoals',
+            ev_center_forward_on_goals: 'evCenterForwardOnGoals',
+            ev_center_forward_misses: 'evCenterForwardMisses',
+            sh_center_forward_goals: 'shCenterForwardGoals',
+            sh_center_forward_on_goals: 'shCenterForwardOnGoals',
+            sh_center_forward_misses: 'shCenterForwardMisses',
             pp_assists: 'ppAssists',
             ev_assists: 'evAssists',
             sh_assists: 'shAssists',
@@ -4982,31 +4996,73 @@ WaterpoloStatistic = __decorate([
             block_shots: 'blockShots',
             face_off_losses: 'faceOffLosses',
             face_off_wins: 'faceOffWins',
-            face_offs: 'faceOffs',
-            face_off_percent: 'faceOffPercent',
-            saves: 'saves',
-            total_saves: 'totalSaves',
+            pp_saves: 'ppSaves',
+            sh_saves: 'shSaves',
+            ev_saves: 'evSaves',
+            pp_counterattack_saves: 'ppCounterAttackSaves',
+            sh_counterattack_saves: 'shCounterAttackSaves',
+            ev_counterattack_saves: 'evCounterAttackSaves',
+            pp_maneuver_saves: 'ppManeuverSaves',
+            sh_maneuver_saves: 'shManeuverSaves',
+            ev_maneuver_saves: 'evManeuverSaves',
+            pp_center_forward_saves: 'ppCenterForwardSaves',
+            sh_center_forward_saves: 'shCenterForwardSaves',
+            ev_center_forward_saves: 'evCenterForwardSaves',
+            pp_free_kick_saves: 'ppFreeKickSaves',
+            sh_free_kick_saves: 'shFreeKickSaves',
+            ev_free_kick_saves: 'evFreeKickSaves',
+            pp_corner_saves: 'ppCornerSaves',
+            sh_corner_saves: 'shCornerSaves',
+            ev_corner_saves: 'evCornerSaves',
+            pp_total_game_saves: 'ppTotalGameSaves',
+            sh_total_game_saves: 'shTotalGameSaves',
+            ev_total_game_saves: 'evTotalGameSaves',
             shootout_saves: 'shootoutSaves',
-            shots_against: 'shotsAgainst',
-            shootout_shots_against: 'shootoutShotsAgainst',
-            total_shots_against: 'totalShotsAgainst',
-            saves_percent: 'savesPercent',
-            total_saves_percent: 'totalSavesPercent',
+            after_game_shootout_saves: 'afterGameShootoutSaves',
+            pp_goals_against: 'ppGoalsAgainst',
+            sh_goals_against: 'shGoalsAgainst',
+            ev_goals_against: 'evGoalsAgainst',
             goals_against: 'goalsAgainst',
+            pp_counterattack_goals_against: 'ppCounterAttackGoalsAgainst',
+            sh_counterattack_goals_against: 'shCounterAttackGoalsAgainst',
+            ev_counterattack_goals_against: 'evCounterAttackGoalsAgainst',
+            counterattack_goals_against: 'counterAttackGoalsAgainst',
+            pp_maneuver_goals_against: 'ppManeuverGoalsAgainst',
+            sh_maneuver_goals_against: 'shManeuverGoalsAgainst',
+            ev_maneuver_goals_against: 'evManeuverGoalsAgainst',
+            maneuver_goals_against: 'maneuverGoalsAgainst',
+            pp_center_forward_goals_against: 'ppCenterForwardGoalsAgainst',
+            sh_center_forward_goals_against: 'shCenterForwardGoalsAgainst',
+            ev_center_forward_goals_against: 'evCenterForwardGoalsAgainst',
+            center_forward_goals_against: 'centerForwardGoalsAgainst',
+            pp_free_kick_goals_against: 'ppFreeKickGoalsAgainst',
+            sh_free_kick_goals_against: 'shFreeKickGoalsAgainst',
+            ev_free_kick_goals_against: 'evFreeKickGoalsAgainst',
+            free_kick_goals_against: 'freeKickGoalsAgainst',
+            pp_corner_goals_against: 'ppCornerGoalsAgainst',
+            sh_corner_goals_against: 'shCornerGoalsAgainst',
+            ev_corner_goals_against: 'evCornerGoalsAgainst',
+            corner_goals_against: 'cornerGoalsAgainst',
             shootout_goals_against: 'shootoutGoalsAgainst',
-            total_goals_against: 'totalGoalsAgainst',
+            after_game_shootout_goals_against: 'afterGameShootoutGoalsAgainst',
             safety_rate: 'safetyRate',
             penalty_minutes: 'penaltyMinutes',
             game_time: 'gameTime',
             plus_minus: 'plusMinus',
-            yellow_cards: 'yellowCards',
-            red_cards: 'redCards',
             fouls: 'fouls',
+            minor_penalties: 'minorPenalties',
+            major_penalties: 'majorPenalties',
+            match_penalties: 'matchPenalties',
+            penalty_fouls: 'penaltyFouls',
+            turnovers: 'turnovers',
+            attack_fouls: 'attackFouls',
             personal_fouls: 'personalFouls',
-            total_fouls: 'totalFouls',
+            drawn_fouls: 'drawnFouls',
+            drawn_turnovers: 'drawnTurnovers',
+            yellow_cards: 'yellowCards',
+            red_cards: 'redCards',
             losses: 'losses',
             steals: 'steals',
-            drawn_fouls: 'drawnFouls',
             pp_free_kick_goals: 'ppFreeKickGoals',
             pp_free_kick_on_goals: 'ppFreeKickOnGoals',
             pp_free_kick_misses: 'ppFreeKickMisses',
@@ -5029,8 +5085,65 @@ WaterpoloStatistic = __decorate([
             ev_corner_misses: 'evCornerMisses',
             corner_passes: 'cornerPasses',
             corner_selfs: 'cornerSelfs',
-            total_corners: 'totalCorners',
+            tackles: 'tackles',
+            player_efficiency: 'playerEfficiency',
+            pp_shots: 'ppShots',
+            ev_shots: 'evShots',
+            sh_shots: 'shShots',
+            pp_goals_percent: 'ppGoalsPercent',
+            sh_goals_percent: 'shGoalsPercent',
+            ev_goals_percent: 'evGoalsPercent',
+            total_pp_goals: 'totalPpGoals',
+            total_sh_goals: 'totalShGoals',
+            total_ev_goals: 'totalEvGoals',
+            goals: 'goals',
+            total_goals: 'totalGoals',
+            total_counterattack_goals: 'totalCounterAttackGoals',
+            total_maneuver_goals: 'totalManeuverGoals',
+            total_center_forward_goals: 'totalCenterForwardGoals',
+            total_in_game_goals: 'totalInGameGoals',
+            in_game_shot_misses: 'inGameShotMisses',
+            counterattack_shot_misses: 'counterAttackShotMisses',
+            center_forward_shot_misses: 'centerForwardShotMisses',
+            total_pp_shot_misses: 'totalPpShotMisses',
+            free_kick_shot_misses: 'freeKickShotMisses',
+            shot_misses: 'shotMisses',
+            total_pp_shots_on_goal: 'totalPpShotsOnGoal',
+            counterattack_shot_on_goals: 'counterAttackShotOnGoals',
+            center_forward_shot_on_goals: 'centerForwardShotOnGoals',
+            free_kick_on_goals: 'freeKickOnGoals',
+            in_game_shots_on_goals: 'inGameShotsOnGoals',
+            shots_on_goal: 'shotsOnGoal',
+            shots_blocked: 'shotsBlocked',
+            shots: 'shots',
+            shots_on_goal_percent: 'shotsOnGoalPercent',
+            total_shots: 'totalShots',
+            goals_percent: 'goalsPercent',
+            total_goals_percent: 'totalGoalsPercent',
+            face_offs: 'faceOffs',
+            face_off_percent: 'faceOffPercent',
+            total_free_kick_goals: 'totalFreeKickGoals',
             total_free_kicks: 'totalFreeKicks',
+            total_corner_goals: 'totalCornerGoals',
+            total_corners: 'totalCorners',
+            total_fouls: 'totalFouls',
+            shootout_shots: 'shootoutShots',
+            shootout_goals_percent: 'shootoutGoalsPercent',
+            /*goalie stat*/
+            counterattack_saves: 'counterAttackSaves',
+            center_forward_saves: 'centerForwardSaves',
+            free_kick_saves: 'freeKickSaves',
+            in_game_saves: 'inGameSaves',
+            total_sh_saves: 'totalShSaves',
+            saves: 'saves',
+            total_saves: 'totalSaves',
+            shootout_shots_against: 'shootoutShotsAgainst',
+            shootout_saves_percent: 'shootoutSavesPercent',
+            game_shots_against: 'gameShotsAgainst',
+            saves_percent: 'savesPercent',
+            total_shots_against: 'totalShotsAgainst',
+            total_saves_percent: 'totalSavesPercent',
+            total_sh_goals_against: 'totalShGoalsAgainst',
             newbie: 'newbie',
             rank: 'rank',
         },
@@ -8516,6 +8629,24 @@ var WaterpoloGameLogTypes;
     WaterpoloGameLogTypes[WaterpoloGameLogTypes["corner_pass"] = 38] = "corner_pass";
     WaterpoloGameLogTypes[WaterpoloGameLogTypes["corner_self"] = 39] = "corner_self";
     WaterpoloGameLogTypes[WaterpoloGameLogTypes["personal_foul"] = 40] = "personal_foul";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["counterattack_goal"] = 41] = "counterattack_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["counterattack_on_goal"] = 42] = "counterattack_on_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["counterattack_miss"] = 43] = "counterattack_miss";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["counterattack_save"] = 44] = "counterattack_save";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["maneuver_goal"] = 45] = "maneuver_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["maneuver_on_goal"] = 46] = "maneuver_on_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["maneuver_miss"] = 47] = "maneuver_miss";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["maneuver_save"] = 48] = "maneuver_save";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["center_forward_goal"] = 49] = "center_forward_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["center_forward_on_goal"] = 50] = "center_forward_on_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["center_forward_miss"] = 51] = "center_forward_miss";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["center_forward_save"] = 52] = "center_forward_save";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["free_kick_save"] = 53] = "free_kick_save";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["corner_save"] = 54] = "corner_save";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["tackle"] = 55] = "tackle";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["penalty_foul"] = 56] = "penalty_foul";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["attack_foul"] = 57] = "attack_foul";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["turnover"] = 58] = "turnover";
 })(WaterpoloGameLogTypes || (WaterpoloGameLogTypes = {}));
 var WaterpoloAdvantageTypes;
 (function (WaterpoloAdvantageTypes) {
@@ -8553,7 +8684,8 @@ let WaterpoloGameLog = class WaterpoloGameLog extends BaseModel {
     }
     isScoreType() {
         return [WaterpoloGameLogTypes.goal, WaterpoloGameLogTypes.shootout_goal, WaterpoloGameLogTypes.after_game_shootout_goal,
-            WaterpoloGameLogTypes.free_kick_goal, WaterpoloGameLogTypes.corner_goal].indexOf(this.logType) > -1;
+            WaterpoloGameLogTypes.free_kick_goal, WaterpoloGameLogTypes.corner_goal,
+            WaterpoloGameLogTypes.counterattack_goal, WaterpoloGameLogTypes.maneuver_goal, WaterpoloGameLogTypes.center_forward_goal].indexOf(this.logType) > -1;
     }
     isPenaltyType() {
         return [
@@ -8562,7 +8694,8 @@ let WaterpoloGameLog = class WaterpoloGameLog extends BaseModel {
     }
     isFoulType() {
         return [
-            WaterpoloGameLogTypes.minor_penalty, WaterpoloGameLogTypes.major_penalty, WaterpoloGameLogTypes.match_penalty, WaterpoloGameLogTypes.personal_foul, WaterpoloGameLogTypes.foul
+            WaterpoloGameLogTypes.minor_penalty, WaterpoloGameLogTypes.major_penalty, WaterpoloGameLogTypes.match_penalty,
+            WaterpoloGameLogTypes.personal_foul, WaterpoloGameLogTypes.foul, WaterpoloGameLogTypes.attack_foul
         ].indexOf(this.logType) > -1;
     }
     isAfter(log) {
@@ -8616,112 +8749,214 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
     get id() {
         return this.gameUserId;
     }
-    get shotsOnGoal() {
-        return (this.evShotsOnGoal || 0) + (this.ppShotsOnGoal || 0) + (this.shShotsOnGoal || 0) +
-            (this.evCornerOnGoals || 0) + (this.ppCornerOnGoals || 0) + (this.shCornerOnGoals || 0) +
-            (this.evFreeKickOnGoals || 0) + (this.ppFreeKickOnGoals || 0) + (this.shFreeKickOnGoals || 0);
+    get gameMinutes() {
+        return Math.floor(this.gameTime / 60);
     }
-    get shotsBlocked() {
-        return (this.evShotsBlocked || 0) + (this.ppShotsBlocked || 0) + (this.shShotsBlocked || 0);
+    get penaltyTime() {
+        if (!this.penaltyMinutes) {
+            return '00:00';
+        }
+        const minutes = Math.floor(this.penaltyMinutes / 60);
+        const seconds = Math.floor(this.penaltyMinutes - minutes * 60);
+        return `${minutes < 10 ? 0 : ''}${minutes}:${seconds < 10 ? 0 : ''}${seconds}`;
     }
-    get shotMisses() {
-        return (this.evShotMisses || 0) + (this.ppShotMisses || 0) + (this.shShotMisses || 0) +
-            (this.evCornerMisses || 0) + (this.ppCornerMisses || 0) + (this.shCornerMisses || 0) +
-            (this.evFreeKickMisses || 0) + (this.ppFreeKickMisses || 0) + (this.shFreeKickMisses || 0);
+    get assists() {
+        return (this.ppAssists || 0) + (this.shAssists || 0) + (this.evAssists || 0);
+    }
+    get totalCounterAttackGoals() {
+        return (this.ppCounterAttackGoals || 0) + (this.evCounterAttackGoals || 0) + (this.shCounterAttackGoals || 0);
+    }
+    get ppCounterAttackShots() {
+        return (this.ppCounterAttackOnGoals || 0) + (this.ppCounterAttackMisses || 0);
+    }
+    get shCounterAttackShots() {
+        return (this.shCounterAttackOnGoals || 0) + (this.shCounterAttackMisses || 0);
+    }
+    get evCounterAttackShots() {
+        return (this.evCounterAttackOnGoals || 0) + (this.evCounterAttackMisses || 0);
+    }
+    get counterAttackShotMisses() {
+        return (this.ppCounterAttackMisses || 0) + (this.shCounterAttackMisses || 0) + (this.evCounterAttackMisses || 0);
+    }
+    get counterAttackShotOnGoals() {
+        return (this.ppCounterAttackOnGoals || 0) + (this.shCounterAttackOnGoals || 0) + (this.evCounterAttackOnGoals || 0);
+    }
+    get totalManeuverGoals() {
+        return (this.ppManeuverGoals || 0) + (this.shManeuverGoals || 0) + (this.evManeuverGoals || 0);
+    }
+    get ppManeuverShots() {
+        return (this.ppManeuverOnGoals || 0) + (this.ppManeuverMisses || 0);
+    }
+    get shManeuverShots() {
+        return (this.shManeuverOnGoals || 0) + (this.shManeuverMisses || 0);
+    }
+    get evManeuverShots() {
+        return (this.evManeuverOnGoals || 0) + (this.evManeuverMisses || 0);
+    }
+    get maneuverShotMisses() {
+        return (this.ppManeuverMisses || 0) + (this.shManeuverMisses || 0) + (this.evManeuverMisses || 0);
+    }
+    get maneuverShotOnGoals() {
+        return (this.ppManeuverOnGoals || 0) + (this.shManeuverOnGoals || 0) + (this.evManeuverOnGoals || 0);
+    }
+    get totalCenterForwardGoals() {
+        return (this.ppCenterForwardGoals || 0) + (this.shCenterForwardGoals || 0) + (this.evCenterForwardGoals || 0);
+    }
+    get ppCenterForwardShots() {
+        return (this.ppCenterForwardOnGoals || 0) + (this.ppCenterForwardMisses || 0);
+    }
+    get shCenterForwardShots() {
+        return (this.shCenterForwardOnGoals || 0) + (this.shCenterForwardMisses || 0);
+    }
+    get evCenterForwardShots() {
+        return (this.evCenterForwardOnGoals || 0) + (this.evCenterForwardMisses || 0);
+    }
+    get centerForwardShotMisses() {
+        return (this.ppCenterForwardMisses || 0) + (this.shCenterForwardMisses || 0) + (this.evCenterForwardMisses || 0);
+    }
+    get centerForwardShotOnGoals() {
+        return (this.ppCenterForwardOnGoals || 0) + (this.shCenterForwardOnGoals || 0) + (this.evCenterForwardOnGoals || 0);
     }
     get ppShots() {
         return (this.ppShotMisses || 0) + (this.ppShotsOnGoal || 0) + (this.ppShotsBlocked || 0) +
+            (this.ppFreeKickMisses || 0) + (this.ppFreeKickOnGoals || 0) +
             (this.ppCornerMisses || 0) + (this.ppCornerOnGoals || 0) +
-            (this.ppFreeKickMisses || 0) + (this.ppFreeKickOnGoals || 0);
+            this.ppCounterAttackShots + this.ppManeuverShots + this.ppCenterForwardShots;
     }
     get evShots() {
         return (this.evShotMisses || 0) + (this.evShotsOnGoal || 0) + (this.evShotsBlocked || 0) +
+            (this.evFreeKickMisses || 0) + (this.evFreeKickOnGoals || 0) +
             (this.evCornerMisses || 0) + (this.evCornerOnGoals || 0) +
-            (this.evFreeKickMisses || 0) + (this.evFreeKickOnGoals || 0);
+            this.evCounterAttackShots + this.evManeuverShots + this.evCenterForwardShots;
     }
     get shShots() {
         return (this.shShotMisses || 0) + (this.shShotsOnGoal || 0) + (this.shShotsBlocked || 0) +
+            (this.shFreeKickMisses || 0) + (this.shFreeKickOnGoals || 0) +
             (this.shCornerMisses || 0) + (this.shCornerOnGoals || 0) +
-            (this.shFreeKickMisses || 0) + (this.shFreeKickOnGoals || 0);
-    }
-    get shots() {
-        return this.ppShots + this.evShots + this.shShots + (this.shootoutAttempts || 0);
-    }
-    get shotsOnGoalPercent() {
-        if (!this.shots || !this.shotsOnGoal) {
-            return 0;
-        }
-        return Math.round(1000 * this.shotsOnGoal / this.shots) / 10;
-    }
-    get totalShots() {
-        return this.shots + (this.shootoutAttempts || 0);
+            this.shCounterAttackShots + this.shManeuverShots + this.shCenterForwardShots;
     }
     get totalShGoals() {
-        return (this.shGoals || 0) + (this.shFreeKickGoals || 0) + (this.shCornerGoals || 0);
+        return (this.shGoals || 0) + (this.shFreeKickGoals || 0) + (this.shCornerGoals || 0) +
+            (this.shCounterAttackGoals || 0) + (this.shManeuverGoals || 0) + (this.shCenterForwardGoals || 0);
     }
     get totalEvGoals() {
-        return (this.evGoals || 0) + (this.evFreeKickGoals || 0) + (this.evCornerGoals || 0);
+        return (this.evGoals || 0) + (this.evFreeKickGoals || 0) + (this.evCornerGoals || 0) +
+            (this.evCounterAttackGoals || 0) + (this.evManeuverGoals || 0) + (this.evCenterForwardGoals || 0);
     }
     get totalPpGoals() {
-        return (this.ppGoals || 0) + (this.ppFreeKickGoals || 0) + (this.ppCornerGoals || 0);
+        return (this.ppGoals || 0) + (this.ppFreeKickGoals || 0) + (this.ppCornerGoals || 0) +
+            (this.ppCounterAttackGoals || 0) + (this.ppManeuverGoals || 0) + (this.ppCenterForwardGoals || 0);
     }
     get goals() {
-        return this.totalEvGoals + this.totalPpGoals + this.totalShGoals;
+        return this.totalShGoals + this.totalEvGoals + this.totalPpGoals;
     }
     get totalGoals() {
         return this.goals + (this.shootoutGoals || 0);
     }
-    get assists() {
-        return (this.ppAssists || 0) + (this.evAssists || 0) + (this.shAssists || 0);
+    get shootoutShots() {
+        return (this.shootoutGoals || 0) + (this.shootoutAttempts || 0);
+    }
+    get inGameShotMisses() {
+        return (this.ppShotMisses || 0) + (this.evShotMisses || 0) + (this.shShotMisses || 0) +
+            this.counterAttackShotMisses + this.maneuverShotMisses + this.centerForwardShotMisses;
+    }
+    get shotMisses() {
+        return (this.ppFreeKickMisses || 0) + (this.evFreeKickMisses || 0) + (this.shFreeKickMisses || 0) +
+            (this.ppCornerMisses || 0) + (this.evCornerMisses || 0) + (this.shCornerMisses || 0) +
+            this.inGameShotMisses;
+    }
+    get totalPpShotMisses() {
+        return (this.ppShotMisses || 0) + (this.ppFreeKickMisses || 0) + (this.ppCornerMisses || 0) +
+            (this.ppCounterAttackMisses || 0) + (this.ppManeuverMisses || 0) + (this.ppCenterForwardMisses || 0);
+    }
+    get shotsOnGoal() {
+        return (this.ppShotsOnGoal || 0) + (this.evShotsOnGoal || 0) + (this.shShotsOnGoal || 0) +
+            (this.ppFreeKickOnGoals || 0) + (this.evFreeKickOnGoals || 0) + (this.shFreeKickOnGoals || 0) +
+            (this.ppCornerOnGoals || 0) + (this.evCornerOnGoals || 0) + (this.shCornerOnGoals || 0) +
+            this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals;
+    }
+    get totalPpShotsOnGoal() {
+        return (this.ppShotsOnGoal || 0) + (this.ppFreeKickOnGoals || 0) + (this.ppCornerOnGoals || 0) +
+            (this.ppCounterAttackOnGoals || 0) + (this.ppManeuverOnGoals || 0) + (this.ppCenterForwardOnGoals || 0);
+    }
+    get inGameShotsOnGoals() {
+        return (this.ppShotsOnGoal || 0) + (this.evShotsOnGoal || 0) + (this.shShotsOnGoal || 0) +
+            this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals;
+    }
+    get shotsBlocked() {
+        return (this.ppShotsBlocked || 0) + (this.evShotsBlocked || 0) + (this.shShotsBlocked || 0);
+    }
+    get shots() {
+        return this.ppShots + this.evShots + this.shShots;
+    }
+    get totalShots() {
+        return this.shots + (this.shootoutAttempts || 0);
     }
     get faceOffs() {
         return (this.faceOffWins || 0) + (this.faceOffLosses || 0);
     }
-    get shootOuts() {
-        return (this.shootoutAttempts || 0) + (this.shootoutGoals || 0);
+    get freeKickShotMisses() {
+        return (this.ppFreeKickMisses || 0) + (this.evFreeKickMisses || 0) + (this.shFreeKickMisses || 0);
     }
-    get shotsAgainst() {
-        return (this.saves || 0) + (this.goalsAgainst || 0);
+    get freeKickOnGoals() {
+        return (this.ppFreeKickOnGoals || 0) + (this.evFreeKickOnGoals || 0) + (this.shFreeKickOnGoals || 0);
     }
-    get shootoutShotsAgainst() {
-        return (this.shootoutSaves || 0) + (this.shootoutGoalsAgainst || 0);
+    get totalFreeKickGoals() {
+        return (this.ppFreeKickGoals || 0) + (this.shFreeKickGoals || 0) + (this.evFreeKickGoals || 0);
     }
-    get totalShotsAgainst() {
-        return this.shotsAgainst + this.shootoutShotsAgainst;
+    get totalFreeKicks() {
+        return (this.freeKickSelfs || 0) + (this.freeKickPasses || 0) +
+            this.freeKickShotMisses + this.freeKickOnGoals + this.totalFreeKickGoals;
     }
-    get savesPercent() {
-        if (!this.shotsAgainst || !this.saves) {
-            return 0;
-        }
-        return Math.round(1000 * this.saves / this.shotsAgainst) / 10;
+    get totalCornerGoals() {
+        return (this.ppCornerGoals || 0) + (this.shCornerGoals || 0) + (this.evCornerGoals || 0);
     }
-    get totalSaves() {
-        return (this.saves || 0) + (this.shootoutSaves || 0);
+    get totalCorners() {
+        return (this.cornerSelfs || 0) + (this.cornerPasses || 0) +
+            (this.ppCornerOnGoals || 0) + (this.shCornerOnGoals || 0) + (this.evCornerOnGoals || 0) +
+            (this.ppCornerMisses || 0) + (this.shCornerMisses || 0) + (this.evCornerMisses || 0) +
+            this.totalCornerGoals;
     }
-    get totalSavesPercent() {
-        if (!this.totalShotsAgainst || !this.totalSaves) {
+    get totalFouls() {
+        return (this.fouls || 0) + (this.penaltyFouls || 0) + (this.attackFouls || 0) + (this.personalFouls || 0);
+    }
+    get inGameGoals() {
+        return (this.shGoals || 0) + (this.evGoals || 0) + (this.ppGoals || 0);
+    }
+    get totalInGameGoals() {
+        return this.totalCenterForwardGoals + this.totalManeuverGoals + this.totalCounterAttackGoals + this.inGameGoals;
+    }
+    get ppGoalsPercent() {
+        if (!this.totalPpGoals || !this.ppShots) {
             return 0;
         }
-        return Math.round(1000 * this.totalSaves / this.totalShotsAgainst) / 10;
+        return Math.round(1000 * this.totalPpGoals / this.ppShots) / 10;
     }
-    get totalGoalsAgainst() {
-        return (this.goalsAgainst || 0) + (this.shootoutGoalsAgainst || 0);
-    }
-    get totalFouls() {
-        return (this.fouls || 0) + (this.personalFouls || 0);
+    get evGoalsPercent() {
+        if (!this.totalEvGoals || !this.evShots) {
+            return 0;
+        }
+        return Math.round(1000 * this.totalEvGoals / this.evShots) / 10;
     }
-    get gameMinutes() {
-        return Math.floor(this.gameTime / 60);
+    get shGoalsPercent() {
+        if (!this.totalShGoals || !this.shShots) {
+            return 0;
+        }
+        return Math.round(1000 * this.totalShGoals / this.shShots) / 10;
     }
-    get penaltyTime() {
-        if (!this.penaltyMinutes) {
-            return '00:00';
+    get shotsOnGoalPercent() {
+        if (!this.shotsOnGoal || !this.shots) {
+            return 0;
         }
-        const minutes = Math.floor(this.penaltyMinutes / 60);
-        const seconds = Math.floor(this.penaltyMinutes - minutes * 60);
-        return `${minutes < 10 ? 0 : ''}${minutes}:${seconds < 10 ? 0 : ''}${seconds}`;
+        return Math.round(1000 * this.shotsOnGoal / this.shots) / 10;
     }
     get goalsPercent() {
+        if (!this.goals || !this.shots) {
+            return 0;
+        }
+        return Math.round(1000 * this.goals / this.shots) / 10;
+    }
+    get totalGoalsPercent() {
         if (!this.totalGoals || !this.totalShots) {
             return 0;
         }
@@ -8733,20 +8968,85 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
         }
         return Math.round(1000 * this.faceOffWins / this.faceOffs) / 10;
     }
+    get shootoutGoalsPercent() {
+        if (!this.shootoutGoals || !this.shootoutShots) {
+            return 0;
+        }
+        return Math.round(1000 * this.shootoutGoals / this.shootoutShots) / 10;
+    }
     get goalpass() {
         return (this.totalGoals || 0) + (this.assists || 0);
     }
-    get totalFreeKicks() {
-        return (this.freeKickPasses || 0) + (this.freeKickSelfs || 0) +
-            (this.ppFreeKickGoals || 0) + (this.ppFreeKickOnGoals || 0) + (this.ppFreeKickMisses || 0) +
-            (this.evFreeKickGoals || 0) + (this.evFreeKickOnGoals || 0) + (this.evFreeKickMisses || 0) +
-            (this.shFreeKickGoals || 0) + (this.shFreeKickOnGoals || 0) + (this.shFreeKickMisses || 0);
+    /*goalie stat */
+    get counterAttackSaves() {
+        return (this.ppCounterAttackSaves || 0) + (this.shCounterAttackSaves || 0) + (this.evCounterAttackSaves || 0);
     }
-    get totalCorners() {
-        return (this.cornerPasses || 0) + (this.cornerSelfs || 0) +
-            (this.ppCornerGoals || 0) + (this.ppCornerOnGoals || 0) + (this.ppCornerMisses || 0) +
-            (this.evCornerGoals || 0) + (this.evCornerOnGoals || 0) + (this.evCornerMisses || 0) +
-            (this.shCornerGoals || 0) + (this.shCornerOnGoals || 0) + (this.shCornerMisses || 0);
+    get centerForwardSaves() {
+        return (this.ppCenterForwardSaves || 0) + (this.shCenterForwardSaves || 0) + (this.evCenterForwardSaves || 0);
+    }
+    get maneuverSaves() {
+        return (this.ppManeuverSaves || 0) + (this.shManeuverSaves || 0) + (this.evManeuverSaves || 0);
+    }
+    get freeKickSaves() {
+        return (this.ppFreeKickSaves || 0) + (this.shFreeKickSaves || 0) + (this.evFreeKickSaves || 0);
+    }
+    get cornerSaves() {
+        return (this.ppCornerSaves || 0) + (this.shCornerSaves || 0) + (this.evCornerSaves || 0);
+    }
+    get totalShSaves() {
+        return (this.shCounterAttackSaves || 0) + (this.shManeuverSaves || 0) + (this.shCenterForwardSaves || 0) +
+            (this.shSaves || 0) + (this.shFreeKickSaves || 0) + (this.shCornerSaves || 0);
+    }
+    get inGameSaves() {
+        return (this.shSaves || 0) + (this.evSaves || 0) + (this.ppSaves || 0) +
+            this.counterAttackSaves + this.maneuverSaves + this.centerForwardSaves;
+    }
+    get saves() {
+        return this.inGameSaves + this.freeKickSaves + this.cornerSaves;
+    }
+    get totalSaves() {
+        return this.saves + (this.shootoutSaves || 0);
+    }
+    get totalShGoalsAgainst() {
+        return (this.shGoalsAgainst || 0) + (this.shFreeKickGoalsAgainst || 0) + (this.shCornerGoalsAgainst || 0) +
+            (this.shCounterAttackGoalsAgainst || 0) + (this.shManeuverGoalsAgainst || 0) + (this.shCenterForwardGoalsAgainst || 0);
+    }
+    get inGameGoalsAgainst() {
+        return (this.goalsAgainst || 0) + (this.counterAttackGoalsAgainst || 0) + (this.maneuverGoalsAgainst || 0) +
+            (this.centerForwardGoalsAgainst || 0);
+    }
+    get shootoutShotsAgainst() {
+        return (this.shootoutSaves || 0) + (this.shootoutGoalsAgainst || 0);
+    }
+    get gameGoalsAgainst() {
+        return this.inGameGoalsAgainst + (this.freeKickGoalsAgainst || 0) + (this.cornerGoalsAgainst || 0);
+    }
+    get totalGoalsAgainst() {
+        return this.gameGoalsAgainst + (this.shootoutGoalsAgainst || 0);
+    }
+    get gameShotsAgainst() {
+        return this.saves + this.gameGoalsAgainst;
+    }
+    get totalShotsAgainst() {
+        return this.gameShotsAgainst + this.shootoutShotsAgainst;
+    }
+    get shootoutSavesPercent() {
+        if (!this.shootoutSaves || !this.shootoutShotsAgainst) {
+            return 0;
+        }
+        return Math.round(1000 * this.shootoutSaves / this.shootoutShotsAgainst) / 10;
+    }
+    get savesPercent() {
+        if (!this.saves || !this.gameShotsAgainst) {
+            return 0;
+        }
+        return Math.round(1000 * this.saves / this.gameShotsAgainst) / 10;
+    }
+    get totalSavesPercent() {
+        if (!this.totalSaves || !this.totalShotsAgainst) {
+            return 0;
+        }
+        return Math.round(1000 * this.totalSaves / this.totalShotsAgainst) / 10;
     }
     static toFront(data) { }
     static toBack(data) { }
@@ -8772,9 +9072,39 @@ WaterpoloGameStatistic = __decorate([
             sh_shot_misses: 'shShotMisses',
             sh_shots_on_goal: 'shShotsOnGoal',
             sh_shots_blocked: 'shShotsBlocked',
+            pp_total_shots_on_goal: 'ppTotalShotsOnGoal',
+            ev_total_shots_on_goal: 'evTotalShotsOnGoal',
+            sh_total_shots_on_goal: 'shTotalShotsOnGoal',
             pp_goals: 'ppGoals',
             ev_goals: 'evGoals',
             sh_goals: 'shGoals',
+            pp_counterattack_goals: 'ppCounterAttackGoals',
+            pp_counterattack_on_goals: 'ppCounterAttackOnGoals',
+            pp_counterattack_misses: 'ppCounterAttackMisses',
+            ev_counterattack_goals: 'evCounterAttackGoals',
+            ev_counterattack_on_goals: 'evCounterAttackOnGoals',
+            ev_counterattack_misses: 'evCounterAttackMisses',
+            sh_counterattack_goals: 'shCounterAttackGoals',
+            sh_counterattack_on_goals: 'shCounterAttackOnGoals',
+            sh_counterattack_misses: 'shCounterAttackMisses',
+            pp_maneuver_goals: 'ppManeuverGoals',
+            pp_maneuver_on_goals: 'ppManeuverOnGoals',
+            pp_maneuver_misses: 'ppManeuverMisses',
+            ev_maneuver_goals: 'evManeuverGoals',
+            ev_maneuver_on_goals: 'evManeuverOnGoals',
+            ev_maneuver_misses: 'evManeuverMisses',
+            sh_maneuver_goals: 'shManeuverGoals',
+            sh_maneuver_on_goals: 'shManeuverOnGoals',
+            sh_maneuver_misses: 'shManeuverMisses',
+            pp_center_forward_goals: 'ppCenterForwardGoals',
+            pp_center_forward_on_goals: 'ppCenterForwardOnGoals',
+            pp_center_forward_misses: 'ppCenterForwardMisses',
+            ev_center_forward_goals: 'evCenterForwardGoals',
+            ev_center_forward_on_goals: 'evCenterForwardOnGoals',
+            ev_center_forward_misses: 'evCenterForwardMisses',
+            sh_center_forward_goals: 'shCenterForwardGoals',
+            sh_center_forward_on_goals: 'shCenterForwardOnGoals',
+            sh_center_forward_misses: 'shCenterForwardMisses',
             pp_assists: 'ppAssists',
             ev_assists: 'evAssists',
             sh_assists: 'shAssists',
@@ -8785,23 +9115,73 @@ WaterpoloGameStatistic = __decorate([
             block_shots: 'blockShots',
             face_off_losses: 'faceOffLosses',
             face_off_wins: 'faceOffWins',
-            saves: 'saves',
-            shootout_save: 'shootoutSaves',
+            pp_saves: 'ppSaves',
+            sh_saves: 'shSaves',
+            ev_saves: 'evSaves',
+            pp_counterattack_saves: 'ppCounterAttackSaves',
+            sh_counterattack_saves: 'shCounterAttackSaves',
+            ev_counterattack_saves: 'evCounterAttackSaves',
+            pp_maneuver_saves: 'ppManeuverSaves',
+            sh_maneuver_saves: 'shManeuverSaves',
+            ev_maneuver_saves: 'evManeuverSaves',
+            pp_center_forward_saves: 'ppCenterForwardSaves',
+            sh_center_forward_saves: 'shCenterForwardSaves',
+            ev_center_forward_saves: 'evCenterForwardSaves',
+            pp_free_kick_saves: 'ppFreeKickSaves',
+            sh_free_kick_saves: 'shFreeKickSaves',
+            ev_free_kick_saves: 'evFreeKickSaves',
+            pp_corner_saves: 'ppCornerSaves',
+            sh_corner_saves: 'shCornerSaves',
+            ev_corner_saves: 'evCornerSaves',
+            pp_total_game_saves: 'ppTotalGameSaves',
+            sh_total_game_saves: 'shTotalGameSaves',
+            ev_total_game_saves: 'evTotalGameSaves',
+            shootout_saves: 'shootoutSaves',
             after_game_shootout_saves: 'afterGameShootoutSaves',
+            pp_goals_against: 'ppGoalsAgainst',
+            sh_goals_against: 'shGoalsAgainst',
+            ev_goals_against: 'evGoalsAgainst',
             goals_against: 'goalsAgainst',
+            pp_counterattack_goals_against: 'ppCounterAttackGoalsAgainst',
+            sh_counterattack_goals_against: 'shCounterAttackGoalsAgainst',
+            ev_counterattack_goals_against: 'evCounterAttackGoalsAgainst',
+            counterattack_goals_against: 'counterAttackGoalsAgainst',
+            pp_maneuver_goals_against: 'ppManeuverGoalsAgainst',
+            sh_maneuver_goals_against: 'shManeuverGoalsAgainst',
+            ev_maneuver_goals_against: 'evManeuverGoalsAgainst',
+            maneuver_goals_against: 'maneuverGoalsAgainst',
+            pp_center_forward_goals_against: 'ppCenterForwardGoalsAgainst',
+            sh_center_forward_goals_against: 'shCenterForwardGoalsAgainst',
+            ev_center_forward_goals_against: 'evCenterForwardGoalsAgainst',
+            center_forward_goals_against: 'centerForwardGoalsAgainst',
+            pp_free_kick_goals_against: 'ppFreeKickGoalsAgainst',
+            sh_free_kick_goals_against: 'shFreeKickGoalsAgainst',
+            ev_free_kick_goals_against: 'evFreeKickGoalsAgainst',
+            free_kick_goals_against: 'freeKickGoalsAgainst',
+            pp_corner_goals_against: 'ppCornerGoalsAgainst',
+            sh_corner_goals_against: 'shCornerGoalsAgainst',
+            ev_corner_goals_against: 'evCornerGoalsAgainst',
+            corner_goals_against: 'cornerGoalsAgainst',
             shootout_goals_against: 'shootoutGoalsAgainst',
             after_game_shootout_goals_against: 'afterGameShootoutGoalsAgainst',
             safety_rate: 'safetyRate',
             penalty_minutes: 'penaltyMinutes',
             game_time: 'gameTime',
             plus_minus: 'plusMinus',
-            yellow_cards: 'yellowCards',
-            red_cards: 'redCards',
             fouls: 'fouls',
+            minor_penalties: 'minorPenalties',
+            major_penalties: 'majorPenalties',
+            match_penalties: 'matchPenalties',
+            penalty_fouls: 'penaltyFouls',
+            turnovers: 'turnovers',
+            attack_fouls: 'attackFouls',
             personal_fouls: 'personalFouls',
+            drawn_fouls: 'drawnFouls',
+            drawn_turnovers: 'drawnTurnovers',
+            yellow_cards: 'yellowCards',
+            red_cards: 'redCards',
             losses: 'losses',
             steals: 'steals',
-            drawn_fouls: 'drawnFouls',
             pp_free_kick_goals: 'ppFreeKickGoals',
             pp_free_kick_on_goals: 'ppFreeKickOnGoals',
             pp_free_kick_misses: 'ppFreeKickMisses',
@@ -8823,7 +9203,9 @@ WaterpoloGameStatistic = __decorate([
             ev_corner_on_goals: 'evCornerOnGoals',
             ev_corner_misses: 'evCornerMisses',
             corner_passes: 'cornerPasses',
-            corner_selfs: 'cornerSelfs'
+            corner_selfs: 'cornerSelfs',
+            tackles: 'tackles',
+            player_efficiency: 'playerEfficiency'
         },
         relation: {
             updatedAt: DateTimeField,