From 02894ddeb136a1348b0689f92dd84182e9e05baa Mon Sep 17 00:00:00 2001 From: KingMcDonalds Date: Sun, 17 Aug 2025 23:16:40 -0700 Subject: [PATCH] adding updating to mods --- resources/El3ttric-40MM/.fxap | Bin 178 -> 178 bytes resources/El3ttric-BeanBag/.fxap | Bin 178 -> 178 bytes .../[gnstudio]/cfx_gn_biker_grapeseed/.fxap | Bin 178 -> 178 bytes .../cfx_gn_biker_grapeseed/fxmanifest.lua | 2 +- .../stream/ydd/gn_biker_slod_children.ydd | Bin 11270 -> 11270 bytes .../stream/ydr/gn_biker_barn_exitdoor.ydr | 2 +- .../stream/ydr/gn_biker_barn_fanbase.ydr | 2 +- .../stream/ydr/gn_biker_barn_r01_decals.ydr | 2 +- .../stream/ydr/gn_biker_barn_r01_details.ydr | 2 +- .../stream/ydr/gn_biker_barn_r01_details2.ydr | 2 +- .../stream/ydr/gn_biker_barn_r01_emi_day.ydr | 2 +- .../ydr/gn_biker_barn_r01_emi_night.ydr | 2 +- .../ydr/gn_biker_barn_r01_emi_weather.ydr | 2 +- .../stream/ydr/gn_biker_barn_r01_proxy.ydr | 2 +- .../stream/ydr/gn_biker_barn_r01_windows.ydr | 2 +- .../stream/ydr/gn_biker_barn_r01_workshop.ydr | 2 +- .../ydr/gn_biker_barn_r01_workshop2.ydr | 2 +- .../ydr/gn_biker_barn_r01_workshop_art.ydr | 2 +- .../ydr/gn_biker_barn_r01_workshop_decals.ydr | 2 +- .../stream/ydr/gn_biker_barn_r02_details.ydr | 2 +- .../stream/ydr/gn_biker_barn_r02_details2.ydr | 2 +- .../stream/ydr/gn_biker_barn_r02_proxy.ydr | 2 +- .../stream/ydr/gn_biker_barn_r02_windows.ydr | 2 +- .../stream/ydr/gn_biker_barn_shell.ydr | 2 +- .../stream/ydr/gn_biker_barn_shell_office.ydr | 2 +- .../stream/ydr/gn_biker_barn_slide_door_l.ydr | 2 +- .../stream/ydr/gn_biker_barn_slide_door_r.ydr | 2 +- .../stream/ydr/gn_biker_r01_art.ydr | 4 +- .../stream/ydr/gn_biker_r01_decals.ydr | 2 +- .../stream/ydr/gn_biker_r01_details.ydr | 2 +- .../stream/ydr/gn_biker_r01_elec.ydr | 2 +- .../stream/ydr/gn_biker_r01_lightproxy.ydr | 2 +- .../stream/ydr/gn_biker_r01_windowsday.ydr | 2 +- .../stream/ydr/gn_biker_r02_art.ydr | 2 +- .../stream/ydr/gn_biker_r02_decals.ydr | 2 +- .../stream/ydr/gn_biker_r02_details.ydr | 2 +- .../stream/ydr/gn_biker_r02_elec.ydr | 2 +- .../stream/ydr/gn_biker_r02_lightproxy.ydr | 2 +- .../stream/ydr/gn_biker_r02_windowsday.ydr | 2 +- .../stream/ydr/gn_biker_r03_decals.ydr | 2 +- .../stream/ydr/gn_biker_r03_details.ydr | 2 +- .../stream/ydr/gn_biker_r03_elec.ydr | 2 +- .../stream/ydr/gn_biker_r03_mirror.ydr | 2 +- .../stream/ydr/gn_biker_r03_windowsday.ydr | 2 +- .../stream/ydr/gn_biker_shell.ydr | 2 +- .../stream/ydr/gn_prop_bar_table_01.ydr | 2 +- .../stream/ydr/gn_prop_leather_pillow_01.ydr | 2 +- .../stream/ytd/gn_biker_grapeseed_art.ytd | 4 +- .../brofx_farmhouse_02/.fxap | Bin 178 -> 178 bytes .../brofx_farmhouse_02/fxmanifest.lua | 7 +- .../stream/brofx_farmbarn_02.ydr | 2 +- .../stream/brofx_farmbarn_02_detail.ydr | 2 +- .../stream/brofx_farmbarn_02_gate1a.ydr | 2 +- .../stream/brofx_farmbarn_02_gate1b.ydr | 2 +- .../stream/brofx_farmhouse_02.ydr | 2 +- .../stream/brofx_farmhouse_02_ao.ydr | 2 +- .../stream/brofx_farmhouse_02_bedroom.ydr | 2 +- .../stream/brofx_farmhouse_02_decalos.ydr | 2 +- .../stream/brofx_farmhouse_02_detail.ydr | 2 +- .../stream/brofx_farmhouse_02_frontdoor.ydr | 2 +- .../stream/brofx_farmhouse_02_insidedoor.ydr | 2 +- .../stream/brofx_farmhouse_02_main.ydr | 2 +- .../brofx_farmhouse_02_master_bedroom.ydr | 2 +- .../stream/brofx_farmhouse_02_office.ydr | 2 +- .../stream/brofx_farmhouse_02_txt.ytd | 4 +- .../stream/brofx_farmhouse_02_wc.ydr | 2 +- .../stream/cs6_05_emissive_1.ydr | 2 +- .../stream/cs6_05_mcfarm_10524.ydr | 2 +- .../stream/cs6_05_mcfarm_21579.ydr | 2 +- .../stream/cs6_05_mcfarm_25759.ydr | 2 +- .../stream/cs6_05_mcfarm_30573.ydr | 2 +- .../stream/[basemaps]/bcso_ground.ymap | 4 +- resources/chp21tahoe/.fxap | Bin 178 -> 178 bytes resources/chp21tahoe/carvariations.meta | 35 +-- .../chp21tahoe/stream/21tahoeantenna.yft | 4 +- resources/chp21tahoe/stream/21tahoecage.yft | 4 +- .../chp21tahoe/stream/21tahoehalogenddown.yft | 4 +- .../chp21tahoe/stream/21tahoehalogendup.yft | 4 +- .../chp21tahoe/stream/21tahoehalogenpdown.yft | 4 +- .../chp21tahoe/stream/21tahoehalogenpup.yft | 4 +- resources/chp21tahoe/stream/21tahoetkdns.yft | 4 +- resources/chp21tahoe/stream/chp21tahoe+hi.ytd | 4 +- resources/chp21tahoe/stream/chp21tahoe.yft | 4 +- resources/chp21tahoe/stream/chp21tahoe.ytd | 4 +- resources/chp21tahoe/stream/chp21tahoe_hi.yft | 4 +- resources/chp21tahoe/vehicles.meta | Bin 6980 -> 6014 bytes resources/scully_radio2/.fxap | Bin 178 -> 178 bytes resources/scully_radio2/client/main.lua | Bin 8756 -> 8190 bytes .../scully_radio2/functions/framework.lua | 131 ++++++++-- resources/scully_radio2/fxmanifest.lua | 3 +- resources/scully_radio2/server/main.lua | Bin 1623 -> 1623 bytes .../scully_radio2/talkover_protection.lua | 238 ++++++++++++++++++ server.cfg | 8 +- 93 files changed, 452 insertions(+), 154 deletions(-) create mode 100644 resources/scully_radio2/talkover_protection.lua diff --git a/resources/El3ttric-40MM/.fxap b/resources/El3ttric-40MM/.fxap index e93f210f050d8eea34a5f1b66e48fde6da35792a..de8b3dcc61c6d4b9c002887de97af92fe08fb524 100644 GIT binary patch literal 178 zcmV;j08Rf!SV2$$0000009xML(|&XX7vmNL@)1svb$L;d# z_@FIIjI-!1PE@F;dn0w$5OwQu2N)Q&b2f5836?eSi6+3fk9l+srwQ{|5spU;W|^H3 zhHORe`^=YY8KdyJVhL6C;6B03jZwv@UrnzUJ<0L=`(-45;C!Kx9A}9Jc1a~0W?Txi glF6A$2(=&l`O28v#sZtMkk&WZpiG24?0<711^OUWZ2$lO literal 178 zcmV;j08Rf!SV2$$00000083hZfc(8^)ttBNt>)(GCoqGMW**|or;XU%>1Y92Ks;6@ zISd7p@gFlZZ@jLMK|TLS0Vm8$CKa{oC+jh01%=VRi`OYAa^MeW{6P?f5AS;kFx&Qu zB>2{myCg|svDN{(nc;8G*3(#+BvQB*`eMFdxC=XBPL{WC(u~KMb700^R8JknR!ck1 gdk#n}CfjA@WsDs$MH=3g5)=cJdgmX#TjZ{E?o7c_l>h($ diff --git a/resources/El3ttric-BeanBag/.fxap b/resources/El3ttric-BeanBag/.fxap index a5c88866021c139e0e839e146e94caa34730e20d..ec569b4cf6fb76f2a46e7f9280d6c6d6cd02f5c3 100644 GIT binary patch literal 178 zcmV;j08Rf!SV2$$000000F`$)n&Wo|EY$wwl;68MHqs8~LL+62jqApNJYK8CpB5yP zqZaI#YH2Y$(Z8hO+McmPuV{^^(;8UwNVMRY49i+?=}p%#w*WwycQHS*lY)+VPSE9E zkL&5LcvC!0?`2@fUax3bGxJpJNdVo_eD3oEY>}?ma@QpGLzP@|w^I6HuXb4_1MF=b gFEb-lKg6dD)YU0Ei>?*C!Zg?Wrfu#wl-C6w0rdMn&tm!R;Tx-QNT!(jTyx*Dud46#1043;>#s)4$X`#|yGvKY^YDcN9wZg{w_-Qj-Vs=*PMdUx=MSf=OC< g$&x>hjIu45=>UsFWdLWbRL*s?ZxUr5|IYKk&?XUDY5)KL 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 e350ce84a07610e6afca4cf9df575d4ba826fd09..80e1005899cc32b09e59a32b30e2a52c4fd6e222 100644 GIT binary patch literal 178 zcmV;j08Rf!SV2$$000000GOO3Z6bqmmf0*KKaCWdH1x#5XD#fH7)#BBt{8y9@)6py zjC3*P&+cQU+jN;mU$Xo;RwoYS_4?0Pm;(QI0AoUb?O@bT3|ugmKJN=iPJOopdw9*ketjK6aK<*@jvD-_iazNdIIwa5JDlZG1CLea0IZ gniPAuuKo(gbjC1Cw*FL9d5U|Vt8`1?F# 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 literal 11270 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 literal 178 zcmV;j08Rf!SV2$$000000K#=Sz3N{tcR^^F2nE%%xPNj_4Nodmy7zv$QwCLzLDL$} zV{ZYM*_^vl+9Ra>5}$?SSIeb#K?BkU>-P1m1);P6pqiFWkEf*m^|lbNE4l1wulb|c z_bD%1aPI^`f}0$c-he=ShU@MZ@yvCGT|g0WTcjUY@cILFk(@7OZJU=rhcS~So%4vo gBIE;KPJa$?ej?XiY835OXD3Z|6r9!poIM|CY>lB(+yDRo 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 30a0e0dc05990d595a6662a645358ae861bc8116..8d39c11a1d63d04a355aac87e036f5d154c81fbf 100644 GIT binary patch literal 178 zcmV;j08Rf!SV2$$000000Aog6ii!C<2=3KN#WN4HiMdulNh^Qr$O--w|p$_aSq{{h^cd zaBSZD08P6sg;W!^nIXaddxe#tp8YAXP~b-h4C!>s#r+XnMZr&V_(uHK?$Yme-h+oX zv^@LQ%i`)e-)CaWnU@a@A7K=@mvO4Yi-2L(ErTt*$K gwL9jC@jT%U5R7?Z0??V3_B@7rN{MZ*YvgZ>=>srZ#sB~S 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 e909ef52bac5ad60f1cc01d855e1261bb5795906..3428fc4584452579ef660dd6c3053ba86695749e 100644 GIT binary patch literal 6014 zcmcIo%aWrw7F}0;1>t=sX=m0kFM@Zy87?G|D*kS*d)phr&&zNbEkWE-%&8}X%Lh3b7$d>e)-(_ zwf|8YEO8Y337*mbCleA<&zq1qAEF$YahCT#DvFlkEDkWq-9ymd;V6qxiZxXpl~Fp0 zH<_YxNkNtMKYmc)r%iIaVKe+=!`7Uk4etBVw%5&3M1i*%6}bEmoT0>+z(j}y3G8hW zw8*4kfn39aXLR+TK*2t_Sy1z#_2h zfRdd}X?U{2#i>hj(kimd)pb@e3Fto4!w~y94obgr?``w&pl2DDH`*Sn*Dr#YvK7WC zi~7#kuqUHYPg7BAT%Z$lq($C0^;c`*dXB5lhPpk})M{M7dn2A@7bS_RyOf zwgbuu7JV|Unc8B4?2QtFbBRxgzF4yvn5Wdkn@)z_c=Bbesb>O$X-jt!jZkZDEo%+h z2q8C$(=4Au9fGV#;~joEPQI2NQx4Ca`@4Jo>nO+P&M)xw=@Wc+l;6v*Zu!NF2@kq+ zwgtFggM+K2%?iNTd;ld>Bu(O*r}Q_7@i@Vk^?WFGsr3BJ)aH8rAX)Wl&flQ-%CH+)nJ{TXUIUPnKHyD~3R^rAUVHD;E%ZR(1Z>v)^? zJk%=pp2vku%nW>+yxG7FD_^q2Pm5<+?^@@d#y+KQkSX(s5-ewP_wj){i^p2;;ct!S zK0UsZ%e8*jXe*|YwpXsfjr-WEX;1Q5qH-{*;}-J%Lv;=L0RLLb%d2#|lJbvLSz^%v zLY$8T_@L}iQsC!KufwW8%&6rB=l`(8!|4)Gy;P}uUE8iA3h`VNaCyrtwODeMb%)mm zk!o!FYzj8UuWO1{Gc0kM$39B*;I|^nH*hr^(bT3%GC*rAY|>;wi=lRPd74~NrV&0( zp+=WhGX6ETU3g&UKR>aTqi@wA$?gtty4l_rV+MDYfu_nhVU;YRMG`DBJctS2ATZ1_ z#(Q?37M94<0?T$RB}$Fm6p<{>;R0fjK@xA?7TY1+6CoO+B)cj*SreLK;{f7heN{qF z61tzKILB~R^8I3qNS+DwscIbj4|+^v)+oG-a^UKPj;zYuLcY-8IG_nlr)ax<2fU9k zP8^7<+H&`I4-Zc#QP`kZ00w<$9emh!*RR^O>KsS7fZtmmZzsDnI%lnI_r;2 z{foD73}_HtI1?<}vyGu=Lhs}%d~U2e@ChC0Yx7-Wjc=~4JLQC_uRH@z7<*t$jaelP ze{DEz2CtrD*vrYlD6u+k9>==tcr(khEo-Eyr9MLS{J6z^(cHPObJk+on#zX-W}BcK zyBs)oy%&A()tj5TYdD(PO!2lTfJXg|qBJPcL)ZH! zX8Dd%P6<3O;U)D7TKvUQQ=1_Hf?$CgW(rS7<&iI5k3g@yniJQpHb4k&5PN%Ry*R02 zPLOIS2>9uX68Fk_LWI%5qeYwVy0{jwZa1x7!kC5{6uJ~mh@TVz)G+D%p)}1_aUMZ3 zCy-N=KF+9#(-;g%jyg)I-7PuJhO4z}9-%ShuyQW^45h49n&?6jRM`s)1 zwAD9>Bed+%t6RdAt8bgdiGRm83-4CwX`^)jLFPvAP#MuAP*{O@?#vdZ$!i_!p~90F zo3|r-4L)_H;|{&y#57!ZpmUANr_7k`6cN6>2r&2QPWGn|=&=ffS16J9}zq e;a~Ok&8v>FZSfbE$lN(N!r!4eDj*Z%d_l0ZO= z@J+~Z=bt=41fJa z(Uv%jycoYwAIDP?P}iN3C?BC58Bvx4q|;GSoJBq+xpVY~dmLsVO0m+b&;I&L1E`W{ zn{|3Zy5!4>VUD-_Uk855maRKOTRil_WN@3KkOFlz%V;?;Kl*2|a!!ImMEn@GIQ1KJ zwP^|6z?x@-a#F%zyWBkJyFlMQXcK+;P3gV(Ayb0@dpY)t)8%KA7mA)gvRJZclppzznKfiwba?OZYjNDR-!x#Uj9UP#5aQgRLF+U z0_tk!Qny@lJhpYmozBLl(mMxB9ypztvQuM0Fx0=!4bz^QGcM?k^s%}y9Das1loZZ9 zOi&t8gR5LOjR#vz5w~hV;*L$jFjwwUpG-AFcQy4zw^Y!rLP}l)2VG4+nO~)pI(?Cn zO_UT~Q$lcFlP_0%GG{X|iCEaR9d$NRt&!3@6OdF1-Pd@^jm*tuNn)7h7u7NsGoWdL zCC4~QvwRL22?8UH_W0>E{UVO6bA0UfZ~FY#?VKLFzx8i!@7S>0`J0dWAH_&y6z+59 zbPG6wE%q<6R!abBHDH_{AQROH=PCUYoIHy0J2dTo{#E%k^v}1~=<}5}OuI*Z(Asl7D*_HM2!4edS{RmEH||{5aokwaSm9 zf1zs#n|VkHt_OD+&fF4%duitW%^ido-YH5 ztyjxzm-k)RXkKRe`p#J#6jo-b`J=EbH}iclsAXnJvBYT}c_>!>KX+Nag#vO+Q;Wv2 zhBmk~O%)|g3K>%3;<=zsCC#;IxhFuIMuh$&y5GgVYnttYBP$U2g}xkrEv{5nUBFdn zxzGAcx277Dhc%qM0<)0rVtqfJlblQb~^GP%h2s~elJ<8DY(>% zm8v;#y|Xz;m+zQ^)~2SSR7TlGgxx0-%<8Rji~XC2`}>B`c!SQeE$`&*1RbFN6#FfO z2F>H!qT_70H3J(u3?6MI?zV~Zae&|)SWr$diu16-$&EEsf&RCVKCb)5KFXqXjHTAs zCGr$`-!T+kdAN%FN~b~F*&i@UD1pnz!&f~jNbz4gcq%#7cG=inc0lAifewFYuhiL> znQq(et*w*(7s8K=!<-4)YlZHz7QO-R$SASUUOcqQM`+2F;s5DrRIXV7Tk(j^<*MGNdcam z1^3Ev?Zr~*RZ|iL=M8mbT0ScA77+P9zYS3gH{;n?pEa3H0Z0`oni4PG`H%$a$(+(O zTSa*YaS($qQUd7*?pT^NA38WE0#6+=fjYx_w@qNR8OFXtIg5`OAtch$0nYDd0_e=5 z2`-Y@Wh8UTD8;_ccF#*|l97ju*r{l82nP!IA7bT!d+qi_Lh`aCJ017v|J z>cKX+p^x8%wsa_n-p$R?m#N`>?Fi#qc15h z%hw%RnXnrXyWZ7l?C5WNJx?X2N*3Dq;9O1!kAoqN{SFJw$L?%l7>z}OSI;Et6MKt2 zJHPUcOI@mlrjGRDD478-9AP0LqMjei+rW7tAP?prz}x5{WxcgE$qs*t2Wa+StiT(u zg&`$DOlDz}h)3koEoFL0;6<9`>~WgC)@JS+DrG1jTqrg$yvwDK)&xRIcwrPbUx~$x d07z|E|J0&_(!2I>{;!|EpBDIOf&XI*{0Ck^zpwxR diff --git a/resources/scully_radio2/.fxap b/resources/scully_radio2/.fxap index d466586a786cac45951b05fb532ba99e6e8d3b19..b999014b4a1e6e1a7fe03cd9dfea7877e34b63d9 100644 GIT binary patch literal 178 zcmV;j08Rf!SV2$$000000KFv-QK_iTsl&JJiC@mCbs&5118Bf-Gps1hXh$|sD3j4x zuE+WSqUD6RM8E|QI&_4mY}{MAe|)5u*0@Fp`xSw4csZ*Hw4Q|8;m&4hVutWgd(~ g{!?9D_GSDPbmUN_sB#FU!Q#%)0w+sqxO~weeD$SMBme*a literal 178 zcmV;j08Rf!SV2$$0000003AdPp0VU&dgTxEvOA)f4#m|Mm137)ru4vIuvxGTSf>lrD)d$KCJF@0 gq8p)aJ^|9xrHR#*_u>|0D|$2{CO!+m??v5vbN_u($p8QV diff --git a/resources/scully_radio2/client/main.lua b/resources/scully_radio2/client/main.lua index 850bfd0b301129bd8736b2ea8ef547912993b693..c7d7ef627a05f17b60e9a88b264c8d33d513cb56 100644 GIT binary patch literal 8190 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 literal 8756 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 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 ffa5699d8251e639e9631242f4cf744acbc1b615..5f6746db3aecb784941611c39742fc7586586396 100644 GIT binary patch literal 1623 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 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