From 90e850a89a8bc21419db3e885c3eaed9159c6638 Mon Sep 17 00:00:00 2001 From: TheIndra55 Date: Sun, 31 Mar 2024 22:22:57 +0200 Subject: [PATCH 1/8] Add support for Los Santos Drug Wars DLC --- client.lua | 8 ++++++++ dlc_drugwars/garage.lua | 37 +++++++++++++++++++++++++++++++++++++ dlc_drugwars/traincrash.lua | 12 ++++++++++++ dlc_drugwars/warehouse.lua | 24 ++++++++++++++++++++++++ fxmanifest.lua | 5 +++++ 5 files changed, 86 insertions(+) create mode 100644 dlc_drugwars/garage.lua create mode 100644 dlc_drugwars/traincrash.lua create mode 100644 dlc_drugwars/warehouse.lua diff --git a/client.lua b/client.lua index 593036b..617d3f9 100644 --- a/client.lua +++ b/client.lua @@ -175,4 +175,12 @@ Citizen.CreateThread(function() CriminalEnterpriseVehicleWarehouse.LoadDefault() -- 800.13696, -3001.4297, -65.14074 CriminalEnterpriseWarehouse.LoadDefault() -- 849.1047, -3000.209, -45.974354 end + + -- ==================================================================== + -- =------------------- [DLC: Los Santos Drug Wars] ------------------= + -- ==================================================================== + if GetGameBuildNumber() >= 2802 then + DrugWarsGarage.LoadDefault() -- -272.9271, 283.2581, 103.9920 + DrugWarsWarehouse.LoadDefault() -- 603.0235, -395.7166, 23.7996 + end end) diff --git a/dlc_drugwars/garage.lua b/dlc_drugwars/garage.lua new file mode 100644 index 0000000..a54aa1c --- /dev/null +++ b/dlc_drugwars/garage.lua @@ -0,0 +1,37 @@ +-- Garage: -272.9271, 283.2581, 103.9920 +exports('GetDrugWarsGarageObject', function() + return DrugWarsGarage +end) + +DrugWarsGarage = { + Ipl = { + ipl = { + "xm3_garage_fix", + "xm3_collision_fixes" + }, + + Load = function() + EnableIpl(DrugWarsGarage.Ipl.ipl, true) + end, + Remove = function() + EnableIpl(DrugWarsGarage.Ipl.ipl, false) + end + }, + + Banner = { + model = `ss1_13_clth_ss1_13`, + position = vector3(-277.1116, 281.5493, 98.6691), + + Hide = function() + CreateModelHide(DrugWarsGarage.Banner.position, 10.0, DrugWarsGarage.Banner.model, true) + end, + Restore = function() + RemoveModelHide(DrugWarsGarage.Banner.position, 10.0, DrugWarsGarage.Banner.model, false) + end + }, + + LoadDefault = function() + DrugWarsGarage.Ipl.Load() + DrugWarsGarage.Banner.Hide() + end +} diff --git a/dlc_drugwars/traincrash.lua b/dlc_drugwars/traincrash.lua new file mode 100644 index 0000000..e7b6f8f --- /dev/null +++ b/dlc_drugwars/traincrash.lua @@ -0,0 +1,12 @@ +-- Train crash: 2630.595, 1458.144, 25.3669 +exports('GetDrugWarsTrainCrashObject', function() + return DrugWarsTrainCrash +end) + +DrugWarsTrainCrash = { + ipl = "xm3_train_crash", + + Enable = function(state) + EnableIpl(DrugWarsTrainCrash.ipl, state) + end +} diff --git a/dlc_drugwars/warehouse.lua b/dlc_drugwars/warehouse.lua new file mode 100644 index 0000000..90657e5 --- /dev/null +++ b/dlc_drugwars/warehouse.lua @@ -0,0 +1,24 @@ +-- Warehouse: 603.0235, -395.7166, 23.7996 +exports('GetDrugWarsWarehouseObject', function() + return DrugWarsWarehouse +end) + +DrugWarsWarehouse = { + Ipl = { + ipl = { + "xm3_warehouse", + "xm3_warehouse_grnd" + }, + + Load = function() + EnableIpl(DrugWarsWarehouse.Ipl.ipl, true) + end, + Remove = function() + EnableIpl(DrugWarsWarehouse.Ipl.ipl, false) + end + }, + + LoadDefault = function() + DrugWarsWarehouse.Ipl.Load() + end +} diff --git a/fxmanifest.lua b/fxmanifest.lua index 5fdfc09..7ed0577 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -127,4 +127,9 @@ client_scripts { , "gta_mpsum2/simeonfix.lua" , "gta_mpsum2/vehicle_warehouse.lua" , "gta_mpsum2/warehouse.lua" + + -- DLC Los Santos Drug Wars (Requires forced build 2802 or higher) + , "dlc_drugwars/garage.lua" + , "dlc_drugwars/warehouse.lua" + , "dlc_drugwars/traincrash.lua" } From 1e5108d23e32deacfddcdf0fcbfe1c27745100bc Mon Sep 17 00:00:00 2001 From: TheIndra55 Date: Mon, 1 Apr 2024 00:05:59 +0200 Subject: [PATCH 2/8] Add Chop Shop cargo ship --- client.lua | 7 +++++++ dlc_chopshop/cargoship.lua | 24 ++++++++++++++++++++++++ fxmanifest.lua | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 dlc_chopshop/cargoship.lua diff --git a/client.lua b/client.lua index 617d3f9..d706862 100644 --- a/client.lua +++ b/client.lua @@ -183,4 +183,11 @@ Citizen.CreateThread(function() DrugWarsGarage.LoadDefault() -- -272.9271, 283.2581, 103.9920 DrugWarsWarehouse.LoadDefault() -- 603.0235, -395.7166, 23.7996 end + + -- ==================================================================== + -- =------------------- [DLC: The Chop Shop] -------------------------= + -- ==================================================================== + if GetGameBuildNumber() >= 3095 then + ChopShopCargoShip.LoadDefault() -- -356.4354, -4072.71, 16.8003 + end end) diff --git a/dlc_chopshop/cargoship.lua b/dlc_chopshop/cargoship.lua new file mode 100644 index 0000000..1b2eb6d --- /dev/null +++ b/dlc_chopshop/cargoship.lua @@ -0,0 +1,24 @@ +-- Cargo ship: -356.4354, -4072.71, 16.8003 +exports('GetChopShopCargoShipObject', function() + return ChopShopCargoShip +end) + +ChopShopCargoShip = { + Ipl = { + ipl = { + "m23_2_cargoship", + "m23_2_cargoship_bridge" + }, + + Load = function() + EnableIpl(ChopShopCargoShip.Ipl.ipl, true) + end, + Remove = function() + EnableIpl(ChopShopCargoShip.Ipl.ipl, false) + end + }, + + LoadDefault = function() + ChopShopCargoShip.Ipl.Load() + end +} diff --git a/fxmanifest.lua b/fxmanifest.lua index 7ed0577..950712b 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -132,4 +132,7 @@ client_scripts { , "dlc_drugwars/garage.lua" , "dlc_drugwars/warehouse.lua" , "dlc_drugwars/traincrash.lua" + + -- DLC The Chop Shop (Requires forced build 3095 or higher) + , "dlc_chopshop/cargoship.lua" } From 8f8fe9123a2a55e4e50b943171790b3297241c66 Mon Sep 17 00:00:00 2001 From: TheIndra55 Date: Mon, 1 Apr 2024 02:38:03 +0200 Subject: [PATCH 3/8] Add base item placements and freakshop --- client.lua | 2 ++ dlc_chopshop/base.lua | 7 +++++++ dlc_chopshop/lifeguard.lua | 21 +++++++++++++++++++++ dlc_drugwars/freakshop.lua | 31 +++++++++++++++++++++++++++++++ dlc_drugwars/garage.lua | 5 +---- dlc_mercenaries/base.lua | 3 +++ fxmanifest.lua | 7 +++++++ gtav/base.lua | 2 +- 8 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 dlc_chopshop/base.lua create mode 100644 dlc_chopshop/lifeguard.lua create mode 100644 dlc_drugwars/freakshop.lua create mode 100644 dlc_mercenaries/base.lua diff --git a/client.lua b/client.lua index d706862..2c2adb2 100644 --- a/client.lua +++ b/client.lua @@ -182,6 +182,7 @@ Citizen.CreateThread(function() if GetGameBuildNumber() >= 2802 then DrugWarsGarage.LoadDefault() -- -272.9271, 283.2581, 103.9920 DrugWarsWarehouse.LoadDefault() -- 603.0235, -395.7166, 23.7996 + DrugWarsFreakshop.LoadDefault() -- 571.6017, -423.0762, -70.6470 end -- ==================================================================== @@ -189,5 +190,6 @@ Citizen.CreateThread(function() -- ==================================================================== if GetGameBuildNumber() >= 3095 then ChopShopCargoShip.LoadDefault() -- -356.4354, -4072.71, 16.8003 + ChopShopLifeguard.LoadDefault() -- -1487.699, -1019.91, 5.2976 end end) diff --git a/dlc_chopshop/base.lua b/dlc_chopshop/base.lua new file mode 100644 index 0000000..005d1c3 --- /dev/null +++ b/dlc_chopshop/base.lua @@ -0,0 +1,7 @@ +CreateThread(function() + RequestIpl("m23_2_acp_collision_fixes_01") + RequestIpl("m23_2_acp_collision_fixes_02") + RequestIpl("m23_2_tug_collision") + RequestIpl("m23_2_hei_yacht_collision_fixes") + RequestIpl("m23_2_vinewood_garage") +end) diff --git a/dlc_chopshop/lifeguard.lua b/dlc_chopshop/lifeguard.lua new file mode 100644 index 0000000..425fa98 --- /dev/null +++ b/dlc_chopshop/lifeguard.lua @@ -0,0 +1,21 @@ +-- Lifeguard: -1487.699, -1019.91, 5.2976 +exports('GetChopShopLifeguardObject', function() + return ChopShopLifeguard +end) + +ChopShopLifeguard = { + Ipl = { + ipl = "m23_2_lifeguard_access", + + Load = function() + EnableIpl(ChopShopLifeguard.Ipl.ipl, true) + end, + Remove = function() + EnableIpl(ChopShopLifeguard.Ipl.ipl, false) + end + }, + + LoadDefault = function() + ChopShopLifeguard.Ipl.Load() + end +} diff --git a/dlc_drugwars/freakshop.lua b/dlc_drugwars/freakshop.lua new file mode 100644 index 0000000..94c0afc --- /dev/null +++ b/dlc_drugwars/freakshop.lua @@ -0,0 +1,31 @@ +-- Freakshop: 571.6017, -423.0762, -70.6470 +exports('GetDrugWarsFreakshopObject', function() + return DrugWarsFreakshop +end) + +DrugWarsFreakshop = { + interiorId = 290817, + + Door = { + opened = "entity_set_roller_door_open", + closed = "entity_set_roller_door_closed", + + Set = function(door, refresh) + DrugWarsFreakshop.Door.Clear() + + SetIplPropState(DrugWarsFreakshop.interiorId, door, true, refresh) + end, + Clear = function(refresh) + SetIplPropState(DrugWarsFreakshop.interiorId, { + DrugWarsFreakshop.Door.opened, + DrugWarsFreakshop.Door.closed + }, false, refresh) + end + }, + + LoadDefault = function() + DrugWarsFreakshop.Door.Set(DrugWarsFreakshop.Door.closed, false) + + RefreshInterior(DrugWarsFreakshop.interiorId) + end +} diff --git a/dlc_drugwars/garage.lua b/dlc_drugwars/garage.lua index a54aa1c..81fd235 100644 --- a/dlc_drugwars/garage.lua +++ b/dlc_drugwars/garage.lua @@ -5,10 +5,7 @@ end) DrugWarsGarage = { Ipl = { - ipl = { - "xm3_garage_fix", - "xm3_collision_fixes" - }, + ipl = "xm3_garage_fix", Load = function() EnableIpl(DrugWarsGarage.Ipl.ipl, true) diff --git a/dlc_mercenaries/base.lua b/dlc_mercenaries/base.lua new file mode 100644 index 0000000..c178940 --- /dev/null +++ b/dlc_mercenaries/base.lua @@ -0,0 +1,3 @@ +CreateThread(function() + RequestIpl("m23_1_legacy_fixes") +end) diff --git a/fxmanifest.lua b/fxmanifest.lua index 950712b..a95daf3 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -129,10 +129,17 @@ client_scripts { , "gta_mpsum2/warehouse.lua" -- DLC Los Santos Drug Wars (Requires forced build 2802 or higher) + , "dlc_drugwars/base.lua" , "dlc_drugwars/garage.lua" , "dlc_drugwars/warehouse.lua" + , "dlc_drugwars/freakshop.lua" , "dlc_drugwars/traincrash.lua" + -- DLC San Andreas Mercenaries (Requires forced build 2944 or higher) + , "dlc_mercenaries/base.lua" + -- DLC The Chop Shop (Requires forced build 3095 or higher) + , "dlc_chopshop/base.lua" , "dlc_chopshop/cargoship.lua" + , "dlc_chopshop/lifeguard.lua" } diff --git a/gtav/base.lua b/gtav/base.lua index a7f5eba..e31956a 100644 --- a/gtav/base.lua +++ b/gtav/base.lua @@ -1,4 +1,4 @@ -Citizen.CreateThread(function() +CreateThread(function() -- Heist Jewel: -637.20159 -239.16250 38.1 RequestIpl("post_hiest_unload") From 0930e13964f66cb5050b00c7435f1e9609f16c3e Mon Sep 17 00:00:00 2001 From: TheIndra55 Date: Mon, 1 Apr 2024 02:52:32 +0200 Subject: [PATCH 4/8] Checkin missing file --- dlc_drugwars/base.lua | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 dlc_drugwars/base.lua diff --git a/dlc_drugwars/base.lua b/dlc_drugwars/base.lua new file mode 100644 index 0000000..ed67d0d --- /dev/null +++ b/dlc_drugwars/base.lua @@ -0,0 +1,5 @@ +CreateThread(function() + RequestIpl("xm3_collision_fixes") + RequestIpl("xm3_sum2_fix") + RequestIpl("xm3_security_fix") +end) From 28b6b5f937a8ac5643cbf38b6ed9884883d73add Mon Sep 17 00:00:00 2001 From: TheIndra55 Date: Mon, 1 Apr 2024 20:02:27 +0200 Subject: [PATCH 5/8] Implement all Drug Wars interiors --- client.lua | 3 +- dlc_drugwars/garage.lua | 78 +++++++++++++++++++++++++++++++++++++++++ dlc_drugwars/lab.lua | 38 ++++++++++++++++++++ fxmanifest.lua | 5 +-- 4 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 dlc_drugwars/lab.lua diff --git a/client.lua b/client.lua index 2c2adb2..d2a30e3 100644 --- a/client.lua +++ b/client.lua @@ -180,9 +180,10 @@ 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() -- 571.6017, -423.0762, -70.6470 end -- ==================================================================== diff --git a/dlc_drugwars/garage.lua b/dlc_drugwars/garage.lua index 81fd235..50995ae 100644 --- a/dlc_drugwars/garage.lua +++ b/dlc_drugwars/garage.lua @@ -4,6 +4,8 @@ exports('GetDrugWarsGarageObject', function() end) DrugWarsGarage = { + interiorId = 290561, + Ipl = { ipl = "xm3_garage_fix", @@ -27,8 +29,84 @@ DrugWarsGarage = { end }, + Numbering = { + none = "", + level1 = "entity_set_numbers_01", + level2 = "entity_set_numbers_02", + level3 = "entity_set_numbers_03", + level4 = "entity_set_numbers_04", + level5 = "entity_set_numbers_05", + + Set = function(num, refresh) + DrugWarsGarage.Numbering.Clear(false) + + if num ~= "" then + SetIplPropState(DrugWarsGarage.interiorId, num, true, refresh) + else + if refresh then + RefreshInterior(DrugWarsGarage.interiorId) + end + end + end, + Clear = function(refresh) + SetIplPropState(DrugWarsGarage.interiorId, { + DrugWarsGarage.Numbering.level1, + DrugWarsGarage.Numbering.level2, + DrugWarsGarage.Numbering.level3, + DrugWarsGarage.Numbering.level4, + DrugWarsGarage.Numbering.level5 + }, false, refresh) + end + }, + + Style = { + immaculate = "entity_set_shell_01", + industrial = "entity_set_shell_02", + indulgent = "entity_set_shell_03", + + Set = function(style, refresh) + DrugWarsGarage.Style.Clear(false) + + SetIplPropState(DrugWarsGarage.interiorId, style, true, refresh) + end, + Clear = function(refresh) + SetIplPropState(DrugWarsGarage.interiorId, { + DrugWarsGarage.Style.immaculate, + DrugWarsGarage.Style.industrial, + DrugWarsGarage.Style.indulgent + }, false, refresh) + end + }, + + Tint = { + white = 1, + gray = 2, + black = 3, + purple = 4, + orange = 5, + yellow = 6, + blue = 7, + red = 8, + green = 9, + lightBlue = 10, + lightGreen = 11, + + SetColor = function(color, refresh) + SetIplPropState(DrugWarsGarage.interiorId, "entity_set_tint_01", true, refresh) + SetInteriorEntitySetColor(DrugWarsGarage.interiorId, "entity_set_tint_01", color) + end, + }, + LoadDefault = function() + -- Exterior DrugWarsGarage.Ipl.Load() DrugWarsGarage.Banner.Hide() + + -- Interior + DrugWarsGarage.Numbering.Set(DrugWarsGarage.Numbering.level1, false) + DrugWarsGarage.Style.Set(DrugWarsGarage.Style.immaculate, false) + DrugWarsGarage.Tint.SetColor(DrugWarsGarage.Tint.white, false) + + RefreshInterior(DrugWarsGarage.interiorId) end } diff --git a/dlc_drugwars/lab.lua b/dlc_drugwars/lab.lua new file mode 100644 index 0000000..235200a --- /dev/null +++ b/dlc_drugwars/lab.lua @@ -0,0 +1,38 @@ +-- Acid Lab: 483.3028, -2625.291, -50.0 +exports('GetDrugWarsLabObject', function() + return DrugWarsLab +end) + +DrugWarsLab = { + interiorId = 290305, + + Details = { + products = { + "set_product_01", + "set_product_02", + "set_product_03", + "set_product_04", + "set_product_05" + }, + supplies = { + "set_supplies_01", + "set_supplies_02", + "set_supplies_03", + "set_supplies_04", + "set_supplies_05", + }, + equipment = "set_equipment_upgrade", + + Enable = function(details, state, refresh) + SetIplPropState(DrugWarsLab.interiorId, details, state, refresh) + end + }, + + LoadDefault = function() + DrugWarsLab.Details.Enable(DrugWarsLab.Details.products, true, false) + DrugWarsLab.Details.Enable(DrugWarsLab.Details.supplies, true, false) + DrugWarsLab.Details.Enable(DrugWarsLab.Details.equipment, true, false) + + RefreshInterior(DrugWarsLab.interiorId) + end +} \ No newline at end of file diff --git a/fxmanifest.lua b/fxmanifest.lua index a95daf3..b87a4c5 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -130,10 +130,11 @@ client_scripts { -- DLC Los Santos Drug Wars (Requires forced build 2802 or higher) , "dlc_drugwars/base.lua" - , "dlc_drugwars/garage.lua" - , "dlc_drugwars/warehouse.lua" , "dlc_drugwars/freakshop.lua" + , "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" From 3657fe46fc14aa13d763170bbd1b2b41ce881b80 Mon Sep 17 00:00:00 2001 From: TheIndra55 Date: Tue, 2 Apr 2024 22:50:18 +0200 Subject: [PATCH 6/8] Implement San Andreas Mercenaries interiors --- client.lua | 8 +++++++ dlc_mercenaries/lab.lua | 28 ++++++++++++++++++++++ dlc_mercenaries/warehouse.lua | 44 +++++++++++++++++++++++++++++++++++ fxmanifest.lua | 2 ++ 4 files changed, 82 insertions(+) create mode 100644 dlc_mercenaries/lab.lua create mode 100644 dlc_mercenaries/warehouse.lua diff --git a/client.lua b/client.lua index d2a30e3..2c93c3d 100644 --- a/client.lua +++ b/client.lua @@ -186,6 +186,14 @@ Citizen.CreateThread(function() DrugWarsWarehouse.LoadDefault() -- 603.0235, -395.7166, 23.7996 end + -- ==================================================================== + -- =------------------- [DLC: San Andreas Mercenaries] ---------------= + -- ==================================================================== + if GetGameBuildNumber() >= 2944 then + MercenariesLab.LoadDefault() + MercenariesWarehouse.LoadDefault() + end + -- ==================================================================== -- =------------------- [DLC: The Chop Shop] -------------------------= -- ==================================================================== diff --git a/dlc_mercenaries/lab.lua b/dlc_mercenaries/lab.lua new file mode 100644 index 0000000..6ea8e96 --- /dev/null +++ b/dlc_mercenaries/lab.lua @@ -0,0 +1,28 @@ +-- Fort Zancudo Lab: -1915.75, 3749.85, -100.0 +exports('GetMercenariesLabObject', function() + return MercenariesLab +end) + +MercenariesLab = { + interiorId = 292097, + + Details = { + levers = "entity_set_levers", + crates = "entity_set_crates", + weapons = "entity_set_weapons", + lights = "entity_set_lift_lights", + + Enable = function(details, state, refresh) + SetIplPropState(MercenariesLab.interiorId, details, state, refresh) + end + }, + + LoadDefault = function() + MercenariesLab.Details.Enable(MercenariesLab.Details.levers, true, false) + MercenariesLab.Details.Enable(MercenariesLab.Details.crates, true, false) + MercenariesLab.Details.Enable(MercenariesLab.Details.weapons, true, false) + MercenariesLab.Details.Enable(MercenariesLab.Details.lights, true, false) + + RefreshInterior(MercenariesLab.interiorId) + end +} \ No newline at end of file diff --git a/dlc_mercenaries/warehouse.lua b/dlc_mercenaries/warehouse.lua new file mode 100644 index 0000000..2d61567 --- /dev/null +++ b/dlc_mercenaries/warehouse.lua @@ -0,0 +1,44 @@ +-- Warehouse/Vinewood Car Club: 1200.0, -3250.0, -50.0 +exports('GetMercenariesWarehouseObject', function() + return MercenariesWarehouse +end) + +MercenariesWarehouse = { + 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) + MercenariesWarehouse.Style.Clear(false) + + SetIplPropState(MercenariesWarehouse.interiorId, style, true, refresh) + end, + Clear = function(refresh) + SetIplPropState(MercenariesWarehouse.interiorId, { + MercenariesWarehouse.Style.empty, + MercenariesWarehouse.Style.club + }, false, refresh) + end + }, + + Stairs = { + stairs = "entity_set_stairs", + + Enable = function(state, refresh) + SetIplPropState(MercenariesWarehouse.interiorId, MercenariesWarehouse.Stairs.stairs, state, refresh) + end + }, + + LoadDefault = function() + MercenariesWarehouse.Style.Set(MercenariesWarehouse.Style.club, false) + MercenariesWarehouse.Stairs.Enable(true, false) + + RefreshInterior(MercenariesWarehouse.interiorId) + end +} \ No newline at end of file diff --git a/fxmanifest.lua b/fxmanifest.lua index b87a4c5..c01746b 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -138,6 +138,8 @@ client_scripts { -- DLC San Andreas Mercenaries (Requires forced build 2944 or higher) , "dlc_mercenaries/base.lua" + , "dlc_mercenaries/lab.lua" + , "dlc_mercenaries/warehouse.lua" -- DLC The Chop Shop (Requires forced build 3095 or higher) , "dlc_chopshop/base.lua" From 28f849e19a26fbfb0404066c20f9773ba8728dc4 Mon Sep 17 00:00:00 2001 From: TheIndra55 Date: Thu, 4 Apr 2024 01:21:42 +0200 Subject: [PATCH 7/8] Add Chop Shop interiors --- client.lua | 6 +- dlc_chopshop/garage.lua | 22 ++++++++ dlc_chopshop/salvage.lua | 115 +++++++++++++++++++++++++++++++++++++++ dlc_drugwars/garage.lua | 10 ++-- fxmanifest.lua | 2 + 5 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 dlc_chopshop/garage.lua create mode 100644 dlc_chopshop/salvage.lua diff --git a/client.lua b/client.lua index 2c93c3d..086c8b5 100644 --- a/client.lua +++ b/client.lua @@ -190,8 +190,8 @@ Citizen.CreateThread(function() -- =------------------- [DLC: San Andreas Mercenaries] ---------------= -- ==================================================================== if GetGameBuildNumber() >= 2944 then - MercenariesLab.LoadDefault() - MercenariesWarehouse.LoadDefault() + MercenariesLab.LoadDefault() -- -1915.75, 3749.85, -100.0 + MercenariesWarehouse.LoadDefault() -- 1200.0, -3250.0, -50.0 end -- ==================================================================== @@ -200,5 +200,7 @@ Citizen.CreateThread(function() 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 end end) diff --git a/dlc_chopshop/garage.lua b/dlc_chopshop/garage.lua new file mode 100644 index 0000000..85bb5e6 --- /dev/null +++ b/dlc_chopshop/garage.lua @@ -0,0 +1,22 @@ +-- Cartel Garage: 1220.0, -2280.0, -50.0 +exports('GetChopShopGarageObject', function() + return ChopShopGarage +end) + +ChopShopGarage = { + interiorId = 293633, + + Entities = { + entities = "mp2023_02_dlc_int_6_cb", + + Enable = function(state, refresh) + SetIplPropState(ChopShopGarage.interiorId, ChopShopGarage.Entities.entities, state, refresh) + end + }, + + LoadDefault = function() + ChopShopGarage.Entities.Enable(true, false) + + RefreshInterior(ChopShopGarage.interiorId) + end +} \ No newline at end of file diff --git a/dlc_chopshop/salvage.lua b/dlc_chopshop/salvage.lua new file mode 100644 index 0000000..70d3c4d --- /dev/null +++ b/dlc_chopshop/salvage.lua @@ -0,0 +1,115 @@ +-- Salvage Yard: 1080.0, -2275.0, -50.0 +exports('GetChopShopSalvageObject', function() + return ChopShopSalvage +end) + +ChopShopSalvage = { + interiorId = 293377, + + Ipl = { + Exterior = { + ipl = { + "m23_2_sp1_03_reds", + "m23_2_sc1_03_reds", + "m23_2_id2_04_reds", + "m23_2_cs1_05_reds", + "m23_2_cs4_11_reds", + } + }, + + Load = function() + EnableIpl(ChopShopSalvage.Ipl.Exterior.ipl, true) + end, + Remove = function() + EnableIpl(ChopShopSalvage.Ipl.Exterior.ipl, false) + end + }, + + Style = { + basic = { + "set_mechanic_basic", + "set_safe_basic" + }, + upgrade = { + "set_mechanic_upgrade", + "set_safe_upgrade" + }, + + Set = function(style, refresh) + ChopShopSalvage.Style.Clear(false) + + SetIplPropState(ChopShopSalvage.interiorId, style, true, refresh) + end, + Clear = function(refresh) + SetIplPropState(ChopShopSalvage.interiorId, { + ChopShopSalvage.Style.basic, + ChopShopSalvage.Style.upgrade + }, false, refresh) + end + }, + + Lift1 = { + down = "set_car_lift_01_down", + up = "set_car_lift_01_up", + + Set = function(lift, refresh) + ChopShopSalvage.Lift1.Clear(false) + + SetIplPropState(ChopShopSalvage.interiorId, lift, true, refresh) + end, + Clear = function(refresh) + SetIplPropState(ChopShopSalvage.interiorId, { + ChopShopSalvage.Lift1.down, + ChopShopSalvage.Lift1.up + }, false, refresh) + end + }, + + Lift2 = { + down = "set_car_lift_02_down", + up = "set_car_lift_02_up", + + Set = function(lift, refresh) + ChopShopSalvage.Lift2.Clear(false) + + SetIplPropState(ChopShopSalvage.interiorId, lift, true, refresh) + end, + Clear = function(refresh) + SetIplPropState(ChopShopSalvage.interiorId, { + ChopShopSalvage.Lift2.down, + ChopShopSalvage.Lift2.up + }, false, refresh) + end + }, + + Tint = { + gray = 1, + red = 2, + blue = 3, + orange = 4, + yellow = 5, + green = 6, + pink = 7, + teal = 8, + darkGray = 9, + + SetColor = function(color, refresh) + SetIplPropState(ChopShopSalvage.interiorId, "set_tint_b", true, refresh) + SetInteriorEntitySetColor(ChopShopSalvage.interiorId, "set_tint_b", color) + end + }, + + LoadDefault = function() + -- Exterior + ChopShopSalvage.Ipl.Load() + + -- Interior + ChopShopSalvage.Tint.SetColor(ChopShopSalvage.Tint.gray, false) + ChopShopSalvage.Style.Set(ChopShopSalvage.Style.upgrade, false) + + ChopShopSalvage.Lift1.Set(ChopShopSalvage.Lift1.up, false) + ChopShopSalvage.Lift2.Set(ChopShopSalvage.Lift2.up, false) + + RefreshInterior(ChopShopSalvage.interiorId) + end +} \ No newline at end of file diff --git a/dlc_drugwars/garage.lua b/dlc_drugwars/garage.lua index 50995ae..9510d2a 100644 --- a/dlc_drugwars/garage.lua +++ b/dlc_drugwars/garage.lua @@ -7,13 +7,15 @@ DrugWarsGarage = { interiorId = 290561, Ipl = { - ipl = "xm3_garage_fix", + Exterior = { + ipl = "xm3_garage_fix" + }, Load = function() - EnableIpl(DrugWarsGarage.Ipl.ipl, true) + EnableIpl(DrugWarsGarage.Ipl.Exterior.ipl, true) end, Remove = function() - EnableIpl(DrugWarsGarage.Ipl.ipl, false) + EnableIpl(DrugWarsGarage.Ipl.Exterior.ipl, false) end }, @@ -94,7 +96,7 @@ DrugWarsGarage = { SetColor = function(color, refresh) SetIplPropState(DrugWarsGarage.interiorId, "entity_set_tint_01", true, refresh) SetInteriorEntitySetColor(DrugWarsGarage.interiorId, "entity_set_tint_01", color) - end, + end }, LoadDefault = function() diff --git a/fxmanifest.lua b/fxmanifest.lua index c01746b..f841e23 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -144,5 +144,7 @@ client_scripts { -- DLC The Chop Shop (Requires forced build 3095 or higher) , "dlc_chopshop/base.lua" , "dlc_chopshop/cargoship.lua" + , "dlc_chopshop/garage.lua" , "dlc_chopshop/lifeguard.lua" + , "dlc_chopshop/salvage.lua" } From fde82c7fd128c57f06e05abaffd52d99d73f47fc Mon Sep 17 00:00:00 2001 From: TheIndra55 Date: Fri, 5 Apr 2024 01:04:33 +0200 Subject: [PATCH 8/8] Cleanup --- client.lua | 19 +++++++-------- dlc_chopshop/cargoship.lua | 2 +- dlc_chopshop/cartel_garage.lua | 22 +++++++++++++++++ dlc_chopshop/garage.lua | 22 ----------------- dlc_chopshop/lifeguard.lua | 2 +- dlc_chopshop/salvage.lua | 2 +- dlc_drugwars/freakshop.lua | 22 ++++++++++++++++- dlc_drugwars/garage.lua | 2 +- dlc_drugwars/lab.lua | 2 +- dlc_drugwars/warehouse.lua | 24 ------------------- dlc_mercenaries/club.lua | 44 ++++++++++++++++++++++++++++++++++ dlc_mercenaries/lab.lua | 2 +- dlc_mercenaries/warehouse.lua | 44 ---------------------------------- fxmanifest.lua | 5 ++-- 14 files changed, 104 insertions(+), 110 deletions(-) create mode 100644 dlc_chopshop/cartel_garage.lua delete mode 100644 dlc_chopshop/garage.lua delete mode 100644 dlc_drugwars/warehouse.lua create mode 100644 dlc_mercenaries/club.lua delete mode 100644 dlc_mercenaries/warehouse.lua diff --git a/client.lua b/client.lua index 086c8b5..7ebb58a 100644 --- a/client.lua +++ b/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) diff --git a/dlc_chopshop/cargoship.lua b/dlc_chopshop/cargoship.lua index 1b2eb6d..b3050ee 100644 --- a/dlc_chopshop/cargoship.lua +++ b/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) diff --git a/dlc_chopshop/cartel_garage.lua b/dlc_chopshop/cartel_garage.lua new file mode 100644 index 0000000..7ec8fc6 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/dlc_chopshop/garage.lua b/dlc_chopshop/garage.lua deleted file mode 100644 index 85bb5e6..0000000 --- a/dlc_chopshop/garage.lua +++ /dev/null @@ -1,22 +0,0 @@ --- Cartel Garage: 1220.0, -2280.0, -50.0 -exports('GetChopShopGarageObject', function() - return ChopShopGarage -end) - -ChopShopGarage = { - interiorId = 293633, - - Entities = { - entities = "mp2023_02_dlc_int_6_cb", - - Enable = function(state, refresh) - SetIplPropState(ChopShopGarage.interiorId, ChopShopGarage.Entities.entities, state, refresh) - end - }, - - LoadDefault = function() - ChopShopGarage.Entities.Enable(true, false) - - RefreshInterior(ChopShopGarage.interiorId) - end -} \ No newline at end of file diff --git a/dlc_chopshop/lifeguard.lua b/dlc_chopshop/lifeguard.lua index 425fa98..557eab1 100644 --- a/dlc_chopshop/lifeguard.lua +++ b/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) diff --git a/dlc_chopshop/salvage.lua b/dlc_chopshop/salvage.lua index 70d3c4d..cb0a039 100644 --- a/dlc_chopshop/salvage.lua +++ b/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) diff --git a/dlc_drugwars/freakshop.lua b/dlc_drugwars/freakshop.lua index 94c0afc..2f12d20 100644 --- a/dlc_drugwars/freakshop.lua +++ b/dlc_drugwars/freakshop.lua @@ -1,4 +1,4 @@ --- Freakshop: 571.6017, -423.0762, -70.6470 +-- Freakshop: 570.9713, -420.0727, -70.000 exports('GetDrugWarsFreakshopObject', function() return DrugWarsFreakshop end) @@ -6,6 +6,22 @@ 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) diff --git a/dlc_drugwars/garage.lua b/dlc_drugwars/garage.lua index 9510d2a..c4b26cf 100644 --- a/dlc_drugwars/garage.lua +++ b/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) diff --git a/dlc_drugwars/lab.lua b/dlc_drugwars/lab.lua index 235200a..953cdd2 100644 --- a/dlc_drugwars/lab.lua +++ b/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) diff --git a/dlc_drugwars/warehouse.lua b/dlc_drugwars/warehouse.lua deleted file mode 100644 index 90657e5..0000000 --- a/dlc_drugwars/warehouse.lua +++ /dev/null @@ -1,24 +0,0 @@ --- Warehouse: 603.0235, -395.7166, 23.7996 -exports('GetDrugWarsWarehouseObject', function() - return DrugWarsWarehouse -end) - -DrugWarsWarehouse = { - Ipl = { - ipl = { - "xm3_warehouse", - "xm3_warehouse_grnd" - }, - - Load = function() - EnableIpl(DrugWarsWarehouse.Ipl.ipl, true) - end, - Remove = function() - EnableIpl(DrugWarsWarehouse.Ipl.ipl, false) - end - }, - - LoadDefault = function() - DrugWarsWarehouse.Ipl.Load() - end -} diff --git a/dlc_mercenaries/club.lua b/dlc_mercenaries/club.lua new file mode 100644 index 0000000..272d192 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/dlc_mercenaries/lab.lua b/dlc_mercenaries/lab.lua index 6ea8e96..aa483b5 100644 --- a/dlc_mercenaries/lab.lua +++ b/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) diff --git a/dlc_mercenaries/warehouse.lua b/dlc_mercenaries/warehouse.lua deleted file mode 100644 index 2d61567..0000000 --- a/dlc_mercenaries/warehouse.lua +++ /dev/null @@ -1,44 +0,0 @@ --- Warehouse/Vinewood Car Club: 1200.0, -3250.0, -50.0 -exports('GetMercenariesWarehouseObject', function() - return MercenariesWarehouse -end) - -MercenariesWarehouse = { - 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) - MercenariesWarehouse.Style.Clear(false) - - SetIplPropState(MercenariesWarehouse.interiorId, style, true, refresh) - end, - Clear = function(refresh) - SetIplPropState(MercenariesWarehouse.interiorId, { - MercenariesWarehouse.Style.empty, - MercenariesWarehouse.Style.club - }, false, refresh) - end - }, - - Stairs = { - stairs = "entity_set_stairs", - - Enable = function(state, refresh) - SetIplPropState(MercenariesWarehouse.interiorId, MercenariesWarehouse.Stairs.stairs, state, refresh) - end - }, - - LoadDefault = function() - MercenariesWarehouse.Style.Set(MercenariesWarehouse.Style.club, false) - MercenariesWarehouse.Stairs.Enable(true, false) - - RefreshInterior(MercenariesWarehouse.interiorId) - end -} \ No newline at end of file diff --git a/fxmanifest.lua b/fxmanifest.lua index f841e23..f8c2ce7 100644 --- a/fxmanifest.lua +++ b/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" }