Cleanup

client.lua

@@ -180,27 +180,26 @@ Citizen.CreateThread(function()
     -- =------------------- [DLC: Los Santos Drug Wars] ------------------=
     -- ====================================================================
     if GetGameBuildNumber() >= 2802 then
-        DrugWarsFreakshop.LoadDefault() -- 571.6017, -423.0762, -70.0
-        DrugWarsGarage.LoadDefault() -- -272.9271, 283.2581, 103.9920
-        DrugWarsLab.LoadDefault() -- 483.3028, -2625.291, -50.0
-        DrugWarsWarehouse.LoadDefault() -- 603.0235, -395.7166, 23.7996
+        DrugWarsFreakshop.LoadDefault() -- 570.9713, -420.0727, -70.000
+        DrugWarsGarage.LoadDefault() -- 519.2477, -2618.788, -50.000
+        DrugWarsLab.LoadDefault() -- 483.4252, -2625.071, -50.000
     end
 
     -- ====================================================================
     -- =------------------- [DLC: San Andreas Mercenaries] ---------------=
     -- ====================================================================
     if GetGameBuildNumber() >= 2944 then
-        MercenariesLab.LoadDefault() -- -1915.75, 3749.85, -100.0
-        MercenariesWarehouse.LoadDefault() -- 1200.0, -3250.0, -50.0
+        MercenariesClub.LoadDefault() -- 1202.407, -3251.251, -50.000
+        MercenariesLab.LoadDefault() -- -1916.119, 3749.719, -100.000
     end
 
     -- ====================================================================
     -- =------------------- [DLC: The Chop Shop] -------------------------=
     -- ====================================================================
     if GetGameBuildNumber() >= 3095 then
-        ChopShopCargoShip.LoadDefault() -- -356.4354, -4072.71, 16.8003
-        ChopShopLifeguard.LoadDefault() -- -1487.699, -1019.91, 5.2976
-        ChopShopGarage.LoadDefault() -- 1220.0, -2280.0, -50.0
-        ChopShopSalvage.LoadDefault() -- 1080.0, -2275.0, -50.0
+        ChopShopCargoShip.LoadDefault() -- -344.4349, -4062.832, 17.000
+        ChopShopCartelGarage.LoadDefault() -- 1220.133, -2277.844, -50.000
+        ChopShopLifeguard.LoadDefault() -- -1488.153, -1021.166, 5.000
+        ChopShopSalvage.LoadDefault() -- 1077.276, -2274.876, -50.000
     end
 end)

dlc_chopshop/cargoship.lua

@@ -1,4 +1,4 @@
--- Cargo ship: -356.4354, -4072.71, 16.8003
+-- Cargo ship: -344.4349, -4062.832, 17.000
 exports('GetChopShopCargoShipObject', function()
     return ChopShopCargoShip
 end)

dlc_chopshop/cartel_garage.lua

@@ -0,0 +1,22 @@
+-- Cartel Garage: 1220.133, -2277.844, -50.000
+exports('GetChopShopCartelGarageObject', function()
+    return ChopShopCartelGarage
+end)
+
+ChopShopCartelGarage = {
+    interiorId = 293633,
+
+    Entities = {
+        entities = "mp2023_02_dlc_int_6_cb",
+
+        Enable = function(state, refresh)
+            SetIplPropState(ChopShopCartelGarage.interiorId, ChopShopCartelGarage.Entities.entities, state, refresh)
+        end
+    },
+
+    LoadDefault = function()
+        ChopShopCartelGarage.Entities.Enable(true, false)
+
+        RefreshInterior(ChopShopCartelGarage.interiorId)
+    end
+}

dlc_chopshop/lifeguard.lua

@@ -1,4 +1,4 @@
--- Lifeguard: -1487.699, -1019.91, 5.2976
+-- Lifeguard: -1488.153, -1021.166, 5.000
 exports('GetChopShopLifeguardObject', function()
     return ChopShopLifeguard
 end)

dlc_chopshop/salvage.lua

@@ -1,4 +1,4 @@
--- Salvage Yard: 1080.0, -2275.0, -50.0
+-- Salvage Yard: 1077.276, -2274.876, -50.000
 exports('GetChopShopSalvageObject', function()
     return ChopShopSalvage
 end)

dlc_drugwars/freakshop.lua

