From 8da64130515430dc86a46b3c2cb0dc64db84d42e Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:47:08 +0100 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/[maps]/hdigitalden/client.lua | 41 +++++++++---------- .../[maps]/hdigitalden/interiorproxies.meta | 12 +++--- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/server-data/resources/[maps]/hdigitalden/client.lua b/server-data/resources/[maps]/hdigitalden/client.lua index 3a7e95645..40d95d081 100644 --- a/server-data/resources/[maps]/hdigitalden/client.lua +++ b/server-data/resources/[maps]/hdigitalden/client.lua @@ -1,27 +1,26 @@ CreateThread(function() - while (true) do - ClearAreaOfPeds(387.1764, -828.0369, 29.3054, 46.9588, 5) - Wait(0) - end + while true do + ClearAreaOfPeds(387.1764, -828.0369, 29.3054, 46.9588, 5) + Wait(0) + end end) CreateThread(function() -- Examples - local ped_info - local ped_hash = 0x5B3BD90D -- Ped Hash - local ped_coords = { x = 383.762634, y = -826.681335, z = 28.300000, h = 260.0 } -- Ped Coords + local ped_info + local ped_hash = 0x5B3BD90D -- Ped Hash + local ped_coords = { x = 383.762634, y = -826.681335, z = 28.300000, h = 260.0 } -- Ped Coords - RequestModel(ped_hash) - while not HasModelLoaded(ped_hash) do - Wait(1) - end + RequestModel(ped_hash) + while not HasModelLoaded(ped_hash) do + Wait(1) + end - ped_info = CreatePed(1, ped_hash, ped_coords.x, ped_coords.y, ped_coords.z, ped_coords.h, false, true) - SetBlockingOfNonTemporaryEvents(ped_info, true) -- Don't Change - SetPedDiesWhenInjured(ped_info, false) -- Can Die? - SetPedCanPlayAmbientAnims(ped_info, true) -- Don't Change - SetPedCanRagdollFromPlayerImpact(ped_info, false) -- Ped Fall Down - SetEntityInvincible(ped_info, true) -- Ped Invincible - FreezeEntityPosition(ped_info, true) -- Don't Change - TaskStartScenarioInPlace(ped_info, "WORLD_HUMAN_COP_IDLES", 0, true); -- Ped Anim - -end) \ No newline at end of file + ped_info = CreatePed(1, ped_hash, ped_coords.x, ped_coords.y, ped_coords.z, ped_coords.h, false, true) + SetBlockingOfNonTemporaryEvents(ped_info, true) -- Don't Change + SetPedDiesWhenInjured(ped_info, false) -- Can Die? + SetPedCanPlayAmbientAnims(ped_info, true) -- Don't Change + SetPedCanRagdollFromPlayerImpact(ped_info, false) -- Ped Fall Down + SetEntityInvincible(ped_info, true) -- Ped Invincible + FreezeEntityPosition(ped_info, true) -- Don't Change + TaskStartScenarioInPlace(ped_info, "WORLD_HUMAN_COP_IDLES", 0, true) -- Ped Anim +end) diff --git a/server-data/resources/[maps]/hdigitalden/interiorproxies.meta b/server-data/resources/[maps]/hdigitalden/interiorproxies.meta index a5be91af3..9948a6c40 100644 --- a/server-data/resources/[maps]/hdigitalden/interiorproxies.meta +++ b/server-data/resources/[maps]/hdigitalden/interiorproxies.meta @@ -1,7 +1,9 @@ - - - digitalgen - - \ No newline at end of file + + + + digitalgen + + + From e03e29719b1c458663f6db9ea7aa2f75bc1818ca Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:58:13 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bob74_ipl/dlc_afterhours/nightclubs.lua | 118 +++++----- .../bob74_ipl/dlc_bikers/clubhouse1.lua | 82 +++---- .../bob74_ipl/dlc_bikers/clubhouse2.lua | 88 +++---- .../[maps]/bob74_ipl/dlc_bikers/cocaine.lua | 22 +- .../bob74_ipl/dlc_bikers/counterfeit_cash.lua | 34 +-- .../bob74_ipl/dlc_bikers/document_forgery.lua | 24 +- .../[maps]/bob74_ipl/dlc_bikers/gang.lua | 65 +++--- .../[maps]/bob74_ipl/dlc_bikers/meth.lua | 20 +- .../[maps]/bob74_ipl/dlc_bikers/weed.lua | 126 +++++------ .../[maps]/bob74_ipl/dlc_casino/casino.lua | 22 +- .../[maps]/bob74_ipl/dlc_casino/penthouse.lua | 44 ++-- .../bob74_ipl/dlc_doomsday/facility.lua | 98 ++++---- .../bob74_ipl/dlc_executive/apartment1.lua | 42 ++-- .../bob74_ipl/dlc_executive/apartment2.lua | 43 ++-- .../bob74_ipl/dlc_executive/apartment3.lua | 42 ++-- .../[maps]/bob74_ipl/dlc_finance/office1.lua | 72 +++--- .../[maps]/bob74_ipl/dlc_finance/office2.lua | 72 +++--- .../[maps]/bob74_ipl/dlc_finance/office3.lua | 72 +++--- .../[maps]/bob74_ipl/dlc_finance/office4.lua | 72 +++--- .../bob74_ipl/dlc_finance/organization.lua | 28 +-- .../bob74_ipl/dlc_gunrunning/bunkers.lua | 28 +-- .../[maps]/bob74_ipl/dlc_gunrunning/yacht.lua | 6 +- .../[maps]/bob74_ipl/dlc_heists/carrier.lua | 6 +- .../[maps]/bob74_ipl/dlc_heists/yacht.lua | 8 +- .../bob74_ipl/dlc_high_life/apartment1.lua | 20 +- .../bob74_ipl/dlc_high_life/apartment2.lua | 18 +- .../bob74_ipl/dlc_high_life/apartment3.lua | 20 +- .../bob74_ipl/dlc_high_life/apartment4.lua | 18 +- .../bob74_ipl/dlc_high_life/apartment5.lua | 18 +- .../bob74_ipl/dlc_high_life/apartment6.lua | 20 +- .../[maps]/bob74_ipl/dlc_import/garage1.lua | 72 +++--- .../[maps]/bob74_ipl/dlc_import/garage2.lua | 72 +++--- .../[maps]/bob74_ipl/dlc_import/garage3.lua | 72 +++--- .../[maps]/bob74_ipl/dlc_import/garage4.lua | 74 +++--- .../dlc_import/vehicle_warehouse.lua | 26 +-- .../bob74_ipl/dlc_security/billboards.lua | 10 +- .../[maps]/bob74_ipl/dlc_security/garage.lua | 18 +- .../bob74_ipl/dlc_security/musicrooftop.lua | 10 +- .../[maps]/bob74_ipl/dlc_security/office1.lua | 16 +- .../[maps]/bob74_ipl/dlc_security/office2.lua | 16 +- .../[maps]/bob74_ipl/dlc_security/office3.lua | 16 +- .../[maps]/bob74_ipl/dlc_security/office4.lua | 12 +- .../[maps]/bob74_ipl/dlc_security/studio.lua | 14 +- .../[maps]/bob74_ipl/dlc_smuggler/hangar.lua | 56 ++--- .../[maps]/bob74_ipl/dlc_tuner/garage.lua | 22 +- .../[maps]/bob74_ipl/dlc_tuner/meetup.lua | 18 +- .../[maps]/bob74_ipl/dlc_tuner/methlab.lua | 10 +- .../resources/[maps]/bob74_ipl/fxmanifest.lua | 214 +++++++++--------- .../[maps]/bob74_ipl/gta_mpsum2/simeonfix.lua | 16 +- .../gta_mpsum2/vehicle_warehouse.lua | 18 +- .../[maps]/bob74_ipl/gta_mpsum2/warehouse.lua | 16 +- .../bob74_ipl/gta_online/apartment_hi_1.lua | 16 +- .../bob74_ipl/gta_online/apartment_hi_2.lua | 16 +- .../bob74_ipl/gta_online/house_hi_1.lua | 16 +- .../bob74_ipl/gta_online/house_hi_2.lua | 18 +- .../bob74_ipl/gta_online/house_hi_3.lua | 16 +- .../bob74_ipl/gta_online/house_hi_4.lua | 18 +- .../bob74_ipl/gta_online/house_hi_5.lua | 16 +- .../bob74_ipl/gta_online/house_hi_6.lua | 16 +- .../bob74_ipl/gta_online/house_hi_7.lua | 16 +- .../bob74_ipl/gta_online/house_hi_8.lua | 16 +- .../bob74_ipl/gta_online/house_low_1.lua | 33 ++- .../bob74_ipl/gta_online/house_mid_1.lua | 16 +- .../[maps]/bob74_ipl/gtav/ammunations.lua | 12 +- .../[maps]/bob74_ipl/gtav/bahama.lua | 4 +- .../resources/[maps]/bob74_ipl/gtav/base.lua | 6 +- .../resources/[maps]/bob74_ipl/gtav/floyd.lua | 16 +- .../[maps]/bob74_ipl/gtav/franklin.lua | 16 +- .../[maps]/bob74_ipl/gtav/franklin_aunt.lua | 10 +- .../[maps]/bob74_ipl/gtav/graffitis.lua | 6 +- .../[maps]/bob74_ipl/gtav/lester_factory.lua | 6 +- .../[maps]/bob74_ipl/gtav/michael.lua | 20 +- .../[maps]/bob74_ipl/gtav/north_yankton.lua | 6 +- .../bob74_ipl/gtav/pillbox_hospital.lua | 4 +- .../[maps]/bob74_ipl/gtav/red_carpet.lua | 4 +- .../[maps]/bob74_ipl/gtav/simeon.lua | 18 +- .../[maps]/bob74_ipl/gtav/stripclub.lua | 6 +- .../[maps]/bob74_ipl/gtav/trevors_trailer.lua | 10 +- .../resources/[maps]/bob74_ipl/gtav/ufo.lua | 10 +- .../[maps]/bob74_ipl/gtav/zancudo_gates.lua | 4 +- .../lib/observers/officeSafeDoorHandler.lua | 2 +- 81 files changed, 1311 insertions(+), 1208 deletions(-) diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_afterhours/nightclubs.lua b/server-data/resources/[maps]/bob74_ipl/dlc_afterhours/nightclubs.lua index 22b1c3966..124b8a2e7 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_afterhours/nightclubs.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_afterhours/nightclubs.lua @@ -1,5 +1,5 @@ -- Nightclub: -1604.664 -3012.583 -78.000 -exports('GetAfterHoursNightclubsObject', function() +exports("GetAfterHoursNightclubsObject", function() return AfterHoursNightclubs end) @@ -15,8 +15,8 @@ AfterHoursNightclubs = { end, Remove = function() EnableIpl(AfterHoursNightclubs.Ipl.Interior.ipl, false) - end - } + end, + }, }, Interior = { @@ -42,7 +42,7 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Style = { trad = "Int01_ba_Style01", @@ -60,7 +60,7 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Podium = { none = "", @@ -79,14 +79,14 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Speakers = { none = "", basic = "Int01_ba_equipment_setup", upgrade = { "Int01_ba_equipment_setup", - "Int01_ba_equipment_upgrade" + "Int01_ba_equipment_upgrade", }, Set = function(speakers, refresh) @@ -100,7 +100,7 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Security = { off = "", @@ -113,7 +113,7 @@ AfterHoursNightclubs = { end, Clear = function(refresh) SetIplPropState(AfterHoursNightclubs.interiorId, AfterHoursNightclubs.Interior.Security.on, false, refresh) - end + end, }, Turntables = { none = "", @@ -139,7 +139,7 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Lights = { Droplets = { @@ -159,7 +159,7 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Neons = { yellow = "DJ_01_Lights_02", @@ -178,7 +178,7 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Bands = { yellow = "DJ_01_Lights_03", @@ -197,7 +197,7 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Lasers = { yellow = "DJ_01_Lights_04", @@ -216,19 +216,19 @@ AfterHoursNightclubs = { SetIplPropState(AfterHoursNightclubs.interiorId, value, false, refresh) end end - end + end, }, Clear = function() AfterHoursNightclubs.Interior.Lights.Droplets.Clear() AfterHoursNightclubs.Interior.Lights.Neons.Clear() AfterHoursNightclubs.Interior.Lights.Bands.Clear() AfterHoursNightclubs.Interior.Lights.Lasers.Clear() - end + end, }, Bar = { Enable = function(state, refresh) SetIplPropState(AfterHoursNightclubs.interiorId, "Int01_ba_bar_content", state, refresh) - end + end, }, Booze = { A = "Int01_ba_booze_01", @@ -245,13 +245,13 @@ AfterHoursNightclubs = { else SetIplPropState(AfterHoursNightclubs.interiorId, booze, state, refresh) end - end + end, }, Trophy = { Color = { bronze = 0, silver = 1, - gold = 2 + gold = 2, }, number1 = "Int01_ba_trophy01", battler = "Int01_ba_trophy02", @@ -260,27 +260,27 @@ AfterHoursNightclubs = { Enable = function(trophy, state, color, refresh) SetIplPropState(AfterHoursNightclubs.interiorId, trophy, state, refresh) SetInteriorPropColor(AfterHoursNightclubs.interiorId, trophy, color) - end + end, }, DryIce = { scale = 5.0, Emitters = { { pos = vector3(-1602.932, -3019.1, -79.99), - rot = vector3(0.0, -10.0, 66.0) + rot = vector3(0.0, -10.0, 66.0), }, { pos = vector3(-1593.238, -3017.05, -79.99), - rot = vector3(0.0, -10.0, 110.0) + rot = vector3(0.0, -10.0, 110.0), }, { pos = vector3(-1597.134, -3008.2, -79.99), - rot = vector3(0.0, -10.0, -122.53) + rot = vector3(0.0, -10.0, -122.53), }, { pos = vector3(-1589.966, -3008.518, -79.99), - rot = vector3(0.0, -10.0, -166.97) - } + rot = vector3(0.0, -10.0, -166.97), + }, }, Enable = function(state) @@ -321,8 +321,8 @@ AfterHoursNightclubs = { Enable = function(details, state, refresh) SetIplPropState(AfterHoursNightclubs.interiorId, details, state, refresh) - end - } + end, + }, }, -- 760, -1337, 27 @@ -336,7 +336,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.Mesa.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -348,8 +348,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.Mesa.id) - end - } + end, + }, }, -- 348, -979, 30 @@ -363,7 +363,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.MissionRow.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -375,8 +375,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.MissionRow.id) - end - } + end, + }, }, -- -118, -1260, 30 @@ -390,7 +390,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.Strawberry.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -402,8 +402,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.Strawberry.id) - end - } + end, + }, }, -- 9, 221, 109 @@ -417,7 +417,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.VinewoodWest.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -429,8 +429,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.VinewoodWest.id) - end - } + end, + }, }, -- 868, -2098, 31 @@ -444,7 +444,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.Cypress.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -456,8 +456,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.Cypress.id) - end - } + end, + }, }, -- -1287, -647, 27 @@ -471,7 +471,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.DelPerro.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -483,8 +483,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.DelPerro.id) - end - } + end, + }, }, -- -680, -2461, 14 @@ -498,7 +498,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.Airport.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -510,8 +510,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.Airport.id) - end - } + end, + }, }, -- 192, -3168, 6 @@ -525,7 +525,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.Elysian.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -537,8 +537,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.Elysian.id) - end - } + end, + }, }, -- 373, 254, 103 @@ -552,7 +552,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.Vinewood.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -564,8 +564,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.Vinewood.id) - end - } + end, + }, }, -- -1171, -1150, 6 @@ -578,7 +578,7 @@ AfterHoursNightclubs = { end AfterHoursNightclubs.Barrier.Enable(AfterHoursNightclubs.Vespucci.id, state) - end + end, }, Posters = { Enable = function(poster, state) @@ -590,8 +590,8 @@ AfterHoursNightclubs = { end, Clear = function() AfterHoursNightclubs.Posters.Clear(AfterHoursNightclubs.Vespucci.id) - end - } + end, + }, }, Barrier = { @@ -601,7 +601,7 @@ AfterHoursNightclubs = { local value value = AfterHoursNightclubs.Barrier.barrier:gsub("caseX", "case" .. tostring(clubId)) EnableIpl(value, state) - end + end, }, Posters = { forSale = "ba_caseX_forsale", @@ -633,7 +633,7 @@ AfterHoursNightclubs = { EnableIpl(value, false) end end - end + end, }, LoadDefault = function() @@ -699,5 +699,5 @@ AfterHoursNightclubs = { AfterHoursNightclubs.Vespucci.Barrier.Enable(true) AfterHoursNightclubs.Vespucci.Posters.Enable(AfterHoursNightclubs.Posters, true) AfterHoursNightclubs.Vespucci.Posters.Enable(AfterHoursNightclubs.Posters.forSale, false) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/clubhouse1.lua b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/clubhouse1.lua index bfdcec704..0ac246b3c 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/clubhouse1.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/clubhouse1.lua @@ -1,5 +1,5 @@ -- Clubhouse1: 1107.04, -3157.399, -37.51859 -exports('GetBikerClubhouse1Object', function() +exports("GetBikerClubhouse1Object", function() return BikerClubhouse1 end) @@ -15,8 +15,8 @@ BikerClubhouse1 = { end, Remove = function() EnableIpl(BikerClubhouse1.Ipl.Interior.ipl, false) - end - } + end, + }, }, Walls = { brick = "walls_01", @@ -31,7 +31,7 @@ BikerClubhouse1 = { lightYellowGray = 6, lightGray = 7, orange = 8, - gray = 9 + gray = 9, }, Set = function(walls, color, refresh) @@ -47,9 +47,9 @@ BikerClubhouse1 = { Clear = function(refresh) SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Walls.brick, - BikerClubhouse1.Walls.plain + BikerClubhouse1.Walls.plain, }, false, refresh) - end + end, }, Furnitures = { A = "furnishings_01", @@ -68,9 +68,9 @@ BikerClubhouse1 = { Clear = function(refresh) SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Furnitures.A, - BikerClubhouse1.Furnitures.B + BikerClubhouse1.Furnitures.B, }, false, refresh) - end + end, }, Decoration = { A = "decorative_01", @@ -84,9 +84,9 @@ BikerClubhouse1 = { Clear = function(refresh) SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Decoration.A, - BikerClubhouse1.Decoration.B + BikerClubhouse1.Decoration.B, }, false, refresh) - end + end, }, Mural = { none = "", @@ -121,9 +121,9 @@ BikerClubhouse1 = { BikerClubhouse1.Mural.mods2, BikerClubhouse1.Mural.rideForever, BikerClubhouse1.Mural.heart, - BikerClubhouse1.Mural.route68 + BikerClubhouse1.Mural.route68, }, false, refresh) - end + end, }, GunLocker = { none = "", @@ -144,9 +144,9 @@ BikerClubhouse1 = { Clear = function(refresh) SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.GunLocker.on, - BikerClubhouse1.GunLocker.off + BikerClubhouse1.GunLocker.off, }, false, refresh) - end + end, }, ModBooth = { none = "", @@ -167,21 +167,21 @@ BikerClubhouse1 = { Clear = function(refresh) SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.ModBooth.on, - BikerClubhouse1.ModBooth.off + BikerClubhouse1.ModBooth.off, }, false, refresh) - end + end, }, Meth = { none = "", stage1 = "meth_stash1", stage2 = { "meth_stash1", - "meth_stash2" + "meth_stash2", }, stage3 = { "meth_stash1", "meth_stash2", - "meth_stash3" + "meth_stash3", }, Set = function(stage, refresh) @@ -199,21 +199,21 @@ BikerClubhouse1 = { SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Meth.stage1, BikerClubhouse1.Meth.stage2, - BikerClubhouse1.Meth.stage3 + BikerClubhouse1.Meth.stage3, }, false, refresh) - end + end, }, Cash = { none = "", stage1 = "cash_stash1", stage2 = { "cash_stash1", - "cash_stash2" + "cash_stash2", }, stage3 = { "cash_stash1", "cash_stash2", - "cash_stash3" + "cash_stash3", }, Set = function(stage, refresh) @@ -231,21 +231,21 @@ BikerClubhouse1 = { SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Cash.stage1, BikerClubhouse1.Cash.stage2, - BikerClubhouse1.Cash.stage3 + BikerClubhouse1.Cash.stage3, }, false, refresh) - end + end, }, Weed = { none = "", stage1 = "weed_stash1", stage2 = { "weed_stash1", - "weed_stash2" + "weed_stash2", }, stage3 = { "weed_stash1", "weed_stash2", - "weed_stash3" + "weed_stash3", }, Set = function(stage, refresh) @@ -263,21 +263,21 @@ BikerClubhouse1 = { SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Weed.stage1, BikerClubhouse1.Weed.stage2, - BikerClubhouse1.Weed.stage3 + BikerClubhouse1.Weed.stage3, }, false, refresh) - end + end, }, Coke = { none = "", stage1 = "coke_stash1", stage2 = { "coke_stash1", - "coke_stash2" + "coke_stash2", }, stage3 = { "coke_stash1", "coke_stash2", - "coke_stash3" + "coke_stash3", }, Set = function(stage, refresh) @@ -295,21 +295,21 @@ BikerClubhouse1 = { SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Coke.stage1, BikerClubhouse1.Coke.stage2, - BikerClubhouse1.Coke.stage3 + BikerClubhouse1.Coke.stage3, }, false, refresh) - end + end, }, Counterfeit = { none = "", stage1 = "counterfeit_stash1", stage2 = { "counterfeit_stash1", - "counterfeit_stash2" + "counterfeit_stash2", }, stage3 = { "counterfeit_stash1", "counterfeit_stash2", - "counterfeit_stash3" + "counterfeit_stash3", }, Set = function(stage, refresh) @@ -327,21 +327,21 @@ BikerClubhouse1 = { SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Counterfeit.stage1, BikerClubhouse1.Counterfeit.stage2, - BikerClubhouse1.Counterfeit.stage3 + BikerClubhouse1.Counterfeit.stage3, }, false, refresh) - end + end, }, Documents = { none = "", stage1 = "id_stash1", stage2 = { "id_stash1", - "id_stash2" + "id_stash2", }, stage3 = { "id_stash1", "id_stash2", - "id_stash3" + "id_stash3", }, Set = function(stage, refresh) @@ -359,9 +359,9 @@ BikerClubhouse1 = { SetIplPropState(BikerClubhouse1.interiorId, { BikerClubhouse1.Documents.stage1, BikerClubhouse1.Documents.stage2, - BikerClubhouse1.Documents.stage3 + BikerClubhouse1.Documents.stage3, }, false, refresh) - end + end, }, LoadDefault = function() @@ -384,5 +384,5 @@ BikerClubhouse1 = { BikerClubhouse1.Documents.Set(BikerClubhouse1.Documents.none) RefreshInterior(BikerClubhouse1.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/clubhouse2.lua b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/clubhouse2.lua index bfd6b55bb..666786662 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/clubhouse2.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/clubhouse2.lua @@ -1,5 +1,5 @@ -- Clubhouse2: 998.4809, -3164.711, -38.90733 -exports('GetBikerClubhouse2Object', function() +exports("GetBikerClubhouse2Object", function() return BikerClubhouse2 end) @@ -15,8 +15,8 @@ BikerClubhouse2 = { end, Remove = function() EnableIpl(BikerClubhouse2.Ipl.Interior.ipl, false) - end - } + end, + }, }, Walls = { brick = "walls_01", @@ -30,7 +30,7 @@ BikerClubhouse2 = { greenAndRed = 6, yellowAndGray = 7, red = 8, - fuchsiaAndGray = 9 + fuchsiaAndGray = 9, }, Set = function(walls, color, refresh) @@ -46,9 +46,9 @@ BikerClubhouse2 = { Clear = function(refresh) SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Walls.brick, - BikerClubhouse2.Walls.plain + BikerClubhouse2.Walls.plain, }, false, refresh) - end + end, }, LowerWalls = { default = "lower_walls_default", @@ -72,7 +72,7 @@ BikerClubhouse2 = { red = 6, darkGray = 7, black = 8, - red2 = 9 + red2 = 9, }, Set = function(furn, color, refresh) @@ -88,9 +88,9 @@ BikerClubhouse2 = { Clear = function(refresh) SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Furnitures.A, - BikerClubhouse2.Furnitures.B + BikerClubhouse2.Furnitures.B, }, false, refresh) - end + end, }, Decoration = { A = "decorative_01", @@ -104,9 +104,9 @@ BikerClubhouse2 = { Clear = function(refresh) SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Decoration.A, - BikerClubhouse2.Decoration.B + BikerClubhouse2.Decoration.B, }, false, refresh) - end + end, }, Mural = { none = "", @@ -141,9 +141,9 @@ BikerClubhouse2 = { BikerClubhouse2.Mural.cityColor3, BikerClubhouse2.Mural.cityColor4, BikerClubhouse2.Mural.cityBlack, - BikerClubhouse2.Mural.death3 + BikerClubhouse2.Mural.death3, }, false, refresh) - end + end, }, GunLocker = { on = "gun_locker", @@ -159,9 +159,9 @@ BikerClubhouse2 = { Clear = function(refresh) SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.GunLocker.on, - BikerClubhouse2.GunLocker.off + BikerClubhouse2.GunLocker.off, }, false, refresh) - end + end, }, ModBooth = { none = "", @@ -182,21 +182,21 @@ BikerClubhouse2 = { Clear = function(refresh) SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.ModBooth.on, - BikerClubhouse2.ModBooth.off + BikerClubhouse2.ModBooth.off, }, false, refresh) - end + end, }, Meth = { none = "", stage1 = "meth_small", stage2 = { "meth_small", - "meth_medium" + "meth_medium", }, stage3 = { "meth_small", "meth_medium", - "meth_large" + "meth_large", }, Set = function(stage, refresh) @@ -214,21 +214,21 @@ BikerClubhouse2 = { SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Meth.stage1, BikerClubhouse2.Meth.stage2, - BikerClubhouse2.Meth.stage3 + BikerClubhouse2.Meth.stage3, }, false, refresh) - end + end, }, Cash = { none = "", stage1 = "cash_small", stage2 = { "cash_small", - "cash_medium" + "cash_medium", }, stage3 = { "cash_small", "cash_medium", - "cash_large" + "cash_large", }, Set = function(stage, refresh) @@ -246,21 +246,21 @@ BikerClubhouse2 = { SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Cash.stage1, BikerClubhouse2.Cash.stage2, - BikerClubhouse2.Cash.stage3 + BikerClubhouse2.Cash.stage3, }, false, refresh) - end + end, }, Weed = { none = "", stage1 = "weed_small", stage2 = { "weed_small", - "weed_medium" + "weed_medium", }, stage3 = { "weed_small", "weed_medium", - "weed_large" + "weed_large", }, Set = function(stage, refresh) @@ -278,21 +278,21 @@ BikerClubhouse2 = { SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Weed.stage1, BikerClubhouse2.Weed.stage2, - BikerClubhouse2.Weed.stage3 + BikerClubhouse2.Weed.stage3, }, false, refresh) - end + end, }, Coke = { none = "", stage1 = "coke_small", stage2 = { "coke_small", - "coke_medium" + "coke_medium", }, stage3 = { "coke_small", "coke_medium", - "coke_large" + "coke_large", }, Set = function(stage, refresh) @@ -310,21 +310,21 @@ BikerClubhouse2 = { SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Coke.stage1, BikerClubhouse2.Coke.stage2, - BikerClubhouse2.Coke.stage3 + BikerClubhouse2.Coke.stage3, }, false, refresh) - end + end, }, Counterfeit = { none = "", stage1 = "counterfeit_small", stage2 = { "counterfeit_small", - "counterfeit_medium" + "counterfeit_medium", }, stage3 = { "counterfeit_small", "counterfeit_medium", - "counterfeit_large" + "counterfeit_large", }, Set = function(stage, refresh) @@ -342,21 +342,21 @@ BikerClubhouse2 = { SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Counterfeit.stage1, BikerClubhouse2.Counterfeit.stage2, - BikerClubhouse2.Counterfeit.stage3 + BikerClubhouse2.Counterfeit.stage3, }, false, refresh) - end + end, }, Documents = { none = "", stage1 = "id_small", stage2 = { "id_small", - "id_medium" + "id_medium", }, stage3 = { "id_small", "id_medium", - "id_large" + "id_large", }, Set = function(stage, refresh) @@ -365,16 +365,18 @@ BikerClubhouse2 = { if stage ~= "" then SetIplPropState(BikerClubhouse2.interiorId, stage, true, refresh) else - if refresh then RefreshInterior(BikerClubhouse2.interiorId) end + if refresh then + RefreshInterior(BikerClubhouse2.interiorId) + end end end, Clear = function(refresh) SetIplPropState(BikerClubhouse2.interiorId, { BikerClubhouse2.Documents.stage1, BikerClubhouse2.Documents.stage2, - BikerClubhouse2.Documents.stage3 + BikerClubhouse2.Documents.stage3, }, false, refresh) - end + end, }, LoadDefault = function() @@ -398,5 +400,5 @@ BikerClubhouse2 = { BikerClubhouse2.Documents.Set(BikerClubhouse2.Documents.none) RefreshInterior(BikerClubhouse2.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/cocaine.lua b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/cocaine.lua index 448470d44..31b6aabf7 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/cocaine.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/cocaine.lua @@ -1,5 +1,5 @@ -- Cocaine lockup: 1093.6, -3196.6, -38.99841 -exports('GetBikerCocaineObject', function() +exports("GetBikerCocaineObject", function() return BikerCocaine end) @@ -15,8 +15,8 @@ BikerCocaine = { end, Remove = function() EnableIpl(BikerCocaine.Ipl.Interior.ipl, false) - end - } + end, + }, }, Style = { none = "", @@ -25,14 +25,14 @@ BikerCocaine = { "equipment_basic", "coke_press_basic", "production_basic", - "table_equipment" + "table_equipment", }, upgrade = { "set_up", "equipment_upgrade", "coke_press_upgrade", "production_upgrade", - "table_equipment_upgrade" + "table_equipment_upgrade", }, Set = function(style, refresh) @@ -49,9 +49,9 @@ BikerCocaine = { Clear = function(refresh) SetIplPropState(BikerCocaine.interiorId, { BikerCocaine.Style.basic, - BikerCocaine.Style.upgrade + BikerCocaine.Style.upgrade, }, false, refresh) - end + end, }, Security = { none = "", @@ -72,9 +72,9 @@ BikerCocaine = { Clear = function(refresh) SetIplPropState(BikerCocaine.interiorId, { BikerCocaine.Security.basic, - BikerCocaine.Security.upgrade + BikerCocaine.Security.upgrade, }, false, refresh) - end + end, }, Details = { cokeBasic1 = "coke_cut_01", -- On the basic tables @@ -85,7 +85,7 @@ BikerCocaine = { Enable = function(details, state, refresh) SetIplPropState(BikerCocaine.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -94,5 +94,5 @@ BikerCocaine = { BikerCocaine.Security.Set(BikerCocaine.Security.none) RefreshInterior(BikerCocaine.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/counterfeit_cash.lua b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/counterfeit_cash.lua index b631521fc..52e97266b 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/counterfeit_cash.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/counterfeit_cash.lua @@ -1,5 +1,5 @@ -- Counterfeit cash factory: 1121.897, -3195.338, -40.4025 -exports('GetBikerCounterfeitObject', function() +exports("GetBikerCounterfeitObject", function() return BikerCounterfeit end) @@ -15,8 +15,8 @@ BikerCounterfeit = { end, Remove = function() EnableIpl(BikerCounterfeit.Ipl.Interior.ipl, false) - end - } + end, + }, }, Printer = { none = "", @@ -41,9 +41,9 @@ BikerCounterfeit = { BikerCounterfeit.Printer.basic, BikerCounterfeit.Printer.basicProd, BikerCounterfeit.Printer.upgrade, - BikerCounterfeit.Printer.upgradeProd + BikerCounterfeit.Printer.upgradeProd, }, false, refresh) - end + end, }, Security = { basic = "counterfeit_low_security", @@ -57,9 +57,9 @@ BikerCounterfeit = { Clear = function(refresh) SetIplPropState(BikerCounterfeit.interiorId, { BikerCounterfeit.Security.basic, - BikerCounterfeit.Security.upgrade + BikerCounterfeit.Security.upgrade, }, false, refresh) - end + end, }, Dryer1 = { none = "", @@ -82,9 +82,9 @@ BikerCounterfeit = { SetIplPropState(BikerCounterfeit.interiorId, { BikerCounterfeit.Dryer1.on, BikerCounterfeit.Dryer1.off, - BikerCounterfeit.Dryer1.open + BikerCounterfeit.Dryer1.open, }, false, refresh) - end + end, }, Dryer2 = { none = "", @@ -107,9 +107,9 @@ BikerCounterfeit = { SetIplPropState(BikerCounterfeit.interiorId, { BikerCounterfeit.Dryer2.on, BikerCounterfeit.Dryer2.off, - BikerCounterfeit.Dryer2.open + BikerCounterfeit.Dryer2.open, }, false, refresh) - end + end, }, Dryer3 = { none = "", @@ -132,9 +132,9 @@ BikerCounterfeit = { SetIplPropState(BikerCounterfeit.interiorId, { BikerCounterfeit.Dryer3.on, BikerCounterfeit.Dryer3.off, - BikerCounterfeit.Dryer3.open + BikerCounterfeit.Dryer3.open, }, false, refresh) - end + end, }, Dryer4 = { none = "", @@ -157,9 +157,9 @@ BikerCounterfeit = { SetIplPropState(BikerCounterfeit.interiorId, { BikerCounterfeit.Dryer4.on, BikerCounterfeit.Dryer4.off, - BikerCounterfeit.Dryer4.open + BikerCounterfeit.Dryer4.open, }, false, refresh) - end + end, }, Details = { Cash10 = { @@ -186,7 +186,7 @@ BikerCounterfeit = { Enable = function(details, state, refresh) SetIplPropState(BikerCounterfeit.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -202,5 +202,5 @@ BikerCounterfeit = { BikerCounterfeit.Details.Enable(BikerCounterfeit.Details.Cash100, true) RefreshInterior(BikerCounterfeit.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/document_forgery.lua b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/document_forgery.lua index 2f26cd4cc..94daf690a 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/document_forgery.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/document_forgery.lua @@ -1,5 +1,5 @@ -- Document forgery: 1165, -3196.6, -39.01306 -exports('GetBikerDocumentForgeryObject', function() +exports("GetBikerDocumentForgeryObject", function() return BikerDocumentForgery end) @@ -15,8 +15,8 @@ BikerDocumentForgery = { end, Remove = function() EnableIpl(BikerDocumentForgery.Ipl.Interior.ipl, false) - end - } + end, + }, }, Style = { basic = "interior_basic", @@ -30,9 +30,9 @@ BikerDocumentForgery = { Clear = function(refresh) SetIplPropState(BikerDocumentForgery.interiorId, { BikerDocumentForgery.Style.basic, - BikerDocumentForgery.Style.upgrade + BikerDocumentForgery.Style.upgrade, }, false, refresh) - end + end, }, Equipment = { none = "", @@ -53,9 +53,9 @@ BikerDocumentForgery = { Clear = function(refresh) SetIplPropState(BikerDocumentForgery.interiorId, { BikerDocumentForgery.Equipment.basic, - BikerDocumentForgery.Equipment.upgrade + BikerDocumentForgery.Equipment.upgrade, }, false, refresh) - end + end, }, Security = { basic = "security_low", @@ -69,9 +69,9 @@ BikerDocumentForgery = { Clear = function(refresh) SetIplPropState(BikerDocumentForgery.interiorId, { BikerDocumentForgery.Security.basic, - BikerDocumentForgery.Security.upgrade + BikerDocumentForgery.Security.upgrade, }, false, refresh) - end + end, }, Details = { Chairs = { @@ -81,7 +81,7 @@ BikerDocumentForgery = { D = "chair04", E = "chair05", F = "chair06", - G = "chair07" + G = "chair07", }, production = "production", -- Papers, pencils furnitures = "set_up", -- Printers, shredders @@ -89,7 +89,7 @@ BikerDocumentForgery = { Enable = function(details, state, refresh) SetIplPropState(BikerDocumentForgery.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -103,5 +103,5 @@ BikerDocumentForgery = { BikerDocumentForgery.Details.Enable(BikerDocumentForgery.Details.Chairs, true) RefreshInterior(BikerDocumentForgery.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/gang.lua b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/gang.lua index 54c90ffbf..186fdec53 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/gang.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/gang.lua @@ -1,8 +1,8 @@ -exports('GetBikerGangObject', function() +exports("GetBikerGangObject", function() return BikerGang end) -AddEventHandler('onClientResourceStop', function(res) +AddEventHandler("onClientResourceStop", function(res) if GetCurrentResourceName() ~= res then return end @@ -20,7 +20,7 @@ BikerGang = { red = 4, green = 5, yellow = 6, - blue = 7 + blue = 7, }, Fonts = { font1 = 0, @@ -35,7 +35,7 @@ BikerGang = { font10 = 9, font11 = 10, font12 = 11, - font13 = 12 + font13 = 12, }, name = "", color = 0, @@ -46,7 +46,7 @@ BikerGang = { BikerGang.Name.color = color BikerGang.Name.font = font BikerGang.Clubhouse.ClubName.stage = 0 - end + end, }, Emblem = { Logo = { @@ -58,7 +58,7 @@ BikerGang = { fox = "MPClubPreset6", city = "MPClubPreset7", dices = "MPClubPreset8", - target = "MPClubPreset9" + target = "MPClubPreset9", }, emblem = "MPClubPreset1", rot = 90.0, -- Rotation for 0.0 to 360.0 @@ -67,7 +67,7 @@ BikerGang = { BikerGang.Emblem.emblem = logo BikerGang.Emblem.rot = rotation BikerGang.Clubhouse.Emblem.stage = 0 - end + end, }, Clubhouse = { interiorId1 = 246273, @@ -95,7 +95,7 @@ BikerGang = { end, Clear = function() BikerGang.Clubhouse.Members.Clear(BikerGang.Clubhouse.Members.President) - end + end, }, VicePresident = { needToLoad = false, @@ -118,7 +118,7 @@ BikerGang = { end, Clear = function() BikerGang.Clubhouse.Members.Clear(BikerGang.Clubhouse.Members.VicePresident) - end + end, }, RoadCaptain = { needToLoad = false, @@ -141,7 +141,7 @@ BikerGang = { end, Clear = function() BikerGang.Clubhouse.Members.Clear(BikerGang.Clubhouse.Members.RoadCaptain) - end + end, }, Enforcer = { needToLoad = false, @@ -164,7 +164,7 @@ BikerGang = { end, Clear = function() BikerGang.Clubhouse.Members.Clear(BikerGang.Clubhouse.Members.Enforcer) - end + end, }, SergeantAtArms = { needToLoad = false, @@ -187,7 +187,7 @@ BikerGang = { end, Clear = function() BikerGang.Clubhouse.Members.Clear(BikerGang.Clubhouse.Members.SergeantAtArms) - end + end, }, Set = function(member, ped) member.Clear() @@ -199,7 +199,7 @@ BikerGang = { local IsTextureDictLoaded = LoadStreamedTextureDict(member.textureDict) if not IsTextureDictLoaded then - Citizen.Trace("ERROR: BikerClubhouseDrawMembers - Textures dictionnary \"" .. tostring(member.textureDict) .. "\" cannot be loaded.") + Citizen.Trace('ERROR: BikerClubhouseDrawMembers - Textures dictionnary "' .. tostring(member.textureDict) .. '" cannot be loaded.') end else Citizen.Trace("ERROR: BikerClubhouseDrawMembers - PedHeadShot not ready.") @@ -222,7 +222,7 @@ BikerGang = { member.textureDict = "" member.pedheadshot = -1 member.stage = 0 - end + end, }, ClubName = { @@ -252,7 +252,7 @@ BikerGang = { BikerGang.Clubhouse.ClubName.renderId = -1 BikerGang.Clubhouse.ClubName.movieId = -1 BikerGang.Clubhouse.ClubName.stage = 0 - end + end, }, Emblem = { @@ -277,7 +277,7 @@ BikerGang = { BikerGang.Clubhouse.Emblem.renderId = -1 BikerGang.Clubhouse.Emblem.stage = 0 - end + end, }, MissionsWall = { @@ -302,7 +302,7 @@ BikerGang = { torchedUpper = "BA_SH_BIG", torched = "BA_SH_TITLE", outriderUpper = "SHU_SH_BIG", - outrider = "SHU_SH_TITLE" + outrider = "SHU_SH_TITLE", }, Descriptions = { byThePound = "DEAL_DEALND", @@ -315,7 +315,7 @@ BikerGang = { cracked = "SC_MENU_DESC", fragileGoods = "DV_MENU_DESC", torched = "BA_MENU_DESC", - outrider = "SHU_MENU_DESC" + outrider = "SHU_MENU_DESC", }, Pictures = { byThePound = "CHM_IMG0", -- Pickup car parked @@ -328,7 +328,7 @@ BikerGang = { cracked = "CHM_IMG1", -- Safe fragileGoods = "CHM_IMG2", -- Lost Van torched = "CHM_IMG9", -- Explosive crate - outrider = "CHM_IMG7" -- Sport ride + outrider = "CHM_IMG7", -- Sport ride }, }, needToLoad = false, @@ -342,7 +342,7 @@ BikerGang = { none = -1, left = 0, middle = 1, - right = 2 + right = 2, }, Init = function() @@ -410,7 +410,7 @@ BikerGang = { BikerGang.Clubhouse.MissionsWall.renderId = -1 BikerGang.Clubhouse.MissionsWall.movieId = -1 BikerGang.Clubhouse.MissionsWall.stage = 0 - end + end, }, ClearAll = function() @@ -429,8 +429,8 @@ BikerGang = { member.loaded = false end end - end - } + end, + }, } Citizen.CreateThread(function() @@ -446,7 +446,16 @@ Citizen.CreateThread(function() BikerGang.Clubhouse.MissionsWall.Init() while true do - if BikerGang.Clubhouse.ClubName.needToLoad or BikerGang.Clubhouse.Emblem.needToLoad or BikerGang.Clubhouse.MissionsWall.needToLoad or BikerGang.Clubhouse.Members.President.needToLoad or BikerGang.Clubhouse.Members.VicePresident.needToLoad or BikerGang.Clubhouse.Members.RoadCaptain.needToLoad or BikerGang.Clubhouse.Members.Enforcer.needToLoad or BikerGang.Clubhouse.Members.SergeantAtArms.needToLoad then + if + BikerGang.Clubhouse.ClubName.needToLoad + or BikerGang.Clubhouse.Emblem.needToLoad + or BikerGang.Clubhouse.MissionsWall.needToLoad + or BikerGang.Clubhouse.Members.President.needToLoad + or BikerGang.Clubhouse.Members.VicePresident.needToLoad + or BikerGang.Clubhouse.Members.RoadCaptain.needToLoad + or BikerGang.Clubhouse.Members.Enforcer.needToLoad + or BikerGang.Clubhouse.Members.SergeantAtArms.needToLoad + then -- If we are inside a clubhouse, then we load if Global.Biker.isInsideClubhouse1 or Global.Biker.isInsideClubhouse2 then -- Club name @@ -518,9 +527,9 @@ function DrawClubName(name, color, font) elseif BikerGang.Clubhouse.ClubName.stage == 1 then if HasScaleformMovieLoaded(BikerGang.Clubhouse.ClubName.movieId) then local parameters = { - p0 = {type = "string", value = name}, - p1 = {type = "int", value = color}, - p2 = {type = "int", value = font} + p0 = { type = "string", value = name }, + p1 = { type = "int", value = color }, + p2 = { type = "int", value = font }, } SetupScaleform(BikerGang.Clubhouse.ClubName.movieId, "SET_CLUBHOUSE_NAME", parameters) @@ -561,7 +570,7 @@ function DrawEmblem(texturesDict, rotation) SetScriptGfxAlign(73, 73) SetScriptGfxDrawOrder(4) SetScriptGfxDrawBehindPausemenu(true) - DrawInteractiveSprite(texturesDict, texturesDict, 0.5, 0.5, 1.0, 1.0, rotation, 255, 255, 255, 255); + DrawInteractiveSprite(texturesDict, texturesDict, 0.5, 0.5, 1.0, 1.0, rotation, 255, 255, 255, 255) ResetScriptGfxAlign() SetTextRenderId(GetDefaultScriptRendertargetRenderId()) end diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/meth.lua b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/meth.lua index 7f88a9a1f..443c0cd3c 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/meth.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/meth.lua @@ -1,5 +1,5 @@ -- Meth lab: 1009.5, -3196.6, -38.99682 -exports('GetBikerMethLabObject', function() +exports("GetBikerMethLabObject", function() return BikerMethLab end) @@ -15,19 +15,19 @@ BikerMethLab = { end, Remove = function() EnableIpl(BikerMethLab.Ipl.Interior.ipl, false) - end - } + end, + }, }, Style = { none = "", empty = "meth_lab_empty", basic = { "meth_lab_basic", - "meth_lab_setup" + "meth_lab_setup", }, upgrade = { "meth_lab_upgrade", - "meth_lab_setup" + "meth_lab_setup", }, Set = function(style, refresh) @@ -45,9 +45,9 @@ BikerMethLab = { SetIplPropState(BikerMethLab.interiorId, { BikerMethLab.Style.empty, BikerMethLab.Style.basic, - BikerMethLab.Style.upgrade + BikerMethLab.Style.upgrade, }, false, refresh) - end + end, }, Security = { none = "", @@ -66,14 +66,14 @@ BikerMethLab = { end, Clear = function(refresh) SetIplPropState(BikerMethLab.interiorId, BikerMethLab.Security.upgrade, false, refresh) - end + end, }, Details = { production = "meth_lab_production", -- Products Enable = function(details, state, refresh) SetIplPropState(BikerMethLab.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -83,5 +83,5 @@ BikerMethLab = { BikerMethLab.Details.Enable(BikerMethLab.Details.production, false) RefreshInterior(BikerMethLab.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/weed.lua b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/weed.lua index 2550c73dc..75d64857b 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_bikers/weed.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_bikers/weed.lua @@ -1,5 +1,5 @@ -- Weed farm: 1051.491, -3196.536, -39.14842 -exports('GetBikerWeedFarmObject', function() +exports("GetBikerWeedFarmObject", function() return BikerWeedFarm end) @@ -15,7 +15,7 @@ BikerWeedFarm = { end, Remove = function() EnableIpl(BikerWeedFarm.Ipl.Interior.ipl, false) - end + end, }, }, Style = { @@ -30,9 +30,9 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Style.basic, - BikerWeedFarm.Style.upgrade + BikerWeedFarm.Style.upgrade, }, false, refresh) - end + end, }, Security = { basic = "weed_low_security", @@ -46,9 +46,9 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Security.basic, - BikerWeedFarm.Security.upgrade + BikerWeedFarm.Security.upgrade, }, false, refresh) - end + end, }, Plant1 = { Stage = { @@ -65,9 +65,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant1.Stage.small, BikerWeedFarm.Plant1.Stage.medium, - BikerWeedFarm.Plant1.Stage.full + BikerWeedFarm.Plant1.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growtha_stage23_standard", @@ -81,14 +81,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant1.Light.basic, - BikerWeedFarm.Plant1.Light.upgrade + BikerWeedFarm.Plant1.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hosea", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant1.Stage.Set(stage, false) @@ -99,7 +99,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant1.Stage.Clear() BikerWeedFarm.Plant1.Light.Clear() BikerWeedFarm.Plant1.Hose.Enable(false, true) - end + end, }, Plant2 = { Stage = { @@ -116,9 +116,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant2.Stage.small, BikerWeedFarm.Plant2.Stage.medium, - BikerWeedFarm.Plant2.Stage.full + BikerWeedFarm.Plant2.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growthb_stage23_standard", @@ -132,14 +132,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant2.Light.basic, - BikerWeedFarm.Plant2.Light.upgrade + BikerWeedFarm.Plant2.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hoseb", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant2.Stage.Set(stage, false) @@ -150,7 +150,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant2.Stage.Clear() BikerWeedFarm.Plant2.Light.Clear() BikerWeedFarm.Plant2.Hose.Enable(false, true) - end + end, }, Plant3 = { Stage = { @@ -167,9 +167,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant3.Stage.small, BikerWeedFarm.Plant3.Stage.medium, - BikerWeedFarm.Plant3.Stage.full + BikerWeedFarm.Plant3.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growthc_stage23_standard", @@ -183,14 +183,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant3.Light.basic, - BikerWeedFarm.Plant3.Light.upgrade + BikerWeedFarm.Plant3.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hosec", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant3.Stage.Set(stage, false) @@ -201,7 +201,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant3.Stage.Clear() BikerWeedFarm.Plant3.Light.Clear() BikerWeedFarm.Plant3.Hose.Enable(false, true) - end + end, }, Plant4 = { Stage = { @@ -218,9 +218,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant4.Stage.small, BikerWeedFarm.Plant4.Stage.medium, - BikerWeedFarm.Plant4.Stage.full + BikerWeedFarm.Plant4.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growthd_stage23_standard", @@ -234,14 +234,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant4.Light.basic, - BikerWeedFarm.Plant4.Light.upgrade + BikerWeedFarm.Plant4.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hosed", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant4.Stage.Set(stage, false) @@ -252,7 +252,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant4.Stage.Clear() BikerWeedFarm.Plant4.Light.Clear() BikerWeedFarm.Plant4.Hose.Enable(false, true) - end + end, }, Plant5 = { Stage = { @@ -269,9 +269,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant5.Stage.small, BikerWeedFarm.Plant5.Stage.medium, - BikerWeedFarm.Plant5.Stage.full + BikerWeedFarm.Plant5.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growthe_stage23_standard", @@ -285,14 +285,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant5.Light.basic, - BikerWeedFarm.Plant5.Light.upgrade + BikerWeedFarm.Plant5.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hosee", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant5.Stage.Set(stage, false) @@ -303,7 +303,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant5.Stage.Clear() BikerWeedFarm.Plant5.Light.Clear() BikerWeedFarm.Plant5.Hose.Enable(false, true) - end + end, }, Plant6 = { Stage = { @@ -320,9 +320,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant6.Stage.small, BikerWeedFarm.Plant6.Stage.medium, - BikerWeedFarm.Plant6.Stage.full + BikerWeedFarm.Plant6.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growthf_stage23_standard", @@ -336,14 +336,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant6.Light.basic, - BikerWeedFarm.Plant6.Light.upgrade + BikerWeedFarm.Plant6.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hosef", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant6.Stage.Set(stage, false) @@ -354,7 +354,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant6.Stage.Clear() BikerWeedFarm.Plant6.Light.Clear() BikerWeedFarm.Plant6.Hose.Enable(false, true) - end + end, }, Plant7 = { Stage = { @@ -371,9 +371,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant7.Stage.small, BikerWeedFarm.Plant7.Stage.medium, - BikerWeedFarm.Plant7.Stage.full + BikerWeedFarm.Plant7.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growthg_stage23_standard", @@ -387,14 +387,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant7.Light.basic, - BikerWeedFarm.Plant7.Light.upgrade + BikerWeedFarm.Plant7.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hoseg", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant7.Stage.Set(stage, false) @@ -405,7 +405,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant7.Stage.Clear() BikerWeedFarm.Plant7.Light.Clear() BikerWeedFarm.Plant7.Hose.Enable(false, true) - end + end, }, Plant8 = { Stage = { @@ -422,9 +422,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant8.Stage.small, BikerWeedFarm.Plant8.Stage.medium, - BikerWeedFarm.Plant8.Stage.full + BikerWeedFarm.Plant8.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growthh_stage23_standard", @@ -438,14 +438,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant8.Light.basic, - BikerWeedFarm.Plant8.Light.upgrade + BikerWeedFarm.Plant8.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hoseh", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant8.Stage.Set(stage, false) @@ -456,7 +456,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant8.Stage.Clear() BikerWeedFarm.Plant8.Light.Clear() BikerWeedFarm.Plant8.Hose.Enable(false, true) - end + end, }, Plant9 = { Stage = { @@ -473,9 +473,9 @@ BikerWeedFarm = { SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant9.Stage.small, BikerWeedFarm.Plant9.Stage.medium, - BikerWeedFarm.Plant9.Stage.full + BikerWeedFarm.Plant9.Stage.full, }, false, refresh) - end + end, }, Light = { basic = "light_growthi_stage23_standard", @@ -489,14 +489,14 @@ BikerWeedFarm = { Clear = function(refresh) SetIplPropState(BikerWeedFarm.interiorId, { BikerWeedFarm.Plant9.Light.basic, - BikerWeedFarm.Plant9.Light.upgrade + BikerWeedFarm.Plant9.Light.upgrade, }, false, refresh) - end + end, }, Hose = { Enable = function(state, refresh) SetIplPropState(BikerWeedFarm.interiorId, "weed_hosei", state, refresh) - end + end, }, Set = function(stage, upgrade) BikerWeedFarm.Plant9.Stage.Set(stage, false) @@ -507,7 +507,7 @@ BikerWeedFarm = { BikerWeedFarm.Plant9.Stage.Clear() BikerWeedFarm.Plant9.Light.Clear() BikerWeedFarm.Plant9.Hose.Enable(false, true) - end + end, }, Details = { production = "weed_production", -- Weed on the tables @@ -517,7 +517,7 @@ BikerWeedFarm = { Enable = function(details, state, refresh) SetIplPropState(BikerWeedFarm.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -531,7 +531,7 @@ BikerWeedFarm = { BikerWeedFarm.Details.Enable({ BikerWeedFarm.Details.production, BikerWeedFarm.Details.chairs, - BikerWeedFarm.Details.drying + BikerWeedFarm.Details.drying, }, true) BikerWeedFarm.Plant1.Set(BikerWeedFarm.Plant1.Stage.medium, BikerWeedFarm.Plant1.Light.basic) @@ -545,5 +545,5 @@ BikerWeedFarm = { BikerWeedFarm.Plant9.Set(BikerWeedFarm.Plant9.Stage.full, BikerWeedFarm.Plant9.Light.basic) RefreshInterior(BikerWeedFarm.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_casino/casino.lua b/server-data/resources/[maps]/bob74_ipl/dlc_casino/casino.lua index 0b38d0437..8b676640e 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_casino/casino.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_casino/casino.lua @@ -1,4 +1,4 @@ -exports('GetDiamondCasinoObject', function() +exports("GetDiamondCasinoObject", function() return DiamondCasino end) @@ -9,7 +9,7 @@ DiamondCasino = { "hei_dlc_windows_casino", "hei_dlc_casino_aircon", "vw_dlc_casino_door", - "hei_dlc_casino_door" + "hei_dlc_casino_door", }, Load = function() @@ -17,11 +17,11 @@ DiamondCasino = { end, Remove = function() EnableIpl(DiamondCasino.Ipl.Building.ipl, false) - end + end, }, Main = { ipl = "vw_casino_main", - + -- Normal Version: 1110.20, 216.60 -49.45 -- Heist Version: 2490.67, -280.40, -58.71 @@ -30,11 +30,11 @@ DiamondCasino = { end, Remove = function() EnableIpl(DiamondCasino.Ipl.Main.ipl, false) - end + end, }, Garage = { ipl = "vw_casino_garage", - + -- Loading Bay Garage: 2536.276, -278.98, -64.722 -- Vault Lobby: 2483.151, -278.58, -70.694 -- Vault: 2516.765, -238.056, -70.737 @@ -44,11 +44,11 @@ DiamondCasino = { end, Remove = function() EnableIpl(DiamondCasino.Ipl.Garage.ipl, false) - end + end, }, Carpark = { ipl = "vw_casino_carpark", - + -- Carpark Garage: 1380.000 200.000 -50.000 -- VIP Carpark Garage: 1295.000 230.000 -50.000 @@ -57,8 +57,8 @@ DiamondCasino = { end, Remove = function() EnableIpl(DiamondCasino.Ipl.Carpark.ipl, false) - end - } + end, + }, }, LoadDefault = function() @@ -66,5 +66,5 @@ DiamondCasino = { DiamondCasino.Ipl.Main.Load() DiamondCasino.Ipl.Carpark.Load() DiamondCasino.Ipl.Garage.Load() - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_casino/penthouse.lua b/server-data/resources/[maps]/bob74_ipl/dlc_casino/penthouse.lua index 23b97c4e6..7a4060cbb 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_casino/penthouse.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_casino/penthouse.lua @@ -1,4 +1,4 @@ -exports('GetDiamondPenthouseObject', function() +exports("GetDiamondPenthouseObject", function() return DiamondPenthouse end) @@ -17,14 +17,14 @@ DiamondPenthouse = { end, Remove = function() EnableIpl(DiamondPenthouse.Ipl.Interior.ipl, false) - end - } + end, + }, }, Colors = { default = 0, sharp = 1, vibrant = 2, - timeless = 3 + timeless = 3, }, Interior = { Walls = { @@ -34,7 +34,7 @@ DiamondPenthouse = { if refresh then RefreshInterior(DiamondPenthouse.interiorId) end - end + end, }, Pattern = { pattern01 = "Set_Pent_Pattern_01", @@ -65,7 +65,7 @@ DiamondPenthouse = { if refresh then RefreshInterior(DiamondPenthouse.interiorId) end - end + end, }, SpaBar = { open = "Set_Pent_Spa_Bar_Open", @@ -82,7 +82,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, MediaBar = { open = "Set_Pent_Media_Bar_Open", @@ -99,7 +99,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Dealer = { open = "Set_Pent_Dealer", @@ -116,7 +116,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Arcade = { none = "", @@ -134,7 +134,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Clutter = { bar = "Set_Pent_Bar_Clutter", @@ -153,7 +153,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, BarLight = { none = "", @@ -172,7 +172,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, BarParty = { none = "", @@ -192,7 +192,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Blockers = { Guest = { @@ -210,7 +210,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Lounge = { enabled = "Set_Pent_LOUNGE_BLOCKER", @@ -227,7 +227,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Office = { enabled = "Set_Pent_OFFICE_BLOCKER", @@ -244,7 +244,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Cinema = { enabled = "Set_Pent_CINE_BLOCKER", @@ -261,7 +261,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Spa = { enabled = "Set_Pent_SPA_BLOCKER", @@ -278,7 +278,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, Bar = { enabled = "Set_Pent_BAR_BLOCKER", @@ -295,7 +295,7 @@ DiamondPenthouse = { SetIplPropState(DiamondPenthouse.interiorId, value, false, refresh) end end - end + end, }, EnableAllBlockers = function() DiamondPenthouse.Interior.Blockers.Bar.Set(DiamondPenthouse.Interior.Blockers.Bar.enabled) @@ -312,8 +312,8 @@ DiamondPenthouse = { DiamondPenthouse.Interior.Blockers.Cinema.Set(DiamondPenthouse.Interior.Blockers.Cinema.disabled) DiamondPenthouse.Interior.Blockers.Lounge.Set(DiamondPenthouse.Interior.Blockers.Lounge.disabled) DiamondPenthouse.Interior.Blockers.Office.Set(DiamondPenthouse.Interior.Blockers.Office.disabled) - end - } + end, + }, }, LoadDefault = function() @@ -331,5 +331,5 @@ DiamondPenthouse = { DiamondPenthouse.Interior.Dealer.Set(DiamondPenthouse.Interior.Dealer.open) RefreshInterior(DiamondPenthouse.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_doomsday/facility.lua b/server-data/resources/[maps]/bob74_ipl/dlc_doomsday/facility.lua index 21fe32c14..acfefd794 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_doomsday/facility.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_doomsday/facility.lua @@ -1,5 +1,5 @@ -- DoomsdayFacility: 345.00000000 4842.00000000 -60.00000000 -exports('GetDoomsdayFacilityObject', function() +exports("GetDoomsdayFacilityObject", function() return DoomsdayFacility end) @@ -16,7 +16,7 @@ DoomsdayFacility = { end, Remove = function() EnableIpl(DoomsdayFacility.Ipl.Interior.ipl, false) - end + end, }, Exterior = { ipl = { @@ -33,7 +33,7 @@ DoomsdayFacility = { "xm_siloentranceclosed_x17", -- Closed silo: 598.4869 5556.846 716.7615 "xm_bunkerentrance_door", -- Bunker entrance closed door: 2050.85 2950.0 47.75 "xm_hatches_terrain", -- Terrain adjustments for facilities (all) + silo - "xm_hatches_terrain_lod" + "xm_hatches_terrain_lod", }, Load = function() @@ -41,8 +41,8 @@ DoomsdayFacility = { end, Remove = function() EnableIpl(DoomsdayFacility.Ipl.Exterior.ipl, false) - end - } + end, + }, }, Colors = { utility = 1, @@ -53,7 +53,7 @@ DoomsdayFacility = { influence = 6, order = 7, empire = 8, - supremacy = 9 + supremacy = 9, }, Walls = { SetColor = function(color, refresh) @@ -62,7 +62,7 @@ DoomsdayFacility = { if refresh then RefreshInterior(DoomsdayFacility.interiorId) end - end + end, }, Decals = { none = "", @@ -89,11 +89,17 @@ DoomsdayFacility = { end, Clear = function(refresh) SetIplPropState(DoomsdayFacility.interiorId, { - DoomsdayFacility.Decals.style01, DoomsdayFacility.Decals.style02, DoomsdayFacility.Decals.style03, - DoomsdayFacility.Decals.style04, DoomsdayFacility.Decals.style05, DoomsdayFacility.Decals.style06, - DoomsdayFacility.Decals.style07, DoomsdayFacility.Decals.style08, DoomsdayFacility.Decals.style09 + DoomsdayFacility.Decals.style01, + DoomsdayFacility.Decals.style02, + DoomsdayFacility.Decals.style03, + DoomsdayFacility.Decals.style04, + DoomsdayFacility.Decals.style05, + DoomsdayFacility.Decals.style06, + DoomsdayFacility.Decals.style07, + DoomsdayFacility.Decals.style08, + DoomsdayFacility.Decals.style09, }, false, refresh) - end + end, }, Lounge = { utility = "set_int_02_lounge1", @@ -110,9 +116,9 @@ DoomsdayFacility = { SetIplPropState(DoomsdayFacility.interiorId, { DoomsdayFacility.Lounge.utility, DoomsdayFacility.Lounge.prestige, - DoomsdayFacility.Lounge.premier + DoomsdayFacility.Lounge.premier, }, false, refresh) - end + end, }, Sleeping = { none = "set_int_02_no_sleep", @@ -131,9 +137,9 @@ DoomsdayFacility = { DoomsdayFacility.Sleeping.none, DoomsdayFacility.Sleeping.utility, DoomsdayFacility.Sleeping.prestige, - DoomsdayFacility.Sleeping.premier + DoomsdayFacility.Sleeping.premier, }, false, refresh) - end + end, }, Security = { off = "set_int_02_no_security", @@ -148,9 +154,9 @@ DoomsdayFacility = { Clear = function(refresh) SetIplPropState(DoomsdayFacility.interiorId, { DoomsdayFacility.Security.off, - DoomsdayFacility.Security.on + DoomsdayFacility.Security.on, }, false, refresh) - end + end, }, Cannon = { off = "set_int_02_no_cannon", @@ -165,9 +171,9 @@ DoomsdayFacility = { Clear = function(refresh) SetIplPropState(DoomsdayFacility.interiorId, { DoomsdayFacility.Cannon.off, - DoomsdayFacility.Cannon.on + DoomsdayFacility.Cannon.on, }, false, refresh) - end + end, }, PrivacyGlass = { controlModelHash = `xm_prop_x17_tem_control_01`, @@ -205,7 +211,8 @@ DoomsdayFacility = { rotation = vector3(0.0, 0.0, 0.0), Enable = function(state) - local handle = GetClosestObjectOfType(DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.x, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.y, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.z, 1.0, DoomsdayFacility.PrivacyGlass.controlModelHash, false, false, false) + local handle = + GetClosestObjectOfType(DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.x, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.y, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.z, 1.0, DoomsdayFacility.PrivacyGlass.controlModelHash, false, false, false) if state then if handle == 0 then @@ -214,7 +221,8 @@ DoomsdayFacility = { Citizen.Wait(0) end - local privacyGlass = CreateObjectNoOffset(DoomsdayFacility.PrivacyGlass.controlModelHash, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.x, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.y, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.z, true, true, false) + local privacyGlass = + CreateObjectNoOffset(DoomsdayFacility.PrivacyGlass.controlModelHash, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.x, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.y, DoomsdayFacility.PrivacyGlass.Bedroom.Control.position.z, true, true, false) SetEntityRotation(privacyGlass, DoomsdayFacility.PrivacyGlass.Bedroom.Control.rotation.x, DoomsdayFacility.PrivacyGlass.Bedroom.Control.rotation.y, DoomsdayFacility.PrivacyGlass.Bedroom.Control.rotation.z, 2, true) FreezeEntityPosition(privacyGlass, true) @@ -227,35 +235,35 @@ DoomsdayFacility = { end end end, - } + }, }, Lounge = { Glasses = { { modelHash = `xm_prop_x17_l_door_glass_01`, entityHash = `xm_prop_x17_l_door_frame_01`, - entityPos = vector3(359.22, 4846.043, -58.85) + entityPos = vector3(359.22, 4846.043, -58.85), }, { modelHash = `xm_prop_x17_l_door_glass_01`, entityHash = `xm_prop_x17_l_door_frame_01`, - entityPos = vector3(369.066, 4846.273, -58.85) + entityPos = vector3(369.066, 4846.273, -58.85), }, { modelHash = `xm_prop_x17_l_glass_01`, entityHash = `xm_prop_x17_l_frame_01`, - entityPos = vector3(358.843, 4845.103, -60.0) + entityPos = vector3(358.843, 4845.103, -60.0), }, { modelHash = `xm_prop_x17_l_glass_02`, entityHash = `xm_prop_x17_l_frame_02`, - entityPos = vector3(366.309, 4847.281, -60.0) + entityPos = vector3(366.309, 4847.281, -60.0), }, { modelHash = `xm_prop_x17_l_glass_03`, entityHash = `xm_prop_x17_l_frame_03`, - entityPos = vector3(371.194, 4841.27, -60.0) - } + entityPos = vector3(371.194, 4841.27, -60.0), + }, }, Enable = function(state) @@ -295,7 +303,8 @@ DoomsdayFacility = { rotation = vector3(0.0, 0.0, -16.0), Enable = function(state) - local handle = GetClosestObjectOfType(DoomsdayFacility.PrivacyGlass.Lounge.Control.position.x, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.y, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.z, 1.0, DoomsdayFacility.PrivacyGlass.controlModelHash, false, false, false) + local handle = + GetClosestObjectOfType(DoomsdayFacility.PrivacyGlass.Lounge.Control.position.x, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.y, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.z, 1.0, DoomsdayFacility.PrivacyGlass.controlModelHash, false, false, false) if state then if handle == 0 then @@ -304,7 +313,8 @@ DoomsdayFacility = { Citizen.Wait(0) end - local privacyGlass = CreateObjectNoOffset(DoomsdayFacility.PrivacyGlass.controlModelHash, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.x, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.y, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.z, true, true, false) + local privacyGlass = + CreateObjectNoOffset(DoomsdayFacility.PrivacyGlass.controlModelHash, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.x, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.y, DoomsdayFacility.PrivacyGlass.Lounge.Control.position.z, true, true, false) SetEntityRotation(privacyGlass, DoomsdayFacility.PrivacyGlass.Lounge.Control.rotation.x, DoomsdayFacility.PrivacyGlass.Lounge.Control.rotation.y, DoomsdayFacility.PrivacyGlass.Lounge.Control.rotation.z, 2, true) FreezeEntityPosition(privacyGlass, true) @@ -316,35 +326,35 @@ DoomsdayFacility = { DeleteEntity(handle) end end - end - } - } + end, + }, + }, }, Details = { KhanjaliParts = { A = "Set_Int_02_Parts_Panther1", B = "Set_Int_02_Parts_Panther2", - C = "Set_Int_02_Parts_Panther3" + C = "Set_Int_02_Parts_Panther3", }, RiotParts = { A = "Set_Int_02_Parts_Riot1", B = "Set_Int_02_Parts_Riot2", - C = "Set_Int_02_Parts_Riot3" + C = "Set_Int_02_Parts_Riot3", }, ChenoParts = { A = "Set_Int_02_Parts_Cheno1", B = "Set_Int_02_Parts_Cheno2", - C = "Set_Int_02_Parts_Cheno3" + C = "Set_Int_02_Parts_Cheno3", }, ThrusterParts = { A = "Set_Int_02_Parts_Thruster1", B = "Set_Int_02_Parts_Thruster2", - C = "Set_Int_02_Parts_Thruster3" + C = "Set_Int_02_Parts_Thruster3", }, AvengerParts = { A = "Set_Int_02_Parts_Avenger1", B = "Set_Int_02_Parts_Avenger2", - C = "Set_Int_02_Parts_Avenger3" + C = "Set_Int_02_Parts_Avenger3", }, Outfits = { paramedic = "Set_Int_02_outfit_paramedic", @@ -358,7 +368,7 @@ DoomsdayFacility = { submarine = "Set_Int_02_outfit_sub_finale", predator = "Set_Int_02_outfit_predator", khanjali = "Set_Int_02_outfit_khanjali", - volatol = "Set_Int_02_outfit_volatol" + volatol = "Set_Int_02_outfit_volatol", }, Trophies = { eagle = "set_int_02_trophy1", @@ -371,20 +381,20 @@ DoomsdayFacility = { if refresh then RefreshInterior(DoomsdayFacility.interiorId) end - end + end, }, Clutter = { A = "set_int_02_clutter1", B = "set_int_02_clutter2", C = "set_int_02_clutter3", D = "set_int_02_clutter4", - E = "set_int_02_clutter5" + E = "set_int_02_clutter5", }, crewEmblem = "set_int_02_crewemblem", Enable = function(details, state, refresh) SetIplPropState(DoomsdayFacility.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -413,9 +423,9 @@ DoomsdayFacility = { DoomsdayFacility.Details.Enable({ DoomsdayFacility.Details.Clutter.A, - DoomsdayFacility.Details.Clutter.B + DoomsdayFacility.Details.Clutter.B, }, true) RefreshInterior(DoomsdayFacility.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment1.lua b/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment1.lua index 654b2eeb3..4aca9929f 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment1.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment1.lua @@ -1,5 +1,5 @@ -- Apartment 1: -787.78050000 334.92320000 215.83840000 -exports('GetExecApartment1Object', function() +exports("GetExecApartment1Object", function() return ExecApartment1 end) @@ -10,36 +10,36 @@ ExecApartment1 = { Theme = { modern = { interiorId = 227329, - ipl = "apa_v_mp_h_01_a" + ipl = "apa_v_mp_h_01_a", }, moody = { interiorId = 228097, - ipl = "apa_v_mp_h_02_a" + ipl = "apa_v_mp_h_02_a", }, vibrant = { interiorId = 228865, - ipl = "apa_v_mp_h_03_a" + ipl = "apa_v_mp_h_03_a", }, sharp = { interiorId = 229633, - ipl = "apa_v_mp_h_04_a" + ipl = "apa_v_mp_h_04_a", }, monochrome = { interiorId = 230401, - ipl = "apa_v_mp_h_05_a" + ipl = "apa_v_mp_h_05_a", }, seductive = { interiorId = 231169, - ipl = "apa_v_mp_h_06_a" + ipl = "apa_v_mp_h_06_a", }, regal = { interiorId = 231937, - ipl = "apa_v_mp_h_07_a" + ipl = "apa_v_mp_h_07_a", }, aqua = { interiorId = 232705, - ipl = "apa_v_mp_h_08_a" - } + ipl = "apa_v_mp_h_08_a", + }, }, Set = function(style, refresh) @@ -59,21 +59,21 @@ ExecApartment1 = { SetIplPropState(value.interiorId, { "Apart_Hi_Strip_A", "Apart_Hi_Strip_B", - "Apart_Hi_Strip_C" + "Apart_Hi_Strip_C", }, false) SetIplPropState(value.interiorId, { "Apart_Hi_Booze_A", "Apart_Hi_Booze_B", - "Apart_Hi_Booze_C" + "Apart_Hi_Booze_C", }, false) SetIplPropState(value.interiorId, { "Apart_Hi_Smokes_A", "Apart_Hi_Smokes_B", - "Apart_Hi_Smokes_C" + "Apart_Hi_Smokes_C", }, false, true) EnableIpl(value.ipl, false) end - end + end, }, Strip = { A = "Apart_Hi_Strip_A", @@ -82,7 +82,7 @@ ExecApartment1 = { Enable = function(details, state, refresh) SetIplPropState(ExecApartment1.currentInteriorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -91,7 +91,7 @@ ExecApartment1 = { Enable = function(details, state, refresh) SetIplPropState(ExecApartment1.currentInteriorId, details, state, refresh) - end + end, }, Smoke = { none = "", @@ -114,9 +114,9 @@ ExecApartment1 = { SetIplPropState(ExecApartment1.currentInteriorId, { ExecApartment1.Smoke.stage1, ExecApartment1.Smoke.stage2, - ExecApartment1.Smoke.stage3 + ExecApartment1.Smoke.stage3, }, false, refresh) - end + end, }, LoadDefault = function() @@ -124,13 +124,13 @@ ExecApartment1 = { ExecApartment1.Strip.Enable({ ExecApartment1.Strip.A, ExecApartment1.Strip.B, - ExecApartment1.Strip.C + ExecApartment1.Strip.C, }, false) ExecApartment1.Booze.Enable({ ExecApartment1.Booze.A, ExecApartment1.Booze.B, - ExecApartment1.Booze.C + ExecApartment1.Booze.C, }, false) ExecApartment1.Smoke.Set(ExecApartment1.Smoke.none) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment2.lua b/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment2.lua index 16a353f36..d70971dc3 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment2.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment2.lua @@ -1,5 +1,5 @@ -- Apartment 2: -773.22580000 322.82520000 194.88620000 -exports('GetExecApartment2Object', function() +exports("GetExecApartment2Object", function() return ExecApartment2 end) @@ -10,36 +10,36 @@ ExecApartment2 = { Theme = { modern = { interiorId = 227585, - ipl = "apa_v_mp_h_01_b" + ipl = "apa_v_mp_h_01_b", }, moody = { interiorId = 228353, - ipl = "apa_v_mp_h_02_b" + ipl = "apa_v_mp_h_02_b", }, vibrant = { interiorId = 229121, - ipl = "apa_v_mp_h_03_b" + ipl = "apa_v_mp_h_03_b", }, sharp = { interiorId = 229889, - ipl = "apa_v_mp_h_04_b" + ipl = "apa_v_mp_h_04_b", }, monochrome = { interiorId = 230657, - ipl = "apa_v_mp_h_05_b" + ipl = "apa_v_mp_h_05_b", }, seductive = { interiorId = 231425, - ipl = "apa_v_mp_h_06_b" + ipl = "apa_v_mp_h_06_b", }, regal = { interiorId = 232193, - ipl = "apa_v_mp_h_07_b" + ipl = "apa_v_mp_h_07_b", }, aqua = { interiorId = 232961, - ipl = "apa_v_mp_h_08_b" - } + ipl = "apa_v_mp_h_08_b", + }, }, Set = function(style, refresh) @@ -59,20 +59,21 @@ ExecApartment2 = { SetIplPropState(value.interiorId, { "Apart_Hi_Strip_A", "Apart_Hi_Strip_B", - "Apart_Hi_Strip_C"}, false) + "Apart_Hi_Strip_C", + }, false) SetIplPropState(value.interiorId, { "Apart_Hi_Booze_A", "Apart_Hi_Booze_B", - "Apart_Hi_Booze_C" + "Apart_Hi_Booze_C", }, false) SetIplPropState(value.interiorId, { "Apart_Hi_Smokes_A", "Apart_Hi_Smokes_B", - "Apart_Hi_Smokes_C" + "Apart_Hi_Smokes_C", }, false, true) EnableIpl(value.ipl, false) end - end + end, }, Strip = { A = "Apart_Hi_Strip_A", @@ -81,7 +82,7 @@ ExecApartment2 = { Enable = function(details, state, refresh) SetIplPropState(ExecApartment2.currentInteriorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -90,7 +91,7 @@ ExecApartment2 = { Enable = function(details, state, refresh) SetIplPropState(ExecApartment2.currentInteriorId, details, state, refresh) - end + end, }, Smoke = { none = "", @@ -113,9 +114,9 @@ ExecApartment2 = { SetIplPropState(ExecApartment2.currentInteriorId, { ExecApartment2.Smoke.stage1, ExecApartment2.Smoke.stage2, - ExecApartment2.Smoke.stage3 + ExecApartment2.Smoke.stage3, }, false, refresh) - end + end, }, LoadDefault = function() @@ -123,13 +124,13 @@ ExecApartment2 = { ExecApartment2.Strip.Enable({ ExecApartment2.Strip.A, ExecApartment2.Strip.B, - ExecApartment2.Strip.C + ExecApartment2.Strip.C, }, false) ExecApartment2.Booze.Enable({ ExecApartment2.Booze.A, ExecApartment2.Booze.B, - ExecApartment2.Booze.C + ExecApartment2.Booze.C, }, false) ExecApartment2.Smoke.Set(ExecApartment2.Smoke.none) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment3.lua b/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment3.lua index 824d90fe9..92d3b1327 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment3.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_executive/apartment3.lua @@ -1,5 +1,5 @@ -- Apartment 3: -787.78050000 334.92320000 186.11340000 -exports('GetExecApartment3Object', function() +exports("GetExecApartment3Object", function() return ExecApartment3 end) @@ -10,36 +10,36 @@ ExecApartment3 = { Theme = { modern = { interiorId = 227841, - ipl = "apa_v_mp_h_01_c" + ipl = "apa_v_mp_h_01_c", }, moody = { interiorId = 228609, - ipl = "apa_v_mp_h_02_c" + ipl = "apa_v_mp_h_02_c", }, vibrant = { interiorId = 229377, - ipl = "apa_v_mp_h_03_c" + ipl = "apa_v_mp_h_03_c", }, sharp = { interiorId = 230145, - ipl = "apa_v_mp_h_04_c" + ipl = "apa_v_mp_h_04_c", }, monochrome = { interiorId = 230913, - ipl = "apa_v_mp_h_05_c" + ipl = "apa_v_mp_h_05_c", }, seductive = { interiorId = 231681, - ipl = "apa_v_mp_h_06_c" + ipl = "apa_v_mp_h_06_c", }, regal = { interiorId = 232449, - ipl = "apa_v_mp_h_07_c" + ipl = "apa_v_mp_h_07_c", }, aqua = { interiorId = 233217, - ipl = "apa_v_mp_h_08_c" - } + ipl = "apa_v_mp_h_08_c", + }, }, Set = function(style, refresh) @@ -59,21 +59,21 @@ ExecApartment3 = { SetIplPropState(value.interiorId, { "Apart_Hi_Strip_A", "Apart_Hi_Strip_B", - "Apart_Hi_Strip_C" + "Apart_Hi_Strip_C", }, false) SetIplPropState(value.interiorId, { "Apart_Hi_Booze_A", "Apart_Hi_Booze_B", - "Apart_Hi_Booze_C" + "Apart_Hi_Booze_C", }, false) SetIplPropState(value.interiorId, { "Apart_Hi_Smokes_A", "Apart_Hi_Smokes_B", - "Apart_Hi_Smokes_C" + "Apart_Hi_Smokes_C", }, false, true) EnableIpl(value.ipl, false) end - end + end, }, Strip = { A = "Apart_Hi_Strip_A", @@ -82,7 +82,7 @@ ExecApartment3 = { Enable = function(details, state, refresh) SetIplPropState(ExecApartment3.currentInteriorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -91,7 +91,7 @@ ExecApartment3 = { Enable = function(details, state, refresh) SetIplPropState(ExecApartment3.currentInteriorId, details, state, refresh) - end + end, }, Smoke = { none = "", @@ -114,9 +114,9 @@ ExecApartment3 = { SetIplPropState(ExecApartment3.currentInteriorId, { ExecApartment3.Smoke.stage1, ExecApartment3.Smoke.stage2, - ExecApartment3.Smoke.stage3 + ExecApartment3.Smoke.stage3, }, false, refresh) - end + end, }, LoadDefault = function() @@ -124,13 +124,13 @@ ExecApartment3 = { ExecApartment3.Strip.Enable({ ExecApartment3.Strip.A, ExecApartment3.Strip.B, - ExecApartment3.Strip.C + ExecApartment3.Strip.C, }, false) ExecApartment3.Booze.Enable({ ExecApartment3.Booze.A, ExecApartment3.Booze.B, - ExecApartment3.Booze.C + ExecApartment3.Booze.C, }, false) ExecApartment3.Smoke.Set(ExecApartment3.Smoke.none) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_finance/office1.lua b/server-data/resources/[maps]/bob74_ipl/dlc_finance/office1.lua index 01bf8040b..4c024c8a9 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_finance/office1.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_finance/office1.lua @@ -1,5 +1,5 @@ -- Office 1: -141.1987, -620.913, 168.8205 (Arcadius Business Centre) -exports('GetFinanceOffice1Object', function() +exports("GetFinanceOffice1Object", function() return FinanceOffice1 end) @@ -7,7 +7,7 @@ FinanceOffice1 = { currentInteriorId = -1, currentSafeDoors = { hashL = "", - hashR = "" + hashR = "", }, Style = { @@ -15,48 +15,48 @@ FinanceOffice1 = { warm = { interiorId = 236289, ipl = "ex_dt1_02_office_01a", - safe = "ex_prop_safedoor_office1a" + safe = "ex_prop_safedoor_office1a", }, classical = { interiorId = 236545, ipl = "ex_dt1_02_office_01b", - safe = "ex_prop_safedoor_office1b" + safe = "ex_prop_safedoor_office1b", }, vintage = { interiorId = 236801, ipl = "ex_dt1_02_office_01c", - safe = "ex_prop_safedoor_office1c" + safe = "ex_prop_safedoor_office1c", }, contrast = { interiorId = 237057, ipl = "ex_dt1_02_office_02a", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, rich = { interiorId = 237313, ipl = "ex_dt1_02_office_02b", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, cool = { interiorId = 237569, ipl = "ex_dt1_02_office_02c", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, ice = { interiorId = 237825, ipl = "ex_dt1_02_office_03a", - safe = "ex_prop_safedoor_office3a" + safe = "ex_prop_safedoor_office3a", }, conservative = { interiorId = 238081, ipl = "ex_dt1_02_office_03b", - safe = "ex_prop_safedoor_office3a" + safe = "ex_prop_safedoor_office3a", }, polished = { interiorId = 238337, ipl = "ex_dt1_02_office_03c", - safe = "ex_prop_safedoor_office3c" - } + safe = "ex_prop_safedoor_office3c", + }, }, Set = function(style, refresh) if refresh == nil then @@ -68,7 +68,7 @@ FinanceOffice1 = { FinanceOffice1.currentInteriorId = style.interiorId FinanceOffice1.currentSafeDoors = { hashL = GetHashKey(style.safe .. "_l"), - hashR = GetHashKey(style.safe .. "_r") + hashR = GetHashKey(style.safe .. "_r"), } EnableIpl(style.ipl, true) @@ -85,7 +85,7 @@ FinanceOffice1 = { SetIplPropState(themeValue.interiorId, { swagValue.A, swagValue.B, - swagValue.C + swagValue.C, }, false) end end @@ -95,12 +95,12 @@ FinanceOffice1 = { FinanceOffice1.currentSafeDoors = { hashL = 0, - hashR = 0 + hashR = 0, } EnableIpl(themeValue.ipl, false) end - end + end, }, Safe = { doorHeadingL = 96.0, -- Only need the heading of the Left door to get the Right ones @@ -176,7 +176,7 @@ FinanceOffice1 = { end return doorHandle - end + end, }, Swag = { Cash = { @@ -203,82 +203,82 @@ FinanceOffice1 = { U = "cash_set_21", V = "cash_set_22", W = "cash_set_23", - X = "cash_set_24" + X = "cash_set_24", }, BoozeCigs = { A = "swag_booze_cigs", B = "swag_booze_cigs2", - C = "swag_booze_cigs3" + C = "swag_booze_cigs3", }, Counterfeit = { A = "swag_counterfeit", B = "swag_counterfeit2", - C = "swag_counterfeit3" + C = "swag_counterfeit3", }, DrugBags = { A = "swag_drugbags", B = "swag_drugbags2", - C = "swag_drugbags3" + C = "swag_drugbags3", }, DrugStatue = { A = "swag_drugstatue", B = "swag_drugstatue2", - C = "swag_drugstatue3" + C = "swag_drugstatue3", }, Electronic = { A = "swag_electronic", B = "swag_electronic2", - C = "swag_electronic3" + C = "swag_electronic3", }, FurCoats = { A = "swag_furcoats", B = "swag_furcoats2", - C = "swag_furcoats3" + C = "swag_furcoats3", }, Gems = { A = "swag_gems", B = "swag_gems2", - C = "swag_gems3" + C = "swag_gems3", }, Guns = { A = "swag_guns", B = "swag_guns2", - C = "swag_guns3" + C = "swag_guns3", }, Ivory = { A = "swag_ivory", B = "swag_ivory2", - C = "swag_ivory3" + C = "swag_ivory3", }, Jewel = { A = "swag_jewelwatch", B = "swag_jewelwatch2", - C = "swag_jewelwatch3" + C = "swag_jewelwatch3", }, Med = { A = "swag_med", B = "swag_med2", - C = "swag_med3" + C = "swag_med3", }, Painting = { A = "swag_art", B = "swag_art2", - C = "swag_art3" + C = "swag_art3", }, Pills = { A = "swag_pills", B = "swag_pills2", - C = "swag_pills3" + C = "swag_pills3", }, Silver = { A = "swag_silver", B = "swag_silver2", - C = "swag_silver3" + C = "swag_silver3", }, Enable = function(details, state, refresh) SetIplPropState(FinanceOffice1.currentInteriorId, details, state, refresh) - end + end, }, Chairs = { off = "", @@ -297,7 +297,7 @@ FinanceOffice1 = { end, Clear = function(refresh) SetIplPropState(FinanceOffice1.currentInteriorId, FinanceOffice1.Chairs.on, false, refresh) - end + end, }, Booze = { off = "", @@ -316,11 +316,11 @@ FinanceOffice1 = { end, Clear = function(refresh) SetIplPropState(FinanceOffice1.currentInteriorId, FinanceOffice1.Booze.on, false, refresh) - end + end, }, LoadDefault = function() FinanceOffice1.Style.Set(FinanceOffice1.Style.Theme.polished) FinanceOffice1.Chairs.Set(FinanceOffice1.Chairs.on, true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_finance/office2.lua b/server-data/resources/[maps]/bob74_ipl/dlc_finance/office2.lua index 3dc8b7fd3..a876d85b0 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_finance/office2.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_finance/office2.lua @@ -1,5 +1,5 @@ -- Office 2: -75.8466, -826.9893, 243.3859 (Maze Bank Building) -exports('GetFinanceOffice2Object', function() +exports("GetFinanceOffice2Object", function() return FinanceOffice2 end) @@ -7,7 +7,7 @@ FinanceOffice2 = { currentInteriorId = -1, currentSafeDoors = { hashL = "", - hashR = "" + hashR = "", }, Style = { @@ -15,48 +15,48 @@ FinanceOffice2 = { warm = { interiorId = 238593, ipl = "ex_dt1_11_office_01a", - safe = "ex_prop_safedoor_office1a" + safe = "ex_prop_safedoor_office1a", }, classical = { interiorId = 238849, ipl = "ex_dt1_11_office_01b", - safe = "ex_prop_safedoor_office1b" + safe = "ex_prop_safedoor_office1b", }, vintage = { interiorId = 239105, ipl = "ex_dt1_11_office_01c", - safe = "ex_prop_safedoor_office1c" + safe = "ex_prop_safedoor_office1c", }, contrast = { interiorId = 239361, ipl = "ex_dt1_11_office_02a", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, rich = { interiorId = 239617, ipl = "ex_dt1_11_office_02b", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, cool = { interiorId = 239873, ipl = "ex_dt1_11_office_02c", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, ice = { interiorId = 240129, ipl = "ex_dt1_11_office_03a", - safe = "ex_prop_safedoor_office3a" + safe = "ex_prop_safedoor_office3a", }, conservative = { interiorId = 240385, ipl = "ex_dt1_11_office_03b", - safe = "ex_prop_safedoor_office3a" + safe = "ex_prop_safedoor_office3a", }, polished = { interiorId = 240641, ipl = "ex_dt1_11_office_03c", - safe = "ex_prop_safedoor_office3c" - } + safe = "ex_prop_safedoor_office3c", + }, }, Set = function(style, refresh) if refresh == nil then @@ -68,7 +68,7 @@ FinanceOffice2 = { FinanceOffice2.currentInteriorId = style.interiorId FinanceOffice2.currentSafeDoors = { hashL = GetHashKey(style.safe .. "_l"), - hashR = GetHashKey(style.safe .. "_r") + hashR = GetHashKey(style.safe .. "_r"), } EnableIpl(style.ipl, true) @@ -85,7 +85,7 @@ FinanceOffice2 = { SetIplPropState(themeValue.interiorId, { swagValue.A, swagValue.B, - swagValue.C + swagValue.C, }, false) end end @@ -95,12 +95,12 @@ FinanceOffice2 = { FinanceOffice2.currentSafeDoors = { hashL = 0, - hashR = 0 + hashR = 0, } EnableIpl(themeValue.ipl, false) end - end + end, }, Safe = { doorHeadingL = 250.0, -- Only need the heading of the Left door to get the Right ones @@ -176,7 +176,7 @@ FinanceOffice2 = { end return doorHandle - end + end, }, Swag = { Cash = { @@ -203,82 +203,82 @@ FinanceOffice2 = { U = "cash_set_21", V = "cash_set_22", W = "cash_set_23", - X = "cash_set_24" + X = "cash_set_24", }, BoozeCigs = { A = "swag_booze_cigs", B = "swag_booze_cigs2", - C = "swag_booze_cigs3" + C = "swag_booze_cigs3", }, Counterfeit = { A = "swag_counterfeit", B = "swag_counterfeit2", - C = "swag_counterfeit3" + C = "swag_counterfeit3", }, DrugBags = { A = "swag_drugbags", B = "swag_drugbags2", - C = "swag_drugbags3" + C = "swag_drugbags3", }, DrugStatue = { A = "swag_drugstatue", B = "swag_drugstatue2", - C = "swag_drugstatue3" + C = "swag_drugstatue3", }, Electronic = { A = "swag_electronic", B = "swag_electronic2", - C = "swag_electronic3" + C = "swag_electronic3", }, FurCoats = { A = "swag_furcoats", B = "swag_furcoats2", - C = "swag_furcoats3" + C = "swag_furcoats3", }, Gems = { A = "swag_gems", B = "swag_gems2", - C = "swag_gems3" + C = "swag_gems3", }, Guns = { A = "swag_guns", B = "swag_guns2", - C = "swag_guns3" + C = "swag_guns3", }, Ivory = { A = "swag_ivory", B = "swag_ivory2", - C = "swag_ivory3" + C = "swag_ivory3", }, Jewel = { A = "swag_jewelwatch", B = "swag_jewelwatch2", - C = "swag_jewelwatch3" + C = "swag_jewelwatch3", }, Med = { A = "swag_med", B = "swag_med2", - C = "swag_med3" + C = "swag_med3", }, Painting = { A = "swag_art", B = "swag_art2", - C = "swag_art3" + C = "swag_art3", }, Pills = { A = "swag_pills", B = "swag_pills2", - C = "swag_pills3" + C = "swag_pills3", }, Silver = { A = "swag_silver", B = "swag_silver2", - C = "swag_silver3" + C = "swag_silver3", }, Enable = function(details, state, refresh) SetIplPropState(FinanceOffice2.currentInteriorId, details, state, refresh) - end + end, }, Chairs = { off = "", @@ -297,7 +297,7 @@ FinanceOffice2 = { end, Clear = function(refresh) SetIplPropState(FinanceOffice2.currentInteriorId, FinanceOffice2.Chairs.on, false, refresh) - end + end, }, Booze = { off = "", @@ -316,11 +316,11 @@ FinanceOffice2 = { end, Clear = function(refresh) SetIplPropState(FinanceOffice2.currentInteriorId, FinanceOffice2.Booze.on, false, refresh) - end + end, }, LoadDefault = function() FinanceOffice2.Style.Set(FinanceOffice2.Style.Theme.warm) FinanceOffice2.Chairs.Set(FinanceOffice2.Chairs.on, true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_finance/office3.lua b/server-data/resources/[maps]/bob74_ipl/dlc_finance/office3.lua index 8aa4aaed9..fc318aa2e 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_finance/office3.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_finance/office3.lua @@ -1,5 +1,5 @@ -- Office 3: -1579.756, -565.0661, 108.523 (Lom Bank) -exports('GetFinanceOffice3Object', function() +exports("GetFinanceOffice3Object", function() return FinanceOffice3 end) @@ -7,7 +7,7 @@ FinanceOffice3 = { currentInteriorId = -1, currentSafeDoors = { hashL = "", - hashR = "" + hashR = "", }, Style = { @@ -15,48 +15,48 @@ FinanceOffice3 = { warm = { interiorId = 240897, ipl = "ex_sm_13_office_01a", - safe = "ex_prop_safedoor_office1a" + safe = "ex_prop_safedoor_office1a", }, classical = { interiorId = 241153, ipl = "ex_sm_13_office_01b", - safe = "ex_prop_safedoor_office1b" + safe = "ex_prop_safedoor_office1b", }, vintage = { interiorId = 241409, ipl = "ex_sm_13_office_01c", - safe = "ex_prop_safedoor_office1c" + safe = "ex_prop_safedoor_office1c", }, contrast = { interiorId = 241665, ipl = "ex_sm_13_office_02a", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, rich = { interiorId = 241921, ipl = "ex_sm_13_office_02b", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, cool = { interiorId = 242177, ipl = "ex_sm_13_office_02c", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, ice = { interiorId = 242433, ipl = "ex_sm_13_office_03a", - safe = "ex_prop_safedoor_office3a" + safe = "ex_prop_safedoor_office3a", }, conservative = { interiorId = 242689, ipl = "ex_sm_13_office_03b", - safe = "ex_prop_safedoor_office3a" + safe = "ex_prop_safedoor_office3a", }, polished = { interiorId = 242945, ipl = "ex_sm_13_office_03c", - safe = "ex_prop_safedoor_office3c" - } + safe = "ex_prop_safedoor_office3c", + }, }, Set = function(style, refresh) if refresh == nil then @@ -68,7 +68,7 @@ FinanceOffice3 = { FinanceOffice3.currentInteriorId = style.interiorId FinanceOffice3.currentSafeDoors = { hashL = GetHashKey(style.safe .. "_l"), - hashR = GetHashKey(style.safe .. "_r") + hashR = GetHashKey(style.safe .. "_r"), } EnableIpl(style.ipl, true) @@ -85,7 +85,7 @@ FinanceOffice3 = { SetIplPropState(themeValue.interiorId, { swagValue.A, swagValue.B, - swagValue.C + swagValue.C, }, false) end end @@ -95,12 +95,12 @@ FinanceOffice3 = { FinanceOffice3.currentSafeDoors = { hashL = 0, - hashR = 0 + hashR = 0, } EnableIpl(themeValue.ipl, false) end - end + end, }, Safe = { doorHeadingL = 126.0, -- Only need the heading of the Left door to get the Right ones @@ -176,7 +176,7 @@ FinanceOffice3 = { end return doorHandle - end + end, }, Swag = { Cash = { @@ -203,82 +203,82 @@ FinanceOffice3 = { U = "cash_set_21", V = "cash_set_22", W = "cash_set_23", - X = "cash_set_24" + X = "cash_set_24", }, BoozeCigs = { A = "swag_booze_cigs", B = "swag_booze_cigs2", - C = "swag_booze_cigs3" + C = "swag_booze_cigs3", }, Counterfeit = { A = "swag_counterfeit", B = "swag_counterfeit2", - C = "swag_counterfeit3" + C = "swag_counterfeit3", }, DrugBags = { A = "swag_drugbags", B = "swag_drugbags2", - C = "swag_drugbags3" + C = "swag_drugbags3", }, DrugStatue = { A = "swag_drugstatue", B = "swag_drugstatue2", - C = "swag_drugstatue3" + C = "swag_drugstatue3", }, Electronic = { A = "swag_electronic", B = "swag_electronic2", - C = "swag_electronic3" + C = "swag_electronic3", }, FurCoats = { A = "swag_furcoats", B = "swag_furcoats2", - C = "swag_furcoats3" + C = "swag_furcoats3", }, Gems = { A = "swag_gems", B = "swag_gems2", - C = "swag_gems3" + C = "swag_gems3", }, Guns = { A = "swag_guns", B = "swag_guns2", - C = "swag_guns3" + C = "swag_guns3", }, Ivory = { A = "swag_ivory", B = "swag_ivory2", - C = "swag_ivory3" + C = "swag_ivory3", }, Jewel = { A = "swag_jewelwatch", B = "swag_jewelwatch2", - C = "swag_jewelwatch3" + C = "swag_jewelwatch3", }, Med = { A = "swag_med", B = "swag_med2", - C = "swag_med3" + C = "swag_med3", }, Painting = { A = "swag_art", B = "swag_art2", - C = "swag_art3" + C = "swag_art3", }, Pills = { A = "swag_pills", B = "swag_pills2", - C = "swag_pills3" + C = "swag_pills3", }, Silver = { A = "swag_silver", B = "swag_silver2", - C = "swag_silver3" + C = "swag_silver3", }, Enable = function(details, state, refresh) SetIplPropState(FinanceOffice3.currentInteriorId, details, state, refresh) - end + end, }, Chairs = { off = "", @@ -297,7 +297,7 @@ FinanceOffice3 = { end, Clear = function(refresh) SetIplPropState(FinanceOffice3.currentInteriorId, FinanceOffice3.Chairs.on, false, refresh) - end + end, }, Booze = { off = "", @@ -316,11 +316,11 @@ FinanceOffice3 = { end, Clear = function(refresh) SetIplPropState(FinanceOffice3.currentInteriorId, FinanceOffice3.Booze.on, false, refresh) - end + end, }, LoadDefault = function() FinanceOffice3.Style.Set(FinanceOffice3.Style.Theme.conservative) FinanceOffice3.Chairs.Set(FinanceOffice3.Chairs.on, true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_finance/office4.lua b/server-data/resources/[maps]/bob74_ipl/dlc_finance/office4.lua index 22f6981a7..757c072cd 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_finance/office4.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_finance/office4.lua @@ -1,5 +1,5 @@ -- Office 4: -1392.667, -480.4736, 72.04217 (Maze Bank West) -exports('GetFinanceOffice4Object', function() +exports("GetFinanceOffice4Object", function() return FinanceOffice4 end) @@ -7,7 +7,7 @@ FinanceOffice4 = { currentInteriorId = -1, currentSafeDoors = { hashL = "", - hashR = "" + hashR = "", }, Style = { @@ -15,48 +15,48 @@ FinanceOffice4 = { warm = { interiorId = 243201, ipl = "ex_sm_15_office_01a", - safe = "ex_prop_safedoor_office1a" + safe = "ex_prop_safedoor_office1a", }, classical = { interiorId = 243457, ipl = "ex_sm_15_office_01b", - safe = "ex_prop_safedoor_office1b" + safe = "ex_prop_safedoor_office1b", }, vintage = { interiorId = 243713, ipl = "ex_sm_15_office_01c", - safe = "ex_prop_safedoor_office1c" + safe = "ex_prop_safedoor_office1c", }, contrast = { interiorId = 243969, ipl = "ex_sm_15_office_02a", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, rich = { interiorId = 244225, ipl = "ex_sm_15_office_02b", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, cool = { interiorId = 244481, ipl = "ex_sm_15_office_02c", - safe = "ex_prop_safedoor_office2a" + safe = "ex_prop_safedoor_office2a", }, ice = { interiorId = 244737, ipl = "ex_sm_15_office_03a", - safe = "ex_prop_safedoor_office3a" + safe = "ex_prop_safedoor_office3a", }, conservative = { interiorId = 244993, ipl = "ex_sm_15_office_03b", - safe = "ex_prop_safedoor_office3a" + safe = "ex_prop_safedoor_office3a", }, polished = { interiorId = 245249, ipl = "ex_sm_15_office_03c", - safe = "ex_prop_safedoor_office3c" - } + safe = "ex_prop_safedoor_office3c", + }, }, Set = function(style, refresh) if refresh == nil then @@ -68,7 +68,7 @@ FinanceOffice4 = { FinanceOffice4.currentInteriorId = style.interiorId FinanceOffice4.currentSafeDoors = { hashL = GetHashKey(style.safe .. "_l"), - hashR = GetHashKey(style.safe .. "_r") + hashR = GetHashKey(style.safe .. "_r"), } EnableIpl(style.ipl, true) @@ -85,7 +85,7 @@ FinanceOffice4 = { SetIplPropState(themeValue.interiorId, { swagValue.A, swagValue.B, - swagValue.C + swagValue.C, }, false) end end @@ -95,12 +95,12 @@ FinanceOffice4 = { FinanceOffice4.currentSafeDoors = { hashL = 0, - hashR = 0 + hashR = 0, } EnableIpl(themeValue.ipl, false) end - end + end, }, Safe = { doorHeadingL = 188.0, -- Only need the heading of the Left door to get the Right ones @@ -176,7 +176,7 @@ FinanceOffice4 = { end return doorHandle - end + end, }, Swag = { Cash = { @@ -203,82 +203,82 @@ FinanceOffice4 = { U = "cash_set_21", V = "cash_set_22", W = "cash_set_23", - X = "cash_set_24" + X = "cash_set_24", }, BoozeCigs = { A = "swag_booze_cigs", B = "swag_booze_cigs2", - C = "swag_booze_cigs3" + C = "swag_booze_cigs3", }, Counterfeit = { A = "swag_counterfeit", B = "swag_counterfeit2", - C = "swag_counterfeit3" + C = "swag_counterfeit3", }, DrugBags = { A = "swag_drugbags", B = "swag_drugbags2", - C = "swag_drugbags3" + C = "swag_drugbags3", }, DrugStatue = { A = "swag_drugstatue", B = "swag_drugstatue2", - C = "swag_drugstatue3" + C = "swag_drugstatue3", }, Electronic = { A = "swag_electronic", B = "swag_electronic2", - C = "swag_electronic3" + C = "swag_electronic3", }, FurCoats = { A = "swag_furcoats", B = "swag_furcoats2", - C = "swag_furcoats3" + C = "swag_furcoats3", }, Gems = { A = "swag_gems", B = "swag_gems2", - C = "swag_gems3" + C = "swag_gems3", }, Guns = { A = "swag_guns", B = "swag_guns2", - C = "swag_guns3" + C = "swag_guns3", }, Ivory = { A = "swag_ivory", B = "swag_ivory2", - C = "swag_ivory3" + C = "swag_ivory3", }, Jewel = { A = "swag_jewelwatch", B = "swag_jewelwatch2", - C = "swag_jewelwatch3" + C = "swag_jewelwatch3", }, Med = { A = "swag_med", B = "swag_med2", - C = "swag_med3" + C = "swag_med3", }, Painting = { A = "swag_art", B = "swag_art2", - C = "swag_art3" + C = "swag_art3", }, Pills = { A = "swag_pills", B = "swag_pills2", - C = "swag_pills3" + C = "swag_pills3", }, Silver = { A = "swag_silver", B = "swag_silver2", - C = "swag_silver3" + C = "swag_silver3", }, Enable = function(details, state, refresh) SetIplPropState(FinanceOffice4.currentInteriorId, details, state, refresh) - end + end, }, Chairs = { off = "", @@ -297,7 +297,7 @@ FinanceOffice4 = { end, Clear = function(refresh) SetIplPropState(FinanceOffice4.currentInteriorId, FinanceOffice4.Chairs.on, false, refresh) - end + end, }, Booze = { off = "", @@ -316,11 +316,11 @@ FinanceOffice4 = { end, Clear = function(refresh) SetIplPropState(FinanceOffice4.currentInteriorId, FinanceOffice4.Booze.on, false, refresh) - end + end, }, LoadDefault = function() FinanceOffice4.Style.Set(FinanceOffice4.Style.Theme.cool) FinanceOffice4.Chairs.Set(FinanceOffice4.Chairs.on, true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_finance/organization.lua b/server-data/resources/[maps]/bob74_ipl/dlc_finance/organization.lua index 02b51d8e6..ecb30d4f8 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_finance/organization.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_finance/organization.lua @@ -1,8 +1,8 @@ -exports('GetFinanceOrganizationObject', function() +exports("GetFinanceOrganizationObject", function() return FinanceOrganization end) -AddEventHandler('onClientResourceStop', function(res) +AddEventHandler("onClientResourceStop", function(res) if GetCurrentResourceName() ~= res then return end @@ -19,7 +19,7 @@ FinanceOrganization = { blue = 3, orange = 5, red = 6, - green = 7 + green = 7, }, Fonts = { font1 = 0, @@ -34,11 +34,11 @@ FinanceOrganization = { font10 = 9, font11 = 10, font12 = 11, - font13 = 12 + font13 = 12, }, Style = { normal = 3, - light = 1 + light = 1, }, name = "", style = 0, @@ -51,7 +51,7 @@ FinanceOrganization = { FinanceOrganization.Name.color = color FinanceOrganization.Name.font = font FinanceOrganization.Office.stage = 0 - end + end, }, Office = { needToLoad = false, @@ -80,8 +80,8 @@ FinanceOrganization = { FinanceOrganization.Office.renderId = -1 FinanceOrganization.Office.movieId = -1 FinanceOrganization.Office.stage = 0 - end - } + end, + }, } Citizen.CreateThread(function() @@ -128,20 +128,20 @@ function DrawOrganizationName(name, style, color, font) local parameters = { p0 = { type = "string", - value = name + value = name, }, p1 = { type = "int", - value = style + value = style, }, p2 = { type = "int", - value = color + value = color, }, p3 = { type = "int", - value = font - } + value = font, + }, } SetupScaleform(FinanceOrganization.Office.movieId, "SET_ORGANISATION_NAME", parameters) @@ -159,4 +159,4 @@ function DrawOrganizationName(name, style, color, font) SetTextRenderId(GetDefaultScriptRendertargetRenderId()) ResetScriptGfxAlign() end -end \ No newline at end of file +end diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_gunrunning/bunkers.lua b/server-data/resources/[maps]/bob74_ipl/dlc_gunrunning/bunkers.lua index c68866e48..2956e9138 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_gunrunning/bunkers.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_gunrunning/bunkers.lua @@ -1,4 +1,4 @@ -exports('GetGunrunningBunkerObject', function() +exports("GetGunrunningBunkerObject", function() return GunrunningBunker end) @@ -16,12 +16,12 @@ GunrunningBunker = { -- Remove interiors IPLs. Remove = function() EnableIpl(GunrunningBunker.Ipl.Interior.ipl, false) - end + end, }, Exterior = { ipl = { "gr_case0_bunkerclosed", -- Desert: 848.6175, 2996.567, 45.81612 - "gr_case1_bunkerclosed",-- SmokeTree: 2126.785, 3335.04, 48.21422 + "gr_case1_bunkerclosed", -- SmokeTree: 2126.785, 3335.04, 48.21422 "gr_case2_bunkerclosed", -- Scrapyard: 2493.654, 3140.399, 51.28789 "gr_case3_bunkerclosed", -- Oilfields: 481.0465, 2995.135, 43.96672 "gr_case4_bunkerclosed", -- RatonCanyon: -391.3216, 4363.728, 58.65862 @@ -30,7 +30,7 @@ GunrunningBunker = { "gr_case7_bunkerclosed", -- Paletto: -783.0755, 5934.686, 24.31475 "gr_case9_bunkerclosed", -- Route68: 24.43542, 2959.705, 58.35517 "gr_case10_bunkerclosed", -- Zancudo: -3058.714, 3329.19, 12.5844 - "gr_case11_bunkerclosed" -- Great Ocean Highway: -3180.466, 1374.192, 19.9597 + "gr_case11_bunkerclosed", -- Great Ocean Highway: -3180.466, 1374.192, 19.9597 }, -- Load exteriors IPLs. @@ -40,8 +40,8 @@ GunrunningBunker = { -- Remove exteriors IPLs. Remove = function() EnableIpl(GunrunningBunker.Ipl.Exterior.ipl, false) - end - } + end, + }, }, Style = { default = "Bunker_Style_A", @@ -62,9 +62,9 @@ GunrunningBunker = { SetIplPropState(GunrunningBunker.interiorId, { GunrunningBunker.Style.default, GunrunningBunker.Style.blue, - GunrunningBunker.Style.yellow + GunrunningBunker.Style.yellow, }, false, refresh) - end + end, }, Tier = { default = "standard_bunker_set", @@ -83,9 +83,9 @@ GunrunningBunker = { Clear = function(refresh) SetIplPropState(GunrunningBunker.interiorId, { GunrunningBunker.Tier.default, - GunrunningBunker.Tier.upgrade + GunrunningBunker.Tier.upgrade, }, false, refresh) - end + end, }, Security = { noEntryGate = "", @@ -111,9 +111,9 @@ GunrunningBunker = { Clear = function(refresh) SetIplPropState(GunrunningBunker.interiorId, { GunrunningBunker.Security.default, - GunrunningBunker.Security.upgrade + GunrunningBunker.Security.upgrade, }, false, refresh) - end + end, }, Details = { office = "Office_Upgrade_set", -- Office interior @@ -130,7 +130,7 @@ GunrunningBunker = { -- refresh: Reload the whole interior (values: true / false) Enable = function(details, state, refresh) SetIplPropState(GunrunningBunker.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -151,5 +151,5 @@ GunrunningBunker = { -- Must be called in order to spawn or remove the props RefreshInterior(GunrunningBunker.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_gunrunning/yacht.lua b/server-data/resources/[maps]/bob74_ipl/dlc_gunrunning/yacht.lua index c34ce5c64..166e56d4e 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_gunrunning/yacht.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_gunrunning/yacht.lua @@ -1,5 +1,5 @@ -- Gunrunning Yacht: -1363.724, 6734.108, 2.44598 -exports('GetGunrunningYachtObject', function() +exports("GetGunrunningYachtObject", function() return GunrunningYacht end) @@ -48,10 +48,10 @@ GunrunningYacht = { DeleteEntity(handle) end end - end + end, }, LoadDefault = function() GunrunningYacht.Enable(true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_heists/carrier.lua b/server-data/resources/[maps]/bob74_ipl/dlc_heists/carrier.lua index 22326acfc..7a5414b13 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_heists/carrier.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_heists/carrier.lua @@ -1,5 +1,5 @@ -- Heist Carrier: 3082.3117 -4717.1191 15.2622 -exports('GetHeistCarrierObject', function() +exports("GetHeistCarrierObject", function() return HeistCarrier end) @@ -19,10 +19,10 @@ HeistCarrier = { "hei_carrier_int6", "hei_carrier_int6_lod", "hei_carrier_lod", - "hei_carrier_slod" + "hei_carrier_slod", }, Enable = function(state) EnableIpl(HeistCarrier.ipl, state) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_heists/yacht.lua b/server-data/resources/[maps]/bob74_ipl/dlc_heists/yacht.lua index 71af6cd2e..59024d3ab 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_heists/yacht.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_heists/yacht.lua @@ -1,5 +1,5 @@ -- Heist Yatch: -2043.974,-1031.582, 11.981 -exports('GetHeistYachtObject', function() +exports("GetHeistYachtObject", function() return HeistYacht end) @@ -17,7 +17,7 @@ HeistYacht = { "hei_yacht_heist_lod", "hei_yacht_heist_lounge", "hei_yacht_heist_lounge_lod", - "hei_yacht_heist_slod" + "hei_yacht_heist_slod", }, Enable = function(state) @@ -48,10 +48,10 @@ HeistYacht = { DeleteEntity(handle) end end - end + end, }, LoadDefault = function() HeistYacht.Enable(true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment1.lua b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment1.lua index 84a3b423b..4a8d7c3ee 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment1.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment1.lua @@ -1,5 +1,5 @@ -- Apartment 1: -1462.28100000, -539.62760000, 72.44434000 -exports('GetHLApartment1Object', function() +exports("GetHLApartment1Object", function() return HLApartment1 end) @@ -15,8 +15,8 @@ HLApartment1 = { end, Remove = function() EnableIpl(HLApartment1.Ipl.Interior.ipl, false) - end - } + end, + }, }, Strip = { A = "Apart_Hi_Strip_A", @@ -25,7 +25,7 @@ HLApartment1 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment1.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -34,7 +34,7 @@ HLApartment1 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment1.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -43,7 +43,7 @@ HLApartment1 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment1.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -51,19 +51,19 @@ HLApartment1 = { HLApartment1.Strip.Enable({ HLApartment1.Strip.A, HLApartment1.Strip.B, - HLApartment1.Strip.C + HLApartment1.Strip.C, }, false) HLApartment1.Booze.Enable({ HLApartment1.Booze.A, HLApartment1.Booze.B, - HLApartment1.Booze.C + HLApartment1.Booze.C, }, false) HLApartment1.Smoke.Enable({ HLApartment1.Smoke.A, HLApartment1.Smoke.B, - HLApartment1.Smoke.C + HLApartment1.Smoke.C, }, false) RefreshInterior(HLApartment1.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment2.lua b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment2.lua index d92e1ce5d..760998806 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment2.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment2.lua @@ -1,5 +1,5 @@ -- Apartment 2: -914.90260000, -374.87310000, 112.6748 -exports('GetHLApartment2Object', function() +exports("GetHLApartment2Object", function() return HLApartment2 end) @@ -15,7 +15,7 @@ HLApartment2 = { end, Remove = function() EnableIpl(HLApartment2.Ipl.Interior.ipl, false) - end + end, }, }, Strip = { @@ -25,7 +25,7 @@ HLApartment2 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment2.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -34,7 +34,7 @@ HLApartment2 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment2.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -43,7 +43,7 @@ HLApartment2 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment2.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -51,19 +51,19 @@ HLApartment2 = { HLApartment2.Strip.Enable({ HLApartment2.Strip.A, HLApartment2.Strip.B, - HLApartment2.Strip.C + HLApartment2.Strip.C, }, false) HLApartment2.Booze.Enable({ HLApartment2.Booze.A, HLApartment2.Booze.B, - HLApartment2.Booze.C + HLApartment2.Booze.C, }, false) HLApartment2.Smoke.Enable({ HLApartment2.Smoke.A, HLApartment2.Smoke.B, - HLApartment2.Smoke.C + HLApartment2.Smoke.C, }, false) RefreshInterior(HLApartment2.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment3.lua b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment3.lua index 533ffe48e..10b8d62ac 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment3.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment3.lua @@ -1,5 +1,5 @@ -- Apartment 3: -609.56690000, 51.28212000, 96.60023000 -exports('GetHLApartment3Object', function() +exports("GetHLApartment3Object", function() return HLApartment3 end) @@ -15,8 +15,8 @@ HLApartment3 = { end, Remove = function() EnableIpl(HLApartment3.Ipl.Interior.ipl, false) - end - } + end, + }, }, Strip = { A = "Apart_Hi_Strip_A", @@ -25,7 +25,7 @@ HLApartment3 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment3.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -34,7 +34,7 @@ HLApartment3 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment3.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -43,7 +43,7 @@ HLApartment3 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment3.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -51,19 +51,19 @@ HLApartment3 = { HLApartment3.Strip.Enable({ HLApartment3.Strip.A, HLApartment3.Strip.B, - HLApartment3.Strip.C + HLApartment3.Strip.C, }, false) HLApartment3.Booze.Enable({ HLApartment3.Booze.A, HLApartment3.Booze.B, - HLApartment3.Booze.C + HLApartment3.Booze.C, }, false) HLApartment3.Smoke.Enable({ HLApartment3.Smoke.A, HLApartment3.Smoke.B, - HLApartment3.Smoke.C + HLApartment3.Smoke.C, }, false) RefreshInterior(HLApartment3.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment4.lua b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment4.lua index cc449785d..a5bf8ef42 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment4.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment4.lua @@ -1,5 +1,5 @@ -- Apartment 4: -778.50610000, 331.31600000, 210.39720 -exports('GetHLApartment4Object', function() +exports("GetHLApartment4Object", function() return HLApartment4 end) @@ -15,7 +15,7 @@ HLApartment4 = { end, Remove = function() EnableIpl(HLApartment4.Ipl.Interior.ipl, false) - end + end, }, }, Strip = { @@ -25,7 +25,7 @@ HLApartment4 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment4.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -34,7 +34,7 @@ HLApartment4 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment4.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -43,7 +43,7 @@ HLApartment4 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment4.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -51,19 +51,19 @@ HLApartment4 = { HLApartment4.Strip.Enable({ HLApartment4.Strip.A, HLApartment4.Strip.B, - HLApartment4.Strip.C + HLApartment4.Strip.C, }, false) HLApartment4.Booze.Enable({ HLApartment4.Booze.A, HLApartment4.Booze.B, - HLApartment4.Booze.C + HLApartment4.Booze.C, }, false) HLApartment4.Smoke.Enable({ HLApartment4.Smoke.A, HLApartment4.Smoke.B, - HLApartment4.Smoke.C + HLApartment4.Smoke.C, }, false) RefreshInterior(HLApartment4.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment5.lua b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment5.lua index fa690a4b8..450119dcd 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment5.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment5.lua @@ -1,5 +1,5 @@ -- Apartment 5: -22.61353000, -590.14320000, 78.430910 -exports('GetHLApartment5Object', function() +exports("GetHLApartment5Object", function() return HLApartment5 end) @@ -15,7 +15,7 @@ HLApartment5 = { end, Remove = function() EnableIpl(HLApartment5.Ipl.Interior.ipl, false) - end + end, }, }, Strip = { @@ -25,7 +25,7 @@ HLApartment5 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment5.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -34,7 +34,7 @@ HLApartment5 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment5.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -43,7 +43,7 @@ HLApartment5 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment5.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -51,19 +51,19 @@ HLApartment5 = { HLApartment5.Strip.Enable({ HLApartment5.Strip.A, HLApartment5.Strip.B, - HLApartment5.Strip.C + HLApartment5.Strip.C, }, false) HLApartment5.Booze.Enable({ HLApartment5.Booze.A, HLApartment5.Booze.B, - HLApartment5.Booze.C + HLApartment5.Booze.C, }, false) HLApartment5.Smoke.Enable({ HLApartment5.Smoke.A, HLApartment5.Smoke.B, - HLApartment5.Smoke.C + HLApartment5.Smoke.C, }, false) RefreshInterior(HLApartment5.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment6.lua b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment6.lua index 9058416b4..ee9a0587f 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment6.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_high_life/apartment6.lua @@ -1,5 +1,5 @@ -- Apartment 6: -609.56690000, 51.28212000, -183.98080 -exports('GetHLApartment6Object', function() +exports("GetHLApartment6Object", function() return HLApartment6 end) @@ -15,8 +15,8 @@ HLApartment6 = { end, Remove = function() EnableIpl(HLApartment6.Ipl.Interior.ipl, false) - end - } + end, + }, }, Strip = { A = "Apart_Hi_Strip_A", @@ -25,7 +25,7 @@ HLApartment6 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment6.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -34,7 +34,7 @@ HLApartment6 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment6.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -43,7 +43,7 @@ HLApartment6 = { Enable = function(details, state, refresh) SetIplPropState(HLApartment6.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -51,19 +51,19 @@ HLApartment6 = { HLApartment6.Strip.Enable({ HLApartment6.Strip.A, HLApartment6.Strip.B, - HLApartment6.Strip.C + HLApartment6.Strip.C, }, false) HLApartment6.Booze.Enable({ HLApartment6.Booze.A, HLApartment6.Booze.B, - HLApartment6.Booze.C + HLApartment6.Booze.C, }, false) HLApartment6.Smoke.Enable({ HLApartment6.Smoke.A, HLApartment6.Smoke.B, - HLApartment6.Smoke.C + HLApartment6.Smoke.C, }, false) RefreshInterior(HLApartment6.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_import/garage1.lua b/server-data/resources/[maps]/bob74_ipl/dlc_import/garage1.lua index ff9eceb30..514ed81be 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_import/garage1.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_import/garage1.lua @@ -1,5 +1,5 @@ -- Garage 1: Arcadius Business Centre -exports('GetImportCEOGarage1Object', function() +exports("GetImportCEOGarage1Object", function() return ImportCEOGarage1 end) @@ -7,19 +7,19 @@ ImportCEOGarage1 = { Part = { Garage1 = { -- -191.0133, -579.1428, 135.0000 interiorId = 253441, - ipl = "imp_dt1_02_cargarage_a" + ipl = "imp_dt1_02_cargarage_a", }, Garage2 = { -- -117.4989, -568.1132, 135.0000 interiorId = 253697, - ipl = "imp_dt1_02_cargarage_b" + ipl = "imp_dt1_02_cargarage_b", }, Garage3 = { -- -136.0780, -630.1852, 135.0000 interiorId = 253953, - ipl = "imp_dt1_02_cargarage_c" + ipl = "imp_dt1_02_cargarage_c", }, ModShop = { -- -146.6166, -596.6301, 166.0000 interiorId = 254209, - ipl = "imp_dt1_02_modgarage" + ipl = "imp_dt1_02_modgarage", }, Load = function(part) @@ -32,7 +32,7 @@ ImportCEOGarage1 = { EnableIpl({ ImportCEOGarage1.Part.Garage1.ipl, ImportCEOGarage1.Part.Garage2.ipl, - ImportCEOGarage1.Part.Garage3.ipl + ImportCEOGarage1.Part.Garage3.ipl, }, false) end, }, @@ -52,9 +52,9 @@ ImportCEOGarage1 = { ImportCEOGarage1.Style.concrete, ImportCEOGarage1.Style.plain, ImportCEOGarage1.Style.marble, - ImportCEOGarage1.Style.wooden + ImportCEOGarage1.Style.wooden, }, false, true) - end + end, }, Numbering = { none = "", @@ -67,7 +67,7 @@ ImportCEOGarage1 = { style6 = "numbering_style06_n1", style7 = "numbering_style07_n1", style8 = "numbering_style08_n1", - style9 = "numbering_style09_n1" + style9 = "numbering_style09_n1", }, Level2 = { style1 = "numbering_style01_n2", @@ -78,7 +78,7 @@ ImportCEOGarage1 = { style6 = "numbering_style06_n2", style7 = "numbering_style07_n2", style8 = "numbering_style08_n2", - style9 = "numbering_style09_n2" + style9 = "numbering_style09_n2", }, Level3 = { style1 = "numbering_style01_n3", @@ -89,7 +89,7 @@ ImportCEOGarage1 = { style6 = "numbering_style06_n3", style7 = "numbering_style07_n3", style8 = "numbering_style08_n3", - style9 = "numbering_style09_n3" + style9 = "numbering_style09_n3", }, Set = function(part, num, refresh) @@ -107,9 +107,9 @@ ImportCEOGarage1 = { SetIplPropState(part.interiorId, { ImportCEOGarage1.Numbering.Level1, ImportCEOGarage1.Numbering.Level2, - ImportCEOGarage1.Numbering.Level3 + ImportCEOGarage1.Numbering.Level3, }, false, true) - end + end, }, Lighting = { none = "", @@ -136,11 +136,17 @@ ImportCEOGarage1 = { end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage1.Lighting.style1, ImportCEOGarage1.Lighting.style2, ImportCEOGarage1.Lighting.style3, - ImportCEOGarage1.Lighting.style4, ImportCEOGarage1.Lighting.style5, ImportCEOGarage1.Lighting.style6, - ImportCEOGarage1.Lighting.style7, ImportCEOGarage1.Lighting.style8, ImportCEOGarage1.Lighting.style9 + ImportCEOGarage1.Lighting.style1, + ImportCEOGarage1.Lighting.style2, + ImportCEOGarage1.Lighting.style3, + ImportCEOGarage1.Lighting.style4, + ImportCEOGarage1.Lighting.style5, + ImportCEOGarage1.Lighting.style6, + ImportCEOGarage1.Lighting.style7, + ImportCEOGarage1.Lighting.style8, + ImportCEOGarage1.Lighting.style9, }, false, true) - end + end, }, ModShop = { Floor = { @@ -178,16 +184,28 @@ ImportCEOGarage1 = { end, Clear = function() SetIplPropState(ImportCEOGarage1.Part.ModShop.interiorId, { - ImportCEOGarage1.ModShop.Floor.city, ImportCEOGarage1.ModShop.Floor.seabed, ImportCEOGarage1.ModShop.Floor.aliens, - ImportCEOGarage1.ModShop.Floor.clouds, ImportCEOGarage1.ModShop.Floor.money, ImportCEOGarage1.ModShop.Floor.zebra, - ImportCEOGarage1.ModShop.Floor.blackWhite, ImportCEOGarage1.ModShop.Floor.barcode, ImportCEOGarage1.ModShop.Floor.paintbrushBW, - ImportCEOGarage1.ModShop.Floor.grid, ImportCEOGarage1.ModShop.Floor.splashes, ImportCEOGarage1.ModShop.Floor.squares, - ImportCEOGarage1.ModShop.Floor.mosaic, ImportCEOGarage1.ModShop.Floor.paintbrushColor, ImportCEOGarage1.ModShop.Floor.curvesColor, - ImportCEOGarage1.ModShop.Floor.marbleBrown, ImportCEOGarage1.ModShop.Floor.marbleBlue, ImportCEOGarage1.ModShop.Floor.marbleBW, - ImportCEOGarage1.ModShop.Floor.maze + ImportCEOGarage1.ModShop.Floor.city, + ImportCEOGarage1.ModShop.Floor.seabed, + ImportCEOGarage1.ModShop.Floor.aliens, + ImportCEOGarage1.ModShop.Floor.clouds, + ImportCEOGarage1.ModShop.Floor.money, + ImportCEOGarage1.ModShop.Floor.zebra, + ImportCEOGarage1.ModShop.Floor.blackWhite, + ImportCEOGarage1.ModShop.Floor.barcode, + ImportCEOGarage1.ModShop.Floor.paintbrushBW, + ImportCEOGarage1.ModShop.Floor.grid, + ImportCEOGarage1.ModShop.Floor.splashes, + ImportCEOGarage1.ModShop.Floor.squares, + ImportCEOGarage1.ModShop.Floor.mosaic, + ImportCEOGarage1.ModShop.Floor.paintbrushColor, + ImportCEOGarage1.ModShop.Floor.curvesColor, + ImportCEOGarage1.ModShop.Floor.marbleBrown, + ImportCEOGarage1.ModShop.Floor.marbleBlue, + ImportCEOGarage1.ModShop.Floor.marbleBW, + ImportCEOGarage1.ModShop.Floor.maze, }, false, true) - end - } + end, + }, }, LoadDefault = function() @@ -198,5 +216,5 @@ ImportCEOGarage1 = { ImportCEOGarage1.Part.Load(ImportCEOGarage1.Part.ModShop) ImportCEOGarage1.ModShop.Floor.Set(ImportCEOGarage1.ModShop.Floor.default, true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_import/garage2.lua b/server-data/resources/[maps]/bob74_ipl/dlc_import/garage2.lua index a58917aba..2ad648015 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_import/garage2.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_import/garage2.lua @@ -1,5 +1,5 @@ -- Garage 2: Maze Bank Building -exports('GetImportCEOGarage2Object', function() +exports("GetImportCEOGarage2Object", function() return ImportCEOGarage2 end) @@ -7,19 +7,19 @@ ImportCEOGarage2 = { Part = { Garage1 = { -- -84.2193, -823.0851, 221.0000 interiorId = 254465, - ipl = "imp_dt1_11_cargarage_a" + ipl = "imp_dt1_11_cargarage_a", }, Garage2 = { -- -69.8627, -824.7498, 221.0000 interiorId = 254721, - ipl = "imp_dt1_11_cargarage_b" + ipl = "imp_dt1_11_cargarage_b", }, Garage3 = { -- -80.4318, -813.2536, 221.0000 interiorId = 254977, - ipl = "imp_dt1_11_cargarage_c" + ipl = "imp_dt1_11_cargarage_c", }, ModShop = { -- -73.9039, -821.6204, 284.0000 interiorId = 255233, - ipl = "imp_dt1_11_modgarage" + ipl = "imp_dt1_11_modgarage", }, Load = function(part) @@ -32,7 +32,7 @@ ImportCEOGarage2 = { EnableIpl({ ImportCEOGarage2.Part.Garage1.ipl, ImportCEOGarage2.Part.Garage2.ipl, - ImportCEOGarage2.Part.Garage3.ipl + ImportCEOGarage2.Part.Garage3.ipl, }, false) end, }, @@ -52,9 +52,9 @@ ImportCEOGarage2 = { ImportCEOGarage2.Style.concrete, ImportCEOGarage2.Style.plain, ImportCEOGarage2.Style.marble, - ImportCEOGarage2.Style.wooden + ImportCEOGarage2.Style.wooden, }, false, true) - end + end, }, Numbering = { none = "", @@ -67,7 +67,7 @@ ImportCEOGarage2 = { style6 = "numbering_style06_n1", style7 = "numbering_style07_n1", style8 = "numbering_style08_n1", - style9 = "numbering_style09_n1" + style9 = "numbering_style09_n1", }, Level2 = { style1 = "numbering_style01_n2", @@ -78,7 +78,7 @@ ImportCEOGarage2 = { style6 = "numbering_style06_n2", style7 = "numbering_style07_n2", style8 = "numbering_style08_n2", - style9 = "numbering_style09_n2" + style9 = "numbering_style09_n2", }, Level3 = { style1 = "numbering_style01_n3", @@ -89,7 +89,7 @@ ImportCEOGarage2 = { style6 = "numbering_style06_n3", style7 = "numbering_style07_n3", style8 = "numbering_style08_n3", - style9 = "numbering_style09_n3" + style9 = "numbering_style09_n3", }, Set = function(part, num, refresh) ImportCEOGarage2.Numbering.Clear(part) @@ -106,9 +106,9 @@ ImportCEOGarage2 = { SetIplPropState(part.interiorId, { ImportCEOGarage2.Numbering.Level1, ImportCEOGarage2.Numbering.Level2, - ImportCEOGarage2.Numbering.Level3 + ImportCEOGarage2.Numbering.Level3, }, false, true) - end + end, }, Lighting = { none = "", @@ -135,11 +135,17 @@ ImportCEOGarage2 = { end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage2.Lighting.style1, ImportCEOGarage2.Lighting.style2, ImportCEOGarage2.Lighting.style3, - ImportCEOGarage2.Lighting.style4, ImportCEOGarage2.Lighting.style5, ImportCEOGarage2.Lighting.style6, - ImportCEOGarage2.Lighting.style7, ImportCEOGarage2.Lighting.style8, ImportCEOGarage2.Lighting.style9 + ImportCEOGarage2.Lighting.style1, + ImportCEOGarage2.Lighting.style2, + ImportCEOGarage2.Lighting.style3, + ImportCEOGarage2.Lighting.style4, + ImportCEOGarage2.Lighting.style5, + ImportCEOGarage2.Lighting.style6, + ImportCEOGarage2.Lighting.style7, + ImportCEOGarage2.Lighting.style8, + ImportCEOGarage2.Lighting.style9, }, false, true) - end + end, }, ModShop = { Floor = { @@ -177,16 +183,28 @@ ImportCEOGarage2 = { end, Clear = function() SetIplPropState(ImportCEOGarage2.Part.ModShop.interiorId, { - ImportCEOGarage2.ModShop.Floor.city, ImportCEOGarage2.ModShop.Floor.seabed, ImportCEOGarage2.ModShop.Floor.aliens, - ImportCEOGarage2.ModShop.Floor.clouds, ImportCEOGarage2.ModShop.Floor.money, ImportCEOGarage2.ModShop.Floor.zebra, - ImportCEOGarage2.ModShop.Floor.blackWhite, ImportCEOGarage2.ModShop.Floor.barcode, ImportCEOGarage2.ModShop.Floor.paintbrushBW, - ImportCEOGarage2.ModShop.Floor.grid, ImportCEOGarage2.ModShop.Floor.splashes, ImportCEOGarage2.ModShop.Floor.squares, - ImportCEOGarage2.ModShop.Floor.mosaic, ImportCEOGarage2.ModShop.Floor.paintbrushColor, ImportCEOGarage2.ModShop.Floor.curvesColor, - ImportCEOGarage2.ModShop.Floor.marbleBrown, ImportCEOGarage2.ModShop.Floor.marbleBlue, ImportCEOGarage2.ModShop.Floor.marbleBW, - ImportCEOGarage2.ModShop.Floor.maze + ImportCEOGarage2.ModShop.Floor.city, + ImportCEOGarage2.ModShop.Floor.seabed, + ImportCEOGarage2.ModShop.Floor.aliens, + ImportCEOGarage2.ModShop.Floor.clouds, + ImportCEOGarage2.ModShop.Floor.money, + ImportCEOGarage2.ModShop.Floor.zebra, + ImportCEOGarage2.ModShop.Floor.blackWhite, + ImportCEOGarage2.ModShop.Floor.barcode, + ImportCEOGarage2.ModShop.Floor.paintbrushBW, + ImportCEOGarage2.ModShop.Floor.grid, + ImportCEOGarage2.ModShop.Floor.splashes, + ImportCEOGarage2.ModShop.Floor.squares, + ImportCEOGarage2.ModShop.Floor.mosaic, + ImportCEOGarage2.ModShop.Floor.paintbrushColor, + ImportCEOGarage2.ModShop.Floor.curvesColor, + ImportCEOGarage2.ModShop.Floor.marbleBrown, + ImportCEOGarage2.ModShop.Floor.marbleBlue, + ImportCEOGarage2.ModShop.Floor.marbleBW, + ImportCEOGarage2.ModShop.Floor.maze, }, false, true) - end - } + end, + }, }, LoadDefault = function() @@ -197,5 +215,5 @@ ImportCEOGarage2 = { ImportCEOGarage2.Part.Load(ImportCEOGarage2.Part.ModShop) ImportCEOGarage2.ModShop.Floor.Set(ImportCEOGarage2.ModShop.Floor.default, true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_import/garage3.lua b/server-data/resources/[maps]/bob74_ipl/dlc_import/garage3.lua index 8ab7a0c83..87905e9e6 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_import/garage3.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_import/garage3.lua @@ -1,5 +1,5 @@ -- Garage 3: Lom Bank -exports('GetImportCEOGarage3Object', function() +exports("GetImportCEOGarage3Object", function() return ImportCEOGarage3 end) @@ -7,19 +7,19 @@ ImportCEOGarage3 = { Part = { Garage1 = { -- -1581.1120, -567.2450, 85.5000 interiorId = 255489, - ipl = "imp_sm_13_cargarage_a" + ipl = "imp_sm_13_cargarage_a", }, Garage2 = { -- -1568.7390, -562.0455, 85.5000 interiorId = 255745, - ipl = "imp_sm_13_cargarage_b" + ipl = "imp_sm_13_cargarage_b", }, Garage3 = { -- -1563.5570, -574.4314, 85.5000 interiorId = 256001, - ipl = "imp_sm_13_cargarage_c" + ipl = "imp_sm_13_cargarage_c", }, ModShop = { -- -1578.0230, -576.4251, 104.2000 interiorId = 256257, - ipl = "imp_sm_13_modgarage" + ipl = "imp_sm_13_modgarage", }, Load = function(part) @@ -32,7 +32,7 @@ ImportCEOGarage3 = { EnableIpl({ ImportCEOGarage3.Part.Garage1.ipl, ImportCEOGarage3.Part.Garage2.ipl, - ImportCEOGarage3.Part.Garage3.ipl + ImportCEOGarage3.Part.Garage3.ipl, }, false) end, }, @@ -52,9 +52,9 @@ ImportCEOGarage3 = { ImportCEOGarage3.Style.concrete, ImportCEOGarage3.Style.plain, ImportCEOGarage3.Style.marble, - ImportCEOGarage3.Style.wooden + ImportCEOGarage3.Style.wooden, }, false, true) - end + end, }, Numbering = { none = "", @@ -67,7 +67,7 @@ ImportCEOGarage3 = { style6 = "numbering_style06_n1", style7 = "numbering_style07_n1", style8 = "numbering_style08_n1", - style9 = "numbering_style09_n1" + style9 = "numbering_style09_n1", }, Level2 = { style1 = "numbering_style01_n2", @@ -78,7 +78,7 @@ ImportCEOGarage3 = { style6 = "numbering_style06_n2", style7 = "numbering_style07_n2", style8 = "numbering_style08_n2", - style9 = "numbering_style09_n2" + style9 = "numbering_style09_n2", }, Level3 = { style1 = "numbering_style01_n3", @@ -89,7 +89,7 @@ ImportCEOGarage3 = { style6 = "numbering_style06_n3", style7 = "numbering_style07_n3", style8 = "numbering_style08_n3", - style9 = "numbering_style09_n3" + style9 = "numbering_style09_n3", }, Set = function(part, num, refresh) ImportCEOGarage3.Numbering.Clear(part) @@ -106,9 +106,9 @@ ImportCEOGarage3 = { SetIplPropState(part.interiorId, { ImportCEOGarage3.Numbering.Level1, ImportCEOGarage3.Numbering.Level2, - ImportCEOGarage3.Numbering.Level3 + ImportCEOGarage3.Numbering.Level3, }, false, true) - end + end, }, Lighting = { none = "", @@ -135,11 +135,17 @@ ImportCEOGarage3 = { end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage3.Lighting.style1, ImportCEOGarage3.Lighting.style2, ImportCEOGarage3.Lighting.style3, - ImportCEOGarage3.Lighting.style4, ImportCEOGarage3.Lighting.style5, ImportCEOGarage3.Lighting.style6, - ImportCEOGarage3.Lighting.style7, ImportCEOGarage3.Lighting.style8, ImportCEOGarage3.Lighting.style9 + ImportCEOGarage3.Lighting.style1, + ImportCEOGarage3.Lighting.style2, + ImportCEOGarage3.Lighting.style3, + ImportCEOGarage3.Lighting.style4, + ImportCEOGarage3.Lighting.style5, + ImportCEOGarage3.Lighting.style6, + ImportCEOGarage3.Lighting.style7, + ImportCEOGarage3.Lighting.style8, + ImportCEOGarage3.Lighting.style9, }, false, true) - end + end, }, ModShop = { Floor = { @@ -177,16 +183,28 @@ ImportCEOGarage3 = { end, Clear = function() SetIplPropState(ImportCEOGarage3.Part.ModShop.interiorId, { - ImportCEOGarage3.ModShop.Floor.city, ImportCEOGarage3.ModShop.Floor.seabed, ImportCEOGarage3.ModShop.Floor.aliens, - ImportCEOGarage3.ModShop.Floor.clouds, ImportCEOGarage3.ModShop.Floor.money, ImportCEOGarage3.ModShop.Floor.zebra, - ImportCEOGarage3.ModShop.Floor.blackWhite, ImportCEOGarage3.ModShop.Floor.barcode, ImportCEOGarage3.ModShop.Floor.paintbrushBW, - ImportCEOGarage3.ModShop.Floor.grid, ImportCEOGarage3.ModShop.Floor.splashes, ImportCEOGarage3.ModShop.Floor.squares, - ImportCEOGarage3.ModShop.Floor.mosaic, ImportCEOGarage3.ModShop.Floor.paintbrushColor, ImportCEOGarage3.ModShop.Floor.curvesColor, - ImportCEOGarage3.ModShop.Floor.marbleBrown, ImportCEOGarage3.ModShop.Floor.marbleBlue, ImportCEOGarage3.ModShop.Floor.marbleBW, - ImportCEOGarage3.ModShop.Floor.maze + ImportCEOGarage3.ModShop.Floor.city, + ImportCEOGarage3.ModShop.Floor.seabed, + ImportCEOGarage3.ModShop.Floor.aliens, + ImportCEOGarage3.ModShop.Floor.clouds, + ImportCEOGarage3.ModShop.Floor.money, + ImportCEOGarage3.ModShop.Floor.zebra, + ImportCEOGarage3.ModShop.Floor.blackWhite, + ImportCEOGarage3.ModShop.Floor.barcode, + ImportCEOGarage3.ModShop.Floor.paintbrushBW, + ImportCEOGarage3.ModShop.Floor.grid, + ImportCEOGarage3.ModShop.Floor.splashes, + ImportCEOGarage3.ModShop.Floor.squares, + ImportCEOGarage3.ModShop.Floor.mosaic, + ImportCEOGarage3.ModShop.Floor.paintbrushColor, + ImportCEOGarage3.ModShop.Floor.curvesColor, + ImportCEOGarage3.ModShop.Floor.marbleBrown, + ImportCEOGarage3.ModShop.Floor.marbleBlue, + ImportCEOGarage3.ModShop.Floor.marbleBW, + ImportCEOGarage3.ModShop.Floor.maze, }, false, true) - end - } + end, + }, }, LoadDefault = function() @@ -197,5 +215,5 @@ ImportCEOGarage3 = { -- No mod shop since it overlapses CEO office ImportCEOGarage3.Part.Remove(ImportCEOGarage3.Part.ModShop) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_import/garage4.lua b/server-data/resources/[maps]/bob74_ipl/dlc_import/garage4.lua index a0d7f03c7..0b0c74359 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_import/garage4.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_import/garage4.lua @@ -1,6 +1,6 @@ -- Garage 4: Maze Bank West -- Be careful, ImportCEOGarage4.Part.Garage1 and ImportCEOGarage4.Part.Garage3 overlaps with FinanceOffice4 -exports('GetImportCEOGarage4Object', function() +exports("GetImportCEOGarage4Object", function() return ImportCEOGarage4 end) @@ -8,19 +8,19 @@ ImportCEOGarage4 = { Part = { Garage1 = { -- -1388.8400, -478.7402, 56.1000 interiorId = 256513, - ipl = "imp_sm_15_cargarage_a" + ipl = "imp_sm_15_cargarage_a", }, Garage2 = { -- -1388.8600, -478.7574, 48.1000 interiorId = 256769, - ipl = "imp_sm_15_cargarage_b" + ipl = "imp_sm_15_cargarage_b", }, Garage3 = { -- -1374.6820, -474.3586, 56.1000 interiorId = 257025, - ipl = "imp_sm_15_cargarage_c" + ipl = "imp_sm_15_cargarage_c", }, ModShop = { -- -1391.2450, -473.9638, 77.2000 interiorId = 257281, - ipl = "imp_sm_15_modgarage" + ipl = "imp_sm_15_modgarage", }, Load = function(part) @@ -33,9 +33,9 @@ ImportCEOGarage4 = { EnableIpl({ ImportCEOGarage4.Part.Garage1.ipl, ImportCEOGarage4.Part.Garage2.ipl, - ImportCEOGarage4.Part.Garage3.ipl + ImportCEOGarage4.Part.Garage3.ipl, }, false) - end + end, }, Style = { concrete = "garage_decor_01", @@ -53,9 +53,9 @@ ImportCEOGarage4 = { ImportCEOGarage4.Style.concrete, ImportCEOGarage4.Style.plain, ImportCEOGarage4.Style.marble, - ImportCEOGarage4.Style.wooden + ImportCEOGarage4.Style.wooden, }, false, true) - end + end, }, Numbering = { none = "", @@ -68,7 +68,7 @@ ImportCEOGarage4 = { style6 = "numbering_style06_n1", style7 = "numbering_style07_n1", style8 = "numbering_style08_n1", - style9 = "numbering_style09_n1" + style9 = "numbering_style09_n1", }, Level2 = { style1 = "numbering_style01_n2", @@ -79,7 +79,7 @@ ImportCEOGarage4 = { style6 = "numbering_style06_n2", style7 = "numbering_style07_n2", style8 = "numbering_style08_n2", - style9 = "numbering_style09_n2" + style9 = "numbering_style09_n2", }, Level3 = { style1 = "numbering_style01_n3", @@ -90,7 +90,7 @@ ImportCEOGarage4 = { style6 = "numbering_style06_n3", style7 = "numbering_style07_n3", style8 = "numbering_style08_n3", - style9 = "numbering_style09_n3" + style9 = "numbering_style09_n3", }, Set = function(part, num, refresh) @@ -108,9 +108,9 @@ ImportCEOGarage4 = { SetIplPropState(part.interiorId, { ImportCEOGarage4.Numbering.Level1, ImportCEOGarage4.Numbering.Level2, - ImportCEOGarage4.Numbering.Level3 + ImportCEOGarage4.Numbering.Level3, }, false, true) - end + end, }, Lighting = { none = "", @@ -137,11 +137,17 @@ ImportCEOGarage4 = { end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage4.Lighting.style1, ImportCEOGarage4.Lighting.style2, ImportCEOGarage4.Lighting.style3, - ImportCEOGarage4.Lighting.style4, ImportCEOGarage4.Lighting.style5, ImportCEOGarage4.Lighting.style6, - ImportCEOGarage4.Lighting.style7, ImportCEOGarage4.Lighting.style8, ImportCEOGarage4.Lighting.style9 + ImportCEOGarage4.Lighting.style1, + ImportCEOGarage4.Lighting.style2, + ImportCEOGarage4.Lighting.style3, + ImportCEOGarage4.Lighting.style4, + ImportCEOGarage4.Lighting.style5, + ImportCEOGarage4.Lighting.style6, + ImportCEOGarage4.Lighting.style7, + ImportCEOGarage4.Lighting.style8, + ImportCEOGarage4.Lighting.style9, }, false, true) - end + end, }, ModShop = { Floor = { @@ -179,16 +185,28 @@ ImportCEOGarage4 = { end, Clear = function() SetIplPropState(ImportCEOGarage4.Part.ModShop.interiorId, { - ImportCEOGarage4.ModShop.Floor.city, ImportCEOGarage4.ModShop.Floor.seabed, ImportCEOGarage4.ModShop.Floor.aliens, - ImportCEOGarage4.ModShop.Floor.clouds, ImportCEOGarage4.ModShop.Floor.money, ImportCEOGarage4.ModShop.Floor.zebra, - ImportCEOGarage4.ModShop.Floor.blackWhite, ImportCEOGarage4.ModShop.Floor.barcode, ImportCEOGarage4.ModShop.Floor.paintbrushBW, - ImportCEOGarage4.ModShop.Floor.grid, ImportCEOGarage4.ModShop.Floor.splashes, ImportCEOGarage4.ModShop.Floor.squares, - ImportCEOGarage4.ModShop.Floor.mosaic, ImportCEOGarage4.ModShop.Floor.paintbrushColor, ImportCEOGarage4.ModShop.Floor.curvesColor, - ImportCEOGarage4.ModShop.Floor.marbleBrown, ImportCEOGarage4.ModShop.Floor.marbleBlue, ImportCEOGarage4.ModShop.Floor.marbleBW, - ImportCEOGarage4.ModShop.Floor.maze + ImportCEOGarage4.ModShop.Floor.city, + ImportCEOGarage4.ModShop.Floor.seabed, + ImportCEOGarage4.ModShop.Floor.aliens, + ImportCEOGarage4.ModShop.Floor.clouds, + ImportCEOGarage4.ModShop.Floor.money, + ImportCEOGarage4.ModShop.Floor.zebra, + ImportCEOGarage4.ModShop.Floor.blackWhite, + ImportCEOGarage4.ModShop.Floor.barcode, + ImportCEOGarage4.ModShop.Floor.paintbrushBW, + ImportCEOGarage4.ModShop.Floor.grid, + ImportCEOGarage4.ModShop.Floor.splashes, + ImportCEOGarage4.ModShop.Floor.squares, + ImportCEOGarage4.ModShop.Floor.mosaic, + ImportCEOGarage4.ModShop.Floor.paintbrushColor, + ImportCEOGarage4.ModShop.Floor.curvesColor, + ImportCEOGarage4.ModShop.Floor.marbleBrown, + ImportCEOGarage4.ModShop.Floor.marbleBlue, + ImportCEOGarage4.ModShop.Floor.marbleBW, + ImportCEOGarage4.ModShop.Floor.maze, }, false, true) - end - } + end, + }, }, LoadDefault = function() @@ -200,5 +218,5 @@ ImportCEOGarage4 = { ImportCEOGarage4.Part.Load(ImportCEOGarage4.Part.ModShop) ImportCEOGarage4.ModShop.Floor.Set(ImportCEOGarage4.ModShop.Floor.default, true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_import/vehicle_warehouse.lua b/server-data/resources/[maps]/bob74_ipl/dlc_import/vehicle_warehouse.lua index a8ddd847c..fa2a40a5e 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_import/vehicle_warehouse.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_import/vehicle_warehouse.lua @@ -1,7 +1,7 @@ -- Vehicle warehouse -- Upper: 994.5925, -3002.594, -39.64699 -- Lower: 969.5376, -3000.411, -48.64689 -exports('GetImportVehicleWarehouseObject', function() +exports("GetImportVehicleWarehouseObject", function() return ImportVehicleWarehouse end) @@ -18,8 +18,8 @@ ImportVehicleWarehouse = { end, Remove = function() EnableIpl(ImportVehicleWarehouse.Upper.Ipl.Interior.ipl, false) - end - } + end, + }, }, Style = { basic = "basic_style_set", @@ -35,9 +35,9 @@ ImportVehicleWarehouse = { SetIplPropState(ImportVehicleWarehouse.Upper.interiorId, { ImportVehicleWarehouse.Upper.Style.basic, ImportVehicleWarehouse.Upper.Style.branded, - ImportVehicleWarehouse.Upper.Style.urban + ImportVehicleWarehouse.Upper.Style.urban, }, false, refresh) - end + end, }, Details = { floorHatch = "car_floor_hatch", @@ -45,8 +45,8 @@ ImportVehicleWarehouse = { Enable = function(details, state, refresh) SetIplPropState(ImportVehicleWarehouse.Upper.interiorId, details, state, refresh) - end - } + end, + }, }, Lower = { interiorId = 253185, @@ -60,8 +60,8 @@ ImportVehicleWarehouse = { end, Remove = function() EnableIpl(ImportVehicleWarehouse.Lower.Ipl.Interior.ipl, false) - end - } + end, + }, }, Details = { Pumps = { @@ -72,12 +72,12 @@ ImportVehicleWarehouse = { pump5 = "pump_05", pump6 = "pump_06", pump7 = "pump_07", - pump8 = "pump_08" + pump8 = "pump_08", }, Enable = function(details, state, refresh) SetIplPropState(ImportVehicleWarehouse.Lower.interiorId, details, state, refresh) - end - } + end, + }, }, LoadDefault = function() @@ -92,5 +92,5 @@ ImportVehicleWarehouse = { ImportVehicleWarehouse.Lower.Details.Enable(ImportVehicleWarehouse.Lower.Details.Pumps, true) RefreshInterior(ImportVehicleWarehouse.Lower.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_security/billboards.lua b/server-data/resources/[maps]/bob74_ipl/dlc_security/billboards.lua index 30f4a12df..5eef9d31e 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_security/billboards.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_security/billboards.lua @@ -1,4 +1,4 @@ -exports('GetMpSecurityBillboardsObject', function() +exports("GetMpSecurityBillboardsObject", function() return MpSecurityBillboards end) @@ -6,8 +6,8 @@ MpSecurityBillboards = { Ipl = { Interior = { ipl = { - 'sf_billboards', - } + "sf_billboards", + }, }, Load = function() @@ -17,8 +17,8 @@ MpSecurityBillboards = { EnableIpl(MpSecurityBillboards.Ipl.Interior.ipl, false) end, }, - + LoadDefault = function() MpSecurityBillboards.Ipl.Load() - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_security/garage.lua b/server-data/resources/[maps]/bob74_ipl/dlc_security/garage.lua index 342f69e08..7f1f03400 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_security/garage.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_security/garage.lua @@ -1,4 +1,4 @@ -exports('GetMpSecurityGarageObject', function() +exports("GetMpSecurityGarageObject", function() return MpSecurityGarage end) @@ -8,8 +8,8 @@ MpSecurityGarage = { Ipl = { Interior = { ipl = { - 'sf_int_placement_sec_interior_2_dlc_garage_sec_milo_' - } + "sf_int_placement_sec_interior_2_dlc_garage_sec_milo_", + }, }, Load = function() @@ -17,12 +17,12 @@ MpSecurityGarage = { end, Remove = function() EnableIpl(MpSecurityGarage.Ipl.Interior.ipl, false) - end + end, }, Entities = { Entity_Set_Workshop_Wall = false, Entity_Set_Wallpaper_01 = false, - Entity_Set_Wallpaper_02 = false, + Entity_Set_Wallpaper_02 = false, Entity_Set_Wallpaper_03 = false, Entity_Set_Wallpaper_04 = false, Entity_Set_Wallpaper_05 = false, @@ -50,18 +50,18 @@ MpSecurityGarage = { end, Load = function() for entity, state in pairs(MpSecurityGarage.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(MpSecurityGarage.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(MpSecurityGarage.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(MpSecurityGarage.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -69,5 +69,5 @@ MpSecurityGarage = { MpSecurityGarage.Entities.Load() RefreshInterior(MpSecurityGarage.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_security/musicrooftop.lua b/server-data/resources/[maps]/bob74_ipl/dlc_security/musicrooftop.lua index d3b94e580..e35904274 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_security/musicrooftop.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_security/musicrooftop.lua @@ -1,4 +1,4 @@ -exports('GetMpSecurityMusicRoofTopObject', function() +exports("GetMpSecurityMusicRoofTopObject", function() return MpSecurityMusicRoofTop end) @@ -6,8 +6,8 @@ MpSecurityMusicRoofTop = { Ipl = { Interior = { ipl = { - 'sf_musicrooftop' - } + "sf_musicrooftop", + }, }, Load = function() @@ -15,10 +15,10 @@ MpSecurityMusicRoofTop = { end, Remove = function() EnableIpl(MpSecurityMusicRoofTop.Ipl.Interior.ipl, false) - end + end, }, LoadDefault = function() MpSecurityMusicRoofTop.Ipl.Load() - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_security/office1.lua b/server-data/resources/[maps]/bob74_ipl/dlc_security/office1.lua index 70659dabd..36ac2801b 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_security/office1.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_security/office1.lua @@ -1,4 +1,4 @@ -exports('GetMpSecurityOffice1Object', function() +exports("GetMpSecurityOffice1Object", function() return MpSecurityOffice1 end) @@ -8,8 +8,8 @@ MpSecurityOffice1 = { Ipl = { Interior = { ipl = { - 'sf_fixeroffice_bh1_05' - } + "sf_fixeroffice_bh1_05", + }, }, Load = function() @@ -17,7 +17,7 @@ MpSecurityOffice1 = { end, Remove = function() EnableIpl(MpSecurityOffice1.Ipl.Interior.ipl, false) - end + end, }, Entities = { Entity_Set_Armoury = false, @@ -83,18 +83,18 @@ MpSecurityOffice1 = { end, Load = function() for entity, state in pairs(MpSecurityOffice1.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(MpSecurityOffice1.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(MpSecurityOffice1.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(MpSecurityOffice1.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -102,5 +102,5 @@ MpSecurityOffice1 = { MpSecurityOffice1.Entities.Load() RefreshInterior(MpSecurityOffice1.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_security/office2.lua b/server-data/resources/[maps]/bob74_ipl/dlc_security/office2.lua index cb4481753..9ac5fe38d 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_security/office2.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_security/office2.lua @@ -1,4 +1,4 @@ -exports('GetMpSecurityOffice2Object', function() +exports("GetMpSecurityOffice2Object", function() return MpSecurityOffice2 end) @@ -8,8 +8,8 @@ MpSecurityOffice2 = { Ipl = { Interior = { ipl = { - 'sf_fixeroffice_hw1_08' - } + "sf_fixeroffice_hw1_08", + }, }, Load = function() @@ -17,7 +17,7 @@ MpSecurityOffice2 = { end, Remove = function() EnableIpl(MpSecurityOffice2.Ipl.Interior.ipl, false) - end + end, }, Entities = { Entity_Set_Armoury = true, @@ -83,18 +83,18 @@ MpSecurityOffice2 = { end, Load = function() for entity, state in pairs(MpSecurityOffice2.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(MpSecurityOffice2.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(MpSecurityOffice2.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(MpSecurityOffice2.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -102,5 +102,5 @@ MpSecurityOffice2 = { MpSecurityOffice2.Entities.Load() RefreshInterior(MpSecurityOffice2.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_security/office3.lua b/server-data/resources/[maps]/bob74_ipl/dlc_security/office3.lua index 401ad4c05..a775e1470 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_security/office3.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_security/office3.lua @@ -1,4 +1,4 @@ -exports('GetMpSecurityOffice3Object', function() +exports("GetMpSecurityOffice3Object", function() return MpSecurityOffice3 end) @@ -8,15 +8,15 @@ MpSecurityOffice3 = { Ipl = { Interior = { ipl = { - 'sf_fixeroffice_kt1_05' - } + "sf_fixeroffice_kt1_05", + }, }, Load = function() EnableIpl(MpSecurityOffice3.Ipl.Interior.ipl, true) end, Remove = function() EnableIpl(MpSecurityOffice3.Ipl.Interior.ipl, false) - end + end, }, Entities = { Entity_Set_Armoury = false, @@ -82,18 +82,18 @@ MpSecurityOffice3 = { end, Load = function() for entity, state in pairs(MpSecurityOffice3.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(MpSecurityOffice3.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(MpSecurityOffice3.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(MpSecurityOffice3.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -101,5 +101,5 @@ MpSecurityOffice3 = { MpSecurityOffice3.Entities.Load() RefreshInterior(MpSecurityOffice3.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_security/office4.lua b/server-data/resources/[maps]/bob74_ipl/dlc_security/office4.lua index 86ce6d94b..ad5d56c4a 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_security/office4.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_security/office4.lua @@ -1,4 +1,4 @@ -exports('GetMpSecurityOffice4Object', function() +exports("GetMpSecurityOffice4Object", function() return MpSecurityOffice4 end) @@ -8,8 +8,8 @@ MpSecurityOffice4 = { Ipl = { Interior = { ipl = { - 'sf_fixeroffice_kt1_08' - } + "sf_fixeroffice_kt1_08", + }, }, Load = function() @@ -83,14 +83,14 @@ MpSecurityOffice4 = { end, Load = function() for entity, state in pairs(MpSecurityOffice4.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(MpSecurityOffice4.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(MpSecurityOffice4.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(MpSecurityOffice4.InteriorId, entity) end end @@ -102,5 +102,5 @@ MpSecurityOffice4 = { MpSecurityOffice4.Entities.Load() RefreshInterior(MpSecurityOffice4.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_security/studio.lua b/server-data/resources/[maps]/bob74_ipl/dlc_security/studio.lua index de33322ef..32f0b952f 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_security/studio.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_security/studio.lua @@ -1,4 +1,4 @@ -exports('GetMpSecurityStudioObject', function() +exports("GetMpSecurityStudioObject", function() return MpSecurityStudio end) @@ -8,8 +8,8 @@ MpSecurityStudio = { Ipl = { Interior = { ipl = { - 'sf_int_placement_sec_interior_1_dlc_studio_sec_milo_ ' - } + "sf_int_placement_sec_interior_1_dlc_studio_sec_milo_ ", + }, }, Load = function() @@ -37,18 +37,18 @@ MpSecurityStudio = { end, Load = function() for entity, state in pairs(MpSecurityStudio.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(MpSecurityStudio.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(MpSecurityStudio.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(MpSecurityStudio.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -56,5 +56,5 @@ MpSecurityStudio = { MpSecurityStudio.Entities.Load() RefreshInterior(MpSecurityStudio.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_smuggler/hangar.lua b/server-data/resources/[maps]/bob74_ipl/dlc_smuggler/hangar.lua index 188088077..8895562ee 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_smuggler/hangar.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_smuggler/hangar.lua @@ -1,5 +1,5 @@ -- SmugglerHangar: -1267.0 -3013.135 -49.5 -exports('GetSmugglerHangarObject', function() +exports("GetSmugglerHangarObject", function() return SmugglerHangar end) @@ -15,8 +15,8 @@ SmugglerHangar = { end, Remove = function() EnableIpl(SmugglerHangar.Ipl.Interior.ipl, false) - end - } + end, + }, }, Colors = { colorSet1 = 1, -- sable, red, gray @@ -27,7 +27,7 @@ SmugglerHangar = { colorSet6 = 6, -- yellow, gray, light gray colorSet7 = 7, -- light Black and white colorSet8 = 8, -- dark Black and white - colorSet9 = 9 -- sable and gray + colorSet9 = 9, -- sable and gray }, Walls = { default = "set_tint_shell", @@ -50,9 +50,9 @@ SmugglerHangar = { Clear = function(refresh) SetIplPropState(SmugglerHangar.interiorId, { SmugglerHangar.Floor.Style.raw, - SmugglerHangar.Floor.Style.plain + SmugglerHangar.Floor.Style.plain, }, false, refresh) - end + end, }, Decals = { decal1 = "set_floor_decal_1", @@ -85,10 +85,10 @@ SmugglerHangar = { SmugglerHangar.Floor.Decals.decal6, SmugglerHangar.Floor.Decals.decal7, SmugglerHangar.Floor.Decals.decal8, - SmugglerHangar.Floor.Decals.decal9 + SmugglerHangar.Floor.Decals.decal9, }, false, refresh) - end - } + end, + }, }, Cranes = { on = "set_crane_tint", @@ -108,7 +108,7 @@ SmugglerHangar = { end, Clear = function(refresh) SetIplPropState(SmugglerHangar.interiorId, SmugglerHangar.Cranes.default, false, refresh) - end + end, }, ModArea = { on = "set_modarea", @@ -132,7 +132,7 @@ SmugglerHangar = { end, Clear = function(refresh) SetIplPropState(SmugglerHangar.interiorId, SmugglerHangar.ModArea.mod, false, refresh) - end + end, }, Office = { basic = "set_office_basic", @@ -148,20 +148,20 @@ SmugglerHangar = { SetIplPropState(SmugglerHangar.interiorId, { SmugglerHangar.Office.basic, SmugglerHangar.Office.modern, - SmugglerHangar.Office.traditional + SmugglerHangar.Office.traditional, }, false, refresh) - end + end, }, Bedroom = { Style = { none = "", modern = { "set_bedroom_modern", - "set_bedroom_tint" + "set_bedroom_tint", }, traditional = { "set_bedroom_traditional", - "set_bedroom_tint" + "set_bedroom_tint", }, Set = function(bed, color, refresh) @@ -183,9 +183,9 @@ SmugglerHangar = { Clear = function(refresh) SetIplPropState(SmugglerHangar.interiorId, { SmugglerHangar.Bedroom.Style.modern, - SmugglerHangar.Bedroom.Style.traditional + SmugglerHangar.Bedroom.Style.traditional, }, false, refresh) - end + end, }, Blinds = { none = "", @@ -206,10 +206,10 @@ SmugglerHangar = { Clear = function(refresh) SetIplPropState(SmugglerHangar.interiorId, { SmugglerHangar.Bedroom.Blinds.opened, - SmugglerHangar.Bedroom.Blinds.closed + SmugglerHangar.Bedroom.Blinds.closed, }, false, refresh) - end - } + end, + }, }, Lighting = { FakeLights = { @@ -232,7 +232,7 @@ SmugglerHangar = { end, Clear = function(refresh) SetIplPropState(SmugglerHangar.interiorId, "set_lighting_tint_props", false, refresh) - end + end, }, Ceiling = { none = "", @@ -255,9 +255,9 @@ SmugglerHangar = { SetIplPropState(SmugglerHangar.interiorId, { SmugglerHangar.Lighting.Ceiling.yellow, SmugglerHangar.Lighting.Ceiling.blue, - SmugglerHangar.Lighting.Ceiling.white + SmugglerHangar.Lighting.Ceiling.white, }, false, refresh) - end + end, }, Walls = { none = "", @@ -294,17 +294,17 @@ SmugglerHangar = { SmugglerHangar.Lighting.Walls.strongYellow, SmugglerHangar.Lighting.Walls.white, SmugglerHangar.Lighting.Walls.lightGreen, - SmugglerHangar.Lighting.Walls.yellow + SmugglerHangar.Lighting.Walls.yellow, }, false, refresh) - end - } + end, + }, }, Details = { bedroomClutter = "set_bedroom_clutter", Enable = function(details, state, refresh) SetIplPropState(SmugglerHangar.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -329,5 +329,5 @@ SmugglerHangar = { SmugglerHangar.Details.Enable(SmugglerHangar.Details.bedroomClutter, false) RefreshInterior(SmugglerHangar.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_tuner/garage.lua b/server-data/resources/[maps]/bob74_ipl/dlc_tuner/garage.lua index d7f38a487..89b5e734f 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_tuner/garage.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_tuner/garage.lua @@ -1,4 +1,4 @@ -exports('GetTunerGarageObject', function() +exports("GetTunerGarageObject", function() return TunerGarage end) @@ -8,12 +8,12 @@ TunerGarage = { Ipl = { Interior = { ipl = { - 'tr_tuner_shop_burton', - 'tr_tuner_shop_mesa', - 'tr_tuner_shop_mission', - 'tr_tuner_shop_rancho', - 'tr_tuner_shop_strawberry' - } + "tr_tuner_shop_burton", + "tr_tuner_shop_mesa", + "tr_tuner_shop_mission", + "tr_tuner_shop_rancho", + "tr_tuner_shop_strawberry", + }, }, Load = function() @@ -71,18 +71,18 @@ TunerGarage = { end, Load = function() for entity, state in pairs(TunerGarage.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(TunerGarage.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(TunerGarage.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(TunerGarage.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -90,5 +90,5 @@ TunerGarage = { TunerGarage.Entities.Load() RefreshInterior(TunerGarage.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_tuner/meetup.lua b/server-data/resources/[maps]/bob74_ipl/dlc_tuner/meetup.lua index 30484783b..019ba10ed 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_tuner/meetup.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_tuner/meetup.lua @@ -1,4 +1,4 @@ -exports('GetTunerMeetupObject', function() +exports("GetTunerMeetupObject", function() return TunerMeetup end) @@ -8,9 +8,9 @@ TunerMeetup = { Ipl = { Interior = { ipl = { - 'tr_tuner_meetup', - 'tr_tuner_race_line' - } + "tr_tuner_meetup", + "tr_tuner_race_line", + }, }, Load = function() @@ -18,7 +18,7 @@ TunerMeetup = { end, Remove = function() EnableIpl(TunerMeetup.Ipl.Interior.ipl, false) - end + end, }, Entities = { entity_set_meet_crew = true, @@ -41,18 +41,18 @@ TunerMeetup = { end, Load = function() for entity, state in pairs(TunerMeetup.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(TunerMeetup.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(TunerMeetup.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(TunerMeetup.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -60,5 +60,5 @@ TunerMeetup = { TunerMeetup.Entities.Load() RefreshInterior(TunerMeetup.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/dlc_tuner/methlab.lua b/server-data/resources/[maps]/bob74_ipl/dlc_tuner/methlab.lua index cd8a06e84..b67736350 100644 --- a/server-data/resources/[maps]/bob74_ipl/dlc_tuner/methlab.lua +++ b/server-data/resources/[maps]/bob74_ipl/dlc_tuner/methlab.lua @@ -1,4 +1,4 @@ -exports('GetTunerMethLabObject', function() +exports("GetTunerMethLabObject", function() return TunerMethLab end) @@ -19,18 +19,18 @@ TunerMethLab = { end, Load = function() for entity, state in pairs(TunerMethLab.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(TunerMethLab.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(TunerMethLab.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(TunerMethLab.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -38,5 +38,5 @@ TunerMethLab = { SetInteriorEntitySetColor(TunerMethLab.interiorId, TunerMethLab.Entities.tintable_walls, 3) RefreshInterior(TunerMethLab.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/fxmanifest.lua b/server-data/resources/[maps]/bob74_ipl/fxmanifest.lua index 47173906a..6eeb0a018 100644 --- a/server-data/resources/[maps]/bob74_ipl/fxmanifest.lua +++ b/server-data/resources/[maps]/bob74_ipl/fxmanifest.lua @@ -2,129 +2,129 @@ -- ********** -- IPL list: https://wiki.rage.mp/index.php?title=Interiors_and_Locations -fx_version 'cerulean' -game 'gta5' +fx_version("cerulean") +game("gta5") -author 'Bob_74' -description 'Load and customize your map' -version '2.0.15' +author("Bob_74") +description("Load and customize your map") +version("2.0.15") -lua54 "yes" - -client_scripts { - "lib/common.lua" - , "lib/observers/interiorIdObserver.lua" - , "lib/observers/officeSafeDoorHandler.lua" - , "client.lua" +lua54("yes") +client_scripts({ + "lib/common.lua", + "lib/observers/interiorIdObserver.lua", + "lib/observers/officeSafeDoorHandler.lua", + "client.lua" -- GTA V - , "gtav/base.lua" -- Base IPLs to fix holes - , "gtav/ammunations.lua" - , "gtav/bahama.lua" - , "gtav/floyd.lua" - , "gtav/franklin.lua" - , "gtav/franklin_aunt.lua" - , "gtav/graffitis.lua" - , "gtav/pillbox_hospital.lua" - , "gtav/lester_factory.lua" - , "gtav/michael.lua" - , "gtav/north_yankton.lua" - , "gtav/red_carpet.lua" - , "gtav/simeon.lua" - , "gtav/stripclub.lua" - , "gtav/trevors_trailer.lua" - , "gtav/ufo.lua" - , "gtav/zancudo_gates.lua" - +, + "gtav/base.lua", -- Base IPLs to fix holes + "gtav/ammunations.lua", + "gtav/bahama.lua", + "gtav/floyd.lua", + "gtav/franklin.lua", + "gtav/franklin_aunt.lua", + "gtav/graffitis.lua", + "gtav/pillbox_hospital.lua", + "gtav/lester_factory.lua", + "gtav/michael.lua", + "gtav/north_yankton.lua", + "gtav/red_carpet.lua", + "gtav/simeon.lua", + "gtav/stripclub.lua", + "gtav/trevors_trailer.lua", + "gtav/ufo.lua", + "gtav/zancudo_gates.lua" -- GTA Online - , "gta_online/apartment_hi_1.lua" - , "gta_online/apartment_hi_2.lua" - , "gta_online/house_hi_1.lua" - , "gta_online/house_hi_2.lua" - , "gta_online/house_hi_3.lua" - , "gta_online/house_hi_4.lua" - , "gta_online/house_hi_5.lua" - , "gta_online/house_hi_6.lua" - , "gta_online/house_hi_7.lua" - , "gta_online/house_hi_8.lua" - , "gta_online/house_mid_1.lua" - , "gta_online/house_low_1.lua" - +, + "gta_online/apartment_hi_1.lua", + "gta_online/apartment_hi_2.lua", + "gta_online/house_hi_1.lua", + "gta_online/house_hi_2.lua", + "gta_online/house_hi_3.lua", + "gta_online/house_hi_4.lua", + "gta_online/house_hi_5.lua", + "gta_online/house_hi_6.lua", + "gta_online/house_hi_7.lua", + "gta_online/house_hi_8.lua", + "gta_online/house_mid_1.lua", + "gta_online/house_low_1.lua" -- DLC High Life - , "dlc_high_life/apartment1.lua" - , "dlc_high_life/apartment2.lua" - , "dlc_high_life/apartment3.lua" - , "dlc_high_life/apartment4.lua" - , "dlc_high_life/apartment5.lua" - , "dlc_high_life/apartment6.lua" - +, + "dlc_high_life/apartment1.lua", + "dlc_high_life/apartment2.lua", + "dlc_high_life/apartment3.lua", + "dlc_high_life/apartment4.lua", + "dlc_high_life/apartment5.lua", + "dlc_high_life/apartment6.lua" -- DLC Heists - , "dlc_heists/carrier.lua" - , "dlc_heists/yacht.lua" - +, + "dlc_heists/carrier.lua", + "dlc_heists/yacht.lua" -- DLC Executives & Other Criminals - , "dlc_executive/apartment1.lua" - , "dlc_executive/apartment2.lua" - , "dlc_executive/apartment3.lua" - +, + "dlc_executive/apartment1.lua", + "dlc_executive/apartment2.lua", + "dlc_executive/apartment3.lua" -- DLC Finance & Felony - , "dlc_finance/office1.lua" - , "dlc_finance/office2.lua" - , "dlc_finance/office3.lua" - , "dlc_finance/office4.lua" - , "dlc_finance/organization.lua" - +, + "dlc_finance/office1.lua", + "dlc_finance/office2.lua", + "dlc_finance/office3.lua", + "dlc_finance/office4.lua", + "dlc_finance/organization.lua" -- DLC Bikers - , "dlc_bikers/cocaine.lua" - , "dlc_bikers/counterfeit_cash.lua" - , "dlc_bikers/document_forgery.lua" - , "dlc_bikers/meth.lua" - , "dlc_bikers/weed.lua" - , "dlc_bikers/clubhouse1.lua" - , "dlc_bikers/clubhouse2.lua" - , "dlc_bikers/gang.lua" - +, + "dlc_bikers/cocaine.lua", + "dlc_bikers/counterfeit_cash.lua", + "dlc_bikers/document_forgery.lua", + "dlc_bikers/meth.lua", + "dlc_bikers/weed.lua", + "dlc_bikers/clubhouse1.lua", + "dlc_bikers/clubhouse2.lua", + "dlc_bikers/gang.lua" -- DLC Import/Export - , "dlc_import/garage1.lua" - , "dlc_import/garage2.lua" - , "dlc_import/garage3.lua" - , "dlc_import/garage4.lua" - , "dlc_import/vehicle_warehouse.lua" - +, + "dlc_import/garage1.lua", + "dlc_import/garage2.lua", + "dlc_import/garage3.lua", + "dlc_import/garage4.lua", + "dlc_import/vehicle_warehouse.lua" -- DLC Gunrunning - , "dlc_gunrunning/bunkers.lua" - , "dlc_gunrunning/yacht.lua" - +, + "dlc_gunrunning/bunkers.lua", + "dlc_gunrunning/yacht.lua" -- DLC Smuggler's Run - , "dlc_smuggler/hangar.lua" - +, + "dlc_smuggler/hangar.lua" -- DLC Doomsday Heist - , "dlc_doomsday/facility.lua" - +, + "dlc_doomsday/facility.lua" -- DLC After Hours - , "dlc_afterhours/nightclubs.lua" - +, + "dlc_afterhours/nightclubs.lua" -- DLC Diamond Casino (Requires forced build 2060 or higher) - , "dlc_casino/casino.lua" - , "dlc_casino/penthouse.lua" - +, + "dlc_casino/casino.lua", + "dlc_casino/penthouse.lua" -- DLC Tuners (Requires forced build 2372 or higher) - , "dlc_tuner/garage.lua" - , "dlc_tuner/meetup.lua" - , "dlc_tuner/methlab.lua" - +, + "dlc_tuner/garage.lua", + "dlc_tuner/meetup.lua", + "dlc_tuner/methlab.lua" -- DLC The Contract (Requires forced build 2545 or higher) - , "dlc_security/studio.lua" - , "dlc_security/billboards.lua" - , "dlc_security/musicrooftop.lua" - , "dlc_security/garage.lua" - , "dlc_security/office1.lua" - , "dlc_security/office2.lua" - , "dlc_security/office3.lua" - , "dlc_security/office4.lua" - +, + "dlc_security/studio.lua", + "dlc_security/billboards.lua", + "dlc_security/musicrooftop.lua", + "dlc_security/garage.lua", + "dlc_security/office1.lua", + "dlc_security/office2.lua", + "dlc_security/office3.lua", + "dlc_security/office4.lua" -- DLC The Criminal Enterprises (Requires forced build 2699 or higher) - , "gta_mpsum2/simeonfix.lua" - , "gta_mpsum2/vehicle_warehouse.lua" - , "gta_mpsum2/warehouse.lua" -} +, + "gta_mpsum2/simeonfix.lua", + "gta_mpsum2/vehicle_warehouse.lua", + "gta_mpsum2/warehouse.lua", +}) diff --git a/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/simeonfix.lua b/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/simeonfix.lua index 346bbeef4..8cf99372b 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/simeonfix.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/simeonfix.lua @@ -1,4 +1,4 @@ -exports('GetCriminalEnterpriseSmeonFixObject', function() +exports("GetCriminalEnterpriseSmeonFixObject", function() return CriminalEnterpriseSmeonFix end) @@ -8,8 +8,8 @@ CriminalEnterpriseSmeonFix = { Ipl = { Interior = { ipl = { - 'reh_simeonfix', - } + "reh_simeonfix", + }, }, Load = function() @@ -17,7 +17,7 @@ CriminalEnterpriseSmeonFix = { end, Remove = function() EnableIpl(CriminalEnterpriseSmeonFix.Ipl.Interior.ipl, false) - end + end, }, Entities = { @@ -32,18 +32,18 @@ CriminalEnterpriseSmeonFix = { end, Load = function() for entity, state in pairs(CriminalEnterpriseSmeonFix.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(CriminalEnterpriseSmeonFix.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(CriminalEnterpriseSmeonFix.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(CriminalEnterpriseSmeonFix.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -51,5 +51,5 @@ CriminalEnterpriseSmeonFix = { CriminalEnterpriseSmeonFix.Entities.Load() RefreshInterior(CriminalEnterpriseSmeonFix.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/vehicle_warehouse.lua b/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/vehicle_warehouse.lua index 81fdcf018..81c39f219 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/vehicle_warehouse.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/vehicle_warehouse.lua @@ -1,4 +1,4 @@ -exports('GetCriminalEnterpriseVehicleWarehouseObject', function() +exports("GetCriminalEnterpriseVehicleWarehouseObject", function() return CriminalEnterpriseVehicleWarehouse end) @@ -8,8 +8,8 @@ CriminalEnterpriseVehicleWarehouse = { Ipl = { Interior = { ipl = { - 'reh_int_placement_sum2_interior_0_dlc_int_03_sum2_milo_', - } + "reh_int_placement_sum2_interior_0_dlc_int_03_sum2_milo_", + }, }, Load = function() @@ -17,10 +17,10 @@ CriminalEnterpriseVehicleWarehouse = { end, Remove = function() EnableIpl(CriminalEnterpriseVehicleWarehouse.Ipl.Interior.ipl, false) - end + end, }, Entities = { - entity_set_office = true, + entity_set_office = true, entity_set_light_option_1 = true, entity_set_light_option_2 = true, entity_set_light_option_3 = true, @@ -37,18 +37,18 @@ CriminalEnterpriseVehicleWarehouse = { end, Load = function() for entity, state in pairs(CriminalEnterpriseVehicleWarehouse.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(CriminalEnterpriseVehicleWarehouse.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(CriminalEnterpriseVehicleWarehouse.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(CriminalEnterpriseVehicleWarehouse.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -56,5 +56,5 @@ CriminalEnterpriseVehicleWarehouse = { CriminalEnterpriseVehicleWarehouse.Entities.Load() RefreshInterior(CriminalEnterpriseVehicleWarehouse.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/warehouse.lua b/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/warehouse.lua index 15dbaff13..99ba4da74 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/warehouse.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_mpsum2/warehouse.lua @@ -1,4 +1,4 @@ -exports('GetCriminalEnterpriseWarehouseObject', function() +exports("GetCriminalEnterpriseWarehouseObject", function() return CriminalEnterpriseWarehouse end) @@ -8,8 +8,8 @@ CriminalEnterpriseWarehouse = { Ipl = { Interior = { ipl = { - 'reh_int_placement_sum2_interior_1_dlc_int_04_sum2_milo_', - } + "reh_int_placement_sum2_interior_1_dlc_int_04_sum2_milo_", + }, }, Load = function() @@ -17,7 +17,7 @@ CriminalEnterpriseWarehouse = { end, Remove = function() EnableIpl(CriminalEnterpriseWarehouse.Ipl.Interior.ipl, false) - end + end, }, Entities = { entity_set_style_1 = false, @@ -37,18 +37,18 @@ CriminalEnterpriseWarehouse = { end, Load = function() for entity, state in pairs(CriminalEnterpriseWarehouse.Entities) do - if type(entity) == 'string' and state then + if type(entity) == "string" and state then ActivateInteriorEntitySet(CriminalEnterpriseWarehouse.InteriorId, entity) end end end, Clear = function() for entity, _ in pairs(CriminalEnterpriseWarehouse.Entities) do - if type(entity) == 'string' then + if type(entity) == "string" then DeactivateInteriorEntitySet(CriminalEnterpriseWarehouse.InteriorId, entity) end end - end + end, }, LoadDefault = function() @@ -56,5 +56,5 @@ CriminalEnterpriseWarehouse = { CriminalEnterpriseWarehouse.Entities.Load() RefreshInterior(CriminalEnterpriseWarehouse.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/apartment_hi_1.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/apartment_hi_1.lua index 7729a612f..b753ec482 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/apartment_hi_1.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/apartment_hi_1.lua @@ -1,6 +1,6 @@ -- 4 Integrity Way, Apt 30 -- High end apartment 1: -35.31277 -580.4199 88.71221 -exports('GetGTAOApartmentHi1Object', function() +exports("GetGTAOApartmentHi1Object", function() return GTAOApartmentHi1 end) @@ -14,7 +14,7 @@ GTAOApartmentHi1 = { Enable = function(details, state, refresh) SetIplPropState(GTAOApartmentHi1.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOApartmentHi1 = { Enable = function(details, state, refresh) SetIplPropState(GTAOApartmentHi1.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,25 +32,25 @@ GTAOApartmentHi1 = { Enable = function(details, state, refresh) SetIplPropState(GTAOApartmentHi1.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOApartmentHi1.Strip.Enable({ GTAOApartmentHi1.Strip.A, GTAOApartmentHi1.Strip.B, - GTAOApartmentHi1.Strip.C + GTAOApartmentHi1.Strip.C, }, false) GTAOApartmentHi1.Booze.Enable({ GTAOApartmentHi1.Booze.A, GTAOApartmentHi1.Booze.B, - GTAOApartmentHi1.Booze.C + GTAOApartmentHi1.Booze.C, }, false) GTAOApartmentHi1.Smoke.Enable({ GTAOApartmentHi1.Smoke.A, GTAOApartmentHi1.Smoke.B, - GTAOApartmentHi1.Smoke.C + GTAOApartmentHi1.Smoke.C, }, false) RefreshInterior(GTAOApartmentHi1.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/apartment_hi_2.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/apartment_hi_2.lua index 733a238a4..59db37759 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/apartment_hi_2.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/apartment_hi_2.lua @@ -1,6 +1,6 @@ -- Dell Perro Heights, Apt 7 -- High end apartment 2: -1477.14 -538.7499 55.5264 -exports('GetGTAOApartmentHi2Object', function() +exports("GetGTAOApartmentHi2Object", function() return GTAOApartmentHi2 end) @@ -14,7 +14,7 @@ GTAOApartmentHi2 = { Enable = function(details, state, refresh) SetIplPropState(GTAOApartmentHi2.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOApartmentHi2 = { Enable = function(details, state, refresh) SetIplPropState(GTAOApartmentHi2.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOApartmentHi2 = { Enable = function(details, state, refresh) SetIplPropState(GTAOApartmentHi2.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOApartmentHi2.Strip.Enable({ GTAOApartmentHi2.Strip.A, GTAOApartmentHi2.Strip.B, - GTAOApartmentHi2.Strip.C + GTAOApartmentHi2.Strip.C, }, false) GTAOApartmentHi2.Booze.Enable({ GTAOApartmentHi2.Booze.A, GTAOApartmentHi2.Booze.B, - GTAOApartmentHi2.Booze.C + GTAOApartmentHi2.Booze.C, }, false) GTAOApartmentHi2.Smoke.Enable({ GTAOApartmentHi2.Smoke.A, GTAOApartmentHi2.Smoke.B, - GTAOApartmentHi2.Smoke.C + GTAOApartmentHi2.Smoke.C, }, false) RefreshInterior(GTAOApartmentHi2.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_1.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_1.lua index ee5b73ed1..0a5cce42b 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_1.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_1.lua @@ -1,6 +1,6 @@ -- 3655 Wild Oats Drive -- High end house 1: -169.286 486.4938 137.4436 -exports('GetGTAOHouseHi1Object', function() +exports("GetGTAOHouseHi1Object", function() return GTAOHouseHi1 end) @@ -14,7 +14,7 @@ GTAOHouseHi1 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi1.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOHouseHi1 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi1.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOHouseHi1 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi1.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOHouseHi1.Strip.Enable({ GTAOHouseHi1.Strip.A, GTAOHouseHi1.Strip.B, - GTAOHouseHi1.Strip.C + GTAOHouseHi1.Strip.C, }, false) GTAOHouseHi1.Booze.Enable({ GTAOHouseHi1.Booze.A, GTAOHouseHi1.Booze.B, - GTAOHouseHi1.Booze.C + GTAOHouseHi1.Booze.C, }, false) GTAOHouseHi1.Smoke.Enable({ GTAOHouseHi1.Smoke.A, GTAOHouseHi1.Smoke.B, - GTAOHouseHi1.Smoke.C + GTAOHouseHi1.Smoke.C, }, false) RefreshInterior(GTAOHouseHi1.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_2.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_2.lua index e1c9296b2..10154d889 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_2.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_2.lua @@ -1,6 +1,6 @@ -- 2044 North Conker Avenue -- High end house 2: 340.9412 437.1798 149.3925 -exports('GetGTAOHouseHi2Object', function() +exports("GetGTAOHouseHi2Object", function() return GTAOHouseHi2 end) @@ -14,16 +14,16 @@ GTAOHouseHi2 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi2.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", B = "Apart_Hi_Booze_B", C = "Apart_Hi_Booze_C", - + Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi2.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOHouseHi2 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi2.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOHouseHi2.Strip.Enable({ GTAOHouseHi2.Strip.A, GTAOHouseHi2.Strip.B, - GTAOHouseHi2.Strip.C + GTAOHouseHi2.Strip.C, }, false) GTAOHouseHi2.Booze.Enable({ GTAOHouseHi2.Booze.A, GTAOHouseHi2.Booze.B, - GTAOHouseHi2.Booze.C + GTAOHouseHi2.Booze.C, }, false) GTAOHouseHi2.Smoke.Enable({ GTAOHouseHi2.Smoke.A, GTAOHouseHi2.Smoke.B, - GTAOHouseHi2.Smoke.C + GTAOHouseHi2.Smoke.C, }, false) RefreshInterior(GTAOHouseHi2.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_3.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_3.lua index f8bec5ed1..6042cdbb9 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_3.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_3.lua @@ -1,6 +1,6 @@ -- 2045 North Conker Avenue -- High end house 3: 373.023 416.105 145.7006 -exports('GetGTAOHouseHi3Object', function() +exports("GetGTAOHouseHi3Object", function() return GTAOHouseHi3 end) @@ -14,7 +14,7 @@ GTAOHouseHi3 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi3.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOHouseHi3 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi3.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOHouseHi3 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi3.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOHouseHi3.Strip.Enable({ GTAOHouseHi3.Strip.A, GTAOHouseHi3.Strip.B, - GTAOHouseHi3.Strip.C + GTAOHouseHi3.Strip.C, }, false) GTAOHouseHi3.Booze.Enable({ GTAOHouseHi3.Booze.A, GTAOHouseHi3.Booze.B, - GTAOHouseHi3.Booze.C + GTAOHouseHi3.Booze.C, }, false) GTAOHouseHi3.Smoke.Enable({ GTAOHouseHi3.Smoke.A, GTAOHouseHi3.Smoke.B, - GTAOHouseHi3.Smoke.C + GTAOHouseHi3.Smoke.C, }, false) RefreshInterior(GTAOHouseHi3.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_4.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_4.lua index 6e3d02439..af76c0a14 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_4.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_4.lua @@ -1,6 +1,6 @@ -- 2862 Hillcrest Avenue -- High end house 4: -676.127 588.612 145.1698 -exports('GetGTAOHouseHi4Object', function() +exports("GetGTAOHouseHi4Object", function() return GTAOHouseHi4 end) @@ -14,7 +14,7 @@ GTAOHouseHi4 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi4.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOHouseHi4 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi4.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOHouseHi4 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi4.interiorId, details, state, refresh) - end + end, }, - + LoadDefault = function() GTAOHouseHi4.Strip.Enable({ GTAOHouseHi4.Strip.A, GTAOHouseHi4.Strip.B, - GTAOHouseHi4.Strip.C + GTAOHouseHi4.Strip.C, }, false) GTAOHouseHi4.Booze.Enable({ GTAOHouseHi4.Booze.A, GTAOHouseHi4.Booze.B, - GTAOHouseHi4.Booze.C + GTAOHouseHi4.Booze.C, }, false) GTAOHouseHi4.Smoke.Enable({ GTAOHouseHi4.Smoke.A, GTAOHouseHi4.Smoke.B, - GTAOHouseHi4.Smoke.C + GTAOHouseHi4.Smoke.C, }, false) RefreshInterior(GTAOHouseHi4.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_5.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_5.lua index 1d5f425e6..1643143b9 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_5.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_5.lua @@ -1,6 +1,6 @@ -- 2868 Hillcrest Avenue -- High end house 5: -763.107 615.906 144.1401 -exports('GetGTAOHouseHi5Object', function() +exports("GetGTAOHouseHi5Object", function() return GTAOHouseHi5 end) @@ -14,7 +14,7 @@ GTAOHouseHi5 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi5.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOHouseHi5 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi5.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOHouseHi5 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi5.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOHouseHi5.Strip.Enable({ GTAOHouseHi5.Strip.A, GTAOHouseHi5.Strip.B, - GTAOHouseHi5.Strip.C + GTAOHouseHi5.Strip.C, }, false) GTAOHouseHi5.Booze.Enable({ GTAOHouseHi5.Booze.A, GTAOHouseHi5.Booze.B, - GTAOHouseHi5.Booze.C + GTAOHouseHi5.Booze.C, }, false) GTAOHouseHi5.Smoke.Enable({ GTAOHouseHi5.Smoke.A, GTAOHouseHi5.Smoke.B, - GTAOHouseHi5.Smoke.C + GTAOHouseHi5.Smoke.C, }, false) RefreshInterior(GTAOHouseHi5.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_6.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_6.lua index 12433111d..f7e3729b8 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_6.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_6.lua @@ -1,6 +1,6 @@ -- 2874 Hillcrest Avenue -- High end house 6: -857.798 682.563 152.6529 -exports('GetGTAOHouseHi6Object', function() +exports("GetGTAOHouseHi6Object", function() return GTAOHouseHi6 end) @@ -14,7 +14,7 @@ GTAOHouseHi6 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi6.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOHouseHi6 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi6.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOHouseHi6 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi6.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOHouseHi6.Strip.Enable({ GTAOHouseHi6.Strip.A, GTAOHouseHi6.Strip.B, - GTAOHouseHi6.Strip.C + GTAOHouseHi6.Strip.C, }, false) GTAOHouseHi6.Booze.Enable({ GTAOHouseHi6.Booze.A, GTAOHouseHi6.Booze.B, - GTAOHouseHi6.Booze.C + GTAOHouseHi6.Booze.C, }, false) GTAOHouseHi6.Smoke.Enable({ GTAOHouseHi6.Smoke.A, GTAOHouseHi6.Smoke.B, - GTAOHouseHi6.Smoke.C + GTAOHouseHi6.Smoke.C, }, false) RefreshInterior(GTAOHouseHi6.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_7.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_7.lua index 8f50a34d8..e90f713d2 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_7.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_7.lua @@ -1,6 +1,6 @@ -- 2677 Whispymound Drive -- High end house 7: 120.5 549.952 184.097 -exports('GetGTAOHouseHi7Object', function() +exports("GetGTAOHouseHi7Object", function() return GTAOHouseHi7 end) @@ -14,7 +14,7 @@ GTAOHouseHi7 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi7.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOHouseHi7 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi7.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOHouseHi7 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi7.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOHouseHi7.Strip.Enable({ GTAOHouseHi7.Strip.A, GTAOHouseHi7.Strip.B, - GTAOHouseHi7.Strip.C + GTAOHouseHi7.Strip.C, }, false) GTAOHouseHi7.Booze.Enable({ GTAOHouseHi7.Booze.A, GTAOHouseHi7.Booze.B, - GTAOHouseHi7.Booze.C + GTAOHouseHi7.Booze.C, }, false) GTAOHouseHi7.Smoke.Enable({ GTAOHouseHi7.Smoke.A, GTAOHouseHi7.Smoke.B, - GTAOHouseHi7.Smoke.C + GTAOHouseHi7.Smoke.C, }, false) RefreshInterior(GTAOHouseHi7.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_8.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_8.lua index d83072685..cc11a5d89 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_8.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_hi_8.lua @@ -1,6 +1,6 @@ -- 2133 Mad Wayne Thunder -- High end house 8: -1288 440.748 97.69459 -exports('GetGTAOHouseHi8Object', function() +exports("GetGTAOHouseHi8Object", function() return GTAOHouseHi8 end) @@ -14,7 +14,7 @@ GTAOHouseHi8 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi8.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Hi_Booze_A", @@ -23,7 +23,7 @@ GTAOHouseHi8 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi8.interiorId, details, state, refresh) - end + end, }, Smoke = { A = "Apart_Hi_Smokes_A", @@ -32,26 +32,26 @@ GTAOHouseHi8 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi8.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() GTAOHouseHi8.Strip.Enable({ GTAOHouseHi8.Strip.A, GTAOHouseHi8.Strip.B, - GTAOHouseHi8.Strip.C + GTAOHouseHi8.Strip.C, }, false) GTAOHouseHi8.Booze.Enable({ GTAOHouseHi8.Booze.A, GTAOHouseHi8.Booze.B, - GTAOHouseHi8.Booze.C + GTAOHouseHi8.Booze.C, }, false) GTAOHouseHi8.Smoke.Enable({ GTAOHouseHi8.Smoke.A, GTAOHouseHi8.Smoke.B, - GTAOHouseHi8.Smoke.C + GTAOHouseHi8.Smoke.C, }, false) RefreshInterior(GTAOHouseHi8.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_low_1.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_low_1.lua index 4cf81657f..233fe3465 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_low_1.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_low_1.lua @@ -1,54 +1,63 @@ -- Low end house 1: 261.4586 -998.8196 -99.00863 -exports('GetGTAOHouseLow1Object', function() +exports("GetGTAOHouseLow1Object", function() return GTAOHouseLow1 end) GTAOHouseLow1 = { interiorId = 149761, Strip = { - A = "Studio_Lo_Strip_A", B = "Studio_Lo_Strip_B", C = "Studio_Lo_Strip_C", + A = "Studio_Lo_Strip_A", + B = "Studio_Lo_Strip_B", + C = "Studio_Lo_Strip_C", Enable = function(details, state, refresh) SetIplPropState(GTAOHouseLow1.interiorId, details, state, refresh) - end + end, }, Booze = { - A = "Studio_Lo_Booze_A", B = "Studio_Lo_Booze_B", C = "Studio_Lo_Booze_C", + A = "Studio_Lo_Booze_A", + B = "Studio_Lo_Booze_B", + C = "Studio_Lo_Booze_C", Enable = function(details, state, refresh) SetIplPropState(GTAOHouseLow1.interiorId, details, state, refresh) - end + end, }, Smoke = { - none = "", stage1 = "Studio_Lo_Smoke_A", stage2 = "Studio_Lo_Smoke_B", stage3 = "Studio_Lo_Smoke_C", + none = "", + stage1 = "Studio_Lo_Smoke_A", + stage2 = "Studio_Lo_Smoke_B", + stage3 = "Studio_Lo_Smoke_C", Set = function(smoke, refresh) GTAOHouseLow1.Smoke.Clear(false) if smoke ~= nil then SetIplPropState(GTAOHouseLow1.interiorId, smoke, true, refresh) else - if refresh then RefreshInterior(GTAOHouseLow1.interiorId) end + if refresh then + RefreshInterior(GTAOHouseLow1.interiorId) + end end end, Clear = function(refresh) SetIplPropState(GTAOHouseLow1.interiorId, { GTAOHouseLow1.Smoke.stage1, GTAOHouseLow1.Smoke.stage2, - GTAOHouseLow1.Smoke.stage3 + GTAOHouseLow1.Smoke.stage3, }, false, refresh) - end + end, }, LoadDefault = function() GTAOHouseLow1.Strip.Enable({ GTAOHouseLow1.Strip.A, GTAOHouseLow1.Strip.B, - GTAOHouseLow1.Strip.C + GTAOHouseLow1.Strip.C, }, false) GTAOHouseLow1.Booze.Enable({ GTAOHouseLow1.Booze.A, GTAOHouseLow1.Booze.B, - GTAOHouseLow1.Booze.C + GTAOHouseLow1.Booze.C, }, false) GTAOHouseLow1.Smoke.Set(GTAOHouseLow1.Smoke.none) RefreshInterior(GTAOHouseLow1.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gta_online/house_mid_1.lua b/server-data/resources/[maps]/bob74_ipl/gta_online/house_mid_1.lua index adfd3a268..9233144e1 100644 --- a/server-data/resources/[maps]/bob74_ipl/gta_online/house_mid_1.lua +++ b/server-data/resources/[maps]/bob74_ipl/gta_online/house_mid_1.lua @@ -1,5 +1,5 @@ -- Middle end house 1: 347.2686 -999.2955 -99.19622 -exports('GetGTAOHouseMid1Object', function() +exports("GetGTAOHouseMid1Object", function() return GTAOHouseMid1 end) @@ -13,7 +13,7 @@ GTAOHouseMid1 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseMid1.interiorId, details, state, refresh) - end + end, }, Booze = { A = "Apart_Mid_Booze_A", @@ -22,7 +22,7 @@ GTAOHouseMid1 = { Enable = function(details, state, refresh) SetIplPropState(GTAOHouseMid1.interiorId, details, state, refresh) - end + end, }, Smoke = { none = "", @@ -45,24 +45,24 @@ GTAOHouseMid1 = { SetIplPropState(GTAOHouseMid1.interiorId, { GTAOHouseMid1.Smoke.stage1, GTAOHouseMid1.Smoke.stage2, - GTAOHouseMid1.Smoke.stage3 + GTAOHouseMid1.Smoke.stage3, }, false, refresh) - end + end, }, LoadDefault = function() GTAOHouseMid1.Strip.Enable({ GTAOHouseMid1.Strip.A, GTAOHouseMid1.Strip.B, - GTAOHouseMid1.Strip.C + GTAOHouseMid1.Strip.C, }, false) GTAOHouseMid1.Booze.Enable({ GTAOHouseMid1.Booze.A, GTAOHouseMid1.Booze.B, - GTAOHouseMid1.Booze.C + GTAOHouseMid1.Booze.C, }, false) GTAOHouseMid1.Smoke.Set(GTAOHouseMid1.Smoke.none) RefreshInterior(GTAOHouseMid1.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/ammunations.lua b/server-data/resources/[maps]/bob74_ipl/gtav/ammunations.lua index a74688460..b964b52e5 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/ammunations.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/ammunations.lua @@ -1,4 +1,4 @@ -exports('GetAmmunationsObject', function() +exports("GetAmmunationsObject", function() return Ammunations end) @@ -12,11 +12,11 @@ Ammunations = { 175617, -- -1116.0, 2694.1, 18.6 200961, -- 1695.2, 3756.0, 34.7 180481, -- -328.7, 6079.0, 31.5 - 178689 -- 2569.8, 297.8, 108.7 + 178689, -- 2569.8, 297.8, 108.7 }, gunclubsId = { - 137729, -- 19.1, -1110.0, 29.8 - 248065 -- 811.0, -2152.0, 29.6 + 137729, -- 19.1, -1110.0, 29.8 + 248065, -- 811.0, -2152.0, 29.6 }, Details = { @@ -29,11 +29,11 @@ Ammunations = { elseif details == Ammunations.Details.hooksClub then SetIplPropState(Ammunations.gunclubsId, details, state, refresh) end - end + end, }, LoadDefault = function() Ammunations.Details.Enable(Ammunations.Details.hooks, true, true) Ammunations.Details.Enable(Ammunations.Details.hooksClub, true, true) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/bahama.lua b/server-data/resources/[maps]/bob74_ipl/gtav/bahama.lua index a9a463835..e5681a31b 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/bahama.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/bahama.lua @@ -1,5 +1,5 @@ -- Bahama Mamas: -1388.0013, -618.41967, 30.819599 -exports('GetBahamaMamasObject', function() +exports("GetBahamaMamasObject", function() return BahamaMamas end) @@ -8,5 +8,5 @@ BahamaMamas = { Enable = function(state) EnableIpl(BahamaMamas.ipl, state) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/base.lua b/server-data/resources/[maps]/bob74_ipl/gtav/base.lua index 722cd2045..368e17fe4 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/base.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/base.lua @@ -32,9 +32,9 @@ Citizen.CreateThread(function() RequestIpl("atriumglmission") -- FIB Fountain 174.184, -667.902, 43.140 - RemoveIpl('dt1_05_hc_end') - RemoveIpl('dt1_05_hc_req') - RequestIpl('dt1_05_hc_remove') + RemoveIpl("dt1_05_hc_end") + RemoveIpl("dt1_05_hc_req") + RequestIpl("dt1_05_hc_remove") -- Billboard: iFruit RequestIpl("FruitBB") diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/floyd.lua b/server-data/resources/[maps]/bob74_ipl/gtav/floyd.lua index 7b85e266e..8ce775ed4 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/floyd.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/floyd.lua @@ -1,4 +1,4 @@ -exports('GetFloydObject', function() +exports("GetFloydObject", function() return Floyd end) @@ -10,7 +10,7 @@ Floyd = { "swap_clean_apt", "layer_debra_pic", "layer_whiskey", - "swap_sofa_A" + "swap_sofa_A", }, messedUp = { "layer_mess_A", @@ -20,7 +20,7 @@ Floyd = { "swap_sofa_B", "swap_wade_sofa_A", "layer_wade_shit", - "layer_torture" + "layer_torture", }, Set = function(style, refresh) @@ -31,9 +31,9 @@ Floyd = { Clear = function(refresh) SetIplPropState(Floyd.interiorId, { Floyd.Style.normal, - Floyd.Style.messedUp + Floyd.Style.messedUp, }, false, refresh) - end + end, }, MrJam = { normal = "swap_mrJam_A", @@ -49,9 +49,9 @@ Floyd = { SetIplPropState(Floyd.interiorId, { Floyd.MrJam.normal, Floyd.MrJam.jammed, - Floyd.MrJam.jammedOnTable + Floyd.MrJam.jammedOnTable, }, false, refresh) - end + end, }, LoadDefault = function() @@ -59,5 +59,5 @@ Floyd = { Floyd.MrJam.Set(Floyd.MrJam.normal) RefreshInterior(Floyd.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/franklin.lua b/server-data/resources/[maps]/bob74_ipl/gtav/franklin.lua index e8794e70c..6630d64c7 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/franklin.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/franklin.lua @@ -1,4 +1,4 @@ -exports('GetFranklinObject', function() +exports("GetFranklinObject", function() return Franklin end) @@ -10,7 +10,7 @@ Franklin = { unpacking = "franklin_unpacking", settled = { "franklin_unpacking", - "franklin_settled" + "franklin_settled", }, cardboxes = "showhome_only", @@ -29,9 +29,9 @@ Franklin = { SetIplPropState(Franklin.interiorId, { Franklin.Style.settled, Franklin.Style.unpacking, - Franklin.Style.cardboxes + Franklin.Style.cardboxes, }, false, refresh) - end + end, }, GlassDoor = { opened = "unlocked", @@ -45,9 +45,9 @@ Franklin = { Clear = function(refresh) SetIplPropState(Franklin.interiorId, { Franklin.GlassDoor.opened, - Franklin.GlassDoor.closed + Franklin.GlassDoor.closed, }, false, refresh) - end + end, }, Details = { flyer = "progress_flyer", -- Mountain flyer on the kitchen counter @@ -57,7 +57,7 @@ Franklin = { Enable = function(details, state, refresh) SetIplPropState(Franklin.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -69,5 +69,5 @@ Franklin = { Franklin.Details.Enable(Franklin.Details.bong, false) RefreshInterior(Franklin.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/franklin_aunt.lua b/server-data/resources/[maps]/bob74_ipl/gtav/franklin_aunt.lua index b0ba2c73e..869048bf1 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/franklin_aunt.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/franklin_aunt.lua @@ -1,4 +1,4 @@ -exports('GetFranklinAuntObject', function() +exports("GetFranklinAuntObject", function() return FranklinAunt end) @@ -24,9 +24,9 @@ FranklinAunt = { Clear = function(refresh) SetIplPropState(FranklinAunt.interiorId, { FranklinAunt.Style.franklinStuff, - FranklinAunt.Style.franklinLeft + FranklinAunt.Style.franklinLeft, }, false, refresh) - end + end, }, Details = { bandana = "V_57_GangBandana", -- Bandana on the bed @@ -34,7 +34,7 @@ FranklinAunt = { Enable = function(details, state, refresh) SetIplPropState(FranklinAunt.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -43,5 +43,5 @@ FranklinAunt = { FranklinAunt.Details.Enable(FranklinAunt.Details.bag, false) RefreshInterior(FranklinAunt.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/graffitis.lua b/server-data/resources/[maps]/bob74_ipl/gtav/graffitis.lua index be34afae9..a7d87c4f4 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/graffitis.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/graffitis.lua @@ -1,4 +1,4 @@ -exports('GetGraffitisObject', function() +exports("GetGraffitisObject", function() return Graffitis end) @@ -6,9 +6,9 @@ Graffitis = { ipl = { "ch3_rd2_bishopschickengraffiti", -- 1861.28, 2402.11, 58.53 "cs5_04_mazebillboardgraffiti", -- 2697.32, 3162.18, 58.1 - "cs5_roads_ronoilgraffiti" -- 2119.12, 3058.21, 53.25 + "cs5_roads_ronoilgraffiti", -- 2119.12, 3058.21, 53.25 }, Enable = function(state) EnableIpl(Graffitis.ipl, state) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/lester_factory.lua b/server-data/resources/[maps]/bob74_ipl/gtav/lester_factory.lua index 399e255f6..995b9b59d 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/lester_factory.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/lester_factory.lua @@ -1,4 +1,4 @@ -exports('GetLesterFactoryObject', function() +exports("GetLesterFactoryObject", function() return LesterFactory end) @@ -15,7 +15,7 @@ LesterFactory = { Enable = function(details, state, refresh) SetIplPropState(LesterFactory.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -27,5 +27,5 @@ LesterFactory = { LesterFactory.Details.Enable(LesterFactory.Details.janitorStuff, false) RefreshInterior(LesterFactory.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/michael.lua b/server-data/resources/[maps]/bob74_ipl/gtav/michael.lua index cb54d3098..63249580e 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/michael.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/michael.lua @@ -1,4 +1,4 @@ -exports('GetMichaelObject', function() +exports("GetMichaelObject", function() return Michael end) @@ -12,7 +12,7 @@ Michael = { "V_Michael_M_items", "V_Michael_D_items", "V_Michael_S_items", - "V_Michael_L_Items" + "V_Michael_L_Items", }, moved = { "V_Michael_bed_Messy", @@ -20,7 +20,7 @@ Michael = { "V_Michael_D_Moved", "V_Michael_L_Moved", "V_Michael_S_items_swap", - "V_Michael_M_items_swap" + "V_Michael_M_items_swap", }, Set = function(style, refresh) @@ -31,9 +31,9 @@ Michael = { Clear = function(refresh) SetIplPropState(Michael.interiorId, { Michael.Style.normal, - Michael.Style.moved + Michael.Style.moved, }, false, refresh) - end + end, }, Bed = { tidy = "V_Michael_bed_tidy", @@ -47,16 +47,16 @@ Michael = { Clear = function(refresh) SetIplPropState(Michael.interiorId, { Michael.Bed.tidy, - Michael.Bed.messy + Michael.Bed.messy, }, false, refresh) - end + end, }, Garage = { scuba = "V_Michael_Scuba", -- Scuba diver gear Enable = function(scuba, state, refresh) SetIplPropState(Michael.garageId, scuba, state, refresh) - end + end, }, Details = { moviePoster = "Michael_premier", -- Meltdown movie poster @@ -67,7 +67,7 @@ Michael = { Enable = function(details, state, refresh) SetIplPropState(Michael.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -81,5 +81,5 @@ Michael = { Michael.Details.Enable(Michael.Details.bugershot, false) RefreshInterior(Michael.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/north_yankton.lua b/server-data/resources/[maps]/bob74_ipl/gtav/north_yankton.lua index 6def102f6..49fb290a1 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/north_yankton.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/north_yankton.lua @@ -1,4 +1,4 @@ -exports('GetNorthYanktonObject', function() +exports("GetNorthYanktonObject", function() return NorthYankton end) @@ -29,10 +29,10 @@ NorthYankton = { "prologuerdb", "prologue_DistantLights", "prologue_LODLights", - "prologue_m2_door" + "prologue_m2_door", }, Enable = function(state) EnableIpl(NorthYankton.ipl, state) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/pillbox_hospital.lua b/server-data/resources/[maps]/bob74_ipl/gtav/pillbox_hospital.lua index ed8bfc0b0..54ac7d9f1 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/pillbox_hospital.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/pillbox_hospital.lua @@ -1,5 +1,5 @@ -- Pillbox hospital: 307.1680, -590.807, 43.280 -exports('GetPillboxHospitalObject', function() +exports("GetPillboxHospitalObject", function() return PillboxHospital end) @@ -8,5 +8,5 @@ PillboxHospital = { Enable = function(state) EnableIpl(PillboxHospital.ipl, state) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/red_carpet.lua b/server-data/resources/[maps]/bob74_ipl/gtav/red_carpet.lua index 53ec831bd..f3dd8d7be 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/red_carpet.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/red_carpet.lua @@ -1,4 +1,4 @@ -exports('GetRedCarpetObject', function() +exports("GetRedCarpetObject", function() return RedCarpet end) @@ -7,5 +7,5 @@ RedCarpet = { Enable = function(state) EnableIpl(RedCarpet.ipl, state) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/simeon.lua b/server-data/resources/[maps]/bob74_ipl/gtav/simeon.lua index 031357341..c5ce60452 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/simeon.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/simeon.lua @@ -1,4 +1,4 @@ -exports('GetSimeonObject', function() +exports("GetSimeonObject", function() return Simeon end) @@ -8,7 +8,7 @@ Simeon = { Ipl = { Interior = { ipl = { - "shr_int" + "shr_int", }, Load = function() @@ -16,8 +16,8 @@ Simeon = { end, Remove = function() EnableIpl(Simeon.Ipl.Interior.ipl, false) - end - } + end, + }, }, Style = { normal = "csr_beforeMission", @@ -35,9 +35,9 @@ Simeon = { Simeon.Style.normal, Simeon.Style.noGlass, Simeon.Style.destroyed, - Simeon.Style.fixed + Simeon.Style.fixed, }, false, refresh) - end + end, }, Shutter = { none = "", @@ -58,9 +58,9 @@ Simeon = { Clear = function(refresh) SetIplPropState(Simeon.interiorId, { Simeon.Shutter.opened, - Simeon.Shutter.closed + Simeon.Shutter.closed, }, false, refresh) - end + end, }, LoadDefault = function() @@ -69,5 +69,5 @@ Simeon = { Simeon.Shutter.Set(Simeon.Shutter.opened) RefreshInterior(Simeon.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/stripclub.lua b/server-data/resources/[maps]/bob74_ipl/gtav/stripclub.lua index 87606c88e..53a7c2af2 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/stripclub.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/stripclub.lua @@ -1,4 +1,4 @@ -exports('GetStripClubObject', function() +exports("GetStripClubObject", function() return StripClub end) @@ -9,10 +9,10 @@ StripClub = { mess = "V_19_Trevor_Mess", -- A bit of mess in the office Enable = function(state) SetIplPropState(StripClub.interiorId, StripClub.Mess.mess, state, true) - end + end, }, LoadDefault = function() StripClub.Mess.Enable(false) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/trevors_trailer.lua b/server-data/resources/[maps]/bob74_ipl/gtav/trevors_trailer.lua index e8a22beb1..5300e46d0 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/trevors_trailer.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/trevors_trailer.lua @@ -1,4 +1,4 @@ -exports('GetTrevorsTrailerObject', function() +exports("GetTrevorsTrailerObject", function() return TrevorsTrailer end) @@ -17,9 +17,9 @@ TrevorsTrailer = { Clear = function() EnableIpl({ TrevorsTrailer.Interior.tidy, - TrevorsTrailer.Interior.trash + TrevorsTrailer.Interior.trash, }, false) - end + end, }, Details = { copHelmet = "V_26_Trevor_Helmet3", -- Cop helmet in the closet @@ -28,7 +28,7 @@ TrevorsTrailer = { Enable = function(details, state, refresh) SetIplPropState(TrevorsTrailer.interiorId, details, state, refresh) - end + end, }, LoadDefault = function() @@ -38,5 +38,5 @@ TrevorsTrailer = { TrevorsTrailer.Details.Enable(TrevorsTrailer.Details.michaelStuff, false, false) RefreshInterior(TrevorsTrailer.interiorId) - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/ufo.lua b/server-data/resources/[maps]/bob74_ipl/gtav/ufo.lua index 776b6fee0..95fdc571a 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/ufo.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/ufo.lua @@ -1,4 +1,4 @@ -exports('GetUFOObject', function() +exports("GetUFOObject", function() return UFO end) @@ -8,20 +8,20 @@ UFO = { Enable = function(state) EnableIpl(UFO.Hippie.ipl, state) - end + end, }, Chiliad = { ipl = "ufo_eye", -- Chiliad: 501.5288, 5593.865, 796.2325 Enable = function(state) EnableIpl(UFO.Chiliad.ipl, state) - end + end, }, Zancudo = { ipl = "ufo_lod", -- Zancudo: -2051.99463, 3237.05835, 1456.97021 Enable = function(state) EnableIpl(UFO.Zancudo.ipl, state) - end - } + end, + }, } diff --git a/server-data/resources/[maps]/bob74_ipl/gtav/zancudo_gates.lua b/server-data/resources/[maps]/bob74_ipl/gtav/zancudo_gates.lua index cbd3da7a1..5c698fad1 100644 --- a/server-data/resources/[maps]/bob74_ipl/gtav/zancudo_gates.lua +++ b/server-data/resources/[maps]/bob74_ipl/gtav/zancudo_gates.lua @@ -1,5 +1,5 @@ -- Zancudo Gates (GTAO like): -1600.30100000 2806.73100000 18.79683000 -exports('GetZancudoGatesObject', function() +exports("GetZancudoGatesObject", function() return ZancudoGates end) @@ -15,5 +15,5 @@ ZancudoGates = { LoadDefault = function() ZancudoGates.Gates.Open() - end + end, } diff --git a/server-data/resources/[maps]/bob74_ipl/lib/observers/officeSafeDoorHandler.lua b/server-data/resources/[maps]/bob74_ipl/lib/observers/officeSafeDoorHandler.lua index 183d4d220..53af9ad86 100644 --- a/server-data/resources/[maps]/bob74_ipl/lib/observers/officeSafeDoorHandler.lua +++ b/server-data/resources/[maps]/bob74_ipl/lib/observers/officeSafeDoorHandler.lua @@ -45,4 +45,4 @@ CreateThread(function() Wait(_scanDelay) end -end) \ No newline at end of file +end) From e7518d7816e04466ae4c1cf93d3736227cf87b0c Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:09:22 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/[sqz]/sqz_rental/client.lua | 141 ++- .../resources/[sqz]/sqz_rental/config.lua | 90 +- .../resources/[sqz]/sqz_rental/fxmanifest.lua | 30 +- .../resources/[sqz]/sqz_rental/server.lua | 55 +- .../resources/[sqz]/sqz_rental/warmenu.lua | 863 +++++++++--------- 5 files changed, 597 insertions(+), 582 deletions(-) diff --git a/server-data/resources/[sqz]/sqz_rental/client.lua b/server-data/resources/[sqz]/sqz_rental/client.lua index f5c20c947..651689eac 100644 --- a/server-data/resources/[sqz]/sqz_rental/client.lua +++ b/server-data/resources/[sqz]/sqz_rental/client.lua @@ -2,8 +2,8 @@ local rentalTimer = 0 local lastLocalVehicle CreateThread(function() - AddTextEntry('carRental', 'Vehicle Rental') - AddTextEntry('carRentalClose', '~INPUT_PICKUP~ Vehicle Rental') + AddTextEntry("carRental", "Vehicle Rental") + AddTextEntry("carRentalClose", "~INPUT_PICKUP~ Vehicle Rental") while true do Wait(0) local letSleep = true @@ -13,7 +13,7 @@ CreateThread(function() local dist = #(pedCoords - v.Pos) if dist < 1.5 and not IsPedInAnyVehicle(PlayerPedId()) then letSleep = false - BeginTextCommandDisplayHelp('carRentalClose') + BeginTextCommandDisplayHelp("carRentalClose") EndTextCommandDisplayHelp(1, 0, 0, 0) SetFloatingHelpTextWorldPosition(0, v.Pos) @@ -23,7 +23,7 @@ CreateThread(function() end elseif dist < 5 and not IsPedInAnyVehicle(PlayerPedId()) then letSleep = false - BeginTextCommandDisplayHelp('carRental') + BeginTextCommandDisplayHelp("carRental") EndTextCommandDisplayHelp(1, 0, 0, 0) SetFloatingHelpTextWorldPosition(0, v.Pos) end @@ -38,16 +38,15 @@ CreateThread(function() end end) -WarMenu.CreateMenu('carRental', 'Vehicle Rental') +WarMenu.CreateMenu("carRental", "Vehicle Rental") function OpenCarRental(index) - WarMenu.OpenMenu('carRental') + WarMenu.OpenMenu("carRental") local price = 0 local vehicleIndex = 1 local rentalTimeIndex = 1 local vehiclesToRent = {} - for k, v in pairs(Config.Points[index].Vehicles) do table.insert(vehiclesToRent, v.model) end @@ -56,9 +55,8 @@ function OpenCarRental(index) while true do Wait(0) - if WarMenu.Begin('carRental') then - - local _, vehicleId = WarMenu.ComboBox('Select Vehicle', vehiclesToRent, vehicleIndex) + if WarMenu.Begin("carRental") then + local _, vehicleId = WarMenu.ComboBox("Select Vehicle", vehiclesToRent, vehicleIndex) if vehicleIndex ~= vehicleId then vehicleIndex = vehicleId if DoesEntityExist(lastLocalVehicle) then @@ -71,17 +69,17 @@ function OpenCarRental(index) SpawnLocalVehicle(vehiclesToRent[vehicleId], Config.Points[index].SpawnPoint) end - local _, totalTime = WarMenu.ComboBox('Vehicle Rental Time', Config.RentalTimes, rentalTimeIndex) + local _, totalTime = WarMenu.ComboBox("Vehicle Rental Time", Config.RentalTimes, rentalTimeIndex) if rentalTimeIndex ~= totalTime then rentalTimeIndex = totalTime end - if WarMenu.CheckBox('Insurance - '..Config.InsurancePrice..'$', insurance) then + if WarMenu.CheckBox("Insurance - " .. Config.InsurancePrice .. "$", insurance) then insurance = not insurance end if WarMenu.IsItemHovered() then - WarMenu.ToolTip('In case you damage the car, you will pay no additional fees') + WarMenu.ToolTip("In case you damage the car, you will pay no additional fees") end price = Config.Points[index].Vehicles[vehicleIndex].price @@ -90,7 +88,7 @@ function OpenCarRental(index) price = price + Config.InsurancePrice end - if WarMenu.Button('Rent Vehicle', price..'$') then + if WarMenu.Button("Rent Vehicle", price .. "$") then if DoesEntityExist(lastLocalVehicle) then DeleteEntity(lastLocalVehicle) lastLocalVehicle = nil @@ -98,11 +96,10 @@ function OpenCarRental(index) SetEntityInvincible(PlayerPedId(), false) SetEntityCoords(PlayerPedId(), Config.Points[index].Pos) end - TriggerServerEvent('sqz_carrental:RentVehicle', vehiclesToRent[vehicleId], insurance, price, Config.RentalTimes[rentalTimeIndex], index) + TriggerServerEvent("sqz_carrental:RentVehicle", vehiclesToRent[vehicleId], insurance, price, Config.RentalTimes[rentalTimeIndex], index) return end - WarMenu.End() else if DoesEntityExist(lastLocalVehicle) then @@ -115,12 +112,11 @@ function OpenCarRental(index) return end end - end function SpawnLocalVehicle(model, coords) model = GetHashKey(model) - + RequestModel(model) while not HasModelLoaded(model) do Wait(0) @@ -139,48 +135,44 @@ function SpawnLocalVehicle(model, coords) end CreateThread(function() - for k, v in pairs(Config.Points) do local blip = AddBlipForCoord(v.Pos) - SetBlipSprite (blip, 147) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 0.8) - SetBlipColour (blip, 24) - SetBlipAsShortRange(blip, true) + SetBlipSprite(blip, 147) + SetBlipDisplay(blip, 4) + SetBlipScale(blip, 0.8) + SetBlipColour(blip, 24) + SetBlipAsShortRange(blip, true) SetBlipHighDetail(blip, true) - BeginTextCommandSetBlipName('STRING') - AddTextComponentSubstringPlayerName('Vehicle Rental') - EndTextCommandSetBlipName(blip) + BeginTextCommandSetBlipName("STRING") + AddTextComponentSubstringPlayerName("Vehicle Rental") + EndTextCommandSetBlipName(blip) end - end) local returnBlips = {} function createReturnBlips() - for k, v in pairs(Config.ReturnPoints) do local blip = AddBlipForCoord(v) - SetBlipSprite (blip, 527) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 0.8) - SetBlipColour (blip, 65) - SetBlipAsShortRange(blip, true) + SetBlipSprite(blip, 527) + SetBlipDisplay(blip, 4) + SetBlipScale(blip, 0.8) + SetBlipColour(blip, 65) + SetBlipAsShortRange(blip, true) SetBlipHighDetail(blip, true) - BeginTextCommandSetBlipName('STRING') - AddTextComponentSubstringPlayerName('Vehicle Return Point') - EndTextCommandSetBlipName(blip) + BeginTextCommandSetBlipName("STRING") + AddTextComponentSubstringPlayerName("Vehicle Return Point") + EndTextCommandSetBlipName(blip) table.insert(returnBlips, blip) end - end -RegisterNetEvent('sqz_carrental:SpawnVehicle') -AddEventHandler('sqz_carrental:SpawnVehicle', function(model, insurance, price, time, rentalIndex) +RegisterNetEvent("sqz_carrental:SpawnVehicle") +AddEventHandler("sqz_carrental:SpawnVehicle", function(model, insurance, price, time, rentalIndex) model = GetHashKey(model) RequestModel(model) @@ -199,7 +191,7 @@ AddEventHandler('sqz_carrental:SpawnVehicle', function(model, insurance, price, TaskWarpPedIntoVehicle(PlayerPedId(), vehicle, -1) - TriggerServerEvent('sqz_carrental:VehicleSpawned', GetVehicleNumberPlateText(vehicle), insurance, time, netId) + TriggerServerEvent("sqz_carrental:VehicleSpawned", GetVehicleNumberPlateText(vehicle), insurance, time, netId) rentalTimer = time * 60 @@ -209,20 +201,20 @@ AddEventHandler('sqz_carrental:SpawnVehicle', function(model, insurance, price, end) function disp_time(time) - local minutes = math.floor((time%3600/60)) - local seconds = math.floor((time%60)) - return string.format("%02dm %02ds",minutes,seconds) + local minutes = math.floor((time % 3600 / 60)) + local seconds = math.floor((time % 60)) + return string.format("%02dm %02ds", minutes, seconds) end function startTimer() CreateThread(function() CreateThread(function() - while rentalTimer>0 do - rentalTimer=rentalTimer-1 + while rentalTimer > 0 do + rentalTimer = rentalTimer - 1 Wait(1000) end end) - while rentalTimer>0 do + while rentalTimer > 0 do Wait(0) SetTextFont(4) SetTextScale(0.45, 0.45) @@ -231,16 +223,16 @@ function startTimer() SetTextEdge(1, 0, 0, 0, 255) SetTextDropShadow() SetTextOutline() - BeginTextCommandDisplayText('STRING') - AddTextComponentSubstringPlayerName(disp_time(rentalTimer).." - Rental Time Remaining") + BeginTextCommandDisplayText("STRING") + AddTextComponentSubstringPlayerName(disp_time(rentalTimer) .. " - Rental Time Remaining") EndTextCommandDisplayText(0.05, 0.55) end end) end CreateThread(function() - AddTextEntry('carReturn', 'Vehicle return point') - AddTextEntry('carReturnClose', '~INPUT_PICKUP~ Return Vehicle') + AddTextEntry("carReturn", "Vehicle return point") + AddTextEntry("carReturnClose", "~INPUT_PICKUP~ Return Vehicle") while true do Wait(0) if rentalTimer > 0 then @@ -250,17 +242,17 @@ CreateThread(function() local dist = #(v - pedCoords) if dist < 2.5 and IsPedInAnyVehicle(PlayerPedId()) then letSleep = false - BeginTextCommandDisplayHelp('carReturnClose') + BeginTextCommandDisplayHelp("carReturnClose") EndTextCommandDisplayHelp(1, 0, 0, 0) SetFloatingHelpTextWorldPosition(0, v) - + if IsControlJustPressed(0, 38) then ReturnVehicle() Wait(2000) end elseif dist < 10 and IsPedInAnyVehicle(PlayerPedId()) then letSleep = false - BeginTextCommandDisplayHelp('carReturn') + BeginTextCommandDisplayHelp("carReturn") EndTextCommandDisplayHelp(1, 0, 0, 0) SetFloatingHelpTextWorldPosition(0, v) end @@ -272,45 +264,42 @@ CreateThread(function() Wait(100) end end - end) function ReturnVehicle() - local vehicle = GetVehiclePedIsIn(PlayerPedId()) local health = (GetVehicleEngineHealth(vehicle) + GetVehicleBodyHealth(vehicle)) / 2 - TriggerServerEvent('sqz_carrental:ReturnVehicle', GetVehicleNumberPlateText(vehicle), health/1000) + TriggerServerEvent("sqz_carrental:ReturnVehicle", GetVehicleNumberPlateText(vehicle), health / 1000) end -RegisterNetEvent('sqz_carrental:VehicleSuccessfulyReturned') -AddEventHandler('sqz_carrental:VehicleSuccessfulyReturned', function() - +RegisterNetEvent("sqz_carrental:VehicleSuccessfulyReturned") +AddEventHandler("sqz_carrental:VehicleSuccessfulyReturned", function() rentalTimer = 0 local sec = 3 - local scaleform = RequestScaleformMovie('MP_BIG_MESSAGE_FREEMODE') + local scaleform = RequestScaleformMovie("MP_BIG_MESSAGE_FREEMODE") - for i=1, #returnBlips do + for i = 1, #returnBlips do if DoesBlipExist(returnBlips[i]) then RemoveBlip(returnBlips[i]) end end - while not HasScaleformMovieLoaded(scaleform) do - Wait(0) - end + while not HasScaleformMovieLoaded(scaleform) do + Wait(0) + end - BeginScaleformMovieMethod(scaleform, 'SHOW_SHARD_WASTED_MP_MESSAGE') - PushScaleformMovieMethodParameterString('Vehicle Rental') - PushScaleformMovieMethodParameterString('Vehicle has been successfuly returned') - EndScaleformMovieMethod() + BeginScaleformMovieMethod(scaleform, "SHOW_SHARD_WASTED_MP_MESSAGE") + PushScaleformMovieMethodParameterString("Vehicle Rental") + PushScaleformMovieMethodParameterString("Vehicle has been successfuly returned") + EndScaleformMovieMethod() - while sec > 0 do - Wait(1) - sec = sec - 0.01 + while sec > 0 do + Wait(1) + sec = sec - 0.01 - DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255) - end + DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255) + end - SetScaleformMovieAsNoLongerNeeded(scaleform) -end) \ No newline at end of file + SetScaleformMovieAsNoLongerNeeded(scaleform) +end) diff --git a/server-data/resources/[sqz]/sqz_rental/config.lua b/server-data/resources/[sqz]/sqz_rental/config.lua index c9f0f8404..c715d8b14 100644 --- a/server-data/resources/[sqz]/sqz_rental/config.lua +++ b/server-data/resources/[sqz]/sqz_rental/config.lua @@ -6,106 +6,112 @@ Config.ExtraChargePerMinute = 500 Config.Points = { { - Pos = vector3(-985.3989,-2707.436,13.8307), - SpawnPoint = vector3(-985.3989,-2707.436,13.8307), + Pos = vector3(-985.3989, -2707.436, 13.8307), + SpawnPoint = vector3(-985.3989, -2707.436, 13.8307), Vehicles = { { - model = 'issi2', + model = "issi2", price = 150, }, { - model = 'cogcabrio', + model = "cogcabrio", price = 250, }, { - model = 'bagger', + model = "bagger", price = 75, }, { - model = 'tribike3', + model = "tribike3", price = 25, - } - } + }, + }, }, { - Pos = vector3(211.2574,-1379.5165,30.5875), - SpawnPoint = vector3(219.0401,-1380.4989,30.5514), + Pos = vector3(211.2574, -1379.5165, 30.5875), + SpawnPoint = vector3(219.0401, -1380.4989, 30.5514), Vehicles = { { - model = 'issi2', + model = "issi2", price = 150, }, { - model = 'cogcabrio', + model = "cogcabrio", price = 250, }, { - model = 'bagger', + model = "bagger", price = 75, }, { - model = 'tribike3', + model = "tribike3", price = 25, - } - } + }, + }, }, { - Pos = vector3(-249.0248,-954.9617,31.22), - SpawnPoint = vector3(-258.9018,-993.5417,29.951), + Pos = vector3(-249.0248, -954.9617, 31.22), + SpawnPoint = vector3(-258.9018, -993.5417, 29.951), Vehicles = { { - model = 'issi2', + model = "issi2", price = 150, }, { - model = 'cogcabrio', + model = "cogcabrio", price = 250, }, { - model = 'bagger', + model = "bagger", price = 75, }, { - model = 'tribike3', + model = "tribike3", price = 25, - } - } + }, + }, }, { - Pos = vector3(1852.7104,2593.9482,45.672), - SpawnPoint = vector3(1867.6857,2599.4282,45.672), + Pos = vector3(1852.7104, 2593.9482, 45.672), + SpawnPoint = vector3(1867.6857, 2599.4282, 45.672), Vehicles = { { - model = 'issi2', + model = "issi2", price = 150, }, { - model = 'cogcabrio', + model = "cogcabrio", price = 250, }, { - model = 'bagger', + model = "bagger", price = 75, }, { - model = 'tribike3', + model = "tribike3", price = 25, - } - } + }, + }, }, } Config.ReturnPoints = { - vector3(1871.1001,2608.6328,45.672), - vector3(-263.0754,-990.73,30.457), - vector3(915.2678,-190.6824,73.2665), - vector3(242.7683,-1411.8146,30.5671), - vector3(366.9097,-952.8362,29.4442), - vector3(1855.3997,2625.0098,45.6678), - vector3(-290.9992,-127.1658,44.3788), - vector3(-1134.4578,-1585.7444,4.3294), + vector3(1871.1001, 2608.6328, 45.672), + vector3(-263.0754, -990.73, 30.457), + vector3(915.2678, -190.6824, 73.2665), + vector3(242.7683, -1411.8146, 30.5671), + vector3(366.9097, -952.8362, 29.4442), + vector3(1855.3997, 2625.0098, 45.6678), + vector3(-290.9992, -127.1658, 44.3788), + vector3(-1134.4578, -1585.7444, 4.3294), } Config.RentalTimes = { - '5 min', '10 min', '15 min', '20 min', '25 min', '30 min', '60 min' -} \ No newline at end of file + "5 min", + "10 min", + "15 min", + "20 min", + "25 min", + "30 min", + "60 min", +} diff --git a/server-data/resources/[sqz]/sqz_rental/fxmanifest.lua b/server-data/resources/[sqz]/sqz_rental/fxmanifest.lua index b792d0e73..df960a3e8 100644 --- a/server-data/resources/[sqz]/sqz_rental/fxmanifest.lua +++ b/server-data/resources/[sqz]/sqz_rental/fxmanifest.lua @@ -1,19 +1,19 @@ -fx_version 'cerulean' -game 'gta5' +fx_version("cerulean") +game("gta5") -author 'Squizer#3020' -description 'Script that allows you to borrow vehicles.' -version '1.0.0' +author("Squizer#3020") +description("Script that allows you to borrow vehicles.") +version("1.0.0") -shared_script '@es_extended/imports.lua' +shared_script("@es_extended/imports.lua") -client_scripts { - 'warmenu.lua', - 'config.lua', - 'client.lua' -} +client_scripts({ + "warmenu.lua", + "config.lua", + "client.lua", +}) -server_scripts { - 'config.lua', - 'server.lua' -} \ No newline at end of file +server_scripts({ + "config.lua", + "server.lua", +}) diff --git a/server-data/resources/[sqz]/sqz_rental/server.lua b/server-data/resources/[sqz]/sqz_rental/server.lua index 0e1b48310..050605147 100644 --- a/server-data/resources/[sqz]/sqz_rental/server.lua +++ b/server-data/resources/[sqz]/sqz_rental/server.lua @@ -1,29 +1,29 @@ local rentedVehicles = {} ESX = exports["es_extended"]:getSharedObject() -RegisterNetEvent('sqz_carrental:RentVehicle') -AddEventHandler('sqz_carrental:RentVehicle', function(model, insurance, price, time, rentalIndex) - time = time:gsub('min', '') - time = tonumber(time) +RegisterNetEvent("sqz_carrental:RentVehicle") +AddEventHandler("sqz_carrental:RentVehicle", function(model, insurance, price, time, rentalIndex) + time = time:gsub("min", "") + time = tonumber(time) local xPlayer = ESX.GetPlayerFromId(source) if xPlayer.getMoney() >= price + Config.DownPayment then xPlayer.removeMoney(price + Config.DownPayment) - xPlayer.showNotification('You have paid '..price..'$') - xPlayer.showNotification('You have paid '..Config.DownPayment..'$ as a down payment') - TriggerClientEvent('sqz_carrental:SpawnVehicle', source, model, insurance, price, time, rentalIndex) - elseif xPlayer.getAccount('bank').money >= price + Config.DownPayment then - xPlayer.removeAccountMoney('bank', price + Config.DownPayment) - xPlayer.showNotification('You have paid '..Config.DownPayment..'$ as a down payment from your bank account') - xPlayer.showNotification('You have paid '..price..'$ from your bank account') - TriggerClientEvent('sqz_carrental:SpawnVehicle', source, model, insurance, price, time, rentalIndex) + xPlayer.showNotification("You have paid " .. price .. "$") + xPlayer.showNotification("You have paid " .. Config.DownPayment .. "$ as a down payment") + TriggerClientEvent("sqz_carrental:SpawnVehicle", source, model, insurance, price, time, rentalIndex) + elseif xPlayer.getAccount("bank").money >= price + Config.DownPayment then + xPlayer.removeAccountMoney("bank", price + Config.DownPayment) + xPlayer.showNotification("You have paid " .. Config.DownPayment .. "$ as a down payment from your bank account") + xPlayer.showNotification("You have paid " .. price .. "$ from your bank account") + TriggerClientEvent("sqz_carrental:SpawnVehicle", source, model, insurance, price, time, rentalIndex) else - xPlayer.showNotification('You can not afford renting this vehicle') + xPlayer.showNotification("You can not afford renting this vehicle") end end) -RegisterNetEvent('sqz_carrental:VehicleSpawned') -AddEventHandler('sqz_carrental:VehicleSpawned', function(plate, insurance, time, netId) +RegisterNetEvent("sqz_carrental:VehicleSpawned") +AddEventHandler("sqz_carrental:VehicleSpawned", function(plate, insurance, time, netId) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) if not rentedVehicles[plate] then @@ -31,22 +31,21 @@ AddEventHandler('sqz_carrental:VehicleSpawned', function(plate, insurance, time, owner = xPlayer.identifier, insurance = insurance, netId = netId, - downPayment = Config.DownPayment + downPayment = Config.DownPayment, } SetTimeout(time * 60 * 1000 + 5000, function() local plate = GetVehicleNumberPlateText(NetworkGetEntityFromNetworkId(netId)) if rentedVehicles[plate] then if GetPlayerPing(rentedVehicles[plate].owner) > 5 then CreateThread(function() - while true do Wait(1000 * 60) if rentedVehicles[plate].downPayment >= Config.ExtraChargePerMinute then rentedVehicles[plate].downPayment = rentedVehicles[plate].downPayment - Config.ExtraChargePerMinute else if ESX.GetPlayerFromId(_source) then - xPlayer.showNotification('The deposit will not be refunded, because you have not returned the vehicle') - xPlayer.showNotification('The vehicle has been impounded') + xPlayer.showNotification("The deposit will not be refunded, because you have not returned the vehicle") + xPlayer.showNotification("The vehicle has been impounded") end DeleteEntity(NetworkGetEntityFromNetworkId(netId)) rentedVehicles[plate] = nil @@ -62,16 +61,16 @@ AddEventHandler('sqz_carrental:VehicleSpawned', function(plate, insurance, time, end end) -RegisterNetEvent('sqz_carrental:ReturnVehicle') -AddEventHandler('sqz_carrental:ReturnVehicle', function(plate, damageIndex) +RegisterNetEvent("sqz_carrental:ReturnVehicle") +AddEventHandler("sqz_carrental:ReturnVehicle", function(plate, damageIndex) local xPlayer = ESX.GetPlayerFromId(source) if not rentedVehicles[plate] then - xPlayer.showNotification('You can not return this vehicle because this one has not been rented.') + xPlayer.showNotification("You can not return this vehicle because this one has not been rented.") return end if rentedVehicles[plate].owner ~= xPlayer.identifier then - xPlayer.showNotification('You can not return this vehicle because you are not borrower.') + xPlayer.showNotification("You can not return this vehicle because you are not borrower.") return end @@ -83,14 +82,14 @@ AddEventHandler('sqz_carrental:ReturnVehicle', function(plate, damageIndex) if damageIndex < 1 then local reducedBy = Config.DownPayment - Config.DownPayment * damageIndex - xPlayer.showNotification('Down payment you should receive has been lowered by '..reducedBy..'$ because you have returned the vehicle damaged') + xPlayer.showNotification("Down payment you should receive has been lowered by " .. reducedBy .. "$ because you have returned the vehicle damaged") end - xPlayer.addAccountMoney('bank', moneyToGive) - xPlayer.showNotification('The down payment of amount '..moneyToGive..'$ has been returned you.') + xPlayer.addAccountMoney("bank", moneyToGive) + xPlayer.showNotification("The down payment of amount " .. moneyToGive .. "$ has been returned you.") TaskLeaveVehicle(GetPlayerPed(source), NetworkGetEntityFromNetworkId(rentedVehicles[plate].netId), 0) Wait(1700) DeleteEntity(NetworkGetEntityFromNetworkId(rentedVehicles[plate].netId)) rentedVehicles[plate] = nil - TriggerClientEvent('sqz_carrental:VehicleSuccessfulyReturned', xPlayer.source) -end) \ No newline at end of file + TriggerClientEvent("sqz_carrental:VehicleSuccessfulyReturned", xPlayer.source) +end) diff --git a/server-data/resources/[sqz]/sqz_rental/warmenu.lua b/server-data/resources/[sqz]/sqz_rental/warmenu.lua index 23d64ca2b..6b0f6e158 100644 --- a/server-data/resources/[sqz]/sqz_rental/warmenu.lua +++ b/server-data/resources/[sqz]/sqz_rental/warmenu.lua @@ -1,16 +1,15 @@ -WarMenu = { } +WarMenu = {} WarMenu.__index = WarMenu -- Deprecated WarMenu.debug = false -function WarMenu.SetDebugEnabled(enabled) -end +function WarMenu.SetDebugEnabled(enabled) end function WarMenu.IsDebugEnabled() - return false + return false end --- -local menus = { } +local menus = {} local keys = { down = 187, up = 188, left = 189, right = 190, select = 191, back = 194 } local optionCount = 0 @@ -36,634 +35,656 @@ local buttonSpriteXOffset = 0.002 local buttonSpriteYOffset = 0.005 local defaultStyle = { - x = 0.0175, - y = 0.025, - width = 0.23, - maxOptionCountOnScreen = 10, - titleColor = { 0, 0, 0, 255 }, - titleBackgroundColor = { 245, 127, 23, 255 }, - titleBackgroundSprite = nil, - subTitleColor = { 245, 127, 23, 255 }, - textColor = { 255, 255, 255, 255 }, - subTextColor = { 189, 189, 189, 255 }, - focusTextColor = { 0, 0, 0, 255 }, - focusColor = { 245, 245, 245, 255 }, - backgroundColor = { 0, 0, 0, 160 }, - subTitleBackgroundColor = { 0, 0, 0, 255 }, - buttonPressedSound = { name = 'SELECT', set = 'HUD_FRONTEND_DEFAULT_SOUNDSET' }, --https://pastebin.com/0neZdsZ5 + x = 0.0175, + y = 0.025, + width = 0.23, + maxOptionCountOnScreen = 10, + titleColor = { 0, 0, 0, 255 }, + titleBackgroundColor = { 245, 127, 23, 255 }, + titleBackgroundSprite = nil, + subTitleColor = { 245, 127, 23, 255 }, + textColor = { 255, 255, 255, 255 }, + subTextColor = { 189, 189, 189, 255 }, + focusTextColor = { 0, 0, 0, 255 }, + focusColor = { 245, 245, 245, 255 }, + backgroundColor = { 0, 0, 0, 160 }, + subTitleBackgroundColor = { 0, 0, 0, 255 }, + buttonPressedSound = { name = "SELECT", set = "HUD_FRONTEND_DEFAULT_SOUNDSET" }, --https://pastebin.com/0neZdsZ5 } local function setMenuProperty(id, property, value) - if not id then - return - end + if not id then + return + end - local menu = menus[id] - if menu then - menu[property] = value - end + local menu = menus[id] + if menu then + menu[property] = value + end end local function setStyleProperty(id, property, value) - if not id then - return - end + if not id then + return + end - local menu = menus[id] + local menu = menus[id] - if menu then - if not menu.overrideStyle then - menu.overrideStyle = { } - end + if menu then + if not menu.overrideStyle then + menu.overrideStyle = {} + end - menu.overrideStyle[property] = value - end + menu.overrideStyle[property] = value + end end local function getStyleProperty(property, menu) - menu = menu or currentMenu + menu = menu or currentMenu - if menu.overrideStyle then - local value = menu.overrideStyle[property] - if value then - return value - end - end + if menu.overrideStyle then + local value = menu.overrideStyle[property] + if value then + return value + end + end - return menu.style and menu.style[property] or defaultStyle[property] + return menu.style and menu.style[property] or defaultStyle[property] end local function copyTable(t) - if type(t) ~= 'table' then - return t - end + if type(t) ~= "table" then + return t + end - local result = { } - for k, v in pairs(t) do - result[k] = copyTable(v) - end + local result = {} + for k, v in pairs(t) do + result[k] = copyTable(v) + end - return result + return result end local function setMenuVisible(id, visible, holdCurrentOption) - if currentMenu then - if visible then - if currentMenu.id == id then - return - end - else - if currentMenu.id ~= id then - return - end - end - end - - if visible then - local menu = menus[id] - - if not currentMenu then - menu.currentOption = 1 - else - if not holdCurrentOption then - menus[currentMenu.id].currentOption = 1 - end - end - - currentMenu = menu - else - currentMenu = nil - end + if currentMenu then + if visible then + if currentMenu.id == id then + return + end + else + if currentMenu.id ~= id then + return + end + end + end + + if visible then + local menu = menus[id] + + if not currentMenu then + menu.currentOption = 1 + else + if not holdCurrentOption then + menus[currentMenu.id].currentOption = 1 + end + end + + currentMenu = menu + else + currentMenu = nil + end end local function setTextParams(font, color, scale, center, shadow, alignRight, wrapFrom, wrapTo) - SetTextFont(font) - SetTextColour(color[1], color[2], color[3], color[4] or 255) - SetTextScale(scale, scale) + SetTextFont(font) + SetTextColour(color[1], color[2], color[3], color[4] or 255) + SetTextScale(scale, scale) - if shadow then - SetTextDropShadow() - end + if shadow then + SetTextDropShadow() + end - if center then - SetTextCentre(true) - elseif alignRight then - SetTextRightJustify(true) - end + if center then + SetTextCentre(true) + elseif alignRight then + SetTextRightJustify(true) + end - if not wrapFrom or not wrapTo then - wrapFrom = wrapFrom or getStyleProperty('x') - wrapTo = wrapTo or getStyleProperty('x') + getStyleProperty('width') - buttonTextXOffset - end + if not wrapFrom or not wrapTo then + wrapFrom = wrapFrom or getStyleProperty("x") + wrapTo = wrapTo or getStyleProperty("x") + getStyleProperty("width") - buttonTextXOffset + end - SetTextWrap(wrapFrom, wrapTo) + SetTextWrap(wrapFrom, wrapTo) end local function getLinesCount(text, x, y) - BeginTextCommandLineCount('TWOSTRINGS') - AddTextComponentString(tostring(text)) - return EndTextCommandGetLineCount(x, y) + BeginTextCommandLineCount("TWOSTRINGS") + AddTextComponentString(tostring(text)) + return EndTextCommandGetLineCount(x, y) end local function drawText(text, x, y) - BeginTextCommandDisplayText('TWOSTRINGS') - AddTextComponentString(tostring(text)) - EndTextCommandDisplayText(x, y) + BeginTextCommandDisplayText("TWOSTRINGS") + AddTextComponentString(tostring(text)) + EndTextCommandDisplayText(x, y) end local function drawRect(x, y, width, height, color) - DrawRect(x, y, width, height, color[1], color[2], color[3], color[4] or 255) + DrawRect(x, y, width, height, color[1], color[2], color[3], color[4] or 255) end local function getCurrentIndex() - if currentMenu.currentOption <= getStyleProperty('maxOptionCountOnScreen') and optionCount <= getStyleProperty('maxOptionCountOnScreen') then - return optionCount - elseif optionCount > currentMenu.currentOption - getStyleProperty('maxOptionCountOnScreen') and optionCount <= currentMenu.currentOption then - return optionCount - (currentMenu.currentOption - getStyleProperty('maxOptionCountOnScreen')) - end + if currentMenu.currentOption <= getStyleProperty("maxOptionCountOnScreen") and optionCount <= getStyleProperty("maxOptionCountOnScreen") then + return optionCount + elseif optionCount > currentMenu.currentOption - getStyleProperty("maxOptionCountOnScreen") and optionCount <= currentMenu.currentOption then + return optionCount - (currentMenu.currentOption - getStyleProperty("maxOptionCountOnScreen")) + end - return nil + return nil end local function drawTitle() - local x = getStyleProperty('x') + getStyleProperty('width') / 2 - local y = getStyleProperty('y') + titleHeight / 2 + local x = getStyleProperty("x") + getStyleProperty("width") / 2 + local y = getStyleProperty("y") + titleHeight / 2 - if getStyleProperty('titleBackgroundSprite') then - DrawSprite(getStyleProperty('titleBackgroundSprite').dict, getStyleProperty('titleBackgroundSprite').name, x, y, getStyleProperty('width'), titleHeight, 0., 255, 255, 255, 255) - else - drawRect(x, y, getStyleProperty('width'), titleHeight, getStyleProperty('titleBackgroundColor')) - end + if getStyleProperty("titleBackgroundSprite") then + DrawSprite(getStyleProperty("titleBackgroundSprite").dict, getStyleProperty("titleBackgroundSprite").name, x, y, getStyleProperty("width"), titleHeight, 0., 255, 255, 255, 255) + else + drawRect(x, y, getStyleProperty("width"), titleHeight, getStyleProperty("titleBackgroundColor")) + end - if currentMenu.title then - setTextParams(titleFont, getStyleProperty('titleColor'), titleScale, true) - drawText(currentMenu.title, x, y - titleHeight / 2 + titleYOffset) - end + if currentMenu.title then + setTextParams(titleFont, getStyleProperty("titleColor"), titleScale, true) + drawText(currentMenu.title, x, y - titleHeight / 2 + titleYOffset) + end end local function drawSubTitle() - local x = getStyleProperty('x') + getStyleProperty('width') / 2 - local y = getStyleProperty('y') + titleHeight + buttonHeight / 2 + local x = getStyleProperty("x") + getStyleProperty("width") / 2 + local y = getStyleProperty("y") + titleHeight + buttonHeight / 2 - drawRect(x, y, getStyleProperty('width'), buttonHeight, getStyleProperty('subTitleBackgroundColor')) + drawRect(x, y, getStyleProperty("width"), buttonHeight, getStyleProperty("subTitleBackgroundColor")) - setTextParams(buttonFont, getStyleProperty('subTitleColor'), buttonScale, false) - drawText(currentMenu.subTitle, getStyleProperty('x') + buttonTextXOffset, y - buttonHeight / 2 + buttonTextYOffset) + setTextParams(buttonFont, getStyleProperty("subTitleColor"), buttonScale, false) + drawText(currentMenu.subTitle, getStyleProperty("x") + buttonTextXOffset, y - buttonHeight / 2 + buttonTextYOffset) - if optionCount > getStyleProperty('maxOptionCountOnScreen') then - setTextParams(buttonFont, getStyleProperty('subTitleColor'), buttonScale, false, false, true) - drawText(tostring(currentMenu.currentOption)..' / '..tostring(optionCount), getStyleProperty('x') + getStyleProperty('width'), y - buttonHeight / 2 + buttonTextYOffset) - end + if optionCount > getStyleProperty("maxOptionCountOnScreen") then + setTextParams(buttonFont, getStyleProperty("subTitleColor"), buttonScale, false, false, true) + drawText(tostring(currentMenu.currentOption) .. " / " .. tostring(optionCount), getStyleProperty("x") + getStyleProperty("width"), y - buttonHeight / 2 + buttonTextYOffset) + end end local function drawButton(text, subText) - local currentIndex = getCurrentIndex() - if not currentIndex then - return - end + local currentIndex = getCurrentIndex() + if not currentIndex then + return + end - local backgroundColor = nil - local textColor = nil - local subTextColor = nil - local shadow = false + local backgroundColor = nil + local textColor = nil + local subTextColor = nil + local shadow = false - if currentMenu.currentOption == optionCount then - backgroundColor = getStyleProperty('focusColor') - textColor = getStyleProperty('focusTextColor') - subTextColor = getStyleProperty('focusTextColor') - else - backgroundColor = getStyleProperty('backgroundColor') - textColor = getStyleProperty('textColor') - subTextColor = getStyleProperty('subTextColor') - shadow = true - end + if currentMenu.currentOption == optionCount then + backgroundColor = getStyleProperty("focusColor") + textColor = getStyleProperty("focusTextColor") + subTextColor = getStyleProperty("focusTextColor") + else + backgroundColor = getStyleProperty("backgroundColor") + textColor = getStyleProperty("textColor") + subTextColor = getStyleProperty("subTextColor") + shadow = true + end - local x = getStyleProperty('x') + getStyleProperty('width') / 2 - local y = getStyleProperty('y') + titleHeight + buttonHeight + (buttonHeight * currentIndex) - buttonHeight / 2 + local x = getStyleProperty("x") + getStyleProperty("width") / 2 + local y = getStyleProperty("y") + titleHeight + buttonHeight + (buttonHeight * currentIndex) - buttonHeight / 2 - drawRect(x, y, getStyleProperty('width'), buttonHeight, backgroundColor) + drawRect(x, y, getStyleProperty("width"), buttonHeight, backgroundColor) - setTextParams(buttonFont, textColor, buttonScale, false, shadow) - drawText(text, getStyleProperty('x') + buttonTextXOffset, y - (buttonHeight / 2) + buttonTextYOffset) + setTextParams(buttonFont, textColor, buttonScale, false, shadow) + drawText(text, getStyleProperty("x") + buttonTextXOffset, y - (buttonHeight / 2) + buttonTextYOffset) - if subText then - setTextParams(buttonFont, subTextColor, buttonScale, false, shadow, true) - drawText(subText, getStyleProperty('x') + buttonTextXOffset, y - buttonHeight / 2 + buttonTextYOffset) - end + if subText then + setTextParams(buttonFont, subTextColor, buttonScale, false, shadow, true) + drawText(subText, getStyleProperty("x") + buttonTextXOffset, y - buttonHeight / 2 + buttonTextYOffset) + end end function WarMenu.CreateMenu(id, title, subTitle, style) - -- Default settings - local menu = { } + -- Default settings + local menu = {} - -- Members - menu.id = id - menu.previousMenu = nil - menu.aboutToBeClosed = false - menu.currentOption = 1 - menu.title = title - menu.subTitle = subTitle and string.upper(subTitle) or 'INTERACTION MENU' + -- Members + menu.id = id + menu.previousMenu = nil + menu.aboutToBeClosed = false + menu.currentOption = 1 + menu.title = title + menu.subTitle = subTitle and string.upper(subTitle) or "INTERACTION MENU" - -- Style - if style then - menu.style = style - end + -- Style + if style then + menu.style = style + end - menus[id] = menu + menus[id] = menu end function WarMenu.CreateSubMenu(id, parent, subTitle, style) - local parentMenu = menus[parent] - if not parentMenu then - return - end + local parentMenu = menus[parent] + if not parentMenu then + return + end - WarMenu.CreateMenu(id, parentMenu.title, subTitle and string.upper(subTitle) or parentMenu.subTitle) + WarMenu.CreateMenu(id, parentMenu.title, subTitle and string.upper(subTitle) or parentMenu.subTitle) - local menu = menus[id] + local menu = menus[id] - menu.previousMenu = parent + menu.previousMenu = parent - if parentMenu.overrideStyle then - menu.overrideStyle = copyTable(parentMenu.overrideStyle) - end + if parentMenu.overrideStyle then + menu.overrideStyle = copyTable(parentMenu.overrideStyle) + end - if style then - menu.style = style - elseif parentMenu.style then - menu.style = copyTable(parentMenu.style) - end + if style then + menu.style = style + elseif parentMenu.style then + menu.style = copyTable(parentMenu.style) + end end function WarMenu.CurrentMenu() - return currentMenu and currentMenu.id or nil + return currentMenu and currentMenu.id or nil end function WarMenu.OpenMenu(id) - if id and menus[id] then - PlaySoundFrontend(-1, 'SELECT', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true) - setMenuVisible(id, true) - end + if id and menus[id] then + PlaySoundFrontend(-1, "SELECT", "HUD_FRONTEND_DEFAULT_SOUNDSET", true) + setMenuVisible(id, true) + end end function WarMenu.IsMenuOpened(id) - return currentMenu and currentMenu.id == id + return currentMenu and currentMenu.id == id end WarMenu.Begin = WarMenu.IsMenuOpened function WarMenu.IsAnyMenuOpened() - return currentMenu ~= nil + return currentMenu ~= nil end function WarMenu.IsMenuAboutToBeClosed() - return currentMenu and currentMenu.aboutToBeClosed + return currentMenu and currentMenu.aboutToBeClosed end function WarMenu.CloseMenu() - if not currentMenu then - return - end + if not currentMenu then + return + end - if currentMenu.aboutToBeClosed then - currentMenu.aboutToBeClosed = false - setMenuVisible(currentMenu.id, false) - optionCount = 0 - currentKey = nil - PlaySoundFrontend(-1, 'QUIT', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true) - else - currentMenu.aboutToBeClosed = true - end + if currentMenu.aboutToBeClosed then + currentMenu.aboutToBeClosed = false + setMenuVisible(currentMenu.id, false) + optionCount = 0 + currentKey = nil + PlaySoundFrontend(-1, "QUIT", "HUD_FRONTEND_DEFAULT_SOUNDSET", true) + else + currentMenu.aboutToBeClosed = true + end end function WarMenu.ToolTip(text, width, flipHorizontal) - if not currentMenu then - return - end + if not currentMenu then + return + end - local currentIndex = getCurrentIndex() - if not currentIndex then - return - end + local currentIndex = getCurrentIndex() + if not currentIndex then + return + end - width = width or toolTipWidth + width = width or toolTipWidth - local x = nil - if not flipHorizontal then - x = getStyleProperty('x') + getStyleProperty('width') + width / 2 + buttonTextXOffset - else - x = getStyleProperty('x') - width / 2 - buttonTextXOffset - end + local x = nil + if not flipHorizontal then + x = getStyleProperty("x") + getStyleProperty("width") + width / 2 + buttonTextXOffset + else + x = getStyleProperty("x") - width / 2 - buttonTextXOffset + end - local textX = x - (width / 2) + buttonTextXOffset - setTextParams(buttonFont, getStyleProperty('textColor'), buttonScale, false, true, false, textX, textX + width - (buttonTextYOffset * 2)) - local linesCount = getLinesCount(text, textX, getStyleProperty('y')) + local textX = x - (width / 2) + buttonTextXOffset + setTextParams(buttonFont, getStyleProperty("textColor"), buttonScale, false, true, false, textX, textX + width - (buttonTextYOffset * 2)) + local linesCount = getLinesCount(text, textX, getStyleProperty("y")) - local height = GetTextScaleHeight(buttonScale, buttonFont) * (linesCount + 1) + buttonTextYOffset - local y = getStyleProperty('y') + titleHeight + (buttonHeight * currentIndex) + height / 2 + local height = GetTextScaleHeight(buttonScale, buttonFont) * (linesCount + 1) + buttonTextYOffset + local y = getStyleProperty("y") + titleHeight + (buttonHeight * currentIndex) + height / 2 - drawRect(x, y, width, height, getStyleProperty('backgroundColor')) + drawRect(x, y, width, height, getStyleProperty("backgroundColor")) - y = y - (height / 2) + buttonTextYOffset - drawText(text, textX, y) + y = y - (height / 2) + buttonTextYOffset + drawText(text, textX, y) end function WarMenu.Button(text, subText) - if not currentMenu then - return - end + if not currentMenu then + return + end - optionCount = optionCount + 1 + optionCount = optionCount + 1 - drawButton(text, subText) + drawButton(text, subText) - local pressed = false + local pressed = false - if currentMenu.currentOption == optionCount then - if currentKey == keys.select then - pressed = true - PlaySoundFrontend(-1, getStyleProperty('buttonPressedSound').name, getStyleProperty('buttonPressedSound').set, true) - elseif currentKey == keys.left or currentKey == keys.right then - PlaySoundFrontend(-1, 'NAV_UP_DOWN', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true) - end - end + if currentMenu.currentOption == optionCount then + if currentKey == keys.select then + pressed = true + PlaySoundFrontend(-1, getStyleProperty("buttonPressedSound").name, getStyleProperty("buttonPressedSound").set, true) + elseif currentKey == keys.left or currentKey == keys.right then + PlaySoundFrontend(-1, "NAV_UP_DOWN", "HUD_FRONTEND_DEFAULT_SOUNDSET", true) + end + end - return pressed + return pressed end function WarMenu.SpriteButton(text, dict, name, r, g, b, a) - if not currentMenu then - return - end - - local pressed = WarMenu.Button(text) - - local currentIndex = getCurrentIndex() - if not currentIndex then - return - end - - if not HasStreamedTextureDictLoaded(dict) then - RequestStreamedTextureDict(dict) - end - DrawSprite(dict, name, getStyleProperty('x') + getStyleProperty('width') - spriteWidth / 2 - buttonSpriteXOffset, getStyleProperty('y') + titleHeight + buttonHeight + (buttonHeight * currentIndex) - spriteHeight / 2 + buttonSpriteYOffset, spriteWidth, spriteHeight, 0., r or 255, g or 255, b or 255, a or 255) - - return pressed + if not currentMenu then + return + end + + local pressed = WarMenu.Button(text) + + local currentIndex = getCurrentIndex() + if not currentIndex then + return + end + + if not HasStreamedTextureDictLoaded(dict) then + RequestStreamedTextureDict(dict) + end + DrawSprite( + dict, + name, + getStyleProperty("x") + getStyleProperty("width") - spriteWidth / 2 - buttonSpriteXOffset, + getStyleProperty("y") + titleHeight + buttonHeight + (buttonHeight * currentIndex) - spriteHeight / 2 + buttonSpriteYOffset, + spriteWidth, + spriteHeight, + 0., + r or 255, + g or 255, + b or 255, + a or 255 + ) + + return pressed end function WarMenu.InputButton(text, windowTitleEntry, defaultText, maxLength, subText) - if not currentMenu then - return - end + if not currentMenu then + return + end - local pressed = WarMenu.Button(text, subText) - local inputText = nil + local pressed = WarMenu.Button(text, subText) + local inputText = nil - if pressed then - DisplayOnscreenKeyboard(1, windowTitleEntry or 'FMMC_MPM_NA', '', defaultText or '', '', '', '', maxLength or 255) + if pressed then + DisplayOnscreenKeyboard(1, windowTitleEntry or "FMMC_MPM_NA", "", defaultText or "", "", "", "", maxLength or 255) - while true do - DisableAllControlActions(0) + while true do + DisableAllControlActions(0) - local status = UpdateOnscreenKeyboard() - if status == 2 then - break - elseif status == 1 then - inputText = GetOnscreenKeyboardResult() - break - end + local status = UpdateOnscreenKeyboard() + if status == 2 then + break + elseif status == 1 then + inputText = GetOnscreenKeyboardResult() + break + end - Wait(0) - end - end + Wait(0) + end + end - return pressed, inputText + return pressed, inputText end function WarMenu.MenuButton(text, id, subText) - if not currentMenu then - return - end + if not currentMenu then + return + end - local pressed = WarMenu.Button(text, subText) + local pressed = WarMenu.Button(text, subText) - if pressed then - currentMenu.currentOption = optionCount - setMenuVisible(currentMenu.id, false) - setMenuVisible(id, true, true) - end + if pressed then + currentMenu.currentOption = optionCount + setMenuVisible(currentMenu.id, false) + setMenuVisible(id, true, true) + end - return pressed + return pressed end function WarMenu.CheckBox(text, checked, callback) - if not currentMenu then - return - end + if not currentMenu then + return + end - local name = nil - if currentMenu.currentOption == optionCount + 1 then - name = checked and 'shop_box_tickb' or 'shop_box_blankb' - else - name = checked and 'shop_box_tick' or 'shop_box_blank' - end + local name = nil + if currentMenu.currentOption == optionCount + 1 then + name = checked and "shop_box_tickb" or "shop_box_blankb" + else + name = checked and "shop_box_tick" or "shop_box_blank" + end - local pressed = WarMenu.SpriteButton(text, 'commonmenu', name) + local pressed = WarMenu.SpriteButton(text, "commonmenu", name) - if pressed then - checked = not checked - if callback then callback(checked) end - end + if pressed then + checked = not checked + if callback then + callback(checked) + end + end - return pressed + return pressed end function WarMenu.ComboBox(text, items, currentIndex, selectedIndex, callback) - if not currentMenu then - return - end - - local itemsCount = #items - local selectedItem = items[currentIndex] - local isCurrent = currentMenu.currentOption == optionCount + 1 - selectedIndex = selectedIndex or currentIndex - - - if itemsCount > 1 and isCurrent then - - if GetLabelText(selectedItem) ~= 'NULL' then - selectedItem = '← '..tostring(GetLabelText(selectedItem))..' →' - else - selectedItem = '← '..tostring(selectedItem)..' →' - end - elseif itemsCount > 1 and not isCurrent then - if GetLabelText(selectedItem) ~= 'NULL' then - selectedItem = tostring(GetLabelText(selectedItem)) - else - selectedItem = tostring(selectedItem) - end - end - - local pressed = WarMenu.Button(text, selectedItem) - - if pressed then - selectedIndex = currentIndex - elseif isCurrent then - if currentKey == keys.left then - if currentIndex > 1 then currentIndex = currentIndex - 1 else currentIndex = itemsCount end - elseif currentKey == keys.right then - if currentIndex < itemsCount then currentIndex = currentIndex + 1 else currentIndex = 1 end - end - end - - if callback then callback(currentIndex, selectedIndex) end - return pressed, currentIndex + if not currentMenu then + return + end + + local itemsCount = #items + local selectedItem = items[currentIndex] + local isCurrent = currentMenu.currentOption == optionCount + 1 + selectedIndex = selectedIndex or currentIndex + + if itemsCount > 1 and isCurrent then + if GetLabelText(selectedItem) ~= "NULL" then + selectedItem = "← " .. tostring(GetLabelText(selectedItem)) .. " →" + else + selectedItem = "← " .. tostring(selectedItem) .. " →" + end + elseif itemsCount > 1 and not isCurrent then + if GetLabelText(selectedItem) ~= "NULL" then + selectedItem = tostring(GetLabelText(selectedItem)) + else + selectedItem = tostring(selectedItem) + end + end + + local pressed = WarMenu.Button(text, selectedItem) + + if pressed then + selectedIndex = currentIndex + elseif isCurrent then + if currentKey == keys.left then + if currentIndex > 1 then + currentIndex = currentIndex - 1 + else + currentIndex = itemsCount + end + elseif currentKey == keys.right then + if currentIndex < itemsCount then + currentIndex = currentIndex + 1 + else + currentIndex = 1 + end + end + end + + if callback then + callback(currentIndex, selectedIndex) + end + return pressed, currentIndex end function WarMenu.Display() - if currentMenu then - DisableControlAction(0, keys.left, true) - DisableControlAction(0, keys.up, true) - DisableControlAction(0, keys.down, true) - DisableControlAction(0, keys.right, true) - DisableControlAction(0, keys.back, true) - - if currentMenu.aboutToBeClosed then - WarMenu.CloseMenu() - else - ClearAllHelpMessages() - - drawTitle() - drawSubTitle() - - currentKey = nil - - if IsDisabledControlJustReleased(0, keys.down) then - PlaySoundFrontend(-1, 'NAV_UP_DOWN', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true) - - if currentMenu.currentOption < optionCount then - currentMenu.currentOption = currentMenu.currentOption + 1 - else - currentMenu.currentOption = 1 - end - elseif IsDisabledControlJustReleased(0, keys.up) then - PlaySoundFrontend(-1, 'NAV_UP_DOWN', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true) - - if currentMenu.currentOption > 1 then - currentMenu.currentOption = currentMenu.currentOption - 1 - else - currentMenu.currentOption = optionCount - end - elseif IsDisabledControlJustReleased(0, keys.left) then - currentKey = keys.left - elseif IsDisabledControlJustReleased(0, keys.right) then - currentKey = keys.right - elseif IsControlJustReleased(0, keys.select) then - currentKey = keys.select - elseif IsDisabledControlJustReleased(0, keys.back) then - if menus[currentMenu.previousMenu] then - setMenuVisible(currentMenu.previousMenu, true) - PlaySoundFrontend(-1, 'BACK', 'HUD_FRONTEND_DEFAULT_SOUNDSET', true) - else - WarMenu.CloseMenu() - end - end - - optionCount = 0 - end - end + if currentMenu then + DisableControlAction(0, keys.left, true) + DisableControlAction(0, keys.up, true) + DisableControlAction(0, keys.down, true) + DisableControlAction(0, keys.right, true) + DisableControlAction(0, keys.back, true) + + if currentMenu.aboutToBeClosed then + WarMenu.CloseMenu() + else + ClearAllHelpMessages() + + drawTitle() + drawSubTitle() + + currentKey = nil + + if IsDisabledControlJustReleased(0, keys.down) then + PlaySoundFrontend(-1, "NAV_UP_DOWN", "HUD_FRONTEND_DEFAULT_SOUNDSET", true) + + if currentMenu.currentOption < optionCount then + currentMenu.currentOption = currentMenu.currentOption + 1 + else + currentMenu.currentOption = 1 + end + elseif IsDisabledControlJustReleased(0, keys.up) then + PlaySoundFrontend(-1, "NAV_UP_DOWN", "HUD_FRONTEND_DEFAULT_SOUNDSET", true) + + if currentMenu.currentOption > 1 then + currentMenu.currentOption = currentMenu.currentOption - 1 + else + currentMenu.currentOption = optionCount + end + elseif IsDisabledControlJustReleased(0, keys.left) then + currentKey = keys.left + elseif IsDisabledControlJustReleased(0, keys.right) then + currentKey = keys.right + elseif IsControlJustReleased(0, keys.select) then + currentKey = keys.select + elseif IsDisabledControlJustReleased(0, keys.back) then + if menus[currentMenu.previousMenu] then + setMenuVisible(currentMenu.previousMenu, true) + PlaySoundFrontend(-1, "BACK", "HUD_FRONTEND_DEFAULT_SOUNDSET", true) + else + WarMenu.CloseMenu() + end + end + + optionCount = 0 + end + end end WarMenu.End = WarMenu.Display function WarMenu.CurrentOption() - if currentMenu and optionCount ~= 0 then - return currentMenu.currentOption - end + if currentMenu and optionCount ~= 0 then + return currentMenu.currentOption + end - return nil + return nil end function WarMenu.IsItemHovered() - if not currentMenu or optionCount == 0 then - return false - end + if not currentMenu or optionCount == 0 then + return false + end - return currentMenu.currentOption == optionCount + return currentMenu.currentOption == optionCount end function WarMenu.IsItemSelected() - return currentKey == keys.select and WarMenu.IsItemHovered() + return currentKey == keys.select and WarMenu.IsItemHovered() end function WarMenu.SetTitle(id, title) - setMenuProperty(id, 'title', title) + setMenuProperty(id, "title", title) end WarMenu.SetMenuTitle = WarMenu.SetTitle function WarMenu.SetSubTitle(id, text) - setMenuProperty(id, 'subTitle', string.upper(text)) + setMenuProperty(id, "subTitle", string.upper(text)) end WarMenu.SetMenuSubTitle = WarMenu.SetSubTitle function WarMenu.SetMenuStyle(id, style) - setMenuProperty(id, 'style', style) + setMenuProperty(id, "style", style) end function WarMenu.SetMenuX(id, x) - setStyleProperty(id, 'x', x) + setStyleProperty(id, "x", x) end function WarMenu.SetMenuY(id, y) - setStyleProperty(id, 'y', y) + setStyleProperty(id, "y", y) end function WarMenu.SetMenuWidth(id, width) - setStyleProperty(id, 'width', width) + setStyleProperty(id, "width", width) end function WarMenu.SetMenuMaxOptionCountOnScreen(id, count) - setStyleProperty(id, 'maxOptionCountOnScreen', count) + setStyleProperty(id, "maxOptionCountOnScreen", count) end function WarMenu.SetTitleColor(id, r, g, b, a) - setStyleProperty(id, 'titleColor', { r, g, b, a }) + setStyleProperty(id, "titleColor", { r, g, b, a }) end WarMenu.SetMenuTitleColor = WarMenu.SetTitleColor function WarMenu.SetMenuSubTitleColor(id, r, g, b, a) - setStyleProperty(id, 'subTitleColor', { r, g, b, a }) + setStyleProperty(id, "subTitleColor", { r, g, b, a }) end function WarMenu.SetTitleBackgroundColor(id, r, g, b, a) - setStyleProperty(id, 'titleBackgroundColor', { r, g, b, a }) + setStyleProperty(id, "titleBackgroundColor", { r, g, b, a }) end WarMenu.SetMenuTitleBackgroundColor = WarMenu.SetTitleBackgroundColor function WarMenu.SetTitleBackgroundSprite(id, dict, name) - RequestStreamedTextureDict(dict) - setStyleProperty(id, 'titleBackgroundSprite', { dict = dict, name = name }) + RequestStreamedTextureDict(dict) + setStyleProperty(id, "titleBackgroundSprite", { dict = dict, name = name }) end WarMenu.SetMenuTitleBackgroundSprite = WarMenu.SetTitleBackgroundSprite function WarMenu.SetMenuBackgroundColor(id, r, g, b, a) - setStyleProperty(id, 'backgroundColor', { r, g, b, a }) + setStyleProperty(id, "backgroundColor", { r, g, b, a }) end function WarMenu.SetMenuTextColor(id, r, g, b, a) - setStyleProperty(id, 'textColor', { r, g, b, a }) + setStyleProperty(id, "textColor", { r, g, b, a }) end function WarMenu.SetMenuSubTextColor(id, r, g, b, a) - setStyleProperty(id, 'subTextColor', { r, g, b, a }) + setStyleProperty(id, "subTextColor", { r, g, b, a }) end function WarMenu.SetMenuFocusColor(id, r, g, b, a) - setStyleProperty(id, 'focusColor', { r, g, b, a }) + setStyleProperty(id, "focusColor", { r, g, b, a }) end function WarMenu.SetMenuFocusTextColor(id, r, g, b, a) - setStyleProperty(id, 'focusTextColor', { r, g, b, a }) + setStyleProperty(id, "focusTextColor", { r, g, b, a }) end function WarMenu.SetMenuButtonPressedSound(id, name, set) - setStyleProperty(id, 'buttonPressedSound', { name = name, set = set }) + setStyleProperty(id, "buttonPressedSound", { name = name, set = set }) end From a8aee479e0dca932d37d2de1322ef8c2a98fee88 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:11:46 +0100 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../[sqz]/sqz_carkeys/client/client.lua | 45 ++++++------- .../resources/[sqz]/sqz_carkeys/config.lua | 4 +- .../[sqz]/sqz_carkeys/fxmanifest.lua | 38 +++++------ .../[sqz]/sqz_carkeys/locales/cz.lua | 38 +++++------ .../[sqz]/sqz_carkeys/locales/en.lua | 38 +++++------ .../[sqz]/sqz_carkeys/locales/it.lua | 38 +++++------ .../[sqz]/sqz_carkeys/server/server.lua | 65 ++++++++++--------- .../resources/[sqz]/sqz_carkeys/sql.sql | 7 +- 8 files changed, 137 insertions(+), 136 deletions(-) diff --git a/server-data/resources/[sqz]/sqz_carkeys/client/client.lua b/server-data/resources/[sqz]/sqz_carkeys/client/client.lua index 51f61bda1..3706a44c5 100644 --- a/server-data/resources/[sqz]/sqz_carkeys/client/client.lua +++ b/server-data/resources/[sqz]/sqz_carkeys/client/client.lua @@ -1,25 +1,24 @@ ESX = exports["es_extended"]:getSharedObject() -RegisterCommand('lockvehicle', function() - +RegisterCommand("lockvehicle", function() local vehicle, dist = ESX.Game.GetClosestVehicle() if dist < 10 and vehicle > 0 then ClearPedTasks(PlayerPedId()) Wait(100) - TriggerServerEvent('carkeys:RequestVehicleLock', VehToNet(vehicle), GetVehicleDoorLockStatus(vehicle)) + TriggerServerEvent("carkeys:RequestVehicleLock", VehToNet(vehicle), GetVehicleDoorLockStatus(vehicle)) else - ESX.ShowNotification(_U('no_vehicle_found')) + ESX.ShowNotification(_U("no_vehicle_found")) end end) -RegisterKeyMapping('lockvehicle', _U('lock_vehicle'), 'keyboard', 'f10') +RegisterKeyMapping("lockvehicle", _U("lock_vehicle"), "keyboard", "f10") -RegisterNetEvent('carlock:CarLockedEffect', function(netId, lockStatus) +RegisterNetEvent("carlock:CarLockedEffect", function(netId, lockStatus) local vehicle = NetToVeh(netId) if DoesEntityExist(vehicle) then local ped = PlayerPedId() - local prop = GetHashKey('p_car_keys_01') + local prop = GetHashKey("p_car_keys_01") RequestModel(prop) while not HasModelLoaded(prop) do Wait(10) @@ -40,9 +39,9 @@ RegisterNetEvent('carlock:CarLockedEffect', function(netId, lockStatus) PlayVehicleDoorCloseSound(vehicle, 1) SetVehicleDoorsLockedForAllPlayers(vehicle, lockStatus) if lockStatus then - ESX.ShowNotification(_U('vehicle_locked')) + ESX.ShowNotification(_U("vehicle_locked")) else - ESX.ShowNotification(_U('vehicle_unlocked')) + ESX.ShowNotification(_U("vehicle_unlocked")) end SetVehicleLights(vehicle, 2) @@ -58,27 +57,27 @@ RegisterNetEvent('carlock:CarLockedEffect', function(netId, lockStatus) end end) -RegisterCommand('givekeys', function() +RegisterCommand("givekeys", function() local closestP, closestD = ESX.Game.GetClosestPlayer() local vehicle, dist = ESX.Game.GetClosestVehicle() if DoesEntityExist(vehicle) and closestP ~= -1 and closestD < 4 and dist < 10 then local plate = GetVehicleNumberPlateText(vehicle) - TriggerServerEvent('carkeys:GiveKeyToPerson', plate, GetPlayerServerId(closestP)) + TriggerServerEvent("carkeys:GiveKeyToPerson", plate, GetPlayerServerId(closestP)) end end) function Draw3DText(x, y, z, text) - SetTextScale(0.22, 0.22) + SetTextScale(0.22, 0.22) SetTextFont(13) SetTextProportional(1) SetTextColour(255, 255, 255, 215) SetTextEntry("STRING") SetTextCentre(true) AddTextComponentString(text) - SetDrawOrigin(x,y,z, 0) + SetDrawOrigin(x, y, z, 0) DrawText(0.0, 0.0) local factor = (string.len(text)) / 370 - DrawRect(0.0, 0.0+0.0125, 0.015+ factor, 0.03, 0, 0, 0, 75) + DrawRect(0.0, 0.0 + 0.0125, 0.015 + factor, 0.03, 0, 0, 0, 75) ClearDrawOrigin() end @@ -90,15 +89,15 @@ CreateThread(function() local dist = #(GetEntityCoords(playerPed) - centralPos) if dist < 15.0 then - Draw3DText(centralPos.x, centralPos.y, centralPos.z, _U('change_locks_for', Config.Price)) + Draw3DText(centralPos.x, centralPos.y, centralPos.z, _U("change_locks_for", Config.Price)) if dist < 2 then if IsControlJustPressed(0, 38) then local veh = GetVehiclePedIsIn(playerPed) if DoesEntityExist(veh) then - TriggerServerEvent('carkeys:NewLocks', GetVehicleNumberPlateText(veh)) + TriggerServerEvent("carkeys:NewLocks", GetVehicleNumberPlateText(veh)) Wait(5000) else - ESX.ShowNotification(_U('must_in_vehicle')) + ESX.ShowNotification(_U("must_in_vehicle")) end end end @@ -109,17 +108,15 @@ CreateThread(function() end) CreateThread(function() - local blip = AddBlipForCoord(centralPos) - SetBlipSprite (blip, 186) + SetBlipSprite(blip, 186) SetBlipDisplay(blip, 4) - SetBlipScale (blip, 0.9) - SetBlipColour (blip, 73) + SetBlipScale(blip, 0.9) + SetBlipColour(blip, 73) SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString(AddTextComponentString(_U('locksmith'))) + AddTextComponentString(AddTextComponentString(_U("locksmith"))) EndTextCommandSetBlipName(blip) - -end) \ No newline at end of file +end) diff --git a/server-data/resources/[sqz]/sqz_carkeys/config.lua b/server-data/resources/[sqz]/sqz_carkeys/config.lua index e10f37393..88ee30f6f 100644 --- a/server-data/resources/[sqz]/sqz_carkeys/config.lua +++ b/server-data/resources/[sqz]/sqz_carkeys/config.lua @@ -1,3 +1,3 @@ Config = {} -Config.Locale = 'en' -Config.Price = 5000 -- amount of car locks replace at Locksmith \ No newline at end of file +Config.Locale = "en" +Config.Price = 5000 -- amount of car locks replace at Locksmith diff --git a/server-data/resources/[sqz]/sqz_carkeys/fxmanifest.lua b/server-data/resources/[sqz]/sqz_carkeys/fxmanifest.lua index 0acd8a36a..f5cd437a4 100644 --- a/server-data/resources/[sqz]/sqz_carkeys/fxmanifest.lua +++ b/server-data/resources/[sqz]/sqz_carkeys/fxmanifest.lua @@ -1,22 +1,22 @@ -game 'gta5' -fx_version 'cerulean' +game("gta5") +fx_version("cerulean") -author 'Squizer#3020' -description 'Script that allows you to lock vehicles.' -version '1.0.0' +author("Squizer#3020") +description("Script that allows you to lock vehicles.") +version("1.0.0") -shared_scripts { - '@es_extended/locale.lua', - 'locales/*.lua', - '@es_extended/imports.lua', - 'config.lua' -} +shared_scripts({ + "@es_extended/locale.lua", + "locales/*.lua", + "@es_extended/imports.lua", + "config.lua", +}) -client_scripts { - 'client/client.lua', - 'locales/*.lua' -} -server_scripts { - '@oxmysql/lib/MySQL.lua', - 'server/server.lua' -} \ No newline at end of file +client_scripts({ + "client/client.lua", + "locales/*.lua", +}) +server_scripts({ + "@oxmysql/lib/MySQL.lua", + "server/server.lua", +}) diff --git a/server-data/resources/[sqz]/sqz_carkeys/locales/cz.lua b/server-data/resources/[sqz]/sqz_carkeys/locales/cz.lua index abe9581f6..7ba014105 100644 --- a/server-data/resources/[sqz]/sqz_carkeys/locales/cz.lua +++ b/server-data/resources/[sqz]/sqz_carkeys/locales/cz.lua @@ -1,19 +1,19 @@ -Locales['cz'] = { - ['spz_not_found'] = 'Nepodařilo se najít SPZ vozidla', - ['no_keys'] = 'Od tohoto auta nemáš klíče', - ['not_yours_vehicle'] = 'Toto vozidlo není tvoje', - ['locks_replaced'] = 'Zámky úspěšně vyměněny', - ['paid_for_locks'] = 'Zaplatil jsi %s$ za nové zámky', - ['not_enough_money'] = 'Nemáš na zaplacení nových zámků', - ['wait_new_locks'] = 'Nyní počkej půl minuty na nové zámky', - ['installing_new_locks'] = 'Probíhá instalace nových zámků', - ['received_keys'] = 'Dostal jsi klíče od vozidla s SPZ: %s', - ['gave_keys'] = 'Dal jsi klíče od vozidla s SPZ: %s', - ['locksmith'] = 'Locksmith', - ['must_in_vehicle'] = 'Musíš sedět ve vozidle', - ['change_locks_for'] = '[E] Pro výměnu zámků za %s$', - ['vehicle_locked'] = 'Vozidlo bylo úspěšně zamčeno', - ['vehicle_unlocked'] = 'Vozidlo bylo úspěšně odemčeno', - ['lock_vehicle'] = 'Zamknout vozidlo', - ['no_vehicle_found'] = 'Žádné vozidlo nebylo nalezeno' -} \ No newline at end of file +Locales["cz"] = { + ["spz_not_found"] = "Nepodařilo se najít SPZ vozidla", + ["no_keys"] = "Od tohoto auta nemáš klíče", + ["not_yours_vehicle"] = "Toto vozidlo není tvoje", + ["locks_replaced"] = "Zámky úspěšně vyměněny", + ["paid_for_locks"] = "Zaplatil jsi %s$ za nové zámky", + ["not_enough_money"] = "Nemáš na zaplacení nových zámků", + ["wait_new_locks"] = "Nyní počkej půl minuty na nové zámky", + ["installing_new_locks"] = "Probíhá instalace nových zámků", + ["received_keys"] = "Dostal jsi klíče od vozidla s SPZ: %s", + ["gave_keys"] = "Dal jsi klíče od vozidla s SPZ: %s", + ["locksmith"] = "Locksmith", + ["must_in_vehicle"] = "Musíš sedět ve vozidle", + ["change_locks_for"] = "[E] Pro výměnu zámků za %s$", + ["vehicle_locked"] = "Vozidlo bylo úspěšně zamčeno", + ["vehicle_unlocked"] = "Vozidlo bylo úspěšně odemčeno", + ["lock_vehicle"] = "Zamknout vozidlo", + ["no_vehicle_found"] = "Žádné vozidlo nebylo nalezeno", +} diff --git a/server-data/resources/[sqz]/sqz_carkeys/locales/en.lua b/server-data/resources/[sqz]/sqz_carkeys/locales/en.lua index 56510e611..8fda1251e 100644 --- a/server-data/resources/[sqz]/sqz_carkeys/locales/en.lua +++ b/server-data/resources/[sqz]/sqz_carkeys/locales/en.lua @@ -1,19 +1,19 @@ -Locales['en'] = { - ['spz_not_found'] = 'We were unable to find the vehicle\'s SPZ', - ['no_keys'] = 'You do not have keys of this vehicle', - ['not_yours_vehicle'] = 'This vehicle is not yours', - ['locks_replaced'] = 'The locks have been successfuly replaced', - ['paid_for_locks'] = 'You have paid %s$ for the new locks', - ['not_enough_money'] = 'You do not have enough money to buy a locks replacement', - ['wait_new_locks'] = 'Wait a half of minute until the locks get replaced', - ['installing_new_locks'] = 'The locks are being replaced', - ['received_keys'] = 'You have received keys of a vehicle with a license plate: %s', - ['gave_keys'] = 'You have given keys of a vehicle with a license plate: %s', - ['locksmith'] = 'Locksmith', - ['must_in_vehicle'] = 'You must be sitting in a vehicle', - ['change_locks_for'] = '[E] To replace vehicle locks %s$', - ['vehicle_locked'] = 'Vehicle has been successfuly locked', - ['vehicle_unlocked'] = 'Vehicle has been successfuly unlocked', - ['lock_vehicle'] = 'Toggle vehicle locks', - ['no_vehicle_found'] = 'There is no vehicle nearby' -} \ No newline at end of file +Locales["en"] = { + ["spz_not_found"] = "We were unable to find the vehicle's SPZ", + ["no_keys"] = "You do not have keys of this vehicle", + ["not_yours_vehicle"] = "This vehicle is not yours", + ["locks_replaced"] = "The locks have been successfuly replaced", + ["paid_for_locks"] = "You have paid %s$ for the new locks", + ["not_enough_money"] = "You do not have enough money to buy a locks replacement", + ["wait_new_locks"] = "Wait a half of minute until the locks get replaced", + ["installing_new_locks"] = "The locks are being replaced", + ["received_keys"] = "You have received keys of a vehicle with a license plate: %s", + ["gave_keys"] = "You have given keys of a vehicle with a license plate: %s", + ["locksmith"] = "Locksmith", + ["must_in_vehicle"] = "You must be sitting in a vehicle", + ["change_locks_for"] = "[E] To replace vehicle locks %s$", + ["vehicle_locked"] = "Vehicle has been successfuly locked", + ["vehicle_unlocked"] = "Vehicle has been successfuly unlocked", + ["lock_vehicle"] = "Toggle vehicle locks", + ["no_vehicle_found"] = "There is no vehicle nearby", +} diff --git a/server-data/resources/[sqz]/sqz_carkeys/locales/it.lua b/server-data/resources/[sqz]/sqz_carkeys/locales/it.lua index 53fa02df6..eab544fb6 100644 --- a/server-data/resources/[sqz]/sqz_carkeys/locales/it.lua +++ b/server-data/resources/[sqz]/sqz_carkeys/locales/it.lua @@ -1,19 +1,19 @@ -Locales['it'] = { - ['spz_not_found'] = 'Non siamo riusciti a trovare l\'SPZ del veicolo', - ['no_keys'] = 'Non hai le chiavi di questo veicolo', - ['not_yours_vehicle'] = 'Questo veicolo non è tuo', - ['locks_replaced'] = 'le chiavi sono state sostituite con successo', - ['paid_for_locks'] = 'hai pagato %s$ per le nuovi chiavi', - ['not_enough_money'] = 'Non hai abbastanza soldi per comprare una chiave sostitutiva', - ['wait_new_locks'] = 'Attendi mezzo minuto fino a quando le chivi non verranno sostituite', - ['installing_new_locks'] = 'le chivi sono in fase di sostituzioni', - ['received_keys'] = 'Hai ricevuto le chiavi di un veicolo targato: %s', - ['gave_keys'] = 'Hai consegnato le chiavi di un veicolo targato: %s', - ['locksmith'] = 'Fabbro', - ['must_in_vehicle'] = 'Devi essere seduto in un veicolo', - ['change_locks_for'] = 'premi [E] per sostituire le chiavi del veicolo %s$', - ['vehicle_locked'] = 'Il veicolo è stato chiuso con successo', - ['vehicle_unlocked'] = 'veicolo aperto con successo', - ['lock_vehicle'] = 'Attiva/disattiva le serrature del veicolo', - ['no_vehicle_found'] = 'Non c\'è nessun veicolo nelle vicinanze' -} \ No newline at end of file +Locales["it"] = { + ["spz_not_found"] = "Non siamo riusciti a trovare l'SPZ del veicolo", + ["no_keys"] = "Non hai le chiavi di questo veicolo", + ["not_yours_vehicle"] = "Questo veicolo non è tuo", + ["locks_replaced"] = "le chiavi sono state sostituite con successo", + ["paid_for_locks"] = "hai pagato %s$ per le nuovi chiavi", + ["not_enough_money"] = "Non hai abbastanza soldi per comprare una chiave sostitutiva", + ["wait_new_locks"] = "Attendi mezzo minuto fino a quando le chivi non verranno sostituite", + ["installing_new_locks"] = "le chivi sono in fase di sostituzioni", + ["received_keys"] = "Hai ricevuto le chiavi di un veicolo targato: %s", + ["gave_keys"] = "Hai consegnato le chiavi di un veicolo targato: %s", + ["locksmith"] = "Fabbro", + ["must_in_vehicle"] = "Devi essere seduto in un veicolo", + ["change_locks_for"] = "premi [E] per sostituire le chiavi del veicolo %s$", + ["vehicle_locked"] = "Il veicolo è stato chiuso con successo", + ["vehicle_unlocked"] = "veicolo aperto con successo", + ["lock_vehicle"] = "Attiva/disattiva le serrature del veicolo", + ["no_vehicle_found"] = "Non c'è nessun veicolo nelle vicinanze", +} diff --git a/server-data/resources/[sqz]/sqz_carkeys/server/server.lua b/server-data/resources/[sqz]/sqz_carkeys/server/server.lua index 3cdfcfb5a..4f06bb123 100644 --- a/server-data/resources/[sqz]/sqz_carkeys/server/server.lua +++ b/server-data/resources/[sqz]/sqz_carkeys/server/server.lua @@ -1,12 +1,11 @@ ESX = exports["es_extended"]:getSharedObject() local vehiclesCache = {} -exports('resetPlate', function(plate) +exports("resetPlate", function(plate) vehiclesCache[plate] = nil end) -exports('giveTempKeys', function(plate, identifier, timeout) - +exports("giveTempKeys", function(plate, identifier, timeout) if not vehiclesCache[plate] then vehiclesCache[plate] = {} end @@ -22,18 +21,23 @@ exports('giveTempKeys', function(plate, identifier, timeout) end end) -RegisterNetEvent('carkeys:RequestVehicleLock', function(netId, lockstatus) +RegisterNetEvent("carkeys:RequestVehicleLock", function(netId, lockstatus) local vehicle = NetworkGetEntityFromNetworkId(netId) local plate = GetVehicleNumberPlateText(vehicle) local xPlayer = ESX.GetPlayerFromId(source) - if not plate then xPlayer.showNotification(_U('spz_not_found')) return end + if not plate then + xPlayer.showNotification(_U("spz_not_found")) + return + end if not vehiclesCache[plate] then - local result = MySQL.Sync.fetchAll('SELECT owner, peopleWithKeys FROM owned_vehicles WHERE plate = "'..plate..'"') + local result = MySQL.Sync.fetchAll('SELECT owner, peopleWithKeys FROM owned_vehicles WHERE plate = "' .. plate .. '"') if result and result[1] then vehiclesCache[plate] = {} vehiclesCache[plate][result[1].owner] = true local otherKeys = json.decode(result[1].peopleWithKeys) - if not otherKeys then otherKeys = {} end + if not otherKeys then + otherKeys = {} + end for _, v in pairs(otherKeys) do vehiclesCache[plate][v] = true end @@ -41,69 +45,68 @@ RegisterNetEvent('carkeys:RequestVehicleLock', function(netId, lockstatus) end if vehiclesCache[plate] and (vehiclesCache[plate][xPlayer.identifier] or vehiclesCache[plate][xPlayer.job.name]) then SetVehicleDoorsLocked(vehicle, lockstatus == 2 and 1 or 2) - TriggerClientEvent('carlock:CarLockedEffect', xPlayer.source, netId, lockstatus ~= 2) + TriggerClientEvent("carlock:CarLockedEffect", xPlayer.source, netId, lockstatus ~= 2) else - xPlayer.showNotification(_U('no_keys')) + xPlayer.showNotification(_U("no_keys")) end end) -RegisterNetEvent('carkeys:GiveKeyToPerson', function(plate, target) +RegisterNetEvent("carkeys:GiveKeyToPerson", function(plate, target) local xPlayer = ESX.GetPlayerFromId(source) - local owner = MySQL.Sync.fetchScalar('SELECT owner FROM owned_vehicles WHERE plate = "'..plate..'"') + local owner = MySQL.Sync.fetchScalar('SELECT owner FROM owned_vehicles WHERE plate = "' .. plate .. '"') if owner == xPlayer.identifier then local xTarget = ESX.GetPlayerFromId(target) - local peopleWithKeys = MySQL.Sync.fetchScalar('SELECT peopleWithKeys FROM owned_vehicles WHERE plate = "'..plate..'"') + local peopleWithKeys = MySQL.Sync.fetchScalar('SELECT peopleWithKeys FROM owned_vehicles WHERE plate = "' .. plate .. '"') local keysTable = json.decode(peopleWithKeys) or {} keysTable[xTarget.identifier] = true - MySQL.Async.execute('UPDATE owned_vehicles SET peopleWithKeys = @peopleWithKeys WHERE plate = @plate', { - ['@peopleWithKeys'] = json.encode(keysTable), - ['@plate'] = plate + MySQL.Async.execute("UPDATE owned_vehicles SET peopleWithKeys = @peopleWithKeys WHERE plate = @plate", { + ["@peopleWithKeys"] = json.encode(keysTable), + ["@plate"] = plate, }, function(rowsUpdated) if rowsUpdated > 0 then - xTarget.showNotification(_U('received_keys', plate)) - xPlayer.showNotification(_U('gave_keys', plate)) + xTarget.showNotification(_U("received_keys", plate)) + xPlayer.showNotification(_U("gave_keys", plate)) end end) if vehiclesCache[plate] then vehiclesCache[plate][xTarget.identifier] = true end - else - xPlayer.showNotification(_U('not_yours_vehicle')) + xPlayer.showNotification(_U("not_yours_vehicle")) end end) -RegisterNetEvent('carkeys:NewLocks', function(plate) +RegisterNetEvent("carkeys:NewLocks", function(plate) local xPlayer = ESX.GetPlayerFromId(source) - local isOwned = MySQL.Sync.fetchScalar('SELECT 1 FROM owned_vehicles WHERE plate = "'..plate..'" AND owner = "'..xPlayer.identifier..'"') + local isOwned = MySQL.Sync.fetchScalar('SELECT 1 FROM owned_vehicles WHERE plate = "' .. plate .. '" AND owner = "' .. xPlayer.identifier .. '"') if isOwned then if xPlayer.getMoney() >= Config.Price then xPlayer.removeMoney(Config.Price) - elseif xPlayer.getAccount('bank').money >= Config.Price then - xPlayer.removeAccountMoney('bank', Config.Price) + elseif xPlayer.getAccount("bank").money >= Config.Price then + xPlayer.removeAccountMoney("bank", Config.Price) else - xPlayer.showNotification(_U('not_enough_money')) + xPlayer.showNotification(_U("not_enough_money")) return end - xPlayer.showNotification(_U('paid_for_locks', Config.Price)) - xPlayer.showNotification(_U('wait_new_locks')) - TriggerClientEvent('progressBars:StartUI', xPlayer.source, 30000, _U('installing_new_locks')) + xPlayer.showNotification(_U("paid_for_locks", Config.Price)) + xPlayer.showNotification(_U("wait_new_locks")) + TriggerClientEvent("progressBars:StartUI", xPlayer.source, 30000, _U("installing_new_locks")) FreezeEntityPosition(GetPlayerPed(xPlayer.source), true) local playersVeh = GetVehiclePedIsIn(GetPlayerPed(xPlayer.source)) FreezeEntityPosition(playersVeh, true) Wait(30000) FreezeEntityPosition(GetPlayerPed(xPlayer.source), false) FreezeEntityPosition(playersVeh, false) - MySQL.Async.execute('UPDATE owned_vehicles SET peopleWithKeys = "[]" WHERE plate = "'..plate..'"', {}, function(rowsUpdated) + MySQL.Async.execute('UPDATE owned_vehicles SET peopleWithKeys = "[]" WHERE plate = "' .. plate .. '"', {}, function(rowsUpdated) if rowsUpdated > 0 then - xPlayer.showNotification(_('locks_replaced')) + xPlayer.showNotification(_("locks_replaced")) vehiclesCache[plate] = {} vehiclesCache[plate][xPlayer.identifier] = true end end) else - xPlayer.showNotification(_U('not_yours_vehicle')) + xPlayer.showNotification(_U("not_yours_vehicle")) end -end) \ No newline at end of file +end) diff --git a/server-data/resources/[sqz]/sqz_carkeys/sql.sql b/server-data/resources/[sqz]/sqz_carkeys/sql.sql index 39ece6c5c..fed7886d4 100644 --- a/server-data/resources/[sqz]/sqz_carkeys/sql.sql +++ b/server-data/resources/[sqz]/sqz_carkeys/sql.sql @@ -1,3 +1,4 @@ -ALTER TABLE `owned_vehicles` - ADD COLUMN `peopleWithKeys` LONGTEXT NULL -; \ No newline at end of file +ALTER TABLE + `owned_vehicles` +ADD + COLUMN `peopleWithKeys` LONGTEXT NULL; \ No newline at end of file From 946dd56219455e481327a85bf652ee09209ed0a4 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:14:14 +0100 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wasabi_mining/bridge/esx/client.lua | 40 +++++++++++-------- .../wasabi_mining/bridge/esx/server.lua | 22 ++++++---- .../[wasabi]/wasabi_mining/client/client.lua | 30 +++++++------- .../wasabi_mining/client/functions.lua | 10 ++--- .../wasabi_mining/configuration/config.lua | 27 ++++++------- .../wasabi_mining/configuration/strings.lua | 34 ++++++++-------- .../[wasabi]/wasabi_mining/fxmanifest.lua | 20 +++++----- .../[wasabi]/wasabi_mining/server/server.lua | 16 ++++---- 8 files changed, 105 insertions(+), 94 deletions(-) diff --git a/server-data/resources/[wasabi]/wasabi_mining/bridge/esx/client.lua b/server-data/resources/[wasabi]/wasabi_mining/bridge/esx/client.lua index aa24fcf8b..6d7cbbbdc 100644 --- a/server-data/resources/[wasabi]/wasabi_mining/bridge/esx/client.lua +++ b/server-data/resources/[wasabi]/wasabi_mining/bridge/esx/client.lua @@ -1,57 +1,63 @@ -if GetResourceState('es_extended') ~= 'started' then return end -ESX = exports['es_extended']:getSharedObject() -Framework, PlayerLoaded, PlayerData = 'esx', nil, {} +if GetResourceState("es_extended") ~= "started" then + return +end +ESX = exports["es_extended"]:getSharedObject() +Framework, PlayerLoaded, PlayerData = "esx", nil, {} -RegisterNetEvent('esx:playerLoaded', function(xPlayer) +RegisterNetEvent("esx:playerLoaded", function(xPlayer) PlayerData = xPlayer PlayerLoaded = true end) -RegisterNetEvent('esx:onPlayerSpawn', function() - TriggerEvent('wasabi_bridge:onPlayerSpawn') +RegisterNetEvent("esx:onPlayerSpawn", function() + TriggerEvent("wasabi_bridge:onPlayerSpawn") end) -AddEventHandler('esx:onPlayerDeath', function(data) - TriggerEvent('wasabi_bridge:onPlayerDeath') +AddEventHandler("esx:onPlayerDeath", function(data) + TriggerEvent("wasabi_bridge:onPlayerDeath") end) -RegisterNetEvent('esx:onPlayerLogout', function() +RegisterNetEvent("esx:onPlayerLogout", function() table.wipe(PlayerData) PlayerLoaded = false end) -RegisterNetEvent('esx:setJob', function(job) +RegisterNetEvent("esx:setJob", function(job) PlayerData.job = job end) -AddEventHandler('onResourceStart', function(resourceName) - if GetCurrentResourceName() ~= resourceName or not ESX.PlayerLoaded then return end +AddEventHandler("onResourceStart", function(resourceName) + if GetCurrentResourceName() ~= resourceName or not ESX.PlayerLoaded then + return + end PlayerData = ESX.GetPlayerData() PlayerLoaded = true end) -AddEventHandler('esx:setPlayerData', function(key, value) - if GetInvokingResource() ~= 'es_extended' then return end +AddEventHandler("esx:setPlayerData", function(key, value) + if GetInvokingResource() ~= "es_extended" then + return + end PlayerData[key] = value end) function HasGroup(filter) local type = type(filter) - if type == 'string' then + if type == "string" then if PlayerData.job.name == filter then return PlayerData.job.name, PlayerData.job.grade end else local tabletype = table.type(filter) - if tabletype == 'hash' then + if tabletype == "hash" then local grade = filter[PlayerData.job.name] if grade and grade <= PlayerData.job.grade then return PlayerData.job.name, PlayerData.job.grade end - elseif tabletype == 'array' then + elseif tabletype == "array" then for i = 1, #filter do if PlayerData.job.name == filter[i] then return PlayerData.job.name, PlayerData.job.grade diff --git a/server-data/resources/[wasabi]/wasabi_mining/bridge/esx/server.lua b/server-data/resources/[wasabi]/wasabi_mining/bridge/esx/server.lua index a345578a1..2d56efce1 100644 --- a/server-data/resources/[wasabi]/wasabi_mining/bridge/esx/server.lua +++ b/server-data/resources/[wasabi]/wasabi_mining/bridge/esx/server.lua @@ -1,6 +1,8 @@ -if GetResourceState('es_extended') ~= 'started' then return end -ESX = exports['es_extended']:getSharedObject() -Framework = 'esx' +if GetResourceState("es_extended") ~= "started" then + return +end +ESX = exports["es_extended"]:getSharedObject() +Framework = "esx" function GetPlayer(source) return ESX.GetPlayerFromId(source) @@ -15,20 +17,20 @@ function HasGroup(source, filter) local player = GetPlayer(source) local type = type(filter) - if type == 'string' then + if type == "string" then if player.job.name == filter then return player.job.name, player.job.grade end else local tabletype = table.type(filter) - if tabletype == 'hash' then + if tabletype == "hash" then local grade = filter[player.job.name] if grade and grade <= player.job.grade then return player.job.name, player.job.grade end - elseif tabletype == 'array' then + elseif tabletype == "array" then for i = 1, #filter do if player.job.name == filter[i] then return player.job.name, player.job.grade @@ -73,13 +75,17 @@ function RemoveItem(source, item, count, slot, metadata) end function AddMoney(source, type, amount) - if type == 'cash' then type = 'money' end + if type == "cash" then + type = "money" + end local player = GetPlayer(source) player.addAccountMoney(type, amount) end function RemoveMoney(source, type, amount) - if type == 'cash' then type = 'money' end + if type == "cash" then + type = "money" + end local player = GetPlayer(source) player.removeAccountMoney(type, amount) end diff --git a/server-data/resources/[wasabi]/wasabi_mining/client/client.lua b/server-data/resources/[wasabi]/wasabi_mining/client/client.lua index 161f67c71..5d9220568 100644 --- a/server-data/resources/[wasabi]/wasabi_mining/client/client.lua +++ b/server-data/resources/[wasabi]/wasabi_mining/client/client.lua @@ -1,7 +1,7 @@ local mining = false CreateThread(function() - for i=1, #Config.miningAreas, 1 do + for i = 1, #Config.miningAreas, 1 do CreateBlip(Config.miningAreas[i], 85, 5, Strings.mining_blips, 0.75) end end) @@ -11,7 +11,7 @@ CreateThread(function() while true do local sleep = 1500 local pos = GetEntityCoords(cache.ped) - for i=1, #Config.miningAreas, 1 do + for i = 1, #Config.miningAreas, 1 do local dist = #(pos - Config.miningAreas[i]) if dist <= 2.0 and not mining then sleep = 0 @@ -21,7 +21,7 @@ CreateThread(function() end if IsControlJustReleased(0, 38) and dist <= 2.0 then lib.hideTextUI() - local output = lib.callback.await('wasabi_mining:checkPick', 100, 'pickaxe') + local output = lib.callback.await("wasabi_mining:checkPick", 100, "pickaxe") if output then mining = true local model = Config.axe.prop @@ -35,23 +35,23 @@ CreateThread(function() showHelp(Strings.intro_instruction) DisableControlAction(0, 24, true) if IsDisabledControlJustReleased(0, 24) then - lib.requestAnimDict('melee@hatchet@streamed_core', 100) - TaskPlayAnim(cache.ped, 'melee@hatchet@streamed_core', 'plyr_rear_takedown_b', 8.0, -8.0, -1, 2, 0, false, false, false) - local rockData = lib.callback.await('wasabi_mining:getRockData', 100) + lib.requestAnimDict("melee@hatchet@streamed_core", 100) + TaskPlayAnim(cache.ped, "melee@hatchet@streamed_core", "plyr_rear_takedown_b", 8.0, -8.0, -1, 2, 0, false, false, false) + local rockData = lib.callback.await("wasabi_mining:getRockData", 100) if lib.skillCheck(rockData.difficulty) then ClearPedTasks(cache.ped) tryMine(rockData, i) else local breakChance = math.random(1, 100) if breakChance < Config.axe.breakChance then - TriggerServerEvent('wasabi_mining:axeBroke') - TriggerEvent('wasabi_mining:notify', Strings.axe_broke, Strings.axe_broke_desc, 'error') + TriggerServerEvent("wasabi_mining:axeBroke") + TriggerEvent("wasabi_mining:notify", Strings.axe_broke, Strings.axe_broke_desc, "error") ClearPedTasks(cache.ped) textUI[i] = nil break end ClearPedTasks(PlayerPedId()) - TriggerEvent('wasabi_mining:notify', Strings.failed_mine, Strings.failed_mine_desc, 'error') + TriggerEvent("wasabi_mining:notify", Strings.failed_mine, Strings.failed_mine_desc, "error") end elseif IsControlJustReleased(0, 194) then textUI[i] = nil @@ -65,9 +65,9 @@ CreateThread(function() textUI[i] = nil DeleteObject(axe) SetModelAsNoLongerNeeded(model) - RemoveAnimDict('melee@hatchet@streamed_core') + RemoveAnimDict("melee@hatchet@streamed_core") elseif not output then - TriggerEvent('wasabi_mining:notify', Strings.no_pickaxe, Strings.no_pickaxe_desc, 'error') + TriggerEvent("wasabi_mining:notify", Strings.no_pickaxe, Strings.no_pickaxe_desc, "error") end end elseif dist >= 2.1 then @@ -81,7 +81,7 @@ CreateThread(function() end end) -RegisterNetEvent('wasabi_mining:alertStaff') -AddEventHandler('wasabi_mining:alertStaff', function() - TriggerEvent('wasabi_mining:notify', Strings.possible_cheater, Strings.possible_cheater_desc, 'error') -end) \ No newline at end of file +RegisterNetEvent("wasabi_mining:alertStaff") +AddEventHandler("wasabi_mining:alertStaff", function() + TriggerEvent("wasabi_mining:notify", Strings.possible_cheater, Strings.possible_cheater_desc, "error") +end) diff --git a/server-data/resources/[wasabi]/wasabi_mining/client/functions.lua b/server-data/resources/[wasabi]/wasabi_mining/client/functions.lua index a8053cd0c..48c04260e 100644 --- a/server-data/resources/[wasabi]/wasabi_mining/client/functions.lua +++ b/server-data/resources/[wasabi]/wasabi_mining/client/functions.lua @@ -1,5 +1,5 @@ showHelp = function(msg) - BeginTextCommandDisplayHelp('STRING') + BeginTextCommandDisplayHelp("STRING") AddTextComponentSubstringPlayerName(msg) EndTextCommandDisplayHelp(0, false, true, -1) end @@ -10,12 +10,12 @@ CreateBlip = function(coords, sprite, colour, text, scale) SetBlipColour(blip, colour) SetBlipAsShortRange(blip, true) SetBlipScale(blip, scale) - AddTextEntry(text, text) - BeginTextCommandSetBlipName(text) - EndTextCommandSetBlipName(blip) + AddTextEntry(text, text) + BeginTextCommandSetBlipName(text) + EndTextCommandSetBlipName(blip) return blip end tryMine = function(data, index) - TriggerServerEvent('wasabi_mining:mineRock', data, index) + TriggerServerEvent("wasabi_mining:mineRock", data, index) end diff --git a/server-data/resources/[wasabi]/wasabi_mining/configuration/config.lua b/server-data/resources/[wasabi]/wasabi_mining/configuration/config.lua index 4fa6764f9..8de1a863f 100644 --- a/server-data/resources/[wasabi]/wasabi_mining/configuration/config.lua +++ b/server-data/resources/[wasabi]/wasabi_mining/configuration/config.lua @@ -1,19 +1,18 @@ Config = {} Config.axe = { prop = `prop_tool_pickaxe`, --Default: `prop_tool_pickaxe` - breakChance = 20 -- When failing to mine rock, this is the percentage of a chance that your pickaxe will 'break' + breakChance = 20, -- When failing to mine rock, this is the percentage of a chance that your pickaxe will 'break' } Config.rocks = { -- Items obtained from mining - { item = 'emerald', label = 'Emerald', difficulty = {'easy'} }, - { item = 'diamond', label = 'Diamond', difficulty = {'easy'} }, - { item = 'copper', label = 'Copper', difficulty = {'easy'} }, - { item = 'iron', label = 'Iron', difficulty = {'easy'} }, - { item = 'steel', label = 'Steel', difficulty = {'easy'} }, - { item = 'gunpowder', label = 'polvere da sparo', difficulty = {'easy'}}, + { item = "emerald", label = "Emerald", difficulty = { "easy" } }, + { item = "diamond", label = "Diamond", difficulty = { "easy" } }, + { item = "copper", label = "Copper", difficulty = { "easy" } }, + { item = "iron", label = "Iron", difficulty = { "easy" } }, + { item = "steel", label = "Steel", difficulty = { "easy" } }, + { item = "gunpowder", label = "polvere da sparo", difficulty = { "easy" } }, } - Config.miningAreas = { vec3(2977.45, 2741.62, 44.62), -- vec3 of locations for mining stones vec3(2982.64, 2750.89, 42.99), @@ -21,23 +20,23 @@ Config.miningAreas = { vec3(2958.21, 2725.44, 50.16), vec3(2946.3, 2725.36, 47.94), vec3(3004.01, 2763.27, 43.56), - vec3(3001.79, 2791.01, 44.82) + vec3(3001.79, 2791.01, 44.82), } -RegisterNetEvent('wasabi_mining:notify') -AddEventHandler('wasabi_mining:notify', function(title, message, msgType) +RegisterNetEvent("wasabi_mining:notify") +AddEventHandler("wasabi_mining:notify", function(title, message, msgType) -- Place notification system info here, ex: exports['mythic_notify']:SendAlert('inform', message) if not msgType then lib.notify({ title = title, description = message, - type = 'inform' + type = "inform", }) else lib.notify({ title = title, description = message, - type = msgType + type = msgType, }) end -end) \ No newline at end of file +end) diff --git a/server-data/resources/[wasabi]/wasabi_mining/configuration/strings.lua b/server-data/resources/[wasabi]/wasabi_mining/configuration/strings.lua index 74cf3731d..89671fa52 100644 --- a/server-data/resources/[wasabi]/wasabi_mining/configuration/strings.lua +++ b/server-data/resources/[wasabi]/wasabi_mining/configuration/strings.lua @@ -1,18 +1,18 @@ Strings = { - mining_blips = 'miniera', - intro_instruction = 'Premi ~INPUT_ATTACK~ per estrarre il minerale, ~INPUT_FRONTEND_RRIGHT~ per cancellare.', - mine_rock = '[E] - mina', - rewarded = 'roccia estratta', - rewarded_desc = 'Hai estratto con successo 1x', - failed_mine = 'Fallito', - failed_mine_desc = 'Non sei riuscito a estrarre il minerale!', - no_pickaxe = 'Nessun piccone', - no_pickaxe_desc = 'Non hai un piccone!', - axe_broke = 'piccone rotto', - axe_broke_desc = 'Hai colpito male la roccia, la tua ascia si è spezzata!', - cantcarry = 'Non puoi trasportare', - cantcarry_desc = 'Non hai più spazio per trasportare', - possible_cheater = 'Exploit rilevato', - possible_cheater_desc = 'Sei stato segnalato allo staff.', - kicked = 'Sei stato espulso e segnalato allo staff per possibile imbroglio.' -} \ No newline at end of file + mining_blips = "miniera", + intro_instruction = "Premi ~INPUT_ATTACK~ per estrarre il minerale, ~INPUT_FRONTEND_RRIGHT~ per cancellare.", + mine_rock = "[E] - mina", + rewarded = "roccia estratta", + rewarded_desc = "Hai estratto con successo 1x", + failed_mine = "Fallito", + failed_mine_desc = "Non sei riuscito a estrarre il minerale!", + no_pickaxe = "Nessun piccone", + no_pickaxe_desc = "Non hai un piccone!", + axe_broke = "piccone rotto", + axe_broke_desc = "Hai colpito male la roccia, la tua ascia si è spezzata!", + cantcarry = "Non puoi trasportare", + cantcarry_desc = "Non hai più spazio per trasportare", + possible_cheater = "Exploit rilevato", + possible_cheater_desc = "Sei stato segnalato allo staff.", + kicked = "Sei stato espulso e segnalato allo staff per possibile imbroglio.", +} diff --git a/server-data/resources/[wasabi]/wasabi_mining/fxmanifest.lua b/server-data/resources/[wasabi]/wasabi_mining/fxmanifest.lua index fb6ab8a4c..ddcbe2fd1 100644 --- a/server-data/resources/[wasabi]/wasabi_mining/fxmanifest.lua +++ b/server-data/resources/[wasabi]/wasabi_mining/fxmanifest.lua @@ -1,15 +1,15 @@ -fx_version 'cerulean' -game 'gta5' -lua54 'yes' +fx_version("cerulean") +game("gta5") +lua54("yes") -version '2.0.2' -author 'wasabirobby#5110' -description 'A simple yet smooth ESX based mining script' +version("2.0.2") +author("wasabirobby#5110") +description("A simple yet smooth ESX based mining script") -shared_scripts { '@ox_lib/init.lua', 'configuration/*.lua' } +shared_scripts({ "@ox_lib/init.lua", "configuration/*.lua" }) -client_scripts { 'bridge/**/client.lua', 'client/*.lua' } +client_scripts({ "bridge/**/client.lua", "client/*.lua" }) -server_scripts { 'bridge/**/server.lua', 'server/*.lua' } +server_scripts({ "bridge/**/server.lua", "server/*.lua" }) -dependencies { 'ox_lib' } +dependencies({ "ox_lib" }) diff --git a/server-data/resources/[wasabi]/wasabi_mining/server/server.lua b/server-data/resources/[wasabi]/wasabi_mining/server/server.lua index a49fdfa6e..ed1a1a1df 100644 --- a/server-data/resources/[wasabi]/wasabi_mining/server/server.lua +++ b/server-data/resources/[wasabi]/wasabi_mining/server/server.lua @@ -1,4 +1,4 @@ -lib.callback.register('wasabi_mining:checkPick', function(source, itemname) +lib.callback.register("wasabi_mining:checkPick", function(source, itemname) local item = HasItem(source, itemname) if item >= 1 then return true @@ -7,7 +7,7 @@ lib.callback.register('wasabi_mining:checkPick', function(source, itemname) end end) -lib.callback.register('wasabi_mining:getRockData', function() +lib.callback.register("wasabi_mining:getRockData", function() local data = Config.rocks[math.random(#Config.rocks)] return data end) @@ -26,15 +26,15 @@ AddEventHandler("wasabi_mining:mineRock", function(data, index) return end AddItem(source, data.item, 1) - TriggerClientEvent('wasabi_mining:notify', source, Strings.rewarded, Strings.rewarded_desc..' '..data.label, 'success') + TriggerClientEvent("wasabi_mining:notify", source, Strings.rewarded, Strings.rewarded_desc .. " " .. data.label, "success") end) -RegisterServerEvent('wasabi_mining:axeBroke') -AddEventHandler('wasabi_mining:axeBroke', function() - if HasItem(source, 'pickaxe') >= 1 then - RemoveItem(source, 'pickaxe', 1) +RegisterServerEvent("wasabi_mining:axeBroke") +AddEventHandler("wasabi_mining:axeBroke", function() + if HasItem(source, "pickaxe") >= 1 then + RemoveItem(source, "pickaxe", 1) else Wait(2000) KickPlayer(source, Strings.kicked) end -end) \ No newline at end of file +end)