diff --git a/.github/workflows/formatt-all.yml b/.github/workflows/formatt-all.yml index 62a708245..04c8cb056 100644 --- a/.github/workflows/formatt-all.yml +++ b/.github/workflows/formatt-all.yml @@ -10,6 +10,9 @@ jobs: stylua-check: name: Stylua Check runs-on: ubuntu-latest + permissions: + contents: write + if: ${{ github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.label.name == 'format_all') }} steps: - uses: actions/checkout@v4 - uses: JohnnyMorganz/stylua-action@v3 diff --git a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua index ba2d891c1..2831137b2 100644 --- a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua +++ b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua @@ -1,23 +1,23 @@ fx_version("cerulean") game("gta5") -name ("CayoTwoIslands") -author ("TayMcKenzieNZ") +name("CayoTwoIslands") +author("TayMcKenzieNZ") description("Spawns Cayo Perico alongside Los Santos") -- Server build must be on the LATEST recommended server build. You should be checking for and updating this at least once a month -- Server MUST be on gamebuild 2189 or higher for this resource to run sucessfully -this_is_a_map 'yes' +this_is_a_map("yes") -data_file 'DLC_ITYP_REQUEST' 'stream/ytyp/mads_no_exp_pumps.ytyp' -- Stops petrol pumps from exploding. Credit to MadsL on the FiveM Forums for this. +data_file("DLC_ITYP_REQUEST")("stream/ytyp/mads_no_exp_pumps.ytyp") -- Stops petrol pumps from exploding. Credit to MadsL on the FiveM Forums for this -client_scripts { - 'scripts/twoislands.lua', -- Both Islands Visible At One Time - 'scripts/cayo_perico_entitysets.lua', -- Responsible for spawning in heist props in El Rubio's Mansion safe. You can use this file to change the prop that appears. - 'scripts/blips.lua', -- Map Blips - 'scripts/zones.lua', -- Displays all map zones, fixing the 'bug' of showing North Yankton, and instead, showing Cayo Perico - 'scripts/peds_config.lua', -- Invincible peds that appear on the island, ie merryweather - 'scripts/main_peds.lua', -- Don't touch this - 'scripts/static_emitters.lua' -- Disables annoying 'cheering' SFXs from Arena Wars location near North Yankton / Cayo Perico -} \ No newline at end of file +client_scripts({ + "scripts/twoislands.lua", -- Both Islands Visible At One Time + "scripts/cayo_perico_entitysets.lua", -- Responsible for spawning in heist props in El Rubio's Mansion safe. You can use this file to change the prop that appears. + "scripts/blips.lua", -- Map Blips + "scripts/zones.lua", -- Displays all map zones, fixing the 'bug' of showing North Yankton, and instead, showing Cayo Perico + "scripts/peds_config.lua", -- Invincible peds that appear on the island, ie merryweather + "scripts/main_peds.lua", -- Don't touch this + "scripts/static_emitters.lua", -- Disables annoying 'cheering' SFXs from Arena Wars location near North Yankton / Cayo Perico +}) \ No newline at end of file diff --git a/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua b/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua index a5476f8ec..78f662486 100644 --- a/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua +++ b/server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua @@ -1,36 +1,36 @@ local blips = { - -- Airports -- - { title = "Cayo Perico Runway", colour = 3, id = 90, x = 3961.97, y = -4689.05, z = 3.6 }, +-- Airports -- +{ title = "Cayo Perico Runway", colour = 3, id = 90, x = 3961.97, y = -4689.05, z = 3.6 }, - -- Cayo Perico Island Blips -- - -- Island Beach Party - { title = "Island Beach Party", colour = 23, id = 614, x = 4918.11, y = -4906.8, z = 3.44 }, +-- Cayo Perico Island Blips -- +-- Island Beach Party +{ title = "Island Beach Party", colour = 23, id = 614, x = 4918.11, y = -4906.8, z = 3.44 }, - -- Island Weed Farm - { title = "Island Weed Farm", colour = 25, id = 496, x = 5319.28, y = -5248.54, z = 32.58 }, +-- Island Weed Farm +{ title = "Island Weed Farm", colour = 25, id = 496, x = 5319.28, y = -5248.54, z = 32.58 }, - -- Island Helipad 1 -- - { title = "Island Helipad", colour = 26, id = 542, x = 4890.52, y = -5736.66, z = 26.35 }, +-- Island Helipad 1 -- +{ title = "Island Helipad", colour = 26, id = 542, x = 4890.52, y = -5736.66, z = 26.35 }, - -- Island Mansion -- - { title = "Island Mansion", colour = 30, id = 40, x = 5009.41, y = -5749.76, z = 32.85 }, +-- Island Mansion -- +{ title = "Island Mansion", colour = 30, id = 40, x = 5009.41, y = -5749.76, z = 32.85 }, - -- Island House -- - { title = "Island House", colour = 7, id = 40, x = 5006.63, y = -5787.81, z = 22.56 }, - { title = "Island House", colour = 7, id = 40, x = 5080.4, y = -5756.1, z = 21.62 }, - { title = "Island House", colour = 7, id = 40, x = 5026.97, y = -5735.91, z = 17.87 }, +-- Island House -- +{ title = "Island House", colour = 7, id = 40, x = 5006.63, y = -5787.81, z = 22.56 }, +{ title = "Island House", colour = 7, id = 40, x = 5080.4, y = -5756.1, z = 21.62 }, +{ title = "Island House", colour = 7, id = 40, x = 5026.97, y = -5735.91, z = 17.87 }, } Citizen.CreateThread(function() - for _, info in pairs(blips) do - info.blip = AddBlipForCoord(info.x, info.y, info.z) - SetBlipSprite(info.blip, info.id) - SetBlipDisplay(info.blip, 4) - SetBlipScale(info.blip, 1.0) - SetBlipColour(info.blip, info.colour) - SetBlipAsShortRange(info.blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(info.title) - EndTextCommandSetBlipName(info.blip) + for _, info in pairs(blips) do + info.blip = AddBlipForCoord(info.x, info.y, info.z) + SetBlipSprite(info.blip, info.id) + SetBlipDisplay(info.blip, 4) + SetBlipScale(info.blip, 1.0) + SetBlipColour(info.blip, info.colour) + SetBlipAsShortRange(info.blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(info.title) + EndTextCommandSetBlipName(info.blip) end end) \ No newline at end of file