From 7e53994a5a4b5a144b07f8165ecb04fa68ba5263 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sun, 15 May 2022 04:14:38 -0500 Subject: [PATCH] Use curly brackets on switch case blocks --- scripts/client/animation.js | 15 ++++-- scripts/client/startup.js | 26 +++++++--- scripts/server/gui.js | 29 ++++++++---- scripts/server/item.js | 94 ++++++++++++++++++++++--------------- 4 files changed, 105 insertions(+), 59 deletions(-) diff --git a/scripts/client/animation.js b/scripts/client/animation.js index b6378d0f..1afad949 100644 --- a/scripts/client/animation.js +++ b/scripts/client/animation.js @@ -19,40 +19,45 @@ function makePedPlayAnimation(pedId, animationSlot, positionOffset) { let freezePlayer = false; switch(animationData.moveType) { - case VRR_ANIMMOVE_FORWARD: + case VRR_ANIMMOVE_FORWARD: { setElementCollisionsEnabled(ped, false); if(ped.isSyncer) { setElementPosition(ped, getPosInFrontOfPos(getElementPosition(pedId), fixAngle(getElementHeading(pedId)), positionOffset)); } freezePlayer = true; break; + } - case VRR_ANIMMOVE_BACK: + case VRR_ANIMMOVE_BACK: { setElementCollisionsEnabled(pedId, false); if(ped.isSyncer) { setElementPosition(pedId, getPosBehindPos(getElementPosition(pedId), fixAngle(getElementHeading(pedId)), positionOffset)); } freezePlayer = true; break; + } - case VRR_ANIMMOVE_LEFT: + case VRR_ANIMMOVE_LEFT: { setElementCollisionsEnabled(pedId, false); if(ped.isSyncer) { setElementPosition(pedId, getPosToLeftOfPos(getElementPosition(pedId), fixAngle(getElementHeading(pedId)), positionOffset)); } freezePlayer = true; break; + } - case VRR_ANIMMOVE_RIGHT: + case VRR_ANIMMOVE_RIGHT: { setElementCollisionsEnabled(pedId, false); if(ped.isSyncer) { setElementPosition(pedId, getPosToRightOfPos(getElementPosition(pedId), fixAngle(getElementHeading(pedId)), positionOffset)); } freezePlayer = true; break; + } - default: + default: { break; + } } if(getGame() < VRR_GAME_GTA_IV) { diff --git a/scripts/client/startup.js b/scripts/client/startup.js index b7d41523..1b0ce9ee 100644 --- a/scripts/client/startup.js +++ b/scripts/client/startup.js @@ -26,7 +26,7 @@ function initClientScripts() { function setUpInitialGame() { switch(getGame()) { - case VRR_GAME_GTA_III: + case [VRR_GAME_GTA_III]: { game.SET_PLAYER_NEVER_GETS_TIRED(game.GET_PLAYER_ID(), 0); game.setGameStat(STAT_PROGRESSMADE, 9999); game.setGameStat(STAT_TOTALPROGRESSINGAME, 9999); @@ -35,8 +35,9 @@ function setUpInitialGame() { game.onMission = true; // Disables taxi/vigilante/etc and other start mission triggers SetStandardControlsEnabled(true); // Provided by mouse camera script (mousecam.js) break; + } - case VRR_GAME_GTA_VC: + case [VRR_GAME_GTA_VC]: { game.SET_PLAYER_NEVER_GETS_TIRED(game.GET_PLAYER_ID(), 0); game.setGameStat(STAT_PROGRESSMADE, 9999); game.setGameStat(STAT_TOTALPROGRESSINGAME, 9999); @@ -69,8 +70,9 @@ function setUpInitialGame() { game.onMission = true; // Disables taxi/vigilante/etc and other start mission triggers SetStandardControlsEnabled(true); // Provided by mouse camera script (mousecam.js) break; + } - case VRR_GAME_GTA_SA: + case [VRR_GAME_GTA_SA]: { game.setGameStat(STAT_WEAPONTYPE_PISTOL_SKILL, 400); game.setGameStat(STAT_WEAPONTYPE_PISTOL_SILENCED_SKILL, 400); game.setGameStat(STAT_WEAPONTYPE_DESERT_EAGLE_SKILL, 400); @@ -99,8 +101,9 @@ function setUpInitialGame() { game.setDefaultInteriors(false); // Disables default yellow cone at doors for entering places in singleplayer game.onMission = true; // Disables taxi/vigilante/etc and other start mission triggers break; + } - case VRR_GAME_GTA_IV: + case [VRR_GAME_GTA_IV]: { natives.allowEmergencyServices(false); natives.setCreateRandomCops(true); natives.setMaxWantedLevel(0); @@ -163,16 +166,27 @@ function setUpInitialGame() { // Some last steps //natives.loadAllObjectsNow(); break; + } - case VRR_GAME_MAFIA_ONE: + case VRR_GAME_MAFIA_ONE: { game.mapEnabled = false; game.setTrafficEnabled(false); break; + } } } // =========================================================================== +function initClient() { + loadLocaleConfig(); + loadAllLocaleStrings(); + + setUpInitialGame(); +} + +// =========================================================================== + initClientScripts(); -// =========================================================================== \ No newline at end of file +// =========================================================================== diff --git a/scripts/server/gui.js b/scripts/server/gui.js index b912ccb1..fa814c6c 100644 --- a/scripts/server/gui.js +++ b/scripts/server/gui.js @@ -58,11 +58,12 @@ function playerPromptAnswerYes(client) { logToConsole(LOG_DEBUG, `[VRR.GUI] ${getPlayerDisplayForConsole(client)} answered YES to their prompt (${getPlayerData(client).promptType})`); switch(getPlayerData(client).promptType) { - case VRR_PROMPT_CREATEFIRSTCHAR: + case VRR_PROMPT_CREATEFIRSTCHAR: { showPlayerNewCharacterGUI(client); break; + } - case VRR_PROMPT_BIZORDER: + case VRR_PROMPT_BIZORDER: { if(getPlayerData(client).businessOrderAmount > 0) { if(getBusinessData(getPlayerData(client).businessOrderBusiness).till < getPlayerData(client).businessOrderCost) { logToConsole(LOG_DEBUG, `[VRR.GUI] ${getPlayerDisplayForConsole(client)} failed to order ${getPlayerData(client).businessOrderAmount} ${getItemTypeData(getPlayerData(client).businessOrderItem).name} at ${getPlayerData(client).businessOrderCost/getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness).name} (Reason: Not enough money in business till)`); @@ -87,8 +88,9 @@ function playerPromptAnswerYes(client) { showPlayerErrorGUI(client, ``, `Business Order Canceled`); } break; + } - case VRR_PROMPT_GIVEVEHTOCLAN: + case VRR_PROMPT_GIVEVEHTOCLAN: { if(!isPlayerInAnyVehicle(client)) { messagePlayerError(client, getLocaleString(client, "MustBeInVehicle")); return false; @@ -114,8 +116,9 @@ function playerPromptAnswerYes(client) { messagePlayerSuccess(client, getLocaleString(client, "GaveVehicleToClan", getVehicleName(getPlayerVehicle(client)))); //messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}set their {vehiclePurple}${getVehicleName(vehicle)} {MAINCOLOUR}owner to the {clanOrange}${getClanData(clanId).name} {MAINCOLOUR}clan`); break; + } - case VRR_PROMPT_GIVEHOUSETOCLAN: + case VRR_PROMPT_GIVEHOUSETOCLAN: { let houseId = getPlayerHouse(client); if(!houseId) { messagePlayerError(client, getLocaleString(client, "InvalidHouse")); @@ -137,8 +140,9 @@ function playerPromptAnswerYes(client) { messagePlayerSuccess(client, getLocaleString(client, "GaveHouseToClan")); //messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}set their {vehiclePurple}${getVehicleName(vehicle)} {MAINCOLOUR}owner to the {clanOrange}${getClanData(clanId).name} {MAINCOLOUR}clan`); break; + } - case VRR_PROMPT_GIVEBIZTOCLAN: + case VRR_PROMPT_GIVEBIZTOCLAN: { let businessId = getPlayerBusiness(client); if(!businessId) { messagePlayerError(client, getLocaleString(client, "InvalidBusiness")); @@ -160,9 +164,10 @@ function playerPromptAnswerYes(client) { messagePlayerSuccess(client, getLocaleString(client, "GaveBusinessToClan")); //messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}set their {vehiclePurple}${getVehicleName(vehicle)} {MAINCOLOUR}owner to the {clanOrange}${getClanData(clanId).name} {MAINCOLOUR}clan`); break; + } - case VRR_PROMPT_BUYHOUSE: - houseId = getPlayerHouse(client); + case VRR_PROMPT_BUYHOUSE: { + let houseId = getPlayerHouse(client); if(!houseId) { messagePlayerError(client, getLocaleString(client, "InvalidHouse")); return false; @@ -186,9 +191,10 @@ function playerPromptAnswerYes(client) { messagePlayerSuccess(client, `You are now the owner of {houseGreen}${getHouseData(houseId).description}`); break; + } - case VRR_PROMPT_BUYBIZ: - businessId = getPlayerBusiness(client); + case VRR_PROMPT_BUYBIZ: { + let businessId = getPlayerBusiness(client); if(!businessId) { messagePlayerError(client, getLocaleString(client, "InvalidBusiness")); return false; @@ -212,9 +218,12 @@ function playerPromptAnswerYes(client) { messagePlayerSuccess(client, `You are now the owner of {businessBlue}${getBusinessData(businessId).name}`); break; + } - default: + default: { + submitBugReport(client, `[AUTOMATED REPORT] Unknown prompt type: ${getPlayerData(client).promptType}`); break; + } } getPlayerData(client).promptType = VRR_PROMPT_NONE; diff --git a/scripts/server/item.js b/scripts/server/item.js index ddfc5a7d..248bab5e 100644 --- a/scripts/server/item.js +++ b/scripts/server/item.js @@ -717,12 +717,6 @@ function setItemTypeUseValueCommand(command, params, client) { // =========================================================================== function playerUseItem(client, hotBarSlot) { - let closestPlayer; - let tempUseValue; - - let vehicle; - let fuelPump; - let itemIndex = getPlayerData(client).hotBarItems[hotBarSlot]; if(itemIndex == -1) { @@ -730,12 +724,13 @@ function playerUseItem(client, hotBarSlot) { } switch(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useType) { - case VRR_ITEM_USETYPE_SKIN: + case VRR_ITEM_USETYPE_SKIN: { getPlayerData(client).itemActionItem = itemIndex; forcePlayerIntoSkinSelect(client); break; + } - case VRR_ITEM_USETYPE_WEAPON: + case VRR_ITEM_USETYPE_WEAPON: { for(let i in getPlayerData(client).hotBarItems) { if(getPlayerData(client).hotBarItems[i] != -1) { if(getItemData(getPlayerData(client).hotBarItems[i]) != false) { @@ -753,16 +748,19 @@ function playerUseItem(client, hotBarSlot) { } messagePlayerError(client, `You don't have any ammo to load into your ${getItemTypeData(getItemData(itemIndex).itemTypeIndex).name}!`); break; + } - case VRR_ITEM_USETYPE_AMMO_CLIP: + case VRR_ITEM_USETYPE_AMMO_CLIP: { messagePlayerError(client, `To load this ammo into a weapon, equip the weapon and ${(doesPlayerHaveKeyBindForCommand(client, "use")) ? `press {ALTCOLOUR}${toUpperCase(getKeyNameFromId(getPlayerKeyBindForCommand(client, "use").key))}` : `{ALTCOLOUR}/use`}`); break; + } - case VRR_ITEM_USETYPE_STORAGE: + case VRR_ITEM_USETYPE_STORAGE: { showItemInventoryToPlayer(client, itemIndex); break; + } - case VRR_ITEM_USETYPE_FOOD: + case VRR_ITEM_USETYPE_FOOD: { meActionToNearbyPlayers(client, `eats some of their ${getItemName(itemIndex)}`); givePlayerHealth(client, getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue); getItemData(itemIndex).value = getItemData(itemIndex).value - getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue; @@ -771,8 +769,9 @@ function playerUseItem(client, hotBarSlot) { switchPlayerActiveHotBarSlot(client, -1); } break; + } - case VRR_ITEM_USETYPE_DRINK: + case VRR_ITEM_USETYPE_DRINK: { meActionToNearbyPlayers(client, `drinks some of their ${getItemName(itemIndex)}`); givePlayerHealth(client, getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue); getItemData(itemIndex).value = getItemData(itemIndex).value - getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue; @@ -781,16 +780,18 @@ function playerUseItem(client, hotBarSlot) { switchPlayerActiveHotBarSlot(client, -1); } break; + } - case VRR_ITEM_USETYPE_ARMOUR: + case VRR_ITEM_USETYPE_ARMOUR: { meActionToNearbyPlayers(client, `puts on a ${getItemName(itemIndex)}`); givePlayerArmour(client, getItemData(itemIndex).useValue); deleteItem(itemIndex); switchPlayerActiveHotBarSlot(client, -1); break; + } - case VRR_ITEM_USETYPE_ROPE: - closestPlayer = getClosestPlayer(getPlayerPosition(client), client); + case VRR_ITEM_USETYPE_ROPE: { + let closestPlayer = getClosestPlayer(getPlayerPosition(client), client); if(!getPlayerData(closestPlayer)) { messagePlayerError(client, "There isn't anyone close enough to tie up!"); @@ -820,9 +821,10 @@ function playerUseItem(client, hotBarSlot) { meActionToNearbyPlayers(client, `takes their rope and ties ${getCharacterFullName(closestPlayer)}'s hands and feet together.`); } break; + } - case VRR_ITEM_USETYPE_HANDCUFF: - closestPlayer = getClosestPlayer(getPlayerPosition(client), client); + case VRR_ITEM_USETYPE_HANDCUFF: { + let closestPlayer = getClosestPlayer(getPlayerPosition(client), client); if(!getPlayerData(closestPlayer)) { messagePlayerError(client, "There isn't anyone close enough to handcuff!"); @@ -847,13 +849,15 @@ function playerUseItem(client, hotBarSlot) { meActionToNearbyPlayers(client, `takes their cuffs and places them on ${getCharacterFullName(closestPlayer)}`); } break; + } - case VRR_ITEM_USETYPE_NONE: + case VRR_ITEM_USETYPE_NONE: { messagePlayerError(client, `The ${getItemName(itemIndex)} doesn't do anything when you try to use it.`); break; + } - case VRR_ITEM_USETYPE_VEHREPAIR: - vehicle = getClosestVehicle(getPlayerPosition(client)); + case VRR_ITEM_USETYPE_VEHREPAIR: { + let vehicle = getClosestVehicle(getPlayerPosition(client)); if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getGlobalConfig().vehicleRepairDistance) { meActionToNearbyPlayers(client, `takes their repair kit and fixes the vehicle`); repairVehicle(vehicle); @@ -864,25 +868,28 @@ function playerUseItem(client, hotBarSlot) { } } break; + } - case VRR_ITEM_USETYPE_VEHUPGRADE_PART: - vehicle = getClosestVehicle(getPlayerPosition(client)); + case VRR_ITEM_USETYPE_VEHUPGRADE_PART: { + let vehicle = getClosestVehicle(getPlayerPosition(client)); if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getGlobalConfig().vehicleRepairDistance) { meActionToNearbyPlayers(client, `takes their upgrade kit and adds a ${getItemName(itemIndex)} to the vehicle.`); addVehicleUpgrade(vehicle, getItemData(itemIndex).useId); } break; + } - case VRR_ITEM_USETYPE_VEHLIVERY: - vehicle = getClosestVehicle(getPlayerPosition(client)); + case VRR_ITEM_USETYPE_VEHLIVERY: { + let vehicle = getClosestVehicle(getPlayerPosition(client)); if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getGlobalConfig().vehicleRepairDistance) { meActionToNearbyPlayers(client, `takes their decal kit and adds some decals to the vehicle.`); setVehicleLivery(vehicle, getItemData(itemIndex).value); } break; + } - case VRR_ITEM_USETYPE_VEHCOLOUR: - vehicle = getClosestVehicle(getPlayerPosition(client)); + case VRR_ITEM_USETYPE_VEHCOLOUR: { + let vehicle = getClosestVehicle(getPlayerPosition(client)); if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getGlobalConfig().vehicleRepairDistance) { if(getItemData(itemIndex).useId == 1) { meActionToNearbyPlayers(client, `takes their vehicle colour kit and changes the primary colour of the vehicle.`); @@ -895,10 +902,11 @@ function playerUseItem(client, hotBarSlot) { } } break; + } - case VRR_ITEM_USETYPE_FUELCAN: - vehicle = getClosestVehicle(getPlayerPosition(client)); - fuelPump = getClosestFuelPump(getPlayerPosition(client)); + case VRR_ITEM_USETYPE_FUELCAN: { + let vehicle = getClosestVehicle(getPlayerPosition(client)); + let fuelPump = getClosestFuelPump(getPlayerPosition(client)); if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getDistance(getPlayerPosition(client), getFuelPumpData(fuelPump).position)) { if(getDistance(getPlayerPosition(client), getVehiclePosition(vehicle)) <= getGlobalConfig().vehicleRepairDistance) { meActionToNearbyPlayers(client, `takes their fuel can and refills the vehicle`); @@ -927,14 +935,16 @@ function playerUseItem(client, hotBarSlot) { } } break; + } - case VRR_ITEM_USETYPE_WALKIETALKIE: + case VRR_ITEM_USETYPE_WALKIETALKIE: { getItemData(itemIndex).enabled = !getItemData(itemIndex).enabled; //messagePlayerAlert(client, `You turned ${getBoolRedGreenInlineColour(getItemData(itemIndex).enabled)}${toUpperCase(getOnOffFromBool(getItemData(itemIndex).enabled))} {MAINCOLOUR}your walkie talkie in slot ${getPlayerData(client).activeHotBarSlot+1} {ALTCOLOUR}${getItemValueDisplayForItem(itemIndex)}`); meActionToNearbyPlayers(client, `turns ${toLowerCase(getOnOffFromBool(getItemData(itemIndex).enabled))} their walkie-talkie`); break; + } - case VRR_ITEM_USETYPE_PHONE: + case VRR_ITEM_USETYPE_PHONE: { if(getItemData(itemIndex).value == 0) { let phoneNumber = generateRandomPhoneNumber(); getItemData(itemIndex).value = phoneNumber; @@ -950,8 +960,9 @@ function playerUseItem(client, hotBarSlot) { } } break; + } - case VRR_ITEM_USETYPE_SMOKEDRUG: + case VRR_ITEM_USETYPE_SMOKEDRUG: { meActionToNearbyPlayers(client, `smokes some ${getItemName(itemIndex)}`); getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue/100); if(getPlayerData(client).incomingDamageMultiplier < 0.25) { @@ -960,8 +971,9 @@ function playerUseItem(client, hotBarSlot) { deleteItem(itemIndex); switchPlayerActiveHotBarSlot(client, -1); break; + } - case VRR_ITEM_USETYPE_SNORTDRUG: + case VRR_ITEM_USETYPE_SNORTDRUG: { meActionToNearbyPlayers(client, `snorts some ${getItemName(itemIndex)}`); getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue/100); if(getPlayerData(client).incomingDamageMultiplier < 0.25) { @@ -970,8 +982,9 @@ function playerUseItem(client, hotBarSlot) { deleteItem(itemIndex); switchPlayerActiveHotBarSlot(client, -1); break; + } - case VRR_ITEM_USETYPE_INJECTDRUG: + case VRR_ITEM_USETYPE_INJECTDRUG: { meActionToNearbyPlayers(client, `shoots up some ${getItemName(itemIndex)}`); getPlayerData(client).incomingDamageMultiplier = getPlayerData(client).incomingDamageMultiplier-(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useValue/100); if(getPlayerData(client).incomingDamageMultiplier < 0.25) { @@ -980,8 +993,9 @@ function playerUseItem(client, hotBarSlot) { deleteItem(itemIndex); switchPlayerActiveHotBarSlot(client, -1); break; + } - case VRR_ITEM_USETYPE_PLANT: + case VRR_ITEM_USETYPE_PLANT: { meActionToNearbyPlayers(client, `bends down and plants a ${getItemName(itemIndex)} in the ground`); createGroundPlant(itemIndex); if(getItemData(itemIndex).value == 0) { @@ -989,8 +1003,9 @@ function playerUseItem(client, hotBarSlot) { switchPlayerActiveHotBarSlot(client, -1); } break; + } - case VRR_ITEM_USETYPE_BADGE: + case VRR_ITEM_USETYPE_BADGE: { meActionToNearbyPlayers(client, `shows their badge to everyone nearby.`); let clients = getClients(); for(let i in clients) { @@ -1002,14 +1017,17 @@ function playerUseItem(client, hotBarSlot) { } } break; + } - case VRR_ITEM_USETYPE_AMMO_CLIP: + case VRR_ITEM_USETYPE_AMMO_CLIP: { messagePlayerError(client, `Equip a compatible weapon and press R to use an ammo clip/magazine`); break; + } - default: + default: { messagePlayerError(client, `The ${getItemName(itemIndex)} doesn't do anything when you try to use it.`); break; + } } if(getItemData(itemIndex) != false) {