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

Use game namespace and new const

Browse Source
This commit is contained in:
Vortrex
2021-11-16 02:00:54 -06:00
parent b8ee6efcd6
commit 2e753b4d87
12 changed files with 249 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/server/job.js
View File

@@ -203,7 +203,7 @@ function createAllJobBlips() {
logToConsole(LOG_DEBUG, `[VRR.Job] Spawning all job location blips ...`);
for(let i in getServerData().jobs) {
for(let j in getServerData().jobs[i].locations) {
getServerData().jobs[i].locations[j].blip = gta.createBlip((getServerData().jobs[i].blipModel!=0) ? getServerData().jobs[i].blipModel : 0, getServerData().jobs[i].locations[j].position, 2, getColourByName("yellow"));
getServerData().jobs[i].locations[j].blip = game.createBlip((getServerData().jobs[i].blipModel!=0) ? getServerData().jobs[i].blipModel : 0, getServerData().jobs[i].locations[j].position, 2, getColourByName("yellow"));
addToWorld(getServerData().jobs[i].locations[j].blip);
logToConsole(LOG_DEBUG, `[VRR.Job] Job '${getServerData().jobs[i].name}' location blip ${j} spawned!`);
}
@@ -220,7 +220,7 @@ function createAllJobPickups() {
if(getServerData().jobs[i].pickupModel != 0) {
for(let j in getServerData().jobs[i].locations) {
pickupCount++;
getServerData().jobs[i].locations[j].pickup = gta.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);
getServerData().jobs[i].locations[j].pickup.onAllDimensions = false;
setEntityData(getServerData().jobs[i].locations[j].pickup, "vrr.owner.type", VRR_PICKUP_JOB, false);
setEntityData(getServerData().jobs[i].locations[j].pickup, "vrr.owner.id", j, false);
@@ -1619,7 +1619,7 @@ function createJobLocationBlip(jobId, locationId) {
blipModelId = getJobData(jobId).blipModel;
}
getJobData(jobId).locations[locationId].blip = gta.createBlip(getJobData(jobId).locations[locationId].position, blipModelId, getColourByType("job"));
getJobData(jobId).locations[locationId].blip = game.createBlip(getJobData(jobId).locations[locationId].position, blipModelId, getColourByType("job"));
//getJobData(jobId).locations[locationId].blip.onAllDimensions = false;
getJobData(jobId).locations[locationId].blip.dimension = getJobData(jobId).locations[locationId].dimension;
addToWorld(getJobData(jobId).locations[locationId].blip);

2
scripts/server/timers.js
View File

@@ -13,7 +13,7 @@ let serverTimers = {};
function updateTimeRule() {
if(isTimeSupported()) {
server.setRule("Time", makeReadableTime(gta.time.hour, gta.time.minute));
server.setRule("Time", makeReadableTime(game.time.hour, game.time.minute));
}
}

167
scripts/server/utilities.js
View File

@@ -448,10 +448,10 @@ function getSpeedFromVelocity(vel) {
// ===========================================================================
function isValidSkin(skin, game = GAME_GTA_III) {
if(game == GAME_GTA_III) {
function isValidSkin(skin, game = VRR_GAME_GTA_III) {
if(game == VRR_GAME_GTA_III) {
return true;
} else if(game == GAME_GTA_VC) {
} else if(game == VRR_GAME_GTA_VC) {
switch(skin) {
case 111:
return false;
@@ -715,6 +715,21 @@ function getAccentFromParams(params) {
// ===========================================================================
function getLocaleNameFromParams(params) {
let locales = getLocales();
if(isNaN(params)) {
for(let i in locales) {
if(toLowerCase(i).indexOf(toLowerCase(params)) != -1) {
return locales[i];
}
}
}
return false;
}
// ===========================================================================
function getWeatherFromParams(params) {
if(isNaN(params)) {
for(let i in getGameData().weatherNames[getServerGame()]) {
@@ -895,7 +910,7 @@ function getItemTypeFromParams(params) {
// ===========================================================================
function clearChatBox(client) {
//gta.messages.clear();
//game.messages.clear();
for(let i = 0; i <= 20; i++) {
messageClient(" ", client, COLOUR_WHITE);
}
@@ -903,58 +918,6 @@ function clearChatBox(client) {
// ===========================================================================
function getSkinIdFromParams(params, gameId = getServerGame()) {
if(isNaN(params)) {
return getSkinIdFromName(params, gameId);
} else {
params = toInteger(params);
if(gameId == GAME_GTA_IV || gameId == GAME_GTA_IV_EFLC) {
return getGameData().gtaivSkinModels[params][1];
} else {
return params;
}
}
return false;
}
// ===========================================================================
function getSkinNameFromId(modelId, gameId = getServerGame()) {
if(gameId >= GAME_GTA_IV) {
for(let i in getGameData().gtaivSkinModels) {
if(getGameData().gtaivSkinModels[i][1] == modelId) {
return getGameData().gtaivSkinModels[i][0];
}
}
} else {
let modelIndex = modelId;
return getGameData().skinNames[gameId][modelIndex];
}
}
// ===========================================================================
function getSkinIdFromName(params, gameId = getServerGame()) {
if(gameId == GAME_GTA_IV || gameId == GAME_GTA_IV_EFLC) {
for(let i in gtaivSkinModels) {
if(toLowerCase(getGameData().gtaivSkinModels[i][0]).indexOf(toLowerCase(params)) != -1) {
return getGameData().gtaivSkinModels[i][1];
}
}
} else {
for(let i in getGameData().skinNames[gameId]) {
if(toLowerCase(getGameData().skinNames[gameId][i]).indexOf(toLowerCase(params)) != -1) {
return i;
}
}
}
return false;
}
// ===========================================================================
function getClosestHospital(position) {
let closest = 0;
for(let i in getGameData().hospitals[getServerGame()]) {
@@ -1320,72 +1283,6 @@ function getPlayerFromParams(params) {
// ===========================================================================
function getPosToRightOfPos(pos, angle, distance) {
let x = (pos.x+((Math.cos((-angle+1.57)+(Math.PI/2)))*distance));
let y = (pos.y+((Math.sin((-angle+1.57)+(Math.PI/2)))*distance));
let rightPos = toVector3(x, y, pos.z);
return rightPos;
}
// ===========================================================================
function getPosToLeftOfPos(pos, angle, distance) {
let x = (pos.x+((Math.cos((angle+1.57)+(Math.PI/2)))*distance));
let y = (pos.y+((Math.sin((angle+1.57)+(Math.PI/2)))*distance));
let leftPos = toVector3(x, y, pos.z);
return leftPos;
}
// ===========================================================================
function getPosInFrontOfPos(pos, angle, distance) {
let x = (pos.x+((Math.cos(angle+(Math.PI/2)))*distance));
let y = (pos.y+((Math.sin(angle+(Math.PI/2)))*distance));
let z = pos.z;
return toVector3(x, y, z);
}
// ===========================================================================
function getPosBehindPos(pos, angle, distance) {
let x = (pos.x+((Math.cos(angle-(Math.PI/2)))*distance));
let y = (pos.y+((Math.sin(angle-(Math.PI/2)))*distance));
let z = pos.z;
return toVector3(x, y, z);
}
// ===========================================================================
function getPosAbovePos(pos, distance) {
return toVector3(pos.x, pos.y, pos.z+distance);
}
// ===========================================================================
function getPosBelowPos(pos, distance) {
return toVector3(pos.x, pos.y, pos.z-distance);
}
// ===========================================================================
function applyOffsetToPos(position, position2) {
return toVector3(position.x+position2.x, position.y+position2.y, position.z+position2.z);
}
// ===========================================================================
function getRandom(min, max) {
return Math.floor(Math.random() * (toInteger(max) - toInteger(min) + 1)) + toInteger(min)
}
// ===========================================================================
function getArrayOfElementId(elements) {
let tempArray = [];
for(let i in elements) {
@@ -1640,8 +1537,30 @@ async function triggerWebHook(webHookURL, payloadData) {
// ===========================================================================
function getGameName(gameId = getGame()) {
return getGameData().gameNames[gameId];
function clearTemporaryVehicles() {
let vehicles = getVehicles();
for(let i in vehicles) {
if(vehicles[i].owner == -1) {
if(!getVehicleData(vehicles[i])) {
destroyElement(vehicles[i]);
}
}
}
}
// ===========================================================================
function clearTemporaryPeds() {
let peds = getPeds();
for(let i in peds) {
if(peds[i].owner == -1) {
if(peds[i].isType != ELEMENT_PLAYER) {
if(!getNPCData(peds[i])) {
destroyElement(peds[i]);
}
}
}
}
}
// ===========================================================================