@mtgame/core 1.0.32 → 1.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6086,6 +6086,8 @@ WaterpoloStatistic = __decorate([
6086
6086
  corner_selfs: 'cornerSelfs',
6087
6087
  tackles: 'tackles',
6088
6088
  player_efficiency: 'playerEfficiency',
6089
+ defense_select_positions: 'defenseSelectPositions',
6090
+ save_possessions: 'savePossessions',
6089
6091
  pp_shots: 'ppShots',
6090
6092
  ev_shots: 'evShots',
6091
6093
  sh_shots: 'shShots',
@@ -6143,6 +6145,78 @@ WaterpoloStatistic = __decorate([
6143
6145
  total_penalties: 'totalPenalties',
6144
6146
  shootout_shots: 'shootoutShots',
6145
6147
  shootout_goals_percent: 'shootoutGoalsPercent',
6148
+ pp_perimetr_shot_goals: 'ppPerimetrShotGoals',
6149
+ pp_perimetr_shot_on_goals: 'ppPerimetrShotOnGoals',
6150
+ pp_perimetr_shot_misses: 'ppPerimetrShotMisses',
6151
+ pp_perimetr_shots_blocked: 'ppPerimetrShotsBlocked',
6152
+ ev_perimetr_shot_goals: 'evPerimetrShotGoals',
6153
+ ev_perimetr_shot_on_goals: 'evPerimetrShotOnGoals',
6154
+ ev_perimetr_shot_misses: 'evPerimetrShotMisses',
6155
+ ev_perimetr_shots_blocked: 'evPerimetrShotsBlocked',
6156
+ sh_perimetr_shot_goals: 'shPerimetrShotGoals',
6157
+ sh_perimetr_shot_on_goals: 'shPerimetrShotOnGoals',
6158
+ sh_perimetr_shot_misses: 'shPerimetrShotMisses',
6159
+ sh_perimetr_shots_blocked: 'shPerimetrShotsBlocked',
6160
+ pp_perimetr_shot_saves: 'ppPerimetrShotSaves',
6161
+ sh_perimetr_shot_saves: 'shPerimetrShotSaves',
6162
+ ev_perimetr_shot_saves: 'evPerimetrShotSaves',
6163
+ pp_perimetr_shot_goals_against: 'ppPerimetrShotGoalsAgainst',
6164
+ sh_perimetr_shot_goals_against: 'shPerimetrShotGoalsAgainst',
6165
+ ev_perimetr_shot_goals_against: 'evPerimetrShotGoalsAgainst',
6166
+ perimetr_shot_goals_against: 'perimetrShotGoalsAgainst',
6167
+ total_perimetr_shot_goals: 'totalPerimetrShotGoals',
6168
+ perimetr_shots_on_goals: 'perimetrShotsOnGoals',
6169
+ perimetr_shots_misses: 'perimetrShotsMisses',
6170
+ perimetr_shots: 'perimetrShots',
6171
+ perimetr_shot_goals_percent: 'perimetrShotGoalsPercent',
6172
+ pp_post_shot_goals: 'ppPostShotGoals',
6173
+ pp_post_shot_on_goals: 'ppPostShotOnGoals',
6174
+ pp_post_shot_misses: 'ppPostShotMisses',
6175
+ pp_post_shots_blocked: 'ppPostShotsBlocked',
6176
+ ev_post_shot_goals: 'evPostShotGoals',
6177
+ ev_post_shot_on_goals: 'evPostShotOnGoals',
6178
+ ev_post_shot_misses: 'evPostShotMisses',
6179
+ ev_post_shots_blocked: 'evPostShotsBlocked',
6180
+ sh_post_shot_goals: 'shPostShotGoals',
6181
+ sh_post_shot_on_goals: 'shPostShotOnGoals',
6182
+ sh_post_shot_misses: 'shPostShotMisses',
6183
+ sh_post_shots_blocked: 'shPostShotsBlocked',
6184
+ pp_post_shot_saves: 'ppPostShotSaves',
6185
+ sh_post_shot_saves: 'shPostShotSaves',
6186
+ ev_post_shot_saves: 'evPostShotSaves',
6187
+ pp_post_shot_goals_against: 'ppPostShotGoalsAgainst',
6188
+ sh_post_shot_goals_against: 'shPostShotGoalsAgainst',
6189
+ ev_post_shot_goals_against: 'evPostShotGoalsAgainst',
6190
+ post_shot_goals_against: 'postShotGoalsAgainst',
6191
+ total_post_shot_goals: 'totalPostShotGoals',
6192
+ post_shots_on_goals: 'postShotsOnGoals',
6193
+ post_shots_misses: 'postShotsMisses',
6194
+ post_shots: 'postShots',
6195
+ post_shot_goals_percent: 'postShotGoalsPercent',
6196
+ pp_fast_shot_goals: 'ppFastShotGoals',
6197
+ pp_fast_shot_on_goals: 'ppFastShotOnGoals',
6198
+ pp_fast_shot_misses: 'ppFastShotMisses',
6199
+ pp_fast_shots_blocked: 'ppFastShotsBlocked',
6200
+ ev_fast_shot_goals: 'evFastShotGoals',
6201
+ ev_fast_shot_on_goals: 'evFastShotOnGoals',
6202
+ ev_fast_shot_misses: 'evFastShotMisses',
6203
+ ev_fast_shots_blocked: 'evFastShotsBlocked',
6204
+ sh_fast_shot_goals: 'shFastShotGoals',
6205
+ sh_fast_shot_on_goals: 'shFastShotOnGoals',
6206
+ sh_fast_shot_misses: 'shFastShotMisses',
6207
+ sh_fast_shots_blocked: 'shFastShotsBlocked',
6208
+ pp_fast_shot_saves: 'ppFastShotSaves',
6209
+ sh_fast_shot_saves: 'shFastShotSaves',
6210
+ ev_fast_shot_saves: 'evFastShotSaves',
6211
+ pp_fast_shot_goals_against: 'ppFastShotGoalsAgainst',
6212
+ sh_fast_shot_goals_against: 'shFastShotGoalsAgainst',
6213
+ ev_fast_shot_goals_against: 'evFastShotGoalsAgainst',
6214
+ fast_shot_goals_against: 'fastShotGoalsAgainst',
6215
+ total_fast_shot_goals: 'totalFastShotGoals',
6216
+ fast_shots_on_goals: 'fastShotsOnGoals',
6217
+ fast_shots_misses: 'fastShotsMisses',
6218
+ fast_shots: 'fastShots',
6219
+ fast_shot_goals_percent: 'fastShotGoalsPercent',
6146
6220
  /*goalie stat*/
6147
6221
  position_attack_saves: 'positionAttackSaves',
6148
6222
  position_attack_shots_against: 'positionAttackShotsAgainst',
@@ -6181,6 +6255,15 @@ WaterpoloStatistic = __decorate([
6181
6255
  total_ev_goals_against: 'totalEvGoalsAgainst',
6182
6256
  total_ev_shots_against: 'totalEvShotsAgainst',
6183
6257
  total_ev_saves_percent: 'totalEvSavesPercent',
6258
+ perimetr_shot_saves: 'perimetrShotSaves',
6259
+ perimetr_shots_against: 'perimetrShotsAgainst',
6260
+ perimetr_shot_saves_percent: 'perimetrShotSavesPercent',
6261
+ post_shot_saves: 'postShotSaves',
6262
+ post_shots_against: 'postShotsAgainst',
6263
+ post_shot_saves_percent: 'postShotSavesPercent',
6264
+ fast_shot_saves: 'fastShotSaves',
6265
+ fast_shots_against: 'fastShotsAgainst',
6266
+ fast_shot_saves_percent: 'fastShotSavesPercent',
6184
6267
  newbie: 'newbie',
6185
6268
  rank: 'rank',
6186
6269
  },
@@ -9988,6 +10071,23 @@ var WaterpoloGameLogTypes;
9988
10071
  WaterpoloGameLogTypes[WaterpoloGameLogTypes["free_kick_shot_blocked"] = 62] = "free_kick_shot_blocked";
9989
10072
  WaterpoloGameLogTypes[WaterpoloGameLogTypes["corner_shot_blocked"] = 63] = "corner_shot_blocked";
9990
10073
  WaterpoloGameLogTypes[WaterpoloGameLogTypes["complete_penalty_time"] = 64] = "complete_penalty_time";
10074
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["defense_select_position"] = 65] = "defense_select_position";
10075
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["save_possession"] = 66] = "save_possession";
10076
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_goal"] = 67] = "perimetr_shot_goal";
10077
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_on_goal"] = 68] = "perimetr_shot_on_goal";
10078
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_miss"] = 69] = "perimetr_shot_miss";
10079
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_blocked"] = 70] = "perimetr_shot_blocked";
10080
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["perimetr_shot_save"] = 71] = "perimetr_shot_save";
10081
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_goal"] = 72] = "post_shot_goal";
10082
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_on_goal"] = 73] = "post_shot_on_goal";
10083
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_miss"] = 74] = "post_shot_miss";
10084
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_blocked"] = 75] = "post_shot_blocked";
10085
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["post_shot_save"] = 76] = "post_shot_save";
10086
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_goal"] = 77] = "fast_shot_goal";
10087
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_on_goal"] = 78] = "fast_shot_on_goal";
10088
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_miss"] = 79] = "fast_shot_miss";
10089
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_blocked"] = 80] = "fast_shot_blocked";
10090
+ WaterpoloGameLogTypes[WaterpoloGameLogTypes["fast_shot_save"] = 81] = "fast_shot_save";
9991
10091
  })(WaterpoloGameLogTypes || (WaterpoloGameLogTypes = {}));
