diff --git a/.replxx_history b/.replxx_history new file mode 100644 index 000000000..e69de29bb diff --git a/CoreRT.dll b/CoreRT.dll index d62be0f01..552a72ee8 100644 Binary files a/CoreRT.dll and b/CoreRT.dll differ diff --git a/FXServer.exe b/FXServer.exe index aed9058c7..d73679d88 100644 Binary files a/FXServer.exe and b/FXServer.exe differ diff --git a/botan.dll b/botan.dll index f0de0be3d..32d3f972f 100644 Binary files a/botan.dll and b/botan.dll differ diff --git a/cfx_curl_x86_64.dll b/cfx_curl_x86_64.dll index da1bd6d79..d9f193d8d 100644 Binary files a/cfx_curl_x86_64.dll and b/cfx_curl_x86_64.dll differ diff --git a/citizen-devtools.dll b/citizen-devtools.dll index 371e6f99f..61812b205 100644 Binary files a/citizen-devtools.dll and b/citizen-devtools.dll differ diff --git a/citizen-resources-core.dll b/citizen-resources-core.dll index 7ba6a9572..50dea7d6d 100644 Binary files a/citizen-resources-core.dll and b/citizen-resources-core.dll differ diff --git a/citizen-resources-metadata-lua.dll b/citizen-resources-metadata-lua.dll index b29f1cf83..7f207bb61 100644 Binary files a/citizen-resources-metadata-lua.dll and b/citizen-resources-metadata-lua.dll differ diff --git a/citizen-scripting-core.dll b/citizen-scripting-core.dll index 308a6b3c1..010f45a3e 100644 Binary files a/citizen-scripting-core.dll and b/citizen-scripting-core.dll differ diff --git a/citizen-scripting-lua.dll b/citizen-scripting-lua.dll index 79735b610..e24d85b62 100644 Binary files a/citizen-scripting-lua.dll and b/citizen-scripting-lua.dll differ diff --git a/citizen-scripting-lua54.dll b/citizen-scripting-lua54.dll index a5ec8f010..b757a7940 100644 Binary files a/citizen-scripting-lua54.dll and b/citizen-scripting-lua54.dll differ diff --git a/citizen-scripting-mono-v2.dll b/citizen-scripting-mono-v2.dll index fdabba1ce..1cef18b4b 100644 Binary files a/citizen-scripting-mono-v2.dll and b/citizen-scripting-mono-v2.dll differ diff --git a/citizen-scripting-mono.dll b/citizen-scripting-mono.dll index f4cb9f446..bd5569549 100644 Binary files a/citizen-scripting-mono.dll and b/citizen-scripting-mono.dll differ diff --git a/citizen-scripting-v8node.dll b/citizen-scripting-v8node.dll index b7a50971b..1b30c3f66 100644 Binary files a/citizen-scripting-v8node.dll and b/citizen-scripting-v8node.dll differ diff --git a/citizen-server-fxdk.dll b/citizen-server-fxdk.dll index b74e5e1ce..99bce9c82 100644 Binary files a/citizen-server-fxdk.dll and b/citizen-server-fxdk.dll differ diff --git a/citizen-server-gui.dll b/citizen-server-gui.dll index 69e481dbe..8e17881c4 100644 Binary files a/citizen-server-gui.dll and b/citizen-server-gui.dll differ diff --git a/citizen-server-impl.dll b/citizen-server-impl.dll index d1139d965..1c431a23c 100644 Binary files a/citizen-server-impl.dll and b/citizen-server-impl.dll differ diff --git a/citizen-server-instance.dll b/citizen-server-instance.dll index 6ec0f46a8..fb1693707 100644 Binary files a/citizen-server-instance.dll and b/citizen-server-instance.dll differ diff --git a/citizen-server-main.dll b/citizen-server-main.dll index f50d60947..089526ac3 100644 Binary files a/citizen-server-main.dll and b/citizen-server-main.dll differ diff --git a/citizen-server-monitor.dll b/citizen-server-monitor.dll index 7003b69d9..84cd7b0ec 100644 Binary files a/citizen-server-monitor.dll and b/citizen-server-monitor.dll differ diff --git a/citizen-server-net.dll b/citizen-server-net.dll index f4a68a945..1639c3098 100644 Binary files a/citizen-server-net.dll and b/citizen-server-net.dll differ diff --git a/citizen-server-state-fivesv.dll b/citizen-server-state-fivesv.dll index c95c8d662..aeaa097d4 100644 Binary files a/citizen-server-state-fivesv.dll and b/citizen-server-state-fivesv.dll differ diff --git a/citizen-server-state-rdr3sv.dll b/citizen-server-state-rdr3sv.dll index c2879a22f..00966b0ba 100644 Binary files a/citizen-server-state-rdr3sv.dll and b/citizen-server-state-rdr3sv.dll differ diff --git a/components.json b/components.json index 1d1deaaeb..a71402186 100644 --- a/components.json +++ b/components.json @@ -22,6 +22,7 @@ "scripting:server", "svadhesive", "citizen:scripting:mono", + "citizen:scripting:mono-v2", "citizen:scripting:v8node", "voip-server:mumble", "http-client", diff --git a/conhost-server.dll b/conhost-server.dll index 87569b44a..20442ec4b 100644 Binary files a/conhost-server.dll and b/conhost-server.dll differ diff --git a/debug-script.dll b/debug-script.dll index c4e652b7c..6b4714049 100644 Binary files a/debug-script.dll and b/debug-script.dll differ diff --git a/devcon.dll b/devcon.dll index e7c3082e9..83ccbfbc9 100644 Binary files a/devcon.dll and b/devcon.dll differ diff --git a/http-client.dll b/http-client.dll index 7db4132c2..5d84073ec 100644 Binary files a/http-client.dll and b/http-client.dll differ diff --git a/imgui.dll b/imgui.dll index 27caafa33..bb4770d28 100644 Binary files a/imgui.dll and b/imgui.dll differ diff --git a/libuv.dll b/libuv.dll index bd6ba753f..60b03981b 100644 Binary files a/libuv.dll and b/libuv.dll differ diff --git a/net-base.dll b/net-base.dll index 345acb998..3fbf48489 100644 Binary files a/net-base.dll and b/net-base.dll differ diff --git a/net-http-server.dll b/net-http-server.dll index 95a5fc817..089a691ea 100644 Binary files a/net-http-server.dll and b/net-http-server.dll differ diff --git a/net-tcp-server.dll b/net-tcp-server.dll index d8ba9d51f..7093bbc40 100644 Binary files a/net-tcp-server.dll and b/net-tcp-server.dll differ diff --git a/nng.dll b/nng.dll index f65e380f0..3fabf5277 100644 Binary files a/nng.dll and b/nng.dll differ diff --git a/node.dll b/node.dll index c1c0a18a8..8ad8b4f8a 100644 Binary files a/node.dll and b/node.dll differ diff --git a/resources/Commands/__resource.lua b/resources/Commands/__resource.lua index ab2fdcd5f..431ddf9b4 100644 --- a/resources/Commands/__resource.lua +++ b/resources/Commands/__resource.lua @@ -1,9 +1,3 @@ -description 'Enables use of /ooc for out of character chat.' -server_script 'ooc.lua' -server_script 'dispatch.lua' -server_script 'me.lua' -server_script 'tweet.lua' -server_script 'darkweb.lua' -server_script 'drugdeal.lua' -server_script 'serveradmin.lua' -server_script 'atc.lua' \ No newline at end of file +description 'Custom made commands script by ThatGuyJacobee' +client_script 'client.lua' +server_script 'server.lua' \ No newline at end of file diff --git a/resources/Commands/client.lua b/resources/Commands/client.lua new file mode 100644 index 000000000..eff72e0ab --- /dev/null +++ b/resources/Commands/client.lua @@ -0,0 +1,10 @@ +Citizen.CreateThread(function() + TriggerEvent('chat:addSuggestion', '/ooc', 'Type in Out-Of-Character mode', { }) + TriggerEvent('chat:addSuggestion', '/911', 'Submit a public 911 call', { }) + TriggerEvent('chat:addSuggestion', '/ad', 'Send an ad into the chat', { }) + TriggerEvent('chat:addSuggestion', '/atc', 'To be used for Air Trafic Control', { }) + TriggerEvent('chat:addSuggestion', '/darkweb', 'Send sketchy ads in here :)', { }) + TriggerEvent('chat:addSuggestion', '/dispatch', 'To be used by dispatch for first responders', { }) + TriggerEvent('chat:addSuggestion', '/drugdeal', 'Used to ad your drugdeal', { }) + TriggerEvent('chat:addSuggestion', '/me', 'Used to mention personal actions', { }) +end) \ No newline at end of file diff --git a/resources/Commands/911.lua b/resources/Commands/old/911.lua similarity index 100% rename from resources/Commands/911.lua rename to resources/Commands/old/911.lua diff --git a/resources/Commands/ad.lua b/resources/Commands/old/ad.lua similarity index 100% rename from resources/Commands/ad.lua rename to resources/Commands/old/ad.lua diff --git a/resources/Commands/atc.lua b/resources/Commands/old/atc.lua similarity index 100% rename from resources/Commands/atc.lua rename to resources/Commands/old/atc.lua diff --git a/resources/Commands/darkweb.lua b/resources/Commands/old/darkweb.lua similarity index 100% rename from resources/Commands/darkweb.lua rename to resources/Commands/old/darkweb.lua diff --git a/resources/Commands/dispatch.lua b/resources/Commands/old/dispatch.lua similarity index 100% rename from resources/Commands/dispatch.lua rename to resources/Commands/old/dispatch.lua diff --git a/resources/Commands/drugdeal.lua b/resources/Commands/old/drugdeal.lua similarity index 100% rename from resources/Commands/drugdeal.lua rename to resources/Commands/old/drugdeal.lua diff --git a/resources/Commands/me.lua b/resources/Commands/old/me.lua similarity index 100% rename from resources/Commands/me.lua rename to resources/Commands/old/me.lua diff --git a/resources/Commands/serveradmin.lua b/resources/Commands/old/serveradmin.lua similarity index 100% rename from resources/Commands/serveradmin.lua rename to resources/Commands/old/serveradmin.lua diff --git a/resources/Commands/tweet.lua b/resources/Commands/old/tweet.lua similarity index 100% rename from resources/Commands/tweet.lua rename to resources/Commands/old/tweet.lua diff --git a/resources/Commands/ooc.lua b/resources/Commands/ooc.lua deleted file mode 100644 index 0b6b27d10..000000000 --- a/resources/Commands/ooc.lua +++ /dev/null @@ -1,19 +0,0 @@ -AddEventHandler('chatMessage', function(source, name, msg) - sm = stringsplit(msg, " "); - if sm[1] == "/ooc" then - CancelEvent() - TriggerClientEvent('chatMessage', -1, "OOC | " .. name, { 128, 128, 128 }, string.sub(msg,5)) - end -end) - -function stringsplit(inputstr, sep) - if sep == nil then - sep = "%s" - end - local t={} ; i=1 - for str in string.gmatch(inputstr, "([^"..sep.."]+)") do - t[i] = str - i = i + 1 - end - return t -end \ No newline at end of file diff --git a/resources/Commands/server.lua b/resources/Commands/server.lua new file mode 100644 index 000000000..8b1bf2a9a --- /dev/null +++ b/resources/Commands/server.lua @@ -0,0 +1,81 @@ +--[[AddEventHandler('chatMessage', function(source, name, msg) + sm = stringsplit(msg, " "); + if sm[1] == "/ooc" then + CancelEvent() + TriggerClientEvent('chatMessage', -1, "OOC | " .. name, { 128, 128, 128 }, string.sub(msg,5)) + end +end)]]-- + +--local cmds = {{"ooc", "🔇OOC", "128, 128, 128"}, {"911", "📲 911", "30, 144, 255"}, {"ad", "📡 Advertisement", "255, 255, 51"}, {"", ""}, {"", ""}, {"", ""}, {"", ""}, {"", ""}} + +--[[for c, v in pairs(cmds) do + RegisterCommand("ooc", function(source, args, raw) + local arg = args[1] + + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "OOC | " .. GetPlayerName(source), { 128, 128, 128 }, string.sub(raw, 5)) + end + end, false) +end]]-- + +-- Ignore above, under development + +RegisterCommand("ooc", function(source, args, raw) + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "🔇OOC | " .. GetPlayerName(source), { 128, 128, 128 }, string.sub(raw, 5)) + end +end, false) + +RegisterCommand("911", function(source, args, raw) + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "📲 911 | " .. GetPlayerName(source), { 30, 144, 255 }, string.sub(raw, 5)) + end +end, false) + +RegisterCommand("ad", function(source, args, raw) + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "📡 Advertisement | " .. GetPlayerName(source), { 255, 255, 51 }, string.sub(raw, 4)) + end +end, false) + +RegisterCommand("atc", function(source, args, raw) + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "👨‍✈️ ATC | " .. GetPlayerName(source), { 255, 140, 0 }, string.sub(raw, 5)) + end +end, false) + +RegisterCommand("darkweb", function(source, args, raw) + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "👨‍💻 Dark Web | " .. GetPlayerName(source), { 0, 0, 0 }, string.sub(raw, 9)) + end +end, false) + +RegisterCommand("dispatch", function(source, args, raw) + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "📲 Dispatch | " .. GetPlayerName(source), { 30, 144, 255 }, string.sub(raw, 10)) + end +end, false) + +RegisterCommand("drugdeal", function(source, args, raw) + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "💊 Drug Deal | " .. GetPlayerName(source), { 0, 100, 0 }, string.sub(raw, 10)) + end +end, false) + +RegisterCommand("me", function(source, args, raw) + if (source > 0) then + TriggerClientEvent('chatMessage', -1, "Me | " .. GetPlayerName(source), { 255, 0, 0 }, string.sub(raw, 4)) + end +end, false) + +--[[function stringsplit(inputstr, sep) + if sep == nil then + sep = "%s" + end + local t={} ; i=1 + for str in string.gmatch(inputstr, "([^"..sep.."]+)") do + t[i] = str + i = i + 1 + end + return t +end]]-- \ No newline at end of file diff --git a/resources/Hands-Up/client.lua b/resources/Hands-Up/client.lua index 26dcb464d..cefe838e8 100644 --- a/resources/Hands-Up/client.lua +++ b/resources/Hands-Up/client.lua @@ -1,22 +1,23 @@ -Citizen.CreateThread(function() - local dict = "missminuteman_1ig_2" - - RequestAnimDict(dict) - while not HasAnimDictLoaded(dict) do - Citizen.Wait(100) +RegisterCommand("handsup", function(source, args, raw) + --local arg = args[1] + local dict = "missminuteman_1ig_2" + + if not IsEntityPlayingAnim(GetPlayerPed(-1), dict, "handsup_enter", 3) then + --Citizen.Trace("Not active\n") + RequestAnimDict(dict) + + while not HasAnimDictLoaded(dict) do + Citizen.Wait(100) + end + + TaskPlayAnim(GetPlayerPed(-1), dict, "handsup_enter", 8.0, 8.0, -1, 50, 0, false, false, false) + else + --Citizen.Trace("Active\n") + ClearPedTasks(GetPlayerPed(-1)) end - local handsup = false - while true do - Citizen.Wait(0) - if IsControlJustPressed(1, 323) then --Start holding X - if not handsup then - TaskPlayAnim(GetPlayerPed(-1), dict, "handsup_enter", 8.0, 8.0, -1, 50, 0, false, false, false) - handsup = true - else - handsup = false - ClearPedTasks(GetPlayerPed(-1)) - end - end - end -end) - \ No newline at end of file +end, false) + +Citizen.CreateThread(function() + TriggerEvent('chat:addSuggestion', '/handsup', 'Put your hands up', { }) + --TriggerEvent('chat:addSuggestion', '/handsup', 'Put your hands up', { { name = "emotename", help = "dance, camera, sit or any valid emote." } }) +end) \ No newline at end of file diff --git a/resources/Point-Finger/client.lua b/resources/Point-Finger/client.lua index b4e6158e8..5249156b1 100644 --- a/resources/Point-Finger/client.lua +++ b/resources/Point-Finger/client.lua @@ -31,14 +31,27 @@ local oldval = false local oldvalped = false Citizen.CreateThread(function() + RegisterCommand("point", function(source, args, raw) + if keyPressed == false then + keyPressed = true + startPointing() + mp_pointing = true + + else + keyPressed = false + mp_pointing = false + stopPointing() + end + end, false) + while true do Wait(0) if once then once = false end - - if not keyPressed then + + --[[if not keyPressed then if IsControlPressed(0, 29) and not mp_pointing and IsPedOnFoot(PlayerPedId()) then Wait(200) if not IsControlPressed(0, 29) then @@ -62,7 +75,7 @@ Citizen.CreateThread(function() if not IsControlPressed(0, 29) then keyPressed = false end - end + end--]] if Citizen.InvokeNative(0x921CE12C489C4C41, PlayerPedId()) and not mp_pointing then stopPointing() end diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/LSCSO/handling.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/LSCSO/handling.meta index 7c6772ce7..0f3ca5e47 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/LSCSO/handling.meta +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/LSCSO/handling.meta @@ -4,63 +4,64 @@ trchar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 440010 - 0 - 0 - AVERAGE - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 440010 + 20000 + 0 + SPORTS_CAR + + + + + + + + + trcap diff --git a/scrbind-base.dll b/scrbind-base.dll index 1b0d6926a..395c9bcdb 100644 Binary files a/scrbind-base.dll and b/scrbind-base.dll differ diff --git a/scripting-server.dll b/scripting-server.dll index e7b027fc5..b1e0a87da 100644 Binary files a/scripting-server.dll and b/scripting-server.dll differ diff --git a/svadhesive.dll b/svadhesive.dll index 5f84f9b87..c6fe60a93 100644 Binary files a/svadhesive.dll and b/svadhesive.dll differ diff --git a/vfs-core.dll b/vfs-core.dll index a3da1f4bc..5d73f6314 100644 Binary files a/vfs-core.dll and b/vfs-core.dll differ diff --git a/vfs-impl-server.dll b/vfs-impl-server.dll index 61fe02ba6..a68d93954 100644 Binary files a/vfs-impl-server.dll and b/vfs-impl-server.dll differ diff --git a/voip-server-mumble.dll b/voip-server-mumble.dll index 43a263534..bc7e635fd 100644 Binary files a/voip-server-mumble.dll and b/voip-server-mumble.dll differ