Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 Run formatter #626

Merged
merged 2 commits into from
Jan 28, 2024
Merged

🎨 Run formatter #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31ac7b2
🎨 Run formatter
bitpredator Jan 28, 2024
d205e93
Update formatt-all.yml
bitpredator Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/formatt-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
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
})
50 changes: 25 additions & 25 deletions server-data/resources/[maps]/CayoTwoIslands/scripts/blips.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Loading