diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valor/valor191500.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valor/valor191500.ytd index 771b5170d..f1f0e82df 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valor/valor191500.ytd +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/valor/valor191500.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12d04ecbda05f13b0a76edd22dfb5561e161a78a52cda2efaa5dd0ecd75e1294 -size 14479152 +oid sha256:a42ce2f15247a2d944c55067996f534541c260f992aee54b59f8c912c58acfa0 +size 14445162 diff --git a/resources/ptelevision/config.lua b/resources/ptelevision/config.lua index bdeab5e32..d467e3ccb 100644 --- a/resources/ptelevision/config.lua +++ b/resources/ptelevision/config.lua @@ -17,28 +17,28 @@ Config.Models = { -- Any TV Models used on the map or in locations must be defin }, [`prop_laptop_lester2`] = { DefaultVolume = 0.5, - Range = 20.0, + Range = 10.0, Target = "tvscreen", -- Only use if prop has render-target name. Scale = 0.085, Offset = vector3(-1.02, -0.055, 1.04) }, [`prop_monitor_02`] = { DefaultVolume = 0.5, - Range = 20.0, + Range = 10.0, Target = "tvscreen", -- Only use if prop has render-target name. Scale = 0.085, Offset = vector3(-1.02, -0.055, 1.04) }, [`prop_trev_tv_01`] = { DefaultVolume = 0.5, - Range = 20.0, + Range = 10.0, Target = "tvscreen", -- Only use if prop has render-target name. Scale = 0.085, Offset = vector3(-1.02, -0.055, 1.04) }, [`prop_tv_02`] = { DefaultVolume = 0.5, - Range = 20.0, + Range = 10.0, Target = "tvscreen", -- Only use if prop has render-target name. Scale = 0.085, Offset = vector3(-1.02, -0.055, 1.04) @@ -113,13 +113,132 @@ Config.Models = { -- Any TV Models used on the map or in locations must be defin Scale = 0.085, Offset = vector3(-1.02, -0.055, 1.04) }, - [`prop_tv_flat_02`] = { + [`prop_flatscreen_overlay`] = { DefaultVolume = 0.5, Range = 20.0, Target = "tvscreen", -- Only use if prop has render-target name. Scale = 0.085, Offset = vector3(-1.02, -0.055, 1.04) }, + [`v_ilev_cin_screen`] = { + DefaultVolume = 0.9, + Range = 20.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`v_ilev_mm_screen`] = { + DefaultVolume = 0.9, + Range = 20.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`v_ilev_mm_screen2`] = { + DefaultVolume = 0.9, + Range = 20.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`v_ilev_lest_bigscreen`] = { + DefaultVolume = 0.9, + Range = 20.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`prop_big_cin_screen`] = { + DefaultVolume = 0.9, + Range = 20.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`sf_prop_sf_tv_flat_scr_01a`] = { + DefaultVolume = 0.9, + Range = 20.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`v_club_roc_mscreen`] = { + DefaultVolume = 0.9, + Range = 20.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`hei_prop_hei_monitor_overlay`] = { + DefaultVolume = 0.9, + Range = 6.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`prop_projector_overlay`] = { + DefaultVolume = 0.9, + Range = 20.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`prop_tv_flat_03b`] = { + DefaultVolume = 0.9, + Range = 10.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`prop_tv_flat_03b`] = { + DefaultVolume = 0.9, + Range = 10.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`prop_tv_05`] = { + DefaultVolume = 0.9, + Range = 10.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`prop_tv_01`] = { + DefaultVolume = 0.9, + Range = 10.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`ex_prop_ex_tv_flat_01`] = { + DefaultVolume = 0.9, + Range = 10.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`xm_prop_x17_tv_flat_01`] = { + DefaultVolume = 0.9, + Range = 10.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`prop_cs_tv_stand`] = { + DefaultVolume = 0.5, + Range = 0.5, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, + [`prop_tv_flat_02`] = { + DefaultVolume = 0.5, + Range = 5.0, + Target = "tvscreen", -- Only use if prop has render-target name. + Scale = 0.085, + Offset = vector3(-1.02, -0.055, 1.04) + }, } Config.Locations = { -- REMOVE ALL IF NOT USING ONESYNC, OR IT SHALL BREAK. diff --git a/resources/wk_wars2x/config.lua b/resources/wk_wars2x/config.lua index bb77183e0..090b6ce45 100644 --- a/resources/wk_wars2x/config.lua +++ b/resources/wk_wars2x/config.lua @@ -68,7 +68,7 @@ CONFIG.use_sonorancad = false CONFIG.keyDefaults = { -- Remote control key - remote_control = "f6", + remote_control = "f10", -- Radar key lock key key_lock = "l", diff --git a/server.cfg b/server.cfg index 4f2513f6f..5aa59eba7 100644 --- a/server.cfg +++ b/server.cfg @@ -124,7 +124,7 @@ ensure CinematicCam ensure spotlight ensure CarryPeople ensure Police-Shield -ensure TaserFramework +//ensure TaserFramework ensure dpclothing //ensure Car-Nitro ensure ContainerForklift @@ -209,7 +209,7 @@ ensure unholster ensure NoDriveBy ensure BetterFlashlight ensure ja_sast_eup -//ensure ja_lssd_eup +ensure ja_lssd_eup ///ensure ja_usmarshal_eup //ensure ja_fbi_eup ensure cd_doorlock