diff --git a/api/routes/players.js b/api/routes/players.js
index 744bf25..cfb148b 100644
--- a/api/routes/players.js
+++ b/api/routes/players.js
@@ -46,7 +46,9 @@ campaignPlayer.route('/ranking/:campaignId')
const resItem = {
name: usesUUID ? playerInstances[playerInstances.length - 1].name : player,
kill: 0,
- vehicle: 0,
+ vehicleLight: 0,
+ vehicleHeavy: 0,
+ vehicleAir: 0,
death: 0,
friendlyFire: 0,
revive: 0,
@@ -57,7 +59,9 @@ campaignPlayer.route('/ranking/:campaignId')
resItem.kill += playerInstances[i].kill;
resItem.death += playerInstances[i].death;
resItem.friendlyFire += playerInstances[i].friendlyFire;
- resItem.vehicle += playerInstances[i].vehicle;
+ resItem.vehicleLight += playerInstances[i].vehicleLight;
+ resItem.vehicleHeavy += playerInstances[i].vehicleHeavy;
+ resItem.vehicleAir += playerInstances[i].vehicleAir;
resItem.revive += playerInstances[i].revive;
resItem.respawn += playerInstances[i].respawn;
resItem.flagTouch += playerInstances[i].flagTouch;
@@ -80,7 +84,9 @@ campaignPlayer.route('/ranking/:campaignId')
kill: getSortedField('kill'),
death: getSortedField('death'),
friendlyFire: getSortedField('friendlyFire'),
- vehicle: getSortedField('vehicle'),
+ vehicleLight: getSortedField('vehicleLight'),
+ vehicleHeavy: getSortedField('vehicleHeavy'),
+ vehicleAir: getSortedField('vehicleAir'),
revive: getSortedField('revive'),
respawn: getSortedField('respawn'),
flagTouch: getSortedField('flagTouch'),
diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
index 0d07b97..4e5ecab 100644
--- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
+++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
@@ -83,7 +83,7 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
index 9e206bf..241b5b1 100644
--- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
+++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
@@ -23,7 +23,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
sumData: any[] = [];
killData: any[] = [];
friendlyFireData: any[] = [];
- vehicleKillData: any[] = [];
+ vehicleLightData: any[] = [];
+ vehicleHeavyData: any[] = [];
+ vehicleAirData: any[] = [];
deathData: any[] = [];
respawnData: any[] = [];
reviveData: any[] = [];
@@ -31,7 +33,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
yAxisKill = 'Kills';
yAxisFriendlyFire = 'FriendlyFire';
- yAxisVehicleKill = 'Fahrzeug-Kills';
+ yAxisVehicleLight = 'Fahrzeug (Leicht)';
+ yAxisVehicleHeavy = 'Fahrzeug (Schwer)';
+ yAxisVehicleAir = 'Fahrzeug (Luft)';
yAxisDeath = 'Tode';
yAxisRespawn = 'Respawn';
yAxisRevive = 'Revive';
@@ -49,7 +53,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
showRefLines = true;
showRefLabels = true;
killRefLines = [];
- vehicleKillRefLines = [];
+ vehicleLightRefLines = [];
+ vehicleHeavyRefLines = [];
+ vehicleAirRefLines = [];
deathRefLines = [];
captureRefLines = [];
friendlyFireRefLines = [];
@@ -68,7 +74,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
totalKills;
totalFriendlyFire;
- totalVehicleKills;
+ totalVehicleLight;
+ totalVehicleHeavy;
+ totalVehicleAir;
totalDeath;
totalRespawn;
totalRevive;
@@ -89,7 +97,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
.subscribe(campaignPlayer => {
this.campaignPlayer = campaignPlayer;
this.killData = this.assignData(this.yAxisKill, 'kill');
- this.vehicleKillData = this.assignData(this.yAxisVehicleKill, 'vehicle');
+ this.vehicleLightData = this.assignData(this.yAxisVehicleLight, 'vehicleLight');
+ this.vehicleHeavyData = this.assignData(this.yAxisVehicleHeavy, 'vehicleHeavy');
+ this.vehicleAirData = this.assignData(this.yAxisVehicleAir, 'vehicleAir');
this.friendlyFireData = this.assignData(this.yAxisFriendlyFire, 'friendlyFire');
this.deathData = this.assignData(this.yAxisDeath, 'death');
this.respawnData = this.assignData(this.yAxisRespawn, 'respawn');
@@ -114,8 +124,16 @@ export class CampaignPlayerDetailComponent implements OnInit {
value: this.totalFriendlyFire
},
{
- name: this.yAxisVehicleKill,
- value: this.totalVehicleKills
+ name: this.yAxisVehicleLight,
+ value: this.totalVehicleLight
+ },
+ {
+ name: this.yAxisVehicleHeavy,
+ value: this.totalVehicleHeavy
+ },
+ {
+ name: this.yAxisVehicleAir,
+ value: this.totalVehicleAir
},
{
name: this.yAxisDeath,
@@ -135,8 +153,9 @@ export class CampaignPlayerDetailComponent implements OnInit {
}
];
- Object.assign(this, [this.sumData, this.killData, this.friendlyFireData, this.vehicleKillData,
- this.deathData, this.respawnData, this.reviveData, this.captureData]);
+ Object.assign(this, [this.sumData, this.killData, this.friendlyFireData, this.vehicleLightData,
+ this.vehicleHeavyData, this.vehicleAirData, this.deathData, this.respawnData, this.reviveData,
+ this.captureData]);
});
}
@@ -165,9 +184,17 @@ export class CampaignPlayerDetailComponent implements OnInit {
this.friendlyFireRefLines.push({value: total / playerLength, name: this.avgLabel});
this.totalFriendlyFire = total;
break;
- case 'vehicle':
- this.vehicleKillRefLines.push({value: total / playerLength, name: this.avgLabel});
- this.totalVehicleKills = total;
+ case 'vehicleLight':
+ this.vehicleLightRefLines.push({value: total / playerLength, name: this.avgLabel});
+ this.totalVehicleLight = total;
+ break;
+ case 'vehicleHeavy':
+ this.vehicleHeavyRefLines.push({value: total / playerLength, name: this.avgLabel});
+ this.totalVehicleHeavy = total;
+ break;
+ case 'vehicleAir':
+ this.vehicleAirRefLines.push({value: total / playerLength, name: this.avgLabel});
+ this.totalVehicleAir = total;
break;
case 'death':
this.deathRefLines.push({value: total / playerLength, name: this.avgLabel});
diff --git a/static/src/app/statistic/highscore/highscore.component.html b/static/src/app/statistic/highscore/highscore.component.html
index e7ce8cf..d869b4a 100644
--- a/static/src/app/statistic/highscore/highscore.component.html
+++ b/static/src/app/statistic/highscore/highscore.component.html
@@ -58,7 +58,7 @@
-
+
+
+
+
+
+
+
+
+ {{value}}
+
+
+
+
+
+
+
+
+
+
+
+ {{value}}
+
+
+
+