diff --git a/client/main.lua b/client/main.lua index f8864a28..acc400fe 100644 --- a/client/main.lua +++ b/client/main.lua @@ -21,18 +21,18 @@ function EnableGui(state) }) end -RegisterNetEvent("esx_identity:showRegisterIdentity") -AddEventHandler("esx_identity:showRegisterIdentity", function() +RegisterNetEvent('esx_identity:showRegisterIdentity') +AddEventHandler('esx_identity:showRegisterIdentity', function() EnableGui(true) end) -RegisterNetEvent("esx_identity:identityCheck") -AddEventHandler("esx_identity:identityCheck", function(identityCheck) +RegisterNetEvent('esx_identity:identityCheck') +AddEventHandler('esx_identity:identityCheck', function(identityCheck) hasIdentity = identityCheck end) -RegisterNetEvent("esx_identity:saveID") -AddEventHandler("esx_identity:saveID", function(data) +RegisterNetEvent('esx_identity:saveID') +AddEventHandler('esx_identity:saveID', function(data) myIdentifiers = data end) diff --git a/html/sv_index.html b/html/sv_index.html new file mode 100644 index 00000000..7706c17b --- /dev/null +++ b/html/sv_index.html @@ -0,0 +1,22 @@ + + + + + + + +
+
+

Registrera

+
+
+
+
+ Man + Kvinna
+ +
+
+ + + diff --git a/server/main.lua b/server/main.lua index 92b3f062..135c7eb9 100644 --- a/server/main.lua +++ b/server/main.lua @@ -9,14 +9,14 @@ function getIdentity(source, callback) { ['@identifier'] = identifier }, function(result) - if result[1]['firstname'] ~= nil then + if result[1].firstname ~= nil then local data = { - identifier = result[1]['identifier'], - firstname = result[1]['firstname'], - lastname = result[1]['lastname'], - dateofbirth = result[1]['dateofbirth'], - sex = result[1]['sex'], - height = result[1]['height'] + identifier = result[1].identifier, + firstname = result[1].firstname, + lastname = result[1].lastname, + dateofbirth = result[1].dateofbirth, + sex = result[1].sex, + height = result[1].height } callback(data) else @@ -42,38 +42,38 @@ function getCharacters(source, callback) }, function(result) if result[1] and result[2] and result[3] then local data = { - identifier = result[1]['identifier'], - firstname1 = result[1]['firstname'], - lastname1 = result[1]['lastname'], - dateofbirth1 = result[1]['dateofbirth'], - sex1 = result[1]['sex'], - height1 = result[1]['height'], - firstname2 = result[2]['firstname'], - lastname2 = result[2]['lastname'], - dateofbirth2 = result[2]['dateofbirth'], - sex2 = result[2]['sex'], - height2 = result[2]['height'], - firstname3 = result[3]['firstname'], - lastname3 = result[3]['lastname'], - dateofbirth3 = result[3]['dateofbirth'], - sex3 = result[3]['sex'], - height3 = result[3]['height'] + identifier = result[1].identifier, + firstname1 = result[1].firstname, + lastname1 = result[1].lastname, + dateofbirth1 = result[1].dateofbirth, + sex1 = result[1].sex, + height1 = result[1].height, + firstname2 = result[2].firstname, + lastname2 = result[2].lastname, + dateofbirth2 = result[2].dateofbirth, + sex2 = result[2].sex, + height2 = result[2].height, + firstname3 = result[3].firstname, + lastname3 = result[3].lastname, + dateofbirth3 = result[3].dateofbirth, + sex3 = result[3].sex, + height3 = result[3].height } callback(data) elseif result[1] and result[2] and not result[3] then local data = { - identifier = result[1]['identifier'], - firstname1 = result[1]['firstname'], - lastname1 = result[1]['lastname'], - dateofbirth1 = result[1]['dateofbirth'], - sex1 = result[1]['sex'], - height1 = result[1]['height'], - firstname2 = result[2]['firstname'], - lastname2 = result[2]['lastname'], - dateofbirth2 = result[2]['dateofbirth'], - sex2 = result[2]['sex'], - height2 = result[2]['height'], + identifier = result[1].identifier, + firstname1 = result[1].firstname, + lastname1 = result[1].lastname, + dateofbirth1 = result[1].dateofbirth, + sex1 = result[1].sex, + height1 = result[1].height, + firstname2 = result[2].firstname, + lastname2 = result[2].lastname, + dateofbirth2 = result[2].dateofbirth, + sex2 = result[2].sex, + height2 = result[2].height, firstname3 = '', lastname3 = '', dateofbirth3 = '', @@ -84,12 +84,12 @@ function getCharacters(source, callback) callback(data) elseif result[1] and not result[2] and not result[3] then local data = { - identifier = result[1]['identifier'], - firstname1 = result[1]['firstname'], - lastname1 = result[1]['lastname'], - dateofbirth1 = result[1]['dateofbirth'], - sex1 = result[1]['sex'], - height1 = result[1]['height'], + identifier = result[1].identifier, + firstname1 = result[1].firstname, + lastname1 = result[1].lastname, + dateofbirth1 = result[1].dateofbirth, + sex1 = result[1].sex, + height1 = result[1].height, firstname2 = '', lastname2 = '', dateofbirth2 = '', @@ -193,7 +193,7 @@ AddEventHandler('esx_identity:setIdentity', function(data, myIdentifiers) if callback then TriggerClientEvent('esx_identity:identityCheck', myIdentifiers.playerid, true) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to set character, try again!!") + TriggerClientEvent('chat:addMessage', source, { args = { '^[IDENTITY]', 'Failed to set character, try again later or contact the server admin!' } }) end end) end) @@ -226,7 +226,7 @@ AddEventHandler('onResourceStart', function(resource) local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) local myID = { - steamid = GetPlayerIdentifiers(xPlayer.source)[1], + steamid = xPlayer.identifier, playerid = xPlayer.source } @@ -247,50 +247,50 @@ end) TriggerEvent('es:addCommand', 'register', function(source, args, user) getCharacters(source, function(data) if data.firstname3 ~= '' then - TriggerClientEvent('chatMessage', source, '[IDENTITY]', {255, 0, 0}, "You can only have 3 registered characters. Use the ^3/delchar^0 command in order to delete existing characters.") + TriggerClientEvent('chat:addMessage', source, { args = { '^[IDENTITY]', 'You can only have 3 registered characters. Use the ^3/chardel^0 command in order to delete existing characters.' } }) else TriggerClientEvent('esx_identity:showRegisterIdentity', source, {}) end end) end, {help = "Register a new character"}) -TriggerEvent('es:addGroupCommand', 'char', "user", function(source, args, user) +TriggerEvent('es:addGroupCommand', 'char', 'user', function(source, args, user) getIdentity(source, function(data) if data.firstname == '' then - TriggerClientEvent('chatMessage', source, '[IDENTITY]', {255, 0, 0}, "You do not have an active character!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You do not have an active character!' } }) else - TriggerClientEvent('chatMessage', source, '[IDENTITY]', {255, 0, 0}, "Active Character: ^2" .. data.firstname .. " " .. data.lastname .. "^0") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Active character: ^2' .. data.firstname .. ' ' .. data.lastname } }) end end) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient permissions!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient permissions!' } }) end, {help = "List your current character"}) -TriggerEvent('es:addGroupCommand', 'charlist', "user", function(source, args, user) +TriggerEvent('es:addGroupCommand', 'charlist', 'user', function(source, args, user) getCharacters(source, function(data) if data.firstname1 ~= '' then - TriggerClientEvent('chatMessage', source, '[IDENTITY] Character 1:', {255, 0, 0}, data.firstname1 .. " " .. data.lastname1) + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY] Character 1:', data.firstname1 .. ' ' .. data.lastname1 } }) if data.firstname2 ~= '' then - TriggerClientEvent('chatMessage', source, '[IDENTITY] Character 2:', {255, 0, 0}, data.firstname2 .. " " .. data.lastname2) + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY] Character 2:', data.firstname2 .. ' ' .. data.lastname2 } }) if data.firstname3 ~= '' then - TriggerClientEvent('chatMessage', source, '[IDENTITY] Character 3:', {255, 0, 0}, data.firstname3 .. " " .. data.lastname3) + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY] Character 3:', data.firstname3 .. ' ' .. data.lastname3 } }) end end else - TriggerClientEvent('chatMessage', source, '[IDENTITY]', {255, 0, 0}, "You have no registered characters. Use the ^3/register^0 command to register a character.") + TriggerClientEvent('chat:addMessage', source, { args = { '^[IDENTITY]', 'You have no registered characters. Use the ^3/register^0 command to register a character.' } }) end end) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient permissions!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient permissions!' } }) end, {help = "List all your registered characters"}) -TriggerEvent('es:addGroupCommand', 'charselect', "user", function(source, args, user) +TriggerEvent('es:addGroupCommand', 'charselect', 'user', function(source, args, user) local charNumber = tonumber(args[1]) - + if charNumber == nil or charNumber > 3 or charNumber < 1 then - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "That's an invalid character!") + TriggerClientEvent('chat:addMessage', source, { args = { '^[IDENTITY]', 'That\'s an invalid character!' } }) return end @@ -308,13 +308,13 @@ TriggerEvent('es:addGroupCommand', 'charselect', "user", function(source, args, if data.firstname ~= '' then updateIdentity(GetPlayerIdentifiers(source)[1], data, function(callback) if callback then - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Updated your active character to ^2" .. data.firstname .. " " .. data.lastname .. "^0!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Updated your active character to ^2' .. data.firstname .. ' ' .. data.lastname } }) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to update your identity, try again!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Failed to update your identity, try again later or contact the server admin!' } }) end end) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You don\'t have a character in slot 1!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You don\'t have a character in slot 1!' } }) end elseif charNumber == 2 then @@ -331,13 +331,13 @@ TriggerEvent('es:addGroupCommand', 'charselect', "user", function(source, args, updateIdentity(GetPlayerIdentifiers(source)[1], data, function(callback) if callback then - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Updated your active character to ^2" .. data.firstname .. " " .. data.lastname .. "^0!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Updated your active character to ^2' .. data.firstname .. ' ' .. data.lastname } }) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to update your identity, try again!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Failed to update your identity, try again later or contact the server admin!' } }) end end) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You don\'t have a character in slot 2!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You don\'t have a character in slot 2!' } }) end elseif charNumber == 3 then @@ -353,32 +353,31 @@ TriggerEvent('es:addGroupCommand', 'charselect', "user", function(source, args, if data.firstname ~= '' then updateIdentity(GetPlayerIdentifiers(source)[1], data, function(callback) if callback then - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Updated your active character to ^2" .. data.firstname .. " " .. data.lastname .. "^0!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Updated your active character to ^2' .. data.firstname .. ' ' .. data.lastname } }) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to update your identity, try again!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Failed to update your identity, try again later or contact the server admin!' } }) end end) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You don\'t have a character in slot 3!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You don\'t have a character in slot 3!' } }) end else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to update your identity, try again!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Failed to update your identity, try again later or contact the server admin!' } }) end end) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient permissions!") -end, {help = "Switch character", params = {{name = "char", help = "the character id, ranges from 1-3"}}}) - -TriggerEvent('es:addGroupCommand', 'chardel', "user", function(source, args, user) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient permissions!' } }) +end, {help = "Switch between character", params = {{name = "char", help = "the character id, ranges from 1-3"}}}) +TriggerEvent('es:addGroupCommand', 'chardel', 'user', function(source, args, user) local charNumber = tonumber(args[1]) - + if charNumber == nil or charNumber > 3 or charNumber < 1 then - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "That's an invalid character!") + TriggerClientEvent('chat:addMessage', source, { args = { '^[IDENTITY]', 'That\'s an invalid character!' } }) return end - + getCharacters(source, function(data) if charNumber == 1 then @@ -395,13 +394,13 @@ TriggerEvent('es:addGroupCommand', 'chardel', "user", function(source, args, use if data.firstname ~= '' then deleteIdentity(GetPlayerIdentifiers(source)[1], data, function(callback) if callback then - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You have deleted ^3" .. data.firstname .. " " .. data.lastname .. "!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You have deleted ^1' .. data.firstname .. ' ' .. data.lastname } }) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to delete the identity, try again!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Failed to delete the character, try again later or contact the server admin!' } }) end end) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You don\'t have a character in slot 1!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You don\'t have a character in slot 1!' } }) end elseif charNumber == 2 then @@ -418,13 +417,13 @@ TriggerEvent('es:addGroupCommand', 'chardel', "user", function(source, args, use if data.firstname ~= '' then deleteIdentity(GetPlayerIdentifiers(source)[1], data, function(callback) if callback then - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You have deleted ^3" .. data.firstname .. " " .. data.lastname .. "!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You have deleted ^1' .. data.firstname .. ' ' .. data.lastname } }) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to delete the character, try again!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Failed to delete the character, try again later or contact the server admin!' } }) end end) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You don\'t have a character in slot 2!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You don\'t have a character in slot 2!' } }) end elseif charNumber == 3 then @@ -441,18 +440,18 @@ TriggerEvent('es:addGroupCommand', 'chardel', "user", function(source, args, use if data.firstname ~= '' then deleteIdentity(GetPlayerIdentifiers(source)[1], data, function(callback) if callback then - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You have deleted ^3" .. data.firstname .. " " .. data.lastname .. "!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You have deleted ^1' .. data.firstname .. ' ' .. data.lastname } }) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to delete the character, try again!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Failed to delete the character, try again later or contact the server admin!' } }) end end) else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "You don\'t have a character in slot 3!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'You don\'t have a character in slot 3!' } }) end else - TriggerClientEvent('chatMessage', source, "[IDENTITY]", {255, 0, 0}, "Failed to delete the character, try again!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1[IDENTITY]', 'Failed to delete the character, try again!' } }) end end) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient permissions!") -end, {help = "Delete a registered character", params = {{name = "char", help = "the character id, ranges from 1-3"}}}) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient permissions!' } }) +end, {help = "Delete a registered character", params = {{name = "char", help = "the character id, ranges from 1-3"}}}) \ No newline at end of file