diff --git a/CoreRT.dll b/CoreRT.dll
index 27f3144d0..5af33fe4b 100644
Binary files a/CoreRT.dll and b/CoreRT.dll differ
diff --git a/FXServer.exe b/FXServer.exe
index 4284d0fa4..8f8b6d4c5 100644
Binary files a/FXServer.exe and b/FXServer.exe differ
diff --git a/botan.dll b/botan.dll
index 16c2ec6c0..7e0719cf8 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 f6cd25cbe..1608ef45a 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 8bfd65967..75d34e9c9 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 a14ddd1d1..6067f3645 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 d8d6c7679..9a4ada395 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 b7745039d..8d1574e81 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 92b7200cd..11c947289 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 de80abb91..c0971469f 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 ad932059f..7d4441d83 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 23f15522e..121fd9a00 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 45a441aaf..792d3ee91 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 8b498a69c..9a14d25c0 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 7ea8c7a3f..9ec825fbd 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 016597b6b..ab7060294 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 d743907c5..6aef04a6a 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 c165eaff3..c3fd05cdc 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 226784d8c..9bfed7d72 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 b12d7d3ee..f80cf7de8 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 0421f69d8..dca2f9e9e 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 4e095bce7..077168b14 100644
Binary files a/citizen-server-state-rdr3sv.dll and b/citizen-server-state-rdr3sv.dll differ
diff --git a/conhost-server.dll b/conhost-server.dll
index 12e8c8790..97c0f609d 100644
Binary files a/conhost-server.dll and b/conhost-server.dll differ
diff --git a/debug-script.dll b/debug-script.dll
index 3ab6d3d2a..873d306db 100644
Binary files a/debug-script.dll and b/debug-script.dll differ
diff --git a/devcon.dll b/devcon.dll
index fb912ce0e..24eaaf0bd 100644
Binary files a/devcon.dll and b/devcon.dll differ
diff --git a/http-client.dll b/http-client.dll
index fe7dd4b28..2b4dd18cc 100644
Binary files a/http-client.dll and b/http-client.dll differ
diff --git a/hypnonema.db b/hypnonema.db
index d90bc7e65..568a78f9a 100644
Binary files a/hypnonema.db and b/hypnonema.db differ
diff --git a/imgui.dll b/imgui.dll
index 1ef8068c8..ee38b8e75 100644
Binary files a/imgui.dll and b/imgui.dll differ
diff --git a/libuv.dll b/libuv.dll
index 53f2aefe7..ab1337ff3 100644
Binary files a/libuv.dll and b/libuv.dll differ
diff --git a/net-base.dll b/net-base.dll
index a81e5c247..16a4a3957 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 5e6ed5dc4..30c112f5e 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 8a298c4d9..ae80a4e47 100644
Binary files a/net-tcp-server.dll and b/net-tcp-server.dll differ
diff --git a/nng.dll b/nng.dll
index 1ae290411..9efd0dacc 100644
Binary files a/nng.dll and b/nng.dll differ
diff --git a/node.dll b/node.dll
index a1a03ed0e..c53a934ef 100644
Binary files a/node.dll and b/node.dll differ
diff --git a/resources/Custom-Commands/client.lua b/resources/Custom-Commands/client.lua
index be3761944..694d354d7 100644
--- a/resources/Custom-Commands/client.lua
+++ b/resources/Custom-Commands/client.lua
@@ -11,7 +11,7 @@
--------------------RESPONSE COMMANDS--------------------------
RegisterCommand("discord", function(source, args, rawCommand) -------- replace "discord" with any other command you want **DON'T INCLUDE /**
- TriggerEvent("chatMessage", "^*^8[Our Discord:] ^7discord.eguk.me") ------- change message in the ""
+ TriggerEvent("chatMessage", "^*^8[Our Discord:] ^7discord.elite-gaming.gg") ------- change message in the ""
end)
--RegisterCommand("cad", function(source, args, rawCommand) ------- replace "cad" with any other command you want DON'T INCLUDE /
@@ -19,11 +19,11 @@ end)
--end)
RegisterCommand("website", function(source, args, rawCommand) ------- replace "website" with any other command you want DON'T INCLUDE /
- TriggerEvent("chatMessage", "^*^8[Our Website:] ^7https://elite-gaming.co.uk/") ------- change message in the ""
+ TriggerEvent("chatMessage", "^*^8[Our Website:] ^7elite-gaming.gg") ------- change message in the ""
end)
RegisterCommand("forum", function(source, args, rawCommand) ------- replace "website" with any other command you want DON'T INCLUDE /
- TriggerEvent("chatMessage", "^*^8[Our Forum:] ^7https://forum.elite-gaming.co.uk/") ------- change message in the ""
+ TriggerEvent("chatMessage", "^*^8[Our Forum:] ^7forum.elite-gaming.gg") ------- change message in the ""
end)
--RegisterCommand("commands", function(source, args, rawCommand) ------- replace "commands" with any other command you want DON'T INCLUDE /
diff --git a/resources/Fire-Script/whitelist.json b/resources/Fire-Script/whitelist.json
index 3f068926e..6dbcc3bfb 100644
--- a/resources/Fire-Script/whitelist.json
+++ b/resources/Fire-Script/whitelist.json
@@ -1 +1 @@
-{"steam:110000131ff8eae":true,"steam:110000112db6102":true,"steam:110000147619e76":true}
\ No newline at end of file
+{"steam:110000112db6102":true,"steam:110000147619e76":true,"steam:110000131ff8eae":true,"steam:11000010e6980a7":true}
\ No newline at end of file
diff --git a/resources/Holograms/holograms.lua b/resources/Holograms/holograms.lua
index 297875b16..bdfddc931 100644
--- a/resources/Holograms/holograms.lua
+++ b/resources/Holograms/holograms.lua
@@ -32,15 +32,15 @@ function Holograms()
Citizen.Wait(0)
-- Spawn - Welcome to EGRP
if GetDistanceBetweenCoords( -868.95, -429.17, 37.14, GetEntityCoords(GetPlayerPed(-1))) < 27.5 then
- Draw3DText( -868.95, -429.17, 37.14 -1.400, "Welcome to Elite Gaming RP!", 4, 0.2, 0.2)
+ Draw3DText( -868.95, -429.17, 37.14 -1.400, "Welcome to Elite Gaming!", 4, 0.2, 0.2)
Draw3DText( -868.95, -429.17, 37.14 -1.800, "Use F7 to find our rules and info.", 4, 0.15, 0.15)
end
-- Spawn - Links
if GetDistanceBetweenCoords( -857.60, -411.40, 37.64, GetEntityCoords(GetPlayerPed(-1))) < 32.5 then
Draw3DText( -857.60, -411.40, 37.64 -1.400, "Our Socials:", 4, 0.2, 0.2)
- Draw3DText( -857.60, -411.40, 37.64 -1.750, "Discord: discord.elitegami.ng", 4, 0.15, 0.15)
+ Draw3DText( -857.60, -411.40, 37.64 -1.750, "Discord: discord.elite-gaming.gg", 4, 0.15, 0.15)
Draw3DText( -857.60, -411.40, 37.64 -2.050, "Website: elite-gaming.gg", 4, 0.15, 0.15)
- Draw3DText( -857.60, -411.40, 37.64 -2.350, "CAD: cad.elite-gaming.gg", 4, 0.15, 0.15)
+ --Draw3DText( -857.60, -411.40, 37.64 -2.350, "CAD: cad.elite-gaming.gg", 4, 0.15, 0.15)
--Draw3DText( -857.60, -411.40, 37.64 -2.650, "Forum: forum.elite-gaming.gg", 4, 0.15, 0.15)
--Draw3DText( -857.60, -411.40, 37.64 -2.950, "Twitter: @EliteGamingUK_", 4, 0.15, 0.15)
--Draw3DText( -857.60, -411.40, 37.64 -3.250, "Instagram: @EliteGaming_UK", 4, 0.15, 0.15)
diff --git a/resources/Timetrials/scores.txt b/resources/Timetrials/scores.txt
index 08ed4b923..768338cc4 100644
--- a/resources/Timetrials/scores.txt
+++ b/resources/Timetrials/scores.txt
@@ -1 +1 @@
-{"Race | Sandy Airfield":{"Harley Davidson":{"car":"Harley Davidson","player":"Max Rodriguez","time":34914},"2014 Dodge Charger":{"car":"2014 Dodge Charger","player":"King Rodriguez","time":29132},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":29921},"Space Docker":{"car":"Space Docker","player":"DyslexicStoner240.","time":29122},"Mini JCW 2020":{"car":"Mini JCW 2020","player":"King Rodriguez","time":29879},"BMW M5 Plus":{"car":"BMW M5 Plus","player":"King Rodriguez","time":18019},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":19029},"Kawasaki Ninja ZX10R":{"car":"Kawasaki Ninja ZX10R","player":"King Rodriguez","time":28422},"Jeep TrackHawk 2018":{"car":"Jeep TrackHawk 2018","player":"King Rodriguez","time":22887},"NULL":{"car":"NULL","player":"Max ","time":26029},"Ford Raptor F-150":{"car":"Ford Raptor F-150","player":"King Rodriguez","time":28515},"Bugatti Chiron 2017":{"car":"Bugatti Chiron 2017","player":"King Rodriguez","time":22371},"Ferrari 458":{"car":"Ferrari 458","player":"Woltage.2","time":25352},"Audi S3 2015":{"car":"Audi S3 2015","player":"King Rodriguez","time":25742},"Toyota Sienna 2021":{"car":"Toyota Sienna 2021","player":"Max Rodriguez","time":34685},"F-22A":{"car":"F-22A","player":"Yalaina-DDR8","time":90697},"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},"2016 Ford Explorer":{"car":"2016 Ford Explorer","player":"King Rodriguez","time":26526},"BMW i8":{"car":"BMW i8","player":"King Rodriguez","time":24743}},"Lakeside Loop":{"NULL":{"car":"NULL","player":"DR*KINGPORNHUB","time":206147}},"Race | BCSO Training Course":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":100457},"Schafter V12 (Armored)":{"car":"Schafter V12 (Armored)","player":"Bulvederis","time":53363},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":105983},"2016 Dodge Ram":{"car":"2016 Dodge Ram","player":"vJack","time":119099},"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}},"Race | Highway Sprint":{"NULL":{"car":"NULL","player":"DR-KingRodriguez","time":98074},"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":138033},"Lamborghini Aventador AVJ":{"car":"Lamborghini Aventador AVJ","player":"Kaleb","time":240744},"Deveste Eight":{"car":"Deveste Eight","player":"jb3794339","time":181173}},"Race | Airport Circuit":{"Formula 1":{"car":"Formula 1","player":"vJack","time":42751},"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":69880},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":83978}},"Sandy Airfield":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":5607},"RE-7B":{"car":"RE-7B","player":"*ZbyniU*","time":28456},"Neon":{"car":"Neon","player":"ThunderBird","time":30312},"BMX":{"car":"BMX","player":"vJack","time":21014},"Maverick":{"car":"Maverick","player":"vJack","time":29165},"Oppressor":{"car":"Oppressor","player":"michael82","time":21360},"Vigilante":{"car":"Vigilante","player":"*ZbyniU*","time":6172},"FH-1 Hunter":{"car":"FH-1 Hunter","player":"*ZbyniU*","time":36289},"Jester":{"car":"Jester","player":"michael82","time":47982}},"Hollywood Hills":{"NULL":{"car":"NULL","player":"Kryplos125","time":120053}},"North GP":{"NULL":{"car":"NULL","player":"vJack","time":191650},"Neon":{"car":"Neon","player":"ThunderBird","time":354856},"Baller":{"car":"Baller","player":"dcapone00","time":410118}},"Observatory Loop":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":34126}},"BCSO Training Course":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":26915},"Jester":{"car":"Jester","player":"michael82","time":37835}},"Race | Timetrial Event - 04/04/21":{"Ford Velociraptor 6x6":{"car":"Ford Velociraptor 6x6","player":"ThatGuyJacobee","time":132814},"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}},"Race | Hollywood Hills":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":102048},"Audi R8 V10":{"car":"Audi R8 V10","player":"ThatGuyJacobee","time":100677},"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 | Hillside Loop":{"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},"BMW M8 Widebody":{"car":"BMW M8 Widebody","player":"[C-291][GCF-34][MS-13] K. Lee","time":195442}},"Race | Airport Drag Race":{"NULL":{"car":"NULL","player":"DR-KingRodriguez","time":9270}},"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}},"Race | North GP":{"NULL":{"car":"NULL","player":"SOGGYBEAN","time":42917},"SNOWMOBILE 2020":{"car":"SNOWMOBILE 2020","player":"ThatGuyJacobee","time":387242},"BMW M5":{"car":"BMW M5","player":"Stormzy","time":115460},"Windsor Drop":{"car":"Windsor Drop","player":"[C-81][GCF-145] R. Freeman","time":66673},"2014 Pierce prescue":{"car":"2014 Pierce prescue","player":"Klimek07","time":83300},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":217283}},"Highway Sprint":{"NULL":{"car":"NULL","player":"vJack","time":93300}},"Race | Lakeside Loop":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":196803},"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},"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":177461},"Ford Crown Vic 2011":{"car":"Ford Crown Vic 2011","player":"AnySpiderBat","time":231931},"Adder":{"car":"Adder","player":"Oli","time":30689}},"North Rallycross ":{"Neon":{"car":"Neon","player":"ThunderBird","time":351612}},"Race | Airport Drag":{"NULL":{"car":"NULL","player":"B. LAO","time":12630},"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},"BMW M5 Plus":{"car":"BMW M5 Plus","player":"King Rodriguez","time":8652},"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}},"Race | Observatory Loop":{"NULL":{"car":"NULL","player":"[YJ-18] Sinapsey","time":55388},"2013 Dodge Charger":{"car":"2013 Dodge Charger","player":"vJack","time":64004},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"[C-291][GCF-34][MS-13] K. Lee","time":67881},"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},"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee","time":76765},"BMW M5":{"car":"BMW M5","player":"[C-291][GCF-34][MS-13] K. Lee","time":81837},"Formula 1":{"car":"Formula 1","player":"ThatGuyJacobee","time":54744},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":56747},"Porsche 911 GT3RS":{"car":"Porsche 911 GT3RS","player":"[YJ-18] Sinapsey","time":106410},"Mazda Miata":{"car":"Mazda Miata","player":"[C-291][GCF-34][MS-13] K. Lee","time":79814}},"Cannonball Run":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":81298}}}
\ No newline at end of file
+{"Race | North GP":{"SNOWMOBILE 2020":{"player":"ThatGuyJacobee","time":387242,"car":"SNOWMOBILE 2020"},"BMW M5":{"player":"Stormzy","time":115460,"car":"BMW M5"},"NULL":{"player":"SOGGYBEAN","time":42917,"car":"NULL"},"Windsor Drop":{"player":"[C-81][GCF-145] R. Freeman","time":66673,"car":"Windsor Drop"},"2014 Pierce prescue":{"player":"Klimek07","time":83300,"car":"2014 Pierce prescue"},"Mercedes AMG GTS":{"player":"vJack","time":217283,"car":"Mercedes AMG GTS"}},"Race | Cannonball Run":{"2013 Dodge Charger":{"player":"vJack","time":263368,"car":"2013 Dodge Charger"}},"Airport Drag Race":{"NULL":{"player":"iwan.ralphs","time":7030,"car":"NULL"}},"Highway Sprint":{"NULL":{"player":"vJack","time":93300,"car":"NULL"}},"Cannonball Run":{"NULL":{"player":"ThatGuyJacobee","time":81298,"car":"NULL"}},"Race | Observatory Loop":{"Porsche 911 GT3RS":{"player":"[YJ-18] Sinapsey","time":106410,"car":"Porsche 911 GT3RS"},"2013 Dodge Charger":{"player":"vJack","time":64004,"car":"2013 Dodge Charger"},"Mercedes AMG GTS":{"player":"vJack","time":56747,"car":"Mercedes AMG GTS"},"Nissan Skyline GTR":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":67881,"car":"Nissan Skyline GTR"},"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":76765,"car":"Gauntlet Classic Custom"},"BMW M5":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":81837,"car":"BMW M5"},"Mazda Miata":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":79814,"car":"Mazda Miata"},"BMW M5 Plus":{"player":"[EGRP-02]King Rodriguez","time":70752,"car":"BMW M5 Plus"},"Formula 1":{"player":"ThatGuyJacobee","time":54744,"car":"Formula 1"},"Ford F-150 Lightning 2022":{"player":"ThatGuyJacobee","time":68440,"car":"Ford F-150 Lightning 2022"},"NULL":{"player":"[YJ-18] Sinapsey","time":55388,"car":"NULL"}},"Race | Sandy Airfield":{"Audi S3 2015":{"player":"King Rodriguez","time":25742,"car":"Audi S3 2015"},"Mini JCW 2020":{"player":"King Rodriguez","time":29879,"car":"Mini JCW 2020"},"Chevy Silverado 1500 4dr Cab 2006":{"player":"herediaaldo4","time":29263,"car":"Chevy Silverado 1500 4dr Cab 2006"},"2016 Ford Explorer":{"player":"King Rodriguez","time":26526,"car":"2016 Ford Explorer"},"Toyota Sienna 2021":{"player":"Max Rodriguez","time":34685,"car":"Toyota Sienna 2021"},"Jeep TrackHawk 2018":{"player":"King Rodriguez","time":22887,"car":"Jeep TrackHawk 2018"},"Formula 1":{"player":"vJack","time":15914,"car":"Formula 1"},"Bugatti Chiron 2017":{"player":"King Rodriguez","time":22371,"car":"Bugatti Chiron 2017"},"2014 Dodge Charger":{"player":"King Rodriguez","time":29132,"car":"2014 Dodge Charger"},"Dodge Ram 2dr 1500 srt 2010":{"player":"Max Rodriguez ","time":21999,"car":"Dodge Ram 2dr 1500 srt 2010"},"Ford Raptor F-150":{"player":"King Rodriguez","time":28515,"car":"Ford Raptor F-150"},"NULL":{"player":"Max ","time":26029,"car":"NULL"},"Dodge Challenger srt 2020 ":{"player":"herediaaldo4","time":22940,"car":"Dodge Challenger srt 2020 "},"Chevy Camaro20":{"player":"Max Rodriguez","time":32202,"car":"Chevy Camaro20"},"Ferrari 458":{"player":"Woltage.2","time":25352,"car":"Ferrari 458"},"BMW M5 Plus":{"player":"King Rodriguez","time":18019,"car":"BMW M5 Plus"},"GMC Sierra Singlecab 2006":{"player":"herediaaldo4","time":34750,"car":"GMC Sierra Singlecab 2006"},"Kawasaki Ninja ZX10R":{"player":"King Rodriguez","time":28422,"car":"Kawasaki Ninja ZX10R"},"Yamaha R6":{"player":"ThatGuyJacobee","time":28188,"car":"Yamaha R6"},"Mercedes AMG GTS":{"player":"vJack","time":19029,"car":"Mercedes AMG GTS"},"F-22A":{"player":"Yalaina-DDR8","time":90697,"car":"F-22A"},"Harley Davidson":{"player":"Max Rodriguez","time":34914,"car":"Harley Davidson"},"BMW i8":{"player":"King Rodriguez","time":24743,"car":"BMW i8"},"Chevrolet Silverado 2005 2dr":{"player":"herediaaldo4","time":26183,"car":"Chevrolet Silverado 2005 2dr"},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","time":29921,"car":"Nissan Skyline GTR"},"Space Docker":{"player":"DyslexicStoner240.","time":29122,"car":"Space Docker"}},"Race | Hollywood Hills":{"NULL":{"player":"ThatGuyJacobee","time":102048,"car":"NULL"},"Audi R8 V10":{"player":"ThatGuyJacobee","time":100677,"car":"Audi R8 V10"},"Ford F-150 Lightning 2022":{"player":"ThatGuyJacobee","time":105278,"car":"Ford F-150 Lightning 2022"},"Mercedes AMG GTS":{"player":"vJack","time":85823,"car":"Mercedes AMG GTS"}},"Race | Airport Drag":{"BMW M5 Plus":{"player":"King Rodriguez","time":8652,"car":"BMW M5 Plus"},"2010 Chevy Tahoe":{"player":"King Rodriguez","time":12821,"car":"2010 Chevy Tahoe"},"Police Corvette 2019":{"player":"Woltage.2","time":14484,"car":"Police Corvette 2019"},"NULL":{"player":"B. LAO","time":12630,"car":"NULL"},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","time":9693,"car":"Nissan Skyline GTR"},"Formula 1":{"player":"King Rodriguez","time":7629,"car":"Formula 1"}},"Race | Airport Drag Race":{"NULL":{"player":"DR-KingRodriguez","time":9270,"car":"NULL"}},"Race | Lakeside Loop":{"SNOWMOBILE 2020":{"player":"[C-146] E. Cartman","time":107015,"car":"SNOWMOBILE 2020"},"Adder":{"player":"Oli","time":30689,"car":"Adder"},"Ferrari 458":{"player":"ThatGuyJacobee","time":177461,"car":"Ferrari 458"},"NULL":{"player":"ThatGuyJacobee","time":196803,"car":"NULL"},"EGRP Staff Buggy":{"player":"[EGRP-02]King Rodriguez","time":43710,"car":"EGRP Staff Buggy"},"Ford Crown Vic 2011":{"player":"AnySpiderBat","time":231931,"car":"Ford Crown Vic 2011"}},"Race | BCSO Training Course":{"2013 Dodge Charger":{"player":"vJack","time":94246,"car":"2013 Dodge Charger"},"Neon":{"player":"ThunderBird","time":105527,"car":"Neon"},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","time":105983,"car":"Nissan Skyline GTR"},"NULL":{"player":"ThatGuyJacobee","time":100457,"car":"NULL"},"2016 Dodge Ram":{"player":"vJack","time":119099,"car":"2016 Dodge Ram"},"Schafter V12 (Armored)":{"player":"Bulvederis","time":53363,"car":"Schafter V12 (Armored)"},"Mercedes AMG GTS":{"player":"vJack","time":78151,"car":"Mercedes AMG GTS"}},"Race | Highway Sprint":{"Ferrari 458":{"player":"ThatGuyJacobee","time":138033,"car":"Ferrari 458"},"Deveste Eight":{"player":"jb3794339","time":181173,"car":"Deveste Eight"},"Lamborghini Aventador AVJ":{"player":"Kaleb","time":240744,"car":"Lamborghini Aventador AVJ"},"NULL":{"player":"DR-KingRodriguez","time":98074,"car":"NULL"}},"Lakeside Loop":{"NULL":{"player":"DR*KINGPORNHUB","time":206147,"car":"NULL"}},"Race | Timetrial Event - 04/04/21":{"Ford Velociraptor 6x6":{"player":"ThatGuyJacobee","time":132814,"car":"Ford Velociraptor 6x6"},"Chevrolet Silverado 1980":{"player":"King Rodriguez","time":156244,"car":"Chevrolet Silverado 1980"},"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":191695,"car":"Gauntlet Classic Custom"}},"Race | Hillside Loop":{"Bronco Wildtrak 2021":{"player":"ThatGuyJacobee","time":210714,"car":"Bronco Wildtrak 2021"},"Gauntlet Classic Custom":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":230432,"car":"Gauntlet Classic Custom"},"BMW M8 Widebody":{"player":"[C-291][GCF-34][MS-13] K. Lee","time":195442,"car":"BMW M8 Widebody"}},"North Rallycross ":{"Neon":{"player":"ThunderBird","time":351612,"car":"Neon"}},"Sandy Airfield":{"Oppressor":{"player":"michael82","time":21360,"car":"Oppressor"},"Jester":{"player":"michael82","time":47982,"car":"Jester"},"Maverick":{"player":"vJack","time":29165,"car":"Maverick"},"FH-1 Hunter":{"player":"*ZbyniU*","time":36289,"car":"FH-1 Hunter"},"Neon":{"player":"ThunderBird","time":30312,"car":"Neon"},"RE-7B":{"player":"*ZbyniU*","time":28456,"car":"RE-7B"},"Vigilante":{"player":"*ZbyniU*","time":6172,"car":"Vigilante"},"BMX":{"player":"vJack","time":21014,"car":"BMX"},"NULL":{"player":"ThatGuyJacobee","time":5607,"car":"NULL"}},"Observatory Loop":{"NULL":{"player":"ThatGuyJacobee","time":34126,"car":"NULL"}},"Race | Airport Circuit":{"Ferrari 458":{"player":"ThatGuyJacobee","time":69880,"car":"Ferrari 458"},"Nissan Skyline GTR":{"player":"ThatGuyJacobee","time":83978,"car":"Nissan Skyline GTR"},"Formula 1":{"player":"vJack","time":42751,"car":"Formula 1"}},"BCSO Training Course":{"NULL":{"player":"ThatGuyJacobee","time":26915,"car":"NULL"},"Jester":{"player":"michael82","time":37835,"car":"Jester"}},"North GP":{"NULL":{"player":"vJack","time":191650,"car":"NULL"},"Neon":{"player":"ThunderBird","time":354856,"car":"Neon"},"Baller":{"player":"dcapone00","time":410118,"car":"Baller"}},"Airport Circuit":{"NULL":{"player":"ThatGuyJacobee","time":22916,"car":"NULL"},"P-996 LAZER":{"player":"ThatGuyJacobee","time":59216,"car":"P-996 LAZER"},"Neon":{"player":"ThunderBird","time":92652,"car":"Neon"}},"Hollywood Hills":{"NULL":{"player":"Kryplos125","time":120053,"car":"NULL"}}}
\ No newline at end of file
diff --git a/resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua b/resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua
index f6f747716..638368e51 100644
--- a/resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua
+++ b/resources/[EGRP-Discord-Integration]/Discord-Presence/config.lua
@@ -31,7 +31,7 @@ Config.EnableLargeImage = true -- Large Image enabled. Replace true with false t
Config.LargeImageName = "eg-blurple" -- Image Name without .png, .jpg, or .jpeg --> https://discord.com/developers/applications/YOUR_APPLICATION_ID/rich-presence/assets
Config.EnableLargeImageText = true -- Text which shows up if you hover large image. Replace true with false to disable.
-Config.LargeImageText = "Elite Gaming RP" -- Text which shows up if you hover image.
+Config.LargeImageText = "Elite Gaming FiveM" -- Text which shows up if you hover image.
@@ -59,7 +59,7 @@ Config.Buttons = {
{
Index = 1,
Label = "Connect",
- URL = "fivem://connect/play.elitegami.ng:30120"
+ URL = "fivem://connect/play.elite-gaming.gg:30120"
}
}
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/LICENSE b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/LICENSE
new file mode 100644
index 000000000..e7d69ab04
--- /dev/null
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Jared Scarito
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/README.md b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/README.md
new file mode 100644
index 000000000..ba26aaf8c
--- /dev/null
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/README.md
@@ -0,0 +1,67 @@
+# DiscordWeaponPerms
+## Continued Documentation
+https://docs.badger.store/fivem-discord-scripts/discordweaponperms
+## Discontinued Documentation
+**Version 1.0**
+
+Another discord script of course! With this script, you can restrict weapons to certain roles on your discord server! This script also allows restricting certain attachments to different groups as well (however, it'll remove the weapon if they have the attachment, I'll eventually update it to just remove the attachment from the weapon).
+
+https://i.gyazo.com/52a7106f1db9c309c28ff012b8127ae2.gif
+
+You must set up IllusiveTea's discord_perms script for this to work properly. --> https://forum.fivem.net/t/discord-roles-for-permissions-im-creative-i-know/233805
+
+**How it works**
+```
+roleList = {
+1, -- Trusted Civ (1)
+1, -- Donator (2)
+1, -- Personal (3)
+}
+```
+responds to it's respective number within the other list:
+```
+restrictedWeapons = {
+{}, -- Trusted Civ (1)
+{}, -- Donator (2)
+{
+"WEAPON_RPG",
+}, -- Personal (3)
+}
+```
+
+The RPG weapon would then be restricted to only people with personal discord role within your discord server.
+
+It's quite simple :slight_smile:
+
+
+**Installation**
+1. Download DiscordWeaponPerms
+2. Extract the .zip and place the folder in your /resources/ of your Fivem server
+3. Make sure you add “start DiscordWeaponPerms” in your server.cfg
+4. Enjoy :slight_smile:
+
+**Download**
+[DiscordWeaponPerms](https://github.com/TheWolfBadger/DiscordWeaponPerms)
+
+
+
+**My Other Work**
+
+[DiscordChatRoles](https://forum.fivem.net/t/discordchatroles-release/566338)
+
+[DiscordAcePerms](https://forum.fivem.net/t/discordaceperms-release/573044)
+
+[SandyVehiclesRestrict](https://forum.fivem.net/t/release-sandy-vehicles-restrict/564929)
+
+[DiscordTagIDs](https://forum.fivem.net/t/discordtagids-i-know-i-know-i-only-make-discord-based-scripts/582513)
+
+[DiscordVehiclesRestrict](https://forum.fivem.net/t/discordvehiclesrestrict/599594)
+
+[DiscordPedPerms](https://forum.fivem.net/t/release-discordpedperms/642866)
+
+[BadgerAnims](https://forum.fivem.net/t/release-badgeranims/650517)
+
+[DiscordWeaponPerms](https://forum.fivem.net/t/release-discordweaponperms/664774)
+
+**Version 2.0**
+- Removing restricted weapon attachments from weapon instead of whole weapon?
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/__resource.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/__resource.lua
similarity index 100%
rename from resources/[EGRP-Discord-Integration]/Discord-WepRestriction/__resource.lua
rename to resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/__resource.lua
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/client.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/client.lua
new file mode 100644
index 000000000..1b950a729
--- /dev/null
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/client.lua
@@ -0,0 +1,82 @@
+--------------------------
+--- DiscordWeaponPerms ---
+--------------------------
+restrictedWeapons = {
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 1
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 3
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 4
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 5
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 6
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 7
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 8
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 9
+{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 10
+{}, -- 11
+{}, -- 12
+{}, -- 13
+{}, -- 14
+{}, -- 15
+}
+--[[
+Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components
+Weapon list: https://runtime.fivem.net/doc/natives/#_0xBF0FD6E56C964FCB
+]]--
+isAllowed = {}
+RegisterNetEvent('DiscordWeaponPerms:CheckPerms:Return')
+AddEventHandler('DiscordWeaponPerms:CheckPerms:Return', function(hasPerms)
+ isAllowed = hasPerms
+end)
+function has_value (tab, val)
+ for index, value in ipairs(tab) do
+ if value == val then
+ return true
+ end
+ end
+ return false
+end
+alreadyRan = false
+Citizen.CreateThread(function()
+ while true do
+ Citizen.Wait(1000)
+ if not alreadyRan then
+ TriggerServerEvent("DiscordWeaponPerms:CheckPerms")
+ alreadyRan = true
+ end
+ --TriggerServerEvent("Print:PrintDebug", "It gets here 1") -- DEBUG - GET RID OF
+ local ped = GetPlayerPed(-1)
+ local weapon = GetSelectedPedWeapon(ped)
+ local restrictedStr = ""
+ local requiredPerm = nil
+ for i=1, #restrictedWeapons do
+ local weaponArr = restrictedWeapons[i]
+ for j=1, #weaponArr do
+ -- Check if the weapon is restricted and for what group, or if it's the attachment
+ if weapon == GetHashKey(weaponArr[j]) then
+ -- This weapon is restricted unless they have this role perm
+ requiredPerm = i
+ restrictedStr = weaponArr[j]
+ break
+ elseif (HasPedGotWeaponComponent(ped, weapon, GetHashKey(weaponArr[j]))) then
+ -- It's restricted unless they have this role perm
+ requiredPerm = i
+ restrictedStr = weaponArr[j]
+ break
+ end
+ end
+ end
+ --TriggerServerEvent("Print:PrintDebug", "It gets here 2") -- DEBUG - GET RID OF
+ -- Check their perms
+ if not has_value(isAllowed, requiredPerm) and requiredPerm ~= nil then
+ -- Does not have perms to use this
+ RemoveWeaponFromPed(ped, weapon)
+ DisplayNotification("~r~Weapon Restricted! \n~w~You aren't a high enough rank to use this!\n" .. restrictedStr)
+ end
+ --TriggerServerEvent("Print:PrintDebug", "It gets here 3") -- DEBUG - GET RID OF
+ end
+end)
+
+function DisplayNotification( text )
+ SetNotificationTextEntry( "STRING" )
+ AddTextComponentString( text )
+ DrawNotification( false, false )
+end
\ No newline at end of file
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/server.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/server.lua
new file mode 100644
index 000000000..ec19f9b38
--- /dev/null
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction-Legacy/server.lua
@@ -0,0 +1,53 @@
+--------------------------
+--- DiscordWeaponPerms ---
+--------------------------
+roleList = {
+"Civilian I", -- Civilian I (1)
+"Civilian II", -- Civilian II (2)
+"Civilian III", -- Civilian III (3)
+"Civilian IV", -- Civilian IV (4)
+"Civilian V", -- Civilian V (5)
+"EG | Helper", -- Mod (6)
+"EG | Staff", -- Admin (7)
+"EG | Sr. Staff", -- Management (8)
+"EG | Moderator", -- Owner (9)
+"EG | Sr. Moderator", -- Owner (10)
+"EG | Admin", -- Owner (11)
+"EG | Sr. Admin", -- Owner (12)
+"EG | Head of Staff", -- Owner (13)
+"EG | Server Developer", -- Owner (14)
+"EG | Owner", -- Owner (15)
+}
+
+
+RegisterNetEvent('Print:PrintDebug')
+AddEventHandler('Print:PrintDebug', function(msg)
+ print(msg)
+ TriggerClientEvent('chatMessage', -1, "^7[^1Badger's Scripts^7] ^1DEBUG ^7" .. msg)
+end)
+
+RegisterNetEvent("DiscordWeaponPerms:CheckPerms")
+AddEventHandler("DiscordWeaponPerms:CheckPerms", function()
+ local src = source
+ for k, v in ipairs(GetPlayerIdentifiers(src)) do
+ if string.sub(v, 1, string.len("discord:")) == "discord:" then
+ identifierDiscord = v
+ end
+ end
+ local hasPerms = {} -- Has perms for indexes:
+ if identifierDiscord then
+ local roleIDs = exports.Badger_Discord_API:GetDiscordRoles(src)
+ if not (roleIDs == false) then
+ for i = 1, #roleList do
+ for j = 1, #roleIDs do
+ if exports.Badger_Discord_API:CheckEqual(roleList[i], roleIDs[j]) then
+ table.insert(hasPerms, i)
+ end
+ end
+ end
+ else
+ print(GetPlayerName(src) .. " has not gotten their permissions cause roleIDs == false")
+ end
+ end
+ TriggerClientEvent('DiscordWeaponPerms:CheckPerms:Return', src, hasPerms)
+end)
\ No newline at end of file
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/LICENSE b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/LICENSE
index e7d69ab04..6b90c677b 100644
--- a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/LICENSE
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2019 Jared Scarito
+Copyright (c) 2022 IC-Technologies
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/README.md b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/README.md
index ba26aaf8c..f39a5ed2a 100644
--- a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/README.md
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/README.md
@@ -1,67 +1,64 @@
-# DiscordWeaponPerms
-## Continued Documentation
-https://docs.badger.store/fivem-discord-scripts/discordweaponperms
-## Discontinued Documentation
-**Version 1.0**
+# ImprovedDiscordWeaponPerms
-Another discord script of course! With this script, you can restrict weapons to certain roles on your discord server! This script also allows restricting certain attachments to different groups as well (however, it'll remove the weapon if they have the attachment, I'll eventually update it to just remove the attachment from the weapon).
+## What is it?
+ImprovedDiscordWeaponPerms is a Discord based weapon restriction script. It is a fork of [JaredScar's original DiscordWeaponPerms](https://github.com/JaredScar/DiscordWeaponPerms) - I have rewritten it and added inheritances for roles and also added t-notify integration, as well as more config options and seperate messages for components and weapons with model names.
-https://i.gyazo.com/52a7106f1db9c309c28ff012b8127ae2.gif
+## Requirement
+https://forum.cfx.re/t/release-badger-discord-api/1698464
-You must set up IllusiveTea's discord_perms script for this to work properly. --> https://forum.fivem.net/t/discord-roles-for-permissions-im-creative-i-know/233805
+## Configuration
+* It should be noted that for `Config.Inheritances`, the roleNames and roleIDs should match up with the ones specified in `Config.WeaponRestrictions`.
-**How it works**
-```
-roleList = {
-1, -- Trusted Civ (1)
-1, -- Donator (2)
-1, -- Personal (3)
+* Also, inheritance only inherits the role groups listed. Inheriting `RoleName2` which inherits `RoleName1` would not be inherited for `RoleName3`.
+```lua
+Config = {
+ WeaponRestrictedMessage = "~r~This Weapon is restricted",
+ ComponentRestrictedMessage = "~r~This Component is restricted",
+ InheritanceEnabled = true,
+ -- Set to true if you use the t-notify plugin for notifications.
+ usingTnotify = false,
+ -- How often the script checks for restricted weapons (in milliseconds)
+ updateTime = 2000,
+ -- Whether or not the script shows the name of the model being restricted. If true, it will append the weapon/component name to the end of the message.
+ showWeaponOrComponentName = true
+}
+
+--[[
+Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components
+Weapon list: https://runtime.fivem.net/doc/natives/#_0xBF0FD6E56C964FCB
+]]--
+
+-- This Script uses the nicknames for roles listed in Badger_Discord_API.
+Config.WeaponRestrictions = {
+ --['RoleName or ID'] = {
+ -- "Weapon1/Component1",
+ -- "Weapon2/Component2",
+ -- "Weapon3/Component3",
+ -- "Weapon4/Component4"
+ --},
+
+ ['RoleName1'] = {
+ ""
+ },
+ ['RoleName2'] = {
+ ""
+ },
+ ['RoleName3'] = {
+ ""
+ },
+ ['RoleName4'] = {
+ ""
+ }
+}
+
+-- Requires Config.InheritanceEnabled to be = true
+Config.Inheritances = {
+ --['RoleName or ID'] = {'RoleName2', 'RoleName3', 'RoleName4'},
+ ['RoleName1'] = {'RoleName2', 'RoleName3', 'RoleName4'},
+ ['RoleName2'] = {'RoleName3', 'RoleName4'},
+ ['RoleName3'] = {'RoleName4'},
+ ['RoleName4'] = {}
}
```
-responds to it's respective number within the other list:
-```
-restrictedWeapons = {
-{}, -- Trusted Civ (1)
-{}, -- Donator (2)
-{
-"WEAPON_RPG",
-}, -- Personal (3)
-}
-```
-
-The RPG weapon would then be restricted to only people with personal discord role within your discord server.
-
-It's quite simple :slight_smile:
-
-
-**Installation**
-1. Download DiscordWeaponPerms
-2. Extract the .zip and place the folder in your /resources/ of your Fivem server
-3. Make sure you add “start DiscordWeaponPerms” in your server.cfg
-4. Enjoy :slight_smile:
-
-**Download**
-[DiscordWeaponPerms](https://github.com/TheWolfBadger/DiscordWeaponPerms)
-
-
-
-**My Other Work**
-
-[DiscordChatRoles](https://forum.fivem.net/t/discordchatroles-release/566338)
-
-[DiscordAcePerms](https://forum.fivem.net/t/discordaceperms-release/573044)
-
-[SandyVehiclesRestrict](https://forum.fivem.net/t/release-sandy-vehicles-restrict/564929)
-
-[DiscordTagIDs](https://forum.fivem.net/t/discordtagids-i-know-i-know-i-only-make-discord-based-scripts/582513)
-
-[DiscordVehiclesRestrict](https://forum.fivem.net/t/discordvehiclesrestrict/599594)
-
-[DiscordPedPerms](https://forum.fivem.net/t/release-discordpedperms/642866)
-
-[BadgerAnims](https://forum.fivem.net/t/release-badgeranims/650517)
-
-[DiscordWeaponPerms](https://forum.fivem.net/t/release-discordweaponperms/664774)
-
-**Version 2.0**
-- Removing restricted weapon attachments from weapon instead of whole weapon?
+## Download
+https://github.com/IC-Technologies/ImprovedDiscordWeaponPerms/releases
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua
index 1b950a729..11d4d69ec 100644
--- a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/client.lua
@@ -1,82 +1,93 @@
---------------------------
---- DiscordWeaponPerms ---
---------------------------
-restrictedWeapons = {
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 1
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 3
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 4
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 5
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 6
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 7
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 8
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 9
-{"WEAPON_PROXMINE", "WEAPON_GRENADELAUNCHER", "WEAPON_RPG", "WEAPON_MINIGUN", "WEAPON_FIREWORK", "WEAPON_RAILGUN", "WEAPON_HOMINGLAUNCHER", "WEAPON_STICKYBOMB", "WEAPON_COMPACTLAUNCHER", "WEAPON_RAYPISTOL", "WEAPON_RAYCARBINE", "WEAPON_RAYMINIGUN", "WEAPON_PIPEBOMB",}, -- 10
-{}, -- 11
-{}, -- 12
-{}, -- 13
-{}, -- 14
-{}, -- 15
-}
---[[
-Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components
-Weapon list: https://runtime.fivem.net/doc/natives/#_0xBF0FD6E56C964FCB
-]]--
-isAllowed = {}
-RegisterNetEvent('DiscordWeaponPerms:CheckPerms:Return')
-AddEventHandler('DiscordWeaponPerms:CheckPerms:Return', function(hasPerms)
- isAllowed = hasPerms
+-------------------------------
+-- ImprovedDiscordWeaponPerms -
+--------IC-Technologies--------
+-------------------------------
+
+restrictedWeapons = Config.WeaponRestrictions;
+myRoles = nil;
+
+RegisterNetEvent('ImprovedDiscordWeaponPerms:CheckPerms:Return')
+AddEventHandler('ImprovedDiscordWeaponPerms:CheckPerms:Return', function(roles)
+ myRoles = roles;
end)
-function has_value (tab, val)
- for index, value in ipairs(tab) do
- if value == val then
- return true
- end
- end
- return false
-end
-alreadyRan = false
+
Citizen.CreateThread(function()
+ TriggerServerEvent("ImprovedDiscordWeaponPerms:CheckPerms")
while true do
- Citizen.Wait(1000)
- if not alreadyRan then
- TriggerServerEvent("DiscordWeaponPerms:CheckPerms")
- alreadyRan = true
- end
- --TriggerServerEvent("Print:PrintDebug", "It gets here 1") -- DEBUG - GET RID OF
- local ped = GetPlayerPed(-1)
- local weapon = GetSelectedPedWeapon(ped)
- local restrictedStr = ""
- local requiredPerm = nil
- for i=1, #restrictedWeapons do
- local weaponArr = restrictedWeapons[i]
- for j=1, #weaponArr do
- -- Check if the weapon is restricted and for what group, or if it's the attachment
- if weapon == GetHashKey(weaponArr[j]) then
- -- This weapon is restricted unless they have this role perm
- requiredPerm = i
- restrictedStr = weaponArr[j]
- break
- elseif (HasPedGotWeaponComponent(ped, weapon, GetHashKey(weaponArr[j]))) then
- -- It's restricted unless they have this role perm
- requiredPerm = i
- restrictedStr = weaponArr[j]
- break
+ Citizen.Wait(Config.updateTime)
+ local PlayerPED = PlayerPedId()
+ local playerWeapon = GetSelectedPedWeapon(PlayerPED)
+ local playerComponentHash = nil;
+ local playerComponentName = nil;
+ local playerWeaponName = nil;
+ local requiredPerm = nil;
+ hasPerm = false;
+
+ for role, val in pairs(myRoles) do
+ if (val == true) then
+ local weapons = Config.WeaponRestrictions[role];
+ for i = 1, #weapons do
+ if (weapons[i] ~= nil) then
+ if (playerWeapon == GetHashKey(tostring(weapons[i]))) then
+ requiredPerm = true;
+ hasPerm = true;
+ elseif HasPedGotWeaponComponent(PlayerPED, playerWeapon, GetHashKey(tostring(weapons[i]))) then
+ requiredPerm = true;
+ hasPerm = true;
+ end
+ end
end
end
end
- --TriggerServerEvent("Print:PrintDebug", "It gets here 2") -- DEBUG - GET RID OF
- -- Check their perms
- if not has_value(isAllowed, requiredPerm) and requiredPerm ~= nil then
- -- Does not have perms to use this
- RemoveWeaponFromPed(ped, weapon)
- DisplayNotification("~r~Weapon Restricted! \n~w~You aren't a high enough rank to use this!\n" .. restrictedStr)
+
+ if not hasPerm then
+ local weapons = Config.WeaponRestrictions;
+ for role, weaponList in pairs(weapons) do
+ for i = 1, #weaponList do
+ if (playerWeapon == GetHashKey(tostring(weaponList[i]))) then
+ requiredPerm = true;
+ playerWeaponName = weaponList[i];
+ elseif HasPedGotWeaponComponent(PlayerPED, playerWeapon, GetHashKey(tostring(weaponList[i]))) then
+ requiredPerm = true;
+ playerComponentHash = GetHashKey(tostring(weaponList[i]));
+ playerComponentName = tostring(weaponList[i]);
+ end
+ end
+ end
+ end
+
+ -- If doesn't have permission, it's a restricted weapon/component to them
+ if not hasPerm and (requiredPerm ~= nil) then
+ if playerComponentHash ~= nil then
+ RemoveWeaponComponentFromPed(PlayerPED, playerWeapon, playerComponentHash)
+ if Config.showWeaponOrComponentName then
+ DisplayNotification(Config.ComponentRestrictedMessage .. " (" .. playerComponentName .. ")")
+ else
+ DisplayNotification(Config.ComponentRestrictedMessage)
+ end
+ else
+ if (playerWeapon ~= nil) and (playerWeapon ~= 0) then
+ RemoveWeaponFromPed(PlayerPED, playerWeapon)
+ if Config.showWeaponOrComponentName then
+ DisplayNotification(Config.WeaponRestrictedMessage .. " (" .. playerWeaponName .. ")")
+ else
+ DisplayNotification(Config.WeaponRestrictedMessage)
+ end
+ end
+ end
end
- --TriggerServerEvent("Print:PrintDebug", "It gets here 3") -- DEBUG - GET RID OF
end
end)
function DisplayNotification( text )
- SetNotificationTextEntry( "STRING" )
- AddTextComponentString( text )
- DrawNotification( false, false )
+ if Config.usingTnotify then
+ exports['t-notify']:Alert({
+ style = 'error',
+ message = text
+ })
+ else
+ SetNotificationTextEntry( "STRING" )
+ AddTextComponentString( text )
+ DrawNotification( false, false )
+ end
end
\ No newline at end of file
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/config.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/config.lua
new file mode 100644
index 000000000..9291a8ac8
--- /dev/null
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/config.lua
@@ -0,0 +1,71 @@
+Config = {
+ WeaponRestrictedMessage = "~r~This Weapon is restricted",
+ ComponentRestrictedMessage = "~r~This Component is restricted",
+ InheritanceEnabled = false,
+ -- Set to true if you use the t-notify plugin for notifications.
+ usingTnotify = false,
+ -- How often the script checks for restricted weapons (in milliseconds)
+ updateTime = 2000,
+ -- Whether or not the script shows the name of the model being restricted. If true, it will append the weapon/component name to the end of the message.
+ showWeaponOrComponentName = true
+}
+
+--[[
+Weapon components list: https://wiki.rage.mp/index.php?title=Weapons_Components
+Weapon list: https://runtime.fivem.net/doc/natives/#_0xBF0FD6E56C964FCB
+]]--
+
+-- This Script uses the nicknames for roles listed in Badger_Discord_API.
+Config.WeaponRestrictions = {
+ ['EG | Helper'] = {
+
+ },
+ ['EG | Staff'] = {
+
+ },
+ ['EG | Sr. Staff'] = {
+
+ },
+ ['EG | Moderator'] = {
+
+ },
+ ['EG | Sr. Moderator'] = {
+
+ },
+ ['EG | Admin'] = {
+ "WEAPON_PROXMINE",
+ "WEAPON_GRENADELAUNCHER",
+ "WEAPON_RPG",
+ "WEAPON_MINIGUN",
+ "WEAPON_FIREWORK",
+ "WEAPON_RAILGUN",
+ "WEAPON_HOMINGLAUNCHER",
+ "WEAPON_STICKYBOMB",
+ "WEAPON_COMPACTLAUNCHER",
+ "WEAPON_RAYPISTOL",
+ "WEAPON_RAYCARBINE",
+ "WEAPON_RAYMINIGUN",
+ "WEAPON_PIPEBOMB",
+ },
+ ['EG | Sr. Admin'] = {
+
+ },
+ ['EG | Head of Staff'] = {
+
+ },
+ ['EG | Server Developer'] = {
+
+ },
+ ['EG | Owner'] = {
+
+ },
+}
+
+-- Requires Config.InheritanceEnabled to be = true
+Config.Inheritances = {
+ --['RoleName or ID'] = {'RoleName2', 'RoleName3', 'RoleName4'},
+ ['RoleName1'] = {'RoleName2', 'RoleName3', 'RoleName4'},
+ ['RoleName2'] = {'RoleName3', 'RoleName4'},
+ ['RoleName3'] = {'RoleName4'},
+ ['RoleName4'] = {}
+}
\ No newline at end of file
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/fxmanifest.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/fxmanifest.lua
new file mode 100644
index 000000000..bf19e13b8
--- /dev/null
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/fxmanifest.lua
@@ -0,0 +1,24 @@
+-------------------------------
+--- ImprovedDiscordWeaponPerms ---
+--------IC-Technologies--------
+-------------------------------
+
+fx_version 'cerulean'
+game 'gta5'
+
+author 'IC-Technologies --> Original script by JaredScar on GitHub'
+description 'ImprovedDiscordWeaponPerms by IC-Technologies on Github'
+version '1.0.2'
+
+shared_script {
+ "config.lua"
+}
+
+client_scripts {
+ "client.lua"
+}
+
+server_scripts {
+ "server.lua",
+ "version-check.lua"
+}
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/server.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/server.lua
index ec19f9b38..387905d11 100644
--- a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/server.lua
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/server.lua
@@ -1,53 +1,46 @@
---------------------------
---- DiscordWeaponPerms ---
---------------------------
-roleList = {
-"Civilian I", -- Civilian I (1)
-"Civilian II", -- Civilian II (2)
-"Civilian III", -- Civilian III (3)
-"Civilian IV", -- Civilian IV (4)
-"Civilian V", -- Civilian V (5)
-"EG | Helper", -- Mod (6)
-"EG | Staff", -- Admin (7)
-"EG | Sr. Staff", -- Management (8)
-"EG | Moderator", -- Owner (9)
-"EG | Sr. Moderator", -- Owner (10)
-"EG | Admin", -- Owner (11)
-"EG | Sr. Admin", -- Owner (12)
-"EG | Head of Staff", -- Owner (13)
-"EG | Server Developer", -- Owner (14)
-"EG | Owner", -- Owner (15)
-}
+-------------------------------
+-- ImprovedDiscordWeaponPerms -
+--------IC-Technologies--------
+-------------------------------
-
-RegisterNetEvent('Print:PrintDebug')
-AddEventHandler('Print:PrintDebug', function(msg)
- print(msg)
- TriggerClientEvent('chatMessage', -1, "^7[^1Badger's Scripts^7] ^1DEBUG ^7" .. msg)
-end)
-
-RegisterNetEvent("DiscordWeaponPerms:CheckPerms")
-AddEventHandler("DiscordWeaponPerms:CheckPerms", function()
+RegisterNetEvent("ImprovedDiscordWeaponPerms:CheckPerms")
+AddEventHandler("ImprovedDiscordWeaponPerms:CheckPerms", function()
local src = source
+ local userRoles = {}
+
for k, v in ipairs(GetPlayerIdentifiers(src)) do
if string.sub(v, 1, string.len("discord:")) == "discord:" then
identifierDiscord = v
end
end
- local hasPerms = {} -- Has perms for indexes:
+
if identifierDiscord then
local roleIDs = exports.Badger_Discord_API:GetDiscordRoles(src)
+
if not (roleIDs == false) then
- for i = 1, #roleList do
- for j = 1, #roleIDs do
- if exports.Badger_Discord_API:CheckEqual(roleList[i], roleIDs[j]) then
- table.insert(hasPerms, i)
+ for i = 1, #roleIDs do
+ for role, PEDs in pairs(Config.WeaponRestrictions) do
+ if exports.Badger_Discord_API:CheckEqual(role, roleIDs[i]) then
+ userRoles[role] = true;
+ print("[ImprovedDiscordWeaponPerms] " .. GetPlayerName(src) .. " has received permission for role: " .. tostring(role) );
+ if Config.InheritanceEnabled then
+ local inheritedRoles = Config.Inheritances[role];
+ if inheritedRoles ~= nil then
+ --There are inherited roles
+ for j = 1, #inheritedRoles do
+ userRoles[ inheritedRoles[j] ] = true;
+ print("[ImprovedDiscordWeaponPerms] " .. GetPlayerName(src) .. " has inherited role: " .. tostring(inheritedRoles[j]));
+ end
+ end
+ end
end
end
end
else
- print(GetPlayerName(src) .. " has not gotten their permissions cause roleIDs == false")
+ print("[ImprovedDiscordWeaponPerms] " .. GetPlayerName(src) .. " has not gotten their permissions because roleIDs == false")
end
+ elseif identifierDiscord == nil then
+ print("[ImprovedDiscordWeaponPerms] " .. "identifierDiscord == nil")
end
- TriggerClientEvent('DiscordWeaponPerms:CheckPerms:Return', src, hasPerms)
-end)
\ No newline at end of file
+ TriggerClientEvent('ImprovedDiscordWeaponPerms:CheckPerms:Return', src, userRoles)
+end)
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/version-check.lua b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/version-check.lua
new file mode 100644
index 000000000..ac80e40b9
--- /dev/null
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/version-check.lua
@@ -0,0 +1,19 @@
+function GetCurrentVersion()
+ return GetResourceMetadata(GetCurrentResourceName(), "version")
+end
+
+PerformHttpRequest("https://raw.githubusercontent.com/IC-Technologies/ImprovedDiscordWeaponPerms/master/version.txt", function(error, updatedVersion, headers)
+ Citizen.Wait(2500)
+ local currentVersion = GetCurrentVersion()
+ if (updatedVersion ~= nil) and (currentVersion ~= nil) then
+ print("Current Version: " .. currentVersion)
+ print("Latest Version: " .. updatedVersion)
+ if (updatedVersion ~= currentVersion) then
+ print('ImprovedDiscordWeaponPerms is outdated, go to https://github.com/IC-Technologies/RP_Commands/releases to get the latest version.')
+ else
+ print('ImprovedDiscordWeaponPerms is up to date!')
+ end
+ else
+ print('There was an error in the checks for the latest version, if the issue persists open an issue @ https://github.com/IC-Technologies/ImprovedDiscordWeaponPerms/issues.')
+ end
+end)
\ No newline at end of file
diff --git a/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/version.txt b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/version.txt
new file mode 100644
index 000000000..e6d5cb833
--- /dev/null
+++ b/resources/[EGRP-Discord-Integration]/Discord-WepRestriction/version.txt
@@ -0,0 +1 @@
+1.0.2
\ No newline at end of file
diff --git a/resources/assets/TruckersFM_Logo.dds b/resources/assets/TruckersFM_Logo.dds
deleted file mode 100644
index 70a21fe7e..000000000
Binary files a/resources/assets/TruckersFM_Logo.dds and /dev/null differ
diff --git a/resources/assets/TruckersFM_Logo.png b/resources/assets/TruckersFM_Logo.png
deleted file mode 100644
index 24518a23e..000000000
Binary files a/resources/assets/TruckersFM_Logo.png and /dev/null differ
diff --git a/resources/generic/__resource.lua b/resources/generic/__resource.lua
deleted file mode 100644
index 0d9c8ef32..000000000
--- a/resources/generic/__resource.lua
+++ /dev/null
@@ -1 +0,0 @@
-resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
diff --git a/resources/generic/stream/generic_texture_renderer.gfx b/resources/generic/stream/generic_texture_renderer.gfx
deleted file mode 100644
index 8151eff54..000000000
Binary files a/resources/generic/stream/generic_texture_renderer.gfx and /dev/null differ
diff --git a/resources/generic/stream/generic_texture_renderer_2.gfx b/resources/generic/stream/generic_texture_renderer_2.gfx
deleted file mode 100644
index 8151eff54..000000000
Binary files a/resources/generic/stream/generic_texture_renderer_2.gfx and /dev/null differ
diff --git a/resources/ptelevision/config.lua b/resources/ptelevision/config.lua
index c36ded66d..bdeab5e32 100644
--- a/resources/ptelevision/config.lua
+++ b/resources/ptelevision/config.lua
@@ -130,7 +130,8 @@ Config.Locations = { -- REMOVE ALL IF NOT USING ONESYNC, OR IT SHALL BREAK.
}
Config.Channels = { -- These channels are default channels and cannot be overriden.
- {name = "Twitch", url = "twitch.tv/twitch"},
+ {name = "Twitch", url = "twitch.tv/thatguyjacobee"},
+ {name = "YouTube", url = "youtube.com/thatguyjacobee"},
}
Config.BannedWords = {
diff --git a/resources/radio-assets/TruckersFM-Logo.png b/resources/radio-assets/TruckersFM-Logo.png
new file mode 100644
index 000000000..f02398f08
Binary files /dev/null and b/resources/radio-assets/TruckersFM-Logo.png differ
diff --git a/resources/assets/__resource.lua b/resources/radio-assets/__resource.lua
similarity index 100%
rename from resources/assets/__resource.lua
rename to resources/radio-assets/__resource.lua
diff --git a/resources/assets/stream/hud/Backup of HUD items.ytdbackup b/resources/radio-assets/stream/hud/Backup of HUD items.ytdbackup
similarity index 100%
rename from resources/assets/stream/hud/Backup of HUD items.ytdbackup
rename to resources/radio-assets/stream/hud/Backup of HUD items.ytdbackup
diff --git a/resources/radio-assets/stream/hud/hud.ytd b/resources/radio-assets/stream/hud/hud.ytd
new file mode 100644
index 000000000..aa7aea5f4
--- /dev/null
+++ b/resources/radio-assets/stream/hud/hud.ytd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df9e88e981c4888f7b8cc6296765df0ae824fef3100fe7fd7859a2800c776875
+size 473559
diff --git a/resources/assets/stream/hud/hud.ytd b/resources/radio-assets/stream/hud/previoushud.ytd
similarity index 100%
rename from resources/assets/stream/hud/hud.ytd
rename to resources/radio-assets/stream/hud/previoushud.ytd
diff --git a/resources/radio/__resource.lua b/resources/radio/__resource.lua
deleted file mode 100644
index 9bc13961f..000000000
--- a/resources/radio/__resource.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-resource_manifest_version "44febabe-d386-4d18-afbe-5e627f4af937"
-
--- Example custom radios
-supersede_radio "RADIO_21_DLC_XM17" { url = "https://live.truckers.fm/", volume = 0.40 }
-
-files {
- "index.html"
-}
-
-ui_page "index.html"
-
-client_scripts {
- "data.js",
- "client.js"
-}
diff --git a/resources/radio/client.js b/resources/radio/client.js
index d526c185a..294251dc2 100644
--- a/resources/radio/client.js
+++ b/resources/radio/client.js
@@ -86,4 +86,4 @@ setTick(() => {
SendNuiMessage(JSON.stringify({ "type": "volume", "volume": volume }));
previousVolume = volume;
}
-});
+});
\ No newline at end of file
diff --git a/resources/radio/data.js b/resources/radio/data.js
index b808918a7..04f52d765 100644
--- a/resources/radio/data.js
+++ b/resources/radio/data.js
@@ -8,6 +8,7 @@ const availableRadios = [
"RADIO_07_DANCE_01", // Soulwax FM
"RADIO_08_MEXICAN", // East Los FM
"RADIO_09_HIPHOP_OLD", // West Coast Classics
+ "RADIO_11_TALK_02", // Blaine County Radio
"RADIO_12_REGGAE", // Blue Ark
"RADIO_13_JAZZ", // Worldwide FM
"RADIO_14_DANCE_02", // FlyLo FM
@@ -17,9 +18,12 @@ const availableRadios = [
"RADIO_18_90S_ROCK", // Vinewood Boulevard Radio
"RADIO_19_USER", // Self Radio
"RADIO_20_THELAB", // The Lab
- "RADIO_11_TALK_02", // Blaine County Radio
"RADIO_21_DLC_XM17", // Blonded Los Santos 97.8 FM
"RADIO_22_DLC_BATTLE_MIX1_RADIO", // Los Santos Underground Radio
+ "RADIO_23_DLC_XM19_RADIO", // iFruit Radio
+ "RADIO_27_DLC_PRHEI4", // Still Slipping Los Santos
"RADIO_34_DLC_HEI4_KULT", // Kult FM
- "RADIO_35_DLC_HEI4_MLR" // The Music Locker
-];
+ "RADIO_35_DLC_HEI4_MLR", // The Music Locker
+ "RADIO_36_AUDIOPLAYER", // Media Player
+ "RADIO_37_MOTOMAMI" // MOTOMAMI Los Santos
+];
\ No newline at end of file
diff --git a/resources/radio/fxmanifest.lua b/resources/radio/fxmanifest.lua
new file mode 100644
index 000000000..75d59f750
--- /dev/null
+++ b/resources/radio/fxmanifest.lua
@@ -0,0 +1,20 @@
+fx_version 'bodacious'
+game 'gta5'
+
+author 'Hellslicer'
+description 'This resource allows you to integrate your own radios in place of the original radios'
+version '2.0.0'
+
+-- Example custom radios
+supersede_radio 'RADIO_21_DLC_XM17' { url = 'https://live.truckers.fm/', volume = 0.2, name = 'Truckers FM Live' }
+
+files {
+ 'index.html'
+}
+
+ui_page 'index.html'
+
+client_scripts {
+ 'data.js',
+ 'client.js'
+}
\ No newline at end of file
diff --git a/resources/radio/index.html b/resources/radio/index.html
index 470ebe269..e1d82a2fa 100644
--- a/resources/radio/index.html
+++ b/resources/radio/index.html
@@ -1,6 +1,6 @@
-
+