hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed iv.js to sync.js

Browse Source
This commit is contained in:
Vortrex
2020-12-12 06:07:54 -06:00
parent dd7cedd716
commit 2df7e35b4f
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scripts/client/iv.js → scripts/client/sync.js
View File

@@ -3,20 +3,24 @@
// https://github.com/VortrexFTW/gtac_asshat_rp // https://github.com/VortrexFTW/gtac_asshat_rp
// Copyright (c) 2020 Asshat-Gaming (https://asshatgaming.com) // Copyright (c) 2020 Asshat-Gaming (https://asshatgaming.com)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// FILE: iv.js // FILE: sync.js
// DESC: Provides IV fixes and sync // DESC: Provides some elements and data sync
// TYPE: Client (JavaScript) // TYPE: Client (JavaScript)
// =========================================================================== // ===========================================================================
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
let syncPosition = false; let syncPosition = false;
let inVehicle = null;
// ---------------------------------------------------------------------------
addEventHandler("onProcess", function(event, deltaTime) { addEventHandler("onProcess", function(event, deltaTime) {
//if(gta.game == GAME_GTA_IV) { //if(gta.game == GAME_GTA_IV) {
getVehicles().forEach(function(vehicle) { getVehicles().forEach(function(vehicle) {
if(vehicle.isSyncer && vehicle.getData("ag.syncId") != null) { if(vehicle.isSyncer && getEntityData(vehicle, "ag.syncId") != null) {
triggerNetworkEvent("ag.veh.sync", vehicle.getData("ag.syncId"), vehicle.position, vehicle.heading.toFixed(2)); //console.log(`Syncing vehicle ${getEntityData(vehicle, "ag.syncId")} to server. Pos: ${vehicle.position.x}, ${vehicle.position.y}, ${vehicle.position.z}`);
triggerNetworkEvent("ag.veh.sync", getEntityData(vehicle, "ag.syncId"), vehicle.position, vehicle.heading.toFixed(2));
} }
}); });
@@ -27,17 +31,22 @@ addEventHandler("onProcess", function(event, deltaTime) {
triggerNetworkEvent("ag.player.sync", localPlayer.position, localPlayer.heading.toFixed(2)); triggerNetworkEvent("ag.player.sync", localPlayer.position, localPlayer.heading.toFixed(2));
if(localPlayer.vehicle) { if(localPlayer.vehicle) {
if(localPlayer.getData("ag.veh") == null) { if(!inVehicle) {
if(localPlayer.vehicle.getData("ag.syncId") != null) { inVehicle = localPlayer.vehicle;
triggerNetworkEvent("ag.iv.veh", localPlayer.getData("ag.syncId")); console.log(`Entered vehicle ${inVehicle}`);
localPlayer.setData("ag.veh", localPlayer.vehicle); if(doesEntityDataExist(vehicle, "ag.syncId")) {
triggerNetworkEvent("ag.player.vehicle", getEntityData(localPlayer.vehicle, "ag.syncId"));
//localPlayer.setData("ag.vehicle", localPlayer.vehicle);
} }
} }
} else { } else {
if(localPlayer.getData("ag.veh") != null) { if(inVehicle != null) {
triggerNetworkEvent("ag.iv.veh", -1); console.log(`Exited vehicle ${inVehicle}`);
localPlayer.removeData("ag.veh", localPlayer.vehicle); triggerNetworkEvent("ag.player.vehicle", -1);
//localPlayer.removeData("ag.vehicle", localPlayer.vehicle);
inVehicle = null;
} }
} }
} }
} }
@@ -48,13 +57,14 @@ addEventHandler("onProcess", function(event, deltaTime) {
addNetworkHandler("ag.vehicle", function(syncId, model, position, heading, colour1, colour2, locked, lights) { //livery, dirtLevel, locked, lights) { addNetworkHandler("ag.vehicle", function(syncId, model, position, heading, colour1, colour2, locked, lights) { //livery, dirtLevel, locked, lights) {
let vehicle = createVehicle(model, position, heading); let vehicle = createVehicle(model, position, heading);
vehicle.setData("ag.syncId", syncId); setEntityData(vehicle, "ag.syncId", syncId);
vehicle.colour1 = colour1; vehicle.colour1 = colour1;
vehicle.colour2 = colour2; vehicle.colour2 = colour2;
//vehicle.livery = livery; //vehicle.livery = livery;
//vehicle.dirtLevel = dirtLevel; //vehicle.dirtLevel = dirtLevel;
vehicle.carLock = locked; vehicle.carLock = locked;
vehicle.lights = lights; vehicle.lights = lights;
serverVehicles.push(vehicle);
}); });
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -103,8 +113,8 @@ addNetworkHandler("ag.iv.syncPosition", function(state) {
function getVehicleFromIVSyncId(syncId) { function getVehicleFromIVSyncId(syncId) {
let vehicles = getVehicles(); let vehicles = getVehicles();
for(let i in vehicles) { for(let i in vehicles) {
if(vehicles[i].getData("ag.syncId")) { if(getEntityData(vehicles[i], "ag.syncId")) {
if(vehicles[i].getData("ag.syncId") == syncId) { if(getEntityData(vehicles[i], "ag.syncId") == syncId) {
return vehicles[i]; return vehicles[i];
} }
} }
@@ -116,8 +126,8 @@ function getVehicleFromIVSyncId(syncId) {
function getVehicleFromSyncId(syncId) { function getVehicleFromSyncId(syncId) {
let vehicles = getVehicles(); let vehicles = getVehicles();
for(let i in vehicles) { for(let i in vehicles) {
if(vehicles[i].getData("ag.syncId") != null) { if(getEntityData(vehicles[i], "ag.syncId") != null) {
if(vehicles[i].getData("ag.syncId") == syncId) { if(getEntityData(vehicles[i], "ag.syncId") == syncId) {
return vehicles[i]; return vehicles[i];
} }
} }