@mtgame/core 1.0.32 → 1.0.34

package/fesm2015/mtgame-core.js

@@ -6086,6 +6086,8 @@ WaterpoloStatistic = __decorate([
             corner_selfs: 'cornerSelfs',
             tackles: 'tackles',
             player_efficiency: 'playerEfficiency',
+            defense_select_positions: 'defenseSelectPositions',
+            save_possessions: 'savePossessions',
             pp_shots: 'ppShots',
             ev_shots: 'evShots',
             sh_shots: 'shShots',
@@ -6143,6 +6145,78 @@ WaterpoloStatistic = __decorate([
             total_penalties: 'totalPenalties',
             shootout_shots: 'shootoutShots',
             shootout_goals_percent: 'shootoutGoalsPercent',
+            pp_perimetr_shot_goals: 'ppPerimetrShotGoals',
+            pp_perimetr_shot_on_goals: 'ppPerimetrShotOnGoals',
+            pp_perimetr_shot_misses: 'ppPerimetrShotMisses',
+            pp_perimetr_shots_blocked: 'ppPerimetrShotsBlocked',
+            ev_perimetr_shot_goals: 'evPerimetrShotGoals',
+            ev_perimetr_shot_on_goals: 'evPerimetrShotOnGoals',
+            ev_perimetr_shot_misses: 'evPerimetrShotMisses',
+            ev_perimetr_shots_blocked: 'evPerimetrShotsBlocked',
+            sh_perimetr_shot_goals: 'shPerimetrShotGoals',
+            sh_perimetr_shot_on_goals: 'shPerimetrShotOnGoals',
+            sh_perimetr_shot_misses: 'shPerimetrShotMisses',
+            sh_perimetr_shots_blocked: 'shPerimetrShotsBlocked',
+            pp_perimetr_shot_saves: 'ppPerimetrShotSaves',
+            sh_perimetr_shot_saves: 'shPerimetrShotSaves',
+            ev_perimetr_shot_saves: 'evPerimetrShotSaves',
+            pp_perimetr_shot_goals_against: 'ppPerimetrShotGoalsAgainst',
+            sh_perimetr_shot_goals_against: 'shPerimetrShotGoalsAgainst',
+            ev_perimetr_shot_goals_against: 'evPerimetrShotGoalsAgainst',
+            perimetr_shot_goals_against: 'perimetrShotGoalsAgainst',
+            total_perimetr_shot_goals: 'totalPerimetrShotGoals',
+            perimetr_shots_on_goals: 'perimetrShotsOnGoals',
+            perimetr_shots_misses: 'perimetrShotsMisses',
+            perimetr_shots: 'perimetrShots',
+            perimetr_shot_goals_percent: 'perimetrShotGoalsPercent',
+            pp_post_shot_goals: 'ppPostShotGoals',
+            pp_post_shot_on_goals: 'ppPostShotOnGoals',
+            pp_post_shot_misses: 'ppPostShotMisses',
+            pp_post_shots_blocked: 'ppPostShotsBlocked',
+            ev_post_shot_goals: 'evPostShotGoals',
+            ev_post_shot_on_goals: 'evPostShotOnGoals',
+            ev_post_shot_misses: 'evPostShotMisses',
+            ev_post_shots_blocked: 'evPostShotsBlocked',
+            sh_post_shot_goals: 'shPostShotGoals',
+            sh_post_shot_on_goals: 'shPostShotOnGoals',
+            sh_post_shot_misses: 'shPostShotMisses',
+            sh_post_shots_blocked: 'shPostShotsBlocked',
+            pp_post_shot_saves: 'ppPostShotSaves',
+            sh_post_shot_saves: 'shPostShotSaves',
+            ev_post_shot_saves: 'evPostShotSaves',
+            pp_post_shot_goals_against: 'ppPostShotGoalsAgainst',
+            sh_post_shot_goals_against: 'shPostShotGoalsAgainst',
+            ev_post_shot_goals_against: 'evPostShotGoalsAgainst',
+            post_shot_goals_against: 'postShotGoalsAgainst',
+            total_post_shot_goals: 'totalPostShotGoals',
+            post_shots_on_goals: 'postShotsOnGoals',
+            post_shots_misses: 'postShotsMisses',
+            post_shots: 'postShots',
+            post_shot_goals_percent: 'postShotGoalsPercent',
+            pp_fast_shot_goals: 'ppFastShotGoals',
+            pp_fast_shot_on_goals: 'ppFastShotOnGoals',
+            pp_fast_shot_misses: 'ppFastShotMisses',
+            pp_fast_shots_blocked: 'ppFastShotsBlocked',
+            ev_fast_shot_goals: 'evFastShotGoals',
+            ev_fast_shot_on_goals: 'evFastShotOnGoals',
+            ev_fast_shot_misses: 'evFastShotMisses',
+            ev_fast_shots_blocked: 'evFastShotsBlocked',
+            sh_fast_shot_goals: 'shFastShotGoals',
+            sh_fast_shot_on_goals: 'shFastShotOnGoals',
+            sh_fast_shot_misses: 'shFastShotMisses',
+            sh_fast_shots_blocked: 'shFastShotsBlocked',
+            pp_fast_shot_saves: 'ppFastShotSaves',
+            sh_fast_shot_saves: 'shFastShotSaves',
+            ev_fast_shot_saves: 'evFastShotSaves',
+            pp_fast_shot_goals_against: 'ppFastShotGoalsAgainst',
+            sh_fast_shot_goals_against: 'shFastShotGoalsAgainst',
+            ev_fast_shot_goals_against: 'evFastShotGoalsAgainst',
+            fast_shot_goals_against: 'fastShotGoalsAgainst',
+            total_fast_shot_goals: 'totalFastShotGoals',
+            fast_shots_on_goals: 'fastShotsOnGoals',
+            fast_shots_misses: 'fastShotsMisses',
+            fast_shots: 'fastShots',
+            fast_shot_goals_percent: 'fastShotGoalsPercent',
             /*goalie stat*/
             position_attack_saves: 'positionAttackSaves',
             position_attack_shots_against: 'positionAttackShotsAgainst',
@@ -6181,6 +6255,15 @@ WaterpoloStatistic = __decorate([
             total_ev_goals_against: 'totalEvGoalsAgainst',
             total_ev_shots_against: 'totalEvShotsAgainst',
             total_ev_saves_percent: 'totalEvSavesPercent',
+            perimetr_shot_saves: 'perimetrShotSaves',
+            perimetr_shots_against: 'perimetrShotsAgainst',
+            perimetr_shot_saves_percent: 'perimetrShotSavesPercent',
+            post_shot_saves: 'postShotSaves',
+            post_shots_against: 'postShotsAgainst',
+            post_shot_saves_percent: 'postShotSavesPercent',
+            fast_shot_saves: 'fastShotSaves',
+            fast_shots_against: 'fastShotsAgainst',
+            fast_shot_saves_percent: 'fastShotSavesPercent',
             newbie: 'newbie',
             rank: 'rank',
         },
@@ -7031,6 +7114,20 @@ class LeagueApi {
             return this.httpClient.get(`${this.configService.get('apiUrl')}/api/v1/league/${leagueId}/tournaments/`, { params }).pipe(map(result => Tournament.toFront(result))).toPromise();
         });
     }
+    getTournamentsPaginated(leagueId, page, size, filters) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let params = new HttpParams().set('page', page).set('size', size);
+            if (filters) {
+                if (filters.statuses) {
+                    params = params.set('statuses', filters.statuses.map(s => TournamentStatuses[s]).join(','));
+                }
+            }
+            return this.httpClient.get(`${this.configService.get('apiUrl')}/api/v1/league/${leagueId}/tournaments/`, { params, observe: 'response' }).pipe(map(response => ({
+                total: +response.headers.get('X-Page-Count'),
+                data: Tournament.toFront(response.body)
+            }))).toPromise();
+        });
+    }
     getEvents(leagueId, page, size, filters) {
         return __awaiter(this, void 0, void 0, function* () {
             let params = new HttpParams().set('page', page.toString())
@@ -9988,6 +10085,23 @@ var WaterpoloGameLogTypes;
     WaterpoloGameLogTypes[WaterpoloGameLogTypes["free_kick_shot_blocked"] = 62] = "free_kick_shot_blocked";
     WaterpoloGameLogTypes[WaterpoloGameLogTypes["corner_shot_blocked"] = 63] = "corner_shot_blocked";
     WaterpoloGameLogTypes[WaterpoloGameLogTypes["complete_penalty_time"] = 64] = "complete_penalty_time";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["defense_select_position"] = 65] = "defense_select_position";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["save_possession"] = 66] = "save_possession";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_goal"] = 67] = "perimetr_shot_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_on_goal"] = 68] = "perimetr_shot_on_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_miss"] = 69] = "perimetr_shot_miss";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_blocked"] = 70] = "perimetr_shot_blocked";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_save"] = 71] = "perimetr_shot_save";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_goal"] = 72] = "post_shot_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_on_goal"] = 73] = "post_shot_on_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_miss"] = 74] = "post_shot_miss";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_blocked"] = 75] = "post_shot_blocked";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_save"] = 76] = "post_shot_save";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_goal"] = 77] = "fast_shot_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_on_goal"] = 78] = "fast_shot_on_goal";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_miss"] = 79] = "fast_shot_miss";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_blocked"] = 80] = "fast_shot_blocked";
