diff --git a/resources/Timetrials/scores.txt b/resources/Timetrials/scores.txt index c21e4b0ec..f7acbc75e 100644 --- a/resources/Timetrials/scores.txt +++ b/resources/Timetrials/scores.txt @@ -1 +1 @@ -{"Race | Airport Circuit":{"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":69880},"Formula 1":{"car":"Formula 1","player":"vJack","time":42751},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":83978}},"Race | Hollywood Hills":{"Audi R8 V10":{"car":"Audi R8 V10","player":"ThatGuyJacobee","time":100677},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":102048},"Ford F-150 Lightning 2022":{"car":"Ford F-150 Lightning 2022","player":"ThatGuyJacobee","time":105278},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":85823}},"Race | Airport Drag":{"BMW M5 Plus":{"car":"BMW M5 Plus","player":"King Rodriguez","time":8652},"Police Corvette 2019":{"car":"Police Corvette 2019","player":"Woltage.2","time":14484},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":9693},"Formula 1":{"car":"Formula 1","player":"King Rodriguez","time":7629},"NULL":{"car":"NULL","player":"B. LAO","time":12630},"2010 Chevy Tahoe":{"car":"2010 Chevy Tahoe","player":"King Rodriguez","time":12821}},"Race | Cannonball Run":{"2013 Dodge Charger":{"car":"2013 Dodge Charger","player":"vJack","time":263368}},"Observatory Loop":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":34126}},"Race | Airport Drag Race":{"NULL":{"car":"NULL","player":"DR-KingRodriguez","time":9270}},"BCSO Training Course":{"Jester":{"car":"Jester","player":"michael82","time":37835},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":26915}},"Lakeside Loop":{"NULL":{"car":"NULL","player":"DR*KINGPORNHUB","time":206147}},"Highway Sprint":{"NULL":{"car":"NULL","player":"vJack","time":93300}},"Race | Observatory Loop":{"NULL":{"car":"NULL","player":"[YJ-18] Sinapsey","time":55388},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"[C-291][GCF-34][MS-13] K. Lee","time":67881},"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee","time":76765},"Porsche 911 GT3RS":{"car":"Porsche 911 GT3RS","player":"[YJ-18] Sinapsey","time":106410},"BMW M5 Plus":{"car":"BMW M5 Plus","player":"[EGRP-02]King Rodriguez","time":70752},"Ford F-150 Lightning 2022":{"car":"Ford F-150 Lightning 2022","player":"ThatGuyJacobee","time":68440},"Mazda Miata":{"car":"Mazda Miata","player":"[C-291][GCF-34][MS-13] K. Lee","time":79814},"2013 Dodge Charger":{"car":"2013 Dodge Charger","player":"vJack","time":64004},"Formula 1":{"car":"Formula 1","player":"ThatGuyJacobee","time":54744},"BMW M5":{"car":"BMW M5","player":"[C-291][GCF-34][MS-13] K. Lee","time":81837},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":56747}},"Race | Timetrial Event - 04/04/21":{"Chevrolet Silverado 1980":{"car":"Chevrolet Silverado 1980","player":"King Rodriguez","time":156244},"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee","time":191695},"Ford Velociraptor 6x6":{"car":"Ford Velociraptor 6x6","player":"ThatGuyJacobee","time":132814}},"Race | Lakeside Loop":{"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":177461},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":196803},"Ford Crown Vic 2011":{"car":"Ford Crown Vic 2011","player":"AnySpiderBat","time":231931},"SNOWMOBILE 2020":{"car":"SNOWMOBILE 2020","player":"[C-146] E. Cartman","time":107015},"EGRP Staff Buggy":{"car":"EGRP Staff Buggy","player":"[EGRP-02]King Rodriguez","time":43710},"Adder":{"car":"Adder","time":30689,"player":"Oli"}},"Race | North GP":{"NULL":{"car":"NULL","player":"SOGGYBEAN","time":42917},"2014 Pierce prescue":{"car":"2014 Pierce prescue","player":"Klimek07","time":83300},"Windsor Drop":{"car":"Windsor Drop","player":"[C-81][GCF-145] R. Freeman","time":66673},"SNOWMOBILE 2020":{"car":"SNOWMOBILE 2020","player":"ThatGuyJacobee","time":387242},"BMW M5":{"car":"BMW M5","player":"Stormzy","time":115460},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":217283}},"Hollywood Hills":{"NULL":{"car":"NULL","player":"Kryplos125","time":120053}},"Sandy Airfield":{"Jester":{"car":"Jester","player":"michael82","time":47982},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":5607},"Maverick":{"car":"Maverick","player":"vJack","time":29165},"RE-7B":{"car":"RE-7B","player":"*ZbyniU*","time":28456},"BMX":{"car":"BMX","player":"vJack","time":21014},"Neon":{"car":"Neon","player":"ThunderBird","time":30312},"Vigilante":{"car":"Vigilante","player":"*ZbyniU*","time":6172},"FH-1 Hunter":{"car":"FH-1 Hunter","player":"*ZbyniU*","time":36289},"Oppressor":{"car":"Oppressor","player":"michael82","time":21360}},"Race | Highway Sprint":{"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":138033},"NULL":{"car":"NULL","player":"DR-KingRodriguez","time":98074},"Lamborghini Aventador AVJ":{"car":"Lamborghini Aventador AVJ","player":"Kaleb","time":240744},"Deveste Eight":{"car":"Deveste Eight","player":"jb3794339","time":181173}},"Airport Drag Race":{"NULL":{"car":"NULL","player":"iwan.ralphs","time":7030}},"Airport Circuit":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":22916},"P-996 LAZER":{"car":"P-996 LAZER","player":"ThatGuyJacobee","time":59216},"Neon":{"car":"Neon","player":"ThunderBird","time":92652}},"North Rallycross ":{"Neon":{"car":"Neon","player":"ThunderBird","time":351612}},"Race | BCSO Training Course":{"2016 Dodge Ram":{"car":"2016 Dodge Ram","player":"vJack","time":119099},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":105983},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":100457},"Neon":{"car":"Neon","player":"ThunderBird","time":105527},"2013 Dodge Charger":{"car":"2013 Dodge Charger","player":"vJack","time":94246},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":78151}},"Cannonball Run":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":81298}},"Race | Hillside Loop":{"BMW M8 Widebody":{"car":"BMW M8 Widebody","player":"[C-291][GCF-34][MS-13] K. Lee","time":195442},"Bronco Wildtrak 2021":{"car":"Bronco Wildtrak 2021","player":"ThatGuyJacobee","time":210714},"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee","time":230432}},"Race | Sandy Airfield":{"NULL":{"car":"NULL","player":"Max ","time":26029},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":29921},"F-22A":{"car":"F-22A","player":"Yalaina-DDR8","time":90697},"2016 Ford Explorer":{"car":"2016 Ford Explorer","player":"King Rodriguez","time":26526},"Ferrari 458":{"car":"Ferrari 458","player":"Woltage.2","time":25352},"Yamaha R6":{"car":"Yamaha R6","player":"ThatGuyJacobee","time":28188},"Formula 1":{"car":"Formula 1","player":"vJack","time":15914},"Chevy Camaro20":{"car":"Chevy Camaro20","player":"Max Rodriguez","time":32202},"Jeep TrackHawk 2018":{"car":"Jeep TrackHawk 2018","player":"King Rodriguez","time":22887},"2014 Dodge Charger":{"car":"2014 Dodge Charger","player":"King Rodriguez","time":29132},"Space Docker":{"car":"Space Docker","player":"DyslexicStoner240.","time":29122},"Audi S3 2015":{"car":"Audi S3 2015","player":"King Rodriguez","time":25742},"Kawasaki Ninja ZX10R":{"car":"Kawasaki Ninja ZX10R","player":"King Rodriguez","time":28422},"BMW M5 Plus":{"car":"BMW M5 Plus","player":"King Rodriguez","time":18019},"Toyota Sienna 2021":{"car":"Toyota Sienna 2021","player":"Max Rodriguez","time":34685},"Bugatti Chiron 2017":{"car":"Bugatti Chiron 2017","player":"King Rodriguez","time":22371},"Ford Raptor F-150":{"car":"Ford Raptor F-150","player":"King Rodriguez","time":28515},"Mini JCW 2020":{"car":"Mini JCW 2020","player":"King Rodriguez","time":29879},"BMW i8":{"car":"BMW i8","player":"King Rodriguez","time":24743},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":19029}},"North GP":{"NULL":{"car":"NULL","player":"vJack","time":191650},"Baller":{"car":"Baller","player":"dcapone00","time":410118},"Neon":{"car":"Neon","player":"ThunderBird","time":354856}}} \ No newline at end of file +{"Sandy Airfield":{"RE-7B":{"car":"RE-7B","time":28456,"player":"*ZbyniU*"},"Neon":{"car":"Neon","time":30312,"player":"ThunderBird"},"Jester":{"car":"Jester","time":47982,"player":"michael82"},"NULL":{"car":"NULL","time":5607,"player":"ThatGuyJacobee"},"Vigilante":{"car":"Vigilante","time":6172,"player":"*ZbyniU*"},"Maverick":{"car":"Maverick","time":29165,"player":"vJack"},"BMX":{"car":"BMX","time":21014,"player":"vJack"},"FH-1 Hunter":{"car":"FH-1 Hunter","time":36289,"player":"*ZbyniU*"},"Oppressor":{"car":"Oppressor","time":21360,"player":"michael82"}},"Race | Airport Drag Race":{"NULL":{"car":"NULL","time":9270,"player":"DR-KingRodriguez"}},"Race | North GP":{"Windsor Drop":{"car":"Windsor Drop","time":66673,"player":"[C-81][GCF-145] R. Freeman"},"SNOWMOBILE 2020":{"car":"SNOWMOBILE 2020","time":387242,"player":"ThatGuyJacobee"},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","time":217283,"player":"vJack"},"BMW M5":{"car":"BMW M5","time":115460,"player":"Stormzy"},"NULL":{"car":"NULL","time":42917,"player":"SOGGYBEAN"},"2014 Pierce prescue":{"car":"2014 Pierce prescue","time":83300,"player":"Klimek07"}},"Race | Hollywood Hills":{"Audi R8 V10":{"car":"Audi R8 V10","time":100677,"player":"ThatGuyJacobee"},"Ford F-150 Lightning 2022":{"car":"Ford F-150 Lightning 2022","time":105278,"player":"ThatGuyJacobee"},"NULL":{"car":"NULL","time":102048,"player":"ThatGuyJacobee"},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","time":85823,"player":"vJack"}},"Race | Timetrial Event - 04/04/21":{"Ford Velociraptor 6x6":{"car":"Ford Velociraptor 6x6","time":132814,"player":"ThatGuyJacobee"},"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","time":191695,"player":"[C-291][GCF-34][MS-13] K. Lee"},"Chevrolet Silverado 1980":{"car":"Chevrolet Silverado 1980","time":156244,"player":"King Rodriguez"}},"Hollywood Hills":{"NULL":{"car":"NULL","time":120053,"player":"Kryplos125"}},"Race | Airport Circuit":{"Formula 1":{"car":"Formula 1","time":42751,"player":"vJack"},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","time":83978,"player":"ThatGuyJacobee"},"Ferrari 458":{"car":"Ferrari 458","time":69880,"player":"ThatGuyJacobee"}},"Airport Drag Race":{"NULL":{"car":"NULL","time":7030,"player":"iwan.ralphs"}},"Race | Airport Drag":{"BMW M5 Plus":{"car":"BMW M5 Plus","time":8652,"player":"King Rodriguez"},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","time":9693,"player":"ThatGuyJacobee"},"2010 Chevy Tahoe":{"car":"2010 Chevy Tahoe","time":12821,"player":"King Rodriguez"},"Formula 1":{"car":"Formula 1","time":7629,"player":"King Rodriguez"},"Police Corvette 2019":{"car":"Police Corvette 2019","time":14484,"player":"Woltage.2"},"NULL":{"car":"NULL","time":12630,"player":"B. LAO"}},"North GP":{"Neon":{"car":"Neon","time":354856,"player":"ThunderBird"},"Baller":{"car":"Baller","time":410118,"player":"dcapone00"},"NULL":{"car":"NULL","time":191650,"player":"vJack"}},"Race | Cannonball Run":{"2013 Dodge Charger":{"car":"2013 Dodge Charger","time":263368,"player":"vJack"}},"Lakeside Loop":{"NULL":{"car":"NULL","time":206147,"player":"DR*KINGPORNHUB"}},"Airport Circuit":{"Neon":{"car":"Neon","time":92652,"player":"ThunderBird"},"P-996 LAZER":{"car":"P-996 LAZER","time":59216,"player":"ThatGuyJacobee"},"NULL":{"car":"NULL","time":22916,"player":"ThatGuyJacobee"}},"Highway Sprint":{"NULL":{"car":"NULL","time":93300,"player":"vJack"}},"Race | Hillside Loop":{"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","time":230432,"player":"[C-291][GCF-34][MS-13] K. Lee"},"Bronco Wildtrak 2021":{"car":"Bronco Wildtrak 2021","time":210714,"player":"ThatGuyJacobee"},"BMW M8 Widebody":{"car":"BMW M8 Widebody","time":195442,"player":"[C-291][GCF-34][MS-13] K. Lee"}},"North Rallycross ":{"Neon":{"car":"Neon","time":351612,"player":"ThunderBird"}},"Race | Observatory Loop":{"Mazda Miata":{"car":"Mazda Miata","time":79814,"player":"[C-291][GCF-34][MS-13] K. Lee"},"Ford F-150 Lightning 2022":{"car":"Ford F-150 Lightning 2022","time":68440,"player":"ThatGuyJacobee"},"NULL":{"car":"NULL","time":55388,"player":"[YJ-18] Sinapsey"},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","time":56747,"player":"vJack"},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","time":67881,"player":"[C-291][GCF-34][MS-13] K. Lee"},"BMW M5":{"car":"BMW M5","time":81837,"player":"[C-291][GCF-34][MS-13] K. Lee"},"2013 Dodge Charger":{"car":"2013 Dodge Charger","time":64004,"player":"vJack"},"Formula 1":{"car":"Formula 1","time":54744,"player":"ThatGuyJacobee"},"BMW M5 Plus":{"car":"BMW M5 Plus","time":70752,"player":"[EGRP-02]King Rodriguez"},"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","time":76765,"player":"[C-291][GCF-34][MS-13] K. Lee"},"Porsche 911 GT3RS":{"car":"Porsche 911 GT3RS","time":106410,"player":"[YJ-18] Sinapsey"}},"Race | Sandy Airfield":{"2014 Dodge Charger":{"car":"2014 Dodge Charger","time":29132,"player":"King Rodriguez"},"Audi S3 2015":{"car":"Audi S3 2015","time":25742,"player":"King Rodriguez"},"Space Docker":{"car":"Space Docker","time":29122,"player":"DyslexicStoner240."},"Chevy Camaro20":{"car":"Chevy Camaro20","time":32202,"player":"Max Rodriguez"},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","time":29921,"player":"ThatGuyJacobee"},"Formula 1":{"car":"Formula 1","time":15914,"player":"vJack"},"BMW M5 Plus":{"car":"BMW M5 Plus","time":18019,"player":"King Rodriguez"},"BMW i8":{"car":"BMW i8","time":24743,"player":"King Rodriguez"},"2016 Ford Explorer":{"car":"2016 Ford Explorer","time":26526,"player":"King Rodriguez"},"Kawasaki Ninja ZX10R":{"car":"Kawasaki Ninja ZX10R","time":28422,"player":"King Rodriguez"},"NULL":{"car":"NULL","time":26029,"player":"Max "},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","time":19029,"player":"vJack"},"Ford Raptor F-150":{"car":"Ford Raptor F-150","time":28515,"player":"King Rodriguez"},"F-22A":{"car":"F-22A","time":90697,"player":"Yalaina-DDR8"},"Yamaha R6":{"car":"Yamaha R6","time":28188,"player":"ThatGuyJacobee"},"Mini JCW 2020":{"car":"Mini JCW 2020","time":29879,"player":"King Rodriguez"},"Ferrari 458":{"car":"Ferrari 458","time":25352,"player":"Woltage.2"},"Toyota Sienna 2021":{"car":"Toyota Sienna 2021","time":34685,"player":"Max Rodriguez"},"Jeep TrackHawk 2018":{"car":"Jeep TrackHawk 2018","time":22887,"player":"King Rodriguez"},"Bugatti Chiron 2017":{"car":"Bugatti Chiron 2017","time":22371,"player":"King Rodriguez"}},"Observatory Loop":{"NULL":{"car":"NULL","time":34126,"player":"ThatGuyJacobee"}},"BCSO Training Course":{"NULL":{"car":"NULL","time":26915,"player":"ThatGuyJacobee"},"Jester":{"car":"Jester","time":37835,"player":"michael82"}},"Race | BCSO Training Course":{"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","time":105983,"player":"ThatGuyJacobee"},"Schafter V12 (Armored)":{"car":"Schafter V12 (Armored)","time":53363,"player":"Bulvederis"},"2013 Dodge Charger":{"car":"2013 Dodge Charger","time":94246,"player":"vJack"},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","time":78151,"player":"vJack"},"2016 Dodge Ram":{"car":"2016 Dodge Ram","time":119099,"player":"vJack"},"NULL":{"car":"NULL","time":100457,"player":"ThatGuyJacobee"},"Neon":{"car":"Neon","time":105527,"player":"ThunderBird"}},"Race | Lakeside Loop":{"Ford Crown Vic 2011":{"car":"Ford Crown Vic 2011","time":231931,"player":"AnySpiderBat"},"SNOWMOBILE 2020":{"car":"SNOWMOBILE 2020","time":107015,"player":"[C-146] E. Cartman"},"Ferrari 458":{"car":"Ferrari 458","time":177461,"player":"ThatGuyJacobee"},"Adder":{"car":"Adder","time":30689,"player":"Oli"},"NULL":{"car":"NULL","time":196803,"player":"ThatGuyJacobee"},"EGRP Staff Buggy":{"car":"EGRP Staff Buggy","time":43710,"player":"[EGRP-02]King Rodriguez"}},"Race | Highway Sprint":{"Ferrari 458":{"car":"Ferrari 458","time":138033,"player":"ThatGuyJacobee"},"Lamborghini Aventador AVJ":{"car":"Lamborghini Aventador AVJ","time":240744,"player":"Kaleb"},"NULL":{"car":"NULL","time":98074,"player":"DR-KingRodriguez"},"Deveste Eight":{"car":"Deveste Eight","time":181173,"player":"jb3794339"}},"Cannonball Run":{"NULL":{"car":"NULL","time":81298,"player":"ThatGuyJacobee"}}} \ No newline at end of file diff --git a/resources/[EGRP-Discord-Integration]/Discord-Presence/client/main.lua b/resources/[EGRP-Discord-Integration]/Discord-Presence/client/main.lua index 25e12c88b..ab4b33c6a 100644 --- a/resources/[EGRP-Discord-Integration]/Discord-Presence/client/main.lua +++ b/resources/[EGRP-Discord-Integration]/Discord-Presence/client/main.lua @@ -51,7 +51,7 @@ Citizen.CreateThread(function() elseif Config.RichPresenceText == "discordServer" then SetRichPresence(Translation[Config.Locale]['discordserver_text'] ..Config.YourDisordServerLink) elseif Config.RichPresenceText == "customEGRP" then - SetRichPresence(playername.." ID: "..id.." | Players: "..onlinePlayers.." | Currently at: "..zone) + SetRichPresence("ID: "..id.." | Players: "..onlinePlayers.." | Currently at "..zone) else SetRichPresence(Config.RichPresenceText) end @@ -84,7 +84,7 @@ Citizen.CreateThread(function() elseif Config.LargeImageText == "discordServer" then SetDiscordRichPresenceAssetText(Translation[Config.Locale]['discordserver_text'] ..Config.YourDisordServerLink) elseif Config.RichPresenceText == "customEGRP" then - SetRichPresence(playername.." ID: "..id.." | Players: "..onlinePlayers.." | Currently at: "..zone) + SetRichPresence("ID: "..id.." | Players: "..onlinePlayers.." | Currently at "..zone) else SetDiscordRichPresenceAssetText(Config.LargeImageText) end @@ -121,7 +121,7 @@ Citizen.CreateThread(function() elseif Config.SmallImageText == "discordServer" then SetDiscordRichPresenceAssetSmallText(Translation[Config.Locale]['discordserver_text'] ..Config.YourDisordServerLink) elseif Config.RichPresenceText == "customEGRP" then - SetRichPresence(playername.." ID: "..id.." | Players: "..onlinePlayers.." | Currently at: "..zone) + SetRichPresence("ID: "..id.." | Players: "..onlinePlayers.." | Currently at "..zone) else SetDiscordRichPresenceAssetSmallText(Config.SmallImageText) end diff --git a/resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua b/resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua index 88ab50385..f6f747716 100644 --- a/resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua +++ b/resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua @@ -2,7 +2,7 @@ Config = {} Translation = {} Config.ApplicationID = "543866591079694346" -- Enter your Discord Application ID --> https://discord.com/developers/applications/ -Config.UpdateTime = 5 -- 1 = 1 Second -> Updates every Second. Default is 60 Seconds +Config.UpdateTime = 1 -- 1 = 1 Second -> Updates every Second. Default is 60 Seconds Config.Locale = "en" -- Current translations: de, en Config.YourDisordServerLink = "https://discord.elitegami.ng" @@ -36,10 +36,10 @@ Config.LargeImageText = "Elite Gaming RP" -- Text which shows up if you hover im Config.EnableSmallImage = false -- Small Image enabled. Replace true with false to disable. -Config.SmallImageName = "YOUR_IMAGE_NAME" -- Image Name without .png, .jpg, or .jpeg --> https://discord.com/developers/applications/YOUR_APPLICATION_ID/rich-presence/assets +Config.SmallImageName = "fivem" -- Image Name without .png, .jpg, or .jpeg --> https://discord.com/developers/applications/YOUR_APPLICATION_ID/rich-presence/assets Config.EnableSmallImageText = false -- Text which shows up if you hover small image. Replace true with false to disable. -Config.SmallImageText = "standard" -- Text which shows up if you hover image. +Config.SmallImageText = "EGRP on FiveM!" -- Text which shows up if you hover image. @@ -55,8 +55,8 @@ Config.Buttons = { Index = 0, Label = "Discord", URL = "https://discord.com/invite/x6PwsHtVjE" - } - ButtonWebsite = { + }, + { Index = 1, Label = "Connect", URL = "fivem://connect/play.elitegami.ng:30120" diff --git a/resources/[EGRP-Discord-Integration]/RichPresence/Client.lua b/resources/[EGRP-Discord-Integration]/RichPresence/Client.lua deleted file mode 100644 index 91191cfd1..000000000 --- a/resources/[EGRP-Discord-Integration]/RichPresence/Client.lua +++ /dev/null @@ -1,58 +0,0 @@ -local WaitTime = 5000 -- How often do you want to update the status (In MS) - -local DiscordAppId = tonumber(GetConvar("RichAppId", "543866591079694346")) -local DiscordAppAsset = GetConvar("RichAssetId", "eg-blurple") - -Citizen.CreateThread(function() - Citizen.Wait(3000) - SetDiscordAppId(DiscordAppId) - SetDiscordRichPresenceAsset(DiscordAppAsset) - for _, v in pairs(Config.Buttons) do - SetDiscordRichPresenceAction(v.index, v.name, v.url) - end - while true do - local x,y,z = table.unpack(GetEntityCoords(PlayerPedId(),true)) - local StreetHash = GetStreetNameAtCoord(x, y, z) - local onlinePlayers = #GetActivePlayers() - Citizen.Wait(WaitTime) - if StreetHash ~= nil then - miid = GetPlayerServerId(NetworkGetEntityOwner(GetPlayerPed(-1))) - StreetName = GetStreetNameFromHashKey(StreetHash) - if IsPedOnFoot(PlayerPedId()) and not IsEntityInWater(PlayerPedId()) then - if IsPedSprinting(PlayerPedId()) then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Sprinting down "..StreetName) - elseif IsPedRunning(PlayerPedId()) then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Running down "..StreetName) - elseif IsPedWalking(PlayerPedId()) then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Walking down "..StreetName) - elseif IsPedStill(PlayerPedId()) then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Standing on "..StreetName) - end - elseif GetVehiclePedIsUsing(PlayerPedId()) ~= nil and not IsPedInAnyHeli(PlayerPedId()) and not IsPedInAnyPlane(PlayerPedId()) and not IsPedOnFoot(PlayerPedId()) and not IsPedInAnySub(PlayerPedId()) and not IsPedInAnyBoat(PlayerPedId()) then - local MPH = math.ceil(GetEntitySpeed(GetVehiclePedIsUsing(PlayerPedId())) * 2.236936) - local VehName = GetLabelText(GetDisplayNameFromVehicleModel(GetEntityModel(GetVehiclePedIsUsing(PlayerPedId())))) - if MPH > 50 then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Speeding down "..StreetName.." in a "..VehName) - elseif MPH <= 50 and MPH > 0 then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Cruising down "..StreetName.." in a "..VehName) - elseif MPH == 0 then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Parked on "..StreetName.." in a "..VehName) - end - elseif IsPedInAnyHeli(PlayerPedId()) or IsPedInAnyPlane(PlayerPedId()) then - local VehName = GetLabelText(GetDisplayNameFromVehicleModel(GetEntityModel(GetVehiclePedIsUsing(PlayerPedId())))) - if IsEntityInAir(GetVehiclePedIsUsing(PlayerPedId())) or GetEntityHeightAboveGround(GetVehiclePedIsUsing(PlayerPedId())) > 5.0 then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Flying over "..StreetName.." in a "..VehName) - else - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Landed at "..StreetName.." in a "..VehName) - end - elseif IsEntityInWater(PlayerPedId()) then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Swimming around") - elseif IsPedInAnyBoat(PlayerPedId()) and IsEntityInWater(GetVehiclePedIsUsing(PlayerPedId())) then - local VehName = GetLabelText(GetDisplayNameFromVehicleModel(GetEntityModel(GetVehiclePedIsUsing(PlayerPedId())))) - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | Sailing around in a "..VehName) - elseif IsPedInAnySub(PlayerPedId()) and IsEntityInWater(GetVehiclePedIsUsing(PlayerPedId())) then - SetRichPresence("ID: "..miid.." | Players: "..onlinePlayers.." | In a yellow submarine") - end - end - end -end) diff --git a/resources/[EGRP-Discord-Integration]/RichPresence/Config.lua b/resources/[EGRP-Discord-Integration]/RichPresence/Config.lua deleted file mode 100644 index 5d6d37dc9..000000000 --- a/resources/[EGRP-Discord-Integration]/RichPresence/Config.lua +++ /dev/null @@ -1,5 +0,0 @@ -Config = {} -Config.Buttons = { - {index = 0,name = 'Website',url = 'https://elite-gaming.co.uk'}, - {index = 1,name = 'Connect',url = 'fivem://connect/fivem.eguk.me:30120'} -} \ No newline at end of file diff --git a/resources/[EGRP-Discord-Integration]/RichPresence/fxmanifest.lua b/resources/[EGRP-Discord-Integration]/RichPresence/fxmanifest.lua deleted file mode 100644 index e6abcb3ca..000000000 --- a/resources/[EGRP-Discord-Integration]/RichPresence/fxmanifest.lua +++ /dev/null @@ -1,6 +0,0 @@ -fx_version 'adamant' - -game 'gta5' - -shared_script 'Config.lua' -client_script 'Client.lua' diff --git a/resources/fivepd/config.json b/resources/fivepd/config.json index fdc0f9812..a38fac827 100644 --- a/resources/fivepd/config.json +++ b/resources/fivepd/config.json @@ -30,7 +30,7 @@ "maxCallsignLength": 15, "adminCode": "egrp_police_ADMIN", "discord": { - "enable": true, + "enable": false, "token": "" }, "dutyNotification": true, diff --git a/resources/fivepd/config/items.json b/resources/fivepd/config/items.json index 22cf30df5..8161ddad6 100644 --- a/resources/fivepd/config/items.json +++ b/resources/fivepd/config/items.json @@ -3673,5 +3673,5 @@ "isIllegal": false, "multiplier": 15, "itemLocation": 0 - }, + } ] \ No newline at end of file diff --git a/server.cfg b/server.cfg index b29e3fa87..86d3a4a2b 100644 --- a/server.cfg +++ b/server.cfg @@ -183,7 +183,7 @@ start cvpiv8 start r_pepperspray #[-----Discord Perms-----] -start RichPresence +start Discord-Presence start discord_perms start Badger_Discord_API start Discord-VehRestriction @@ -504,6 +504,7 @@ add_ace group.helper jd.staff allow add_ace group.superadmin hypnonema allow add_ace group.admin hypnonema allow add_ace group.moderator hypnonema allow +add_ace group.helper hypnonema allow # remove the # to hide player endpoints in external log output sv_endpointprivacy true