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

Change netevent and const prefix

Browse Source
This commit is contained in:
Vortrex
2022-06-30 18:29:17 -05:00
parent 2f7f3a1b00
commit cb86419f2b
20 changed files with 485 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/client/gui.js
View File

@@ -73,7 +73,7 @@ function initGUI() {
resetGUIStrings(); resetGUIStrings();
resetLocaleChooserOptions(); resetLocaleChooserOptions();
sendNetworkEventToServer("vrr.guiReady", true); sendNetworkEventToServer("agrp.guiReady", true);
}; };
// =========================================================================== // ===========================================================================
@@ -230,7 +230,7 @@ function processGUIKeyPress(keyCode) {
function processToggleGUIKeyPress(keyCode) { function processToggleGUIKeyPress(keyCode) {
if (keyCode == disableGUIKey) { if (keyCode == disableGUIKey) {
sendNetworkEventToServer("vrr.toggleGUI"); sendNetworkEventToServer("agrp.toggleGUI");
} }
} }

2
scripts/client/gui/2fa.js
View File

@@ -129,7 +129,7 @@ function twoFactorAuthSuccess() {
function checkTwoFactorAuth() { function checkTwoFactorAuth() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Checking two-factor authentication with server ...`); logToConsole(LOG_DEBUG, `[VRR.GUI] Checking two-factor authentication with server ...`);
sendNetworkEventToServer("vrr.2fa", twoFactorAuth.codeInput.lines[0]); sendNetworkEventToServer("agrp.2fa", twoFactorAuth.codeInput.lines[0]);
} }
// =========================================================================== // ===========================================================================

2
scripts/client/gui/changepass.js
View File

@@ -128,7 +128,7 @@ function passwordChangeFailed(errorMessage) {
function checkChangePassword() { function checkChangePassword() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Checking password change with server ...`); logToConsole(LOG_DEBUG, `[VRR.GUI] Checking password change with server ...`);
sendNetworkEventToServer("vrr.checkChangePassword", passwordChange.passwordInput.lines[0], passwordChange.confirmPasswordInput.lines[0]); sendNetworkEventToServer("agrp.checkChangePassword", passwordChange.passwordInput.lines[0], passwordChange.confirmPasswordInput.lines[0]);
} }
// =========================================================================== // ===========================================================================

6
scripts/client/gui/charselect.js
View File

@@ -186,21 +186,21 @@ function showNewCharacter() {
function selectNextCharacter() { function selectNextCharacter() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Requesting next character info from server for character select window`); logToConsole(LOG_DEBUG, `[VRR.GUI] Requesting next character info from server for character select window`);
sendNetworkEventToServer("vrr.nextCharacter"); sendNetworkEventToServer("agrp.nextCharacter");
} }
// =========================================================================== // ===========================================================================
function selectPreviousCharacter() { function selectPreviousCharacter() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Requesting previous character info from server for character select window`); logToConsole(LOG_DEBUG, `[VRR.GUI] Requesting previous character info from server for character select window`);
sendNetworkEventToServer("vrr.previousCharacter"); sendNetworkEventToServer("agrp.previousCharacter");
} }
// =========================================================================== // ===========================================================================
function selectThisCharacter() { function selectThisCharacter() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Tell server the current shown character was selected in character select window`); logToConsole(LOG_DEBUG, `[VRR.GUI] Tell server the current shown character was selected in character select window`);
sendNetworkEventToServer("vrr.selectCharacter"); sendNetworkEventToServer("agrp.selectCharacter");
} }
// =========================================================================== // ===========================================================================

4
scripts/client/gui/login.js
View File

@@ -165,7 +165,7 @@ function showLoginGUI() {
function checkLogin() { function checkLogin() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Checking login with server ...`); logToConsole(LOG_DEBUG, `[VRR.GUI] Checking login with server ...`);
sendNetworkEventToServer("vrr.checkLogin", login.passwordInput.lines[0]); sendNetworkEventToServer("agrp.checkLogin", login.passwordInput.lines[0]);
} }
// =========================================================================== // ===========================================================================
@@ -191,7 +191,7 @@ function switchToPasswordResetGUI() {
//closeAllWindows(); //closeAllWindows();
//logToConsole(LOG_DEBUG, `[VRR.GUI] Showing password reset dialog window`); //logToConsole(LOG_DEBUG, `[VRR.GUI] Showing password reset dialog window`);
//showResetPasswordGUI(); //showResetPasswordGUI();
sendNetworkEventToServer("vrr.checkResetPassword", ""); sendNetworkEventToServer("agrp.checkResetPassword", "");
return false; return false;
} }

2
scripts/client/gui/newchar.js
View File

@@ -143,7 +143,7 @@ function checkNewCharacter() {
return false; return false;
} }
sendNetworkEventToServer("vrr.checkNewCharacter", sendNetworkEventToServer("agrp.checkNewCharacter",
newCharacter.firstNameInput.lines[0], newCharacter.firstNameInput.lines[0],
newCharacter.lastNameInput.lines[0], newCharacter.lastNameInput.lines[0],
); );

2
scripts/client/gui/register.js
View File

@@ -148,7 +148,7 @@ function registrationFailed(errorMessage) {
function checkRegistration() { function checkRegistration() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Checking registration with server ...`); logToConsole(LOG_DEBUG, `[VRR.GUI] Checking registration with server ...`);
sendNetworkEventToServer("vrr.checkRegistration", register.passwordInput.lines[0], register.confirmPasswordInput.lines[0], register.emailInput.lines[0]); sendNetworkEventToServer("agrp.checkRegistration", register.passwordInput.lines[0], register.confirmPasswordInput.lines[0], register.emailInput.lines[0]);
} }
// =========================================================================== // ===========================================================================

2
scripts/client/gui/resetpass.js
View File

@@ -142,7 +142,7 @@ function showResetPasswordGUI() {
function checkResetPassword() { function checkResetPassword() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Checking password reset with server (${passwordReset.emailInput.lines[0]}) ...`); logToConsole(LOG_DEBUG, `[VRR.GUI] Checking password reset with server (${passwordReset.emailInput.lines[0]}) ...`);
sendNetworkEventToServer("vrr.checkResetPassword", passwordReset.emailInput.lines[0]); sendNetworkEventToServer("agrp.checkResetPassword", passwordReset.emailInput.lines[0]);
} }
// =========================================================================== // ===========================================================================

4
scripts/client/gui/yesno.js
View File

