Merge pull request #1 from ItzCelyrian/dev

Merge Update

dlc_arcade/arcade.lua

@@ -0,0 +1,91 @@
+CreateThread(function()
+	RequestIpl("ch_int_placement_ch_interior_1_dlc_arcade_milo_")
+	RequestIpl("ch_int_placement_ch_interior_2_dlc_plan_milo_")
+
+	-- ARCADE
+	-- 2730, -380, -50
+	local interiorid_arcade = 278273
+
+	-- Interior props / entitysets
+
+	-- MAIN STYLES (Choose one)
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_style_01") 
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_style_02")
+
+	-- DESTROYED VERSION
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_destroyed")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_destroyed_extras") -- (extras for the destroyed version)
+
+	-- TEXTURE STYLES (Choose one)
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_01") 
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_02") 
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_03")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_04") 
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_09")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_10")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_11")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_16")
+
+	-- WALL DESIGNS (Choose one)
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_01")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_02")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_03")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_04")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_05")
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_06")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_07")
+	-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_08")
+
+
+	-- PROPS: Can all be used at same time without colliding
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_streetgames_01")
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wallmonitors")
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_no_idea") -- Some floor stuff
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_no_idea2") -- Neon stuff i think
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_barstuff")
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_walltv")
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_lights_01") -- This also has trophies etc
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_lights_02")
+	EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wire") -- Main Arcade room ligting, cables and arcade props
+
+	-- always refresh the interior or they won't appear
+	RefreshInterior(interiorid_arcade)
+
+	-- UNDERGROUND BASE
+	-- 2697.615, -376.3892, -56.46193
+	local interiorid_arcade_underbase = 278529
+
+	-- PROPS: Can all be used at same time without colliding
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_hacking")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_keypads")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_hacking2")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work2")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_vaultplan")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work3")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_casino_tablemodel") -- Has to be used together with: casino_plan_work3 (its on a table)
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work4")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work5")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_board_drawing")
+	-- EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_machines") -- Blocks path to back room vehicle parking
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_blueprints")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_c4")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_insect")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_01")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_02")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_03")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_04")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_05")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_hat")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_drone")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_noidea_xd")
+	EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_07")
+
+    --  DESTROYED/OLD GARAGE VERSION	(ONLY LOAD THESE 3)
+	-- EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_destroyed")
+	-- EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_destroyed2") -- Enables the walls
+	-- EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_destroyed3") -- Extra props
+
+	-- always refresh the interior or they won't appear
+	RefreshInterior(interiorid_arcade_underbase)
+end)

dlc_mercenary/avenger.lua

@@ -0,0 +1,66 @@
+local function ToggleEntitySet(interior, entitySet, toggle)
+	if toggle then
+		ActivateInteriorEntitySet(interior, entitySet)
+	else
+		DeactivateInteriorEntitySet(interior, entitySet)
+	end
+end
+
+CreateThread(function()
+	RequestIpl("m23_1_int_placement_m23_1_interior_0_dlc_int_01_m23_1_milo_")
+
+	-- -880.0, -2770.0, -50.0
+	local interiorid = 291585
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_tint_fabric_01a")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_avenger_door")
+
+	EnableInteriorProp(interiorid, "prop_fire_exting_2a")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_tint_netting_01a")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_tint_seat_01a")
+	EnableInteriorProp(interiorid, "m23_1_m231_1_tint_seat_01b")
+	EnableInteriorProp(interiorid, "m23_1_m231_1_tint_seat_01c")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_prop_am_decal_strip_01c")
+	EnableInteriorProp(interiorid, "m23_1_m231_1_prop_am_decal_strip_01b")
+	EnableInteriorProp(interiorid, "m23_1_m231_1_prop_am_decal_strip_01a")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_cctv_unit")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_tint_floor_01a")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_tint_bolts_01a")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_shadow_mesh")
+
+	EnableInteriorProp(interiorid, "m23_1_m231_1_avenger_col_dummy")
+
+	ToggleEntitySet(interiorid, "vehicle_mod", true)
+	SetInteriorEntitySetColor(interiorid, "vehicle_mod", 1)
+
+	ToggleEntitySet(interiorid, "weapons_mod", true)
+	SetInteriorEntitySetColor(interiorid, "weapons_mod", 1)
+
+	ToggleEntitySet(interiorid, "control_1", true)
+	SetInteriorEntitySetColor(interiorid, "control_1", 1)
+
+	ToggleEntitySet(interiorid, "control_2", true)
+	SetInteriorEntitySetColor(interiorid, "control_2", 1)
+
+	ToggleEntitySet(interiorid, "control_3", true)
+	SetInteriorEntitySetColor(interiorid, "control_3", 1)
+
+	ToggleEntitySet(interiorid, "gold_bling", true)
+
+	ToggleEntitySet(interiorid, "screen_control", true) -- Controle table
+	SetInteriorEntitySetColor(interiorid, "screen_control", 1)
+	ToggleEntitySet(interiorid, "seat_01", false) -- seat under the controle table
+
+	ToggleEntitySet(interiorid, "jetpack_stand", true) -- Jetpack stand
+	ToggleEntitySet(interiorid, "seat_02", false) -- seat under the jetpack stand
+
+	RefreshInterior(interiorid)
+end)

