diff --git a/resources/El3ttric-40MM/.fxap b/resources/El3ttric-40MM/.fxap index e93f210f0..de8b3dcc6 100644 Binary files a/resources/El3ttric-40MM/.fxap and b/resources/El3ttric-40MM/.fxap differ diff --git a/resources/El3ttric-BeanBag/.fxap b/resources/El3ttric-BeanBag/.fxap index a5c888660..ec569b4cf 100644 Binary files a/resources/El3ttric-BeanBag/.fxap and b/resources/El3ttric-BeanBag/.fxap differ diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/.fxap b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/.fxap index e350ce84a..80e100589 100644 Binary files a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/.fxap and b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/.fxap differ diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/fxmanifest.lua b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/fxmanifest.lua index 2fac2cb89..24f47577f 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/fxmanifest.lua +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/fxmanifest.lua @@ -4,7 +4,7 @@ lua54 'yes' description 'Biker - Grapeseed' author 'G&Ns Studio' -version '4.1.0' +version '4.1.1' this_is_a_map 'yes' diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydd/gn_biker_slod_children.ydd b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydd/gn_biker_slod_children.ydd index c0262fda5..78dd9565d 100644 Binary files a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydd/gn_biker_slod_children.ydd and b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydd/gn_biker_slod_children.ydd differ diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_exitdoor.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_exitdoor.ydr index f316cffa0..2966c2df8 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_exitdoor.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_exitdoor.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cfe9624c7d310c31940744413302e0733a6a40f20404d6f6a5a2755d93e8900 +oid sha256:ab6d308e949b7c81a150343b24b021431cf718d9d99a3dc01fcfde880f890993 size 234826 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_fanbase.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_fanbase.ydr index 1c46f0452..7127d96ff 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_fanbase.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_fanbase.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f1360b5352d88664220796a6c6b1dd011991e8f7706ad552febfb940f415903 +oid sha256:60677e2dcfdbcbab52dcaeee14cb05f09e6201d8336da17ea8e600df3b568af0 size 41913 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_decals.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_decals.ydr index e2a9d11ee..1dc603ccb 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_decals.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_decals.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffae9102f759ed5a96f357123cf1891907f4b7f91e23bd9723cb80b44482eb6c +oid sha256:9f59e5e85b491a8b136813a7df3f91ac8753718b04e6c4aecf2669a9af92d5c6 size 5722 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_details.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_details.ydr index 80f3f3f15..a29648540 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_details.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_details.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db40f4ecfe9d053bef1289779b189c209f700abe377e40d337f5bc582c63a4a4 +oid sha256:45d1d06efd1389bb9218e6abae889ecb8617046f6e87cc36ab17a0d48a076b22 size 470325 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_details2.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_details2.ydr index b4b983e27..b07c93e74 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_details2.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_details2.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f904e48b2ed03979fa7533f135ac0eb7167e983b1c4a38b41045eb4106ec2f77 +oid sha256:e159b3c42d121df9c6514e0b138851cc5e95c3f959614bc988e86affc99ab67b size 10891 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_day.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_day.ydr index 266a3c04c..7215c77be 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_day.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_day.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d3bd861af270f9c7a601a0e2228e91b878c5bb27616c70680e44c1a6ee40aad +oid sha256:0dc5cd4a8657117c29f2277a39aa4ad4a915bc68375f8e3526f441ca929c6d9e size 30011 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_night.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_night.ydr index ad6726046..facd944da 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_night.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_night.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f69e6e73083389f7249b9c99c58ce510202756f52e45ff6ce6dea4de5269ca3d +oid sha256:34cd7f7f22ae1516d40325b787f171bcfecb2170e30a6c00859b91ea004782b4 size 30136 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_weather.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_weather.ydr index ad6957ee9..eb710df7f 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_weather.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_emi_weather.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0adaa75782795e05e17af53ae08fee6579c8c0db305ee591637b52b936ce812 +oid sha256:7760fe8f39832d29d8f0e7a4931d93b07c6e092ec76a53066e988546ceb7fadb size 30152 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_proxy.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_proxy.ydr index 8bb3b3114..4402bae11 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_proxy.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_proxy.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d73ec36a37dfaa4405f42e7ff2d23283e6e320bd0a89e70881699749bb30aa51 +oid sha256:4ccc9f294b69a62b283430be7e8a1c1550e24b488df76617f1202378118aa07f size 228710 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_windows.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_windows.ydr index 617b72e88..add33f675 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_windows.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_windows.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54c4b88de1c5f82239c46c7a8f338f4028a420185b110c980c5112d518f3df48 +oid sha256:efcbb36d7d5e25bbeab7f529037f1115be2b8344adc82d506fc24252bd392829 size 3261 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop.ydr index eceefe7d1..96ba37c2d 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:540eb3a3241378f16425745949c1258dd30439a2285d6a966471b4fdc37cc67e +oid sha256:3b7521af14886014e187f75df89d919969fb8d922412ba51d76ca94cba188f24 size 512901 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop2.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop2.ydr index 87a12ba6d..d342ee3ae 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop2.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop2.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:811481ec8761d83d3057a9d6217f10a5072271a566356b0abd06461c7962df86 +oid sha256:f45af809d7dcc4bf3867c741bd04ed1f4b21df05346f9481dee48ef84cd0e8ed size 77240 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop_art.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop_art.ydr index 44854eb43..bde3e49e5 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop_art.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop_art.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3ad2bc004a18974382fac2fe22462ede5bb600719f74fc175f3ffc53cb588b5 +oid sha256:a5f914ef1c07d8285954f044a160b06be95486d7aafb555d2cc11f1837b8f7f9 size 9607 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop_decals.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop_decals.ydr index 2dcb2ced8..854ee876c 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop_decals.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r01_workshop_decals.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68a6cf66ee4eaeffc580f97e1b6cf9c7385a5c9d88b8b0618d8f1b2b440242d0 +oid sha256:9bd619a6151bd3b1e9559f482bd7a688dc51df2d61abac9ce50b8e72c63a01da size 893 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_details.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_details.ydr index 3246f90ec..4206a69d1 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_details.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_details.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:113649bd6fa550d140a0ae88e32aaabecc6a5d200eba04e57659e66a482e5645 +oid sha256:a0eed12ccb8d055313b6cfa9acd2ca617316353db6c9782fb9ce9d1dac73689d size 213474 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_details2.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_details2.ydr index c936a4c06..688bd69c1 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_details2.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_details2.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95195abd64810547faf1e884da8c378fcda61b26819b136821f72eb8bda47c25 +oid sha256:74b3aab2c90748aaa21480e9a31fbbe63d8c21d7f04a2ae7e3e1b978ce8b9fc5 size 62820 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_proxy.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_proxy.ydr index 86acaaeba..4ed4c8a8b 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_proxy.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_proxy.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59022a6dffb867dcd66595bf8745e118ea13bfc03f0e6aeb33e3cbb2291dc2f0 +oid sha256:7633a144a2f411b772e36692580bec59ffdfac09b3a584115d55349a647dd848 size 37256 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_windows.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_windows.ydr index 6bc39b883..55932f97b 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_windows.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_r02_windows.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66b51899703284976a0f72aa9db249d67de397adf7d883d4835426cf9f242501 +oid sha256:69e99b17095d4bb48c58db4131680e1b808a127b42b2d33598c407c67f47ad5e size 3247 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_shell.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_shell.ydr index dc9ecbca2..b096e3928 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_shell.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_shell.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a1c57d61aeab754104d427eb78eaaa07718a1af9161d7e1bb71eefac8d4635b +oid sha256:eecf0eb760c6b9235da62c1d60e550833258e03e63d5edee20deb59b2adbe4b0 size 106921 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_shell_office.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_shell_office.ydr index 20946cf92..63db2ce2e 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_shell_office.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_shell_office.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dc88e6319ef533d1ac5e4788c591447501ce1a9731785f88d90448d0a3e7f75 +oid sha256:1da6fbf9b03f9a2e3d03d388a91ec961ac71de4a87d34a066d1dff9d7540163d size 45092 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_slide_door_l.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_slide_door_l.ydr index ac1af60a9..7874087a8 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_slide_door_l.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_slide_door_l.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdc837e8b0da49c180e34087f7a2037f83871522befa8f5bf44927ada88aa11e +oid sha256:5df75f37c454f7f7691683123ff03a48247fd825b975fda592e46ed8d531c738 size 3129 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_slide_door_r.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_slide_door_r.ydr index dc7310adb..9e117e2f8 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_slide_door_r.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_barn_slide_door_r.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaebe485d5a440ea5a454ef45bae01b5bb1793b3c938a2b81c1507d7a8002c09 +oid sha256:ae9f80ba0dff6d5bb368605a942eba77b18f7da61967cbf5d372172dfe807886 size 3196 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_art.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_art.ydr index 748412cc1..fad0f4ac2 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_art.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_art.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3e735fcadeca056cee5a9cd6b58a6aa28c4e8982010ee6ef2f7736ff9257205 -size 475509 +oid sha256:f3390f35ee1a3f7a91f6bea2d188712a116086952362738dc48692022ac9f684 +size 138668 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_decals.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_decals.ydr index 62d7d24c6..9d24d8571 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_decals.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_decals.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f0d9cebb7f7f1d8cc9fc6f2d94eb5bb0bbe8c73605a66a34d64adcedf55a168 +oid sha256:396b765b30bf040c933677fee286561daa9f2e24390c605871c5e47918f3ec9b size 50054 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_details.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_details.ydr index 464ce4727..5f117a394 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_details.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_details.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46d823c4bbeb4e8825d8691e7e80b514b213616610a79d0ca57c193bde252d4c +oid sha256:22dc42bce5a048340f251a2a91441a4eafb650e9a896dc2ba4a598ff3861ad8a size 231285 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_elec.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_elec.ydr index 6675d9f92..afdb260f4 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_elec.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_elec.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1ed7a701c95d60318db71cf23f1d809f21a30af66678e2e3c0f47514f377f68 +oid sha256:fb9c81291855dee8c182cf40ead52c462af50ed6a3dd7671042339f29760fd6b size 241406 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_lightproxy.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_lightproxy.ydr index 38d7814ab..29b012ca9 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_lightproxy.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_lightproxy.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46844d89d2d960f03ff293912ee2f8be363246de012f00f34a7b6a21b9f9ab30 +oid sha256:68baefc6ba625a9559ddce796710e24b1fb73f5351d9f585693ac48bb6ccea42 size 2419 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_windowsday.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_windowsday.ydr index 45de122a1..380939ec5 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_windowsday.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r01_windowsday.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adb833a980f9e7cde1f1b1d20f74ee7d8bc63e9c2501bba49ac1cae9b6af3146 +oid sha256:01e9b642d966ec7858f5c6f312786d02cb5e6b854528a8bed46c02c754c090f2 size 2730 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_art.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_art.ydr index d0c8bbc47..07ec40a4d 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_art.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_art.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1624961a9bcb243e770edc8e370d5b2cfacef71df3676b402dc68bfe2dbc3fa +oid sha256:7437dd886f5f0f783c70f8ae3a737572cd7c356bee64785ae46e15e5e9589d14 size 5162 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_decals.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_decals.ydr index 1c9edb5dd..c85c381ec 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_decals.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_decals.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6282f3f52736ac5d32211d6c15d47f4dd3aae23401cdb4d8badd960b2200d276 +oid sha256:b39bbec897f67a2e8e853c8bd46fdc670202c79edebe9c1b6ff98d42cefe7f5f size 5978 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_details.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_details.ydr index efa782e37..564706df0 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_details.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_details.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b80e9d3a3da9bad2cf28daaca9ee7dd43fd00b4f3c1b054c99cc76b012ad19c +oid sha256:c9c3e9b158be590a182600e4bfc1fcc4a63d2e42070e892056046ee3390bc64c size 35332 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_elec.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_elec.ydr index 3efa9fc81..90f73fb9b 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_elec.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_elec.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6424c6c9b4b7e94ac83c30751121d8c68fb890d7b4e451dc0a9d7bdb9e8a327 +oid sha256:582ff142bc7284f3d9e94debbb78ac86c74da15fd60895f8210e6479f32cef76 size 52714 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_lightproxy.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_lightproxy.ydr index 4cac939ce..b69590e09 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_lightproxy.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_lightproxy.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d01c6290ad8c86fd6a74ac36c5617142271ad8b6bcaec83aa5f7d9ac00b3a3f +oid sha256:d9e105a9cf95ba07a1a8af06876939cf42e08ea460573271a0e38dd77a5bf9c0 size 1023 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_windowsday.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_windowsday.ydr index 10b938418..1760132ad 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_windowsday.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r02_windowsday.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be4d0ccf05e0bcbcd67621a9f1528e570317dd11a2da39a8d8ca0d8483f8dc70 +oid sha256:abfa0e014b29502a5646f0e246801d7faca17c0744212db0b7a14e37651b6085 size 1349 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_decals.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_decals.ydr index 3dfff99b3..34952b7fe 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_decals.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_decals.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f4b88e5ba3739a5a41210a955a85512f4933e45ead54ebf19aa2f7b052e9a95 +oid sha256:29cf42cb5cef87dbadd8c94813aee21b79385eb9aba40a42ad4624279a0ab76c size 17198 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_details.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_details.ydr index cdb2aa070..cb66f8121 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_details.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_details.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ac168c6e4ff01f99be21d025b38256a14824b2bef74adc194edca10a32c96bc +oid sha256:13915f8bb2be2b395f0ab3d889d3f9cf14a0d264c060560e2ab6e673d66ab753 size 84831 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_elec.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_elec.ydr index 58d6a90d6..5312c2357 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_elec.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_elec.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb5a2e635969d06e21f71de55e22dcd4b960d5a83182643b145a89314fc33227 +oid sha256:519c902b9f12ef7d13b3a464de3af2b56ced0a80c565317a1b5e91bc827c6a9d size 44091 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_mirror.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_mirror.ydr index 907123423..05c13ce36 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_mirror.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_mirror.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecee338f135b0accac6e0a5b54675735fbccb675292fcdfc0b45534ec8891228 +oid sha256:916375c2307fed9d61203fbf00df1ed666375abe8095db5139354bdbc204b03a size 1348 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_windowsday.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_windowsday.ydr index 2bab93943..ba22a15ee 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_windowsday.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_r03_windowsday.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11dd47e7800afd2ccfe54f0755980aaa32aca33388abacb9f7024725e83299aa +oid sha256:e74b52f717d67ceb71fdb2ea2c5492a1740ad97d85beb3ed09e76fb334cd031e size 1222 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_shell.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_shell.ydr index 9acffd843..c7774370f 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_shell.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_biker_shell.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fbd8daab7675440f743a01a680f05ce0f49b45332a6668f7d4d4f1de211d685 +oid sha256:af808c71f55f6c64ea11eb82462a12dccc53567ddd58bc81dfc31202d39ef5de size 113493 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_prop_bar_table_01.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_prop_bar_table_01.ydr index 5bf4b8938..76b4de6de 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_prop_bar_table_01.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_prop_bar_table_01.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8829b98ce8adee166b056da1d3d0d4059c38be1a8032509119638a9b82397bdb +oid sha256:23041e282519144e751b636941cf6442b5d934bfdc83f0d8d011b90234e39b25 size 17917 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_prop_leather_pillow_01.ydr b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_prop_leather_pillow_01.ydr index f24b681e9..e033e7c45 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_prop_leather_pillow_01.ydr +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ydr/gn_prop_leather_pillow_01.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49b885e17152afd34c79777dcbe3206581ef132b60b3261e8a148645aed8354e +oid sha256:03d23c4d2eee26fe1ca90726e7dd4e955c449852d55abcc8c035ea4fcf9730fd size 5687 diff --git a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ytd/gn_biker_grapeseed_art.ytd b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ytd/gn_biker_grapeseed_art.ytd index 6f006ea1e..9167db3f3 100644 --- a/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ytd/gn_biker_grapeseed_art.ytd +++ b/resources/[EGRP-Map-Addons]/[gnstudio]/cfx_gn_biker_grapeseed/stream/ytd/gn_biker_grapeseed_art.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb660c327b12cc1932b2aee728dfdb7e511c06282104e0347587e5292ff24076 -size 5168766 +oid sha256:01e8d878b98378de0007c1974a87d76823446232d1b8f432ee98b6737cf81623 +size 5542580 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/.fxap b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/.fxap index d8c4abf09..222030bdd 100644 Binary files a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/.fxap and b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/.fxap differ diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/fxmanifest.lua b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/fxmanifest.lua index db25be256..066610c10 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/fxmanifest.lua +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/fxmanifest.lua @@ -3,12 +3,9 @@ lua54 'yes' game "gta5" author 'brofx' -description 'brofx_farmhouse_02' -version '1.0.0' +description 'brofx_farmhouse02' +version '1.1.0' -data_file "INTERIOR_PROXY_ORDER_FILE" "interiorproxies.meta" - -files { "stream/interiorproxies.meta" } this_is_a_map "yes" diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02.ydr index 6e6780dfc..ea3842185 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffd969e8e3a06d0cb20b340b723f4397ff4bbf868be1c198d0423e1798c8e4b6 +oid sha256:13643921390219423cd9a5424a490358f62637c3bb2a0c5a77b1582a68b88c8e size 593230 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_detail.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_detail.ydr index cb052ff26..7ebc54c33 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_detail.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_detail.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:635860216c672c92fcf54858e3cdabec78993c8c864bd316dcc94e0f8230642a +oid sha256:ca5395f3254a0c6cd7753cea9fab0429007ea7600dc1f2e7ea2858abbbe85689 size 3870874 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_gate1a.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_gate1a.ydr index d2d3286bd..690c182d3 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_gate1a.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_gate1a.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d3c7b49ffdfbcfe9353ba9e1fd49c0830a944f0d3ac40b59919202dafc6e9ec +oid sha256:024fca27fac65dabb105e845716c911fca34800e461973dcbe975ad02644e56f size 157498 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_gate1b.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_gate1b.ydr index 862732e42..b5963b864 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_gate1b.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmbarn_02_gate1b.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e998a826539ee5b5f68307f7b16b7e9bce48d034dae170d999551fef7a6a9b90 +oid sha256:d58faa3409647b8d17166ad9aaf8b40ef0edfd44a1338439497e01f176f3bfd4 size 159280 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02.ydr index 3ace2ba2c..d5e104943 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87f5a90c4429bcf9d77a4e5b5fc67d376b8e603f5211b96c541624fd310a8b1f +oid sha256:f6dcf5a8b1b132b9fb3aa81f88f40b7956fe324cc6fac910b4076dc71084bf8f size 3245566 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_ao.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_ao.ydr index f69589ec9..07c5766f1 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_ao.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_ao.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dfe8eb299e9559bf9742201d4ac700bdd7b154fd9a343dc559521dd6b655c63 +oid sha256:7957ef1047d9756b824189c58d36fd4da85dc40f0f115f62b641096c1e0bbe41 size 85885 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_bedroom.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_bedroom.ydr index ce4c218d8..b24a4d1fb 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_bedroom.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_bedroom.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ded56e50d3256f905f16bc2f2e104b5217ceac21ba87f6978378a8b5d9a7746f +oid sha256:040d54390d246c734913e10d2aac7e8a2044ecf383ed1ebe691912fcc302ccaa size 265213 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_decalos.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_decalos.ydr index 334728e44..a2735e754 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_decalos.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_decalos.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7faa347a94cfb36acbcf5ab82552b7494d8d953bb5070acacbb0ce0a5b0b46c4 +oid sha256:b310dc57e2bf4ec2ffe0a7f76d201471397e5445fbed38f1d3be8751351bfc55 size 654609 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_detail.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_detail.ydr index 57234893a..b5de7353a 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_detail.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_detail.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c05c59fd7fed34a74d284d22f8a47ea4798a875f82cd9438a00201a9beb76bb5 +oid sha256:7bb6fb31ae3d352190ea0170a7418550d4aca686c49bedd89fba974c3216f245 size 78469 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_frontdoor.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_frontdoor.ydr index a5739ec4e..e3aa1440d 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_frontdoor.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_frontdoor.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04301ce594a31136ddedb7917d99365dae2af2103f8effc672aca1ad2cbc14a4 +oid sha256:b761f720deb7f276ca298371ed6725aef302638c89ac8f87cfcfdab8bb8b754d size 152942 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_insidedoor.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_insidedoor.ydr index f110c60ad..eced724e1 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_insidedoor.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_insidedoor.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e52d54a272d432df18ec2db0fcf33697e0f76900bbbe7fd36acc418203040066 +oid sha256:30cfd7866560c61cb350846a03b949d0ed15b59f71c50c98e450a66ee09ff078 size 293925 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_main.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_main.ydr index c700c90d2..8c3d9c225 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_main.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_main.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a5c48966c36ee2392c57ef3d22045bf83de1da1ea22abacd2b5113b15d85973 +oid sha256:4f6c4e95dc0859db80b2c8924dc12e0480c51b3e06549cf6def090ccbdbc9c7f size 8933519 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_master_bedroom.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_master_bedroom.ydr index 8315f9ecd..f52c58c76 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_master_bedroom.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_master_bedroom.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cda74d3119c2c0344e81ff16ebed4bf0a1ae7a942b1d02bf840400e6d620cf7 +oid sha256:d3d3a1ce3f3962f32ee40004e4603e2087e9feba0c8442a67f5b208819e3f9ba size 299094 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_office.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_office.ydr index 709e968a1..34a235f51 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_office.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_office.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97216db2895a18f8b3d102a895dcf42de494b5c4ff91f61c8989e13705059768 +oid sha256:28b8f0a98c77c7ac624a1b56e19834be9459e9daf2c4a3a0e13ed6ddcca6d81c size 139176 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_txt.ytd b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_txt.ytd index d493b4d7b..e0e635f60 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_txt.ytd +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_txt.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db2b4a9aea61ed1a012a86bbb770db030d54e84c74cd141245a2739c3bda294d -size 3417263 +oid sha256:62915d9343e94d03bc5a938cb0bd60c3d5ea12ec490758e68476c75154deb8b6 +size 3314298 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_wc.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_wc.ydr index 77627dc42..7ac4f08ac 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_wc.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/brofx_farmhouse_02_wc.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9c2444211ea72bc721b045f397a81d997f3675876478c997dc1e128c26f8d36 +oid sha256:02e72103aa552f855f731d82627757539e7840f438a859e6fa920b4830e6985b size 247414 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_emissive_1.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_emissive_1.ydr index b10122c70..d4b11f4eb 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_emissive_1.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_emissive_1.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fd9a1cc2dc1d8a26fdf0cdcdcceb32c8e29370691dbcf6c21a4f98e27bf67fe +oid sha256:6d6aa42be9a4c621fb629323a7d81bc148fef2af6b47ae95bdc5c181d79882d0 size 105279 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_10524.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_10524.ydr index a5640f77b..640a8e3d4 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_10524.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_10524.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cb4aae3bdd11a47b08f1e3a0ad4dbe0f5102d39497eb3d32c132c3aedbb6551 +oid sha256:7a3a4a9c9c02aaa4bb080c19b6c55904cb67ade66b4e3d6a30b98214a0259ebd size 1405016 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_21579.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_21579.ydr index 759c49a32..bb353f9f8 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_21579.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_21579.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ea6dc9a3bda33e31ef5e6ff70abd538af791fdd5307a6b99e6aa5552b64df88 +oid sha256:8152dbcabc340c52226f991f02d317379ba56730a38e5cf5f9d9d6f09acd58e2 size 17462 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_25759.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_25759.ydr index c8929282c..8eb435d02 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_25759.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_25759.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46bce10137ee76319d0bf00a678bc5ce387eb5683cf26cde8737001c94426026 +oid sha256:eef8782241eb222f8f276ce25d332fe2810d8e5602beef6978fc11469bd382ac size 52339 diff --git a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_30573.ydr b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_30573.ydr index c9ff95afb..a34b5e44e 100644 --- a/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_30573.ydr +++ b/resources/[EGRP-Map-Addons]/brofx_farmhouse_02/stream/cs6_05_mcfarm_30573.ydr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc690824833aea1918350c8d06690f36ef88fc357990a3a5704efe013a41f18e +oid sha256:fed6b0bbe0da2c9f009737b66d22d8e0396d4825afbb9675f654ad7c607b7144 size 51252 diff --git a/resources/[EGRP-Map-Addons]/lasdinblainecounty/stream/[basemaps]/bcso_ground.ymap b/resources/[EGRP-Map-Addons]/lasdinblainecounty/stream/[basemaps]/bcso_ground.ymap index afca1c8e1..b906e66c8 100644 --- a/resources/[EGRP-Map-Addons]/lasdinblainecounty/stream/[basemaps]/bcso_ground.ymap +++ b/resources/[EGRP-Map-Addons]/lasdinblainecounty/stream/[basemaps]/bcso_ground.ymap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db63a47b1f4cdb92042076d772261c4ce3b9f4159948342e7a087d4fb7d1147d -size 4504 +oid sha256:e7f5fe9b4754a0fae28c4de47768871a9d40833f972218bcfe800873cc00d972 +size 4584 diff --git a/resources/chp21tahoe/.fxap b/resources/chp21tahoe/.fxap index 30a0e0dc0..8d39c11a1 100644 Binary files a/resources/chp21tahoe/.fxap and b/resources/chp21tahoe/.fxap differ diff --git a/resources/chp21tahoe/carvariations.meta b/resources/chp21tahoe/carvariations.meta index d7765eac6..f11f7190d 100644 --- a/resources/chp21tahoe/carvariations.meta +++ b/resources/chp21tahoe/carvariations.meta @@ -6,40 +6,15 @@ + 0 + 0 + 0 0 - 134 - 0 - 64 - 64 - 64 - 64 + 13 + 16 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/chp21tahoe/stream/21tahoeantenna.yft b/resources/chp21tahoe/stream/21tahoeantenna.yft index 6268b60cd..12a85cebc 100644 --- a/resources/chp21tahoe/stream/21tahoeantenna.yft +++ b/resources/chp21tahoe/stream/21tahoeantenna.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33c3de9a6707ab3b57c5dd4fdab5b366717e0bb413821989f6e64ac974e48353 -size 22729 +oid sha256:4156a2595659104d080ecd55625bbb5457960af0a41b785e40a20fc7db04b544 +size 22863 diff --git a/resources/chp21tahoe/stream/21tahoecage.yft b/resources/chp21tahoe/stream/21tahoecage.yft index fdf0e42c8..ef5ead63b 100644 --- a/resources/chp21tahoe/stream/21tahoecage.yft +++ b/resources/chp21tahoe/stream/21tahoecage.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe01c3fb75b0a45f87d8cfc27e550b5d3a2ef853a88c1bc07da6ff545c1f5013 -size 77923 +oid sha256:02d463c76c84d534afb341be1b88132bb5b42345bf501b7b581bb51bcaa79d5f +size 78359 diff --git a/resources/chp21tahoe/stream/21tahoehalogenddown.yft b/resources/chp21tahoe/stream/21tahoehalogenddown.yft index 517240e59..04603c947 100644 --- a/resources/chp21tahoe/stream/21tahoehalogenddown.yft +++ b/resources/chp21tahoe/stream/21tahoehalogenddown.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b489a906095b8f648d56853d529ec1914347d00088e9194abdc19e6d3c774702 -size 182125 +oid sha256:51ed8a4f4b667cd1921e9eb092069728a2a3447e3a32d4363f643e791291f132 +size 182493 diff --git a/resources/chp21tahoe/stream/21tahoehalogendup.yft b/resources/chp21tahoe/stream/21tahoehalogendup.yft index 8da4f9285..b0d8cd975 100644 --- a/resources/chp21tahoe/stream/21tahoehalogendup.yft +++ b/resources/chp21tahoe/stream/21tahoehalogendup.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da9b166b29ab16a8369a262bd8cad58597840a0e6768e528c0d11a12ab47335a -size 180900 +oid sha256:5375409d9d31f37713329e2e5bf9a109fdb19d67973fb7c0a92a79621555d7e1 +size 181294 diff --git a/resources/chp21tahoe/stream/21tahoehalogenpdown.yft b/resources/chp21tahoe/stream/21tahoehalogenpdown.yft index 27b299167..38cd1b6bf 100644 --- a/resources/chp21tahoe/stream/21tahoehalogenpdown.yft +++ b/resources/chp21tahoe/stream/21tahoehalogenpdown.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8f7697141ce5141fcf768f2b3bbc6ba2f97ba037165dc765e714a2d28c5bcbb -size 181980 +oid sha256:f7cb84ef856c2d949590ea3c4b9e2957ee8d9da43e2b5d9c2b40b9cce0a66d6f +size 182402 diff --git a/resources/chp21tahoe/stream/21tahoehalogenpup.yft b/resources/chp21tahoe/stream/21tahoehalogenpup.yft index cefa37880..6d54decd4 100644 --- a/resources/chp21tahoe/stream/21tahoehalogenpup.yft +++ b/resources/chp21tahoe/stream/21tahoehalogenpup.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bebb91dfbf76e0f30d10676960447c6aa842e7e37a9d2ed430323a9c9b552725 -size 180740 +oid sha256:fbcb02f779487157686cf1b2707c03b5f38f88f74b1fe39559fd22aa66e92e17 +size 181111 diff --git a/resources/chp21tahoe/stream/21tahoetkdns.yft b/resources/chp21tahoe/stream/21tahoetkdns.yft index 3773dd154..4f09b5782 100644 --- a/resources/chp21tahoe/stream/21tahoetkdns.yft +++ b/resources/chp21tahoe/stream/21tahoetkdns.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b87ca2e4a71b95566ac981f4105e0b34692ca6ef1e78c8f1dbf5e720caee207c -size 5528 +oid sha256:6c9bae2ffd19ea5ba87f935c9d3b489d375a100666f40c5d7a62aaea050116ca +size 5824 diff --git a/resources/chp21tahoe/stream/chp21tahoe+hi.ytd b/resources/chp21tahoe/stream/chp21tahoe+hi.ytd index aa75fb25a..89269e8c0 100644 --- a/resources/chp21tahoe/stream/chp21tahoe+hi.ytd +++ b/resources/chp21tahoe/stream/chp21tahoe+hi.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2de5cda7b28b110f2228d0fb6536bb548b437ee85b7d13ba149f67ecef9d7c6 -size 2421273 +oid sha256:f8502b268cf9b95145a7b8fb80a3eef90e35d80acde4df9652aae2be145c1f83 +size 5707393 diff --git a/resources/chp21tahoe/stream/chp21tahoe.yft b/resources/chp21tahoe/stream/chp21tahoe.yft index 4817ace63..4be3b0c27 100644 --- a/resources/chp21tahoe/stream/chp21tahoe.yft +++ b/resources/chp21tahoe/stream/chp21tahoe.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcc737e21732cd8638e48b7d74782b6e7142a4e2a5a6c9b4ef43cdba3c9d0c82 -size 4501527 +oid sha256:812f828372b6930deeeac5f300a9c1bc457f73ed647e0b03d5d661650f779fd4 +size 6848745 diff --git a/resources/chp21tahoe/stream/chp21tahoe.ytd b/resources/chp21tahoe/stream/chp21tahoe.ytd index 3fe1a8f0e..bd34afb9c 100644 --- a/resources/chp21tahoe/stream/chp21tahoe.ytd +++ b/resources/chp21tahoe/stream/chp21tahoe.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46855354a4012d1b1ff8e051311a22e44d49cc77c66311362ecdf0ec351b4d0a -size 11963217 +oid sha256:8bcfac21638ace5b37c6ffd42b9bfd52e3679d931dc885d1c92f554a934b8e95 +size 13488066 diff --git a/resources/chp21tahoe/stream/chp21tahoe_hi.yft b/resources/chp21tahoe/stream/chp21tahoe_hi.yft index 302694db7..50407ff07 100644 --- a/resources/chp21tahoe/stream/chp21tahoe_hi.yft +++ b/resources/chp21tahoe/stream/chp21tahoe_hi.yft @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07907d2a16a3309c80967e83bfc0a48f79de806cd986e307d4b97c2dc556b812 -size 8816285 +oid sha256:5189be0aaa5a651f78a1a13cb0bddeb01a3273f28ba3f871417ef71593d935ab +size 7508307 diff --git a/resources/chp21tahoe/vehicles.meta b/resources/chp21tahoe/vehicles.meta index e909ef52b..3428fc458 100644 Binary files a/resources/chp21tahoe/vehicles.meta and b/resources/chp21tahoe/vehicles.meta differ diff --git a/resources/scully_radio2/.fxap b/resources/scully_radio2/.fxap index d466586a7..b999014b4 100644 Binary files a/resources/scully_radio2/.fxap and b/resources/scully_radio2/.fxap differ diff --git a/resources/scully_radio2/client/main.lua b/resources/scully_radio2/client/main.lua index 850bfd0b3..c7d7ef627 100644 Binary files a/resources/scully_radio2/client/main.lua and b/resources/scully_radio2/client/main.lua differ diff --git a/resources/scully_radio2/functions/framework.lua b/resources/scully_radio2/functions/framework.lua index 2bd33776a..17c4e128f 100644 --- a/resources/scully_radio2/functions/framework.lua +++ b/resources/scully_radio2/functions/framework.lua @@ -8,7 +8,9 @@ end local ox_inventory = hasResource('ox_inventory') and exports.ox_inventory local qb_inventory = hasResource('qb-inventory') and exports['qb-inventory'] +local ps_inventory = hasResource('ps-inventory') and exports['ps-inventory'] local qs_inventory = hasResource('qs-inventory') and exports['qs-inventory'] +local codem_inventory = hasResource('codem-inventory') and exports['codem-inventory'] local QBCore, ESX = hasResource('qb-core'), hasResource('es_extended') if IsDuplicityVersion() then @@ -29,7 +31,7 @@ if IsDuplicityVersion() then end end - if Scully.UseItem and (qb_inventory or qs_inventory) then + if Scully.UseItem and (qb_inventory or ps_inventory or qs_inventory or codem_inventory) then fw.Functions.CreateUseableItem('radio', function(source, item) TriggerClientEvent('scully_radio:openRadio', source, Scully.RadioColour) end) @@ -51,16 +53,19 @@ if IsDuplicityVersion() then function Scully.Functions.GetPlayerName(source) local player = fw.GetPlayerFromId(source) - local firstname = player.get('firstName') - if firstname then - return '', string.sub(firstname, 1, 1) .. '. ' .. player.get('lastName') - else - return '', GetPlayerName(source) + if player then + local firstname = player.get('firstName') + + if firstname then + return '', string.sub(firstname, 1, 1) .. '. ' .. player.get('lastName') + else + return '', GetPlayerName(source) + end end end - if Scully.UseItem and qs_inventory then + if Scully.UseItem and (qs_inventory or codem_inventory) then fw.RegisterUsableItem('radio', function(source) TriggerClientEvent('scully_radio:openRadio', source, Scully.RadioColour) end) @@ -100,6 +105,7 @@ if IsDuplicityVersion() then end) end else + local playerState = LocalPlayer.state local playerData = {} if QBCore then @@ -109,6 +115,17 @@ else RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() playerData = fw.Functions.GetPlayerData() + + local callsign = GetResourceKvpString(playerData.citizenid .. ':callsign:' .. Scully.KVPHandle) + local radioName = GetResourceKvpString(playerData.citizenid .. ':name:' .. Scully.KVPHandle) + + if callsign then + TriggerServerEvent('scully_radio:updateRadioInfo', 'callsign', callsign) + end + + if radioName then + TriggerServerEvent('scully_radio:updateRadioInfo', 'name', radioName) + end end) RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() @@ -121,32 +138,50 @@ else playerData.job = job end) - RegisterNetEvent('qb-inventory:client:updateInventory', function() - Scully.Functions.HasItem(function(hasItem) - if not hasItem then - TriggerEvent('scully_radio:leaveChannel', true) + CreateThread(function() + while true do + if playerState.radioChannel and (playerState.radioChannel > 0) then + Scully.Functions.HasItem(function(hasItem) + if not hasItem then + TriggerEvent('scully_radio:leaveChannel', true) + end + end) end - end) - end) - RegisterNetEvent('inventory:client:UpdatePlayerInventory', function() - Scully.Functions.HasItem(function(hasItem) - if not hasItem then - TriggerEvent('scully_radio:leaveChannel', true) - end - end) + Wait(2500) + end end) Scully.Functions.ShowNotification = fw.Functions.Notify + + function Scully.Functions.UpdateInfo(data) + Scully.Radio[data.type] = data.value + + SetResourceKvp(playerData.citizenid .. ':' .. data.type .. ':' .. Scully.KVPHandle, data.value) + TriggerServerEvent('scully_radio:updateRadioInfo', data.type, data.value) + Scully.Functions.ShowNotification(Scully.Language.UpdatedYour .. ' ' .. data.type .. ' ' .. Scully.Language.To .. ' ' .. data.value .. '!') + end elseif ESX then - local playerState = LocalPlayer.state local fw = exports.es_extended:getSharedObject() playerData = fw.GetPlayerData() RegisterNetEvent('esx:playerLoaded', function(data) + Wait(1000) + playerState.isLoggedIn = true playerData = data + + local callsign = GetResourceKvpString(playerData.identifier .. ':callsign:' .. Scully.KVPHandle) + local radioName = GetResourceKvpString(playerData.identifier .. ':name:' .. Scully.KVPHandle) + + if callsign then + TriggerServerEvent('scully_radio:updateRadioInfo', 'callsign', callsign) + end + + if radioName then + TriggerServerEvent('scully_radio:updateRadioInfo', 'name', radioName) + end end) RegisterNetEvent('esx:onPlayerLogout', function() @@ -161,6 +196,14 @@ else end) Scully.Functions.ShowNotification = fw.ShowNotification + + function Scully.Functions.UpdateInfo(data) + Scully.Radio[data.type] = data.value + + SetResourceKvp(playerData.identifier .. ':' .. data.type .. ':' .. Scully.KVPHandle, data.value) + TriggerServerEvent('scully_radio:updateRadioInfo', data.type, data.value) + Scully.Functions.ShowNotification(Scully.Language.UpdatedYour .. ' ' .. data.type .. ' ' .. Scully.Language.To .. ' ' .. data.value .. '!') + end else CreateThread(function() Wait(500) @@ -172,7 +215,18 @@ else end) RegisterNetEvent('playerSpawned', function() - LocalPlayer.state:set('isLoggedIn', true, false) + playerState:set('isLoggedIn', true, false) + + local callsign = GetResourceKvpString('radio:callsign:' .. Scully.KVPHandle) + local radioName = GetResourceKvpString('radio:name:' .. Scully.KVPHandle) + + if callsign then + TriggerServerEvent('scully_radio:updateRadioInfo', 'callsign', callsign) + end + + if radioName then + TriggerServerEvent('scully_radio:updateRadioInfo', 'name', radioName) + end end) function Scully.Functions.ShowNotification(text) @@ -180,6 +234,14 @@ else AddTextComponentSubstringPlayerName(text) EndTextCommandThefeedPostTicker(true, true) end + + function Scully.Functions.UpdateInfo(data) + Scully.Radio[data.type] = data.value + + SetResourceKvp('radio:' .. data.type .. ':' .. Scully.KVPHandle, data.value) + TriggerServerEvent('scully_radio:updateRadioInfo', data.type, data.value) + Scully.Functions.ShowNotification(Scully.Language.UpdatedYour .. ' ' .. data.type .. ' ' .. Scully.Language.To .. ' ' .. data.value .. '!') + end end function Scully.Functions.HasAccess(channel) @@ -229,7 +291,32 @@ else end end elseif qb_inventory then - hasRadioItem = qb_inventory:HasItem(checkItems) + for i = 1, #checkItems do + local hasItem = qb_inventory:HasItem(checkItems[i], 1) + + if hasItem then + hasRadioItem = true + break + end + end + elseif ps_inventory then + for i = 1, #checkItems do + local hasItem = ps_inventory:HasItem(checkItems[i], 1) + + if hasItem then + hasRadioItem = true + break + end + end + elseif codem_inventory then + for i = 1, #checkItems do + local hasItem = codem_inventory:HasItem(checkItems[i], 1) + + if hasItem then + hasRadioItem = true + break + end + end end if not Scully.UseItem then hasRadioItem = true end diff --git a/resources/scully_radio2/fxmanifest.lua b/resources/scully_radio2/fxmanifest.lua index 626163857..29e4714dd 100644 --- a/resources/scully_radio2/fxmanifest.lua +++ b/resources/scully_radio2/fxmanifest.lua @@ -31,7 +31,8 @@ escrow_ignore { 'config.lua', 'functions/*.lua', 'ox_inventory_items.lua', - 'qb-inventory_items.lua' + 'qb-inventory_items.lua', + 'talkover_protection.lua' } ui_page 'ui/index.html' diff --git a/resources/scully_radio2/server/main.lua b/resources/scully_radio2/server/main.lua index ffa5699d8..5f6746db3 100644 Binary files a/resources/scully_radio2/server/main.lua and b/resources/scully_radio2/server/main.lua differ diff --git a/resources/scully_radio2/talkover_protection.lua b/resources/scully_radio2/talkover_protection.lua new file mode 100644 index 000000000..76eb644ea --- /dev/null +++ b/resources/scully_radio2/talkover_protection.lua @@ -0,0 +1,238 @@ +local radioChannel = 0 +local radioNames = {} +local disableRadioAnim = false +local talkingPlayers = {} +local playerState = LocalPlayer.state + +--- event syncRadioData +--- syncs the current players on the radio to the client +---@param radioTable table the table of the current players on the radio +---@param localPlyRadioName string the local players name +function syncRadioData(radioTable, localPlyRadioName) + radioData = radioTable + logger.info('[radio] Syncing radio table.') + if GetConvarInt('voice_debugMode', 0) >= 4 then + print('-------- RADIO TABLE --------') + tPrint(radioData) + print('-----------------------------') + end + for tgt, enabled in pairs(radioTable) do + if tgt ~= playerServerId then + toggleVoice(tgt, enabled, 'radio') + end + end + sendUIMessage({ + radioChannel = radioChannel, + radioEnabled = radioEnabled + }) + if GetConvarInt("voice_syncPlayerNames", 0) == 1 then + radioNames[playerServerId] = localPlyRadioName + end +end +RegisterNetEvent('pma-voice:syncRadioData', syncRadioData) + +--- event setTalkingOnRadio +--- sets the players talking status, triggered when a player starts/stops talking. +---@param plySource number the players server id. +---@param enabled boolean whether the player is talking or not. +function setTalkingOnRadio(plySource, enabled) + toggleVoice(plySource, enabled, 'radio') + radioData[plySource] = enabled + playMicClicks(enabled) +end +RegisterNetEvent('pma-voice:setTalkingOnRadio', setTalkingOnRadio) + +--- event addPlayerToRadio +--- adds a player onto the radio. +---@param plySource number the players server id to add to the radio. +function addPlayerToRadio(plySource, plyRadioName) + radioData[plySource] = false + if GetConvarInt("voice_syncPlayerNames", 0) == 1 then + radioNames[plySource] = plyRadioName + end + if radioPressed then + logger.info('[radio] %s joined radio %s while we were talking, adding them to targets', plySource, radioChannel) + playerTargets(radioData, MumbleIsPlayerTalking(PlayerId()) and callData or {}) + else + logger.info('[radio] %s joined radio %s', plySource, radioChannel) + end +end +RegisterNetEvent('pma-voice:addPlayerToRadio', addPlayerToRadio) + +--- event removePlayerFromRadio +--- removes the player (or self) from the radio +---@param plySource number the players server id to remove from the radio. +function removePlayerFromRadio(plySource) + if plySource == playerServerId then + logger.info('[radio] Left radio %s, cleaning up.', radioChannel) + for tgt, _ in pairs(radioData) do + if tgt ~= playerServerId then + toggleVoice(tgt, false, 'radio') + end + end + sendUIMessage({ + radioChannel = 0, + radioEnabled = radioEnabled + }) + radioNames = {} + radioData = {} + playerTargets(MumbleIsPlayerTalking(PlayerId()) and callData or {}) + else + toggleVoice(plySource, false) + if radioPressed then + logger.info('[radio] %s left radio %s while we were talking, updating targets.', plySource, radioChannel) + playerTargets(radioData, MumbleIsPlayerTalking(PlayerId()) and callData or {}) + else + logger.info('[radio] %s has left radio %s', plySource, radioChannel) + end + radioData[plySource] = nil + if GetConvarInt("voice_syncPlayerNames", 0) == 1 then + radioNames[plySource] = nil + end + end +end +RegisterNetEvent('pma-voice:removePlayerFromRadio', removePlayerFromRadio) + +--- function setRadioChannel +--- sets the local players current radio channel and updates the server +---@param channel number the channel to set the player to, or 0 to remove them. +function setRadioChannel(channel) + if GetConvarInt('voice_enableRadios', 1) ~= 1 then return end + type_check({channel, "number"}) + TriggerServerEvent('pma-voice:setPlayerRadio', channel) + radioChannel = channel +end + +--- exports setRadioChannel +--- sets the local players current radio channel and updates the server +---@param channel number the channel to set the player to, or 0 to remove them. +exports('setRadioChannel', setRadioChannel) +-- mumble-voip compatability +exports('SetRadioChannel', setRadioChannel) + +--- exports removePlayerFromRadio +--- sets the local players current radio channel and updates the server +exports('removePlayerFromRadio', function() + setRadioChannel(0) +end) + +--- exports addPlayerToRadio +--- sets the local players current radio channel and updates the server +---@param _radio number the channel to set the player to, or 0 to remove them. +exports('addPlayerToRadio', function(_radio) + local radio = tonumber(_radio) + if radio then + setRadioChannel(radio) + end +end) + +--- exports toggleRadioAnim +--- toggles whether the client should play radio anim or not, if the animation should be played or notvaliddance +exports('toggleRadioAnim', function() + disableRadioAnim = not disableRadioAnim + TriggerEvent('pma-voice:toggleRadioAnim', disableRadioAnim) +end) + +-- exports disableRadioAnim +--- returns whether the client is undercover or not +exports('getRadioAnimState', function() + return toggleRadioAnim +end) + +--- check if the player is dead +--- seperating this so if people use different methods they can customize +--- it to their need as this will likely never be changed +--- but you can integrate the below state bag to your death resources. +--- LocalPlayer.state:set('isDead', true or false, false) +function isDead() + if playerState.isDead then + return true + elseif IsPlayerDead(PlayerId()) then + return true + end +end + +RegisterCommand('+radiotalk', function() + if GetConvarInt('voice_enableRadios', 1) ~= 1 then return end + if isDead() then return end + + local talkingProtection = false + + for player, talking in pairs(talkingPlayers) do + if talking then + local currentChannel = Player(player).state.radioChannel + + if currentChannel ~= radioChannel then + talkingPlayers[player] = false + else + talkingProtection = true + break + end + end + end + + if talkingProtection then return end + + if not radioPressed and radioEnabled then + if radioChannel > 0 then + logger.info('[radio] Start broadcasting, update targets and notify server.') + playerTargets(radioData, MumbleIsPlayerTalking(PlayerId()) and callData or {}) + TriggerServerEvent('pma-voice:setTalkingOnRadio', true) + radioPressed = true + playMicClicks(true) + if GetConvarInt('voice_enableRadioAnim', 0) == 1 and not (GetConvarInt('voice_disableVehicleRadioAnim', 0) == 1 and IsPedInAnyVehicle(PlayerPedId(), false)) then + if not disableRadioAnim then + RequestAnimDict('random@arrests') + while not HasAnimDictLoaded('random@arrests') do + Citizen.Wait(10) + end + TaskPlayAnim(PlayerPedId(), "random@arrests", "generic_radio_enter", 8.0, 2.0, -1, 50, 2.0, 0, 0, 0) + end + end + Citizen.CreateThread(function() + TriggerEvent("pma-voice:radioActive", true) + while radioPressed do + Wait(0) + SetControlNormal(0, 249, 1.0) + SetControlNormal(1, 249, 1.0) + SetControlNormal(2, 249, 1.0) + end + end) + end + end +end, false) + +RegisterCommand('-radiotalk', function() + if radioChannel > 0 or radioEnabled and radioPressed then + radioPressed = false + MumbleClearVoiceTargetPlayers(voiceTarget) + playerTargets(MumbleIsPlayerTalking(PlayerId()) and callData or {}) + TriggerEvent("pma-voice:radioActive", false) + playMicClicks(false) + if GetConvarInt('voice_enableRadioAnim', 0) == 1 then + StopAnimTask(PlayerPedId(), "random@arrests", "generic_radio_enter", -4.0) + end + TriggerServerEvent('pma-voice:setTalkingOnRadio', false) + end +end, false) +if gameVersion == 'fivem' then + RegisterKeyMapping('+radiotalk', 'Talk over Radio', 'keyboard', GetConvar('voice_defaultRadio', 'LMENU')) +end + +--- event syncRadio +--- syncs the players radio, only happens if the radio was set server side. +---@param _radioChannel number the radio channel to set the player to. +function syncRadio(_radioChannel) + if GetConvarInt('voice_enableRadios', 1) ~= 1 then return end + logger.info('[radio] radio set serverside update to radio %s', radioChannel) + radioChannel = _radioChannel +end +RegisterNetEvent('pma-voice:clSetPlayerRadio', syncRadio) + +RegisterNetEvent('scully_radio:setTalkingOnRadio', function(player, talking) + local currentChannel = Player(player).state.radioChannel + + if currentChannel == radioChannel then + talkingPlayers[player] = talking + end +end) \ No newline at end of file diff --git a/server.cfg b/server.cfg index 9a4df0e93..3313b8afe 100644 --- a/server.cfg +++ b/server.cfg @@ -69,7 +69,7 @@ ensure vMenu ensure Delete-Vehicle ensure delped ensure disable_interior -ensure Cruise-Control +//ensure Cruise-Control ensure guidehud ensure EGRP-LoadingScreen ensure NeverWanted @@ -87,7 +87,7 @@ ensure Tackle ensure WeazelNewsCam ensure Crouch ensure CalmAI -ensure Engine-Toggle +//ensure Engine-Toggle ensure PiggyBack ensure Weaponry ensure rpemotesreborn1.6.0 @@ -122,7 +122,7 @@ ensure Smart-Clamp ensure Frame-Monitor ensure Chair-Bed-System ensure Nearest-Postal -ensure Sandy-Streetlights +///ensure Sandy-Streetlights ensure LifeInvader-MLO-Script ensure Safe-Zones ensure Server-Queue @@ -148,7 +148,7 @@ ensure DeathCam //ensure Doorlock ensure wk_wars2x ensure Firework-Box -ensure Fighterjet-HUD +///ensure Fighterjet-HUD ensure speedcams //ensure dopeNotify //ensure okokNotify