@mtgame/core 0.1.131 → 0.1.133

package/bundles/mtgame-core.umd.js

@@ -6442,37 +6442,48 @@
                 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',
@@ -6483,31 +6494,73 @@
                 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',
@@ -6530,8 +6583,65 @@
                 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',
             },
@@ -10836,6 +10946,24 @@
         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";
     })(exports.WaterpoloGameLogTypes || (exports.WaterpoloGameLogTypes = {}));
     exports.WaterpoloAdvantageTypes = void 0;
     (function (WaterpoloAdvantageTypes) {
@@ -10883,7 +11011,8 @@
         });
         WaterpoloGameLog.prototype.isScoreType = function () {
             return [exports.WaterpoloGameLogTypes.goal, exports.WaterpoloGameLogTypes.shootout_goal, exports.WaterpoloGameLogTypes.after_game_shootout_goal,
-                exports.WaterpoloGameLogTypes.free_kick_goal, exports.WaterpoloGameLogTypes.corner_goal].indexOf(this.logType) > -1;
+                exports.WaterpoloGameLogTypes.free_kick_goal, exports.WaterpoloGameLogTypes.corner_goal,
+                exports.WaterpoloGameLogTypes.counterattack_goal, exports.WaterpoloGameLogTypes.maneuver_goal, exports.WaterpoloGameLogTypes.center_forward_goal].indexOf(this.logType) > -1;
         };
         WaterpoloGameLog.prototype.isPenaltyType = function () {
             return [
@@ -10892,7 +11021,8 @@
         };
         WaterpoloGameLog.prototype.isFoulType = function () {
             return [
-                exports.WaterpoloGameLogTypes.minor_penalty, exports.WaterpoloGameLogTypes.major_penalty, exports.WaterpoloGameLogTypes.match_penalty, exports.WaterpoloGameLogTypes.personal_foul, exports.WaterpoloGameLogTypes.foul
+                exports.WaterpoloGameLogTypes.minor_penalty, exports.WaterpoloGameLogTypes.major_penalty, exports.WaterpoloGameLogTypes.match_penalty,
+                exports.WaterpoloGameLogTypes.personal_foul, exports.WaterpoloGameLogTypes.foul, exports.WaterpoloGameLogTypes.attack_foul
             ].indexOf(this.logType) > -1;
         };
         WaterpoloGameLog.prototype.isAfter = function (log) {
@@ -10955,27 +11085,154 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotsOnGoal", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "gameMinutes", {
             get: function () {
-                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);
+                return Math.floor(this.gameTime / 60);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotsBlocked", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "penaltyTime", {
             get: function () {
-                return (this.evShotsBlocked || 0) + (this.ppShotsBlocked || 0) + (this.shShotsBlocked || 0);
+                if (!this.penaltyMinutes) {
+                    return '00:00';
+                }
+                var minutes = Math.floor(this.penaltyMinutes / 60);
+                var seconds = Math.floor(this.penaltyMinutes - minutes * 60);
+                return "" + (minutes < 10 ? 0 : '') + minutes + ":" + (seconds < 10 ? 0 : '') + seconds;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotMisses", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "assists", {
+            get: function () {
+                return (this.ppAssists || 0) + (this.shAssists || 0) + (this.evAssists || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalCounterAttackGoals", {
+            get: function () {
+                return (this.ppCounterAttackGoals || 0) + (this.evCounterAttackGoals || 0) + (this.shCounterAttackGoals || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "ppCounterAttackShots", {
+            get: function () {
+                return (this.ppCounterAttackOnGoals || 0) + (this.ppCounterAttackMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shCounterAttackShots", {
+            get: function () {
+                return (this.shCounterAttackOnGoals || 0) + (this.shCounterAttackMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "evCounterAttackShots", {
+            get: function () {
+                return (this.evCounterAttackOnGoals || 0) + (this.evCounterAttackMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "counterAttackShotMisses", {
+            get: function () {
+                return (this.ppCounterAttackMisses || 0) + (this.shCounterAttackMisses || 0) + (this.evCounterAttackMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "counterAttackShotOnGoals", {
+            get: function () {
+                return (this.ppCounterAttackOnGoals || 0) + (this.shCounterAttackOnGoals || 0) + (this.evCounterAttackOnGoals || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalManeuverGoals", {
+            get: function () {
+                return (this.ppManeuverGoals || 0) + (this.shManeuverGoals || 0) + (this.evManeuverGoals || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "ppManeuverShots", {
+            get: function () {
+                return (this.ppManeuverOnGoals || 0) + (this.ppManeuverMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shManeuverShots", {
+            get: function () {
+                return (this.shManeuverOnGoals || 0) + (this.shManeuverMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "evManeuverShots", {
+            get: function () {
+                return (this.evManeuverOnGoals || 0) + (this.evManeuverMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "maneuverShotMisses", {
+            get: function () {
+                return (this.ppManeuverMisses || 0) + (this.shManeuverMisses || 0) + (this.evManeuverMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "maneuverShotOnGoals", {
             get: function () {
-                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);
+                return (this.ppManeuverOnGoals || 0) + (this.shManeuverOnGoals || 0) + (this.evManeuverOnGoals || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalCenterForwardGoals", {
+            get: function () {
+                return (this.ppCenterForwardGoals || 0) + (this.shCenterForwardGoals || 0) + (this.evCenterForwardGoals || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "ppCenterForwardShots", {
+            get: function () {
+                return (this.ppCenterForwardOnGoals || 0) + (this.ppCenterForwardMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shCenterForwardShots", {
+            get: function () {
+                return (this.shCenterForwardOnGoals || 0) + (this.shCenterForwardMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "evCenterForwardShots", {
+            get: function () {
+                return (this.evCenterForwardOnGoals || 0) + (this.evCenterForwardMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "centerForwardShotMisses", {
+            get: function () {
+                return (this.ppCenterForwardMisses || 0) + (this.shCenterForwardMisses || 0) + (this.evCenterForwardMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "centerForwardShotOnGoals", {
+            get: function () {
+                return (this.ppCenterForwardOnGoals || 0) + (this.shCenterForwardOnGoals || 0) + (this.evCenterForwardOnGoals || 0);
             },
             enumerable: false,
             configurable: true
@@ -10983,8 +11240,9 @@
         Object.defineProperty(WaterpoloGameStatistic.prototype, "ppShots", {
             get: function () {
                 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;
             },
             enumerable: false,
             configurable: true
@@ -10992,8 +11250,9 @@
         Object.defineProperty(WaterpoloGameStatistic.prototype, "evShots", {
             get: function () {
                 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;
             },
             enumerable: false,
             configurable: true
@@ -11001,74 +11260,126 @@
         Object.defineProperty(WaterpoloGameStatistic.prototype, "shShots", {
             get: function () {
                 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);
+                    this.shCounterAttackShots + this.shManeuverShots + this.shCenterForwardShots;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "shots", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalShGoals", {
             get: function () {
-                return this.ppShots + this.evShots + this.shShots + (this.shootoutAttempts || 0);
+                return (this.shGoals || 0) + (this.shFreeKickGoals || 0) + (this.shCornerGoals || 0) +
+                    (this.shCounterAttackGoals || 0) + (this.shManeuverGoals || 0) + (this.shCenterForwardGoals || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotsOnGoalPercent", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalEvGoals", {
             get: function () {
-                if (!this.shots || !this.shotsOnGoal) {
-                    return 0;
-                }
-                return Math.round(1000 * this.shotsOnGoal / this.shots) / 10;
+                return (this.evGoals || 0) + (this.evFreeKickGoals || 0) + (this.evCornerGoals || 0) +
+                    (this.evCounterAttackGoals || 0) + (this.evManeuverGoals || 0) + (this.evCenterForwardGoals || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalShots", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalPpGoals", {
             get: function () {
-                return this.shots + (this.shootoutAttempts || 0);
+                return (this.ppGoals || 0) + (this.ppFreeKickGoals || 0) + (this.ppCornerGoals || 0) +
+                    (this.ppCounterAttackGoals || 0) + (this.ppManeuverGoals || 0) + (this.ppCenterForwardGoals || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalShGoals", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "goals", {
             get: function () {
-                return (this.shGoals || 0) + (this.shFreeKickGoals || 0) + (this.shCornerGoals || 0);
+                return this.totalShGoals + this.totalEvGoals + this.totalPpGoals;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalEvGoals", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalGoals", {
             get: function () {
-                return (this.evGoals || 0) + (this.evFreeKickGoals || 0) + (this.evCornerGoals || 0);
+                return this.goals + (this.shootoutGoals || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalPpGoals", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shootoutShots", {
             get: function () {
-                return (this.ppGoals || 0) + (this.ppFreeKickGoals || 0) + (this.ppCornerGoals || 0);
+                return (this.shootoutGoals || 0) + (this.shootoutAttempts || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "goals", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "inGameShotMisses", {
             get: function () {
-                return this.totalEvGoals + this.totalPpGoals + this.totalShGoals;
+                return (this.ppShotMisses || 0) + (this.evShotMisses || 0) + (this.shShotMisses || 0) +
+                    this.counterAttackShotMisses + this.maneuverShotMisses + this.centerForwardShotMisses;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalGoals", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotMisses", {
             get: function () {
-                return this.goals + (this.shootoutGoals || 0);
+                return (this.ppFreeKickMisses || 0) + (this.evFreeKickMisses || 0) + (this.shFreeKickMisses || 0) +
+                    (this.ppCornerMisses || 0) + (this.evCornerMisses || 0) + (this.shCornerMisses || 0) +
+                    this.inGameShotMisses;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "assists", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalPpShotMisses", {
             get: function () {
-                return (this.ppAssists || 0) + (this.evAssists || 0) + (this.shAssists || 0);
+                return (this.ppShotMisses || 0) + (this.ppFreeKickMisses || 0) + (this.ppCornerMisses || 0) +
+                    (this.ppCounterAttackMisses || 0) + (this.ppManeuverMisses || 0) + (this.ppCenterForwardMisses || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotsOnGoal", {
+            get: function () {
+                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;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalPpShotsOnGoal", {
+            get: function () {
+                return (this.ppShotsOnGoal || 0) + (this.ppFreeKickOnGoals || 0) + (this.ppCornerOnGoals || 0) +
+                    (this.ppCounterAttackOnGoals || 0) + (this.ppManeuverOnGoals || 0) + (this.ppCenterForwardOnGoals || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "inGameShotsOnGoals", {
+            get: function () {
+                return (this.ppShotsOnGoal || 0) + (this.evShotsOnGoal || 0) + (this.shShotsOnGoal || 0) +
+                    this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotsBlocked", {
+            get: function () {
+                return (this.ppShotsBlocked || 0) + (this.evShotsBlocked || 0) + (this.shShotsBlocked || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shots", {
+            get: function () {
+                return this.ppShots + this.evShots + this.shShots;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalShots", {
+            get: function () {
+                return this.shots + (this.shootoutAttempts || 0);
             },
             enumerable: false,
             configurable: true
@@ -11080,95 +11391,124 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "shootOuts", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "freeKickShotMisses", {
             get: function () {
-                return (this.shootoutAttempts || 0) + (this.shootoutGoals || 0);
+                return (this.ppFreeKickMisses || 0) + (this.evFreeKickMisses || 0) + (this.shFreeKickMisses || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotsAgainst", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "freeKickOnGoals", {
             get: function () {
-                return (this.saves || 0) + (this.goalsAgainst || 0);
+                return (this.ppFreeKickOnGoals || 0) + (this.evFreeKickOnGoals || 0) + (this.shFreeKickOnGoals || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "shootoutShotsAgainst", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalFreeKickGoals", {
             get: function () {
-                return (this.shootoutSaves || 0) + (this.shootoutGoalsAgainst || 0);
+                return (this.ppFreeKickGoals || 0) + (this.shFreeKickGoals || 0) + (this.evFreeKickGoals || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalShotsAgainst", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalFreeKicks", {
             get: function () {
-                return this.shotsAgainst + this.shootoutShotsAgainst;
+                return (this.freeKickSelfs || 0) + (this.freeKickPasses || 0) +
+                    this.freeKickShotMisses + this.freeKickOnGoals + this.totalFreeKickGoals;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "savesPercent", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalCornerGoals", {
             get: function () {
-                if (!this.shotsAgainst || !this.saves) {
-                    return 0;
-                }
-                return Math.round(1000 * this.saves / this.shotsAgainst) / 10;
+                return (this.ppCornerGoals || 0) + (this.shCornerGoals || 0) + (this.evCornerGoals || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalSaves", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalCorners", {
             get: function () {
-                return (this.saves || 0) + (this.shootoutSaves || 0);
+                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;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalSavesPercent", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalFouls", {
             get: function () {
-                if (!this.totalShotsAgainst || !this.totalSaves) {
+                return (this.fouls || 0) + (this.penaltyFouls || 0) + (this.attackFouls || 0) + (this.personalFouls || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "inGameGoals", {
+            get: function () {
+                return (this.shGoals || 0) + (this.evGoals || 0) + (this.ppGoals || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalInGameGoals", {
+            get: function () {
+                return this.totalCenterForwardGoals + this.totalManeuverGoals + this.totalCounterAttackGoals + this.inGameGoals;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "ppGoalsPercent", {
+            get: function () {
+                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;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalGoalsAgainst", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "evGoalsPercent", {
             get: function () {
-                return (this.goalsAgainst || 0) + (this.shootoutGoalsAgainst || 0);
+                if (!this.totalEvGoals || !this.evShots) {
+                    return 0;
+                }
+                return Math.round(1000 * this.totalEvGoals / this.evShots) / 10;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalFouls", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shGoalsPercent", {
             get: function () {
-                return (this.fouls || 0) + (this.personalFouls || 0);
+                if (!this.totalShGoals || !this.shShots) {
+                    return 0;
+                }
+                return Math.round(1000 * this.totalShGoals / this.shShots) / 10;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "gameMinutes", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shotsOnGoalPercent", {
             get: function () {
-                return Math.floor(this.gameTime / 60);
+                if (!this.shotsOnGoal || !this.shots) {
+                    return 0;
+                }
+                return Math.round(1000 * this.shotsOnGoal / this.shots) / 10;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "penaltyTime", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "goalsPercent", {
             get: function () {
-                if (!this.penaltyMinutes) {
-                    return '00:00';
+                if (!this.goals || !this.shots) {
+                    return 0;
                 }
-                var minutes = Math.floor(this.penaltyMinutes / 60);
-                var seconds = Math.floor(this.penaltyMinutes - minutes * 60);
-                return "" + (minutes < 10 ? 0 : '') + minutes + ":" + (seconds < 10 ? 0 : '') + seconds;
+                return Math.round(1000 * this.goals / this.shots) / 10;
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "goalsPercent", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalGoalsPercent", {
             get: function () {
                 if (!this.totalGoals || !this.totalShots) {
                     return 0;
@@ -11188,6 +11528,16 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shootoutGoalsPercent", {
+            get: function () {
+                if (!this.shootoutGoals || !this.shootoutShots) {
+                    return 0;
+                }
+                return Math.round(1000 * this.shootoutGoals / this.shootoutShots) / 10;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(WaterpoloGameStatistic.prototype, "goalpass", {
             get: function () {
                 return (this.totalGoals || 0) + (this.assists || 0);
@@ -11195,22 +11545,149 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalFreeKicks", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "counterAttackSaves", {
+            /*goalie stat */
             get: function () {
-                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);
+                return (this.ppCounterAttackSaves || 0) + (this.shCounterAttackSaves || 0) + (this.evCounterAttackSaves || 0);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalCorners", {
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "centerForwardSaves", {
+            get: function () {
+                return (this.ppCenterForwardSaves || 0) + (this.shCenterForwardSaves || 0) + (this.evCenterForwardSaves || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "maneuverSaves", {
             get: function () {
-                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);
+                return (this.ppManeuverSaves || 0) + (this.shManeuverSaves || 0) + (this.evManeuverSaves || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "freeKickSaves", {
+            get: function () {
+                return (this.ppFreeKickSaves || 0) + (this.shFreeKickSaves || 0) + (this.evFreeKickSaves || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "cornerSaves", {
+            get: function () {
+                return (this.ppCornerSaves || 0) + (this.shCornerSaves || 0) + (this.evCornerSaves || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalShSaves", {
+            get: function () {
+                return (this.shCounterAttackSaves || 0) + (this.shManeuverSaves || 0) + (this.shCenterForwardSaves || 0) +
+                    (this.shSaves || 0) + (this.shFreeKickSaves || 0) + (this.shCornerSaves || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "inGameSaves", {
+            get: function () {
+                return (this.shSaves || 0) + (this.evSaves || 0) + (this.ppSaves || 0) +
+                    this.counterAttackSaves + this.maneuverSaves + this.centerForwardSaves;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "saves", {
+            get: function () {
+                return this.inGameSaves + this.freeKickSaves + this.cornerSaves;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalSaves", {
+            get: function () {
+                return this.saves + (this.shootoutSaves || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalShGoalsAgainst", {
+            get: function () {
+                return (this.shGoalsAgainst || 0) + (this.shFreeKickGoalsAgainst || 0) + (this.shCornerGoalsAgainst || 0) +
+                    (this.shCounterAttackGoalsAgainst || 0) + (this.shManeuverGoalsAgainst || 0) + (this.shCenterForwardGoalsAgainst || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "inGameGoalsAgainst", {
+            get: function () {
+                return (this.goalsAgainst || 0) + (this.counterAttackGoalsAgainst || 0) + (this.maneuverGoalsAgainst || 0) +
+                    (this.centerForwardGoalsAgainst || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shootoutShotsAgainst", {
+            get: function () {
+                return (this.shootoutSaves || 0) + (this.shootoutGoalsAgainst || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "gameGoalsAgainst", {
+            get: function () {
+                return this.inGameGoalsAgainst + (this.freeKickGoalsAgainst || 0) + (this.cornerGoalsAgainst || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalGoalsAgainst", {
+            get: function () {
+                return this.gameGoalsAgainst + (this.shootoutGoalsAgainst || 0);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "gameShotsAgainst", {
+            get: function () {
+                return this.saves + this.gameGoalsAgainst;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalShotsAgainst", {
+            get: function () {
+                return this.gameShotsAgainst + this.shootoutShotsAgainst;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "shootoutSavesPercent", {
+            get: function () {
+                if (!this.shootoutSaves || !this.shootoutShotsAgainst) {
+                    return 0;
+                }
+                return Math.round(1000 * this.shootoutSaves / this.shootoutShotsAgainst) / 10;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "savesPercent", {
+            get: function () {
+                if (!this.saves || !this.gameShotsAgainst) {
+                    return 0;
+                }
+                return Math.round(1000 * this.saves / this.gameShotsAgainst) / 10;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(WaterpoloGameStatistic.prototype, "totalSavesPercent", {
+            get: function () {
+                if (!this.totalSaves || !this.totalShotsAgainst) {
+                    return 0;
+                }
+                return Math.round(1000 * this.totalSaves / this.totalShotsAgainst) / 10;
             },
             enumerable: false,
             configurable: true
@@ -11240,9 +11717,39 @@
                 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',
@@ -11253,23 +11760,73 @@
                 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',
@@ -11291,7 +11848,9 @@
                 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,
@@ -11597,24 +12156,40 @@
         _a$a[exports.WaterpoloGameLogTypes.enter_game] = 'Выход на площадку',
         _a$a[exports.WaterpoloGameLogTypes.exit_game] = 'Ушел с площадки',
         _a$a[exports.WaterpoloGameLogTypes.shot_miss] = 'Бросок мимо',
+        _a$a[exports.WaterpoloGameLogTypes.counterattack_miss] = 'Бросок мимо',
+        _a$a[exports.WaterpoloGameLogTypes.maneuver_miss] = 'Бросок мимо',
+        _a$a[exports.WaterpoloGameLogTypes.center_forward_miss] = 'Бросок мимо',
         _a$a[exports.WaterpoloGameLogTypes.shot_on_goal] = 'Бросок по воротам',
+        _a$a[exports.WaterpoloGameLogTypes.counterattack_on_goal] = 'Бросок по воротам',
+        _a$a[exports.WaterpoloGameLogTypes.maneuver_on_goal] = 'Бросок по воротам',
+        _a$a[exports.WaterpoloGameLogTypes.center_forward_on_goal] = 'Бросок по воротам',
         _a$a[exports.WaterpoloGameLogTypes.shot_blocked] = 'Заблокированный бросок',
         _a$a[exports.WaterpoloGameLogTypes.goal] = 'Гол',
+        _a$a[exports.WaterpoloGameLogTypes.maneuver_goal] = 'Гол',
+        _a$a[exports.WaterpoloGameLogTypes.counterattack_goal] = 'Гол',
+        _a$a[exports.WaterpoloGameLogTypes.center_forward_goal] = 'Гол',
         _a$a[exports.WaterpoloGameLogTypes.shootout_attempt] = 'Пенальти промах',
         _a$a[exports.WaterpoloGameLogTypes.shootout_goal] = 'Пенальти гол',
         _a$a[exports.WaterpoloGameLogTypes.after_game_shootout_attempt] = 'Пенальти промах',
         _a$a[exports.WaterpoloGameLogTypes.after_game_shootout_goal] = 'Пенальти гол',
-        _a$a[exports.WaterpoloGameLogTypes.assist] = 'Передача',
+        _a$a[exports.WaterpoloGameLogTypes.assist] = 'Голевая передача',
         _a$a[exports.WaterpoloGameLogTypes.block_shot] = 'Блокировка броска',
         _a$a[exports.WaterpoloGameLogTypes.minor_penalty] = 'Удаление на 20 сек.',
         _a$a[exports.WaterpoloGameLogTypes.major_penalty] = 'Удаление + 4 мин. штраф',
         _a$a[exports.WaterpoloGameLogTypes.match_penalty] = 'Удаление до конца матча',
         _a$a[exports.WaterpoloGameLogTypes.foul] = 'Фол',
+        _a$a[exports.WaterpoloGameLogTypes.penalty_foul] = 'Фол пенальти',
+        _a$a[exports.WaterpoloGameLogTypes.attack_foul] = 'Фол в нападении',
         _a$a[exports.WaterpoloGameLogTypes.personal_foul] = 'Персональный фол',
         _a$a[exports.WaterpoloGameLogTypes.penalty_shot] = 'Штрафной бросок',
         _a$a[exports.WaterpoloGameLogTypes.face_off_lose] = 'Проигрыш в спринте',
         _a$a[exports.WaterpoloGameLogTypes.face_off_win] = 'Победа в спринте',
         _a$a[exports.WaterpoloGameLogTypes.save] = 'Отражен бросок',
+        _a$a[exports.WaterpoloGameLogTypes.counterattack_save] = 'Отражен бросок',
+        _a$a[exports.WaterpoloGameLogTypes.maneuver_save] = 'Отражен бросок',
+        _a$a[exports.WaterpoloGameLogTypes.center_forward_save] = 'Отражен бросок',
+        _a$a[exports.WaterpoloGameLogTypes.free_kick_save] = 'Отражен бросок',
+        _a$a[exports.WaterpoloGameLogTypes.corner_save] = 'Отражен бросок',
         _a$a[exports.WaterpoloGameLogTypes.shootout_save] = 'Отражен бросок',
         _a$a[exports.WaterpoloGameLogTypes.after_game_shootout_save] = 'Отражен бросок',
         _a$a[exports.WaterpoloGameLogTypes.timeout] = 'Таймаут',
@@ -11622,8 +12197,10 @@
         _a$a[exports.WaterpoloGameLogTypes.penalty_end] = 'Конец штрафного времени',
         _a$a[exports.WaterpoloGameLogTypes.yellow_card] = 'Желтая карточка',
         _a$a[exports.WaterpoloGameLogTypes.red_card] = 'Красная карточка',
+        _a$a[exports.WaterpoloGameLogTypes.turnover] = 'Переход владения',
         _a$a[exports.WaterpoloGameLogTypes.loss] = 'Потеря',
         _a$a[exports.WaterpoloGameLogTypes.steal] = 'Перехват',
+        _a$a[exports.WaterpoloGameLogTypes.tackle] = 'Отбор',
         _a$a[exports.WaterpoloGameLogTypes.free_kick_goal] = 'Свободный удар - гол',
         _a$a[exports.WaterpoloGameLogTypes.free_kick_on_goal] = 'Свободный удар в створ',
         _a$a[exports.WaterpoloGameLogTypes.free_kick_miss] = 'Свободный удар мимо',