From 98dddfaca40ea4470edf7941994e7d2044e6af2a Mon Sep 17 00:00:00 2001 From: userMacieG Date: Tue, 3 May 2022 01:52:35 +0200 Subject: [PATCH] Tabs to spaces --- dlc_bikers/clubhouse1.lua | 2 +- dlc_bikers/cocaine.lua | 2 +- dlc_bikers/meth.lua | 2 +- dlc_bikers/weed.lua | 2 +- dlc_casino/penthouse.lua | 2 +- dlc_executive/apartment1.lua | 120 +++++++------- dlc_executive/apartment2.lua | 118 +++++++------- dlc_executive/apartment3.lua | 120 +++++++------- dlc_finance/office2.lua | 292 +++++++++++++++++----------------- dlc_finance/office3.lua | 292 +++++++++++++++++----------------- dlc_finance/office4.lua | 292 +++++++++++++++++----------------- dlc_gunrunning/bunkers.lua | 22 +-- dlc_gunrunning/yacht.lua | 2 +- dlc_heists/carrier.lua | 42 ++--- dlc_high_life/apartment2.lua | 48 +++--- dlc_high_life/apartment3.lua | 48 +++--- dlc_high_life/apartment4.lua | 2 +- dlc_high_life/apartment5.lua | 2 +- dlc_high_life/apartment6.lua | 2 +- dlc_import/garage1.lua | 154 +++++++++--------- dlc_import/garage2.lua | 154 +++++++++--------- dlc_import/garage3.lua | 154 +++++++++--------- dlc_import/garage4.lua | 154 +++++++++--------- dlc_security/office4.lua | 2 +- dlc_security/studio.lua | 2 +- fxmanifest.lua | 220 ++++++++++++------------- gta_online/apartment_hi_1.lua | 2 +- gta_online/apartment_hi_2.lua | 2 +- gta_online/house_hi_5.lua | 2 +- gtav/ammunations.lua | 2 +- gtav/north_yankton.lua | 64 ++++---- gtav/pillbox_hospital.lua | 2 +- gtav/red_carpet.lua | 12 +- 33 files changed, 1169 insertions(+), 1169 deletions(-) diff --git a/dlc_bikers/clubhouse1.lua b/dlc_bikers/clubhouse1.lua index ca1d648..bfdcec7 100644 --- a/dlc_bikers/clubhouse1.lua +++ b/dlc_bikers/clubhouse1.lua @@ -343,7 +343,7 @@ BikerClubhouse1 = { "id_stash2", "id_stash3" }, - + Set = function(stage, refresh) BikerClubhouse1.Documents.Clear(false) diff --git a/dlc_bikers/cocaine.lua b/dlc_bikers/cocaine.lua index 8510d6d..448470d 100644 --- a/dlc_bikers/cocaine.lua +++ b/dlc_bikers/cocaine.lua @@ -92,7 +92,7 @@ BikerCocaine = { BikerCocaine.Ipl.Interior.Load() BikerCocaine.Style.Set(BikerCocaine.Style.basic) BikerCocaine.Security.Set(BikerCocaine.Security.none) - + RefreshInterior(BikerCocaine.interiorId) end } diff --git a/dlc_bikers/meth.lua b/dlc_bikers/meth.lua index 3ddb982..7f88a9a 100644 --- a/dlc_bikers/meth.lua +++ b/dlc_bikers/meth.lua @@ -81,7 +81,7 @@ BikerMethLab = { BikerMethLab.Style.Set(BikerMethLab.Style.empty) BikerMethLab.Security.Set(BikerMethLab.Security.none) BikerMethLab.Details.Enable(BikerMethLab.Details.production, false) - + RefreshInterior(BikerMethLab.interiorId) end } diff --git a/dlc_bikers/weed.lua b/dlc_bikers/weed.lua index d8ac723..7983880 100644 --- a/dlc_bikers/weed.lua +++ b/dlc_bikers/weed.lua @@ -5,7 +5,7 @@ end) BikerWeedFarm = { interiorId = 247297, - + Ipl = { Interior = { ipl = "bkr_biker_interior_placement_interior_3_biker_dlc_int_ware02_milo", diff --git a/dlc_casino/penthouse.lua b/dlc_casino/penthouse.lua index 707db86..d9e4ea8 100644 --- a/dlc_casino/penthouse.lua +++ b/dlc_casino/penthouse.lua @@ -281,7 +281,7 @@ DiamondPenthouse = { Bar = { enabled = "Set_Pent_BAR_BLOCKER", disabled = "", - + Set = function(blocker, refresh) DiamondPenthouse.Interior.Blockers.Bar.Clear(false) diff --git a/dlc_executive/apartment1.lua b/dlc_executive/apartment1.lua index d4805ee..8aa25f6 100644 --- a/dlc_executive/apartment1.lua +++ b/dlc_executive/apartment1.lua @@ -1,6 +1,6 @@ -- Apartment 1: -787.78050000 334.92320000 215.83840000 exports('GetExecApartment1Object', function() - return ExecApartment1 + return ExecApartment1 end) ExecApartment1 = { @@ -9,37 +9,37 @@ ExecApartment1 = { Style = { Theme = { modern = { - interiorId = 227329, - ipl = "apa_v_mp_h_01_a" - }, + interiorId = 227329, + ipl = "apa_v_mp_h_01_a" + }, moody = { - interiorId = 228097, - ipl = "apa_v_mp_h_02_a" - }, + interiorId = 228097, + ipl = "apa_v_mp_h_02_a" + }, vibrant = { - interiorId = 228865, - ipl = "apa_v_mp_h_03_a" - }, + interiorId = 228865, + ipl = "apa_v_mp_h_03_a" + }, sharp = { - interiorId = 229633, - ipl = "apa_v_mp_h_04_a" - }, + interiorId = 229633, + ipl = "apa_v_mp_h_04_a" + }, monochrome = { - interiorId = 230401, - ipl = "apa_v_mp_h_05_a" - }, + interiorId = 230401, + ipl = "apa_v_mp_h_05_a" + }, seductive = { - interiorId = 231169, - ipl = "apa_v_mp_h_06_a" - }, + interiorId = 231169, + ipl = "apa_v_mp_h_06_a" + }, regal = { - interiorId = 231937, - ipl = "apa_v_mp_h_07_a" - }, + interiorId = 231937, + ipl = "apa_v_mp_h_07_a" + }, aqua = { - interiorId = 232705, - ipl = "apa_v_mp_h_08_a" - } + interiorId = 232705, + ipl = "apa_v_mp_h_08_a" + } }, Set = function(style, refresh) @@ -50,35 +50,35 @@ ExecApartment1 = { EnableIpl(style.ipl, true) if refresh then - RefreshInterior(style.interiorId) - end + RefreshInterior(style.interiorId) + end end end, Clear = function() for key, value in pairs(ExecApartment1.Style.Theme) do SetIplPropState(value.interiorId, { - "Apart_Hi_Strip_A", - "Apart_Hi_Strip_B", - "Apart_Hi_Strip_C" - }, false) + "Apart_Hi_Strip_A", + "Apart_Hi_Strip_B", + "Apart_Hi_Strip_C" + }, false) SetIplPropState(value.interiorId, { - "Apart_Hi_Booze_A", - "Apart_Hi_Booze_B", - "Apart_Hi_Booze_C" - }, false) + "Apart_Hi_Booze_A", + "Apart_Hi_Booze_B", + "Apart_Hi_Booze_C" + }, false) SetIplPropState(value.interiorId, { - "Apart_Hi_Smokes_A", - "Apart_Hi_Smokes_B", - "Apart_Hi_Smokes_C" - }, false, true) + "Apart_Hi_Smokes_A", + "Apart_Hi_Smokes_B", + "Apart_Hi_Smokes_C" + }, false, true) EnableIpl(value.ipl, false) end end }, Strip = { A = "Apart_Hi_Strip_A", - B = "Apart_Hi_Strip_B", - C = "Apart_Hi_Strip_C", + B = "Apart_Hi_Strip_B", + C = "Apart_Hi_Strip_C", Enable = function(details, state, refresh) SetIplPropState(ExecApartment1.currentInteriorId, details, state, refresh) @@ -86,8 +86,8 @@ ExecApartment1 = { }, Booze = { A = "Apart_Hi_Booze_A", - B = "Apart_Hi_Booze_B", - C = "Apart_Hi_Booze_C", + B = "Apart_Hi_Booze_B", + C = "Apart_Hi_Booze_C", Enable = function(details, state, refresh) SetIplPropState(ExecApartment1.currentInteriorId, details, state, refresh) @@ -95,9 +95,9 @@ ExecApartment1 = { }, Smoke = { none = "", - stage1 = "Apart_Hi_Smokes_A", - stage2 = "Apart_Hi_Smokes_B", - stage3 = "Apart_Hi_Smokes_C", + stage1 = "Apart_Hi_Smokes_A", + stage2 = "Apart_Hi_Smokes_B", + stage3 = "Apart_Hi_Smokes_C", Set = function(smoke, refresh) ExecApartment1.Smoke.Clear(false) @@ -106,31 +106,31 @@ ExecApartment1 = { SetIplPropState(ExecApartment1.currentInteriorId, smoke, true, refresh) else if refresh then - RefreshInterior(ExecApartment1.currentInteriorId) - end + RefreshInterior(ExecApartment1.currentInteriorId) + end end end, Clear = function(refresh) SetIplPropState(ExecApartment1.currentInteriorId, { - ExecApartment1.Smoke.stage1, - ExecApartment1.Smoke.stage2, - ExecApartment1.Smoke.stage3 - }, false, refresh) + ExecApartment1.Smoke.stage1, + ExecApartment1.Smoke.stage2, + ExecApartment1.Smoke.stage3 + }, false, refresh) end }, LoadDefault = function() ExecApartment1.Style.Set(ExecApartment1.Style.Theme.modern, true) ExecApartment1.Strip.Enable({ - ExecApartment1.Strip.A, - ExecApartment1.Strip.B, - ExecApartment1.Strip.C - }, false) + ExecApartment1.Strip.A, + ExecApartment1.Strip.B, + ExecApartment1.Strip.C + }, false) ExecApartment1.Booze.Enable({ - ExecApartment1.Booze.A, - ExecApartment1.Booze.B, - ExecApartment1.Booze.C - }, false) + ExecApartment1.Booze.A, + ExecApartment1.Booze.B, + ExecApartment1.Booze.C + }, false) ExecApartment1.Smoke.Set(ExecApartment1.Smoke.none) end } diff --git a/dlc_executive/apartment2.lua b/dlc_executive/apartment2.lua index 729f7a4..0b29871 100644 --- a/dlc_executive/apartment2.lua +++ b/dlc_executive/apartment2.lua @@ -1,6 +1,6 @@ -- Apartment 2: -773.22580000 322.82520000 194.88620000 exports('GetExecApartment2Object', function() - return ExecApartment2 + return ExecApartment2 end) ExecApartment2 = { @@ -9,37 +9,37 @@ ExecApartment2 = { Style = { Theme = { modern = { - interiorId = 227585, - ipl = "apa_v_mp_h_01_b" - }, + interiorId = 227585, + ipl = "apa_v_mp_h_01_b" + }, moody = { - interiorId = 228353, - ipl = "apa_v_mp_h_02_b" - }, + interiorId = 228353, + ipl = "apa_v_mp_h_02_b" + }, vibrant = { - interiorId = 229121, - ipl = "apa_v_mp_h_03_b" - }, + interiorId = 229121, + ipl = "apa_v_mp_h_03_b" + }, sharp = { - interiorId = 229889, - ipl = "apa_v_mp_h_04_b" - }, + interiorId = 229889, + ipl = "apa_v_mp_h_04_b" + }, monochrome = { - interiorId = 230657, - ipl = "apa_v_mp_h_05_b" - }, + interiorId = 230657, + ipl = "apa_v_mp_h_05_b" + }, seductive = { - interiorId = 231425, - ipl = "apa_v_mp_h_06_b" - }, + interiorId = 231425, + ipl = "apa_v_mp_h_06_b" + }, regal = { - interiorId = 232193, - ipl = "apa_v_mp_h_07_b" - }, + interiorId = 232193, + ipl = "apa_v_mp_h_07_b" + }, aqua = { - interiorId = 232961, - ipl = "apa_v_mp_h_08_b" - } + interiorId = 232961, + ipl = "apa_v_mp_h_08_b" + } }, Set = function(style, refresh) @@ -50,34 +50,34 @@ ExecApartment2 = { EnableIpl(style.ipl, true) if refresh then - RefreshInterior(style.interiorId) - end + RefreshInterior(style.interiorId) + end end end, Clear = function() for key, value in pairs(ExecApartment2.Style.Theme) do SetIplPropState(value.interiorId, { - "Apart_Hi_Strip_A", - "Apart_Hi_Strip_B", - "Apart_Hi_Strip_C"}, false) + "Apart_Hi_Strip_A", + "Apart_Hi_Strip_B", + "Apart_Hi_Strip_C"}, false) SetIplPropState(value.interiorId, { - "Apart_Hi_Booze_A", - "Apart_Hi_Booze_B", - "Apart_Hi_Booze_C" - }, false) + "Apart_Hi_Booze_A", + "Apart_Hi_Booze_B", + "Apart_Hi_Booze_C" + }, false) SetIplPropState(value.interiorId, { - "Apart_Hi_Smokes_A", - "Apart_Hi_Smokes_B", - "Apart_Hi_Smokes_C" - }, false, true) + "Apart_Hi_Smokes_A", + "Apart_Hi_Smokes_B", + "Apart_Hi_Smokes_C" + }, false, true) EnableIpl(value.ipl, false) end end }, Strip = { A = "Apart_Hi_Strip_A", - B = "Apart_Hi_Strip_B", - C = "Apart_Hi_Strip_C", + B = "Apart_Hi_Strip_B", + C = "Apart_Hi_Strip_C", Enable = function(details, state, refresh) SetIplPropState(ExecApartment2.currentInteriorId, details, state, refresh) @@ -85,8 +85,8 @@ ExecApartment2 = { }, Booze = { A = "Apart_Hi_Booze_A", - B = "Apart_Hi_Booze_B", - C = "Apart_Hi_Booze_C", + B = "Apart_Hi_Booze_B", + C = "Apart_Hi_Booze_C", Enable = function(details, state, refresh) SetIplPropState(ExecApartment2.currentInteriorId, details, state, refresh) @@ -94,9 +94,9 @@ ExecApartment2 = { }, Smoke = { none = "", - stage1 = "Apart_Hi_Smokes_A", - stage2 = "Apart_Hi_Smokes_B", - stage3 = "Apart_Hi_Smokes_C", + stage1 = "Apart_Hi_Smokes_A", + stage2 = "Apart_Hi_Smokes_B", + stage3 = "Apart_Hi_Smokes_C", Set = function(smoke, refresh) ExecApartment2.Smoke.Clear(false) @@ -105,31 +105,31 @@ ExecApartment2 = { SetIplPropState(ExecApartment2.currentInteriorId, smoke, true, refresh) else if refresh then - RefreshInterior(ExecApartment2.currentInteriorId) - end + RefreshInterior(ExecApartment2.currentInteriorId) + end end end, Clear = function(refresh) SetIplPropState(ExecApartment2.currentInteriorId, { - ExecApartment2.Smoke.stage1, - ExecApartment2.Smoke.stage2, - ExecApartment2.Smoke.stage3 - }, false, refresh) + ExecApartment2.Smoke.stage1, + ExecApartment2.Smoke.stage2, + ExecApartment2.Smoke.stage3 + }, false, refresh) end }, LoadDefault = function() ExecApartment2.Style.Set(ExecApartment2.Style.Theme.seductive, true) ExecApartment2.Strip.Enable({ - ExecApartment2.Strip.A, - ExecApartment2.Strip.B, - ExecApartment2.Strip.C - }, false) + ExecApartment2.Strip.A, + ExecApartment2.Strip.B, + ExecApartment2.Strip.C + }, false) ExecApartment2.Booze.Enable({ - ExecApartment2.Booze.A, - ExecApartment2.Booze.B, - ExecApartment2.Booze.C - }, false) + ExecApartment2.Booze.A, + ExecApartment2.Booze.B, + ExecApartment2.Booze.C + }, false) ExecApartment2.Smoke.Set(ExecApartment2.Smoke.none) end } diff --git a/dlc_executive/apartment3.lua b/dlc_executive/apartment3.lua index ee67e48..5a008c9 100644 --- a/dlc_executive/apartment3.lua +++ b/dlc_executive/apartment3.lua @@ -1,6 +1,6 @@ -- Apartment 3: -787.78050000 334.92320000 186.11340000 exports('GetExecApartment3Object', function() - return ExecApartment3 + return ExecApartment3 end) ExecApartment3 = { @@ -9,37 +9,37 @@ ExecApartment3 = { Style = { Theme = { modern = { - interiorId = 227841, - ipl = "apa_v_mp_h_01_c" - }, + interiorId = 227841, + ipl = "apa_v_mp_h_01_c" + }, moody = { - interiorId = 228609, - ipl = "apa_v_mp_h_02_c" - }, + interiorId = 228609, + ipl = "apa_v_mp_h_02_c" + }, vibrant = { - interiorId = 229377, - ipl = "apa_v_mp_h_03_c" - }, + interiorId = 229377, + ipl = "apa_v_mp_h_03_c" + }, sharp = { - interiorId = 230145, - ipl = "apa_v_mp_h_04_c" - }, + interiorId = 230145, + ipl = "apa_v_mp_h_04_c" + }, monochrome = { - interiorId = 230913, - ipl = "apa_v_mp_h_05_c" - }, + interiorId = 230913, + ipl = "apa_v_mp_h_05_c" + }, seductive = { - interiorId = 231681, - ipl = "apa_v_mp_h_06_c" - }, + interiorId = 231681, + ipl = "apa_v_mp_h_06_c" + }, regal = { - interiorId = 232449, - ipl = "apa_v_mp_h_07_c" - }, + interiorId = 232449, + ipl = "apa_v_mp_h_07_c" + }, aqua = { - interiorId = 233217, - ipl = "apa_v_mp_h_08_c" - } + interiorId = 233217, + ipl = "apa_v_mp_h_08_c" + } }, Set = function(style, refresh) @@ -50,35 +50,35 @@ ExecApartment3 = { EnableIpl(style.ipl, true) if refresh then - RefreshInterior(style.interiorId) - end + RefreshInterior(style.interiorId) + end end end, Clear = function() for key, value in pairs(ExecApartment3.Style.Theme) do SetIplPropState(value.interiorId, { - "Apart_Hi_Strip_A", - "Apart_Hi_Strip_B", - "Apart_Hi_Strip_C" - }, false) + "Apart_Hi_Strip_A", + "Apart_Hi_Strip_B", + "Apart_Hi_Strip_C" + }, false) SetIplPropState(value.interiorId, { - "Apart_Hi_Booze_A", - "Apart_Hi_Booze_B", - "Apart_Hi_Booze_C" - }, false) + "Apart_Hi_Booze_A", + "Apart_Hi_Booze_B", + "Apart_Hi_Booze_C" + }, false) SetIplPropState(value.interiorId, { - "Apart_Hi_Smokes_A", - "Apart_Hi_Smokes_B", - "Apart_Hi_Smokes_C" - }, false, true) + "Apart_Hi_Smokes_A", + "Apart_Hi_Smokes_B", + "Apart_Hi_Smokes_C" + }, false, true) EnableIpl(value.ipl, false) end end }, Strip = { A = "Apart_Hi_Strip_A", - B = "Apart_Hi_Strip_B", - C = "Apart_Hi_Strip_C", + B = "Apart_Hi_Strip_B", + C = "Apart_Hi_Strip_C", Enable = function(details, state, refresh) SetIplPropState(ExecApartment3.currentInteriorId, details, state, refresh) @@ -86,8 +86,8 @@ ExecApartment3 = { }, Booze = { A = "Apart_Hi_Booze_A", - B = "Apart_Hi_Booze_B", - C = "Apart_Hi_Booze_C", + B = "Apart_Hi_Booze_B", + C = "Apart_Hi_Booze_C", Enable = function(details, state, refresh) SetIplPropState(ExecApartment3.currentInteriorId, details, state, refresh) @@ -95,9 +95,9 @@ ExecApartment3 = { }, Smoke = { none = "", - stage1 = "Apart_Hi_Smokes_A", - stage2 = "Apart_Hi_Smokes_B", - stage3 = "Apart_Hi_Smokes_C", + stage1 = "Apart_Hi_Smokes_A", + stage2 = "Apart_Hi_Smokes_B", + stage3 = "Apart_Hi_Smokes_C", Set = function(smoke, refresh) ExecApartment3.Smoke.Clear(false) @@ -106,31 +106,31 @@ ExecApartment3 = { SetIplPropState(ExecApartment3.currentInteriorId, smoke, true, refresh) else if refresh then - RefreshInterior(ExecApartment3.currentInteriorId) - end + RefreshInterior(ExecApartment3.currentInteriorId) + end end end, Clear = function(refresh) SetIplPropState(ExecApartment3.currentInteriorId, { - ExecApartment3.Smoke.stage1, - ExecApartment3.Smoke.stage2, - ExecApartment3.Smoke.stage3 - }, false, refresh) + ExecApartment3.Smoke.stage1, + ExecApartment3.Smoke.stage2, + ExecApartment3.Smoke.stage3 + }, false, refresh) end }, LoadDefault = function() ExecApartment3.Style.Set(ExecApartment3.Style.Theme.sharp, true) ExecApartment3.Strip.Enable({ - ExecApartment3.Strip.A, - ExecApartment3.Strip.B, - ExecApartment3.Strip.C - }, false) + ExecApartment3.Strip.A, + ExecApartment3.Strip.B, + ExecApartment3.Strip.C + }, false) ExecApartment3.Booze.Enable({ - ExecApartment3.Booze.A, - ExecApartment3.Booze.B, - ExecApartment3.Booze.C - }, false) + ExecApartment3.Booze.A, + ExecApartment3.Booze.B, + ExecApartment3.Booze.C + }, false) ExecApartment3.Smoke.Set(ExecApartment3.Smoke.none) end } diff --git a/dlc_finance/office2.lua b/dlc_finance/office2.lua index 6bb0572..75d2593 100644 --- a/dlc_finance/office2.lua +++ b/dlc_finance/office2.lua @@ -1,81 +1,81 @@ -- Office 2: -75.8466, -826.9893, 243.3859 (Maze Bank Building) exports('GetFinanceOffice2Object', function() - return FinanceOffice2 + return FinanceOffice2 end) FinanceOffice2 = { currentInteriorId = -1, currentSafeDoors = { - hashL = "", - hashR = "" - }, + hashL = "", + hashR = "" + }, Style = { Theme = { warm = { - interiorId = 238593, - ipl = "ex_dt1_11_office_01a", - safe = "ex_prop_safedoor_office1a" - }, + interiorId = 238593, + ipl = "ex_dt1_11_office_01a", + safe = "ex_prop_safedoor_office1a" + }, classical = { - interiorId = 238849, - ipl = "ex_dt1_11_office_01b", - safe = "ex_prop_safedoor_office1b" - }, + interiorId = 238849, + ipl = "ex_dt1_11_office_01b", + safe = "ex_prop_safedoor_office1b" + }, vintage = { - interiorId = 239105, - ipl = "ex_dt1_11_office_01c", - safe = "ex_prop_safedoor_office1c" - }, + interiorId = 239105, + ipl = "ex_dt1_11_office_01c", + safe = "ex_prop_safedoor_office1c" + }, contrast = { - interiorId = 239361, - ipl = "ex_dt1_11_office_02a", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 239361, + ipl = "ex_dt1_11_office_02a", + safe = "ex_prop_safedoor_office2a" + }, rich = { - interiorId = 239617, - ipl = "ex_dt1_11_office_02b", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 239617, + ipl = "ex_dt1_11_office_02b", + safe = "ex_prop_safedoor_office2a" + }, cool = { - interiorId = 239873, - ipl = "ex_dt1_11_office_02c", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 239873, + ipl = "ex_dt1_11_office_02c", + safe = "ex_prop_safedoor_office2a" + }, ice = { - interiorId = 240129, - ipl = "ex_dt1_11_office_03a", - safe = "ex_prop_safedoor_office3a" - }, + interiorId = 240129, + ipl = "ex_dt1_11_office_03a", + safe = "ex_prop_safedoor_office3a" + }, conservative = { - interiorId = 240385, - ipl = "ex_dt1_11_office_03b", - safe = "ex_prop_safedoor_office3a" - }, + interiorId = 240385, + ipl = "ex_dt1_11_office_03b", + safe = "ex_prop_safedoor_office3a" + }, polished = { - interiorId = 240641, - ipl = "ex_dt1_11_office_03c", - safe = "ex_prop_safedoor_office3c" - } + interiorId = 240641, + ipl = "ex_dt1_11_office_03c", + safe = "ex_prop_safedoor_office3c" + } }, Set = function(style, refresh) if refresh == nil then - refresh = false - end + refresh = false + end if type(style) == "table" then FinanceOffice2.Style.Clear() FinanceOffice2.currentInteriorId = style.interiorId FinanceOffice2.currentSafeDoors = { - hashL = GetHashKey(style.safe .. "_l"), - hashR = GetHashKey(style.safe .. "_r") - } + hashL = GetHashKey(style.safe .. "_l"), + hashR = GetHashKey(style.safe .. "_r") + } EnableIpl(style.ipl, true) if refresh then - RefreshInterior(style.interiorId) - end + RefreshInterior(style.interiorId) + end end end, Clear = function() @@ -83,10 +83,10 @@ FinanceOffice2 = { for swagKey, swagValue in pairs(FinanceOffice2.Swag) do if type(swagValue) == "table" then SetIplPropState(themeValue.interiorId, { - swagValue.A, - swagValue.B, - swagValue.C - }, false) + swagValue.A, + swagValue.B, + swagValue.C + }, false) end end @@ -94,9 +94,9 @@ FinanceOffice2 = { SetIplPropState(themeValue.interiorId, "office_booze", false, true) FinanceOffice2.currentSafeDoors = { - hashL = 0, - hashR = 0 - } + hashL = 0, + hashR = 0 + } EnableIpl(themeValue.ipl, false) end @@ -107,14 +107,14 @@ FinanceOffice2 = { Position = vector3(-82.593, -801.0, 243.385), -- Approximately between the two doors -- These values are checked from "doorHandler.lua" and isLeftDoorOpen = false, - isRightDoorOpen = false, + isRightDoorOpen = false, -- Safe door API Open = function(doorSide) if doorSide:lower() == "left" then - FinanceOffice2.Safe.isLeftDoorOpen = true + FinanceOffice2.Safe.isLeftDoorOpen = true elseif doorSide:lower() == "right" then - FinanceOffice2.Safe.isRightDoorOpen = true + FinanceOffice2.Safe.isRightDoorOpen = true else Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") Citizen.Trace("left right") @@ -122,9 +122,9 @@ FinanceOffice2 = { end, Close = function(doorSide) if doorSide:lower() == "left" then - FinanceOffice2.Safe.isLeftDoorOpen = false + FinanceOffice2.Safe.isLeftDoorOpen = false elseif doorSide:lower() == "right" then - FinanceOffice2.Safe.isRightDoorOpen = false + FinanceOffice2.Safe.isRightDoorOpen = false else Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") Citizen.Trace("left right") @@ -139,16 +139,16 @@ FinanceOffice2 = { if doorSide:lower() == "left" then doorHandle = FinanceOffice2.Safe.GetDoorHandle(FinanceOffice2.currentSafeDoors.hashL) - if open then - heading = heading - 90.0 - end + if open then + heading = heading - 90.0 + end elseif doorSide:lower() == "right" then doorHandle = FinanceOffice2.Safe.GetDoorHandle(FinanceOffice2.currentSafeDoors.hashR) heading = heading - 180 if open then - heading = heading + 90.0 - end + heading = heading + 90.0 + end end if doorHandle == 0 then @@ -170,7 +170,7 @@ FinanceOffice2 = { doorHandle = GetClosestObjectOfType(FinanceOffice2.Safe.Position.x, FinanceOffice2.Safe.Position.y, FinanceOffice2.Safe.Position.z, 5.0, doorHash, false, false, false) timeout = timeout - 1 - if timeout <= 0 then + if timeout <= 0 then break end end @@ -181,100 +181,100 @@ FinanceOffice2 = { Swag = { Cash = { A = "cash_set_01", - B = "cash_set_02", - C = "cash_set_03", - D = "cash_set_04", - E = "cash_set_05", + B = "cash_set_02", + C = "cash_set_03", + D = "cash_set_04", + E = "cash_set_05", F = "cash_set_06", - G = "cash_set_07", - H = "cash_set_08", - I = "cash_set_09", - J = "cash_set_10", + G = "cash_set_07", + H = "cash_set_08", + I = "cash_set_09", + J = "cash_set_10", K = "cash_set_11", - L = "cash_set_12", - M = "cash_set_13", - N = "cash_set_14", - O = "cash_set_15", + L = "cash_set_12", + M = "cash_set_13", + N = "cash_set_14", + O = "cash_set_15", P = "cash_set_16", - Q = "cash_set_17", - R = "cash_set_18", - S = "cash_set_19", - T = "cash_set_20", + Q = "cash_set_17", + R = "cash_set_18", + S = "cash_set_19", + T = "cash_set_20", U = "cash_set_21", - V = "cash_set_22", - W = "cash_set_23", - X = "cash_set_24" + V = "cash_set_22", + W = "cash_set_23", + X = "cash_set_24" }, BoozeCigs = { - A = "swag_booze_cigs", - B = "swag_booze_cigs2", - C = "swag_booze_cigs3" - }, + A = "swag_booze_cigs", + B = "swag_booze_cigs2", + C = "swag_booze_cigs3" + }, Counterfeit = { - A = "swag_counterfeit", - B = "swag_counterfeit2", - C = "swag_counterfeit3" - }, + A = "swag_counterfeit", + B = "swag_counterfeit2", + C = "swag_counterfeit3" + }, DrugBags = { - A = "swag_drugbags", - B = "swag_drugbags2", - C = "swag_drugbags3" - }, + A = "swag_drugbags", + B = "swag_drugbags2", + C = "swag_drugbags3" + }, DrugStatue = { - A = "swag_drugstatue", - B = "swag_drugstatue2", - C = "swag_drugstatue3" - }, + A = "swag_drugstatue", + B = "swag_drugstatue2", + C = "swag_drugstatue3" + }, Electronic = { - A = "swag_electronic", - B = "swag_electronic2", - C = "swag_electronic3" - }, + A = "swag_electronic", + B = "swag_electronic2", + C = "swag_electronic3" + }, FurCoats = { - A = "swag_furcoats", - B = "swag_furcoats2", - C = "swag_furcoats3" - }, + A = "swag_furcoats", + B = "swag_furcoats2", + C = "swag_furcoats3" + }, Gems = { - A = "swag_gems", - B = "swag_gems2", - C = "swag_gems3" - }, + A = "swag_gems", + B = "swag_gems2", + C = "swag_gems3" + }, Guns = { - A = "swag_guns", - B = "swag_guns2", - C = "swag_guns3" - }, + A = "swag_guns", + B = "swag_guns2", + C = "swag_guns3" + }, Ivory = { - A = "swag_ivory", - B = "swag_ivory2", - C = "swag_ivory3" - }, + A = "swag_ivory", + B = "swag_ivory2", + C = "swag_ivory3" + }, Jewel = { - A = "swag_jewelwatch", - B = "swag_jewelwatch2", - C = "swag_jewelwatch3" - }, + A = "swag_jewelwatch", + B = "swag_jewelwatch2", + C = "swag_jewelwatch3" + }, Med = { - A = "swag_med", - B = "swag_med2", - C = "swag_med3" - }, + A = "swag_med", + B = "swag_med2", + C = "swag_med3" + }, Painting = { - A = "swag_art", - B = "swag_art2", - C = "swag_art3" - }, + A = "swag_art", + B = "swag_art2", + C = "swag_art3" + }, Pills = { - A = "swag_pills", - B = "swag_pills2", - C = "swag_pills3" - }, + A = "swag_pills", + B = "swag_pills2", + C = "swag_pills3" + }, Silver = { - A = "swag_silver", - B = "swag_silver2", - C = "swag_silver3" - }, + A = "swag_silver", + B = "swag_silver2", + C = "swag_silver3" + }, Enable = function(details, state, refresh) SetIplPropState(FinanceOffice2.currentInteriorId, details, state, refresh) @@ -282,7 +282,7 @@ FinanceOffice2 = { }, Chairs = { off = "", - on = "office_chairs", + on = "office_chairs", Set = function(chairs, refresh) FinanceOffice2.Chairs.Clear(false) @@ -291,8 +291,8 @@ FinanceOffice2 = { SetIplPropState(FinanceOffice2.currentInteriorId, chairs, true, refresh) else if refresh then - RefreshInterior(FinanceOffice2.currentInteriorId) - end + RefreshInterior(FinanceOffice2.currentInteriorId) + end end end, Clear = function(refresh) @@ -301,7 +301,7 @@ FinanceOffice2 = { }, Booze = { off = "", - on = "office_booze", + on = "office_booze", Set = function(booze, refresh) FinanceOffice2.Booze.Clear(false) @@ -310,8 +310,8 @@ FinanceOffice2 = { SetIplPropState(FinanceOffice2.currentInteriorId, booze, true, refresh) else if refresh then - RefreshInterior(FinanceOffice2.currentInteriorId) - end + RefreshInterior(FinanceOffice2.currentInteriorId) + end end end, Clear = function(refresh) diff --git a/dlc_finance/office3.lua b/dlc_finance/office3.lua index c287e16..20a8741 100644 --- a/dlc_finance/office3.lua +++ b/dlc_finance/office3.lua @@ -1,81 +1,81 @@ -- Office 3: -1579.756, -565.0661, 108.523 (Lom Bank) exports('GetFinanceOffice3Object', function() - return FinanceOffice3 + return FinanceOffice3 end) FinanceOffice3 = { currentInteriorId = -1, currentSafeDoors = { - hashL = "", - hashR = "" - }, + hashL = "", + hashR = "" + }, Style = { Theme = { warm = { - interiorId = 240897, - ipl = "ex_sm_13_office_01a", - safe = "ex_prop_safedoor_office1a" - }, + interiorId = 240897, + ipl = "ex_sm_13_office_01a", + safe = "ex_prop_safedoor_office1a" + }, classical = { - interiorId = 241153, - ipl = "ex_sm_13_office_01b", - safe = "ex_prop_safedoor_office1b" - }, + interiorId = 241153, + ipl = "ex_sm_13_office_01b", + safe = "ex_prop_safedoor_office1b" + }, vintage = { - interiorId = 241409, - ipl = "ex_sm_13_office_01c", - safe = "ex_prop_safedoor_office1c" - }, + interiorId = 241409, + ipl = "ex_sm_13_office_01c", + safe = "ex_prop_safedoor_office1c" + }, contrast = { - interiorId = 241665, - ipl = "ex_sm_13_office_02a", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 241665, + ipl = "ex_sm_13_office_02a", + safe = "ex_prop_safedoor_office2a" + }, rich = { - interiorId = 241921, - ipl = "ex_sm_13_office_02b", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 241921, + ipl = "ex_sm_13_office_02b", + safe = "ex_prop_safedoor_office2a" + }, cool = { - interiorId = 242177, - ipl = "ex_sm_13_office_02c", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 242177, + ipl = "ex_sm_13_office_02c", + safe = "ex_prop_safedoor_office2a" + }, ice = { - interiorId = 242433, - ipl = "ex_sm_13_office_03a", - safe = "ex_prop_safedoor_office3a" - }, + interiorId = 242433, + ipl = "ex_sm_13_office_03a", + safe = "ex_prop_safedoor_office3a" + }, conservative = { - interiorId = 242689, - ipl = "ex_sm_13_office_03b", - safe = "ex_prop_safedoor_office3a" - }, + interiorId = 242689, + ipl = "ex_sm_13_office_03b", + safe = "ex_prop_safedoor_office3a" + }, polished = { - interiorId = 242945, - ipl = "ex_sm_13_office_03c", - safe = "ex_prop_safedoor_office3c" - } + interiorId = 242945, + ipl = "ex_sm_13_office_03c", + safe = "ex_prop_safedoor_office3c" + } }, Set = function(style, refresh) if refresh == nil then - refresh = false - end + refresh = false + end if type(style) == "table" then FinanceOffice3.Style.Clear() FinanceOffice3.currentInteriorId = style.interiorId FinanceOffice3.currentSafeDoors = { - hashL = GetHashKey(style.safe .. "_l"), - hashR = GetHashKey(style.safe .. "_r") - } + hashL = GetHashKey(style.safe .. "_l"), + hashR = GetHashKey(style.safe .. "_r") + } EnableIpl(style.ipl, true) if refresh then - RefreshInterior(style.interiorId) - end + RefreshInterior(style.interiorId) + end end end, Clear = function() @@ -83,10 +83,10 @@ FinanceOffice3 = { for swagKey, swagValue in pairs(FinanceOffice3.Swag) do if type(swagValue) == "table" then SetIplPropState(themeValue.interiorId, { - swagValue.A, - swagValue.B, - swagValue.C - }, false) + swagValue.A, + swagValue.B, + swagValue.C + }, false) end end @@ -94,9 +94,9 @@ FinanceOffice3 = { SetIplPropState(themeValue.interiorId, "office_booze", false, true) FinanceOffice3.currentSafeDoors = { - hashL = 0, - hashR = 0 - } + hashL = 0, + hashR = 0 + } EnableIpl(themeValue.ipl, false) end @@ -107,14 +107,14 @@ FinanceOffice3 = { Position = vector3(-1554.08, -573.7122, 108.5272), -- Approximately between the two doors -- These values are checked from "doorHandler.lua" and isLeftDoorOpen = false, - isRightDoorOpen = false, + isRightDoorOpen = false, -- Safe door API Open = function(doorSide) if doorSide:lower() == "left" then - FinanceOffice3.Safe.isLeftDoorOpen = true + FinanceOffice3.Safe.isLeftDoorOpen = true elseif doorSide:lower() == "right" then - FinanceOffice3.Safe.isRightDoorOpen = true + FinanceOffice3.Safe.isRightDoorOpen = true else Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") Citizen.Trace("left right") @@ -122,9 +122,9 @@ FinanceOffice3 = { end, Close = function(doorSide) if doorSide:lower() == "left" then - FinanceOffice3.Safe.isLeftDoorOpen = false + FinanceOffice3.Safe.isLeftDoorOpen = false elseif doorSide:lower() == "right" then - FinanceOffice3.Safe.isRightDoorOpen = false + FinanceOffice3.Safe.isRightDoorOpen = false else Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") Citizen.Trace("left right") @@ -140,15 +140,15 @@ FinanceOffice3 = { doorHandle = FinanceOffice3.Safe.GetDoorHandle(FinanceOffice3.currentSafeDoors.hashL) if open then - heading = heading - 90.0 - end + heading = heading - 90.0 + end elseif doorSide:lower() == "right" then doorHandle = FinanceOffice3.Safe.GetDoorHandle(FinanceOffice3.currentSafeDoors.hashR) heading = heading - 180 if open then - heading = heading + 90.0 - end + heading = heading + 90.0 + end end if doorHandle == 0 then @@ -167,10 +167,10 @@ FinanceOffice3 = { while doorHandle == 0 do Citizen.Wait(25) - doorHandle = GetClosestObjectOfType(FinanceOffice3.Safe.Position.x, FinanceOffice3.Safe.Position.y, FinanceOffice3.Safe.Position.z, 5.0, doorHash, false, false, false) + doorHandle = GetClosestObjectOfType(FinanceOffice3.Safe.Position.x, FinanceOffice3.Safe.Position.y, FinanceOffice3.Safe.Position.z, 5.0, doorHash, false, false, false) timeout = timeout - 1 - if timeout <= 0 then + if timeout <= 0 then break end end @@ -181,100 +181,100 @@ FinanceOffice3 = { Swag = { Cash = { A = "cash_set_01", - B = "cash_set_02", - C = "cash_set_03", - D = "cash_set_04", - E = "cash_set_05", + B = "cash_set_02", + C = "cash_set_03", + D = "cash_set_04", + E = "cash_set_05", F = "cash_set_06", - G = "cash_set_07", - H = "cash_set_08", - I = "cash_set_09", - J = "cash_set_10", + G = "cash_set_07", + H = "cash_set_08", + I = "cash_set_09", + J = "cash_set_10", K = "cash_set_11", - L = "cash_set_12", - M = "cash_set_13", - N = "cash_set_14", - O = "cash_set_15", + L = "cash_set_12", + M = "cash_set_13", + N = "cash_set_14", + O = "cash_set_15", P = "cash_set_16", - Q = "cash_set_17", - R = "cash_set_18", - S = "cash_set_19", - T = "cash_set_20", + Q = "cash_set_17", + R = "cash_set_18", + S = "cash_set_19", + T = "cash_set_20", U = "cash_set_21", - V = "cash_set_22", - W = "cash_set_23", - X = "cash_set_24" + V = "cash_set_22", + W = "cash_set_23", + X = "cash_set_24" }, BoozeCigs = { - A = "swag_booze_cigs", - B = "swag_booze_cigs2", - C = "swag_booze_cigs3" - }, + A = "swag_booze_cigs", + B = "swag_booze_cigs2", + C = "swag_booze_cigs3" + }, Counterfeit = { - A = "swag_counterfeit", - B = "swag_counterfeit2", - C = "swag_counterfeit3" - }, + A = "swag_counterfeit", + B = "swag_counterfeit2", + C = "swag_counterfeit3" + }, DrugBags = { - A = "swag_drugbags", - B = "swag_drugbags2", - C = "swag_drugbags3" - }, + A = "swag_drugbags", + B = "swag_drugbags2", + C = "swag_drugbags3" + }, DrugStatue = { - A = "swag_drugstatue", - B = "swag_drugstatue2", - C = "swag_drugstatue3" - }, + A = "swag_drugstatue", + B = "swag_drugstatue2", + C = "swag_drugstatue3" + }, Electronic = { - A = "swag_electronic", - B = "swag_electronic2", - C = "swag_electronic3" - }, + A = "swag_electronic", + B = "swag_electronic2", + C = "swag_electronic3" + }, FurCoats = { - A = "swag_furcoats", - B = "swag_furcoats2", - C = "swag_furcoats3" - }, + A = "swag_furcoats", + B = "swag_furcoats2", + C = "swag_furcoats3" + }, Gems = { - A = "swag_gems", - B = "swag_gems2", - C = "swag_gems3" - }, + A = "swag_gems", + B = "swag_gems2", + C = "swag_gems3" + }, Guns = { - A = "swag_guns", - B = "swag_guns2", - C = "swag_guns3" - }, + A = "swag_guns", + B = "swag_guns2", + C = "swag_guns3" + }, Ivory = { - A = "swag_ivory", - B = "swag_ivory2", - C = "swag_ivory3" - }, + A = "swag_ivory", + B = "swag_ivory2", + C = "swag_ivory3" + }, Jewel = { - A = "swag_jewelwatch", - B = "swag_jewelwatch2", - C = "swag_jewelwatch3" - }, + A = "swag_jewelwatch", + B = "swag_jewelwatch2", + C = "swag_jewelwatch3" + }, Med = { - A = "swag_med", - B = "swag_med2", - C = "swag_med3" - }, + A = "swag_med", + B = "swag_med2", + C = "swag_med3" + }, Painting = { - A = "swag_art", - B = "swag_art2", - C = "swag_art3" - }, + A = "swag_art", + B = "swag_art2", + C = "swag_art3" + }, Pills = { - A = "swag_pills", - B = "swag_pills2", - C = "swag_pills3" - }, + A = "swag_pills", + B = "swag_pills2", + C = "swag_pills3" + }, Silver = { - A = "swag_silver", - B = "swag_silver2", - C = "swag_silver3" - }, + A = "swag_silver", + B = "swag_silver2", + C = "swag_silver3" + }, Enable = function(details, state, refresh) SetIplPropState(FinanceOffice3.currentInteriorId, details, state, refresh) @@ -282,7 +282,7 @@ FinanceOffice3 = { }, Chairs = { off = "", - on = "office_chairs", + on = "office_chairs", Set = function(chairs, refresh) FinanceOffice3.Chairs.Clear(false) @@ -291,8 +291,8 @@ FinanceOffice3 = { SetIplPropState(FinanceOffice3.currentInteriorId, chairs, true, refresh) else if refresh then - RefreshInterior(FinanceOffice3.currentInteriorId) - end + RefreshInterior(FinanceOffice3.currentInteriorId) + end end end, Clear = function(refresh) @@ -301,7 +301,7 @@ FinanceOffice3 = { }, Booze = { off = "", - on = "office_booze", + on = "office_booze", Set = function(booze, refresh) FinanceOffice3.Booze.Clear(false) @@ -310,8 +310,8 @@ FinanceOffice3 = { SetIplPropState(FinanceOffice3.currentInteriorId, booze, true, refresh) else if refresh then - RefreshInterior(FinanceOffice3.currentInteriorId) - end + RefreshInterior(FinanceOffice3.currentInteriorId) + end end end, Clear = function(refresh) diff --git a/dlc_finance/office4.lua b/dlc_finance/office4.lua index e1e0294..32e2706 100644 --- a/dlc_finance/office4.lua +++ b/dlc_finance/office4.lua @@ -1,92 +1,92 @@ -- Office 4: -1392.667, -480.4736, 72.04217 (Maze Bank West) exports('GetFinanceOffice4Object', function() - return FinanceOffice4 + return FinanceOffice4 end) FinanceOffice4 = { currentInteriorId = -1, currentSafeDoors = { - hashL = "", - hashR = "" - }, + hashL = "", + hashR = "" + }, Style = { Theme = { warm = { - interiorId = 243201, - ipl = "ex_sm_15_office_01a", - safe = "ex_prop_safedoor_office1a" - }, + interiorId = 243201, + ipl = "ex_sm_15_office_01a", + safe = "ex_prop_safedoor_office1a" + }, classical = { - interiorId = 243457, - ipl = "ex_sm_15_office_01b", - safe = "ex_prop_safedoor_office1b" - }, + interiorId = 243457, + ipl = "ex_sm_15_office_01b", + safe = "ex_prop_safedoor_office1b" + }, vintage = { - interiorId = 243713, - ipl = "ex_sm_15_office_01c", - safe = "ex_prop_safedoor_office1c" - }, + interiorId = 243713, + ipl = "ex_sm_15_office_01c", + safe = "ex_prop_safedoor_office1c" + }, contrast = { - interiorId = 243969, - ipl = "ex_sm_15_office_02a", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 243969, + ipl = "ex_sm_15_office_02a", + safe = "ex_prop_safedoor_office2a" + }, rich = { - interiorId = 244225, - ipl = "ex_sm_15_office_02b", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 244225, + ipl = "ex_sm_15_office_02b", + safe = "ex_prop_safedoor_office2a" + }, cool = { - interiorId = 244481, - ipl = "ex_sm_15_office_02c", - safe = "ex_prop_safedoor_office2a" - }, + interiorId = 244481, + ipl = "ex_sm_15_office_02c", + safe = "ex_prop_safedoor_office2a" + }, ice = { - interiorId = 244737, - ipl = "ex_sm_15_office_03a", - safe = "ex_prop_safedoor_office3a" - }, + interiorId = 244737, + ipl = "ex_sm_15_office_03a", + safe = "ex_prop_safedoor_office3a" + }, conservative = { - interiorId = 244993, - ipl = "ex_sm_15_office_03b", - safe = "ex_prop_safedoor_office3a" - }, + interiorId = 244993, + ipl = "ex_sm_15_office_03b", + safe = "ex_prop_safedoor_office3a" + }, polished = { - interiorId = 245249, - ipl = "ex_sm_15_office_03c", - safe = "ex_prop_safedoor_office3c" - } + interiorId = 245249, + ipl = "ex_sm_15_office_03c", + safe = "ex_prop_safedoor_office3c" + } }, Set = function(style, refresh) if refresh == nil then - refresh = false - end + refresh = false + end - if type(style) == "table" then + if type(style) == "table" then FinanceOffice4.Style.Clear() FinanceOffice4.currentInteriorId = style.interiorId FinanceOffice4.currentSafeDoors = { - hashL = GetHashKey(style.safe .. "_l"), - hashR = GetHashKey(style.safe .. "_r") - } + hashL = GetHashKey(style.safe .. "_l"), + hashR = GetHashKey(style.safe .. "_r") + } EnableIpl(style.ipl, true) if refresh then - RefreshInterior(style.interiorId) - end + RefreshInterior(style.interiorId) + end end end, Clear = function() for themeKey, themeValue in pairs(FinanceOffice4.Style.Theme) do for swagKey, swagValue in pairs(FinanceOffice4.Swag) do - if type(swagValue) == "table" then + if type(swagValue) == "table" then SetIplPropState(themeValue.interiorId, { - swagValue.A, - swagValue.B, - swagValue.C - }, false) + swagValue.A, + swagValue.B, + swagValue.C + }, false) end end @@ -94,9 +94,9 @@ FinanceOffice4 = { SetIplPropState(themeValue.interiorId, "office_booze", false, true) FinanceOffice4.currentSafeDoors = { - hashL = 0, - hashR = 0 - } + hashL = 0, + hashR = 0 + } EnableIpl(themeValue.ipl, false) end @@ -107,14 +107,14 @@ FinanceOffice4 = { Position = vector3(-1372.905, -462.08, 72.05), -- Approximately between the two doors -- These values are checked from "doorHandler.lua" and isLeftDoorOpen = false, - isRightDoorOpen = false, + isRightDoorOpen = false, -- Safe door API Open = function(doorSide) if doorSide:lower() == "left" then - FinanceOffice4.Safe.isLeftDoorOpen = true + FinanceOffice4.Safe.isLeftDoorOpen = true elseif doorSide:lower() == "right" then - FinanceOffice4.Safe.isRightDoorOpen = true + FinanceOffice4.Safe.isRightDoorOpen = true else Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") Citizen.Trace("left right") @@ -122,9 +122,9 @@ FinanceOffice4 = { end, Close = function(doorSide) if doorSide:lower() == "left" then - FinanceOffice4.Safe.isLeftDoorOpen = false + FinanceOffice4.Safe.isLeftDoorOpen = false elseif doorSide:lower() == "right" then - FinanceOffice4.Safe.isRightDoorOpen = false + FinanceOffice4.Safe.isRightDoorOpen = false else Citizen.Trace("[bob74_ipl] Warning: " .. doorSide .. " is not a correct value. Valid values are:") Citizen.Trace("left right") @@ -140,15 +140,15 @@ FinanceOffice4 = { doorHandle = FinanceOffice4.Safe.GetDoorHandle(FinanceOffice4.currentSafeDoors.hashL) if open then - heading = heading - 90.0 - end + heading = heading - 90.0 + end elseif doorSide:lower() == "right" then doorHandle = FinanceOffice4.Safe.GetDoorHandle(FinanceOffice4.currentSafeDoors.hashR) heading = heading - 180 if open then - heading = heading + 90.0 - end + heading = heading + 90.0 + end end if doorHandle == 0 then @@ -181,100 +181,100 @@ FinanceOffice4 = { Swag = { Cash = { A = "cash_set_01", - B = "cash_set_02", - C = "cash_set_03", - D = "cash_set_04", - E = "cash_set_05", + B = "cash_set_02", + C = "cash_set_03", + D = "cash_set_04", + E = "cash_set_05", F = "cash_set_06", - G = "cash_set_07", - H = "cash_set_08", - I = "cash_set_09", - J = "cash_set_10", + G = "cash_set_07", + H = "cash_set_08", + I = "cash_set_09", + J = "cash_set_10", K = "cash_set_11", - L = "cash_set_12", - M = "cash_set_13", - N = "cash_set_14", - O = "cash_set_15", + L = "cash_set_12", + M = "cash_set_13", + N = "cash_set_14", + O = "cash_set_15", P = "cash_set_16", - Q = "cash_set_17", - R = "cash_set_18", - S = "cash_set_19", - T = "cash_set_20", + Q = "cash_set_17", + R = "cash_set_18", + S = "cash_set_19", + T = "cash_set_20", U = "cash_set_21", - V = "cash_set_22", - W = "cash_set_23", - X = "cash_set_24" + V = "cash_set_22", + W = "cash_set_23", + X = "cash_set_24" }, BoozeCigs = { - A = "swag_booze_cigs", - B = "swag_booze_cigs2", - C = "swag_booze_cigs3" - }, + A = "swag_booze_cigs", + B = "swag_booze_cigs2", + C = "swag_booze_cigs3" + }, Counterfeit = { - A = "swag_counterfeit", - B = "swag_counterfeit2", - C = "swag_counterfeit3" - }, + A = "swag_counterfeit", + B = "swag_counterfeit2", + C = "swag_counterfeit3" + }, DrugBags = { - A = "swag_drugbags", - B = "swag_drugbags2", - C = "swag_drugbags3" - }, + A = "swag_drugbags", + B = "swag_drugbags2", + C = "swag_drugbags3" + }, DrugStatue = { - A = "swag_drugstatue", - B = "swag_drugstatue2", - C = "swag_drugstatue3" - }, + A = "swag_drugstatue", + B = "swag_drugstatue2", + C = "swag_drugstatue3" + }, Electronic = { - A = "swag_electronic", - B = "swag_electronic2", - C = "swag_electronic3" - }, + A = "swag_electronic", + B = "swag_electronic2", + C = "swag_electronic3" + }, FurCoats = { - A = "swag_furcoats", - B = "swag_furcoats2", - C = "swag_furcoats3" - }, + A = "swag_furcoats", + B = "swag_furcoats2", + C = "swag_furcoats3" + }, Gems = { - A = "swag_gems", - B = "swag_gems2", - C = "swag_gems3" - }, + A = "swag_gems", + B = "swag_gems2", + C = "swag_gems3" + }, Guns = { - A = "swag_guns", - B = "swag_guns2", - C = "swag_guns3" - }, + A = "swag_guns", + B = "swag_guns2", + C = "swag_guns3" + }, Ivory = { - A = "swag_ivory", - B = "swag_ivory2", - C = "swag_ivory3" - }, + A = "swag_ivory", + B = "swag_ivory2", + C = "swag_ivory3" + }, Jewel = { - A = "swag_jewelwatch", - B = "swag_jewelwatch2", - C = "swag_jewelwatch3" - }, + A = "swag_jewelwatch", + B = "swag_jewelwatch2", + C = "swag_jewelwatch3" + }, Med = { - A = "swag_med", - B = "swag_med2", - C = "swag_med3" - }, + A = "swag_med", + B = "swag_med2", + C = "swag_med3" + }, Painting = { - A = "swag_art", - B = "swag_art2", - C = "swag_art3" - }, + A = "swag_art", + B = "swag_art2", + C = "swag_art3" + }, Pills = { - A = "swag_pills", - B = "swag_pills2", - C = "swag_pills3" - }, + A = "swag_pills", + B = "swag_pills2", + C = "swag_pills3" + }, Silver = { - A = "swag_silver", - B = "swag_silver2", - C = "swag_silver3" - }, + A = "swag_silver", + B = "swag_silver2", + C = "swag_silver3" + }, Enable = function(details, state, refresh) SetIplPropState(FinanceOffice4.currentInteriorId, details, state, refresh) @@ -282,7 +282,7 @@ FinanceOffice4 = { }, Chairs = { off = "", - on = "office_chairs", + on = "office_chairs", Set = function(chairs, refresh) FinanceOffice4.Chairs.Clear(false) @@ -291,8 +291,8 @@ FinanceOffice4 = { SetIplPropState(FinanceOffice4.currentInteriorId, chairs, true, refresh) else if refresh then - RefreshInterior(FinanceOffice4.currentInteriorId) - end + RefreshInterior(FinanceOffice4.currentInteriorId) + end end end, Clear = function(refresh) @@ -301,7 +301,7 @@ FinanceOffice4 = { }, Booze = { off = "", - on = "office_booze", + on = "office_booze", Set = function(booze, refresh) FinanceOffice4.Booze.Clear(false) @@ -310,8 +310,8 @@ FinanceOffice4 = { SetIplPropState(FinanceOffice4.currentInteriorId, booze, true, refresh) else if refresh then - RefreshInterior(FinanceOffice4.currentInteriorId) - end + RefreshInterior(FinanceOffice4.currentInteriorId) + end end end, Clear = function(refresh) diff --git a/dlc_gunrunning/bunkers.lua b/dlc_gunrunning/bunkers.lua index 2ba8fc5..c68866e 100644 --- a/dlc_gunrunning/bunkers.lua +++ b/dlc_gunrunning/bunkers.lua @@ -49,15 +49,15 @@ GunrunningBunker = { yellow = "Bunker_Style_C", -- Set the style (color) of the bunker. - -- style: Wall color (values: GunrunningBunker.Style.default / GunrunningBunker.Style.blue / GunrunningBunker.Style.yellow) - -- refresh: Reload the whole interior (values: true / false) + -- style: Wall color (values: GunrunningBunker.Style.default / GunrunningBunker.Style.blue / GunrunningBunker.Style.yellow) + -- refresh: Reload the whole interior (values: true / false) Set = function(style, refresh) GunrunningBunker.Style.Clear(false) SetIplPropState(GunrunningBunker.interiorId, style, true, refresh) end, -- Removes the style. - -- refresh: Reload the whole interior (values: true / false) + -- refresh: Reload the whole interior (values: true / false) Clear = function(refresh) SetIplPropState(GunrunningBunker.interiorId, { GunrunningBunker.Style.default, @@ -71,15 +71,15 @@ GunrunningBunker = { upgrade = "upgrade_bunker_set", -- Set the tier (quality) of the bunker. - -- tier: Upgrade state (values: GunrunningBunker.Tier.default / GunrunningBunker.Tier.upgrade) - -- refresh: Reload the whole interior (values: true / false) + -- tier: Upgrade state (values: GunrunningBunker.Tier.default / GunrunningBunker.Tier.upgrade) + -- refresh: Reload the whole interior (values: true / false) Set = function(tier, refresh) GunrunningBunker.Tier.Clear(false) SetIplPropState(GunrunningBunker.interiorId, tier, true, refresh) end, -- Removes the tier. - -- refresh: Reload the whole interior (values: true / false) + -- refresh: Reload the whole interior (values: true / false) Clear = function(refresh) SetIplPropState(GunrunningBunker.interiorId, { GunrunningBunker.Tier.default, @@ -93,8 +93,8 @@ GunrunningBunker = { upgrade = "security_upgrade", -- Set the security stage of the bunker. - -- security: Upgrade state (values: GunrunningBunker.Security.default / GunrunningBunker.Security.upgrade) - -- refresh: Reload the whole interior (values: true / false) + -- security: Upgrade state (values: GunrunningBunker.Security.default / GunrunningBunker.Security.upgrade) + -- refresh: Reload the whole interior (values: true / false) Set = function(security, refresh) GunrunningBunker.Security.Clear(false) @@ -107,7 +107,7 @@ GunrunningBunker = { end end, -- Removes the security. - -- refresh: Reload the whole interior (values: true / false) + -- refresh: Reload the whole interior (values: true / false) Clear = function(refresh) SetIplPropState(GunrunningBunker.interiorId, { GunrunningBunker.Security.default, @@ -125,9 +125,9 @@ GunrunningBunker = { schematics = "Gun_schematic_set", -- Gun schematic on the table and whiteboard -- Enable or disable a detail. - -- details: Prop to enable or disable (values: GunrunningBunker.Details.office / GunrunningBunker.Details.officeLocked / GunrunningBunker.Details.locker...) + -- details: Prop to enable or disable (values: GunrunningBunker.Details.office / GunrunningBunker.Details.officeLocked / GunrunningBunker.Details.locker...) -- state: Enable or Disable (values: true / false) - -- refresh: Reload the whole interior (values: true / false) + -- refresh: Reload the whole interior (values: true / false) Enable = function(details, state, refresh) SetIplPropState(GunrunningBunker.interiorId, details, state, refresh) end diff --git a/dlc_gunrunning/yacht.lua b/dlc_gunrunning/yacht.lua index 81cf777..c34ce5c 100644 --- a/dlc_gunrunning/yacht.lua +++ b/dlc_gunrunning/yacht.lua @@ -50,7 +50,7 @@ GunrunningYacht = { end end }, - + LoadDefault = function() GunrunningYacht.Enable(true) end diff --git a/dlc_heists/carrier.lua b/dlc_heists/carrier.lua index c730574..22326ac 100644 --- a/dlc_heists/carrier.lua +++ b/dlc_heists/carrier.lua @@ -1,28 +1,28 @@ -- Heist Carrier: 3082.3117 -4717.1191 15.2622 exports('GetHeistCarrierObject', function() - return HeistCarrier + return HeistCarrier end) HeistCarrier = { - ipl = { - "hei_carrier", - "hei_carrier_int1", - "hei_carrier_int1_lod", - "hei_carrier_int2", - "hei_carrier_int2_lod", - "hei_carrier_int3", - "hei_carrier_int3_lod", - "hei_carrier_int4", - "hei_carrier_int4_lod", - "hei_carrier_int5", - "hei_carrier_int5_lod", - "hei_carrier_int6", - "hei_carrier_int6_lod", - "hei_carrier_lod", - "hei_carrier_slod" - }, + ipl = { + "hei_carrier", + "hei_carrier_int1", + "hei_carrier_int1_lod", + "hei_carrier_int2", + "hei_carrier_int2_lod", + "hei_carrier_int3", + "hei_carrier_int3_lod", + "hei_carrier_int4", + "hei_carrier_int4_lod", + "hei_carrier_int5", + "hei_carrier_int5_lod", + "hei_carrier_int6", + "hei_carrier_int6_lod", + "hei_carrier_lod", + "hei_carrier_slod" + }, - Enable = function(state) - EnableIpl(HeistCarrier.ipl, state) - end + Enable = function(state) + EnableIpl(HeistCarrier.ipl, state) + end } diff --git a/dlc_high_life/apartment2.lua b/dlc_high_life/apartment2.lua index 0c6685c..d92e1ce 100644 --- a/dlc_high_life/apartment2.lua +++ b/dlc_high_life/apartment2.lua @@ -1,6 +1,6 @@ -- Apartment 2: -914.90260000, -374.87310000, 112.6748 exports('GetHLApartment2Object', function() - return HLApartment2 + return HLApartment2 end) HLApartment2 = { @@ -11,17 +11,17 @@ HLApartment2 = { ipl = "mpbusiness_int_placement_interior_v_mp_apt_h_01_milo__1", Load = function() - EnableIpl(HLApartment2.Ipl.Interior.ipl, true) - end, + EnableIpl(HLApartment2.Ipl.Interior.ipl, true) + end, Remove = function() - EnableIpl(HLApartment2.Ipl.Interior.ipl, false) - end + EnableIpl(HLApartment2.Ipl.Interior.ipl, false) + end }, }, Strip = { A = "Apart_Hi_Strip_A", - B = "Apart_Hi_Strip_B", - C = "Apart_Hi_Strip_C", + B = "Apart_Hi_Strip_B", + C = "Apart_Hi_Strip_C", Enable = function(details, state, refresh) SetIplPropState(HLApartment2.interiorId, details, state, refresh) @@ -29,8 +29,8 @@ HLApartment2 = { }, Booze = { A = "Apart_Hi_Booze_A", - B = "Apart_Hi_Booze_B", - C = "Apart_Hi_Booze_C", + B = "Apart_Hi_Booze_B", + C = "Apart_Hi_Booze_C", Enable = function(details, state, refresh) SetIplPropState(HLApartment2.interiorId, details, state, refresh) @@ -38,8 +38,8 @@ HLApartment2 = { }, Smoke = { A = "Apart_Hi_Smokes_A", - B = "Apart_Hi_Smokes_B", - C = "Apart_Hi_Smokes_C", + B = "Apart_Hi_Smokes_B", + C = "Apart_Hi_Smokes_C", Enable = function(details, state, refresh) SetIplPropState(HLApartment2.interiorId, details, state, refresh) @@ -49,21 +49,21 @@ HLApartment2 = { LoadDefault = function() HLApartment2.Ipl.Interior.Load() HLApartment2.Strip.Enable({ - HLApartment2.Strip.A, - HLApartment2.Strip.B, - HLApartment2.Strip.C - }, false) + HLApartment2.Strip.A, + HLApartment2.Strip.B, + HLApartment2.Strip.C + }, false) HLApartment2.Booze.Enable({ - HLApartment2.Booze.A, - HLApartment2.Booze.B, - HLApartment2.Booze.C - }, false) + HLApartment2.Booze.A, + HLApartment2.Booze.B, + HLApartment2.Booze.C + }, false) HLApartment2.Smoke.Enable({ - HLApartment2.Smoke.A, - HLApartment2.Smoke.B, - HLApartment2.Smoke.C - }, false) - + HLApartment2.Smoke.A, + HLApartment2.Smoke.B, + HLApartment2.Smoke.C + }, false) + RefreshInterior(HLApartment2.interiorId) end } diff --git a/dlc_high_life/apartment3.lua b/dlc_high_life/apartment3.lua index f06edd6..533ffe4 100644 --- a/dlc_high_life/apartment3.lua +++ b/dlc_high_life/apartment3.lua @@ -1,6 +1,6 @@ -- Apartment 3: -609.56690000, 51.28212000, 96.60023000 exports('GetHLApartment3Object', function() - return HLApartment3 + return HLApartment3 end) HLApartment3 = { @@ -11,17 +11,17 @@ HLApartment3 = { ipl = "mpbusiness_int_placement_interior_v_mp_apt_h_01_milo__2", Load = function() - EnableIpl(HLApartment3.Ipl.Interior.ipl, true) - end, + EnableIpl(HLApartment3.Ipl.Interior.ipl, true) + end, Remove = function() - EnableIpl(HLApartment3.Ipl.Interior.ipl, false) - end + EnableIpl(HLApartment3.Ipl.Interior.ipl, false) + end } }, Strip = { A = "Apart_Hi_Strip_A", - B = "Apart_Hi_Strip_B", - C = "Apart_Hi_Strip_C", + B = "Apart_Hi_Strip_B", + C = "Apart_Hi_Strip_C", Enable = function(details, state, refresh) SetIplPropState(HLApartment3.interiorId, details, state, refresh) @@ -29,8 +29,8 @@ HLApartment3 = { }, Booze = { A = "Apart_Hi_Booze_A", - B = "Apart_Hi_Booze_B", - C = "Apart_Hi_Booze_C", + B = "Apart_Hi_Booze_B", + C = "Apart_Hi_Booze_C", Enable = function(details, state, refresh) SetIplPropState(HLApartment3.interiorId, details, state, refresh) @@ -38,31 +38,31 @@ HLApartment3 = { }, Smoke = { A = "Apart_Hi_Smokes_A", - B = "Apart_Hi_Smokes_B", - C = "Apart_Hi_Smokes_C", + B = "Apart_Hi_Smokes_B", + C = "Apart_Hi_Smokes_C", Enable = function(details, state, refresh) SetIplPropState(HLApartment3.interiorId, details, state, refresh) end }, - + LoadDefault = function() HLApartment3.Ipl.Interior.Load() HLApartment3.Strip.Enable({ - HLApartment3.Strip.A, - HLApartment3.Strip.B, - HLApartment3.Strip.C - }, false) + HLApartment3.Strip.A, + HLApartment3.Strip.B, + HLApartment3.Strip.C + }, false) HLApartment3.Booze.Enable({ - HLApartment3.Booze.A, - HLApartment3.Booze.B, - HLApartment3.Booze.C - }, false) + HLApartment3.Booze.A, + HLApartment3.Booze.B, + HLApartment3.Booze.C + }, false) HLApartment3.Smoke.Enable({ - HLApartment3.Smoke.A, - HLApartment3.Smoke.B, - HLApartment3.Smoke.C - }, false) + HLApartment3.Smoke.A, + HLApartment3.Smoke.B, + HLApartment3.Smoke.C + }, false) RefreshInterior(HLApartment3.interiorId) end diff --git a/dlc_high_life/apartment4.lua b/dlc_high_life/apartment4.lua index 88fdcbf..cc44978 100644 --- a/dlc_high_life/apartment4.lua +++ b/dlc_high_life/apartment4.lua @@ -9,7 +9,7 @@ HLApartment4 = { Ipl = { Interior = { ipl = "mpbusiness_int_placement_interior_v_mp_apt_h_01_milo__3", - + Load = function() EnableIpl(HLApartment4.Ipl.Interior.ipl, true) end, diff --git a/dlc_high_life/apartment5.lua b/dlc_high_life/apartment5.lua index d2ded6b..fa690a4 100644 --- a/dlc_high_life/apartment5.lua +++ b/dlc_high_life/apartment5.lua @@ -45,7 +45,7 @@ HLApartment5 = { SetIplPropState(HLApartment5.interiorId, details, state, refresh) end }, - + LoadDefault = function() HLApartment5.Ipl.Interior.Load() HLApartment5.Strip.Enable({ diff --git a/dlc_high_life/apartment6.lua b/dlc_high_life/apartment6.lua index ddd9160..9058416 100644 --- a/dlc_high_life/apartment6.lua +++ b/dlc_high_life/apartment6.lua @@ -9,7 +9,7 @@ HLApartment6 = { Ipl = { Interior = { ipl = "mpbusiness_int_placement_interior_v_mp_apt_h_01_milo__5", - + Load = function() EnableIpl(HLApartment6.Ipl.Interior.ipl, true) end, diff --git a/dlc_import/garage1.lua b/dlc_import/garage1.lua index 5466b98..ff9eceb 100644 --- a/dlc_import/garage1.lua +++ b/dlc_import/garage1.lua @@ -1,46 +1,46 @@ -- Garage 1: Arcadius Business Centre exports('GetImportCEOGarage1Object', function() - return ImportCEOGarage1 + return ImportCEOGarage1 end) ImportCEOGarage1 = { Part = { Garage1 = { -- -191.0133, -579.1428, 135.0000 - interiorId = 253441, - ipl = "imp_dt1_02_cargarage_a" - }, + interiorId = 253441, + ipl = "imp_dt1_02_cargarage_a" + }, Garage2 = { -- -117.4989, -568.1132, 135.0000 - interiorId = 253697, - ipl = "imp_dt1_02_cargarage_b" - }, + interiorId = 253697, + ipl = "imp_dt1_02_cargarage_b" + }, Garage3 = { -- -136.0780, -630.1852, 135.0000 - interiorId = 253953, - ipl = "imp_dt1_02_cargarage_c" - }, + interiorId = 253953, + ipl = "imp_dt1_02_cargarage_c" + }, ModShop = { -- -146.6166, -596.6301, 166.0000 - interiorId = 254209, - ipl = "imp_dt1_02_modgarage" - }, + interiorId = 254209, + ipl = "imp_dt1_02_modgarage" + }, Load = function(part) - EnableIpl(part.ipl, true) - end, + EnableIpl(part.ipl, true) + end, Remove = function(part) - EnableIpl(part.ipl, false) - end, + EnableIpl(part.ipl, false) + end, Clear = function() - EnableIpl({ - ImportCEOGarage1.Part.Garage1.ipl, - ImportCEOGarage1.Part.Garage2.ipl, - ImportCEOGarage1.Part.Garage3.ipl - }, false) - end, + EnableIpl({ + ImportCEOGarage1.Part.Garage1.ipl, + ImportCEOGarage1.Part.Garage2.ipl, + ImportCEOGarage1.Part.Garage3.ipl + }, false) + end, }, Style = { concrete = "garage_decor_01", - plain = "garage_decor_02", - marble = "garage_decor_03", - wooden = "garage_decor_04", + plain = "garage_decor_02", + marble = "garage_decor_03", + wooden = "garage_decor_04", Set = function(part, style, refresh) ImportCEOGarage1.Style.Clear(part) @@ -49,47 +49,47 @@ ImportCEOGarage1 = { end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage1.Style.concrete, - ImportCEOGarage1.Style.plain, - ImportCEOGarage1.Style.marble, - ImportCEOGarage1.Style.wooden - }, false, true) + ImportCEOGarage1.Style.concrete, + ImportCEOGarage1.Style.plain, + ImportCEOGarage1.Style.marble, + ImportCEOGarage1.Style.wooden + }, false, true) end }, Numbering = { none = "", Level1 = { style1 = "numbering_style01_n1", - style2 = "numbering_style02_n1", - style3 = "numbering_style03_n1", + style2 = "numbering_style02_n1", + style3 = "numbering_style03_n1", style4 = "numbering_style04_n1", - style5 = "numbering_style05_n1", - style6 = "numbering_style06_n1", + style5 = "numbering_style05_n1", + style6 = "numbering_style06_n1", style7 = "numbering_style07_n1", - style8 = "numbering_style08_n1", - style9 = "numbering_style09_n1" + style8 = "numbering_style08_n1", + style9 = "numbering_style09_n1" }, Level2 = { style1 = "numbering_style01_n2", - style2 = "numbering_style02_n2", - style3 = "numbering_style03_n2", + style2 = "numbering_style02_n2", + style3 = "numbering_style03_n2", style4 = "numbering_style04_n2", - style5 = "numbering_style05_n2", - style6 = "numbering_style06_n2", + style5 = "numbering_style05_n2", + style6 = "numbering_style06_n2", style7 = "numbering_style07_n2", - style8 = "numbering_style08_n2", - style9 = "numbering_style09_n2" + style8 = "numbering_style08_n2", + style9 = "numbering_style09_n2" }, Level3 = { style1 = "numbering_style01_n3", - style2 = "numbering_style02_n3", - style3 = "numbering_style03_n3", + style2 = "numbering_style02_n3", + style3 = "numbering_style03_n3", style4 = "numbering_style04_n3", - style5 = "numbering_style05_n3", - style6 = "numbering_style06_n3", + style5 = "numbering_style05_n3", + style6 = "numbering_style06_n3", style7 = "numbering_style07_n3", - style8 = "numbering_style08_n3", - style9 = "numbering_style09_n3" + style8 = "numbering_style08_n3", + style9 = "numbering_style09_n3" }, Set = function(part, num, refresh) @@ -99,29 +99,29 @@ ImportCEOGarage1 = { SetIplPropState(part.interiorId, num, true, refresh) else if refresh then - RefreshInterior(part.interiorId) - end + RefreshInterior(part.interiorId) + end end end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage1.Numbering.Level1, - ImportCEOGarage1.Numbering.Level2, - ImportCEOGarage1.Numbering.Level3 - }, false, true) + ImportCEOGarage1.Numbering.Level1, + ImportCEOGarage1.Numbering.Level2, + ImportCEOGarage1.Numbering.Level3 + }, false, true) end }, Lighting = { none = "", style1 = "lighting_option01", - style2 = "lighting_option02", - style3 = "lighting_option03", + style2 = "lighting_option02", + style3 = "lighting_option03", style4 = "lighting_option04", - style5 = "lighting_option05", - style6 = "lighting_option06", + style5 = "lighting_option05", + style6 = "lighting_option06", style7 = "lighting_option07", - style8 = "lighting_option08", - style9 = "lighting_option09", + style8 = "lighting_option08", + style9 = "lighting_option09", Set = function(part, light, refresh) ImportCEOGarage1.Lighting.Clear(part) @@ -130,8 +130,8 @@ ImportCEOGarage1 = { SetIplPropState(part.interiorId, light, true, refresh) else if refresh then - RefreshInterior(part.interiorId) - end + RefreshInterior(part.interiorId) + end end end, Clear = function(part) @@ -146,23 +146,23 @@ ImportCEOGarage1 = { Floor = { default = "", city = "floor_vinyl_01", - seabed = "floor_vinyl_02", - aliens = "floor_vinyl_03", + seabed = "floor_vinyl_02", + aliens = "floor_vinyl_03", clouds = "floor_vinyl_04", - money = "floor_vinyl_05", - zebra = "floor_vinyl_06", + money = "floor_vinyl_05", + zebra = "floor_vinyl_06", blackWhite = "floor_vinyl_07", - barcode = "floor_vinyl_08", - paintbrushBW = "floor_vinyl_09", + barcode = "floor_vinyl_08", + paintbrushBW = "floor_vinyl_09", grid = "floor_vinyl_10", - splashes = "floor_vinyl_11", - squares = "floor_vinyl_12", + splashes = "floor_vinyl_11", + squares = "floor_vinyl_12", mosaic = "floor_vinyl_13", - paintbrushColor = "floor_vinyl_14", - curvesColor = "floor_vinyl_15", + paintbrushColor = "floor_vinyl_14", + curvesColor = "floor_vinyl_15", marbleBrown = "floor_vinyl_16", - marbleBlue = "floor_vinyl_17", - marbleBW = "floor_vinyl_18", + marbleBlue = "floor_vinyl_17", + marbleBW = "floor_vinyl_18", maze = "floor_vinyl_19", Set = function(floor, refresh) @@ -172,8 +172,8 @@ ImportCEOGarage1 = { SetIplPropState(ImportCEOGarage1.Part.ModShop.interiorId, floor, true, refresh) else if refresh then - RefreshInterior(ImportCEOGarage1.Part.ModShop.interiorId) - end + RefreshInterior(ImportCEOGarage1.Part.ModShop.interiorId) + end end end, Clear = function() diff --git a/dlc_import/garage2.lua b/dlc_import/garage2.lua index 689d595..a58917a 100644 --- a/dlc_import/garage2.lua +++ b/dlc_import/garage2.lua @@ -1,46 +1,46 @@ -- Garage 2: Maze Bank Building exports('GetImportCEOGarage2Object', function() - return ImportCEOGarage2 + return ImportCEOGarage2 end) ImportCEOGarage2 = { Part = { Garage1 = { -- -84.2193, -823.0851, 221.0000 - interiorId = 254465, - ipl = "imp_dt1_11_cargarage_a" - }, + interiorId = 254465, + ipl = "imp_dt1_11_cargarage_a" + }, Garage2 = { -- -69.8627, -824.7498, 221.0000 - interiorId = 254721, - ipl = "imp_dt1_11_cargarage_b" - }, + interiorId = 254721, + ipl = "imp_dt1_11_cargarage_b" + }, Garage3 = { -- -80.4318, -813.2536, 221.0000 - interiorId = 254977, - ipl = "imp_dt1_11_cargarage_c" - }, + interiorId = 254977, + ipl = "imp_dt1_11_cargarage_c" + }, ModShop = { -- -73.9039, -821.6204, 284.0000 - interiorId = 255233, - ipl = "imp_dt1_11_modgarage" - }, + interiorId = 255233, + ipl = "imp_dt1_11_modgarage" + }, Load = function(part) - EnableIpl(part.ipl, true) - end, + EnableIpl(part.ipl, true) + end, Remove = function(part) - EnableIpl(part.ipl, false) - end, + EnableIpl(part.ipl, false) + end, Clear = function() - EnableIpl({ - ImportCEOGarage2.Part.Garage1.ipl, - ImportCEOGarage2.Part.Garage2.ipl, - ImportCEOGarage2.Part.Garage3.ipl - }, false) - end, + EnableIpl({ + ImportCEOGarage2.Part.Garage1.ipl, + ImportCEOGarage2.Part.Garage2.ipl, + ImportCEOGarage2.Part.Garage3.ipl + }, false) + end, }, Style = { concrete = "garage_decor_01", - plain = "garage_decor_02", - marble = "garage_decor_03", - wooden = "garage_decor_04", + plain = "garage_decor_02", + marble = "garage_decor_03", + wooden = "garage_decor_04", Set = function(part, style, refresh) ImportCEOGarage2.Style.Clear(part) @@ -49,47 +49,47 @@ ImportCEOGarage2 = { end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage2.Style.concrete, - ImportCEOGarage2.Style.plain, - ImportCEOGarage2.Style.marble, - ImportCEOGarage2.Style.wooden - }, false, true) + ImportCEOGarage2.Style.concrete, + ImportCEOGarage2.Style.plain, + ImportCEOGarage2.Style.marble, + ImportCEOGarage2.Style.wooden + }, false, true) end }, Numbering = { none = "", Level1 = { style1 = "numbering_style01_n1", - style2 = "numbering_style02_n1", - style3 = "numbering_style03_n1", + style2 = "numbering_style02_n1", + style3 = "numbering_style03_n1", style4 = "numbering_style04_n1", - style5 = "numbering_style05_n1", - style6 = "numbering_style06_n1", + style5 = "numbering_style05_n1", + style6 = "numbering_style06_n1", style7 = "numbering_style07_n1", - style8 = "numbering_style08_n1", - style9 = "numbering_style09_n1" + style8 = "numbering_style08_n1", + style9 = "numbering_style09_n1" }, Level2 = { style1 = "numbering_style01_n2", - style2 = "numbering_style02_n2", - style3 = "numbering_style03_n2", + style2 = "numbering_style02_n2", + style3 = "numbering_style03_n2", style4 = "numbering_style04_n2", - style5 = "numbering_style05_n2", - style6 = "numbering_style06_n2", + style5 = "numbering_style05_n2", + style6 = "numbering_style06_n2", style7 = "numbering_style07_n2", - style8 = "numbering_style08_n2", - style9 = "numbering_style09_n2" + style8 = "numbering_style08_n2", + style9 = "numbering_style09_n2" }, Level3 = { style1 = "numbering_style01_n3", - style2 = "numbering_style02_n3", - style3 = "numbering_style03_n3", + style2 = "numbering_style02_n3", + style3 = "numbering_style03_n3", style4 = "numbering_style04_n3", - style5 = "numbering_style05_n3", - style6 = "numbering_style06_n3", + style5 = "numbering_style05_n3", + style6 = "numbering_style06_n3", style7 = "numbering_style07_n3", - style8 = "numbering_style08_n3", - style9 = "numbering_style09_n3" + style8 = "numbering_style08_n3", + style9 = "numbering_style09_n3" }, Set = function(part, num, refresh) ImportCEOGarage2.Numbering.Clear(part) @@ -98,29 +98,29 @@ ImportCEOGarage2 = { SetIplPropState(part.interiorId, num, true, refresh) else if refresh then - RefreshInterior(part.interiorId) - end + RefreshInterior(part.interiorId) + end end end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage2.Numbering.Level1, - ImportCEOGarage2.Numbering.Level2, - ImportCEOGarage2.Numbering.Level3 - }, false, true) + ImportCEOGarage2.Numbering.Level1, + ImportCEOGarage2.Numbering.Level2, + ImportCEOGarage2.Numbering.Level3 + }, false, true) end }, Lighting = { none = "", style1 = "lighting_option01", - style2 = "lighting_option02", - style3 = "lighting_option03", + style2 = "lighting_option02", + style3 = "lighting_option03", style4 = "lighting_option04", - style5 = "lighting_option05", - style6 = "lighting_option06", + style5 = "lighting_option05", + style6 = "lighting_option06", style7 = "lighting_option07", - style8 = "lighting_option08", - style9 = "lighting_option09", + style8 = "lighting_option08", + style9 = "lighting_option09", Set = function(part, light, refresh) ImportCEOGarage2.Lighting.Clear(part) @@ -129,8 +129,8 @@ ImportCEOGarage2 = { SetIplPropState(part.interiorId, light, true, refresh) else if refresh then - RefreshInterior(part.interiorId) - end + RefreshInterior(part.interiorId) + end end end, Clear = function(part) @@ -145,23 +145,23 @@ ImportCEOGarage2 = { Floor = { default = "", city = "floor_vinyl_01", - seabed = "floor_vinyl_02", - aliens = "floor_vinyl_03", + seabed = "floor_vinyl_02", + aliens = "floor_vinyl_03", clouds = "floor_vinyl_04", - money = "floor_vinyl_05", - zebra = "floor_vinyl_06", + money = "floor_vinyl_05", + zebra = "floor_vinyl_06", blackWhite = "floor_vinyl_07", - barcode = "floor_vinyl_08", - paintbrushBW = "floor_vinyl_09", + barcode = "floor_vinyl_08", + paintbrushBW = "floor_vinyl_09", grid = "floor_vinyl_10", - splashes = "floor_vinyl_11", - squares = "floor_vinyl_12", + splashes = "floor_vinyl_11", + squares = "floor_vinyl_12", mosaic = "floor_vinyl_13", - paintbrushColor = "floor_vinyl_14", - curvesColor = "floor_vinyl_15", + paintbrushColor = "floor_vinyl_14", + curvesColor = "floor_vinyl_15", marbleBrown = "floor_vinyl_16", - marbleBlue = "floor_vinyl_17", - marbleBW = "floor_vinyl_18", + marbleBlue = "floor_vinyl_17", + marbleBW = "floor_vinyl_18", maze = "floor_vinyl_19", Set = function(floor, refresh) @@ -171,8 +171,8 @@ ImportCEOGarage2 = { SetIplPropState(ImportCEOGarage2.Part.ModShop.interiorId, floor, true, refresh) else if refresh then - RefreshInterior(ImportCEOGarage2.Part.ModShop.interiorId) - end + RefreshInterior(ImportCEOGarage2.Part.ModShop.interiorId) + end end end, Clear = function() diff --git a/dlc_import/garage3.lua b/dlc_import/garage3.lua index 6c25f15..8ab7a0c 100644 --- a/dlc_import/garage3.lua +++ b/dlc_import/garage3.lua @@ -1,46 +1,46 @@ -- Garage 3: Lom Bank exports('GetImportCEOGarage3Object', function() - return ImportCEOGarage3 + return ImportCEOGarage3 end) ImportCEOGarage3 = { Part = { Garage1 = { -- -1581.1120, -567.2450, 85.5000 - interiorId = 255489, - ipl = "imp_sm_13_cargarage_a" - }, + interiorId = 255489, + ipl = "imp_sm_13_cargarage_a" + }, Garage2 = { -- -1568.7390, -562.0455, 85.5000 - interiorId = 255745, - ipl = "imp_sm_13_cargarage_b" - }, + interiorId = 255745, + ipl = "imp_sm_13_cargarage_b" + }, Garage3 = { -- -1563.5570, -574.4314, 85.5000 - interiorId = 256001, - ipl = "imp_sm_13_cargarage_c" - }, + interiorId = 256001, + ipl = "imp_sm_13_cargarage_c" + }, ModShop = { -- -1578.0230, -576.4251, 104.2000 - interiorId = 256257, - ipl = "imp_sm_13_modgarage" - }, + interiorId = 256257, + ipl = "imp_sm_13_modgarage" + }, Load = function(part) - EnableIpl(part.ipl, true) - end, + EnableIpl(part.ipl, true) + end, Remove = function(part) - EnableIpl(part.ipl, false) - end, + EnableIpl(part.ipl, false) + end, Clear = function() - EnableIpl({ - ImportCEOGarage3.Part.Garage1.ipl, - ImportCEOGarage3.Part.Garage2.ipl, - ImportCEOGarage3.Part.Garage3.ipl - }, false) - end, + EnableIpl({ + ImportCEOGarage3.Part.Garage1.ipl, + ImportCEOGarage3.Part.Garage2.ipl, + ImportCEOGarage3.Part.Garage3.ipl + }, false) + end, }, Style = { concrete = "garage_decor_01", - plain = "garage_decor_02", - marble = "garage_decor_03", - wooden = "garage_decor_04", + plain = "garage_decor_02", + marble = "garage_decor_03", + wooden = "garage_decor_04", Set = function(part, style, refresh) ImportCEOGarage3.Style.Clear(part) @@ -49,47 +49,47 @@ ImportCEOGarage3 = { end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage3.Style.concrete, - ImportCEOGarage3.Style.plain, - ImportCEOGarage3.Style.marble, - ImportCEOGarage3.Style.wooden - }, false, true) + ImportCEOGarage3.Style.concrete, + ImportCEOGarage3.Style.plain, + ImportCEOGarage3.Style.marble, + ImportCEOGarage3.Style.wooden + }, false, true) end }, Numbering = { none = "", Level1 = { style1 = "numbering_style01_n1", - style2 = "numbering_style02_n1", - style3 = "numbering_style03_n1", + style2 = "numbering_style02_n1", + style3 = "numbering_style03_n1", style4 = "numbering_style04_n1", - style5 = "numbering_style05_n1", - style6 = "numbering_style06_n1", + style5 = "numbering_style05_n1", + style6 = "numbering_style06_n1", style7 = "numbering_style07_n1", - style8 = "numbering_style08_n1", - style9 = "numbering_style09_n1" + style8 = "numbering_style08_n1", + style9 = "numbering_style09_n1" }, Level2 = { style1 = "numbering_style01_n2", - style2 = "numbering_style02_n2", - style3 = "numbering_style03_n2", + style2 = "numbering_style02_n2", + style3 = "numbering_style03_n2", style4 = "numbering_style04_n2", - style5 = "numbering_style05_n2", - style6 = "numbering_style06_n2", + style5 = "numbering_style05_n2", + style6 = "numbering_style06_n2", style7 = "numbering_style07_n2", - style8 = "numbering_style08_n2", - style9 = "numbering_style09_n2" + style8 = "numbering_style08_n2", + style9 = "numbering_style09_n2" }, Level3 = { style1 = "numbering_style01_n3", - style2 = "numbering_style02_n3", - style3 = "numbering_style03_n3", + style2 = "numbering_style02_n3", + style3 = "numbering_style03_n3", style4 = "numbering_style04_n3", - style5 = "numbering_style05_n3", - style6 = "numbering_style06_n3", + style5 = "numbering_style05_n3", + style6 = "numbering_style06_n3", style7 = "numbering_style07_n3", - style8 = "numbering_style08_n3", - style9 = "numbering_style09_n3" + style8 = "numbering_style08_n3", + style9 = "numbering_style09_n3" }, Set = function(part, num, refresh) ImportCEOGarage3.Numbering.Clear(part) @@ -98,29 +98,29 @@ ImportCEOGarage3 = { SetIplPropState(part.interiorId, num, true, refresh) else if refresh then - RefreshInterior(part.interiorId) - end + RefreshInterior(part.interiorId) + end end end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage3.Numbering.Level1, - ImportCEOGarage3.Numbering.Level2, - ImportCEOGarage3.Numbering.Level3 - }, false, true) + ImportCEOGarage3.Numbering.Level1, + ImportCEOGarage3.Numbering.Level2, + ImportCEOGarage3.Numbering.Level3 + }, false, true) end }, Lighting = { none = "", style1 = "lighting_option01", - style2 = "lighting_option02", - style3 = "lighting_option03", + style2 = "lighting_option02", + style3 = "lighting_option03", style4 = "lighting_option04", - style5 = "lighting_option05", - style6 = "lighting_option06", + style5 = "lighting_option05", + style6 = "lighting_option06", style7 = "lighting_option07", - style8 = "lighting_option08", - style9 = "lighting_option09", + style8 = "lighting_option08", + style9 = "lighting_option09", Set = function(part, light, refresh) ImportCEOGarage3.Lighting.Clear(part) @@ -129,8 +129,8 @@ ImportCEOGarage3 = { SetIplPropState(part.interiorId, light, true, refresh) else if refresh then - RefreshInterior(part.interiorId) - end + RefreshInterior(part.interiorId) + end end end, Clear = function(part) @@ -145,23 +145,23 @@ ImportCEOGarage3 = { Floor = { default = "", city = "floor_vinyl_01", - seabed = "floor_vinyl_02", - aliens = "floor_vinyl_03", + seabed = "floor_vinyl_02", + aliens = "floor_vinyl_03", clouds = "floor_vinyl_04", - money = "floor_vinyl_05", - zebra = "floor_vinyl_06", + money = "floor_vinyl_05", + zebra = "floor_vinyl_06", blackWhite = "floor_vinyl_07", - barcode = "floor_vinyl_08", - paintbrushBW = "floor_vinyl_09", + barcode = "floor_vinyl_08", + paintbrushBW = "floor_vinyl_09", grid = "floor_vinyl_10", - splashes = "floor_vinyl_11", - squares = "floor_vinyl_12", + splashes = "floor_vinyl_11", + squares = "floor_vinyl_12", mosaic = "floor_vinyl_13", - paintbrushColor = "floor_vinyl_14", - curvesColor = "floor_vinyl_15", + paintbrushColor = "floor_vinyl_14", + curvesColor = "floor_vinyl_15", marbleBrown = "floor_vinyl_16", - marbleBlue = "floor_vinyl_17", - marbleBW = "floor_vinyl_18", + marbleBlue = "floor_vinyl_17", + marbleBW = "floor_vinyl_18", maze = "floor_vinyl_19", Set = function(floor, refresh) @@ -171,8 +171,8 @@ ImportCEOGarage3 = { SetIplPropState(ImportCEOGarage3.Part.ModShop.interiorId, floor, true, refresh) else if refresh then - RefreshInterior(ImportCEOGarage3.Part.ModShop.interiorId) - end + RefreshInterior(ImportCEOGarage3.Part.ModShop.interiorId) + end end end, Clear = function() diff --git a/dlc_import/garage4.lua b/dlc_import/garage4.lua index cacfa3c..a0d7f03 100644 --- a/dlc_import/garage4.lua +++ b/dlc_import/garage4.lua @@ -1,47 +1,47 @@ -- Garage 4: Maze Bank West -- Be careful, ImportCEOGarage4.Part.Garage1 and ImportCEOGarage4.Part.Garage3 overlaps with FinanceOffice4 exports('GetImportCEOGarage4Object', function() - return ImportCEOGarage4 + return ImportCEOGarage4 end) ImportCEOGarage4 = { Part = { Garage1 = { -- -1388.8400, -478.7402, 56.1000 - interiorId = 256513, - ipl = "imp_sm_15_cargarage_a" - }, + interiorId = 256513, + ipl = "imp_sm_15_cargarage_a" + }, Garage2 = { -- -1388.8600, -478.7574, 48.1000 - interiorId = 256769, - ipl = "imp_sm_15_cargarage_b" - }, + interiorId = 256769, + ipl = "imp_sm_15_cargarage_b" + }, Garage3 = { -- -1374.6820, -474.3586, 56.1000 - interiorId = 257025, - ipl = "imp_sm_15_cargarage_c" - }, + interiorId = 257025, + ipl = "imp_sm_15_cargarage_c" + }, ModShop = { -- -1391.2450, -473.9638, 77.2000 - interiorId = 257281, - ipl = "imp_sm_15_modgarage" - }, + interiorId = 257281, + ipl = "imp_sm_15_modgarage" + }, Load = function(part) - EnableIpl(part.ipl, true) - end, + EnableIpl(part.ipl, true) + end, Remove = function(part) - EnableIpl(part.ipl, false) - end, + EnableIpl(part.ipl, false) + end, Clear = function() - EnableIpl({ - ImportCEOGarage4.Part.Garage1.ipl, - ImportCEOGarage4.Part.Garage2.ipl, - ImportCEOGarage4.Part.Garage3.ipl - }, false) - end + EnableIpl({ + ImportCEOGarage4.Part.Garage1.ipl, + ImportCEOGarage4.Part.Garage2.ipl, + ImportCEOGarage4.Part.Garage3.ipl + }, false) + end }, Style = { concrete = "garage_decor_01", - plain = "garage_decor_02", - marble = "garage_decor_03", - wooden = "garage_decor_04", + plain = "garage_decor_02", + marble = "garage_decor_03", + wooden = "garage_decor_04", Set = function(part, style, refresh) ImportCEOGarage4.Style.Clear(part) @@ -50,47 +50,47 @@ ImportCEOGarage4 = { end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage4.Style.concrete, - ImportCEOGarage4.Style.plain, - ImportCEOGarage4.Style.marble, - ImportCEOGarage4.Style.wooden - }, false, true) + ImportCEOGarage4.Style.concrete, + ImportCEOGarage4.Style.plain, + ImportCEOGarage4.Style.marble, + ImportCEOGarage4.Style.wooden + }, false, true) end }, Numbering = { none = "", Level1 = { style1 = "numbering_style01_n1", - style2 = "numbering_style02_n1", - style3 = "numbering_style03_n1", + style2 = "numbering_style02_n1", + style3 = "numbering_style03_n1", style4 = "numbering_style04_n1", - style5 = "numbering_style05_n1", - style6 = "numbering_style06_n1", + style5 = "numbering_style05_n1", + style6 = "numbering_style06_n1", style7 = "numbering_style07_n1", - style8 = "numbering_style08_n1", - style9 = "numbering_style09_n1" + style8 = "numbering_style08_n1", + style9 = "numbering_style09_n1" }, Level2 = { style1 = "numbering_style01_n2", - style2 = "numbering_style02_n2", - style3 = "numbering_style03_n2", + style2 = "numbering_style02_n2", + style3 = "numbering_style03_n2", style4 = "numbering_style04_n2", - style5 = "numbering_style05_n2", - style6 = "numbering_style06_n2", + style5 = "numbering_style05_n2", + style6 = "numbering_style06_n2", style7 = "numbering_style07_n2", - style8 = "numbering_style08_n2", - style9 = "numbering_style09_n2" + style8 = "numbering_style08_n2", + style9 = "numbering_style09_n2" }, Level3 = { style1 = "numbering_style01_n3", - style2 = "numbering_style02_n3", - style3 = "numbering_style03_n3", + style2 = "numbering_style02_n3", + style3 = "numbering_style03_n3", style4 = "numbering_style04_n3", - style5 = "numbering_style05_n3", - style6 = "numbering_style06_n3", + style5 = "numbering_style05_n3", + style6 = "numbering_style06_n3", style7 = "numbering_style07_n3", - style8 = "numbering_style08_n3", - style9 = "numbering_style09_n3" + style8 = "numbering_style08_n3", + style9 = "numbering_style09_n3" }, Set = function(part, num, refresh) @@ -100,29 +100,29 @@ ImportCEOGarage4 = { SetIplPropState(part.interiorId, num, true, refresh) else if refresh then - RefreshInterior(part.interiorId) - end + RefreshInterior(part.interiorId) + end end end, Clear = function(part) SetIplPropState(part.interiorId, { - ImportCEOGarage4.Numbering.Level1, - ImportCEOGarage4.Numbering.Level2, - ImportCEOGarage4.Numbering.Level3 - }, false, true) + ImportCEOGarage4.Numbering.Level1, + ImportCEOGarage4.Numbering.Level2, + ImportCEOGarage4.Numbering.Level3 + }, false, true) end }, Lighting = { none = "", style1 = "lighting_option01", - style2 = "lighting_option02", - style3 = "lighting_option03", + style2 = "lighting_option02", + style3 = "lighting_option03", style4 = "lighting_option04", - style5 = "lighting_option05", - style6 = "lighting_option06", + style5 = "lighting_option05", + style6 = "lighting_option06", style7 = "lighting_option07", - style8 = "lighting_option08", - style9 = "lighting_option09", + style8 = "lighting_option08", + style9 = "lighting_option09", Set = function(part, light, refresh) ImportCEOGarage4.Lighting.Clear(part) @@ -131,8 +131,8 @@ ImportCEOGarage4 = { SetIplPropState(part.interiorId, light, true, refresh) else if refresh then - RefreshInterior(part.interiorId) - end + RefreshInterior(part.interiorId) + end end end, Clear = function(part) @@ -147,23 +147,23 @@ ImportCEOGarage4 = { Floor = { default = "", city = "floor_vinyl_01", - seabed = "floor_vinyl_02", - aliens = "floor_vinyl_03", + seabed = "floor_vinyl_02", + aliens = "floor_vinyl_03", clouds = "floor_vinyl_04", - money = "floor_vinyl_05", - zebra = "floor_vinyl_06", + money = "floor_vinyl_05", + zebra = "floor_vinyl_06", blackWhite = "floor_vinyl_07", - barcode = "floor_vinyl_08", - paintbrushBW = "floor_vinyl_09", + barcode = "floor_vinyl_08", + paintbrushBW = "floor_vinyl_09", grid = "floor_vinyl_10", - splashes = "floor_vinyl_11", - squares = "floor_vinyl_12", + splashes = "floor_vinyl_11", + squares = "floor_vinyl_12", mosaic = "floor_vinyl_13", - paintbrushColor = "floor_vinyl_14", - curvesColor = "floor_vinyl_15", + paintbrushColor = "floor_vinyl_14", + curvesColor = "floor_vinyl_15", marbleBrown = "floor_vinyl_16", - marbleBlue = "floor_vinyl_17", - marbleBW = "floor_vinyl_18", + marbleBlue = "floor_vinyl_17", + marbleBW = "floor_vinyl_18", maze = "floor_vinyl_19", Set = function(floor, refresh) @@ -173,8 +173,8 @@ ImportCEOGarage4 = { SetIplPropState(ImportCEOGarage4.Part.ModShop.interiorId, floor, true, refresh) else if refresh then - RefreshInterior(ImportCEOGarage4.Part.ModShop.interiorId) - end + RefreshInterior(ImportCEOGarage4.Part.ModShop.interiorId) + end end end, Clear = function() diff --git a/dlc_security/office4.lua b/dlc_security/office4.lua index 493cf55..86ce6d9 100644 --- a/dlc_security/office4.lua +++ b/dlc_security/office4.lua @@ -100,7 +100,7 @@ MpSecurityOffice4 = { LoadDefault = function() MpSecurityOffice4.Ipl.Load() MpSecurityOffice4.Entities.Load() - + RefreshInterior(MpSecurityOffice4.interiorId) end } diff --git a/dlc_security/studio.lua b/dlc_security/studio.lua index f10b4e8..de33322 100644 --- a/dlc_security/studio.lua +++ b/dlc_security/studio.lua @@ -54,7 +54,7 @@ MpSecurityStudio = { LoadDefault = function() MpSecurityStudio.Ipl.Load() MpSecurityStudio.Entities.Load() - + RefreshInterior(MpSecurityStudio.interiorId) end } diff --git a/fxmanifest.lua b/fxmanifest.lua index cdcd10f..cc6f69f 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -12,114 +12,114 @@ version '2.0.15' 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" - - -- 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" - - -- 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 Heists - , "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 Finance & Felony - , "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 Import/Export - , "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 Smuggler's Run - , "dlc_smuggler/hangar.lua" - - -- DLC Doomsday Heist - , "dlc_doomsday/facility.lua" - - -- DLC After Hours - , "dlc_afterhours/nightclubs.lua" - - -- DLC Diamond Casino (Requires forced build 2060 or higher) - , "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 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" + "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" + + -- 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" + + -- 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 Heists + , "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 Finance & Felony + , "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 Import/Export + , "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 Smuggler's Run + , "dlc_smuggler/hangar.lua" + + -- DLC Doomsday Heist + , "dlc_doomsday/facility.lua" + + -- DLC After Hours + , "dlc_afterhours/nightclubs.lua" + + -- DLC Diamond Casino (Requires forced build 2060 or higher) + , "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 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" } diff --git a/gta_online/apartment_hi_1.lua b/gta_online/apartment_hi_1.lua index 47a60cc..7729a61 100644 --- a/gta_online/apartment_hi_1.lua +++ b/gta_online/apartment_hi_1.lua @@ -6,7 +6,7 @@ end) GTAOApartmentHi1 = { interiorId = 141313, - + Strip = { A = "Apart_Hi_Strip_A", B = "Apart_Hi_Strip_B", diff --git a/gta_online/apartment_hi_2.lua b/gta_online/apartment_hi_2.lua index 699dcfe..733a238 100644 --- a/gta_online/apartment_hi_2.lua +++ b/gta_online/apartment_hi_2.lua @@ -6,7 +6,7 @@ end) GTAOApartmentHi2 = { interiorId = 145665, - + Strip = { A = "Apart_Hi_Strip_A", B = "Apart_Hi_Strip_B", diff --git a/gta_online/house_hi_5.lua b/gta_online/house_hi_5.lua index 951f7e3..1d5f425 100644 --- a/gta_online/house_hi_5.lua +++ b/gta_online/house_hi_5.lua @@ -11,7 +11,7 @@ GTAOHouseHi5 = { A = "Apart_Hi_Strip_A", B = "Apart_Hi_Strip_B", C = "Apart_Hi_Strip_C", - + Enable = function(details, state, refresh) SetIplPropState(GTAOHouseHi5.interiorId, details, state, refresh) end diff --git a/gtav/ammunations.lua b/gtav/ammunations.lua index f0478c6..a746884 100644 --- a/gtav/ammunations.lua +++ b/gtav/ammunations.lua @@ -15,7 +15,7 @@ Ammunations = { 178689 -- 2569.8, 297.8, 108.7 }, gunclubsId = { - 137729, -- 19.1, -1110.0, 29.8 + 137729, -- 19.1, -1110.0, 29.8 248065 -- 811.0, -2152.0, 29.6 }, diff --git a/gtav/north_yankton.lua b/gtav/north_yankton.lua index a413777..6def102 100644 --- a/gtav/north_yankton.lua +++ b/gtav/north_yankton.lua @@ -1,38 +1,38 @@ exports('GetNorthYanktonObject', function() - return NorthYankton + return NorthYankton end) NorthYankton = { - ipl = { - "prologue01", - "prologue01c", - "prologue01d", - "prologue01e", - "prologue01f", - "prologue01g", - "prologue01h", - "prologue01i", - "prologue01j", - "prologue01k", - "prologue01z", - "prologue02", - "prologue03", - "prologue03b", - "prologue04", - "prologue04b", - "prologue05", - "prologue05b", - "prologue06", - "prologue06b", - "prologue06_int", - "prologuerd", - "prologuerdb", - "prologue_DistantLights", - "prologue_LODLights", - "prologue_m2_door" - }, + ipl = { + "prologue01", + "prologue01c", + "prologue01d", + "prologue01e", + "prologue01f", + "prologue01g", + "prologue01h", + "prologue01i", + "prologue01j", + "prologue01k", + "prologue01z", + "prologue02", + "prologue03", + "prologue03b", + "prologue04", + "prologue04b", + "prologue05", + "prologue05b", + "prologue06", + "prologue06b", + "prologue06_int", + "prologuerd", + "prologuerdb", + "prologue_DistantLights", + "prologue_LODLights", + "prologue_m2_door" + }, - Enable = function(state) - EnableIpl(NorthYankton.ipl, state) - end + Enable = function(state) + EnableIpl(NorthYankton.ipl, state) + end } diff --git a/gtav/pillbox_hospital.lua b/gtav/pillbox_hospital.lua index 4d7be6f..ed8bfc0 100644 --- a/gtav/pillbox_hospital.lua +++ b/gtav/pillbox_hospital.lua @@ -5,7 +5,7 @@ end) PillboxHospital = { ipl = "rc12b_default", - + Enable = function(state) EnableIpl(PillboxHospital.ipl, state) end diff --git a/gtav/red_carpet.lua b/gtav/red_carpet.lua index a31050c..53ec831 100644 --- a/gtav/red_carpet.lua +++ b/gtav/red_carpet.lua @@ -1,11 +1,11 @@ exports('GetRedCarpetObject', function() - return RedCarpet + return RedCarpet end) RedCarpet = { - ipl = "redCarpet", - - Enable = function(state) - EnableIpl(RedCarpet.ipl, state) - end + ipl = "redCarpet", + + Enable = function(state) + EnableIpl(RedCarpet.ipl, state) + end }