@@ -100,7 +100,7 @@ function showYesNoPromptGUI(promptMessage, promptTitle, yesButtonText, noButtonT
function yesNoDialogAnswerNo() { function yesNoDialogAnswerNo() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Responding with answer NO to server prompt`); logToConsole(LOG_DEBUG, `[VRR.GUI] Responding with answer NO to server prompt`);
sendNetworkEventToServer("vrr.promptAnswerNo"); sendNetworkEventToServer("agrp.promptAnswerNo");
closeAllWindows(); closeAllWindows();
} }
@@ -108,7 +108,7 @@ function yesNoDialogAnswerNo() {
function yesNoDialogAnswerYes() { function yesNoDialogAnswerYes() {
logToConsole(LOG_DEBUG, `[VRR.GUI] Responding with answer YES to server prompt`); logToConsole(LOG_DEBUG, `[VRR.GUI] Responding with answer YES to server prompt`);
sendNetworkEventToServer("vrr.promptAnswerYes"); sendNetworkEventToServer("agrp.promptAnswerYes");
closeAllWindows(); closeAllWindows();
} }

172
scripts/client/native/connected.js
View File

@@ -230,39 +230,39 @@ function repairVehicle(syncId) {
// =========================================================================== // ===========================================================================
function syncVehicleProperties(vehicle) { function syncVehicleProperties(vehicle) {
if (doesEntityDataExist(vehicle, "vrr.lights")) { if (doesEntityDataExist(vehicle, "agrp.lights")) {
let lightStatus = getEntityData(vehicle, "vrr.lights"); let lightStatus = getEntityData(vehicle, "agrp.lights");
vehicle.lights = lightStatus; vehicle.lights = lightStatus;
} }
if (doesEntityDataExist(vehicle, "vrr.invincible")) { if (doesEntityDataExist(vehicle, "agrp.invincible")) {
let invincible = getEntityData(vehicle, "vrr.invincible"); let invincible = getEntityData(vehicle, "agrp.invincible");
element.setProofs(invincible, invincible, invincible, invincible, invincible); element.setProofs(invincible, invincible, invincible, invincible, invincible);
} }
if (doesEntityDataExist(vehicle, "vrr.panelStatus")) { if (doesEntityDataExist(vehicle, "agrp.panelStatus")) {
let panelsStatus = getEntityData(vehicle, "vrr.panelStatus"); let panelsStatus = getEntityData(vehicle, "agrp.panelStatus");
for (let i in panelsStatus) { for (let i in panelsStatus) {
vehicle.setPanelStatus(i, panelsStatus[i]); vehicle.setPanelStatus(i, panelsStatus[i]);
} }
} }
if (doesEntityDataExist(vehicle, "vrr.wheelStatus")) { if (doesEntityDataExist(vehicle, "agrp.wheelStatus")) {
let wheelsStatus = getEntityData(vehicle, "vrr.wheelStatus"); let wheelsStatus = getEntityData(vehicle, "agrp.wheelStatus");
for (let i in wheelsStatus) { for (let i in wheelsStatus) {
vehicle.setWheelStatus(i, wheelsStatus[i]); vehicle.setWheelStatus(i, wheelsStatus[i]);
} }
} }
if (doesEntityDataExist(vehicle, "vrr.lightStatus")) { if (doesEntityDataExist(vehicle, "agrp.lightStatus")) {
let lightStatus = getEntityData(vehicle, "vrr.lightStatus"); let lightStatus = getEntityData(vehicle, "agrp.lightStatus");
for (let i in lightStatus) { for (let i in lightStatus) {
vehicle.setLightStatus(i, lightStatus[i]); vehicle.setLightStatus(i, lightStatus[i]);
} }
} }
if (doesEntityDataExist(vehicle, "vrr.suspensionHeight")) { if (doesEntityDataExist(vehicle, "agrp.suspensionHeight")) {
let suspensionHeight = getEntityData(vehicle, "vrr.suspensionHeight"); let suspensionHeight = getEntityData(vehicle, "agrp.suspensionHeight");
vehicle.setSuspensionHeight(suspensionHeight); vehicle.setSuspensionHeight(suspensionHeight);
} }
@@ -272,8 +272,8 @@ function syncVehicleProperties(vehicle) {
vehicle.removeUpgrade(i); vehicle.removeUpgrade(i);
} }
if (doesEntityDataExist(vehicle, "vrr.upgrades")) { if (doesEntityDataExist(vehicle, "agrp.upgrades")) {
let upgrades = getEntityData(vehicle, "vrr.upgrades"); let upgrades = getEntityData(vehicle, "agrp.upgrades");
for (let i in upgrades) { for (let i in upgrades) {
if (upgrades[i] != 0) { if (upgrades[i] != 0) {
vehicle.addUpgrade(upgrades[i]); vehicle.addUpgrade(upgrades[i]);
@@ -283,8 +283,8 @@ function syncVehicleProperties(vehicle) {
} }
if (getGame() == VRR_GAME_GTA_SA || getGame() == VRR_GAME_GTA_IV) { if (getGame() == VRR_GAME_GTA_SA || getGame() == VRR_GAME_GTA_IV) {
if (doesEntityDataExist(vehicle, "vrr.livery")) { if (doesEntityDataExist(vehicle, "agrp.livery")) {
let livery = getEntityData(vehicle, "vrr.livery"); let livery = getEntityData(vehicle, "agrp.livery");
if (getGame() == VRR_GAME_GTA_SA) { if (getGame() == VRR_GAME_GTA_SA) {
vehicle.setPaintJob(livery); vehicle.setPaintJob(livery);
} else if (getGame() == VRR_GAME_GTA_IV) { } else if (getGame() == VRR_GAME_GTA_IV) {
@@ -316,8 +316,8 @@ function doesEntityDataExist(entity, dataName) {
function syncCivilianProperties(civilian) { function syncCivilianProperties(civilian) {
if (getGame() == VRR_GAME_GTA_III) { if (getGame() == VRR_GAME_GTA_III) {
if (doesEntityDataExist(civilian, "vrr.scale")) { if (doesEntityDataExist(civilian, "agrp.scale")) {
let scaleFactor = getEntityData(civilian, "vrr.scale"); let scaleFactor = getEntityData(civilian, "agrp.scale");
let tempMatrix = civilian.matrix; let tempMatrix = civilian.matrix;
tempMatrix.setScale(toVector3(scaleFactor.x, scaleFactor.y, scaleFactor.z)); tempMatrix.setScale(toVector3(scaleFactor.x, scaleFactor.y, scaleFactor.z));
let tempPosition = civilian.position; let tempPosition = civilian.position;
@@ -328,78 +328,78 @@ function syncCivilianProperties(civilian) {
} }
if (getGame() == VRR_GAME_GTA_SA) { if (getGame() == VRR_GAME_GTA_SA) {
if (doesEntityDataExist(civilian, "vrr.fightStyle")) { if (doesEntityDataExist(civilian, "agrp.fightStyle")) {
let fightStyle = getEntityData(civilian, "vrr.fightStyle"); let fightStyle = getEntityData(civilian, "agrp.fightStyle");
civilian.setFightStyle(fightStyle[0], fightStyle[1]); civilian.setFightStyle(fightStyle[0], fightStyle[1]);
} }
} }
if (getGame() == VRR_GAME_GTA_III) { if (getGame() == VRR_GAME_GTA_III) {
if (doesEntityDataExist(civilian, "vrr.walkStyle")) { if (doesEntityDataExist(civilian, "agrp.walkStyle")) {
let walkStyle = getEntityData(civilian, "vrr.walkStyle"); let walkStyle = getEntityData(civilian, "agrp.walkStyle");
civilian.walkStyle = walkStyle; civilian.walkStyle = walkStyle;
} }
} }
if (getGame() == VRR_GAME_GTA_IV) { if (getGame() == VRR_GAME_GTA_IV) {
if (doesEntityDataExist(civilian, "vrr.bodyPropHair")) { if (doesEntityDataExist(civilian, "agrp.bodyPropHair")) {
let bodyPropHair = getEntityData(civilian, "vrr.bodyPropHair"); let bodyPropHair = getEntityData(civilian, "agrp.bodyPropHair");
civilian.changeBodyProp(0, bodyPropHair[0], bodyPropHair[1]); civilian.changeBodyProp(0, bodyPropHair[0], bodyPropHair[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropHead")) { if (doesEntityDataExist(civilian, "agrp.bodyPropHead")) {
let bodyPropHead = getEntityData(civilian, "vrr.bodyPropHead"); let bodyPropHead = getEntityData(civilian, "agrp.bodyPropHead");
civilian.changeBodyProp(1, bodyPropHead[0], bodyPropHead[1]); civilian.changeBodyProp(1, bodyPropHead[0], bodyPropHead[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropEyes")) { if (doesEntityDataExist(civilian, "agrp.bodyPropEyes")) {
let bodyPropEyes = getEntityData(civilian, "vrr.bodyPropEyes"); let bodyPropEyes = getEntityData(civilian, "agrp.bodyPropEyes");
civilian.changeBodyProp(1, bodyPropEyes[0], bodyPropEyes[1]); civilian.changeBodyProp(1, bodyPropEyes[0], bodyPropEyes[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropLeftHand")) { if (doesEntityDataExist(civilian, "agrp.bodyPropLeftHand")) {
let bodyPropLeftHand = getEntityData(civilian, "vrr.bodyPropLeftHand"); let bodyPropLeftHand = getEntityData(civilian, "agrp.bodyPropLeftHand");
civilian.changeBodyProp(1, bodyPropLeftHand[0], bodyPropLeftHand[1]); civilian.changeBodyProp(1, bodyPropLeftHand[0], bodyPropLeftHand[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropRightHand")) { if (doesEntityDataExist(civilian, "agrp.bodyPropRightHand")) {
let bodyPropRightHand = getEntityData(civilian, "vrr.bodyPropRightHand"); let bodyPropRightHand = getEntityData(civilian, "agrp.bodyPropRightHand");
civilian.changeBodyProp(1, bodyPropRightHand[0], bodyPropRightHand[1]); civilian.changeBodyProp(1, bodyPropRightHand[0], bodyPropRightHand[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropLeftWrist")) { if (doesEntityDataExist(civilian, "agrp.bodyPropLeftWrist")) {
let bodyPropLeftWrist = getEntityData(civilian, "vrr.bodyPropLeftWrist"); let bodyPropLeftWrist = getEntityData(civilian, "agrp.bodyPropLeftWrist");
civilian.changeBodyProp(1, bodyPropLeftWrist[0], bodyPropLeftWrist[1]); civilian.changeBodyProp(1, bodyPropLeftWrist[0], bodyPropLeftWrist[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropRightWrist")) { if (doesEntityDataExist(civilian, "agrp.bodyPropRightWrist")) {
let bodyPropRightWrist = getEntityData(civilian, "vrr.bodyPropRightWrist"); let bodyPropRightWrist = getEntityData(civilian, "agrp.bodyPropRightWrist");
civilian.changeBodyProp(1, bodyPropRightWrist[0], bodyPropRightWrist[1]); civilian.changeBodyProp(1, bodyPropRightWrist[0], bodyPropRightWrist[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropRightWrist")) { if (doesEntityDataExist(civilian, "agrp.bodyPropRightWrist")) {
let bodyPropRightWrist = getEntityData(civilian, "vrr.bodyPropRightWrist"); let bodyPropRightWrist = getEntityData(civilian, "agrp.bodyPropRightWrist");
civilian.changeBodyProp(1, bodyPropRightWrist[0], bodyPropRightWrist[1]); civilian.changeBodyProp(1, bodyPropRightWrist[0], bodyPropRightWrist[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropHip")) { if (doesEntityDataExist(civilian, "agrp.bodyPropHip")) {
let bodyPropHip = getEntityData(civilian, "vrr.bodyPropHip"); let bodyPropHip = getEntityData(civilian, "agrp.bodyPropHip");
civilian.changeBodyProp(1, bodyPropHip[0], bodyPropHip[1]); civilian.changeBodyProp(1, bodyPropHip[0], bodyPropHip[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropLeftFoot")) { if (doesEntityDataExist(civilian, "agrp.bodyPropLeftFoot")) {
let bodyPropLeftFoot = getEntityData(civilian, "vrr.bodyPropLeftFoot"); let bodyPropLeftFoot = getEntityData(civilian, "agrp.bodyPropLeftFoot");
civilian.changeBodyProp(1, bodyPropLeftFoot[0], bodyPropLeftFoot[1]); civilian.changeBodyProp(1, bodyPropLeftFoot[0], bodyPropLeftFoot[1]);
} }
if (doesEntityDataExist(civilian, "vrr.bodyPropRightFoot")) { if (doesEntityDataExist(civilian, "agrp.bodyPropRightFoot")) {
let bodyPropRightFoot = getEntityData(civilian, "vrr.bodyPropRightFoot"); let bodyPropRightFoot = getEntityData(civilian, "agrp.bodyPropRightFoot");
civilian.changeBodyProp(1, bodyPropRightFoot[0], bodyPropRightFoot[1]); civilian.changeBodyProp(1, bodyPropRightFoot[0], bodyPropRightFoot[1]);
} }
} }
if (doesEntityDataExist(civilian, "vrr.anim")) { if (doesEntityDataExist(civilian, "agrp.anim")) {
let animData = getEntityData(vehicle, "vrr.anim"); let animData = getEntityData(vehicle, "agrp.anim");
civilian.addAnimation(animData[0], animData[1]); civilian.addAnimation(animData[0], animData[1]);
} }
} }
@@ -414,8 +414,8 @@ function preventDefaultEventAction(event) {
function syncPlayerProperties(player) { function syncPlayerProperties(player) {
if (getGame() == VRR_GAME_GTA_III) { if (getGame() == VRR_GAME_GTA_III) {
if (doesEntityDataExist(player, "vrr.scale")) { if (doesEntityDataExist(player, "agrp.scale")) {
let scaleFactor = getEntityData(player, "vrr.scale"); let scaleFactor = getEntityData(player, "agrp.scale");
let tempMatrix = player.matrix; let tempMatrix = player.matrix;
tempMatrix.setScale(toVector3(scaleFactor.x, scaleFactor.y, scaleFactor.z)); tempMatrix.setScale(toVector3(scaleFactor.x, scaleFactor.y, scaleFactor.z));
let tempPosition = player.position; let tempPosition = player.position;
@@ -426,94 +426,94 @@ function syncPlayerProperties(player) {
} }
if (getGame() == VRR_GAME_GTA_SA) { if (getGame() == VRR_GAME_GTA_SA) {
if (doesEntityDataExist(player, "vrr.fightStyle")) { if (doesEntityDataExist(player, "agrp.fightStyle")) {
let fightStyle = getEntityData(player, "vrr.fightStyle"); let fightStyle = getEntityData(player, "agrp.fightStyle");
player.setFightStyle(fightStyle[0], fightStyle[1]); player.setFightStyle(fightStyle[0], fightStyle[1]);
} }
} }
//if(getGame() == VRR_GAME_GTA_SA) { //if(getGame() == VRR_GAME_GTA_SA) {
// if(doesEntityDataExist(player, "vrr.walkStyle")) { // if(doesEntityDataExist(player, "agrp.walkStyle")) {
// let walkStyle = getEntityData(player, "vrr.walkStyle"); // let walkStyle = getEntityData(player, "agrp.walkStyle");
// player.walkStyle = walkStyle; // player.walkStyle = walkStyle;
// } // }
//} //}
if (getGame() == VRR_GAME_GTA_IV) { if (getGame() == VRR_GAME_GTA_IV) {
if (doesEntityDataExist(player, "vrr.bodyPartHair")) { if (doesEntityDataExist(player, "agrp.bodyPartHair")) {
let bodyPartHead = getEntityData(player, "vrr.bodyPartHair"); let bodyPartHead = getEntityData(player, "agrp.bodyPartHair");
player.changeBodyPart(0, bodyPartHead[0], bodyPartHair[1]); player.changeBodyPart(0, bodyPartHead[0], bodyPartHair[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPartHead")) { if (doesEntityDataExist(player, "agrp.bodyPartHead")) {
let bodyPartHead = getEntityData(player, "vrr.bodyPartHead"); let bodyPartHead = getEntityData(player, "agrp.bodyPartHead");
player.changeBodyPart(1, bodyPartHead[0], bodyPartHead[1]); player.changeBodyPart(1, bodyPartHead[0], bodyPartHead[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPartUpper")) { if (doesEntityDataExist(player, "agrp.bodyPartUpper")) {
let bodyPartUpper = getEntityData(player, "vrr.bodyPartUpper"); let bodyPartUpper = getEntityData(player, "agrp.bodyPartUpper");
player.changeBodyPart(1, bodyPartUpper[0], bodyPartUpper[1]); player.changeBodyPart(1, bodyPartUpper[0], bodyPartUpper[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPartLower")) { if (doesEntityDataExist(player, "agrp.bodyPartLower")) {
let bodyPartLower = getEntityData(player, "vrr.bodyPartLower"); let bodyPartLower = getEntityData(player, "agrp.bodyPartLower");
player.changeBodyPart(1, bodyPartLower[0], bodyPartLower[1]); player.changeBodyPart(1, bodyPartLower[0], bodyPartLower[1]);
} }
} }
if (getGame() == VRR_GAME_GTA_IV) { if (getGame() == VRR_GAME_GTA_IV) {
if (doesEntityDataExist(player, "vrr.bodyPropHair")) { if (doesEntityDataExist(player, "agrp.bodyPropHair")) {
let bodyPropHair = getEntityData(player, "vrr.bodyPropHair"); let bodyPropHair = getEntityData(player, "agrp.bodyPropHair");
player.changeBodyProp(0, bodyPropHair[0], bodyPropHair[1]); player.changeBodyProp(0, bodyPropHair[0], bodyPropHair[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropHead")) { if (doesEntityDataExist(player, "agrp.bodyPropHead")) {
let bodyPropHead = getEntityData(player, "vrr.bodyPropHead"); let bodyPropHead = getEntityData(player, "agrp.bodyPropHead");
player.changeBodyProp(1, bodyPropHead[0], bodyPropHead[1]); player.changeBodyProp(1, bodyPropHead[0], bodyPropHead[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropEyes")) { if (doesEntityDataExist(player, "agrp.bodyPropEyes")) {
let bodyPropEyes = getEntityData(player, "vrr.bodyPropEyes"); let bodyPropEyes = getEntityData(player, "agrp.bodyPropEyes");
player.changeBodyProp(1, bodyPropEyes[0], bodyPropEyes[1]); player.changeBodyProp(1, bodyPropEyes[0], bodyPropEyes[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropLeftHand")) { if (doesEntityDataExist(player, "agrp.bodyPropLeftHand")) {
let bodyPropLeftHand = getEntityData(player, "vrr.bodyPropLeftHand"); let bodyPropLeftHand = getEntityData(player, "agrp.bodyPropLeftHand");
player.changeBodyProp(1, bodyPropLeftHand[0], bodyPropLeftHand[1]); player.changeBodyProp(1, bodyPropLeftHand[0], bodyPropLeftHand[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropRightHand")) { if (doesEntityDataExist(player, "agrp.bodyPropRightHand")) {
let bodyPropRightHand = getEntityData(player, "vrr.bodyPropRightHand"); let bodyPropRightHand = getEntityData(player, "agrp.bodyPropRightHand");
player.changeBodyProp(1, bodyPropRightHand[0], bodyPropRightHand[1]); player.changeBodyProp(1, bodyPropRightHand[0], bodyPropRightHand[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropLeftWrist")) { if (doesEntityDataExist(player, "agrp.bodyPropLeftWrist")) {
let bodyPropLeftWrist = getEntityData(player, "vrr.bodyPropLeftWrist"); let bodyPropLeftWrist = getEntityData(player, "agrp.bodyPropLeftWrist");
player.changeBodyProp(1, bodyPropLeftWrist[0], bodyPropLeftWrist[1]); player.changeBodyProp(1, bodyPropLeftWrist[0], bodyPropLeftWrist[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropRightWrist")) { if (doesEntityDataExist(player, "agrp.bodyPropRightWrist")) {
let bodyPropRightWrist = getEntityData(player, "vrr.bodyPropRightWrist"); let bodyPropRightWrist = getEntityData(player, "agrp.bodyPropRightWrist");
player.changeBodyProp(1, bodyPropRightWrist[0], bodyPropRightWrist[1]); player.changeBodyProp(1, bodyPropRightWrist[0], bodyPropRightWrist[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropRightWrist")) { if (doesEntityDataExist(player, "agrp.bodyPropRightWrist")) {
let bodyPropRightWrist = getEntityData(player, "vrr.bodyPropRightWrist"); let bodyPropRightWrist = getEntityData(player, "agrp.bodyPropRightWrist");
player.changeBodyProp(1, bodyPropRightWrist[0], bodyPropRightWrist[1]); player.changeBodyProp(1, bodyPropRightWrist[0], bodyPropRightWrist[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropHip")) { if (doesEntityDataExist(player, "agrp.bodyPropHip")) {
let bodyPropHip = getEntityData(player, "vrr.bodyPropHip"); let bodyPropHip = getEntityData(player, "agrp.bodyPropHip");
player.changeBodyProp(1, bodyPropHip[0], bodyPropHip[1]); player.changeBodyProp(1, bodyPropHip[0], bodyPropHip[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropLeftFoot")) { if (doesEntityDataExist(player, "agrp.bodyPropLeftFoot")) {
let bodyPropLeftFoot = getEntityData(player, "vrr.bodyPropLeftFoot"); let bodyPropLeftFoot = getEntityData(player, "agrp.bodyPropLeftFoot");
player.changeBodyProp(1, bodyPropLeftFoot[0], bodyPropLeftFoot[1]); player.changeBodyProp(1, bodyPropLeftFoot[0], bodyPropLeftFoot[1]);
} }
if (doesEntityDataExist(player, "vrr.bodyPropRightFoot")) { if (doesEntityDataExist(player, "agrp.bodyPropRightFoot")) {
let bodyPropRightFoot = getEntityData(player, "vrr.bodyPropRightFoot"); let bodyPropRightFoot = getEntityData(player, "agrp.bodyPropRightFoot");
player.changeBodyProp(1, bodyPropRightFoot[0], bodyPropRightFoot[1]); player.changeBodyProp(1, bodyPropRightFoot[0], bodyPropRightFoot[1]);
} }
} }
@@ -523,8 +523,8 @@ function syncPlayerProperties(player) {
function syncObjectProperties(object) { function syncObjectProperties(object) {
if (getGame() == VRR_GAME_GTA_III || getGame() == VRR_GAME_GTA_VC) { if (getGame() == VRR_GAME_GTA_III || getGame() == VRR_GAME_GTA_VC) {
if (doesEntityDataExist(object, "vrr.scale")) { if (doesEntityDataExist(object, "agrp.scale")) {
let scaleFactor = getEntityData(object, "vrr.scale"); let scaleFactor = getEntityData(object, "agrp.scale");
let tempMatrix = object.matrix; let tempMatrix = object.matrix;
tempMatrix.setScale(toVector3(scaleFactor.x, scaleFactor.y, scaleFactor.z)); tempMatrix.setScale(toVector3(scaleFactor.x, scaleFactor.y, scaleFactor.z));
let tempPosition = object.position; let tempPosition = object.position;
@@ -574,9 +574,9 @@ function getPlayerId(client) {
// =========================================================================== // ===========================================================================
function syncElementProperties(element) { function syncElementProperties(element) {
if (doesEntityDataExist(element, "vrr.interior")) { if (doesEntityDataExist(element, "agrp.interior")) {
if (typeof element.interior != "undefined") { if (typeof element.interior != "undefined") {
element.interior = getEntityData(element, "vrr.interior"); element.interior = getEntityData(element, "agrp.interior");
} }
} }

4
scripts/client/skin-select.js
View File

@@ -86,11 +86,11 @@ function processSkinSelectKeyPress(keyCode) {
localPlayer.skin = allowedSkins[skinSelectorIndex][0]; localPlayer.skin = allowedSkins[skinSelectorIndex][0];
} }
} else if (keyCode == SDLK_RETURN) { } else if (keyCode == SDLK_RETURN) {
sendNetworkEventToServer("vrr.skinSelected", skinSelectorIndex); sendNetworkEventToServer("agrp.skinSelected", skinSelectorIndex);
toggleSkinSelect(false); toggleSkinSelect(false);
return true; return true;
} else if (keyCode == SDLK_BACKSPACE) { } else if (keyCode == SDLK_BACKSPACE) {
sendNetworkEventToServer("vrr.skinSelected", -1); sendNetworkEventToServer("agrp.skinSelected", -1);
toggleSkinSelect(false); toggleSkinSelect(false);
return true; return true;
} }

2
scripts/server/account.js
View File

@@ -1391,7 +1391,7 @@ function initClient(client) {
return false; return false;
} }
setEntityData(client, "vrr.isInitialized", true, false); setEntityData(client, "agrp.isInitialized", true, false);
sendPlayerGUIColours(client); sendPlayerGUIColours(client);

2
scripts/server/animation.js
View File

@@ -97,7 +97,7 @@ function makePlayerPlayAnimation(client, animationSlot, offsetPosition = 1) {
getPlayerData(client).animationForced = false; getPlayerData(client).animationForced = false;
makePedPlayAnimation(getPlayerPed(client), animationSlot, offsetPosition); makePedPlayAnimation(getPlayerPed(client), animationSlot, offsetPosition);
setEntityData(getPlayerPed(client), "vrr.anim", animationSlot, true); setEntityData(getPlayerPed(client), "agrp.anim", animationSlot, true);
//if(getAnimationData(animationSlot)[9] != VRR_ANIMMOVE_NONE) { //if(getAnimationData(animationSlot)[9] != VRR_ANIMMOVE_NONE) {
// if(getGame() < VRR_GAME_GTA_SA) { // if(getGame() < VRR_GAME_GTA_SA) {
// setPlayerMouseCameraState(client, true); // setPlayerMouseCameraState(client, true);

36
scripts/server/event.js
View File

@@ -271,7 +271,7 @@ async function onPlayerEnteredVehicle(client, vehicle, seat) {
return false; return false;
} }
logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)} entered a ${getVehicleName(vehicle)} (ID: ${vehicle.getData("vrr.dataSlot")}, Database ID: ${getVehicleData(vehicle).databaseId})`); logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)} entered a ${getVehicleName(vehicle)} (ID: ${vehicle.getData("agrp.dataSlot")}, Database ID: ${getVehicleData(vehicle).databaseId})`);
getPlayerData(client).lastVehicle = vehicle; getPlayerData(client).lastVehicle = vehicle;
getVehicleData(vehicle).lastActiveTime = getCurrentUnixTimestamp(); getVehicleData(vehicle).lastActiveTime = getCurrentUnixTimestamp();
@@ -385,7 +385,7 @@ function onPlayerExitedVehicle(client, vehicle) {
getVehicleData(vehicle).lastActiveTime = getCurrentUnixTimestamp(); getVehicleData(vehicle).lastActiveTime = getCurrentUnixTimestamp();
logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)} exited a ${getVehicleName(vehicle)} (ID: ${vehicle.getData("vrr.dataSlot")}, Database ID: ${getVehicleData(vehicle).databaseId})`); logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)} exited a ${getVehicleName(vehicle)} (ID: ${vehicle.getData("agrp.dataSlot")}, Database ID: ${getVehicleData(vehicle).databaseId})`);
} }
// =========================================================================== // ===========================================================================
@@ -518,7 +518,7 @@ async function onPlayerSpawn(client) {
logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)}'s player data is valid. Continuing spawn processing ...`); logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)}'s player data is valid. Continuing spawn processing ...`);
logToConsole(LOG_DEBUG, `[VRR.Event] Setting ${getPlayerDisplayForConsole(client)}'s ped scale (${getPlayerCurrentSubAccount(client).pedScale})`); logToConsole(LOG_DEBUG, `[VRR.Event] Setting ${getPlayerDisplayForConsole(client)}'s ped scale (${getPlayerCurrentSubAccount(client).pedScale})`);
setEntityData(getPlayerPed(client), "vrr.scale", getPlayerCurrentSubAccount(client).pedScale, true); setEntityData(getPlayerPed(client), "agrp.scale", getPlayerCurrentSubAccount(client).pedScale, true);
//if (isPlayerSwitchingCharacter(client) || isPlayerCreatingCharacter(client)) { //if (isPlayerSwitchingCharacter(client) || isPlayerCreatingCharacter(client)) {
// logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)}'s ped is being used for character selection/creation. No further spawn processing needed'`); // logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)}'s ped is being used for character selection/creation. No further spawn processing needed'`);
@@ -574,7 +574,7 @@ async function onPlayerSpawn(client) {
if (areServerElementsSupported() && getGame() == VRR_GAME_GTA_SA) { if (areServerElementsSupported() && getGame() == VRR_GAME_GTA_SA) {
logToConsole(LOG_DEBUG, `[VRR.Event] Setting player walk and fightstyle for ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Event] Setting player walk and fightstyle for ${getPlayerDisplayForConsole(client)}`);
setEntityData(getPlayerPed(client), "vrr.walkStyle", getPlayerCurrentSubAccount(client).walkStyle, true); setEntityData(getPlayerPed(client), "agrp.walkStyle", getPlayerCurrentSubAccount(client).walkStyle, true);
setPlayerFightStyle(client, getPlayerCurrentSubAccount(client).fightStyle); setPlayerFightStyle(client, getPlayerCurrentSubAccount(client).fightStyle);
} }
@@ -600,20 +600,20 @@ async function onPlayerSpawn(client) {
} }
//if(isGTAIV()) { //if(isGTAIV()) {
// setEntityData(getPlayerPed(client), "vrr.bodyPartHair", getPlayerCurrentSubAccount(client).bodyParts.hair, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartHair", getPlayerCurrentSubAccount(client).bodyParts.hair, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartHead", getPlayerCurrentSubAccount(client).bodyParts.head, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartHead", getPlayerCurrentSubAccount(client).bodyParts.head, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartUpper", getPlayerCurrentSubAccount(client).bodyParts.upper, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartUpper", getPlayerCurrentSubAccount(client).bodyParts.upper, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartLower", getPlayerCurrentSubAccount(client).bodyParts.lower, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartLower", getPlayerCurrentSubAccount(client).bodyParts.lower, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPropHair", getPlayerCurrentSubAccount(client).bodyProps.hair, true); // setEntityData(getPlayerPed(client), "agrp.bodyPropHair", getPlayerCurrentSubAccount(client).bodyProps.hair, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPropEyes", getPlayerCurrentSubAccount(client).bodyProps.eyes, true); // setEntityData(getPlayerPed(client), "agrp.bodyPropEyes", getPlayerCurrentSubAccount(client).bodyProps.eyes, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartHead", getPlayerCurrentSubAccount(client).bodyProps.head, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartHead", getPlayerCurrentSubAccount(client).bodyProps.head, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartLeftHand", getPlayerCurrentSubAccount(client).bodyProps.leftHand, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartLeftHand", getPlayerCurrentSubAccount(client).bodyProps.leftHand, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartRightHand", getPlayerCurrentSubAccount(client).bodyProps.rightHand, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartRightHand", getPlayerCurrentSubAccount(client).bodyProps.rightHand, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartLeftWrist", getPlayerCurrentSubAccount(client).bodyProps.leftWrist, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartLeftWrist", getPlayerCurrentSubAccount(client).bodyProps.leftWrist, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartRightWrist", getPlayerCurrentSubAccount(client).bodyProps.rightWrist, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartRightWrist", getPlayerCurrentSubAccount(client).bodyProps.rightWrist, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartHip", getPlayerCurrentSubAccount(client).bodyProps.hip, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartHip", getPlayerCurrentSubAccount(client).bodyProps.hip, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartLeftFoot", getPlayerCurrentSubAccount(client).bodyProps.leftFoot, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartLeftFoot", getPlayerCurrentSubAccount(client).bodyProps.leftFoot, true);
// setEntityData(getPlayerPed(client), "vrr.bodyPartRightFoot", getPlayerCurrentSubAccount(client).bodyProps.rightFoot, true); // setEntityData(getPlayerPed(client), "agrp.bodyPartRightFoot", getPlayerCurrentSubAccount(client).bodyProps.rightFoot, true);
//} //}
if (isGTAIV()) { if (isGTAIV()) {

2
scripts/server/item.js
View File

@@ -346,7 +346,7 @@ function createGroundItemObject(itemId) {
setElementRotation(getItemData(itemId).object, getItemTypeData(getItemData(itemId).itemTypeIndex).dropRotation); setElementRotation(getItemData(itemId).object, getItemTypeData(getItemData(itemId).itemTypeIndex).dropRotation);
setElementOnAllDimensions(getItemData(itemId).object, false); setElementOnAllDimensions(getItemData(itemId).object, false);
setElementDimension(getItemData(itemId).object, getItemData(itemId).dimension); setElementDimension(getItemData(itemId).object, getItemData(itemId).dimension);
//setEntityData(getItemData(itemId).object, "vrr.scale", getItemTypeData(getItemData(itemId).itemTypeIndex).dropScale, true); //setEntityData(getItemData(itemId).object, "agrp.scale", getItemTypeData(getItemData(itemId).itemTypeIndex).dropScale, true);
addToWorld(getItemData(itemId).object); addToWorld(getItemData(itemId).object);
} }
} }

