diff --git a/resources/Fire-Script/whitelist.json b/resources/Fire-Script/whitelist.json index c6af8e9be..3f068926e 100644 --- a/resources/Fire-Script/whitelist.json +++ b/resources/Fire-Script/whitelist.json @@ -1 +1 @@ -{"steam:110000131ff8eae":true,"steam:110000147619e76":true} \ No newline at end of file +{"steam:110000131ff8eae":true,"steam:110000112db6102":true,"steam:110000147619e76":true} \ No newline at end of file diff --git a/resources/Holograms/holograms.lua b/resources/Holograms/holograms.lua index 8d705c456..297875b16 100644 --- a/resources/Holograms/holograms.lua +++ b/resources/Holograms/holograms.lua @@ -38,12 +38,12 @@ function Holograms() -- 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.eguk.me", 4, 0.15, 0.15) - Draw3DText( -857.60, -411.40, 37.64 -2.050, "Website: elite-gaming.co.uk", 4, 0.15, 0.15) - Draw3DText( -857.60, -411.40, 37.64 -2.350, "CAD: cad.elite-gaming.co.uk", 4, 0.15, 0.15) - Draw3DText( -857.60, -411.40, 37.64 -2.650, "Forum: forum.elite-gaming.co.uk", 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) + 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 -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.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) end -- Spawn - Extra Info if GetDistanceBetweenCoords( -849.87, -431.62, 38.14, GetEntityCoords(GetPlayerPed(-1))) < 32.5 then diff --git a/resources/Timetrials/scores.txt b/resources/Timetrials/scores.txt index 6bdbf2ccf..c21e4b0ec 100644 --- a/resources/Timetrials/scores.txt +++ b/resources/Timetrials/scores.txt @@ -1 +1 @@ -{"Race | Lakeside Loop":{"EGRP Staff Buggy":{"car":"EGRP Staff Buggy","player":"[EGRP-02]King Rodriguez","time":43710},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":196803},"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":177461},"SNOWMOBILE 2020":{"car":"SNOWMOBILE 2020","player":"[C-146] E. Cartman","time":107015},"Ford Crown Vic 2011":{"car":"Ford Crown Vic 2011","player":"AnySpiderBat","time":231931}},"North GP":{"Baller":{"car":"Baller","player":"dcapone00","time":410118},"NULL":{"car":"NULL","player":"vJack","time":191650},"Neon":{"car":"Neon","player":"ThunderBird","time":354856}},"Race | Hillside Loop":{"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee","time":230432},"Bronco Wildtrak 2021":{"car":"Bronco Wildtrak 2021","player":"ThatGuyJacobee","time":210714},"BMW M8 Widebody":{"car":"BMW M8 Widebody","player":"[C-291][GCF-34][MS-13] K. Lee","time":195442}},"Cannonball Run":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":81298}},"Race | Cannonball Run":{"2013 Dodge Charger":{"car":"2013 Dodge Charger","player":"vJack","time":263368}},"Race | Airport Circuit":{"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":69880},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":83978},"Formula 1":{"car":"Formula 1","player":"vJack","time":42751}},"Lakeside Loop":{"NULL":{"car":"NULL","player":"DR*KINGPORNHUB","time":206147}},"Race | Airport Drag Race":{"NULL":{"car":"NULL","player":"DR-KingRodriguez","time":9270}},"Observatory Loop":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":34126}},"Highway Sprint":{"NULL":{"car":"NULL","player":"vJack","time":93300}},"BCSO Training Course":{"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":26915},"Jester":{"car":"Jester","player":"michael82","time":37835}},"Race | Sandy Airfield":{"Jeep TrackHawk 2018":{"car":"Jeep TrackHawk 2018","player":"King Rodriguez","time":22887},"Mini JCW 2020":{"car":"Mini JCW 2020","player":"King Rodriguez","time":29879},"BMW M5 Plus":{"car":"BMW M5 Plus","player":"King Rodriguez","time":18019},"Chevy Camaro20":{"car":"Chevy Camaro20","player":"Max Rodriguez","time":32202},"Ford Raptor F-150":{"car":"Ford Raptor F-150","player":"King Rodriguez","time":28515},"Yamaha R6":{"car":"Yamaha R6","player":"ThatGuyJacobee","time":28188},"NULL":{"car":"NULL","player":"Max ","time":26029},"2014 Dodge Charger":{"car":"2014 Dodge Charger","player":"King Rodriguez","time":29132},"2016 Ford Explorer":{"car":"2016 Ford Explorer","player":"King Rodriguez","time":26526},"Toyota Sienna 2021":{"car":"Toyota Sienna 2021","player":"Max Rodriguez","time":34685},"Space Docker":{"car":"Space Docker","player":"DyslexicStoner240.","time":29122},"Formula 1":{"car":"Formula 1","player":"vJack","time":15914},"Ferrari 458":{"car":"Ferrari 458","player":"Woltage.2","time":25352},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":19029},"Audi S3 2015":{"car":"Audi S3 2015","player":"King Rodriguez","time":25742},"Bugatti Chiron 2017":{"car":"Bugatti Chiron 2017","player":"King Rodriguez","time":22371},"F-22A":{"car":"F-22A","player":"Yalaina-DDR8","time":90697},"BMW i8":{"car":"BMW i8","player":"King Rodriguez","time":24743},"Kawasaki Ninja ZX10R":{"car":"Kawasaki Ninja ZX10R","player":"King Rodriguez","time":28422},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":29921}},"Race | Timetrial Event - 04/04/21":{"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},"Chevrolet Silverado 1980":{"car":"Chevrolet Silverado 1980","player":"King Rodriguez","time":156244}},"Airport Circuit":{"P-996 LAZER":{"car":"P-996 LAZER","player":"ThatGuyJacobee","time":59216},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":22916},"Neon":{"car":"Neon","player":"ThunderBird","time":92652}},"Race | North GP":{"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":217283},"NULL":{"car":"NULL","player":"SOGGYBEAN","time":42917},"BMW M5":{"car":"BMW M5","player":"Stormzy","time":115460},"Windsor Drop":{"car":"Windsor Drop","player":"[C-81][GCF-145] R. Freeman","time":66673},"SNOWMOBILE 2020":{"car":"SNOWMOBILE 2020","player":"ThatGuyJacobee","time":387242},"2014 Pierce prescue":{"car":"2014 Pierce prescue","player":"Klimek07","time":83300}},"Hollywood Hills":{"NULL":{"car":"NULL","player":"Kryplos125","time":120053}},"Airport Drag Race":{"NULL":{"car":"NULL","player":"iwan.ralphs","time":7030}},"Sandy Airfield":{"FH-1 Hunter":{"car":"FH-1 Hunter","player":"*ZbyniU*","time":36289},"BMX":{"car":"BMX","player":"vJack","time":21014},"Maverick":{"car":"Maverick","player":"vJack","time":29165},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":5607},"Neon":{"car":"Neon","player":"ThunderBird","time":30312},"Vigilante":{"car":"Vigilante","player":"*ZbyniU*","time":6172},"Jester":{"car":"Jester","player":"michael82","time":47982},"RE-7B":{"car":"RE-7B","player":"*ZbyniU*","time":28456},"Oppressor":{"car":"Oppressor","player":"michael82","time":21360}},"Race | Airport Drag":{"2010 Chevy Tahoe":{"car":"2010 Chevy Tahoe","player":"King Rodriguez","time":12821},"NULL":{"car":"NULL","player":"B. LAO","time":12630},"Police Corvette 2019":{"car":"Police Corvette 2019","player":"Woltage.2","time":14484},"BMW M5 Plus":{"car":"BMW M5 Plus","player":"King Rodriguez","time":8652},"Formula 1":{"car":"Formula 1","player":"King Rodriguez","time":7629},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":9693}},"Race | BCSO Training Course":{"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":78151},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":100457},"Neon":{"car":"Neon","player":"ThunderBird","time":105527},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"ThatGuyJacobee","time":105983},"2013 Dodge Charger":{"car":"2013 Dodge Charger","player":"vJack","time":94246},"2016 Dodge Ram":{"car":"2016 Dodge Ram","player":"vJack","time":119099}},"Race | Observatory Loop":{"2013 Dodge Charger":{"car":"2013 Dodge Charger","player":"vJack","time":64004},"BMW M5 Plus":{"car":"BMW M5 Plus","player":"[EGRP-02]King Rodriguez","time":70752},"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},"Ford F-150 Lightning 2022":{"car":"Ford F-150 Lightning 2022","player":"ThatGuyJacobee","time":68440},"Mercedes AMG GTS":{"car":"Mercedes AMG GTS","player":"vJack","time":56747},"NULL":{"car":"NULL","player":"[YJ-18] Sinapsey","time":55388},"BMW M5":{"car":"BMW M5","player":"[C-291][GCF-34][MS-13] K. Lee","time":81837},"Gauntlet Classic Custom":{"car":"Gauntlet Classic Custom","player":"[C-291][GCF-34][MS-13] K. Lee","time":76765},"Formula 1":{"car":"Formula 1","player":"ThatGuyJacobee","time":54744},"Nissan Skyline GTR":{"car":"Nissan Skyline GTR","player":"[C-291][GCF-34][MS-13] K. Lee","time":67881}},"Race | Highway Sprint":{"Ferrari 458":{"car":"Ferrari 458","player":"ThatGuyJacobee","time":138033},"Lamborghini Aventador AVJ":{"car":"Lamborghini Aventador AVJ","player":"Kaleb","time":240744},"NULL":{"car":"NULL","player":"DR-KingRodriguez","time":98074},"Deveste Eight":{"car":"Deveste Eight","player":"jb3794339","time":181173}},"Race | Hollywood Hills":{"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},"NULL":{"car":"NULL","player":"ThatGuyJacobee","time":102048},"Audi R8 V10":{"car":"Audi R8 V10","player":"ThatGuyJacobee","time":100677}},"North Rallycross ":{"Neon":{"car":"Neon","player":"ThunderBird","time":351612}}} \ No newline at end of file +{"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 diff --git a/resources/[EGRP-Discord-Integration]/DiscordChatRoles/server.lua b/resources/[EGRP-Discord-Integration]/DiscordChatRoles/server.lua index 140f533f3..c4690004c 100644 --- a/resources/[EGRP-Discord-Integration]/DiscordChatRoles/server.lua +++ b/resources/[EGRP-Discord-Integration]/DiscordChatRoles/server.lua @@ -31,7 +31,7 @@ roleList = { {556158473981788176, "🔰 ^2Senior Administrator | "}, {650653280275267591, "🔰 ^2Head of Staff | "}, {671141073728307228, "👨‍💻 ^8Server Developer | "}, -{361899298209923075, "🐉 ^8EGRP CEO | "}, +{361899298209923075, "🐉 ^8EGRP Dev | "}, } sendBlockMessages = false;