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

Renamed VW util to dimension

Browse Source
This commit is contained in:
Vortrex
2021-01-09 22:39:25 -06:00
parent 63f6c2e935
commit 8a6af35837
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/server/misc.js
View File

@@ -133,7 +133,7 @@ function enterExitPropertyCommand(command, params, client) {
setTimeout(function() { setTimeout(function() {
setPlayerPosition(client, inHouse.entrancePosition); setPlayerPosition(client, inHouse.entrancePosition);
setPlayerHeading(client, inHouse.entranceRotation); setPlayerHeading(client, inHouse.entranceRotation);
setPlayerVirtualWorld(client, inHouse.entranceDimension); setPlayerDimension(client, inHouse.entranceDimension);
setPlayerInterior(client, inHouse.entranceInterior); setPlayerInterior(client, inHouse.entranceInterior);
setTimeout(function() { setTimeout(function() {
fadeCamera(client, true, 1.0); fadeCamera(client, true, 1.0);
@@ -161,7 +161,7 @@ function enterExitPropertyCommand(command, params, client) {
setTimeout(function() { setTimeout(function() {
setPlayerPosition(client, inBusiness.entrancePosition); setPlayerPosition(client, inBusiness.entrancePosition);
setPlayerHeading(client, inBusiness.entranceRotation); setPlayerHeading(client, inBusiness.entranceRotation);
setPlayerVirtualWorld(client, inBusiness.entranceDimension); setPlayerDimension(client, inBusiness.entranceDimension);
setPlayerInterior(client, inBusiness.entranceInterior); setPlayerInterior(client, inBusiness.entranceInterior);
setTimeout(function() { setTimeout(function() {
fadeCamera(client, true, 1.0); fadeCamera(client, true, 1.0);
@@ -199,7 +199,7 @@ function enterExitPropertyCommand(command, params, client) {
setTimeout(function() { setTimeout(function() {
setPlayerPosition(client, closestBusiness.exitPosition); setPlayerPosition(client, closestBusiness.exitPosition);
setPlayerHeading(client, closestBusiness.exitRotation); setPlayerHeading(client, closestBusiness.exitRotation);
setPlayerVirtualWorld(client, closestBusiness.exitDimension); setPlayerDimension(client, closestBusiness.exitDimension);
setPlayerInterior(client, closestBusiness.exitInterior); setPlayerInterior(client, closestBusiness.exitInterior);
setTimeout(function() { setTimeout(function() {
fadeCamera(client, true, 1.0); fadeCamera(client, true, 1.0);
@@ -233,7 +233,7 @@ function enterExitPropertyCommand(command, params, client) {
setTimeout(function() { setTimeout(function() {
setPlayerPosition(client, closestHouse.exitPosition); setPlayerPosition(client, closestHouse.exitPosition);
setPlayerHeading(client, closestHouse.exitRotation); setPlayerHeading(client, closestHouse.exitRotation);
setPlayerVirtualWorld(client, closestHouse.exitDimension); setPlayerDimension(client, closestHouse.exitDimension);
setPlayerInterior(client, closestHouse.exitInterior); setPlayerInterior(client, closestHouse.exitInterior);
setTimeout(function() { setTimeout(function() {
fadeCamera(client, true, 1.0); fadeCamera(client, true, 1.0);

20
scripts/server/moderation.js
View File

@@ -226,7 +226,7 @@ function gotoVehicleCommand(command, params, client) {
setTimeout(function() { setTimeout(function() {
setPlayerPosition(client, getPosAbovePos(getVehiclePosition(vehicle), 3.0)); setPlayerPosition(client, getPosAbovePos(getVehiclePosition(vehicle), 3.0));
setPlayerInterior(client, 0); setPlayerInterior(client, 0);
setPlayerVirtualWorld(client, vehicle.dimension); setPlayerDimension(client, vehicle.dimension);
}, 500); }, 500);
messagePlayerSuccess(client, `You teleported to a [#CC22CC]${getVehicleName(vehicle)} [#AAAAAA](ID ${vehicle.id})`); messagePlayerSuccess(client, `You teleported to a [#CC22CC]${getVehicleName(vehicle)} [#AAAAAA](ID ${vehicle.id})`);
@@ -251,7 +251,7 @@ function gotoBusinessCommand(command, params, client) {
setTimeout(function() { setTimeout(function() {
setPlayerPosition(client, getBusinessData(businessId).entrancePosition); setPlayerPosition(client, getBusinessData(businessId).entrancePosition);
setPlayerInterior(client, getBusinessData(businessId).entranceInterior); setPlayerInterior(client, getBusinessData(businessId).entranceInterior);
setPlayerVirtualWorld(client, getBusinessData(businessId).entranceDimension); setPlayerDimension(client, getBusinessData(businessId).entranceDimension);
}, 500); }, 500);
messagePlayerSuccess(client, `You teleported to business [#0099FF]${getBusinessData(businessId).name} [#AAAAAA](ID ${businessId})`); messagePlayerSuccess(client, `You teleported to business [#0099FF]${getBusinessData(businessId).name} [#AAAAAA](ID ${businessId})`);
@@ -276,7 +276,7 @@ function gotoHouseCommand(command, params, client) {
setTimeout(function() { setTimeout(function() {
setPlayerPosition(client, getHouseData(houseId).entrancePosition); setPlayerPosition(client, getHouseData(houseId).entrancePosition);
setPlayerInterior(client, getHouseData(houseId).entranceInterior); setPlayerInterior(client, getHouseData(houseId).entranceInterior);
setPlayerVirtualWorld(client, getHouseData(houseId).entranceDimension); setPlayerDimension(client, getHouseData(houseId).entranceDimension);
}, 500); }, 500);
messagePlayerSuccess(client, `You teleported to business [#0099FF]${getHouseData(houseId).description} [#AAAAAA](ID ${houseId})`); messagePlayerSuccess(client, `You teleported to business [#0099FF]${getHouseData(houseId).description} [#AAAAAA](ID ${houseId})`);
@@ -309,7 +309,7 @@ function gotoJobLocationCommand(command, params, client) {
client.player.velocity = toVector3(0.0, 0.0, 0.0); client.player.velocity = toVector3(0.0, 0.0, 0.0);
setPlayerPosition(client, getJobData(jobId).locations[jobLocationId].position); setPlayerPosition(client, getJobData(jobId).locations[jobLocationId].position);
setPlayerInterior(client, getJobData(jobId).locations[jobLocationId].interior); setPlayerInterior(client, getJobData(jobId).locations[jobLocationId].interior);
setPlayerVirtualWorld(client, getJobData(jobId).locations[jobLocationId].dimension); setPlayerDimension(client, getJobData(jobId).locations[jobLocationId].dimension);
messagePlayerSuccess(client, `You teleported to location [#AAAAAA]${jobLocationId} [#FFFFFF]for the [#AAAAAA]${getJobData(jobId).name} [#FFFFFF]job`); messagePlayerSuccess(client, `You teleported to location [#AAAAAA]${jobLocationId} [#FFFFFF]for the [#AAAAAA]${getJobData(jobId).name} [#FFFFFF]job`);
} }
@@ -327,7 +327,7 @@ function gotoPositionCommand(command, params, client) {
let y = splitParams[1] || getPlayerPosition(client).y; let y = splitParams[1] || getPlayerPosition(client).y;
let z = splitParams[2] || getPlayerPosition(client).z; let z = splitParams[2] || getPlayerPosition(client).z;
let int = splitParams[3] || getPlayerInterior(client); let int = splitParams[3] || getPlayerInterior(client);
let vw = splitParams[4] || getPlayerVirtualWorld(client); let vw = splitParams[4] || getPlayerDimension(client);
let newPosition = toVector3(Number(x), Number(y), Number(z)); let newPosition = toVector3(Number(x), Number(y), Number(z));
@@ -336,7 +336,7 @@ function gotoPositionCommand(command, params, client) {
client.player.velocity = toVector3(0.0, 0.0, 0.0); client.player.velocity = toVector3(0.0, 0.0, 0.0);
setPlayerPosition(client, newPosition); setPlayerPosition(client, newPosition);
setPlayerInterior(client, Number(int)); setPlayerInterior(client, Number(int));
setPlayerVirtualWorld(client, Number(vw)); setPlayerDimension(client, Number(vw));
messagePlayerSuccess(client, `You teleported to coordinates [#AAAAAA]${x}, ${y}, ${z} with interior ${int} and dimension ${vw}`); messagePlayerSuccess(client, `You teleported to coordinates [#AAAAAA]${x}, ${y}, ${z} with interior ${int} and dimension ${vw}`);
} }
@@ -460,12 +460,12 @@ function playerVirtualWorldCommand(command, params, client) {
} }
if(getParamsCount(params, " ") == 1) { if(getParamsCount(params, " ") == 1) {
messagePlayerInfo(client, `[#AAAAAA]${targetClient.name}'s [#FFFFFF]virtual world is [#AAAAAA]${getPlayerVirtualWorld(targetClient)}`); messagePlayerInfo(client, `[#AAAAAA]${targetClient.name}'s [#FFFFFF]virtual world is [#AAAAAA]${getPlayerDimension(targetClient)}`);
return false; return false;
} }
let dimensionId = splitParams[1]; let dimensionId = splitParams[1];
setPlayerVirtualWorld(targetClient, Number(dimensionId)); setPlayerDimension(targetClient, Number(dimensionId));
messagePlayerSuccess(client, `You set [#AAAAAA]${targetClient.name}'s [#FFFFFF]virtual world to [#AAAAAA]${dimensionId}`); messagePlayerSuccess(client, `You set [#AAAAAA]${targetClient.name}'s [#FFFFFF]virtual world to [#AAAAAA]${dimensionId}`);
} }
@@ -490,13 +490,13 @@ function getPlayerCommand(command, params, client) {
if(isPlayerInAnyBusiness(client)) { if(isPlayerInAnyBusiness(client)) {
let businessData = getBusinessData(getPlayerBusiness(client)); let businessData = getBusinessData(getPlayerBusiness(client));
setPlayerInterior(targetClient, businessData.exitInterior); setPlayerInterior(targetClient, businessData.exitInterior);
setPlayerVirtualWorld(targetClient, businessData.exitDimension); setPlayerDimension(targetClient, businessData.exitDimension);
} }
if(isPlayerInAnyHouse(client)) { if(isPlayerInAnyHouse(client)) {
let houseData = getHouseData(getPlayerHouse(client)); let houseData = getHouseData(getPlayerHouse(client));
setPlayerInterior(targetClient, houseData.exitInterior); setPlayerInterior(targetClient, houseData.exitInterior);
setPlayerVirtualWorld(client, houseData.exitDimension); setPlayerDimension(client, houseData.exitDimension);
} }
messagePlayerSuccess(client, `You teleported [#AAAAAA]${targetClient.name} [#FFFFFF]to you.`); messagePlayerSuccess(client, `You teleported [#AAAAAA]${targetClient.name} [#FFFFFF]to you.`);

16
scripts/server/native.js
View File

@@ -74,7 +74,7 @@ function getPlayerVehicle(client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getPlayerVirtualWorld(client) { function getPlayerDimension(client) {
return client.player.dimension; return client.player.dimension;
} }
@@ -90,7 +90,7 @@ function getPlayerInterior(client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function setPlayerVirtualWorld(client, dimension) { function setPlayerDimension(client, dimension) {
client.player.dimension = dimension; client.player.dimension = dimension;
} }
@@ -196,4 +196,16 @@ function getElementSyncer(element) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function givePlayerWeapon(client, weaponId, ammo, active) {
triggerNetworkEvent("ag.giveWeapon", client, weaponId, ammo, active);
}
// ---------------------------------------------------------------------------
function clearPlayerWeapons(client) {
triggerNetworkEvent("ag.clearWeapons", client);
}
// ---------------------------------------------------------------------------
//triggerNetworkEvent("ag.veh.engine", getElementSyncer(getPlayerVehicle(client)), getVehicleForNetworkEvent(vehicle), getVehicleData(vehicle).engine); //triggerNetworkEvent("ag.veh.engine", getElementSyncer(getPlayerVehicle(client)), getVehicleForNetworkEvent(vehicle), getVehicleData(vehicle).engine);