20
scripts/server/job.js
View File

@@ -624,11 +624,11 @@ function createAllJobPickups() {
for (let j in getServerData().jobs[i].locations) { for (let j in getServerData().jobs[i].locations) {
pickupCount++; pickupCount++;
getServerData().jobs[i].locations[j].pickup = game.createPickup(getServerData().jobs[i].pickupModel, getServerData().jobs[i].locations[j].position); getServerData().jobs[i].locations[j].pickup = game.createPickup(getServerData().jobs[i].pickupModel, getServerData().jobs[i].locations[j].position);
setEntityData(getServerData().jobs[i].locations[j].pickup, "vrr.owner.type", VRR_PICKUP_JOB, false); setEntityData(getServerData().jobs[i].locations[j].pickup, "agrp.owner.type", VRR_PICKUP_JOB, false);
setEntityData(getServerData().jobs[i].locations[j].pickup, "vrr.owner.id", j, false); setEntityData(getServerData().jobs[i].locations[j].pickup, "agrp.owner.id", j, false);
setEntityData(getServerData().jobs[i].locations[j].pickup, "vrr.label.type", VRR_LABEL_JOB, true); setEntityData(getServerData().jobs[i].locations[j].pickup, "agrp.label.type", VRR_LABEL_JOB, true);
setEntityData(getServerData().jobs[i].locations[j].pickup, "vrr.label.name", getServerData().jobs[i].name, true); setEntityData(getServerData().jobs[i].locations[j].pickup, "agrp.label.name", getServerData().jobs[i].name, true);
setEntityData(getServerData().jobs[i].locations[j].pickup, "vrr.label.jobType", getServerData().jobs[i].databaseId, true); setEntityData(getServerData().jobs[i].locations[j].pickup, "agrp.label.jobType", getServerData().jobs[i].databaseId, true);
setElementOnAllDimensions(getServerData().jobs[i].locations[j].pickup, false); setElementOnAllDimensions(getServerData().jobs[i].locations[j].pickup, false);
setElementDimension(getServerData().jobs[i].locations[j].pickup, getServerData().jobs[i].locations[j].dimension); setElementDimension(getServerData().jobs[i].locations[j].pickup, getServerData().jobs[i].locations[j].dimension);
addToWorld(getServerData().jobs[i].locations[j].pickup); addToWorld(getServerData().jobs[i].locations[j].pickup);
@@ -2743,11 +2743,11 @@ function createJobLocationPickup(jobId, locationId) {
tempJobData.locations[locationId].pickup = pickup; tempJobData.locations[locationId].pickup = pickup;
setElementDimension(pickup, tempJobData.locations[locationId].dimension); setElementDimension(pickup, tempJobData.locations[locationId].dimension);
setElementOnAllDimensions(pickup, false); setElementOnAllDimensions(pickup, false);
setEntityData(pickup, "vrr.owner.type", VRR_PICKUP_JOB, false); setEntityData(pickup, "agrp.owner.type", VRR_PICKUP_JOB, false);
setEntityData(pickup, "vrr.owner.id", locationId, false); setEntityData(pickup, "agrp.owner.id", locationId, false);
setEntityData(pickup, "vrr.label.type", VRR_LABEL_JOB, true); setEntityData(pickup, "agrp.label.type", VRR_LABEL_JOB, true);
setEntityData(pickup, "vrr.label.name", tempJobData.name, true); setEntityData(pickup, "agrp.label.name", tempJobData.name, true);
setEntityData(pickup, "vrr.label.jobType", tempJobData.databaseId, true); setEntityData(pickup, "agrp.label.jobType", tempJobData.databaseId, true);
addToWorld(pickup); addToWorld(pickup);
} }
} else { } else {

20
scripts/server/native/ragemp.js
View File

@@ -181,7 +181,7 @@ function getVehicleHeading(vehicle) {
function setVehicleHeading(vehicle, heading) { function setVehicleHeading(vehicle, heading) {
if (getGame() == VRR_GAME_GTA_IV) { if (getGame() == VRR_GAME_GTA_IV) {
return sendNetworkEventToPlayer("vrr.vehPosition", null, getVehicleForNetworkEvent(vehicle), heading); return sendNetworkEventToPlayer("agrp.vehPosition", null, getVehicleForNetworkEvent(vehicle), heading);
} }
return vehicle.heading = heading; return vehicle.heading = heading;
} }
@@ -255,7 +255,7 @@ function removePlayerFromVehicle(client) {
function setPlayerSkin(client, skinIndex) { function setPlayerSkin(client, skinIndex) {
logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s skin to ${getGameConfig().skins[getGame()][skinIndex][0]} (Index: ${skinIndex}, Name: ${getGameConfig().skins[getGame()][skinIndex][1]})`); logToConsole(LOG_DEBUG, `Setting ${getPlayerDisplayForConsole(client)}'s skin to ${getGameConfig().skins[getGame()][skinIndex][0]} (Index: ${skinIndex}, Name: ${getGameConfig().skins[getGame()][skinIndex][1]})`);
if (getGame() == VRR_GAME_GTA_IV) { if (getGame() == VRR_GAME_GTA_IV) {
triggerNetworkEvent("vrr.localPlayerSkin", client, getGameConfig().skins[getGame()][skinIndex][0]); triggerNetworkEvent("agrp.localPlayerSkin", client, getGameConfig().skins[getGame()][skinIndex][0]);
} else { } else {
getPlayerPed(client).modelIndex = getGameConfig().skins[getGame()][skinIndex][0]; getPlayerPed(client).modelIndex = getGameConfig().skins[getGame()][skinIndex][0];
} }
@@ -547,15 +547,15 @@ function repairVehicle(vehicle) {
// =========================================================================== // ===========================================================================
function setVehicleLights(vehicle, lights) { function setVehicleLights(vehicle, lights) {
setEntityData(vehicle, "vrr.lights", lights, true); setEntityData(vehicle, "agrp.lights", lights, true);
sendNetworkEventToPlayer("vrr.veh.lights", null, vehicle.id, lights); sendNetworkEventToPlayer("agrp.veh.lights", null, vehicle.id, lights);
} }
// =========================================================================== // ===========================================================================
function setVehicleEngine(vehicle, engine) { function setVehicleEngine(vehicle, engine) {
vehicle.engine = engine; vehicle.engine = engine;
setEntityData(vehicle, "vrr.engine", engine, true); setEntityData(vehicle, "agrp.engine", engine, true);
} }
// =========================================================================== // ===========================================================================
@@ -690,7 +690,7 @@ function getPlayerElement(client) {
// =========================================================================== // ===========================================================================
function setElementPosition(element, position) { function setElementPosition(element, position) {
sendNetworkEventToPlayer("vrr.elementPosition", null, element.id, position); sendNetworkEventToPlayer("agrp.elementPosition", null, element.id, position);
} }
// =========================================================================== // ===========================================================================
@@ -714,7 +714,7 @@ function setElementInterior(element, interior) {
// =========================================================================== // ===========================================================================
function setElementCollisionsEnabled(element, state) { function setElementCollisionsEnabled(element, state) {
//sendNetworkEventToPlayer("vrr.elementCollisions", null, element.id, state); //sendNetworkEventToPlayer("agrp.elementCollisions", null, element.id, state);
} }
// =========================================================================== // ===========================================================================
@@ -1014,14 +1014,14 @@ function setVehicleHealth(vehicle, health) {
function givePlayerWeapon(client, weaponId, ammo, active = true) { function givePlayerWeapon(client, weaponId, ammo, active = true) {
//logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to ${getPlayerDisplayForConsole(client)} to give weapon (Weapon: ${weaponId}, Ammo: ${ammo})`); //logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to ${getPlayerDisplayForConsole(client)} to give weapon (Weapon: ${weaponId}, Ammo: ${ammo})`);
//sendNetworkEventToPlayer("vrr.giveWeapon", client, weaponId, ammo, active); //sendNetworkEventToPlayer("agrp.giveWeapon", client, weaponId, ammo, active);
client.giveWeapon(weaponId, ammo); client.giveWeapon(weaponId, ammo);
} }
// =========================================================================== // ===========================================================================
function setPlayerWantedLevel(client, wantedLevel) { function setPlayerWantedLevel(client, wantedLevel) {
//sendNetworkEventToPlayer("vrr.wantedLevel", client, wantedLevel); //sendNetworkEventToPlayer("agrp.wantedLevel", client, wantedLevel);
return true; return true;
} }
@@ -1169,7 +1169,7 @@ function serverBanIP(ip) {
// =========================================================================== // ===========================================================================
function setVehicleTrunkState(vehicle, trunkState) { function setVehicleTrunkState(vehicle, trunkState) {
//sendNetworkEventToPlayer("vrr.veh.trunk", null, getVehicleForNetworkEvent(vehicle), trunkState); //sendNetworkEventToPlayer("agrp.veh.trunk", null, getVehicleForNetworkEvent(vehicle), trunkState);
} }
// =========================================================================== // ===========================================================================

302
scripts/server/netevents.js
View File

@@ -18,72 +18,72 @@ function addAllNetworkEventHandlers() {
logToConsole(LOG_DEBUG, "[VRR.Client]: Adding network handlers ..."); logToConsole(LOG_DEBUG, "[VRR.Client]: Adding network handlers ...");
// KeyBind // KeyBind
addNetworkEventHandler("vrr.useKeyBind", playerUsedKeyBind); addNetworkEventHandler("agrp.useKeyBind", playerUsedKeyBind);
// GUI // GUI
addNetworkEventHandler("vrr.promptAnswerNo", playerPromptAnswerNo); addNetworkEventHandler("agrp.promptAnswerNo", playerPromptAnswerNo);
addNetworkEventHandler("vrr.promptAnswerYes", playerPromptAnswerYes); addNetworkEventHandler("agrp.promptAnswerYes", playerPromptAnswerYes);
addNetworkEventHandler("vrr.toggleGUI", playerToggledGUI); addNetworkEventHandler("agrp.toggleGUI", playerToggledGUI);
addNetworkEventHandler("vrr.2fa", checkPlayerTwoFactorAuthentication); addNetworkEventHandler("agrp.2fa", checkPlayerTwoFactorAuthentication);
// AFK // AFK
addNetworkEventHandler("vrr.afk", playerChangeAFKState); addNetworkEventHandler("agrp.afk", playerChangeAFKState);
// Event // Event
addNetworkEventHandler("vrr.pickup", onPlayerNearPickup); addNetworkEventHandler("agrp.pickup", onPlayerNearPickup);
addNetworkEventHandler("vrr.enteredSphere", onPlayerEnteredSphere); addNetworkEventHandler("agrp.enteredSphere", onPlayerEnteredSphere);
addNetworkEventHandler("vrr.exitedSphere", onPlayerExitedSphere); addNetworkEventHandler("agrp.exitedSphere", onPlayerExitedSphere);
addNetworkEventHandler("vrr.playerDeath", onPlayerDeath); addNetworkEventHandler("agrp.playerDeath", onPlayerDeath);
//addNetworkEventHandler("vrr.onPlayerEnterVehicle", onPlayerEnteredVehicle); //addNetworkEventHandler("agrp.onPlayerEnterVehicle", onPlayerEnteredVehicle);
//addNetworkEventHandler("vrr.onPlayerExitVehicle", onPlayerExitedVehicle); //addNetworkEventHandler("agrp.onPlayerExitVehicle", onPlayerExitedVehicle);
// Job // Job
addNetworkEventHandler("vrr.arrivedAtJobRouteLocation", playerArrivedAtJobRouteLocation); addNetworkEventHandler("agrp.arrivedAtJobRouteLocation", playerArrivedAtJobRouteLocation);
// Client // Client
addNetworkEventHandler("vrr.clientReady", playerClientReady); addNetworkEventHandler("agrp.clientReady", playerClientReady);
addNetworkEventHandler("vrr.guiReady", playerGUIReady); addNetworkEventHandler("agrp.guiReady", playerGUIReady);
addNetworkEventHandler("vrr.clientStarted", playerClientStarted); addNetworkEventHandler("agrp.clientStarted", playerClientStarted);
addNetworkEventHandler("vrr.clientStopped", playerClientStopped); addNetworkEventHandler("agrp.clientStopped", playerClientStopped);
// Account // Account
addNetworkEventHandler("vrr.checkLogin", checkLogin); addNetworkEventHandler("agrp.checkLogin", checkLogin);
addNetworkEventHandler("vrr.checkRegistration", checkRegistration); addNetworkEventHandler("agrp.checkRegistration", checkRegistration);
addNetworkEventHandler("vrr.checkResetPassword", checkAccountResetPasswordRequest); addNetworkEventHandler("agrp.checkResetPassword", checkAccountResetPasswordRequest);
addNetworkEventHandler("vrr.checkChangePassword", checkAccountChangePassword); addNetworkEventHandler("agrp.checkChangePassword", checkAccountChangePassword);
// Developer // Developer
addNetworkEventHandler("vrr.runCodeSuccess", clientRunCodeSuccess); addNetworkEventHandler("agrp.runCodeSuccess", clientRunCodeSuccess);
addNetworkEventHandler("vrr.runCodeFail", clientRunCodeFail); addNetworkEventHandler("agrp.runCodeFail", clientRunCodeFail);
// SubAccount // SubAccount
addNetworkEventHandler("vrr.checkNewCharacter", checkNewCharacter); addNetworkEventHandler("agrp.checkNewCharacter", checkNewCharacter);
addNetworkEventHandler("vrr.nextCharacter", checkNextCharacter); addNetworkEventHandler("agrp.nextCharacter", checkNextCharacter);
addNetworkEventHandler("vrr.previousCharacter", checkPreviousCharacter); addNetworkEventHandler("agrp.previousCharacter", checkPreviousCharacter);
addNetworkEventHandler("vrr.selectCharacter", selectCharacter); addNetworkEventHandler("agrp.selectCharacter", selectCharacter);
// Item // Item
addNetworkEventHandler("vrr.itemActionDelayComplete", playerItemActionDelayComplete); addNetworkEventHandler("agrp.itemActionDelayComplete", playerItemActionDelayComplete);
addNetworkEventHandler("vrr.weaponDamage", playerDamagedByPlayer); addNetworkEventHandler("agrp.weaponDamage", playerDamagedByPlayer);
// Locale // Locale
addNetworkEventHandler("vrr.localeSelect", playerSelectedNewLocale); addNetworkEventHandler("agrp.localeSelect", playerSelectedNewLocale);
// Misc // Misc
addNetworkEventHandler("vrr.plr.pos", updatePositionInPlayerData); addNetworkEventHandler("agrp.plr.pos", updatePositionInPlayerData);
addNetworkEventHandler("vrr.plr.rot", updateHeadingInPlayerData); addNetworkEventHandler("agrp.plr.rot", updateHeadingInPlayerData);
addNetworkEventHandler("vrr.skinSelected", playerFinishedSkinSelection); addNetworkEventHandler("agrp.skinSelected", playerFinishedSkinSelection);
addNetworkEventHandler("vrr.clientInfo", updateConnectionLogOnClientInfoReceive); addNetworkEventHandler("agrp.clientInfo", updateConnectionLogOnClientInfoReceive);
addNetworkEventHandler("vrr.vehBuyState", receiveVehiclePurchaseStateUpdateFromClient); addNetworkEventHandler("agrp.vehBuyState", receiveVehiclePurchaseStateUpdateFromClient);
addNetworkEventHandler("vrr.playerPedId", receivePlayerPedNetworkId); addNetworkEventHandler("agrp.playerPedId", receivePlayerPedNetworkId);
addNetworkEventHandler("vrr.playerCop", setPlayerAsCopState); addNetworkEventHandler("agrp.playerCop", setPlayerAsCopState);
} }
// =========================================================================== // ===========================================================================
function updatePlayerNameTag(client) { function updatePlayerNameTag(client) {
//logToConsole(LOG_DEBUG, `[VRR.Client] Sending ${getPlayerDisplayForConsole(client)}'s updated nametag to all players`); //logToConsole(LOG_DEBUG, `[VRR.Client] Sending ${getPlayerDisplayForConsole(client)}'s updated nametag to all players`);
sendNetworkEventToPlayer("vrr.nametag", null, getPlayerName(client), getPlayerNameForNameTag(client), getPlayerColour(client), getPlayerData(client).afk, getPlayerPing(client)); sendNetworkEventToPlayer("agrp.nametag", null, getPlayerName(client), getPlayerNameForNameTag(client), getPlayerColour(client), getPlayerData(client).afk, getPlayerPing(client));
} }
// =========================================================================== // ===========================================================================
@@ -100,7 +100,7 @@ function updateAllPlayerNameTags() {
function updatePlayerPing(client) { function updatePlayerPing(client) {
//logToConsole(LOG_DEBUG, `[VRR.Client] Sending ${getPlayerDisplayForConsole(client)}'s ping to all players`); //logToConsole(LOG_DEBUG, `[VRR.Client] Sending ${getPlayerDisplayForConsole(client)}'s ping to all players`);
sendNetworkEventToPlayer("vrr.ping", null, getPlayerName(client), getPlayerPing(client)); sendNetworkEventToPlayer("agrp.ping", null, getPlayerName(client), getPlayerPing(client));
} }
// =========================================================================== // ===========================================================================
@@ -142,7 +142,7 @@ function playerClientStopped(client) {
function showSmallGameMessage(client, text, colour, duration, fontName = "Pricedown") { function showSmallGameMessage(client, text, colour, duration, fontName = "Pricedown") {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing game message to ${getPlayerDisplayForConsole(client)} (${text}) for ${duration} milliseconds`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing game message to ${getPlayerDisplayForConsole(client)} (${text}) for ${duration} milliseconds`);
sendNetworkEventToPlayer("vrr.smallGameMessage", client, text, colour, duration, fontName); sendNetworkEventToPlayer("agrp.smallGameMessage", client, text, colour, duration, fontName);
} }
// =========================================================================== // ===========================================================================
@@ -153,7 +153,7 @@ function enableCityAmbienceForPlayer(client, clearElements = false) {
//} //}
//logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s city ambience to ${toUpperCase(getOnOffFromBool(false))}`); //logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s city ambience to ${toUpperCase(getOnOffFromBool(false))}`);
//sendNetworkEventToPlayer("vrr.ambience", client, true); //sendNetworkEventToPlayer("agrp.ambience", client, true);
} }
// =========================================================================== // ===========================================================================
@@ -164,14 +164,14 @@ function disableCityAmbienceForPlayer(client, clearElements = false) {
//} //}
//logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s city ambience to ${toUpperCase(getOnOffFromBool(false))}`); //logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s city ambience to ${toUpperCase(getOnOffFromBool(false))}`);
//sendNetworkEventToPlayer("vrr.ambience", client, false, clearElements); //sendNetworkEventToPlayer("agrp.ambience", client, false, clearElements);
} }
// =========================================================================== // ===========================================================================
function clearPlayerOwnedPeds(client) { function clearPlayerOwnedPeds(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Clearing peds owned by ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Clearing peds owned by ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.clearPeds", client); sendNetworkEventToPlayer("agrp.clearPeds", client);
} }
// =========================================================================== // ===========================================================================
@@ -179,41 +179,41 @@ function clearPlayerOwnedPeds(client) {
function updatePlayerSpawnedState(client, state) { function updatePlayerSpawnedState(client, state) {
logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s spawned state ${toUpperCase(getOnOffFromBool(state))}`); logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s spawned state ${toUpperCase(getOnOffFromBool(state))}`);
getPlayerData(client).spawned = true; getPlayerData(client).spawned = true;
sendNetworkEventToPlayer("vrr.spawned", client, state); sendNetworkEventToPlayer("agrp.spawned", client, state);
} }
// =========================================================================== // ===========================================================================
function setPlayerControlState(client, state) { function setPlayerControlState(client, state) {
logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s control state ${toUpperCase(getOnOffFromBool(state))}`); logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s control state ${toUpperCase(getOnOffFromBool(state))}`);
sendNetworkEventToPlayer("vrr.control", client, state, !state); sendNetworkEventToPlayer("agrp.control", client, state, !state);
} }
// =========================================================================== // ===========================================================================
function updatePlayerShowLogoState(client, state) { function updatePlayerShowLogoState(client, state) {
logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s logo state ${toUpperCase(getOnOffFromBool(state))}`); logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s logo state ${toUpperCase(getOnOffFromBool(state))}`);
sendNetworkEventToPlayer("vrr.logo", client, state); sendNetworkEventToPlayer("agrp.logo", client, state);
} }
// =========================================================================== // ===========================================================================
function restorePlayerCamera(client) { function restorePlayerCamera(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Restoring ${getPlayerDisplayForConsole(client)}'s camera`); logToConsole(LOG_DEBUG, `[VRR.Client] Restoring ${getPlayerDisplayForConsole(client)}'s camera`);
sendNetworkEventToPlayer("vrr.restoreCamera", client); sendNetworkEventToPlayer("agrp.restoreCamera", client);
} }
// =========================================================================== // ===========================================================================
function setPlayer2DRendering(client, hudState = false, labelState = false, smallGameMessageState = false, scoreboardState = false, hotBarState = false, itemActionDelayState = false) { function setPlayer2DRendering(client, hudState = false, labelState = false, smallGameMessageState = false, scoreboardState = false, hotBarState = false, itemActionDelayState = false) {
sendNetworkEventToPlayer("vrr.set2DRendering", client, hudState, labelState, smallGameMessageState, scoreboardState, hotBarState, itemActionDelayState); sendNetworkEventToPlayer("agrp.set2DRendering", client, hudState, labelState, smallGameMessageState, scoreboardState, hotBarState, itemActionDelayState);
} }
// =========================================================================== // ===========================================================================
function syncPlayerProperties(client) { function syncPlayerProperties(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to sync ${getPlayerDisplayForConsole(client)}'s player ped properties`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to sync ${getPlayerDisplayForConsole(client)}'s player ped properties`);
sendNetworkEventToPlayer("vrr.syncElement", null, getPlayerPed(client).id); sendNetworkEventToPlayer("agrp.syncElement", null, getPlayerPed(client).id);
} }
// =========================================================================== // ===========================================================================
@@ -221,7 +221,7 @@ function syncPlayerProperties(client) {
function updatePlayerSnowState(client) { function updatePlayerSnowState(client) {
if (isSnowSupported(getGame())) { if (isSnowSupported(getGame())) {
logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s snow state (Falling: ${toUpperCase(getOnOffFromBool(getServerConfig().fallingSnow))}, Ground: ${toUpperCase(getOnOffFromBool(getServerConfig().groundSnow))})`); logToConsole(LOG_DEBUG, `[VRR.Client] Setting ${getPlayerDisplayForConsole(client)}'s snow state (Falling: ${toUpperCase(getOnOffFromBool(getServerConfig().fallingSnow))}, Ground: ${toUpperCase(getOnOffFromBool(getServerConfig().groundSnow))})`);
sendNetworkEventToPlayer("vrr.snow", client, getServerConfig().fallingSnow, getServerConfig().groundSnow); sendNetworkEventToPlayer("agrp.snow", client, getServerConfig().fallingSnow, getServerConfig().groundSnow);
} }
} }
@@ -245,21 +245,21 @@ function updatePlayerHotBar(client) {
} }
tempHotBarItems.push([i, itemExists, itemImage, itemValue]); tempHotBarItems.push([i, itemExists, itemImage, itemValue]);
} }
sendNetworkEventToPlayer("vrr.hotbar", client, getPlayerData(client).activeHotBarSlot, tempHotBarItems); sendNetworkEventToPlayer("agrp.hotbar", client, getPlayerData(client).activeHotBarSlot, tempHotBarItems);
} }
// =========================================================================== // ===========================================================================
function setPlayerWeaponDamageEnabled(client, state) { function setPlayerWeaponDamageEnabled(client, state) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending weapon damage state for ${getPlayerDisplayForConsole(client)} to all players`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending weapon damage state for ${getPlayerDisplayForConsole(client)} to all players`);
sendNetworkEventToPlayer("vrr.weaponDamageEnabled", null, getPlayerName(client), state); sendNetworkEventToPlayer("agrp.weaponDamageEnabled", null, getPlayerName(client), state);
} }
// =========================================================================== // ===========================================================================
function setPlayerWeaponDamageEvent(client, eventType) { function setPlayerWeaponDamageEvent(client, eventType) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending weapon damage event (${eventType}) for ${getPlayerDisplayForConsole(client)} to all players`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending weapon damage event (${eventType}) for ${getPlayerDisplayForConsole(client)} to all players`);
sendNetworkEventToPlayer("vrr.weaponDamageEvent", null, getPlayerName(client), eventType); sendNetworkEventToPlayer("agrp.weaponDamageEvent", null, getPlayerName(client), eventType);
getPlayerData(client).weaponDamageEvent = eventType; getPlayerData(client).weaponDamageEvent = eventType;
} }
@@ -267,259 +267,259 @@ function setPlayerWeaponDamageEvent(client, eventType) {
function sendJobRouteLocationToPlayer(client, position, colour) { function sendJobRouteLocationToPlayer(client, position, colour) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending job route stop data to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending job route stop data to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.showJobRouteLocation", client, position, colour); sendNetworkEventToPlayer("agrp.showJobRouteLocation", client, position, colour);
} }
// =========================================================================== // ===========================================================================
function showPlayerLoginSuccessGUI(client) { function showPlayerLoginSuccessGUI(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending login success GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending login success GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.loginSuccess", client); sendNetworkEventToPlayer("agrp.loginSuccess", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerLoginFailedGUI(client, errorMessage) { function showPlayerLoginFailedGUI(client, errorMessage) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending login failed GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending login failed GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.loginFailed", client, errorMessage); sendNetworkEventToPlayer("agrp.loginFailed", client, errorMessage);
} }
// =========================================================================== // ===========================================================================
function showPlayerRegistrationSuccessGUI(client) { function showPlayerRegistrationSuccessGUI(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending registration success GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending registration success GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.registrationSuccess", client); sendNetworkEventToPlayer("agrp.registrationSuccess", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerRegistrationFailedGUI(client, errorMessage) { function showPlayerRegistrationFailedGUI(client, errorMessage) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending registration failed GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending registration failed GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.registrationFailed", client, errorMessage); sendNetworkEventToPlayer("agrp.registrationFailed", client, errorMessage);
} }
// =========================================================================== // ===========================================================================
function sendPlayerGUIColours(client) { function sendPlayerGUIColours(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending GUI colours to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending GUI colours to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.guiColour", client, getServerConfig().guiColourPrimary[0], getServerConfig().guiColourPrimary[1], getServerConfig().guiColourPrimary[2], getServerConfig().guiColourSecondary[0], getServerConfig().guiColourSecondary[1], getServerConfig().guiColourSecondary[2], getServerConfig().guiTextColourPrimary[0], getServerConfig().guiTextColourPrimary[1], getServerConfig().guiTextColourPrimary[2]); sendNetworkEventToPlayer("agrp.guiColour", client, getServerConfig().guiColourPrimary[0], getServerConfig().guiColourPrimary[1], getServerConfig().guiColourPrimary[2], getServerConfig().guiColourSecondary[0], getServerConfig().guiColourSecondary[1], getServerConfig().guiColourSecondary[2], getServerConfig().guiTextColourPrimary[0], getServerConfig().guiTextColourPrimary[1], getServerConfig().guiTextColourPrimary[2]);
} }
// =========================================================================== // ===========================================================================
function sendPlayerGUIInit(client) { function sendPlayerGUIInit(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending GUI init signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending GUI init signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.guiInit", client); sendNetworkEventToPlayer("agrp.guiInit", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerLoginGUI(client, errorMessage = "") { function showPlayerLoginGUI(client, errorMessage = "") {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show login GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show login GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.showLogin", client); sendNetworkEventToPlayer("agrp.showLogin", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerRegistrationGUI(client, errorMessage = "") { function showPlayerRegistrationGUI(client, errorMessage = "") {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show registration GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show registration GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.showRegistration", client); sendNetworkEventToPlayer("agrp.showRegistration", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerNewCharacterGUI(client) { function showPlayerNewCharacterGUI(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show new character GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show new character GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.showNewCharacter", client); sendNetworkEventToPlayer("agrp.showNewCharacter", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerChangePasswordGUI(client, errorMessage = "") { function showPlayerChangePasswordGUI(client, errorMessage = "") {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show change password GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show change password GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.showChangePassword", client, errorMessage); sendNetworkEventToPlayer("agrp.showChangePassword", client, errorMessage);
} }
// =========================================================================== // ===========================================================================
function showPlayerResetPasswordCodeInputGUI(client) { function showPlayerResetPasswordCodeInputGUI(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show reset password code input GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show reset password code input GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.showResetPasswordCodeInput", client); sendNetworkEventToPlayer("agrp.showResetPasswordCodeInput", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerResetPasswordEmailInputGUI(client) { function showPlayerResetPasswordEmailInputGUI(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show reset password email input GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show reset password email input GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.showResetPasswordEmailInput", client); sendNetworkEventToPlayer("agrp.showResetPasswordEmailInput", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerCharacterSelectGUI(client, firstName, lastName, cash, clan, lastPlayed, skin) { function showPlayerCharacterSelectGUI(client, firstName, lastName, cash, clan, lastPlayed, skin) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending character select GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending character select GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.showCharacterSelect", client, firstName, lastName, cash, clan, lastPlayed, skin); sendNetworkEventToPlayer("agrp.showCharacterSelect", client, firstName, lastName, cash, clan, lastPlayed, skin);
} }
// =========================================================================== // ===========================================================================
function updatePlayerCharacterSelectGUI(client, firstName, lastName, cash, clan, lastPlayed, skin) { function updatePlayerCharacterSelectGUI(client, firstName, lastName, cash, clan, lastPlayed, skin) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending update character select GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending update character select GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.switchCharacterSelect", client, firstName, lastName, cash, clan, lastPlayed, skin); sendNetworkEventToPlayer("agrp.switchCharacterSelect", client, firstName, lastName, cash, clan, lastPlayed, skin);
} }
// =========================================================================== // ===========================================================================
function showPlayerCharacterSelectSuccessGUI(client) { function showPlayerCharacterSelectSuccessGUI(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending character select success GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending character select success GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.characterSelectSuccess", client); sendNetworkEventToPlayer("agrp.characterSelectSuccess", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerCharacterSelectFailedGUI(client) { function showPlayerCharacterSelectFailedGUI(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending character select failed GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending character select failed GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.characterSelectFailed", client); sendNetworkEventToPlayer("agrp.characterSelectFailed", client);
} }
// =========================================================================== // ===========================================================================
function showPlayerPromptGUI(client, promptMessage, promptTitle, yesButtonText = "Yes", noButtonText = "No") { function showPlayerPromptGUI(client, promptMessage, promptTitle, yesButtonText = "Yes", noButtonText = "No") {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show prompt GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${promptTitle}, Message: ${promptMessage}, YesButton: ${yesButtonText}, NoButton: ${noButtonText})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show prompt GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${promptTitle}, Message: ${promptMessage}, YesButton: ${yesButtonText}, NoButton: ${noButtonText})`);
sendNetworkEventToPlayer("vrr.showPrompt", client, promptMessage, promptTitle, yesButtonText, noButtonText); sendNetworkEventToPlayer("agrp.showPrompt", client, promptMessage, promptTitle, yesButtonText, noButtonText);
} }
// =========================================================================== // ===========================================================================
function showPlayerInfoGUI(client, infoMessage, infoTitle, buttonText = "OK") { function showPlayerInfoGUI(client, infoMessage, infoTitle, buttonText = "OK") {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show info GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${infoTitle}, Message: ${infoMessage})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show info GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${infoTitle}, Message: ${infoMessage})`);
sendNetworkEventToPlayer("vrr.showInfo", client, infoMessage, infoTitle, buttonText); sendNetworkEventToPlayer("agrp.showInfo", client, infoMessage, infoTitle, buttonText);
} }
// =========================================================================== // ===========================================================================
function showPlayerErrorGUI(client, errorMessage, errorTitle, buttonText = "OK") { function showPlayerErrorGUI(client, errorMessage, errorTitle, buttonText = "OK") {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending show error GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${errorTitle}, Message: ${errorMessage})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending show error GUI signal to ${getPlayerDisplayForConsole(client)} (Title: ${errorTitle}, Message: ${errorMessage})`);
sendNetworkEventToPlayer("vrr.showError", client, errorMessage, errorTitle, buttonText); sendNetworkEventToPlayer("agrp.showError", client, errorMessage, errorTitle, buttonText);
} }
// =========================================================================== // ===========================================================================
function sendRunCodeToClient(client, code, returnTo) { function sendRunCodeToClient(client, code, returnTo) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending runcode to ${getPlayerDisplayForConsole(client)} (returnTo: ${getPlayerDisplayForConsole(getClientFromIndex(returnTo))}, Code: ${code})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending runcode to ${getPlayerDisplayForConsole(client)} (returnTo: ${getPlayerDisplayForConsole(getClientFromIndex(returnTo))}, Code: ${code})`);
sendNetworkEventToPlayer("vrr.runCode", client, code, getPlayerId(returnTo)); sendNetworkEventToPlayer("agrp.runCode", client, code, getPlayerId(returnTo));
} }
// =========================================================================== // ===========================================================================
function sendPlayerWorkingState(client, state) { function sendPlayerWorkingState(client, state) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending working state (${toUpperCase(getYesNoFromBool(state))}) to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending working state (${toUpperCase(getYesNoFromBool(state))}) to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.working", client, state); sendNetworkEventToPlayer("agrp.working", client, state);
} }
// =========================================================================== // ===========================================================================
function sendPlayerJobType(client, jobType) { function sendPlayerJobType(client, jobType) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending job type (${jobType}) to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending job type (${jobType}) to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.jobType", client, jobType); sendNetworkEventToPlayer("agrp.jobType", client, jobType);
} }
// =========================================================================== // ===========================================================================
function sendPlayerStopJobRoute(client) { function sendPlayerStopJobRoute(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to abort job route to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to abort job route to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.hideJobRouteLocation", client); sendNetworkEventToPlayer("agrp.hideJobRouteLocation", client);
} }
// =========================================================================== // ===========================================================================
function sendPlayerMouseCameraToggle(client) { function sendPlayerMouseCameraToggle(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to toggle mouse camera ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to toggle mouse camera ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.mouseCamera", client); sendNetworkEventToPlayer("agrp.mouseCamera", client);
} }
// =========================================================================== // ===========================================================================
function setPlayerMouseCameraState(client, state) { function setPlayerMouseCameraState(client, state) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to toggle mouse camera ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to toggle mouse camera ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.mouseCameraForce", client, state); sendNetworkEventToPlayer("agrp.mouseCameraForce", client, state);
} }
// =========================================================================== // ===========================================================================
function sendPlayerMouseCursorToggle(client) { function sendPlayerMouseCursorToggle(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to toggle mouse cursor ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to toggle mouse cursor ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.mouseCursor", client); sendNetworkEventToPlayer("agrp.mouseCursor", client);
} }
// =========================================================================== // ===========================================================================
function sendAddAccountKeyBindToClient(client, key, keyState) { function sendAddAccountKeyBindToClient(client, key, keyState) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending added keybind to ${getPlayerDisplayForConsole(client)} (Key: ${toUpperCase(getKeyNameFromId(key))}, State: ${(keyState) ? "down" : "up"})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending added keybind to ${getPlayerDisplayForConsole(client)} (Key: ${toUpperCase(getKeyNameFromId(key))}, State: ${(keyState) ? "down" : "up"})`);
sendNetworkEventToPlayer("vrr.addKeyBind", client, toInteger(key), (keyState) ? KEYSTATE_DOWN : KEYSTATE_UP); sendNetworkEventToPlayer("agrp.addKeyBind", client, toInteger(key), (keyState) ? KEYSTATE_DOWN : KEYSTATE_UP);
} }
// =========================================================================== // ===========================================================================
function sendClearKeyBindsToClient(client, key, keyState) { function sendClearKeyBindsToClient(client, key, keyState) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending added keybind to ${getPlayerDisplayForConsole(client)} (Key: ${toUpperCase(getKeyNameFromId(key))}, State: ${(keyState) ? "down" : "up"})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending added keybind to ${getPlayerDisplayForConsole(client)} (Key: ${toUpperCase(getKeyNameFromId(key))}, State: ${(keyState) ? "down" : "up"})`);
sendNetworkEventToPlayer("vrr.clearKeyBinds", client); sendNetworkEventToPlayer("agrp.clearKeyBinds", client);
} }
// =========================================================================== // ===========================================================================
function sendRemoveAccountKeyBindToClient(client, key) { function sendRemoveAccountKeyBindToClient(client, key) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending deleted keybind to ${getPlayerDisplayForConsole(client)} (Key: ${toUpperCase(getKeyNameFromId(key))})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending deleted keybind to ${getPlayerDisplayForConsole(client)} (Key: ${toUpperCase(getKeyNameFromId(key))})`);
sendNetworkEventToPlayer("vrr.delKeyBind", client, toInteger(key)); sendNetworkEventToPlayer("agrp.delKeyBind", client, toInteger(key));
} }
// =========================================================================== // ===========================================================================
function sendPlayerSetPosition(client, position) { function sendPlayerSetPosition(client, position) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending set position signal to ${getPlayerDisplayForConsole(client)} (Position: ${position.x}, ${position.y}, ${position.z})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending set position signal to ${getPlayerDisplayForConsole(client)} (Position: ${position.x}, ${position.y}, ${position.z})`);
sendNetworkEventToPlayer("vrr.position", client, position); sendNetworkEventToPlayer("agrp.position", client, position);
} }
// =========================================================================== // ===========================================================================
function sendPlayerSetHeading(client, heading) { function sendPlayerSetHeading(client, heading) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending set heading signal to ${getPlayerDisplayForConsole(client)} (Heading: ${heading})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending set heading signal to ${getPlayerDisplayForConsole(client)} (Heading: ${heading})`);
sendNetworkEventToPlayer("vrr.heading", client, heading); sendNetworkEventToPlayer("agrp.heading", client, heading);
} }
// =========================================================================== // ===========================================================================
function sendPlayerSetInterior(client, interior) { function sendPlayerSetInterior(client, interior) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending set interior signal to ${getPlayerDisplayForConsole(client)} (Interior: ${interior})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending set interior signal to ${getPlayerDisplayForConsole(client)} (Interior: ${interior})`);
sendNetworkEventToPlayer("vrr.interior", client, interior); sendNetworkEventToPlayer("agrp.interior", client, interior);
} }
// =========================================================================== // ===========================================================================
function sendPlayerFrozenState(client, state) { function sendPlayerFrozenState(client, state) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending set frozen signal to ${getPlayerDisplayForConsole(client)} (State: ${toUpperCase(getYesNoFromBool(state))})`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending set frozen signal to ${getPlayerDisplayForConsole(client)} (State: ${toUpperCase(getYesNoFromBool(state))})`);
sendNetworkEventToPlayer("vrr.frozen", client, state); sendNetworkEventToPlayer("agrp.frozen", client, state);
} }
// =========================================================================== // ===========================================================================
function clearPlayerWeapons(client, clearData = true) { function clearPlayerWeapons(client, clearData = true) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to ${getPlayerDisplayForConsole(client)} to clear weapons`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending signal to ${getPlayerDisplayForConsole(client)} to clear weapons`);
sendNetworkEventToPlayer("vrr.clearWeapons", client, clearData); sendNetworkEventToPlayer("agrp.clearWeapons", client, clearData);
} }
// =========================================================================== // ===========================================================================
function showPlayerNewCharacterFailedGUI(client, errorMessage) { function showPlayerNewCharacterFailedGUI(client, errorMessage) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending new character failed GUI signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending new character failed GUI signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.newCharacterFailed", client, errorMessage); sendNetworkEventToPlayer("agrp.newCharacterFailed", client, errorMessage);
} }
// =========================================================================== // ===========================================================================
function sendPlayerRemoveFromVehicle(client) { function sendPlayerRemoveFromVehicle(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Sending remove from vehicle signal to ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Sending remove from vehicle signal to ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.removeFromVehicle", client); sendNetworkEventToPlayer("agrp.removeFromVehicle", client);
} }
// =========================================================================== // ===========================================================================
@@ -536,7 +536,7 @@ function showPlayerItemTakeDelay(client, itemId) {
let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay; let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay;
if (delay > 0) { if (delay > 0) {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
sendNetworkEventToPlayer("vrr.showItemActionDelay", client, delay); sendNetworkEventToPlayer("agrp.showItemActionDelay", client, delay);
} else { } else {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (instant)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item TAKE delay to ${getPlayerDisplayForConsole(client)} (instant)`);
playerItemActionDelayComplete(client); playerItemActionDelayComplete(client);
@@ -551,7 +551,7 @@ function showPlayerItemUseDelay(client, itemSlot) {
let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay; let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).useDelay;
if (delay > 0) { if (delay > 0) {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
sendNetworkEventToPlayer("vrr.showItemActionDelay", client, delay); sendNetworkEventToPlayer("agrp.showItemActionDelay", client, delay);
} else { } else {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (instant)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item USE delay to ${getPlayerDisplayForConsole(client)} (instant)`);
playerItemActionDelayComplete(client); playerItemActionDelayComplete(client);
@@ -566,7 +566,7 @@ function showPlayerItemDropDelay(client, itemSlot) {
let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay; let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).dropDelay;
if (delay > 0) { if (delay > 0) {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
sendNetworkEventToPlayer("vrr.showItemActionDelay", client, delay); sendNetworkEventToPlayer("agrp.showItemActionDelay", client, delay);
} else { } else {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (instant)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item DROP delay to ${getPlayerDisplayForConsole(client)} (instant)`);
playerItemActionDelayComplete(client); playerItemActionDelayComplete(client);
@@ -581,7 +581,7 @@ function showPlayerItemPickupDelay(client, itemId) {
let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay; let delay = getItemTypeData(getItemData(itemId).itemTypeIndex).pickupDelay;
if (delay > 0) { if (delay > 0) {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
sendNetworkEventToPlayer("vrr.showItemActionDelay", client, delay); sendNetworkEventToPlayer("agrp.showItemActionDelay", client, delay);
} else { } else {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (instant)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item PICKUP delay to ${getPlayerDisplayForConsole(client)} (instant)`);
playerItemActionDelayComplete(client); playerItemActionDelayComplete(client);
@@ -596,7 +596,7 @@ function showPlayerItemPutDelay(client, itemSlot) {
let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay; let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).putDelay;
if (delay > 0) { if (delay > 0) {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
sendNetworkEventToPlayer("vrr.showItemActionDelay", client, delay); sendNetworkEventToPlayer("agrp.showItemActionDelay", client, delay);
} else { } else {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (instant)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item PUT delay to ${getPlayerDisplayForConsole(client)} (instant)`);
playerItemActionDelayComplete(client); playerItemActionDelayComplete(client);
@@ -612,7 +612,7 @@ function showPlayerItemSwitchDelay(client, itemSlot) {
let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).switchDelay; let delay = getItemTypeData(getItemData(getPlayerData(client).hotBarItems[itemSlot]).itemTypeIndex).switchDelay;
if (delay > 0) { if (delay > 0) {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item switch delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item switch delay to ${getPlayerDisplayForConsole(client)} (${delay} milliseconds)`);
sendNetworkEventToPlayer("vrr.showItemActionDelay", client, delay); sendNetworkEventToPlayer("agrp.showItemActionDelay", client, delay);
} else { } else {
logToConsole(LOG_DEBUG, `[VRR.Client] Showing item switch delay to ${getPlayerDisplayForConsole(client)} (instant)`); logToConsole(LOG_DEBUG, `[VRR.Client] Showing item switch delay to ${getPlayerDisplayForConsole(client)} (instant)`);
playerItemActionDelayComplete(client); playerItemActionDelayComplete(client);
@@ -631,14 +631,14 @@ function showPlayerItemSwitchDelay(client, itemSlot) {
function sendPlayerDrunkEffect(client, amount, duration) { function sendPlayerDrunkEffect(client, amount, duration) {
logToConsole(LOG_DEBUG, `[VRR.Client] Setting drunk effect for ${getPlayerDisplayForConsole(client)} to ${amount} for ${duration} milliseconds`); logToConsole(LOG_DEBUG, `[VRR.Client] Setting drunk effect for ${getPlayerDisplayForConsole(client)} to ${amount} for ${duration} milliseconds`);
sendNetworkEventToPlayer("vrr.drunkEffect", client, amount, duration); sendNetworkEventToPlayer("agrp.drunkEffect", client, amount, duration);
} }
// =========================================================================== // ===========================================================================
function sendPlayerClearPedState(client) { function sendPlayerClearPedState(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Clearing ped state for ${getPlayerDisplayForConsole(client)}`); logToConsole(LOG_DEBUG, `[VRR.Client] Clearing ped state for ${getPlayerDisplayForConsole(client)}`);
sendNetworkEventToPlayer("vrr.clearPedState", client); sendNetworkEventToPlayer("agrp.clearPedState", client);
} }
// =========================================================================== // ===========================================================================
@@ -696,13 +696,13 @@ function playerDamagedByPlayer(client, damagerEntityName, weaponId, pedPiece, he
// =========================================================================== // ===========================================================================
function setPlayerCameraLookAt(client, cameraPosition, lookAtPosition) { function setPlayerCameraLookAt(client, cameraPosition, lookAtPosition) {
sendNetworkEventToPlayer("vrr.cameraLookAt", client, cameraPosition, lookAtPosition); sendNetworkEventToPlayer("agrp.cameraLookAt", client, cameraPosition, lookAtPosition);
} }
// =========================================================================== // ===========================================================================
function sendTimeMinuteDurationToPlayer(client, minuteDuration) { function sendTimeMinuteDurationToPlayer(client, minuteDuration) {
sendNetworkEventToPlayer("vrr.minuteDuration", client, minuteDuration); sendNetworkEventToPlayer("agrp.minuteDuration", client, minuteDuration);
} }
// =========================================================================== // ===========================================================================
@@ -745,13 +745,13 @@ function forcePlayerIntoSkinSelect(client) {
setPlayerDimension(client, getPlayerId(client) + 500); setPlayerDimension(client, getPlayerId(client) + 500);
} }
sendNetworkEventToPlayer("vrr.skinSelect", client, true); sendNetworkEventToPlayer("agrp.skinSelect", client, true);
} }
// =========================================================================== // ===========================================================================
function updatePlayerCash(client) { function updatePlayerCash(client) {
sendNetworkEventToPlayer("vrr.money", client, getPlayerCurrentSubAccount(client).cash); sendNetworkEventToPlayer("agrp.money", client, getPlayerCurrentSubAccount(client).cash);
} }
// =========================================================================== // ===========================================================================
@@ -769,7 +769,7 @@ function sendAllPoliceStationBlips(client) {
getColourByName("policeBlue"), getColourByName("policeBlue"),
]); ]);
} }
sendNetworkEventToPlayer("vrr.blips", client, tempBlips); sendNetworkEventToPlayer("agrp.blips", client, tempBlips);
} }
} }
@@ -788,7 +788,7 @@ function sendAllFireStationBlips(client) {
getColourByName("firefighterRed"), getColourByName("firefighterRed"),
]); ]);
} }
sendNetworkEventToPlayer("vrr.blips", client, tempBlips); sendNetworkEventToPlayer("agrp.blips", client, tempBlips);
} }
} }
@@ -807,7 +807,7 @@ function sendAllHospitalBlips(client) {
getColourByName("medicPink"), getColourByName("medicPink"),
]); ]);
} }
sendNetworkEventToPlayer("vrr.blips", client, tempBlips); sendNetworkEventToPlayer("agrp.blips", client, tempBlips);
} }
} }
@@ -826,7 +826,7 @@ function sendAllAmmunationBlips(client) {
0 0
]); ]);
} }
sendNetworkEventToPlayer("vrr.blips", client, tempBlips); sendNetworkEventToPlayer("agrp.blips", client, tempBlips);
} }
} }
@@ -845,7 +845,7 @@ function sendAllPayAndSprayBlips(client) {
0 0
]); ]);
} }
sendNetworkEventToPlayer("vrr.blips", client, tempBlips); sendNetworkEventToPlayer("agrp.blips", client, tempBlips);
} }
} }
@@ -864,26 +864,26 @@ function sendAllFuelStationBlips(client) {
getColourByName("burntOrange"), getColourByName("burntOrange"),
]); ]);
} }
sendNetworkEventToPlayer("vrr.blips", client, tempBlips); sendNetworkEventToPlayer("agrp.blips", client, tempBlips);
} }
} }
// =========================================================================== // ===========================================================================
function sendPlayerSetHealth(client, health) { function sendPlayerSetHealth(client, health) {
sendNetworkEventToPlayer("vrr.health", client, toInteger(health)); sendNetworkEventToPlayer("agrp.health", client, toInteger(health));
} }
// =========================================================================== // ===========================================================================
function sendPlayerSetArmour(client, armour) { function sendPlayerSetArmour(client, armour) {
sendNetworkEventToPlayer("vrr.armour", client, armour); sendNetworkEventToPlayer("agrp.armour", client, armour);
} }
// =========================================================================== // ===========================================================================
function playerFinishedSkinSelection(client, allowedSkinIndex) { function playerFinishedSkinSelection(client, allowedSkinIndex) {
sendNetworkEventToPlayer("vrr.skinSelect", client, false); sendNetworkEventToPlayer("agrp.skinSelect", client, false);
if (allowedSkinIndex == -1) { if (allowedSkinIndex == -1) {
messagePlayerAlert(client, "You canceled the skin change."); messagePlayerAlert(client, "You canceled the skin change.");
restorePlayerCamera(client); restorePlayerCamera(client);
@@ -935,34 +935,34 @@ function playerFinishedSkinSelection(client, allowedSkinIndex) {
// =========================================================================== // ===========================================================================
function sendPlayerChatScrollLines(client, amount) { function sendPlayerChatScrollLines(client, amount) {
sendNetworkEventToPlayer("vrr.chatScrollLines", client, amount); sendNetworkEventToPlayer("agrp.chatScrollLines", client, amount);
} }
// =========================================================================== // ===========================================================================
function sendPlayerChatAutoHideDelay(client, delay) { function sendPlayerChatAutoHideDelay(client, delay) {
sendNetworkEventToPlayer("vrr.chatAutoHideDelay", client, delay); sendNetworkEventToPlayer("agrp.chatAutoHideDelay", client, delay);
} }
// =========================================================================== // ===========================================================================
function playRadioStreamForPlayer(client, streamURL, loop = true, volume = 0, element = false) { function playRadioStreamForPlayer(client, streamURL, loop = true, volume = 0, element = false) {
logToConsole(LOG_DEBUG, `[VRR.Client] Forcing ${getPlayerDisplayForConsole(client)} to stream ${streamURL}`); logToConsole(LOG_DEBUG, `[VRR.Client] Forcing ${getPlayerDisplayForConsole(client)} to stream ${streamURL}`);
sendNetworkEventToPlayer("vrr.radioStream", client, streamURL, loop, volume, element); sendNetworkEventToPlayer("agrp.radioStream", client, streamURL, loop, volume, element);
} }
// =========================================================================== // ===========================================================================
function playAudioFileForPlayer(client, audioName, loop = true, volume = 0, element = false) { function playAudioFileForPlayer(client, audioName, loop = true, volume = 0, element = false) {
logToConsole(LOG_DEBUG, `[VRR.Client] Forcing ${getPlayerDisplayForConsole(client)} to play audio ${audioName}`); logToConsole(LOG_DEBUG, `[VRR.Client] Forcing ${getPlayerDisplayForConsole(client)} to play audio ${audioName}`);
sendNetworkEventToPlayer("vrr.audioFileStream", client, audioName, loop, volume); sendNetworkEventToPlayer("agrp.audioFileStream", client, audioName, loop, volume);
} }
// =========================================================================== // ===========================================================================
function stopRadioStreamForPlayer(client) { function stopRadioStreamForPlayer(client) {
logToConsole(LOG_DEBUG, `[VRR.Client] Forcing ${getPlayerDisplayForConsole(client)} to stop their radio stream`); logToConsole(LOG_DEBUG, `[VRR.Client] Forcing ${getPlayerDisplayForConsole(client)} to stop their radio stream`);
sendNetworkEventToPlayer("vrr.stopRadioStream", client); sendNetworkEventToPlayer("agrp.stopRadioStream", client);
} }
// =========================================================================== // ===========================================================================
@@ -970,65 +970,65 @@ function stopRadioStreamForPlayer(client) {
function setPlayerStreamingRadioVolume(client, volumeLevel, elementId = false) { function setPlayerStreamingRadioVolume(client, volumeLevel, elementId = false) {
getPlayerData(client).accountData.streamingRadioVolume = volumeLevel; getPlayerData(client).accountData.streamingRadioVolume = volumeLevel;
getPlayerData(client).streamingRadioElement = elementId; getPlayerData(client).streamingRadioElement = elementId;
sendNetworkEventToPlayer("vrr.radioVolume", client, volumeLevel, elementId); sendNetworkEventToPlayer("agrp.radioVolume", client, volumeLevel, elementId);
} }
// =========================================================================== // ===========================================================================
function setVehicleLightsState(vehicle, state) { function setVehicleLightsState(vehicle, state) {
setEntityData(vehicle, "vrr.lights", getVehicleData(vehicle).lights); setEntityData(vehicle, "agrp.lights", getVehicleData(vehicle).lights);
sendNetworkEventToPlayer("vrr.veh.lights", null, vehicle.id, state); sendNetworkEventToPlayer("agrp.veh.lights", null, vehicle.id, state);
} }
// =========================================================================== // ===========================================================================
function sendPlayerEnterPropertyKey(client, key) { function sendPlayerEnterPropertyKey(client, key) {
sendNetworkEventToPlayer("vrr.enterPropertyKey", client, key); sendNetworkEventToPlayer("agrp.enterPropertyKey", client, key);
} }
// =========================================================================== // ===========================================================================
function makePedPlayAnimation(ped, animationSlot, positionOffset) { function makePedPlayAnimation(ped, animationSlot, positionOffset) {
setEntityData(ped, "vrr.anim", animationSlot, true); setEntityData(ped, "agrp.anim", animationSlot, true);
sendNetworkEventToPlayer("vrr.anim", null, getPedForNetworkEvent(ped), animationSlot, positionOffset); sendNetworkEventToPlayer("agrp.anim", null, getPedForNetworkEvent(ped), animationSlot, positionOffset);
} }
// =========================================================================== // ===========================================================================
function makePedStopAnimation(ped) { function makePedStopAnimation(ped) {
removeEntityData(ped, "vrr.anim"); removeEntityData(ped, "agrp.anim");
sendNetworkEventToPlayer("vrr.stopAnim", null, getPedForNetworkEvent(ped)); sendNetworkEventToPlayer("agrp.stopAnim", null, getPedForNetworkEvent(ped));
} }
// =========================================================================== // ===========================================================================
function forcePedAnimation(ped, animationSlot, positionOffset = 0) { function forcePedAnimation(ped, animationSlot, positionOffset = 0) {
addEntityData(ped, "vrr.anim", animationSlot, true); addEntityData(ped, "agrp.anim", animationSlot, true);
sendNetworkEventToPlayer("vrr.forceAnim", null, getPedForNetworkEvent(ped), animationSlot, positionOffset); sendNetworkEventToPlayer("agrp.forceAnim", null, getPedForNetworkEvent(ped), animationSlot, positionOffset);
} }
// =========================================================================== // ===========================================================================
function hideAllPlayerGUI(client) { function hideAllPlayerGUI(client) {
sendNetworkEventToPlayer("vrr.hideAllGUI", client); sendNetworkEventToPlayer("agrp.hideAllGUI", client);
} }
// =========================================================================== // ===========================================================================
function requestClientInfo(client) { function requestClientInfo(client) {
sendNetworkEventToPlayer("vrr.clientInfo", client); sendNetworkEventToPlayer("agrp.clientInfo", client);
} }
// =========================================================================== // ===========================================================================
function updateInteriorLightsForPlayer(client, state) { function updateInteriorLightsForPlayer(client, state) {
sendNetworkEventToPlayer("vrr.interiorLights", client, state); sendNetworkEventToPlayer("agrp.interiorLights", client, state);
} }
// =========================================================================== // ===========================================================================
function forcePlayerToSyncElementProperties(client, element) { function forcePlayerToSyncElementProperties(client, element) {
sendNetworkEventToPlayer("vrr.syncElement", client, element.id); sendNetworkEventToPlayer("agrp.syncElement", client, element.id);
} }
// =========================================================================== // ===========================================================================
@@ -1037,7 +1037,7 @@ function sendPlayerPedPartsAndProps(client) {
let bodyParts = getPlayerCurrentSubAccount(client).bodyParts; let bodyParts = getPlayerCurrentSubAccount(client).bodyParts;
let bodyProps = getPlayerCurrentSubAccount(client).bodyProps; let bodyProps = getPlayerCurrentSubAccount(client).bodyProps;
sendNetworkEventToPlayer("vrr.ped", client, [bodyParts.hair, bodyParts.head, bodyParts.upper, bodyParts.lower], [bodyProps.hair, bodyProps.eyes, bodyProps.head, bodyProps.leftHand, bodyProps.rightHand, bodyProps.leftWrist, bodyProps.rightWrist, bodyParts.hip, bodyProps.leftFoot, bodyProps.rightFoot]); sendNetworkEventToPlayer("agrp.ped", client, [bodyParts.hair, bodyParts.head, bodyParts.upper, bodyParts.lower], [bodyProps.hair, bodyProps.eyes, bodyProps.head, bodyProps.leftHand, bodyProps.rightHand, bodyProps.leftWrist, bodyProps.rightWrist, bodyParts.hip, bodyProps.leftFoot, bodyProps.rightFoot]);
} }
// =========================================================================== // ===========================================================================
@@ -1062,7 +1062,7 @@ function updateAllInteriorVehiclesForPlayer(client, interior, dimension) {
function setPlayerBuyingVehicleState(client, state, vehicleId, position) { function setPlayerBuyingVehicleState(client, state, vehicleId, position) {
if (getGlobalConfig().useServerSideVehiclePurchaseCheck == false) { if (getGlobalConfig().useServerSideVehiclePurchaseCheck == false) {
sendNetworkEventToPlayer("vrr.vehBuyState", client, state, vehicleId, position); sendNetworkEventToPlayer("agrp.vehBuyState", client, state, vehicleId, position);
} }
} }
@@ -1077,37 +1077,37 @@ function receiveVehiclePurchaseStateUpdateFromClient(client, state) {
// =========================================================================== // ===========================================================================
function sendPlayerLogLevel(client, tempLogLevel = logLevel) { function sendPlayerLogLevel(client, tempLogLevel = logLevel) {
sendNetworkEventToPlayer("vrr.logLevel", client, tempLogLevel); sendNetworkEventToPlayer("agrp.logLevel", client, tempLogLevel);
} }
// ========================================================================== // ==========================================================================
function setPlayerInfiniteRun(client, state) { function setPlayerInfiniteRun(client, state) {
sendNetworkEventToPlayer("vrr.infiniteRun", client, state); sendNetworkEventToPlayer("agrp.infiniteRun", client, state);
} }
// ========================================================================== // ==========================================================================
function sendBusinessToPlayer(client, businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems) { function sendBusinessToPlayer(client, businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems) {
sendNetworkEventToPlayer("vrr.business", client, businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems); sendNetworkEventToPlayer("agrp.business", client, businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems);
} }
// ========================================================================== // ==========================================================================
function sendHouseToPlayer(client, houseId, description, entrancePosition, blipModel, pickupModel, hasInterior) { function sendHouseToPlayer(client, houseId, description, entrancePosition, blipModel, pickupModel, hasInterior) {
sendNetworkEventToPlayer("vrr.house", client, houseId, description, entrancePosition, blipModel, pickupModel, hasInterior); sendNetworkEventToPlayer("agrp.house", client, houseId, description, entrancePosition, blipModel, pickupModel, hasInterior);
} }
// ========================================================================== // ==========================================================================
function sendJobToPlayer(client, jobId, jobLocationId, name, position) { function sendJobToPlayer(client, jobId, jobLocationId, name, position) {
sendNetworkEventToPlayer("vrr.job", client, jobId, jobLocationId, name, position); sendNetworkEventToPlayer("agrp.job", client, jobId, jobLocationId, name, position);
} }
// ========================================================================== // ==========================================================================
function sendVehicleToPlayer(client, vehicleId, model, position, heading, colour1, colour2, colour3, colour4) { function sendVehicleToPlayer(client, vehicleId, model, position, heading, colour1, colour2, colour3, colour4) {
sendNetworkEventToPlayer("vrr.vehicle", client, vehicleId, model, position, heading, colour1, colour2, colour3, colour4); sendNetworkEventToPlayer("agrp.vehicle", client, vehicleId, model, position, heading, colour1, colour2, colour3, colour4);
} }
// ========================================================================== // ==========================================================================
@@ -1151,7 +1151,7 @@ function sendAllVehiclesToPlayer(client) {
// ========================================================================== // ==========================================================================
function makePlayerHoldObjectModel(client, modelIndex) { function makePlayerHoldObjectModel(client, modelIndex) {
sendNetworkEventToPlayer("vrr.holdObject", client, getPlayerData(client).ped, modelIndex); sendNetworkEventToPlayer("agrp.holdObject", client, getPlayerData(client).ped, modelIndex);
} }
// ========================================================================== // ==========================================================================
@@ -1163,44 +1163,44 @@ function receivePlayerPedNetworkId(client, pedId) {
// ========================================================================== // ==========================================================================
function requestPlayerPedNetworkId(client) { function requestPlayerPedNetworkId(client) {
sendNetworkEventToPlayer("vrr.playerPedId", client); sendNetworkEventToPlayer("agrp.playerPedId", client);
} }
// ========================================================================== // ==========================================================================
function setPlayerInCutsceneInterior(client, cutsceneName) { function setPlayerInCutsceneInterior(client, cutsceneName) {
getPlayerData(client).interiorCutscene = cutsceneName; getPlayerData(client).interiorCutscene = cutsceneName;
sendNetworkEventToPlayer("vrr.cutsceneInterior", client, cutsceneName); sendNetworkEventToPlayer("agrp.cutsceneInterior", client, cutsceneName);
} }
// ========================================================================== // ==========================================================================
function makePlayerPedSpeak(client, pedSpeechName) { function makePlayerPedSpeak(client, pedSpeechName) {
sendNetworkEventToPlayer("vrr.pedSpeak", client, pedSpeechName); sendNetworkEventToPlayer("agrp.pedSpeak", client, pedSpeechName);
} }
// ========================================================================== // ==========================================================================
function setPlayerAsCopState(client, state) { function setPlayerAsCopState(client, state) {
sendNetworkEventToPlayer("vrr.playerCop", client, state); sendNetworkEventToPlayer("agrp.playerCop", client, state);
} }
// ========================================================================== // ==========================================================================
function tellPlayerToSpawn(client, skinId, position) { function tellPlayerToSpawn(client, skinId, position) {
sendNetworkEventToPlayer("vrr.spawn", client, skinId, position); sendNetworkEventToPlayer("agrp.spawn", client, skinId, position);
} }
// ========================================================================== // ==========================================================================
function sendNameTagDistanceToClient(client, distance) { function sendNameTagDistanceToClient(client, distance) {
sendNetworkEventToPlayer("vrr.nameTagDistance", client, distance); sendNetworkEventToPlayer("agrp.nameTagDistance", client, distance);
} }
// ========================================================================== // ==========================================================================
function sendGPSBlipToPlayer(client, position, colour) { function sendGPSBlipToPlayer(client, position, colour) {
sendNetworkEventToPlayer("vrr.showGPSBlip", client, position, colour); sendNetworkEventToPlayer("agrp.showGPSBlip", client, position, colour);
} }
// ========================================================================== // ==========================================================================
@@ -1213,13 +1213,13 @@ function playerSelectedNewLocale(client, localeId) {
// ========================================================================== // ==========================================================================
function sendPlayerLocaleId(client, localeId) { function sendPlayerLocaleId(client, localeId) {
sendNetworkEventToPlayer("vrr.locale", client, localeId); sendNetworkEventToPlayer("agrp.locale", client, localeId);
} }
// ========================================================================== // ==========================================================================
function showLocaleChooserForPlayer(client) { function showLocaleChooserForPlayer(client) {
sendNetworkEventToPlayer("vrr.localeChooser", client); sendNetworkEventToPlayer("agrp.localeChooser", client);
} }
// ========================================================================== // ==========================================================================
@@ -1227,20 +1227,20 @@ function showLocaleChooserForPlayer(client) {
function sendPlayerLocaleStrings(client) { function sendPlayerLocaleStrings(client) {
let strings = getGlobalConfig().locale.sendStringsToClient; let strings = getGlobalConfig().locale.sendStringsToClient;
for (let i in strings) { for (let i in strings) {
sendNetworkEventToPlayer("vrr.localeString", client, strings[i], getLocaleString(client, strings[i])); sendNetworkEventToPlayer("agrp.localeString", client, strings[i], getLocaleString(client, strings[i]));
} }
} }
// ========================================================================== // ==========================================================================
function clearLocalPickupsForPlayer(client) { function clearLocalPickupsForPlayer(client) {
sendNetworkEventToPlayer("vrr.clearPickups", client); sendNetworkEventToPlayer("agrp.clearPickups", client);
} }
// ========================================================================== // ==========================================================================
function sendPlayerChatBoxTimeStampsState(client, state) { function sendPlayerChatBoxTimeStampsState(client, state) {
sendNetworkEventToPlayer("vrr.chatTimeStamps", client, state); sendNetworkEventToPlayer("agrp.chatTimeStamps", client, state);
} }
// ========================================================================== // ==========================================================================

6
scripts/server/npc.js
View File

@@ -468,11 +468,11 @@ function spawnNPC(npcIndex) {
let ped = createGamePed(npcData.skin, npcData.position, npcData.rotation.z); let ped = createGamePed(npcData.skin, npcData.position, npcData.rotation.z);
if (ped) { if (ped) {
getNPCData(npcIndex).ped = ped; getNPCData(npcIndex).ped = ped;
setEntityData(ped, "vrr.dataIndex", npcIndex, false); setEntityData(ped, "agrp.dataIndex", npcIndex, false);
if (npcData.animationName != "") { if (npcData.animationName != "") {
let animationId = getAnimationFromParams(npcData.animationName); let animationId = getAnimationFromParams(npcData.animationName);
if (animationId != false) { if (animationId != false) {
setEntityData(ped, "vrr.anim", animationId, true); setEntityData(ped, "agrp.anim", animationId, true);
} }
} }
setElementDimension(ped, npcData.dimension); setElementDimension(ped, npcData.dimension);
@@ -592,7 +592,7 @@ function toggleNPCLookAtClosestPlayerCommand(command, params, client) {
getNPCData(closestNPC).lookAtClosestPlayer = !getNPCData(closestNPC).lookAtClosestPlayer; getNPCData(closestNPC).lookAtClosestPlayer = !getNPCData(closestNPC).lookAtClosestPlayer;
getNPCData(closestNPC).needsSaved = true; getNPCData(closestNPC).needsSaved = true;
setEntityData(getNPCData(closestNPC).ped, "vrr.lookAtClosestPlayer", getNPCData(closestNPC).lookAtClosestPlayer, true); setEntityData(getNPCData(closestNPC).ped, "agrp.lookAtClosestPlayer", getNPCData(closestNPC).lookAtClosestPlayer, true);
forcePlayerToSyncElementProperties(null, getNPCData(closestNPC).ped); forcePlayerToSyncElementProperties(null, getNPCData(closestNPC).ped);
//messagePlayerSuccess(client, getLocaleString(client, "NPCLookAtClosestPlayerSet", `{ALTCOLOUR}${getNPCData(closestNPC).name}{MAINCOLOUR})); //messagePlayerSuccess(client, getLocaleString(client, "NPCLookAtClosestPlayerSet", `{ALTCOLOUR}${getNPCData(closestNPC).name}{MAINCOLOUR}));
} }

30
scripts/server/vehicle.js
View File

@@ -322,7 +322,7 @@ function spawnAllVehicles() {
for (let i in getServerData().vehicles) { for (let i in getServerData().vehicles) {
let vehicle = spawnVehicle(getServerData().vehicles[i]); let vehicle = spawnVehicle(getServerData().vehicles[i]);
getServerData().vehicles[i].vehicle = vehicle; getServerData().vehicles[i].vehicle = vehicle;
setEntityData(vehicle, "vrr.dataSlot", i, false); setEntityData(vehicle, "agrp.dataSlot", i, false);
setAllVehicleIndexes(); setAllVehicleIndexes();
} }
} }
@@ -336,7 +336,7 @@ function spawnAllVehicles() {
function getVehicleData(vehicle) { function getVehicleData(vehicle) {
if (getGame() != VRR_GAME_GTA_IV) { if (getGame() != VRR_GAME_GTA_IV) {
if (isVehicleObject(vehicle)) { if (isVehicleObject(vehicle)) {
let dataIndex = getEntityData(vehicle, "vrr.dataSlot"); let dataIndex = getEntityData(vehicle, "agrp.dataSlot");
if (typeof getServerData().vehicles[dataIndex] != "undefined") { if (typeof getServerData().vehicles[dataIndex] != "undefined") {
return getServerData().vehicles[dataIndex]; return getServerData().vehicles[dataIndex];
} }
@@ -502,7 +502,7 @@ function deleteVehicleCommand(command, params, client) {
return false; return false;
} }
let dataIndex = getEntityData(vehicle, "vrr.dataSlot"); let dataIndex = getEntityData(vehicle, "agrp.dataSlot");
let vehicleName = getVehicleName(vehicle); let vehicleName = getVehicleName(vehicle);
quickDatabaseQuery(`UPDATE veh_main SET veh_deleted = 1 WHERE veh_id = ${getVehicleData(vehicle).databaseId}`); quickDatabaseQuery(`UPDATE veh_main SET veh_deleted = 1 WHERE veh_id = ${getVehicleData(vehicle).databaseId}`);
@@ -540,7 +540,7 @@ function vehicleEngineCommand(command, params, client) {
getVehicleData(vehicle).engine = !getVehicleData(vehicle).engine; getVehicleData(vehicle).engine = !getVehicleData(vehicle).engine;
vehicle.engine = getVehicleData(vehicle).engine; vehicle.engine = getVehicleData(vehicle).engine;
setEntityData(vehicle, "vrr.engine", getVehicleData(vehicle).engine, true); setEntityData(vehicle, "agrp.engine", getVehicleData(vehicle).engine, true);
getVehicleData(vehicle).needsSaved = true; getVehicleData(vehicle).needsSaved = true;
@@ -666,7 +666,7 @@ function vehicleAdminLiveryCommand(command, params, client) {
getVehicleData(vehicle).livery = livery; getVehicleData(vehicle).livery = livery;
getVehicleData(vehicle).needsSaved = true; getVehicleData(vehicle).needsSaved = true;
setEntityData(vehicle, "vrr.livery", livery, true); setEntityData(vehicle, "agrp.livery", livery, true);
forcePlayerToSyncElementProperties(null, vehicle); forcePlayerToSyncElementProperties(null, vehicle);
meActionToNearbyPlayers(client, `sets the ${getVehicleName(vehicle)}'s livery/paintjob'`); meActionToNearbyPlayers(client, `sets the ${getVehicleName(vehicle)}'s livery/paintjob'`);
@@ -700,7 +700,7 @@ function buyVehicleCommand(command, params, client) {
getPlayerData(client).buyingVehicle = vehicle; getPlayerData(client).buyingVehicle = vehicle;
getVehicleData(vehicle).engine = true; getVehicleData(vehicle).engine = true;
vehicle.engine = true; vehicle.engine = true;
setEntityData(vehicle, "vrr.engine", getVehicleData(vehicle).engine, true); setEntityData(vehicle, "agrp.engine", getVehicleData(vehicle).engine, true);
getVehicleData(vehicle).needsSaved = true; getVehicleData(vehicle).needsSaved = true;
setPlayerBuyingVehicleState(client, VRR_VEHBUYSTATE_TESTDRIVE, vehicle.id, getVehiclePosition(vehicle)); setPlayerBuyingVehicleState(client, VRR_VEHBUYSTATE_TESTDRIVE, vehicle.id, getVehiclePosition(vehicle));
@@ -771,7 +771,7 @@ function rentVehicleCommand(command, params, client) {
// =========================================================================== // ===========================================================================
function enterVehicleAsPassengerCommand(command, params, client) { function enterVehicleAsPassengerCommand(command, params, client) {
sendNetworkEventToPlayer("vrr.passenger", client); sendNetworkEventToPlayer("agrp.passenger", client);
} }
// =========================================================================== // ===========================================================================
@@ -1452,7 +1452,7 @@ function respawnVehicle(vehicle) {
let newVehicle = spawnVehicle(vehicles[i]); let newVehicle = spawnVehicle(vehicles[i]);
vehicles[i].vehicle = newVehicle; vehicles[i].vehicle = newVehicle;
setEntityData(newVehicle, "vrr.dataSlot", i, false); setEntityData(newVehicle, "agrp.dataSlot", i, false);
} }
} }
@@ -1504,10 +1504,10 @@ function spawnVehicle(vehicleData) {
//setVehicleHealth(vehicle, 1000); //setVehicleHealth(vehicle, 1000);
repairVehicle(vehicle); repairVehicle(vehicle);
setEntityData(vehicle, "vrr.livery", vehicleData.livery, true); setEntityData(vehicle, "agrp.livery", vehicleData.livery, true);
setEntityData(vehicle, "vrr.upgrades", vehicleData.extras, true); setEntityData(vehicle, "agrp.upgrades", vehicleData.extras, true);
setEntityData(vehicle, "vrr.interior", vehicleData.interior, true); setEntityData(vehicle, "agrp.interior", vehicleData.interior, true);
setEntityData(vehicle, "vrr.engine", vehicleData.engine, true); setEntityData(vehicle, "agrp.engine", vehicleData.engine, true);
forcePlayerToSyncElementProperties(null, vehicle); forcePlayerToSyncElementProperties(null, vehicle);
@@ -1593,7 +1593,7 @@ function createNewDealershipVehicle(modelIndex, spawnPosition, spawnRotation, pr
tempVehicleData.dimension = dimension; tempVehicleData.dimension = dimension;
let slot = getServerData().vehicles.push(tempVehicleData); let slot = getServerData().vehicles.push(tempVehicleData);
setEntityData(vehicle, "vrr.dataSlot", slot - 1, false); setEntityData(vehicle, "agrp.dataSlot", slot - 1, false);
} }
// =========================================================================== // ===========================================================================
@@ -1618,7 +1618,7 @@ function createTemporaryVehicle(modelIndex, position, heading, interior = 0, dim
} }
let slot = getServerData().vehicles.push(tempVehicleData); let slot = getServerData().vehicles.push(tempVehicleData);
setEntityData(vehicle, "vrr.dataSlot", slot - 1, false); setEntityData(vehicle, "agrp.dataSlot", slot - 1, false);
return vehicle; return vehicle;
} }
@@ -1646,7 +1646,7 @@ function createPermanentVehicle(modelIndex, position, heading, interior = 0, dim
let slot = getServerData().vehicles.push(tempVehicleData); let slot = getServerData().vehicles.push(tempVehicleData);
if (areServerElementsSupported()) { if (areServerElementsSupported()) {
setEntityData(vehicle, "vrr.dataSlot", slot - 1, false); setEntityData(vehicle, "agrp.dataSlot", slot - 1, false);
} }