9992
10092
  var WaterpoloAdvantageTypes;
9993
10093
  (function (WaterpoloAdvantageTypes) {
@@ -10024,9 +10124,12 @@ let WaterpoloGameLog = class WaterpoloGameLog extends BaseModel {
10024
10124
  return `${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
10025
10125
  }
10026
10126
  isScoreType() {
10027
- return [WaterpoloGameLogTypes.goal, WaterpoloGameLogTypes.shootout_goal, WaterpoloGameLogTypes.after_game_shootout_goal,
10127
+ return [
10128
+ WaterpoloGameLogTypes.goal, WaterpoloGameLogTypes.shootout_goal, WaterpoloGameLogTypes.after_game_shootout_goal,
10028
10129
  WaterpoloGameLogTypes.free_kick_goal, WaterpoloGameLogTypes.corner_goal,
10029
- WaterpoloGameLogTypes.counterattack_goal, WaterpoloGameLogTypes.maneuver_goal, WaterpoloGameLogTypes.center_forward_goal].indexOf(this.logType) > -1;
10130
+ WaterpoloGameLogTypes.counterattack_goal, WaterpoloGameLogTypes.maneuver_goal, WaterpoloGameLogTypes.center_forward_goal,
10131
+ WaterpoloGameLogTypes.perimetr_shot_goal, WaterpoloGameLogTypes.post_shot_goal, WaterpoloGameLogTypes.fast_shot_goal
10132
+ ].indexOf(this.logType) > -1;
10030
10133
  }
10031
10134
  isPenaltyType() {
10032
10135
  return [
@@ -10194,35 +10297,131 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10194
10297
  }
10195
10298
  return Math.round(1000 * this.totalCenterForwardGoals / this.centerForwardShots) / 10;
10196
10299
  }
10300
+ get totalPerimetrShotGoals() {
10301
+ return (this.ppPerimetrShotGoals || 0) + (this.evPerimetrShotGoals || 0) + (this.shPerimetrShotGoals || 0);
10302
+ }
10303
+ get ppPerimetrShots() {
10304
+ return (this.ppPerimetrShotOnGoals || 0) + (this.ppPerimetrShotMisses || 0) + (this.ppPerimetrShotsBlocked || 0);
10305
+ }
10306
+ get shPerimetrShots() {
10307
+ return (this.shPerimetrShotOnGoals || 0) + (this.shPerimetrShotMisses || 0) + (this.shPerimetrShotsBlocked || 0);
10308
+ }
10309
+ get evPerimetrShots() {
10310
+ return (this.evPerimetrShotOnGoals || 0) + (this.evPerimetrShotMisses || 0) + (this.evPerimetrShotsBlocked || 0);
10311
+ }
10312
+ get perimetrShotMisses() {
10313
+ return (this.ppPerimetrShotMisses || 0) + (this.shPerimetrShotMisses || 0) + (this.evPerimetrShotMisses || 0);
10314
+ }
10315
+ get perimetrShotOnGoals() {
10316
+ return (this.ppPerimetrShotOnGoals || 0) + (this.shPerimetrShotOnGoals || 0) + (this.evPerimetrShotOnGoals || 0);
10317
+ }
10318
+ get perimetrShotsBlocked() {
10319
+ return (this.ppPerimetrShotsBlocked || 0) + (this.shPerimetrShotsBlocked || 0) + (this.evPerimetrShotsBlocked || 0);
10320
+ }
10321
+ get perimetrShots() {
10322
+ return this.perimetrShotMisses + this.perimetrShotOnGoals + this.perimetrShotsBlocked;
10323
+ }
10324
+ get perimetrShotGoalsPercent() {
10325
+ if (!this.totalPerimetrShotGoals || !this.perimetrShots) {
10326
+ return 0;
10327
+ }
10328
+ return Math.round(1000 * this.totalPerimetrShotGoals / this.perimetrShots) / 10;
10329
+ }
10330
+ get totalPostShotGoals() {
10331
+ return (this.ppPostShotGoals || 0) + (this.evPostShotGoals || 0) + (this.shPostShotGoals || 0);
10332
+ }
10333
+ get ppPostShots() {
10334
+ return (this.ppPostShotOnGoals || 0) + (this.ppPostShotMisses || 0) + (this.ppPostShotsBlocked || 0);
10335
+ }
10336
+ get shPostShots() {
10337
+ return (this.shPostShotOnGoals || 0) + (this.shPostShotMisses || 0) + (this.shPostShotsBlocked || 0);
10338
+ }
10339
+ get evPostShots() {
10340
+ return (this.evPostShotOnGoals || 0) + (this.evPostShotMisses || 0) + (this.evPostShotsBlocked || 0);
10341
+ }
10342
+ get postShotMisses() {
10343
+ return (this.ppPostShotMisses || 0) + (this.shPostShotMisses || 0) + (this.evPostShotMisses || 0);
10344
+ }
10345
+ get postShotOnGoals() {
10346
+ return (this.ppPostShotOnGoals || 0) + (this.shPostShotOnGoals || 0) + (this.evPostShotOnGoals || 0);
10347
+ }
10348
+ get postShotsBlocked() {
10349
+ return (this.ppPostShotsBlocked || 0) + (this.shPostShotsBlocked || 0) + (this.evPostShotsBlocked || 0);
10350
+ }
10351
+ get postShots() {
10352
+ return this.postShotMisses + this.postShotOnGoals + this.postShotsBlocked;
10353
+ }
10354
+ get postShotGoalsPercent() {
10355
+ if (!this.totalPostShotGoals || !this.postShots) {
10356
+ return 0;
10357
+ }
10358
+ return Math.round(1000 * this.totalPostShotGoals / this.postShots) / 10;
10359
+ }
10360
+ get totalFastShotGoals() {
10361
+ return (this.ppFastShotGoals || 0) + (this.evFastShotGoals || 0) + (this.shFastShotGoals || 0);
10362
+ }
10363
+ get ppFastShots() {
10364
+ return (this.ppFastShotOnGoals || 0) + (this.ppFastShotMisses || 0) + (this.ppFastShotsBlocked || 0);
10365
+ }
10366
+ get shFastShots() {
10367
+ return (this.shFastShotOnGoals || 0) + (this.shFastShotMisses || 0) + (this.shFastShotsBlocked || 0);
10368
+ }
10369
+ get evFastShots() {
10370
+ return (this.evFastShotOnGoals || 0) + (this.evFastShotMisses || 0) + (this.evFastShotsBlocked || 0);
10371
+ }
10372
+ get fastShotMisses() {
10373
+ return (this.ppFastShotMisses || 0) + (this.shFastShotMisses || 0) + (this.evFastShotMisses || 0);
10374
+ }
10375
+ get fastShotOnGoals() {
10376
+ return (this.ppFastShotOnGoals || 0) + (this.shFastShotOnGoals || 0) + (this.evFastShotOnGoals || 0);
10377
+ }
10378
+ get fastShotsBlocked() {
10379
+ return (this.ppFastShotsBlocked || 0) + (this.shFastShotsBlocked || 0) + (this.evFastShotsBlocked || 0);
10380
+ }
10381
+ get fastShots() {
10382
+ return this.fastShotMisses + this.fastShotOnGoals + this.fastShotsBlocked;
10383
+ }
10384
+ get fastShotGoalsPercent() {
10385
+ if (!this.totalFastShotGoals || !this.fastShots) {
10386
+ return 0;
10387
+ }
10388
+ return Math.round(1000 * this.totalFastShotGoals / this.fastShots) / 10;
10389
+ }
10197
10390
  get ppShots() {
10198
10391
  return (this.ppShotMisses || 0) + (this.ppShotsOnGoal || 0) + (this.ppShotsBlocked || 0) +
10199
10392
  (this.ppFreeKickMisses || 0) + (this.ppFreeKickOnGoals || 0) + (this.ppFreeKickShotsBlocked || 0) +
10200
10393
  (this.ppCornerMisses || 0) + (this.ppCornerOnGoals || 0) + (this.ppCornerShotsBlocked || 0) +
10201
- this.ppCounterAttackShots + this.ppManeuverShots + this.ppCenterForwardShots;
10394
+ this.ppCounterAttackShots + this.ppManeuverShots + this.ppCenterForwardShots +
10395
+ this.ppPerimetrShots + this.ppPostShots + this.ppFastShots;
10202
10396
  }
10203
10397
  get evShots() {
10204
10398
  return (this.evShotMisses || 0) + (this.evShotsOnGoal || 0) + (this.evShotsBlocked || 0) +
10205
10399
  (this.evFreeKickMisses || 0) + (this.evFreeKickOnGoals || 0) + (this.evFreeKickShotsBlocked || 0) +
10206
10400
  (this.evCornerMisses || 0) + (this.evCornerOnGoals || 0) + (this.evCornerShotsBlocked || 0) +
10207
- this.evCounterAttackShots + this.evManeuverShots + this.evCenterForwardShots;
10401
+ this.evCounterAttackShots + this.evManeuverShots + this.evCenterForwardShots +
10402
+ this.evPerimetrShots + this.evPostShots + this.evFastShots;
10208
10403
  }
10209
10404
  get shShots() {
10210
10405
  return (this.shShotMisses || 0) + (this.shShotsOnGoal || 0) + (this.shShotsBlocked || 0) +
10211
10406
  (this.shFreeKickMisses || 0) + (this.shFreeKickOnGoals || 0) + (this.shFreeKickShotsBlocked || 0) +
10212
10407
  (this.shCornerMisses || 0) + (this.shCornerOnGoals || 0) + (this.shCornerShotsBlocked || 0) +
10213
- this.shCounterAttackShots + this.shManeuverShots + this.shCenterForwardShots;
10408
+ this.shCounterAttackShots + this.shManeuverShots + this.shCenterForwardShots +
10409
+ this.shPerimetrShots + this.shPostShots + this.shFastShots;
10214
10410
  }
10215
10411
  get totalShGoals() {
10216
10412
  return (this.shGoals || 0) + (this.shFreeKickGoals || 0) + (this.shCornerGoals || 0) +
10217
- (this.shCounterAttackGoals || 0) + (this.shManeuverGoals || 0) + (this.shCenterForwardGoals || 0);
10413
+ (this.shCounterAttackGoals || 0) + (this.shManeuverGoals || 0) + (this.shCenterForwardGoals || 0) +
10414
+ (this.shPerimetrShotGoals || 0) + (this.shPostShotGoals || 0) + (this.shFastShotGoals || 0);
10218
10415
  }
10219
10416
  get totalEvGoals() {
10220
10417
  return (this.evGoals || 0) + (this.evFreeKickGoals || 0) + (this.evCornerGoals || 0) +
10221
- (this.evCounterAttackGoals || 0) + (this.evManeuverGoals || 0) + (this.evCenterForwardGoals || 0);
10418
+ (this.evCounterAttackGoals || 0) + (this.evManeuverGoals || 0) + (this.evCenterForwardGoals || 0) +
10419
+ (this.evPerimetrShotGoals || 0) + (this.evPostShotGoals || 0) + (this.evFastShotGoals || 0);
10222
10420
  }
10223
10421
  get totalPpGoals() {
10224
10422
  return (this.ppGoals || 0) + (this.ppFreeKickGoals || 0) + (this.ppCornerGoals || 0) +
10225
- (this.ppCounterAttackGoals || 0) + (this.ppManeuverGoals || 0) + (this.ppCenterForwardGoals || 0);
10423
+ (this.ppCounterAttackGoals || 0) + (this.ppManeuverGoals || 0) + (this.ppCenterForwardGoals || 0) +
10424
+ (this.ppPerimetrShotGoals || 0) + (this.ppPostShotGoals || 0) + (this.ppFastShotGoals || 0);
10226
10425
  }
10227
10426
  get goals() {
10228
10427
  return this.totalShGoals + this.totalEvGoals + this.totalPpGoals;
@@ -10235,7 +10434,8 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10235
10434
  }
10236
10435
  get inGameShotMisses() {
10237
10436
  return (this.ppShotMisses || 0) + (this.evShotMisses || 0) + (this.shShotMisses || 0) +
10238
- this.counterAttackShotMisses + this.maneuverShotMisses + this.centerForwardShotMisses;
10437
+ this.counterAttackShotMisses + this.maneuverShotMisses + this.centerForwardShotMisses +
10438
+ this.perimetrShotMisses + this.postShotMisses + this.fastShotMisses;
10239
10439
  }
10240
10440
  get shotMisses() {
10241
10441
  return (this.ppFreeKickMisses || 0) + (this.evFreeKickMisses || 0) + (this.shFreeKickMisses || 0) +
@@ -10244,21 +10444,25 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10244
10444
  }
10245
10445
  get totalPpShotMisses() {
10246
10446
  return (this.ppShotMisses || 0) + (this.ppFreeKickMisses || 0) + (this.ppCornerMisses || 0) +
10247
- (this.ppCounterAttackMisses || 0) + (this.ppManeuverMisses || 0) + (this.ppCenterForwardMisses || 0);
10447
+ (this.ppCounterAttackMisses || 0) + (this.ppManeuverMisses || 0) + (this.ppCenterForwardMisses || 0) +
10448
+ (this.ppPerimetrShotMisses || 0) + (this.ppPostShotMisses || 0) + (this.ppFastShotMisses || 0);
10248
10449
  }
10249
10450
  get shotsOnGoal() {
10250
10451
  return (this.ppShotsOnGoal || 0) + (this.evShotsOnGoal || 0) + (this.shShotsOnGoal || 0) +
10251
10452
  (this.ppFreeKickOnGoals || 0) + (this.evFreeKickOnGoals || 0) + (this.shFreeKickOnGoals || 0) +
10252
10453
  (this.ppCornerOnGoals || 0) + (this.evCornerOnGoals || 0) + (this.shCornerOnGoals || 0) +
10253
- this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals;
10454
+ this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals +
10455
+ this.perimetrShotOnGoals + this.postShotOnGoals + this.fastShotOnGoals;
10254
10456
  }
10255
10457
  get totalPpShotsOnGoal() {
10256
10458
  return (this.ppShotsOnGoal || 0) + (this.ppFreeKickOnGoals || 0) + (this.ppCornerOnGoals || 0) +
10257
- (this.ppCounterAttackOnGoals || 0) + (this.ppManeuverOnGoals || 0) + (this.ppCenterForwardOnGoals || 0);
10459
+ (this.ppCounterAttackOnGoals || 0) + (this.ppManeuverOnGoals || 0) + (this.ppCenterForwardOnGoals || 0) +
10460
+ (this.ppPerimetrShotOnGoals || 0) + (this.ppPostShotOnGoals || 0) + (this.ppFastShotOnGoals || 0);
10258
10461
  }
10259
10462
  get inGameShotsOnGoals() {
10260
10463
  return (this.ppShotsOnGoal || 0) + (this.evShotsOnGoal || 0) + (this.shShotsOnGoal || 0) +
10261
- this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals;
10464
+ this.counterAttackShotOnGoals + this.maneuverShotOnGoals + this.centerForwardShotOnGoals +
10465
+ this.perimetrShotOnGoals + this.postShotOnGoals + this.fastShotOnGoals;
10262
10466
  }
10263
10467
  get shots() {
10264
10468
  return this.ppShots + this.evShots + this.shShots;
@@ -10310,7 +10514,8 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10310
10514
  get shotsBlocked() {
10311
10515
  return (this.ppShotsBlocked || 0) + (this.evShotsBlocked || 0) + (this.shShotsBlocked || 0) +
10312
10516
  this.counterAttackShotsBlocked + this.maneuverShotsBlocked + this.centerForwardShotsBlocked +
10313
- this.freeKickShotsBlocked + this.cornerShotsBlocked;
10517
+ this.freeKickShotsBlocked + this.cornerShotsBlocked +
10518
+ this.perimetrShotsBlocked + this.postShotsBlocked + this.fastShotsBlocked;
10314
10519
  }
10315
10520
  get totalFouls() {
10316
10521
  return (this.fouls || 0) + (this.personalFouls || 0);
@@ -10337,7 +10542,8 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10337
10542
  return Math.round(1000 * this.positionAttackGoals / this.positionAttackShots) / 10;
10338
10543
  }
10339
10544
  get totalInGameGoals() {
10340
- return this.totalCenterForwardGoals + this.totalManeuverGoals + this.totalCounterAttackGoals + this.positionAttackGoals;
10545
+ return this.totalCenterForwardGoals + this.totalManeuverGoals + this.totalCounterAttackGoals + this.positionAttackGoals +
10546
+ this.totalPerimetrShotGoals + this.totalPostShotGoals + this.totalFastShotGoals;
10341
10547
  }
10342
10548
  get ppGoalsPercent() {
10343
10549
  if (!this.totalPpGoals || !this.ppShots) {
@@ -10463,9 +10669,46 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10463
10669
  }
10464
10670
  return Math.round(1000 * this.cornerSaves / this.cornerShotsAgainst) / 10;
10465
10671
  }
10672
+ get perimetrShotSaves() {
10673
+ return (this.ppPerimetrShotSaves || 0) + (this.shPerimetrShotSaves || 0) + (this.evPerimetrShotSaves || 0);
10674
+ }
10675
+ get perimetrShotsAgainst() {
10676
+ return this.perimetrShotSaves + (this.perimetrShotGoalsAgainst || 0);
10677
+ }
10678
+ get perimetrShotSavesPercent() {
10679
+ if (!this.perimetrShotSaves || !this.perimetrShotsAgainst) {
10680
+ return 0;
10681
+ }
10682
+ return Math.round(1000 * this.perimetrShotSaves / this.perimetrShotsAgainst) / 10;
10683
+ }
10684
+ get postShotSaves() {
10685
+ return (this.ppPostShotSaves || 0) + (this.shPostShotSaves || 0) + (this.evPostShotSaves || 0);
10686
+ }
10687
+ get postShotsAgainst() {
10688
+ return this.postShotSaves + (this.postShotGoalsAgainst || 0);
10689
+ }
10690
+ get postShotSavesPercent() {
10691
+ if (!this.postShotSaves || !this.postShotsAgainst) {
10692
+ return 0;
10693
+ }
10694
+ return Math.round(1000 * this.postShotSaves / this.postShotsAgainst) / 10;
10695
+ }
10696
+ get fastShotSaves() {
10697
+ return (this.ppFastShotSaves || 0) + (this.shFastShotSaves || 0) + (this.evFastShotSaves || 0);
10698
+ }
10699
+ get fastShotsAgainst() {
10700
+ return this.fastShotSaves + (this.fastShotGoalsAgainst || 0);
10701
+ }
10702
+ get fastShotSavesPercent() {
10703
+ if (!this.fastShotSaves || !this.fastShotsAgainst) {
10704
+ return 0;
10705
+ }
10706
+ return Math.round(1000 * this.fastShotSaves / this.fastShotsAgainst) / 10;
10707
+ }
10466
10708
  get inGameSaves() {
10467
10709
  return (this.shSaves || 0) + (this.evSaves || 0) + (this.ppSaves || 0) +
10468
- this.counterAttackSaves + this.maneuverSaves + this.centerForwardSaves;
10710
+ this.counterAttackSaves + this.maneuverSaves + this.centerForwardSaves +
10711
+ this.perimetrShotSaves + this.postShotSaves + this.fastShotSaves;
10469
10712
  }
10470
10713
  get saves() {
10471
10714
  return this.inGameSaves + this.freeKickSaves + this.cornerSaves;
@@ -10474,8 +10717,8 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10474
10717
  return this.saves + (this.shootoutSaves || 0);
10475
10718
  }
10476
10719
  get inGameGoalsAgainst() {
10477
- return (this.goalsAgainst || 0) + (this.counterAttackGoalsAgainst || 0) + (this.maneuverGoalsAgainst || 0) +
10478
- (this.centerForwardGoalsAgainst || 0);
10720
+ return (this.goalsAgainst || 0) + (this.counterAttackGoalsAgainst || 0) + (this.maneuverGoalsAgainst || 0) + (this.centerForwardGoalsAgainst || 0) +
10721
+ (this.perimetrShotGoalsAgainst || 0) + (this.postShotGoalsAgainst || 0) + (this.fastShotGoalsAgainst || 0);
10479
10722
  }
10480
10723
  get shootoutShotsAgainst() {
10481
10724
  return (this.shootoutSaves || 0) + (this.shootoutGoalsAgainst || 0);
@@ -10512,11 +10755,13 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10512
10755
  }
10513
10756
  get totalShSaves() {
10514
10757
  return (this.shCounterAttackSaves || 0) + (this.shManeuverSaves || 0) + (this.shCenterForwardSaves || 0) +
10515
- (this.shSaves || 0) + (this.shFreeKickSaves || 0) + (this.shCornerSaves || 0);
10758
+ (this.shSaves || 0) + (this.shFreeKickSaves || 0) + (this.shCornerSaves || 0) +
10759
+ (this.shPerimetrShotSaves) + (this.shPostShotSaves) + (this.shFastShotSaves);
10516
10760
  }
10517
10761
  get totalShGoalsAgainst() {
10518
10762
  return (this.shGoalsAgainst || 0) + (this.shFreeKickGoalsAgainst || 0) + (this.shCornerGoalsAgainst || 0) +
10519
- (this.shCounterAttackGoalsAgainst || 0) + (this.shManeuverGoalsAgainst || 0) + (this.shCenterForwardGoalsAgainst || 0);
10763
+ (this.shCounterAttackGoalsAgainst || 0) + (this.shManeuverGoalsAgainst || 0) + (this.shCenterForwardGoalsAgainst || 0) +
10764
+ (this.shPerimetrShotGoalsAgainst || 0) + (this.shPostShotGoalsAgainst || 0) + (this.shFastShotGoalsAgainst || 0);
10520
10765
  }
10521
10766
  get totalShShotsAgainst() {
10522
10767
  return this.totalShSaves + this.totalShGoalsAgainst;
@@ -10529,11 +10774,13 @@ let WaterpoloGameStatistic = class WaterpoloGameStatistic extends BaseModel {
10529
10774
  }
10530
10775
  get totalEvSaves() {
10531
10776
  return (this.evCounterAttackSaves || 0) + (this.evManeuverSaves || 0) + (this.evCenterForwardSaves || 0) +
10532
- (this.evSaves || 0) + (this.evFreeKickSaves || 0) + (this.evCornerSaves || 0);
10777
+ (this.evSaves || 0) + (this.evFreeKickSaves || 0) + (this.evCornerSaves || 0) +
10778
+ (this.evPerimetrShotSaves) + (this.evPostShotSaves) + (this.evFastShotSaves);
10533
10779
  }
10534
10780
  get totalEvGoalsAgainst() {
10535
10781
  return (this.evGoalsAgainst || 0) + (this.evFreeKickGoalsAgainst || 0) + (this.evCornerGoalsAgainst || 0) +
10536
- (this.evCounterAttackGoalsAgainst || 0) + (this.evManeuverGoalsAgainst || 0) + (this.evCenterForwardGoalsAgainst || 0);
10782
+ (this.evCounterAttackGoalsAgainst || 0) + (this.evManeuverGoalsAgainst || 0) + (this.evCenterForwardGoalsAgainst || 0) +
10783
+ (this.evPerimetrShotGoalsAgainst || 0) + (this.evPostShotGoalsAgainst || 0) + (this.evFastShotGoalsAgainst || 0);
10537
10784
  }
10538
10785
  get totalEvShotsAgainst() {
10539
10786
  return this.totalEvSaves + this.totalEvGoalsAgainst;
@@ -10716,7 +10963,66 @@ WaterpoloGameStatistic = __decorate([
10716
10963
  corner_passes: 'cornerPasses',
10717
10964
  corner_selfs: 'cornerSelfs',
10718
10965
  tackles: 'tackles',
10719
- player_efficiency: 'playerEfficiency'
10966
+ player_efficiency: 'playerEfficiency',
10967
+ defense_select_positions: 'defenseSelectPositions',
10968
+ save_possessions: 'savePossessions',
10969
+ pp_perimetr_shot_goals: 'ppPerimetrShotGoals',
10970
+ pp_perimetr_shot_on_goals: 'ppPerimetrShotOnGoals',
10971
+ pp_perimetr_shot_misses: 'ppPerimetrShotMisses',
10972
+ pp_perimetr_shots_blocked: 'ppPerimetrShotsBlocked',
10973
+ ev_perimetr_shot_goals: 'evPerimetrShotGoals',
10974
+ ev_perimetr_shot_on_goals: 'evPerimetrShotOnGoals',
10975
+ ev_perimetr_shot_misses: 'evPerimetrShotMisses',
10976
+ ev_perimetr_shots_blocked: 'evPerimetrShotsBlocked',
10977
+ sh_perimetr_shot_goals: 'shPerimetrShotGoals',
10978
+ sh_perimetr_shot_on_goals: 'shPerimetrShotOnGoals',
10979
+ sh_perimetr_shot_misses: 'shPerimetrShotMisses',
10980
+ sh_perimetr_shots_blocked: 'shPerimetrShotsBlocked',
10981
+ pp_perimetr_shot_saves: 'ppPerimetrShotSaves',
10982
+ sh_perimetr_shot_saves: 'shPerimetrShotSaves',
10983
+ ev_perimetr_shot_saves: 'evPerimetrShotSaves',
10984
+ pp_perimetr_shot_goals_against: 'ppPerimetrShotGoalsAgainst',
10985
+ sh_perimetr_shot_goals_against: 'shPerimetrShotGoalsAgainst',
10986
+ ev_perimetr_shot_goals_against: 'evPerimetrShotGoalsAgainst',
10987
+ perimetr_shot_goals_against: 'perimetrShotGoalsAgainst',
10988
+ pp_post_shot_goals: 'ppPostShotGoals',
10989
+ pp_post_shot_on_goals: 'ppPostShotOnGoals',
10990
+ pp_post_shot_misses: 'ppPostShotMisses',
10991
+ pp_post_shots_blocked: 'ppPostShotsBlocked',
10992
+ ev_post_shot_goals: 'evPostShotGoals',
10993
+ ev_post_shot_on_goals: 'evPostShotOnGoals',
10994
+ ev_post_shot_misses: 'evPostShotMisses',
10995
+ ev_post_shots_blocked: 'evPostShotsBlocked',
10996
+ sh_post_shot_goals: 'shPostShotGoals',
10997
+ sh_post_shot_on_goals: 'shPostShotOnGoals',
10998
+ sh_post_shot_misses: 'shPostShotMisses',
10999
+ sh_post_shots_blocked: 'shPostShotsBlocked',
11000
+ pp_post_shot_saves: 'ppPostShotSaves',
11001
+ sh_post_shot_saves: 'shPostShotSaves',
11002
+ ev_post_shot_saves: 'evPostShotSaves',
11003
+ pp_post_shot_goals_against: 'ppPostShotGoalsAgainst',
11004
+ sh_post_shot_goals_against: 'shPostShotGoalsAgainst',
11005
+ ev_post_shot_goals_against: 'evPostShotGoalsAgainst',
11006
+ post_shot_goals_against: 'postShotGoalsAgainst',
11007
+ pp_fast_shot_goals: 'ppFastShotGoals',
11008
+ pp_fast_shot_on_goals: 'ppFastShotOnGoals',
11009
+ pp_fast_shot_misses: 'ppFastShotMisses',
11010
+ pp_fast_shots_blocked: 'ppFastShotsBlocked',
11011
+ ev_fast_shot_goals: 'evFastShotGoals',
11012
+ ev_fast_shot_on_goals: 'evFastShotOnGoals',
11013
+ ev_fast_shot_misses: 'evFastShotMisses',
11014
+ ev_fast_shots_blocked: 'evFastShotsBlocked',
11015
+ sh_fast_shot_goals: 'shFastShotGoals',
11016
+ sh_fast_shot_on_goals: 'shFastShotOnGoals',
11017
+ sh_fast_shot_misses: 'shFastShotMisses',
11018
+ sh_fast_shots_blocked: 'shFastShotsBlocked',
11019
+ pp_fast_shot_saves: 'ppFastShotSaves',
11020
+ sh_fast_shot_saves: 'shFastShotSaves',
11021
+ ev_fast_shot_saves: 'evFastShotSaves',
11022
+ pp_fast_shot_goals_against: 'ppFastShotGoalsAgainst',
11023
+ sh_fast_shot_goals_against: 'shFastShotGoalsAgainst',
11024
+ ev_fast_shot_goals_against: 'evFastShotGoalsAgainst',
11025
+ fast_shot_goals_against: 'fastShotGoalsAgainst',
10720
11026
  },
10721
11027
  relation: {
10722
11028
  updatedAt: DateTimeField,
@@ -11666,6 +11972,23 @@ const WaterpoloGameLogTypeLocalization = {
11666
11972
  [WaterpoloGameLogTypes.corner_pass]: 'Пас с углового',
11667
11973
  [WaterpoloGameLogTypes.corner_self]: 'Розыгрыш углового',
11668
11974
  [WaterpoloGameLogTypes.complete_penalty_time]: 'Досрочное завершение штрафа',
11975
+ [WaterpoloGameLogTypes.defense_select_position]: 'Защита: выбор позиции',
11976
+ [WaterpoloGameLogTypes.save_possession]: 'Сохранение владения',
11977
+ [WaterpoloGameLogTypes.perimetr_shot_goal]: 'Гол с периметра',
11978
+ [WaterpoloGameLogTypes.perimetr_shot_on_goal]: 'Бросок с периметра в створ',
11979
+ [WaterpoloGameLogTypes.perimetr_shot_miss]: 'Бросок мимо с периметра',
11980
+ [WaterpoloGameLogTypes.perimetr_shot_blocked]: 'Заблокирован бросок с периметра',
11981
+ [WaterpoloGameLogTypes.perimetr_shot_save]: 'Отражен бросок с периметра',
11982
+ [WaterpoloGameLogTypes.post_shot_goal]: 'Гол со штанги',
11983
+ [WaterpoloGameLogTypes.post_shot_on_goal]: 'Бросок со штанги в створ',
11984
+ [WaterpoloGameLogTypes.post_shot_miss]: 'Бросок мимо со штанги',
11985
+ [WaterpoloGameLogTypes.post_shot_blocked]: 'Заблокирован бросок со штанги',
11986
+ [WaterpoloGameLogTypes.post_shot_save]: 'Отражен бросок со штанги',
11987
+ [WaterpoloGameLogTypes.fast_shot_goal]: 'Быстрый гол',
11988
+ [WaterpoloGameLogTypes.fast_shot_on_goal]: 'Быстрый бросок в створ',
11989
+ [WaterpoloGameLogTypes.fast_shot_miss]: 'Быстрый бросок мимо',
11990
+ [WaterpoloGameLogTypes.fast_shot_blocked]: 'Заблокирован быстрый бросок',
11991
+ [WaterpoloGameLogTypes.fast_shot_save]: 'Отражен быстрый бросок',
11669
11992
  },
11670
11993
  [Locales.en]: {
11671
11994
  [WaterpoloGameLogTypes.enter_game]: 'Entering the court',
@@ -11732,6 +12055,23 @@ const WaterpoloGameLogTypeLocalization = {
11732
12055
  [WaterpoloGameLogTypes.corner_pass]: 'Pass from the corner',
11733
12056
  [WaterpoloGameLogTypes.corner_self]: 'Drawing a corner',
11734
12057
  [WaterpoloGameLogTypes.complete_penalty_time]: 'Early completion of the fine',
12058
+ [WaterpoloGameLogTypes.defense_select_position]: 'Defense: position selection',
12059
+ [WaterpoloGameLogTypes.save_possession]: 'Maintaining possession',
12060
+ [WaterpoloGameLogTypes.perimetr_shot_goal]: 'Goal from the perimeter',
12061
+ [WaterpoloGameLogTypes.perimetr_shot_on_goal]: 'Throw from perimeter on target',
12062
+ [WaterpoloGameLogTypes.perimetr_shot_miss]: 'Throw past from the perimeter',
12063
+ [WaterpoloGameLogTypes.perimetr_shot_blocked]: 'A throw from perimeter is blocked',
12064
+ [WaterpoloGameLogTypes.perimetr_shot_save]: 'A throw from perimeter is saved',
12065
+ [WaterpoloGameLogTypes.post_shot_goal]: 'Goal from the post',
12066
+ [WaterpoloGameLogTypes.post_shot_on_goal]: 'Throw from post on target',
12067
+ [WaterpoloGameLogTypes.post_shot_miss]: 'Throw past from the post',
12068
+ [WaterpoloGameLogTypes.post_shot_blocked]: 'A throw from post is blocked',
12069
+ [WaterpoloGameLogTypes.post_shot_save]: 'A throw from post is saved',
12070
+ [WaterpoloGameLogTypes.fast_shot_goal]: 'Fast goal',
12071
+ [WaterpoloGameLogTypes.fast_shot_on_goal]: 'Fast throw on target',
12072
+ [WaterpoloGameLogTypes.fast_shot_miss]: 'Fast throw is missed',
12073
+ [WaterpoloGameLogTypes.fast_shot_blocked]: 'Fast throw is blocked',
12074
+ [WaterpoloGameLogTypes.fast_shot_save]: 'Fast throw is saved',
11735
12075
  }
11736
12076
  };
11737
12077