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

Lowercase d in Ids

Browse Source
This commit is contained in:
VortrexFTW
2020-09-08 22:05:18 -05:00
parent 18cdf172bc
commit 35d940c516
1 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
scripts/server/utilities.js
View File

@@ -169,7 +169,7 @@ let gameData = {
"User Track Player" "User Track Player"
] ]
], ],
vehicleModelIDStart: [ vehicleModelIdStart: [
0, 0,
90, // GTA III 90, // GTA III
130, // GTA Vice City 130, // GTA Vice City
@@ -2246,7 +2246,7 @@ function getMonthName(monthId) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getWeaponModelID(weaponId) { function getWeaponModelId(weaponId) {
let weaponModels = [ let weaponModels = [
[ 0 , 172 , 173 , 178 , 176 , 171 , 180 , 177 , 175 , 181 , 174 , 170 ], [ 0 , 172 , 173 , 178 , 176 , 171 , 180 , 177 , 175 , 181 , 174 , 170 ],
[], [],
@@ -2500,7 +2500,7 @@ function getJobPointsInRange(position, distance) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getWeaponName(weapon) { function getWeaponName(weapon) {
return weaponNames[game.game][weapon]; return weaponNames[server.game][weapon];
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -2535,47 +2535,55 @@ function isParamsInvalid(params) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function isValidVehicleModel(modelID) { function isValidVehicleModel(modelId) {
if(game.game == GAME_GTA_III) { if(server.game == GAME_GTA_III) {
if(modelID < 90 || modelID > 150) { if(modelId < 90 || modelId > 150) {
return false; return false;
} }
return true; return true;
} }
if(game.game == GAME_GTA_VC) { if(server.game == GAME_GTA_VC) {
if(modelID < 130 || modelID > 236) { if(modelId < 130 || modelId > 236) {
return false; return false;
} }
return true; return true;
} }
if(server.game == GAME_GTA_SA) {
return true;
}
if(server.game == GAME_GTA_IV) {
return true;
}
return false; return false;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getVehicleModelIDFromParams(params, gameID = game.game) { function getVehicleModelIdFromParams(params) {
if(isNaN(params)) { if(isNaN(params)) {
let modelID = getVehicleModelIDFromName(params); let modelId = getVehicleModelIdFromName(params);
if(!modelID) { if(!modelId) {
return gameData.vehicleModelIDStart[gameID]; return false;
} }
if(isValidVehicleModel(Number(modelID))) { if(isValidVehicleModel(Number(modelId))) {
return Number(modelID); return Number(modelId);
} }
return gameData.vehicleModelIDStart[gameID]; return false;
} else { } else {
if(isValidVehicleModel(Number(params))) { if(isValidVehicleModel(Number(params))) {
return Number(params); return Number(params);
} }
return gameData.vehicleModelIDStart[gameID]; return false;
} }
return false; return false;
@@ -2583,10 +2591,10 @@ function getVehicleModelIDFromParams(params, gameID = game.game) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getVehicleModelIDFromName(params, gameID = game.game) { function getVehicleModelIdFromName(params) {
for(let i in gameData.vehicleNames[gameID]) { for(let i in gameData.vehicleNames[server.game]) {
if(gameData.vehicleNames[gameID][i].toLowerCase().indexOf(params.toLowerCase()) != -1) { if(gameData.vehicleNames[server.game][i].toLowerCase().indexOf(params.toLowerCase()) != -1) {
return Number(i)+Number(gameData.vehicleModelIDStart[gameID]); return Number(i)+Number(gameData.vehicleModelIdStart[server.game]);
} }
} }
@@ -2613,9 +2621,9 @@ function doesWordStartWithVowel(word) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getVehicleNameFromModelID(modelID, gameID = game.game) { function getVehicleNameFromModelId(modelId) {
let modelIndex = modelID-gameData.vehicleModelIDStart[gameID]; let modelIndex = modelId-gameData.vehicleModelIdStart[server.game];
return gameData.vehicleNames[gameID][modelIndex]; return gameData.vehicleNames[server.game][modelIndex];
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -2631,9 +2639,9 @@ function replaceEmojiInString(message) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getSyncerFromID(syncerID) { function getSyncerFromId(syncerId) {
let clients = getClients(); let clients = getClients();
return clients[syncerID]; return clients[syncerId];
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -2681,9 +2689,9 @@ function getPlayerFromParams(params, isServer) {
} }
} }
} else { } else {
let playerID = Number(params) || 0; let playerId = Number(params) || 0;
if(typeof clients[playerID] != "undefined") { if(typeof clients[playerId] != "undefined") {
return clients[playerID].player; return clients[playerId].player;
} }
} }
} }
@@ -2711,9 +2719,9 @@ function getClientFromParams(params) {
} }
} }
} else { } else {
let clientID = Number(params) || 0; let clientId = Number(params) || 0;
if(typeof clients[clientID] != "undefined") { if(typeof clients[clientId] != "undefined") {
return clients[clientID]; return clients[clientId];
} }
} }
} }
@@ -2993,7 +3001,7 @@ function getRandom(min, max) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getArrayOfElementID(elements) { function getArrayOfElementId(elements) {
let tempArray = []; let tempArray = [];
for(let i in elements) { for(let i in elements) {
tempArray.push(elements[i].id); tempArray.push(elements[i].id);