Skip to content

Commit 519724f

Browse files
author
Thomas Ortiz
committed
Added fireWeaponStackCount and LogPlayerPosition.vehicle tests and models
1 parent 900c871 commit 519724f

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

src/entities/telemetry/events/playerAttack.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export class PlayerAttack extends TelemetryEvent {
1111
private _attackId: number;
1212
private _attacker: Character;
1313
private _attackType: string;
14+
private _fireWeaponStackCount: number;
1415
private _weapon: Item;
1516
private _vehicle?: Vehicle;
1617

@@ -19,6 +20,7 @@ export class PlayerAttack extends TelemetryEvent {
1920
this._attackId = event.attackId;
2021
this._attacker = new Character(event.attacker);
2122
this._attackType = event.attackType;
23+
this._fireWeaponStackCount = event.fireWeaponStackCount;
2224
this._weapon = new Item(event.weapon);
2325
if (event.vehicle) {
2426
this._vehicle = new Vehicle(event.vehicle);
@@ -37,6 +39,10 @@ export class PlayerAttack extends TelemetryEvent {
3739
return this._attackType;
3840
}
3941

42+
get fireWeaponStackCount(): number {
43+
return this._fireWeaponStackCount;
44+
}
45+
4046
get weapon(): Item {
4147
return this._weapon;
4248
}

src/entities/telemetry/events/playerPosition.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ILogPlayerPosition } from '../../..';
2-
2+
import { Vehicle } from '../objects';
33
import { Character } from '../objects/character';
44

55
import { TelemetryEvent } from './telemetryEvent';
@@ -9,12 +9,16 @@ export class PlayerPosition extends TelemetryEvent {
99
private _character: Character;
1010
private _elapsedTime: number;
1111
private _numAlivePlayers: number;
12+
private _vehicle?: Vehicle;
1213

1314
constructor(event: ILogPlayerPosition) {
1415
super(event);
1516
this._character = new Character(event.character);
1617
this._elapsedTime = event.elapsedTime;
1718
this._numAlivePlayers = event.numAlivePlayers;
19+
if (event.vehicle) {
20+
this._vehicle = new Vehicle(event.vehicle);
21+
}
1822
}
1923

2024
get character(): Character {
@@ -28,4 +32,8 @@ export class PlayerPosition extends TelemetryEvent {
2832
get numAlivePlayers(): number {
2933
return this._numAlivePlayers;
3034
}
35+
36+
get vehicle(): Vehicle | undefined {
37+
return this._vehicle;
38+
}
3139
}

src/entities/telemetry/telemetry.spec.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ const API_RESPONSE: ITelemetry = [
5656
},
5757
"elapsedTime": 626,
5858
"numAlivePlayers": 49,
59+
"vehicle": {
60+
"vehicleType": "",
61+
"vehicleId": "",
62+
"healthPercent": 0,
63+
"feulPercent": 0
64+
},
5965
"common": {
6066
"isGame": 1.5
6167
},
@@ -77,6 +83,7 @@ const API_RESPONSE: ITelemetry = [
7783
"accountId": "account.8544765d5ab34163ba33dec0ebf1ae72"
7884
},
7985
"attackType": "Weapon",
86+
"fireWeaponStackCount": 0,
8087
"weapon": {
8188
"itemId": "Item_Weapon_HK416_C",
8289
"stackCount": 1,
@@ -1230,6 +1237,8 @@ describe('Telemetry entity', () => {
12301237
expect(attacker.ranking).to.eq(0);
12311238
expect(attacker.teamId).to.eq(25);
12321239

1240+
expect(event.fireWeaponStackCount).to.eq(0);
1241+
12331242
const weapon = event.weapon;
12341243
expect(weapon.attachedItems).to.eql([
12351244
'Item_Attach_Weapon_Lower_Foregrip_C',
@@ -1359,6 +1368,13 @@ describe('Telemetry entity', () => {
13591368
expect(character.name).to.eq('Cloudity');
13601369
expect(character.ranking).to.eq(0);
13611370
expect(character.teamId).to.eq(2);
1371+
1372+
const vehicle = event.vehicle;
1373+
expect(vehicle).to.not.be.undefined;
1374+
expect(vehicle!.vehicleType).to.eq('');
1375+
expect(vehicle!.vehicleId).to.eq('');
1376+
expect(vehicle!.healthPercent).to.eq(0);
1377+
expect(vehicle!.feulPercent).to.eq(0);
13621378
});
13631379

13641380
it('should parse player revive events', () => {

0 commit comments

Comments
 (0)