Compare commits
No commits in common. "c2822893caf2930b2aad518fed4ea3134875e286" and "8b0e2d91d3d4546b662c37cddef7a46e9113037f" have entirely different histories.
c2822893ca
...
8b0e2d91d3
|
@ -108,29 +108,20 @@ const parseWarLog = (lineArray, war) => {
|
||||||
const kill = {
|
const kill = {
|
||||||
war: war._id,
|
war: war._id,
|
||||||
time: getFullTimeDate(war.date, line.split(WHITESPACE)[5]),
|
time: getFullTimeDate(war.date, line.split(WHITESPACE)[5]),
|
||||||
|
shooter: shooter ? shooter.name : null,
|
||||||
|
target: target ? target.name : null,
|
||||||
|
friendlyFire: shooter ? target.fraction === shooter.fraction : false,
|
||||||
|
fraction: shooter ? shooter.fraction : 'NONE',
|
||||||
};
|
};
|
||||||
if (shooter) {
|
|
||||||
kill.shooter = shooter.name;
|
|
||||||
kill.fraction = shooter.fraction;
|
|
||||||
if (target) {
|
|
||||||
kill.friendlyFire = (target.fraction === shooter.fraction);
|
|
||||||
}
|
|
||||||
if (shooter.magazine) {
|
if (shooter.magazine) {
|
||||||
kill.magazine = shooter.magazine;
|
kill.magazine = shooter.magazine;
|
||||||
}
|
}
|
||||||
if (shooter.vehicle) {
|
if (shooter.vehicle) {
|
||||||
kill.shooterVehicle = shooter.vehicle;
|
kill.shooterVehicle = shooter.vehicle;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
kill.fraction = 'NONE';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (target) {
|
|
||||||
kill.target = target.name;
|
|
||||||
if (target.vehicle) {
|
if (target.vehicle) {
|
||||||
kill.targetVehicle = target.vehicle;
|
kill.targetVehicle = target.vehicle;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
stats.kills.push(kill);
|
stats.kills.push(kill);
|
||||||
}
|
}
|
||||||
} else if (line.includes('(Budget)')) {
|
} else if (line.includes('(Budget)')) {
|
||||||
|
@ -321,15 +312,12 @@ const getPlayerInfoFromString = (inputString) => {
|
||||||
let name;
|
let name;
|
||||||
if (playerNameRegexMatch && playerNameRegexMatch.length >= 2) {
|
if (playerNameRegexMatch && playerNameRegexMatch.length >= 2) {
|
||||||
name = playerNameRegexMatch[2].trim();
|
name = playerNameRegexMatch[2].trim();
|
||||||
// do not return player for 'unbekannt' or 'Error: No unit'
|
// do not return player for 'Error: No unit'
|
||||||
if (!name || name === 'unbekannt' || name === 'Error: No unit' || name === 'Selbstverschulden.') {
|
if (!name && name === 'Error: No unit') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
resPlayer.name = name;
|
resPlayer.name = name;
|
||||||
} else {
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ADDITIONAL PLAYER NAMES
|
// ADDITIONAL PLAYER NAMES
|
||||||
let additionalPlayerMatch;
|
let additionalPlayerMatch;
|
||||||
while ((additionalPlayerMatch = playerNameRegex.exec(inputString)) !== null) {
|
while ((additionalPlayerMatch = playerNameRegex.exec(inputString)) !== null) {
|
||||||
|
@ -353,7 +341,7 @@ const getPlayerInfoFromString = (inputString) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (side && side !== 'ENEMY') {
|
if (side && side !== 'ENEMY') {
|
||||||
resPlayer.fraction = (side === 'WEST') ? 'BLUFOR' : 'OPFOR';
|
resPlayer.fraction = side === 'WEST' ? 'BLUFOR' : 'OPFOR';
|
||||||
}
|
}
|
||||||
|
|
||||||
// MAGAZINE
|
// MAGAZINE
|
||||||
|
|
|
@ -4219,13 +4219,11 @@
|
||||||
},
|
},
|
||||||
"balanced-match": {
|
"balanced-match": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"brace-expansion": {
|
"brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.11",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"balanced-match": "^1.0.0",
|
"balanced-match": "^1.0.0",
|
||||||
"concat-map": "0.0.1"
|
"concat-map": "0.0.1"
|
||||||
|
@ -4238,18 +4236,15 @@
|
||||||
},
|
},
|
||||||
"code-point-at": {
|
"code-point-at": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"concat-map": {
|
"concat-map": {
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"console-control-strings": {
|
"console-control-strings": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"core-util-is": {
|
"core-util-is": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
|
@ -4352,8 +4347,7 @@
|
||||||
},
|
},
|
||||||
"inherits": {
|
"inherits": {
|
||||||
"version": "2.0.3",
|
"version": "2.0.3",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"ini": {
|
"ini": {
|
||||||
"version": "1.3.5",
|
"version": "1.3.5",
|
||||||
|
@ -4363,7 +4357,6 @@
|
||||||
"is-fullwidth-code-point": {
|
"is-fullwidth-code-point": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"number-is-nan": "^1.0.0"
|
"number-is-nan": "^1.0.0"
|
||||||
}
|
}
|
||||||
|
@ -4376,20 +4369,17 @@
|
||||||
"minimatch": {
|
"minimatch": {
|
||||||
"version": "3.0.4",
|
"version": "3.0.4",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"brace-expansion": "^1.1.7"
|
"brace-expansion": "^1.1.7"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "0.0.8",
|
"version": "0.0.8",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"minipass": {
|
"minipass": {
|
||||||
"version": "2.2.4",
|
"version": "2.2.4",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"safe-buffer": "^5.1.1",
|
"safe-buffer": "^5.1.1",
|
||||||
"yallist": "^3.0.0"
|
"yallist": "^3.0.0"
|
||||||
|
@ -4406,7 +4396,6 @@
|
||||||
"mkdirp": {
|
"mkdirp": {
|
||||||
"version": "0.5.1",
|
"version": "0.5.1",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"minimist": "0.0.8"
|
"minimist": "0.0.8"
|
||||||
}
|
}
|
||||||
|
@ -4479,8 +4468,7 @@
|
||||||
},
|
},
|
||||||
"number-is-nan": {
|
"number-is-nan": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"object-assign": {
|
"object-assign": {
|
||||||
"version": "4.1.1",
|
"version": "4.1.1",
|
||||||
|
@ -4490,7 +4478,6 @@
|
||||||
"once": {
|
"once": {
|
||||||
"version": "1.4.0",
|
"version": "1.4.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"wrappy": "1"
|
"wrappy": "1"
|
||||||
}
|
}
|
||||||
|
@ -4596,7 +4583,6 @@
|
||||||
"string-width": {
|
"string-width": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"code-point-at": "^1.0.0",
|
"code-point-at": "^1.0.0",
|
||||||
"is-fullwidth-code-point": "^1.0.0",
|
"is-fullwidth-code-point": "^1.0.0",
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
.scroll-btn-right {
|
.scroll-btn-right {
|
||||||
top: 50px;
|
top: 50px;
|
||||||
left: calc(100vw - 50px);
|
left: calc(100vw - 45px);
|
||||||
}
|
}
|
||||||
|
|
||||||
.scroll-btn mat-icon {
|
.scroll-btn mat-icon {
|
||||||
|
|
|
@ -1,14 +1,4 @@
|
||||||
import {
|
import {Component, ElementRef, EventEmitter, Input, OnChanges, Output, ViewChild} from '@angular/core';
|
||||||
AfterViewInit,
|
|
||||||
Component,
|
|
||||||
ElementRef,
|
|
||||||
EventEmitter,
|
|
||||||
Input,
|
|
||||||
OnChanges,
|
|
||||||
Output,
|
|
||||||
SimpleChanges,
|
|
||||||
ViewChild
|
|
||||||
} from '@angular/core';
|
|
||||||
import {Campaign} from '../../../models/model-interfaces';
|
import {Campaign} from '../../../models/model-interfaces';
|
||||||
import {LoginService} from '../../../services/app-user-service/login-service';
|
import {LoginService} from '../../../services/app-user-service/login-service';
|
||||||
|
|
||||||
|
@ -40,11 +30,9 @@ export class CampaignNavigationComponent implements OnChanges {
|
||||||
constructor(public loginService: LoginService) {
|
constructor(public loginService: LoginService) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnChanges(changes: SimpleChanges) {
|
ngOnChanges() {
|
||||||
if (!changes.selectedCampaignId) {
|
|
||||||
this.isRightScrollVisible = this.campaigns.length > 4;
|
this.isRightScrollVisible = this.campaigns.length > 4;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
select(campaign) {
|
select(campaign) {
|
||||||
this.selectedCampaignId = campaign._id;
|
this.selectedCampaignId = campaign._id;
|
||||||
|
|
Loading…
Reference in New Issue