dlc_mercenary/garage.lua

@@ -0,0 +1,20 @@
+local function ToggleEntitySet(interior, entitySet, toggle)
+	if toggle then
+		ActivateInteriorEntitySet(interior, entitySet)
+	else
+		DeactivateInteriorEntitySet(interior, entitySet)
+	end
+end
+
+CreateThread(function()
+	-- 1200.0, -3250.0, -50.0
+	local interiorid = 291841
+
+	ToggleEntitySet(interiorid, "showroom", true) -- expo zone
+	ToggleEntitySet(interiorid, "extra_light", false) -- extra light
+	ToggleEntitySet(interiorid, "showroom_wall", true) -- wall vinewood car club on expo zone
+	ToggleEntitySet(interiorid, "extra_door", true) -- extra door
+	ToggleEntitySet(interiorid, "wall_sign", true) -- sign on the wall
+
+	RefreshInterior(interiorid)
+end)

dlc_mercenary/zancudo.lua

@@ -0,0 +1,19 @@
+local function ToggleEntitySet(interior, entitySet, toggle)
+	if toggle then
+		ActivateInteriorEntitySet(interior, entitySet)
+	else
+		DeactivateInteriorEntitySet(interior, entitySet)
+	end
+end
+
+CreateThread(function()
+	-- -1876.62, 3750.0, -100.0
+	local interiorid = 292097
+
+	ToggleEntitySet(interiorid, "entity_set_lever", true)
+	ToggleEntitySet(interiorid, "entity_set_light", true)
+	ToggleEntitySet(interiorid, "entity_set_weapons", true)
+	ToggleEntitySet(interiorid, "entity_set_create", true)
+
+	RefreshInterior(interiorid)
+end)

fxmanifest.lua

@@ -103,6 +103,9 @@ client_scripts {
     -- DLC Diamond Casino (Requires forced build 2060 or higher)
     , "dlc_casino/casino.lua"
     , "dlc_casino/penthouse.lua"
+
+    -- DLC Los Santos Summer Special (Requires forced build 2060 or higher)
+    , "dlc_arcade/arcade.lua"
 
     -- DLC Cayo Perico (Requires forced build 2189 or higher)
     , "dlc_cayoperico/cayoperico.lua"
@@ -129,8 +132,14 @@ client_scripts {
     , "gta_mpsum2/vehicle_warehouse.lua"
     , "gta_mpsum2/warehouse.lua"
 
+    -- DLC San Andreas Mercenaries (Requires forced build 2944 or higher)
+    , "dlc_mercenary/avenger.lua"
+    , "dlc_mercenary/garage.lua"
+    , "dlc_mercenary/zancudo.lua"
+
     -- DLC Chop Shop (Requires forced build 3095 or higher)
     , "dlc_chopshop/chopshop.lua"
 }
 
 data_file 'GTXD_PARENTING_DATA' 'dlc_cayoperico/mph4_gtxd.meta'
+data_file 'DLC_ITYP_REQUEST' 'stream/m23_1_dlc_int_03_m23_1.ytyp'