Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ef18919
Add VEHICLE_DAMAGED server event
CamperNoob Jan 26, 2025
384c471
Started teamkill tag implementation
CamperNoob Jan 26, 2025
6f63d51
Update vehicles-lookup.js
CamperNoob Jan 26, 2025
6c73453
Add new entries, rename factions to forces
CamperNoob Jan 26, 2025
ad1fd3f
Scrapped weapons-lookup, added playermodels (soldier) lookup to deter…
CamperNoob Jan 27, 2025
e33f7d2
Updated socket-io-api plugin to support two new events
CamperNoob Jan 27, 2025
5903630
Update vehicles-lookup.js
CamperNoob Jan 27, 2025
439e516
Update vehicles-lookup.js
CamperNoob Jan 27, 2025
3297cfc
Create factions-lookup.js
CamperNoob Jan 27, 2025
331133b
Rewritten the logic to determine teamkill based on confidence calcula…
CamperNoob Jan 27, 2025
725add5
Fix comma
CamperNoob Jan 27, 2025
9949ef0
Full rewrite after testing
CamperNoob Jan 27, 2025
8cff8b4
Fix T90A
CamperNoob Jan 28, 2025
02019a2
Add vehicledestroys to db-log and into test plugin
CamperNoob Jan 28, 2025
7f57f15
Fix plugin-test
CamperNoob Jan 28, 2025
3619f54
Fix plugin-test
CamperNoob Jan 28, 2025
6dfd134
Fix db-log according to unit-tests
CamperNoob Jan 28, 2025
4d93b60
Added VEHICLE_DESTROYED, used it in db-log to lower the load
CamperNoob Jan 28, 2025
5ac5dae
Update testing plugin
CamperNoob Jan 28, 2025
bb666c7
Updated initial check in db-log
CamperNoob Jan 28, 2025
f1353bc
Updated socket-to-api to include VEHICLE_DESTROYED
CamperNoob Jan 28, 2025
8fc7321
Update vehicles-lookup.js
CamperNoob Jan 29, 2025
2207bba
Delete plugin-test.js
CamperNoob Jan 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions squad-server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { Layers } from './layers/index.js';
import LogParser from './log-parser/index.js';
import Rcon from './rcon.js';

import SoldierLookup from './lookup/soldier-lookup.js';

import { SQUADJS_VERSION } from './utils/constants.js';

import fetchAdminLists from './utils/admin-lists.js';
Expand Down Expand Up @@ -302,6 +304,12 @@ export default class SquadServer extends EventEmitter {
delete data.playerSuffix;

this.emit('PLAYER_POSSESS', data);

let match = data.possessClassname.match(/(?:BP_Soldier_|Default__BP_Soldier_)([a-zA-Z]+)_[a-zA-Z0-9]+/);
if (match) {
if (data.player) data.player.teamName = SoldierLookup[match[1]];
this.emit('PLAYER_SOLDIER_POSSESS', data);
}
});

this.logParser.on('PLAYER_UNPOSSESS', async (data) => {
Expand All @@ -318,6 +326,11 @@ export default class SquadServer extends EventEmitter {

this.logParser.on('TICK_RATE', (data) => {
this.emit('TICK_RATE', data);
});

this.logParser.on('VEHICLE_DAMAGED', (data) => {
this.emit('VEHICLE_DAMAGED', data);
if (data.healthRemaining <= 0) this.emit('VEHICLE_DESTROYED', data);
});
}

Expand Down
4 changes: 3 additions & 1 deletion squad-server/log-parser/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import RoundTickets from './round-tickets.js';
import RoundWinner from './round-winner.js';
import ServerTickRate from './server-tick-rate.js';
import PlayerJoinSucceeded from './player-join-succeeded.js';
import VehicleDamaged from './vehicle-damaged.js';
export default class SquadLogParser extends LogParser {
constructor(options) {
super('SquadGame.log', options);
Expand All @@ -38,7 +39,8 @@ export default class SquadLogParser extends LogParser {
RoundTickets,
RoundWinner,
ServerTickRate,
PlayerJoinSucceeded
PlayerJoinSucceeded,
VehicleDamaged
];
}
}
Loading