+    WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_save"] = 81] = "fast_shot_save";
 })(WaterpoloGameLogTypes || (WaterpoloGameLogTypes = {}));
 var WaterpoloAdvantageTypes;
 (function (WaterpoloAdvantageTypes) {
@@ -10024,9 +10138,12 @@ let WaterpoloGameLog = class WaterpoloGameLog extends BaseModel {
         return `${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
     }
     isScoreType() {
-        return [WaterpoloGameLogTypes.goal, WaterpoloGameLogTypes.shootout_goal, WaterpoloGameLogTypes.after_game_shootout_goal,
+        return [
+            WaterpoloGameLogTypes.goal, WaterpoloGameLogTypes.shootout_goal, WaterpoloGameLogTypes.after_game_shootout_goal,
             WaterpoloGameLogTypes.free_kick_goal, WaterpoloGameLogTypes.corner_goal,
-            WaterpoloGameLogTypes.counterattack_goal, WaterpoloGameLogTypes.maneuver_goal, WaterpoloGameLogTypes.center_forward_goal].indexOf(this.logType) > -1;
+            WaterpoloGameLogTypes.counterattack_goal, WaterpoloGameLogTypes.maneuver_goal, WaterpoloGameLogTypes.center_forward_goal,
+            WaterpoloGameLogTypes.perimetr_shot_goal, WaterpoloGameLogTypes.post_shot_goal, WaterpoloGameLogTypes.fast_shot_goal
+        ].indexOf(this.logType) > -1;
     }
     isPenaltyType() {
         return [
@@ -10194,35 +10311,131 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
         }
         return Math.round(1000 * this.totalCenterForwardGoals / this.centerForwardShots) / 10;
     }
+    get totalPerimetrShotGoals() {
+        return (this.ppPerimetrShotGoals || 0) + (this.evPerimetrShotGoals || 0) + (this.shPerimetrShotGoals || 0);
+    }
+    get ppPerimetrShots() {
+        return (this.ppPerimetrShotOnGoals || 0) + (this.ppPerimetrShotMisses || 0) + (this.ppPerimetrShotsBlocked || 0);
+    }
+    get shPerimetrShots() {
+        return (this.shPerimetrShotOnGoals || 0) + (this.shPerimetrShotMisses || 0) + (this.shPerimetrShotsBlocked || 0);
+    }
+    get evPerimetrShots() {
+        return (this.evPerimetrShotOnGoals || 0) + (this.evPerimetrShotMisses || 0) + (this.evPerimetrShotsBlocked || 0);
+    }
+    get perimetrShotMisses() {
+        return (this.ppPerimetrShotMisses || 0) + (this.shPerimetrShotMisses || 0) + (this.evPerimetrShotMisses || 0);
+    }
+    get perimetrShotOnGoals() {
+        return (this.ppPerimetrShotOnGoals || 0) + (this.shPerimetrShotOnGoals || 0) + (this.evPerimetrShotOnGoals || 0);
+    }
+    get perimetrShotsBlocked() {
+        return (this.ppPerimetrShotsBlocked || 0) + (this.shPerimetrShotsBlocked || 0) + (this.evPerimetrShotsBlocked || 0);
+    }
+    get perimetrShots() {
+        return this.perimetrShotMisses + this.perimetrShotOnGoals + this.perimetrShotsBlocked;
+    }
+    get perimetrShotGoalsPercent() {
+        if (!this.totalPerimetrShotGoals || !this.perimetrShots) {
+            return 0;
+        }
+        return Math.round(1000 * this.totalPerimetrShotGoals / this.perimetrShots) / 10;
+    }
+    get totalPostShotGoals() {
+        return (this.ppPostShotGoals || 0) + (this.evPostShotGoals || 0) + (this.shPostShotGoals || 0);
+    }
+    get ppPostShots() {
+        return (this.ppPostShotOnGoals || 0) + (this.ppPostShotMisses || 0) + (this.ppPostShotsBlocked || 0);
+    }
+    get shPostShots() {
+        return (this.shPostShotOnGoals || 0) + (this.shPostShotMisses || 0) + (this.shPostShotsBlocked || 0);
+    }
+    get evPostShots() {
+        return (this.evPostShotOnGoals || 0) + (this.evPostShotMisses || 0) + (this.evPostShotsBlocked || 0);
+    }
+    get postShotMisses() {
+        return (this.ppPostShotMisses || 0) + (this.shPostShotMisses || 0) + (this.evPostShotMisses || 0);
+    }
+    get postShotOnGoals() {
+        return (this.ppPostShotOnGoals || 0) + (this.shPostShotOnGoals || 0) + (this.evPostShotOnGoals || 0);
+    }
+    get postShotsBlocked() {
+        return (this.ppPostShotsBlocked || 0) + (this.shPostShotsBlocked || 0) + (this.evPostShotsBlocked || 0);
+    }
+    get postShots() {
+        return this.postShotMisses + this.postShotOnGoals + this.postShotsBlocked;
+    }
+    get postShotGoalsPercent() {
+        if (!this.totalPostShotGoals || !this.postShots) {
+            return 0;
+        }
+        return Math.round(1000 * this.totalPostShotGoals / this.postShots) / 10;
+    }
+    get totalFastShotGoals() {
+        return (this.ppFastShotGoals || 0) + (this.evFastShotGoals || 0) + (this.shFastShotGoals || 0);
+    }
+    get ppFastShots() {
+        return (this.ppFastShotOnGoals || 0) + (this.ppFastShotMisses || 0) + (this.ppFastShotsBlocked || 0);
+    }
+    get shFastShots() {
+        return (this.shFastShotOnGoals || 0) + (this.shFastShotMisses || 0) + (this.shFastShotsBlocked || 0);
+    }
+    get evFastShots() {
+        return (this.evFastShotOnGoals || 0) + (this.evFastShotMisses || 0) + (this.evFastShotsBlocked || 0);
+    }
+    get fastShotMisses() {
+        return (this.ppFastShotMisses || 0) + (this.shFastShotMisses || 0) + (this.evFastShotMisses || 0);
+    }
+    get fastShotOnGoals() {
+        return (this.ppFastShotOnGoals || 0) + (this.shFastShotOnGoals || 0) + (this.evFastShotOnGoals || 0);
+    }
+    get fastShotsBlocked() {
+        return (this.ppFastShotsBlocked || 0) + (this.shFastShotsBlocked || 0) + (this.evFastShotsBlocked || 0);
+    }
+    get fastShots() {
+        return this.fastShotMisses + this.fastShotOnGoals + this.fastShotsBlocked;
+    }
+    get fastShotGoalsPercent() {
+        if (!this.totalFastShotGoals || !this.fastShots) {
+            return 0;
+        }
+        return Math.round(1000 * this.totalFastShotGoals / this.fastShots) / 10;
+    }
     get ppShots() {
         return (this.ppShotMisses || 0) + (this.ppShotsOnGoal || 0) + (this.ppShotsBlocked || 0) +
             (this.ppFreeKickMisses || 0) + (this.ppFreeKickOnGoals || 0) + (this.ppFreeKickShotsBlocked || 0) +
             (this.ppCornerMisses || 0) + (this.ppCornerOnGoals || 0) + (this.ppCornerShotsBlocked || 0) +
-            this.ppCounterAttackShots + this.ppManeuverShots + this.ppCenterForwardShots;
+            this.ppCounterAttackShots + this.ppManeuverShots + this.ppCenterForwardShots +
+            this.ppPerimetrShots + this.ppPostShots + this.ppFastShots;
     }
     get evShots() {
         return (this.evShotMisses || 0) + (this.evShotsOnGoal || 0) + (this.evShotsBlocked || 0) +
             (this.evFreeKickMisses || 0) + (this.evFreeKickOnGoals || 0) + (this.evFreeKickShotsBlocked || 0) +
             (this.evCornerMisses || 0) + (this.evCornerOnGoals || 0) + (this.evCornerShotsBlocked || 0) +
-            this.evCounterAttackShots + this.evManeuverShots + this.evCenterForwardShots;
+            this.evCounterAttackShots + this.evManeuverShots + this.evCenterForwardShots +
+            this.evPerimetrShots + this.evPostShots + this.evFastShots;
     }
     get shShots() {
         return (this.shShotMisses || 0) + (this.shShotsOnGoal || 0) + (this.shShotsBlocked || 0) +
             (this.shFreeKickMisses || 0) + (this.shFreeKickOnGoals || 0) + (this.shFreeKickShotsBlocked || 0) +
             (this.shCornerMisses || 0) + (this.shCornerOnGoals || 0) + (this.shCornerShotsBlocked || 0) +
-            this.shCounterAttackShots + this.shManeuverShots + this.shCenterForwardShots;
+            this.shCounterAttackShots + this.shManeuverShots + this.shCenterForwardShots +
+            this.shPerimetrShots + this.shPostShots + this.shFastShots;
     }
     get totalShGoals() {
         return (this.shGoals || 0) + (this.shFreeKickGoals || 0) + (this.shCornerGoals || 0) +
-            (this.shCounterAttackGoals || 0) + (this.shManeuverGoals || 0) + (this.shCenterForwardGoals || 0);
+            (this.shCounterAttackGoals || 0) + (this.shManeuverGoals || 0) + (this.shCenterForwardGoals || 0) +
+            (this.shPerimetrShotGoals || 0) + (this.shPostShotGoals || 0) + (this.shFastShotGoals || 0);
     }
     get totalEvGoals() {
         return (this.evGoals || 0) + (this.evFreeKickGoals || 0) + (this.evCornerGoals || 0) +
-            (this.evCounterAttackGoals || 0) + (this.evManeuverGoals || 0) + (this.evCenterForwardGoals || 0);
+            (this.evCounterAttackGoals || 0) + (this.evManeuverGoals || 0) + (this.evCenterForwardGoals || 0) +
+            (this.evPerimetrShotGoals || 0) + (this.evPostShotGoals || 0) + (this.evFastShotGoals || 0);
     }
     get totalPpGoals() {
         return (this.ppGoals || 0) + (this.ppFreeKickGoals || 0) + (this.ppCornerGoals || 0) +
-            (this.ppCounterAttackGoals || 0) + (this.ppManeuverGoals || 0) + (this.ppCenterForwardGoals || 0);
+            (this.ppCounterAttackGoals || 0) + (this.ppManeuverGoals || 0) + (this.ppCenterForwardGoals || 0) +
+            (this.ppPerimetrShotGoals || 0) + (this.ppPostShotGoals || 0) + (this.ppFastShotGoals || 0);
     }
     get goals() {
         return this.totalShGoals + this.totalEvGoals + this.totalPpGoals;
@@ -10235,7 +10448,8 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
     }
     get inGameShotMisses() {
         return (this.ppShotMisses || 0) + (this.evShotMisses || 0) + (this.shShotMisses || 0) +
-            this.counterAttackShotMisses + this.maneuverShotMisses + this.centerForwardShotMisses;
+            this.counterAttackShotMisses + this.maneuverShotMisses + this.centerForwardShotMisses +
+            this.perimetrShotMisses + this.postShotMisses + this.fastShotMisses;
     }
     get shotMisses() {
         return (this.ppFreeKickMisses || 0) + (this.evFreeKickMisses || 0) + (this.shFreeKickMisses || 0) +
@@ -10244,21 +10458,25 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
     }
     get totalPpShotMisses() {
         return (this.ppShotMisses || 0) + (this.ppFreeKickMisses || 0) + (this.ppCornerMisses || 0) +
-            (this.ppCounterAttackMisses || 0) + (this.ppManeuverMisses || 0) + (this.ppCenterForwardMisses || 0);
+            (this.ppCounterAttackMisses || 0) + (this.ppManeuverMisses || 0) + (this.ppCenterForwardMisses || 0) +
+            (this.ppPerimetrShotMisses || 0) + (this.ppPostShotMisses || 0) + (this.ppFastShotMisses || 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;
+            this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals +
+            this.perimetrShotOnGoals + this.postShotOnGoals + this.fastShotOnGoals;
     }
     get totalPpShotsOnGoal() {
         return (this.ppShotsOnGoal || 0) + (this.ppFreeKickOnGoals || 0) + (this.ppCornerOnGoals || 0) +
-            (this.ppCounterAttackOnGoals || 0) + (this.ppManeuverOnGoals || 0) + (this.ppCenterForwardOnGoals || 0);
+            (this.ppCounterAttackOnGoals || 0) + (this.ppManeuverOnGoals || 0) + (this.ppCenterForwardOnGoals || 0) +
+            (this.ppPerimetrShotOnGoals || 0) + (this.ppPostShotOnGoals || 0) + (this.ppFastShotOnGoals || 0);
     }
     get inGameShotsOnGoals() {
         return (this.ppShotsOnGoal || 0) + (this.evShotsOnGoal || 0) + (this.shShotsOnGoal || 0) +
-            this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals;
+            this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals +
+            this.perimetrShotOnGoals + this.postShotOnGoals + this.fastShotOnGoals;
     }
     get shots() {
         return this.ppShots + this.evShots + this.shShots;
@@ -10310,7 +10528,8 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
     get shotsBlocked() {
         return (this.ppShotsBlocked || 0) + (this.evShotsBlocked || 0) + (this.shShotsBlocked || 0) +
             this.counterAttackShotsBlocked + this.maneuverShotsBlocked + this.centerForwardShotsBlocked +
-            this.freeKickShotsBlocked + this.cornerShotsBlocked;
+            this.freeKickShotsBlocked + this.cornerShotsBlocked +
+            this.perimetrShotsBlocked + this.postShotsBlocked + this.fastShotsBlocked;
     }
     get totalFouls() {
         return (this.fouls || 0) + (this.personalFouls || 0);
@@ -10337,7 +10556,8 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
         return Math.round(1000 * this.positionAttackGoals / this.positionAttackShots) / 10;
     }
     get totalInGameGoals() {
-        return this.totalCenterForwardGoals + this.totalManeuverGoals + this.totalCounterAttackGoals + this.positionAttackGoals;
+        return this.totalCenterForwardGoals + this.totalManeuverGoals + this.totalCounterAttackGoals + this.positionAttackGoals +
+            this.totalPerimetrShotGoals + this.totalPostShotGoals + this.totalFastShotGoals;
     }
     get ppGoalsPercent() {
         if (!this.totalPpGoals || !this.ppShots) {
@@ -10463,9 +10683,46 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
         }
         return Math.round(1000 * this.cornerSaves / this.cornerShotsAgainst) / 10;
     }
+    get perimetrShotSaves() {
+        return (this.ppPerimetrShotSaves || 0) + (this.shPerimetrShotSaves || 0) + (this.evPerimetrShotSaves || 0);
+    }
+    get perimetrShotsAgainst() {
+        return this.perimetrShotSaves + (this.perimetrShotGoalsAgainst || 0);
+    }
+    get perimetrShotSavesPercent() {
+        if (!this.perimetrShotSaves || !this.perimetrShotsAgainst) {
+            return 0;
+        }
+        return Math.round(1000 * this.perimetrShotSaves / this.perimetrShotsAgainst) / 10;
+    }
+    get postShotSaves() {
+        return (this.ppPostShotSaves || 0) + (this.shPostShotSaves || 0) + (this.evPostShotSaves || 0);
+    }
+    get postShotsAgainst() {
+        return this.postShotSaves + (this.postShotGoalsAgainst || 0);
+    }
+    get postShotSavesPercent() {
+        if (!this.postShotSaves || !this.postShotsAgainst) {
+            return 0;
+        }
+        return Math.round(1000 * this.postShotSaves / this.postShotsAgainst) / 10;
+    }
+    get fastShotSaves() {
+        return (this.ppFastShotSaves || 0) + (this.shFastShotSaves || 0) + (this.evFastShotSaves || 0);
+    }
+    get fastShotsAgainst() {
+        return this.fastShotSaves + (this.fastShotGoalsAgainst || 0);
+    }
+    get fastShotSavesPercent() {
+        if (!this.fastShotSaves || !this.fastShotsAgainst) {
+            return 0;
+        }
+        return Math.round(1000 * this.fastShotSaves / this.fastShotsAgainst) / 10;
+    }
     get inGameSaves() {
         return (this.shSaves || 0) + (this.evSaves || 0) + (this.ppSaves || 0) +
-            this.counterAttackSaves + this.maneuverSaves + this.centerForwardSaves;
+            this.counterAttackSaves + this.maneuverSaves + this.centerForwardSaves +
+            this.perimetrShotSaves + this.postShotSaves + this.fastShotSaves;
     }
     get saves() {
         return this.inGameSaves + this.freeKickSaves + this.cornerSaves;
@@ -10474,8 +10731,8 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
         return this.saves + (this.shootoutSaves || 0);
     }
     get inGameGoalsAgainst() {
-        return (this.goalsAgainst || 0) + (this.counterAttackGoalsAgainst || 0) + (this.maneuverGoalsAgainst || 0) +
-            (this.centerForwardGoalsAgainst || 0);
+        return (this.goalsAgainst || 0) + (this.counterAttackGoalsAgainst || 0) + (this.maneuverGoalsAgainst || 0) + (this.centerForwardGoalsAgainst || 0) +
+            (this.perimetrShotGoalsAgainst || 0) + (this.postShotGoalsAgainst || 0) + (this.fastShotGoalsAgainst || 0);
     }
     get shootoutShotsAgainst() {
         return (this.shootoutSaves || 0) + (this.shootoutGoalsAgainst || 0);
@@ -10512,11 +10769,13 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
     }
     get totalShSaves() {
         return (this.shCounterAttackSaves || 0) + (this.shManeuverSaves || 0) + (this.shCenterForwardSaves || 0) +
-            (this.shSaves || 0) + (this.shFreeKickSaves || 0) + (this.shCornerSaves || 0);
+            (this.shSaves || 0) + (this.shFreeKickSaves || 0) + (this.shCornerSaves || 0) +
+            (this.shPerimetrShotSaves) + (this.shPostShotSaves) + (this.shFastShotSaves);
     }
     get totalShGoalsAgainst() {
         return (this.shGoalsAgainst || 0) + (this.shFreeKickGoalsAgainst || 0) + (this.shCornerGoalsAgainst || 0) +
-            (this.shCounterAttackGoalsAgainst || 0) + (this.shManeuverGoalsAgainst || 0) + (this.shCenterForwardGoalsAgainst || 0);
+            (this.shCounterAttackGoalsAgainst || 0) + (this.shManeuverGoalsAgainst || 0) + (this.shCenterForwardGoalsAgainst || 0) +
+            (this.shPerimetrShotGoalsAgainst || 0) + (this.shPostShotGoalsAgainst || 0) + (this.shFastShotGoalsAgainst || 0);
     }
     get totalShShotsAgainst() {
         return this.totalShSaves + this.totalShGoalsAgainst;
@@ -10529,11 +10788,13 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
     }
     get totalEvSaves() {
         return (this.evCounterAttackSaves || 0) + (this.evManeuverSaves || 0) + (this.evCenterForwardSaves || 0) +
-            (this.evSaves || 0) + (this.evFreeKickSaves || 0) + (this.evCornerSaves || 0);
+            (this.evSaves || 0) + (this.evFreeKickSaves || 0) + (this.evCornerSaves || 0) +
+            (this.evPerimetrShotSaves) + (this.evPostShotSaves) + (this.evFastShotSaves);
     }
     get totalEvGoalsAgainst() {
         return (this.evGoalsAgainst || 0) + (this.evFreeKickGoalsAgainst || 0) + (this.evCornerGoalsAgainst || 0) +
-            (this.evCounterAttackGoalsAgainst || 0) + (this.evManeuverGoalsAgainst || 0) + (this.evCenterForwardGoalsAgainst || 0);
+            (this.evCounterAttackGoalsAgainst || 0) + (this.evManeuverGoalsAgainst || 0) + (this.evCenterForwardGoalsAgainst || 0) +
+            (this.evPerimetrShotGoalsAgainst || 0) + (this.evPostShotGoalsAgainst || 0) + (this.evFastShotGoalsAgainst || 0);
     }
     get totalEvShotsAgainst() {
         return this.totalEvSaves + this.totalEvGoalsAgainst;
@@ -10716,7 +10977,66 @@ WaterpoloGameStatistic = __decorate([
             corner_passes: 'cornerPasses',
             corner_selfs: 'cornerSelfs',
             tackles: 'tackles',
-            player_efficiency: 'playerEfficiency'
+            player_efficiency: 'playerEfficiency',
+            defense_select_positions: 'defenseSelectPositions',
+            save_possessions: 'savePossessions',
+            pp_perimetr_shot_goals: 'ppPerimetrShotGoals',
+            pp_perimetr_shot_on_goals: 'ppPerimetrShotOnGoals',
+            pp_perimetr_shot_misses: 'ppPerimetrShotMisses',
+            pp_perimetr_shots_blocked: 'ppPerimetrShotsBlocked',
+            ev_perimetr_shot_goals: 'evPerimetrShotGoals',
+            ev_perimetr_shot_on_goals: 'evPerimetrShotOnGoals',
+            ev_perimetr_shot_misses: 'evPerimetrShotMisses',
+            ev_perimetr_shots_blocked: 'evPerimetrShotsBlocked',
+            sh_perimetr_shot_goals: 'shPerimetrShotGoals',
+            sh_perimetr_shot_on_goals: 'shPerimetrShotOnGoals',
+            sh_perimetr_shot_misses: 'shPerimetrShotMisses',
+            sh_perimetr_shots_blocked: 'shPerimetrShotsBlocked',
+            pp_perimetr_shot_saves: 'ppPerimetrShotSaves',
+            sh_perimetr_shot_saves: 'shPerimetrShotSaves',
+            ev_perimetr_shot_saves: 'evPerimetrShotSaves',
+            pp_perimetr_shot_goals_against: 'ppPerimetrShotGoalsAgainst',
+            sh_perimetr_shot_goals_against: 'shPerimetrShotGoalsAgainst',
+            ev_perimetr_shot_goals_against: 'evPerimetrShotGoalsAgainst',
+            perimetr_shot_goals_against: 'perimetrShotGoalsAgainst',
+            pp_post_shot_goals: 'ppPostShotGoals',
+            pp_post_shot_on_goals: 'ppPostShotOnGoals',
+            pp_post_shot_misses: 'ppPostShotMisses',
+            pp_post_shots_blocked: 'ppPostShotsBlocked',
+            ev_post_shot_goals: 'evPostShotGoals',
+            ev_post_shot_on_goals: 'evPostShotOnGoals',
+            ev_post_shot_misses: 'evPostShotMisses',
+            ev_post_shots_blocked: 'evPostShotsBlocked',
+            sh_post_shot_goals: 'shPostShotGoals',
+            sh_post_shot_on_goals: 'shPostShotOnGoals',
+            sh_post_shot_misses: 'shPostShotMisses',
+            sh_post_shots_blocked: 'shPostShotsBlocked',
+            pp_post_shot_saves: 'ppPostShotSaves',
+            sh_post_shot_saves: 'shPostShotSaves',
+            ev_post_shot_saves: 'evPostShotSaves',
+            pp_post_shot_goals_against: 'ppPostShotGoalsAgainst',
+            sh_post_shot_goals_against: 'shPostShotGoalsAgainst',
+            ev_post_shot_goals_against: 'evPostShotGoalsAgainst',
+            post_shot_goals_against: 'postShotGoalsAgainst',
+            pp_fast_shot_goals: 'ppFastShotGoals',
+            pp_fast_shot_on_goals: 'ppFastShotOnGoals',
+            pp_fast_shot_misses: 'ppFastShotMisses',
+            pp_fast_shots_blocked: 'ppFastShotsBlocked',
+            ev_fast_shot_goals: 'evFastShotGoals',
+            ev_fast_shot_on_goals: 'evFastShotOnGoals',
+            ev_fast_shot_misses: 'evFastShotMisses',
+            ev_fast_shots_blocked: 'evFastShotsBlocked',
+            sh_fast_shot_goals: 'shFastShotGoals',
+            sh_fast_shot_on_goals: 'shFastShotOnGoals',
+            sh_fast_shot_misses: 'shFastShotMisses',
+            sh_fast_shots_blocked: 'shFastShotsBlocked',
+            pp_fast_shot_saves: 'ppFastShotSaves',
+            sh_fast_shot_saves: 'shFastShotSaves',
+            ev_fast_shot_saves: 'evFastShotSaves',
+            pp_fast_shot_goals_against: 'ppFastShotGoalsAgainst',
+            sh_fast_shot_goals_against: 'shFastShotGoalsAgainst',
+            ev_fast_shot_goals_against: 'evFastShotGoalsAgainst',
+            fast_shot_goals_against: 'fastShotGoalsAgainst',
         },
         relation: {
             updatedAt: DateTimeField,
@@ -11666,6 +11986,23 @@ const WaterpoloGameLogTypeLocalization = {
         [WaterpoloGameLogTypes.corner_pass]: 'Пас с углового',
         [WaterpoloGameLogTypes.corner_self]: 'Розыгрыш углового',
         [WaterpoloGameLogTypes.complete_penalty_time]: 'Досрочное завершение штрафа',
+        [WaterpoloGameLogTypes.defense_select_position]: 'Защита: выбор позиции',
+        [WaterpoloGameLogTypes.save_possession]: 'Сохранение владения',
+        [WaterpoloGameLogTypes.perimetr_shot_goal]: 'Гол с периметра',
+        [WaterpoloGameLogTypes.perimetr_shot_on_goal]: 'Бросок с периметра в створ',
+        [WaterpoloGameLogTypes.perimetr_shot_miss]: 'Бросок мимо с периметра',
+        [WaterpoloGameLogTypes.perimetr_shot_blocked]: 'Заблокирован бросок с периметра',
+        [WaterpoloGameLogTypes.perimetr_shot_save]: 'Отражен бросок с периметра',
+        [WaterpoloGameLogTypes.post_shot_goal]: 'Гол со штанги',
+        [WaterpoloGameLogTypes.post_shot_on_goal]: 'Бросок со штанги в створ',
+        [WaterpoloGameLogTypes.post_shot_miss]: 'Бросок мимо со штанги',
+        [WaterpoloGameLogTypes.post_shot_blocked]: 'Заблокирован бросок со штанги',
+        [WaterpoloGameLogTypes.post_shot_save]: 'Отражен бросок со штанги',
+        [WaterpoloGameLogTypes.fast_shot_goal]: 'Быстрый гол',
+        [WaterpoloGameLogTypes.fast_shot_on_goal]: 'Быстрый бросок в створ',
+        [WaterpoloGameLogTypes.fast_shot_miss]: 'Быстрый бросок мимо',
+        [WaterpoloGameLogTypes.fast_shot_blocked]: 'Заблокирован быстрый бросок',
+        [WaterpoloGameLogTypes.fast_shot_save]: 'Отражен быстрый бросок',
     },
     [Locales.en]: {
         [WaterpoloGameLogTypes.enter_game]: 'Entering the court',
@@ -11732,6 +12069,23 @@ const WaterpoloGameLogTypeLocalization = {
         [WaterpoloGameLogTypes.corner_pass]: 'Pass from the corner',
         [WaterpoloGameLogTypes.corner_self]: 'Drawing a corner',
         [WaterpoloGameLogTypes.complete_penalty_time]: 'Early completion of the fine',
+        [WaterpoloGameLogTypes.defense_select_position]: 'Defense: position selection',
+        [WaterpoloGameLogTypes.save_possession]: 'Maintaining possession',
+        [WaterpoloGameLogTypes.perimetr_shot_goal]: 'Goal from the perimeter',
+        [WaterpoloGameLogTypes.perimetr_shot_on_goal]: 'Throw from perimeter on target',
+        [WaterpoloGameLogTypes.perimetr_shot_miss]: 'Throw past from the perimeter',
+        [WaterpoloGameLogTypes.perimetr_shot_blocked]: 'A throw from perimeter is blocked',
+        [WaterpoloGameLogTypes.perimetr_shot_save]: 'A throw from perimeter is saved',
+        [WaterpoloGameLogTypes.post_shot_goal]: 'Goal from the post',
+        [WaterpoloGameLogTypes.post_shot_on_goal]: 'Throw from post on target',
+        [WaterpoloGameLogTypes.post_shot_miss]: 'Throw past from the post',
+        [WaterpoloGameLogTypes.post_shot_blocked]: 'A throw from post is blocked',
+        [WaterpoloGameLogTypes.post_shot_save]: 'A throw from post is saved',
+        [WaterpoloGameLogTypes.fast_shot_goal]: 'Fast goal',
+        [WaterpoloGameLogTypes.fast_shot_on_goal]: 'Fast throw on target',
+        [WaterpoloGameLogTypes.fast_shot_miss]: 'Fast throw is missed',
+        [WaterpoloGameLogTypes.fast_shot_blocked]: 'Fast throw is blocked',
+        [WaterpoloGameLogTypes.fast_shot_save]: 'Fast throw is saved',
     }
 };