Merge pull request #229 from iSentrie/main

refactor(es_extended): missing translation + indentation
This commit is contained in:
Mycroft
2022-04-27 16:06:27 +01:00
committed by GitHub
2 changed files with 20 additions and 15 deletions
+5
View File
@@ -54,6 +54,7 @@ Locales['en'] = {
['in_vehicle'] = 'Cannot Perform Action, Player is in a vehicle',
-- Commands
['command_bring'] = 'Bring player to you',
['command_car'] = 'Spawn a vehicle',
['command_car_car'] = 'Vehicle model or hash',
['command_cardel'] = 'Remove vehicles in proximity',
@@ -62,6 +63,8 @@ Locales['en'] = {
['command_clearall'] = 'Clear chat Text for all players',
['command_clearinventory'] = 'Remove All items from the Players Inventory',
['command_clearloadout'] = 'Remove All weapons from the Players Loadout',
['command_freeze'] = 'Freeze a player',
['command_unfreeze'] = 'Unfreeze a player',
['command_giveaccountmoney'] = 'Give Money to a specified Account',
['command_giveaccountmoney_account'] = 'Account to add to',
['command_giveaccountmoney_amount'] = 'Amount to add',
@@ -78,6 +81,8 @@ Locales['en'] = {
['command_giveweaponcomponent_invalid'] = 'Invalid weapon component',
['command_giveweaponcomponent_hasalready'] = 'Player already has this weapon component',
['command_giveweaponcomponent_missingweapon'] = 'Player does not have this weapon',
['command_goto'] = 'Teleport yourself to a player',
['command_kill'] = 'Kill a player',
['command_save'] = 'Force Save a player`s Data',
['command_saveall'] = 'Force Save all player data',
['command_setaccountmoney'] = 'Set the money within a specified account',
+15 -15
View File
@@ -153,18 +153,18 @@ ESX.RegisterCommand('group', {"user", "admin"}, function(xPlayer, args, showErro
end, true)
ESX.RegisterCommand('job', {"user", "admin"}, function(xPlayer, args, showError)
print(xPlayer.getName()..", You are currently: ^5".. xPlayer.getJob().name.. "^0 - ^5".. xPlayer.getJob().grade_label .. "^0")
print(xPlayer.getName()..", You are currently: ^5".. xPlayer.getJob().name.. "^0 - ^5".. xPlayer.getJob().grade_label .. "^0")
end, true)
ESX.RegisterCommand('info', {"user", "admin"}, function(xPlayer, args, showError)
local job = xPlayer.getJob().name
local jobgrade = xPlayer.getJob().grade_name
print("^2ID : ^5"..xPlayer.source.." ^0| ^2Name:^5"..xPlayer.getName().." ^0 | ^2Group:^5"..xPlayer.getGroup().."^0 | ^2Job:^5".. job.."^0")
end, true)
end, true)
ESX.RegisterCommand('coords', "admin", function(xPlayer, args, showError)
local coords = GetEntityCoords(GetPlayerPed(xPlayer.source), false)
local heading = GetEntityHeading(GetPlayerPed(xPlayer.source))
local heading = GetEntityHeading(GetPlayerPed(xPlayer.source))
print("Coords - Vector3: ^5".. vector3(coords.x,coords.y,coords.z).. "^0")
print("Coords - Vector4: ^5".. vector4(coords.x, coords.y, coords.z, heading) .. "^0")
end, true)
@@ -176,35 +176,35 @@ ESX.RegisterCommand('tpm', "admin", function(xPlayer, args, showError)
end, true)
ESX.RegisterCommand('goto', "admin", function(xPlayer, args, showError)
local targetCoords = args.playerId.getCoords()
xPlayer.setCoords(targetCoords)
end, true, {help = _U('goto'), validate = true, arguments = {
local targetCoords = args.playerId.getCoords()
xPlayer.setCoords(targetCoords)
end, true, {help = _U('command_goto'), validate = true, arguments = {
{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
}})
ESX.RegisterCommand('bring', "admin", function(xPlayer, args, showError)
local playerCoords = xPlayer.getCoords()
args.playerId.setCoords(playerCoords)
end, true, {help = _U('bring'), validate = true, arguments = {
local playerCoords = xPlayer.getCoords()
args.playerId.setCoords(playerCoords)
end, true, {help = _U('command_bring'), validate = true, arguments = {
{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
}})
ESX.RegisterCommand('kill', "admin", function(xPlayer, args, showError)
args.playerId.triggerEvent("esx:killPlayer")
end, true, {help = _U('kill'), validate = true, arguments = {
{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
end, true, {help = _U('command_kill'), validate = true, arguments = {
{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
}})
ESX.RegisterCommand('freeze', "admin", function(xPlayer, args, showError)
args.playerId.triggerEvent('esx:freezePlayer', "freeze")
end, true, {help = _U('kill'), validate = true, arguments = {
{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
end, true, {help = _U('command_freeze'), validate = true, arguments = {
{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
}})
ESX.RegisterCommand('unfreeze', "admin", function(xPlayer, args, showError)
args.playerId.triggerEvent('esx:freezePlayer', "unfreeze")
end, true, {help = _U('kill'), validate = true, arguments = {
{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
end, true, {help = _U('command_unfreeze'), validate = true, arguments = {
{name = 'playerId', help = _U('commandgeneric_playerid'), type = 'player'}
}})
ESX.RegisterCommand("noclip", 'admin', function(xPlayer, args, showError)