@@ -1,11 +1,27 @@
--- Freakshop: 571.6017, -423.0762, -70.6470
+-- Freakshop: 570.9713, -420.0727, -70.000
 exports('GetDrugWarsFreakshopObject', function()
     return DrugWarsFreakshop
 end)
 
 DrugWarsFreakshop = {
     interiorId = 290817,
 
+    Ipl = {
+        Exterior = {
+            ipl = {
+                "xm3_warehouse",
+                "xm3_warehouse_grnd"
+            }
+        },
+
+        Load = function()
+            EnableIpl(DrugWarsFreakshop.Ipl.Exterior.ipl, true)
+        end,
+        Remove = function()
+            EnableIpl(DrugWarsFreakshop.Ipl.Exterior.ipl, false)
+        end
+    },
+
     Door = {
         opened = "entity_set_roller_door_open",
         closed = "entity_set_roller_door_closed",
@@ -24,6 +40,10 @@ DrugWarsFreakshop = {
     },
 
     LoadDefault = function()
+        -- Exterior
+        DrugWarsFreakshop.Ipl.Load()
+
+        -- Interior
         DrugWarsFreakshop.Door.Set(DrugWarsFreakshop.Door.closed, false)
 
         RefreshInterior(DrugWarsFreakshop.interiorId)

dlc_drugwars/garage.lua

@@ -1,4 +1,4 @@
--- Garage: -272.9271, 283.2581, 103.9920
+-- Eclipse Boulevard Garage: 519.2477, -2618.788, -50.000
 exports('GetDrugWarsGarageObject', function()
     return DrugWarsGarage
 end)

dlc_drugwars/lab.lua

@@ -1,4 +1,4 @@
--- Acid Lab: 483.3028, -2625.291, -50.0
+-- Acid Lab: 483.4252, -2625.071, -50.000
 exports('GetDrugWarsLabObject', function()
     return DrugWarsLab
 end)

dlc_mercenaries/club.lua

@@ -0,0 +1,44 @@
+-- Vinewood Car Club: 1202.407, -3251.251, -50.000
+exports('GetMercenariesClubObject', function()
+    return MercenariesClub
+end)
+
+MercenariesClub = {
+    interiorId = 291841,
+
+    Style = {
+        empty = "entity_set_no_plus", -- The lamps if the podium is not there
+        club = {
+            "entity_set_plus",
+            "entity_set_backdrop_frames",
+            "entity_set_signs"
+        },
+
+        Set = function(style, refresh)
+            MercenariesClub.Style.Clear(false)
+
+            SetIplPropState(MercenariesClub.interiorId, style, true, refresh)
+        end,
+        Clear = function(refresh)
+            SetIplPropState(MercenariesClub.interiorId, {
+                MercenariesClub.Style.empty,
+                MercenariesClub.Style.club
+            }, false, refresh)
+        end
+    },
+
+    Stairs = {
+        stairs = "entity_set_stairs",
+
+        Enable = function(state, refresh)
+            SetIplPropState(MercenariesClub.interiorId, MercenariesClub.Stairs.stairs, state, refresh)
+        end
+    },
+
+    LoadDefault = function()
+        MercenariesClub.Style.Set(MercenariesClub.Style.warehouse, false)
+        MercenariesClub.Stairs.Enable(true, false)
+
+        RefreshInterior(MercenariesClub.interiorId)
+    end
+}

dlc_mercenaries/lab.lua

@@ -1,4 +1,4 @@
--- Fort Zancudo Lab: -1915.75, 3749.85, -100.0
+-- Fort Zancudo Lab: -1916.119, 3749.719, -100.000
 exports('GetMercenariesLabObject', function()
     return MercenariesLab
 end)

fxmanifest.lua

@@ -134,17 +134,16 @@ client_scripts {
     , "dlc_drugwars/garage.lua"
     , "dlc_drugwars/lab.lua"
     , "dlc_drugwars/traincrash.lua"
-    , "dlc_drugwars/warehouse.lua"
 
     -- DLC San Andreas Mercenaries (Requires forced build 2944 or higher)
     , "dlc_mercenaries/base.lua"
+    , "dlc_mercenaries/club.lua"
     , "dlc_mercenaries/lab.lua"
-    , "dlc_mercenaries/warehouse.lua"
 
     -- DLC The Chop Shop (Requires forced build 3095 or higher)
     , "dlc_chopshop/base.lua"
     , "dlc_chopshop/cargoship.lua"
-    , "dlc_chopshop/garage.lua"
+    , "dlc_chopshop/cartel_garage.lua"
     , "dlc_chopshop/lifeguard.lua"
     , "dlc_chopshop/salvage.lua"
 }