diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index e987d5bd..e71fe751 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index f044b1fa..ef3e00af 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Altis.pbo and b/Server_Install_Pack/mpmissions/epoch.Altis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index b1ff2da3..a23e71ac 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Australia.pbo and b/Server_Install_Pack/mpmissions/epoch.Australia.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index ac375a6e..bd3e4dcb 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index 83bb9a3b..d35fa5aa 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo and b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 4859c861..d57eba0a 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.ChernarusRedux.pbo b/Server_Install_Pack/mpmissions/epoch.ChernarusRedux.pbo index 9d169af9..46431af7 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.ChernarusRedux.pbo and b/Server_Install_Pack/mpmissions/epoch.ChernarusRedux.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 2bbfe739..b83030ff 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index aa6cbeee..aff19d87 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo and b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Enoch.pbo b/Server_Install_Pack/mpmissions/epoch.Enoch.pbo index 745279b1..f07d93ec 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Enoch.pbo and b/Server_Install_Pack/mpmissions/epoch.Enoch.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index fe96ff2e..1e510148 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo and b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.IslaDuala3.pbo b/Server_Install_Pack/mpmissions/epoch.IslaDuala3.pbo index 04f4b6f2..be2d4ed2 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.IslaDuala3.pbo and b/Server_Install_Pack/mpmissions/epoch.IslaDuala3.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Kapaulio.pbo b/Server_Install_Pack/mpmissions/epoch.Kapaulio.pbo index b4e0dfb6..82bf8835 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Kapaulio.pbo and b/Server_Install_Pack/mpmissions/epoch.Kapaulio.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Malden.pbo b/Server_Install_Pack/mpmissions/epoch.Malden.pbo index 156b23ab..a7404777 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Malden.pbo and b/Server_Install_Pack/mpmissions/epoch.Malden.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index fe9d6d43..37249672 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Napf.pbo b/Server_Install_Pack/mpmissions/epoch.Napf.pbo index ca5e421f..0456853f 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Napf.pbo and b/Server_Install_Pack/mpmissions/epoch.Napf.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Panthera3.pbo b/Server_Install_Pack/mpmissions/epoch.Panthera3.pbo index 03ccef18..b3be5935 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Panthera3.pbo and b/Server_Install_Pack/mpmissions/epoch.Panthera3.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 5471555e..e3cec200 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Porto.pbo and b/Server_Install_Pack/mpmissions/epoch.Porto.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 98e5d939..f44bd847 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo and b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index f602c46e..99de28e1 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index d52fc736..6fb4f7c3 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo and b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 574402b7..3dae7411 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index cf91083f..1d027497 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo and b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 9d4fb79b..10211ae4 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo and b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index b9474785..dbf62db7 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo and b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo index 7ea83feb..76aca2a1 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo and b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index d8bc39aa..11194a32 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.VR.pbo and b/Server_Install_Pack/mpmissions/epoch.VR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Winthera3.pbo b/Server_Install_Pack/mpmissions/epoch.Winthera3.pbo index 0bf1eac9..df2cb849 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Winthera3.pbo and b/Server_Install_Pack/mpmissions/epoch.Winthera3.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index ef159c02..4f83c91b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 33cd84b4..98e14ece 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo and b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch._ChangeMe.pbo b/Server_Install_Pack/mpmissions/epoch._ChangeMe.pbo index 4f5399fa..de835905 100644 Binary files a/Server_Install_Pack/mpmissions/epoch._ChangeMe.pbo and b/Server_Install_Pack/mpmissions/epoch._ChangeMe.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.abramia.pbo b/Server_Install_Pack/mpmissions/epoch.abramia.pbo index 404ae18e..22d338c6 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.abramia.pbo and b/Server_Install_Pack/mpmissions/epoch.abramia.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.dingor.pbo b/Server_Install_Pack/mpmissions/epoch.dingor.pbo index 35eac71e..2735d5b0 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.dingor.pbo and b/Server_Install_Pack/mpmissions/epoch.dingor.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.lingor3.pbo b/Server_Install_Pack/mpmissions/epoch.lingor3.pbo index 1f7e9e06..4476d663 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.lingor3.pbo and b/Server_Install_Pack/mpmissions/epoch.lingor3.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index b4f3be9d..79959139 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.utes.pbo and b/Server_Install_Pack/mpmissions/epoch.utes.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo b/Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo index 8d484af8..985bde06 100644 Binary files a/Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo and b/Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo differ diff --git a/Sources/epoch_code/compile/EPOCH_CamUse.sqf b/Sources/epoch_code/compile/EPOCH_CamUse.sqf index c9308cce..9e3a1e35 100644 --- a/Sources/epoch_code/compile/EPOCH_CamUse.sqf +++ b/Sources/epoch_code/compile/EPOCH_CamUse.sqf @@ -61,7 +61,7 @@ _mycams spawn { Epoch_CamFilmGrain = ppEffectCreate ["FilmGrain", 2000 + 25]; }; Epoch_CamFilmGrain ppEffectEnable true; - _intensity = ((player distance Epoch_ActiveCam) / 10000) min 1; + _intensity = ((player distance Epoch_ActiveCam) / 4000) min 1; _sharpness = 1.25 - _intensity; Epoch_CamFilmGrain ppEffectAdjust [_intensity,_sharpness,2.01,0.75,1.0,true]; Epoch_CamFilmGrain ppEffectCommit 0; @@ -81,8 +81,11 @@ _mycams spawn { _EpochCam camSetTarget _targetpos; _EpochCam camCommit 0; _dirs = [5,10,15,20,25,30,35,40,45,40,35,30,25,20,15,10,5,0,-5,-10,-15,-20,-25,-30,-35,-40,-45,-40,-35,-30,-25,-20,-15,-10,-5,0]; + _GrainUpdateIntervall = 5; + _nextgrainupdate = diag_ticktime; while {!isnull _display} do { Epoch_CamAdjust params ["_dir","_height","_zoom"]; + _playerdist = player distance Epoch_ActiveCam; _AutoCam = Epoch_AutoCam; if !(_ActiveCam isequalto Epoch_ActiveCam) then { _ActiveCam = Epoch_ActiveCam; @@ -96,11 +99,14 @@ _mycams spawn { _EpochCam cameraEffect ['internal', 'front']; _EpochCam camCommit 0; _targetheight = ((getposasl Epoch_ActiveCam) select 2)-50; - _intensity = ((player distance Epoch_ActiveCam) / 10000) min 1; + (_display displayctrl 1000) ctrlsettext format ["Cam %1",(_mycams find Epoch_ActiveCam) + 1]; + }; + if (_nextgrainupdate <= diag_ticktime) then { + _intensity = (_playerdist / 4000) min 1; _sharpness = 1.25 - _intensity; Epoch_CamFilmGrain ppEffectAdjust [_intensity,_sharpness,2.01,0.75,1.0,true]; - Epoch_CamFilmGrain ppEffectCommit 0; - (_display displayctrl 1000) ctrlsettext format ["Cam %1",(_mycams find Epoch_ActiveCam) + 1]; + Epoch_CamFilmGrain ppEffectCommit _GrainUpdateIntervall; + _nextgrainupdate = diag_ticktime + _GrainUpdateIntervall; }; if !(Epoch_AutoCam) then { _targetheight = ((_targetheight + _height) min 50) max -150; diff --git a/Sources/epoch_config/Configs/CfgEpochClient.hpp b/Sources/epoch_config/Configs/CfgEpochClient.hpp index e387d8df..7f0908a0 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient.hpp @@ -56,6 +56,7 @@ class CfgEpochClient splitCountLimits = 0; //1 = distinguish buildingCountLimit from storageCountLimit (ex.: buildingCountLimit=100, storageCountLimit=100 >> you can build 100 baseparts AND additional 100 storage objects like safes, lockboxes...) MaxBuildingTilt = 180; // Max degrees players can tilt building elements EnablePhysicsOnBuild = "true"; // Building parts need Snap (hold) points to not fall on the ground while building + BaseCamOnlyHome = "true"; // set to false, to allow BaseCam usage outside Players PlotPole range (doubleclick on BaseCam Terminal in Inventory) class CfgJammers { class PlotPole_EPOCH // Jammer Classname diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf index a468f52b..e91ae96f 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf @@ -25,6 +25,14 @@ params [["_vehicle",objnull],["_items",[]]]; +private ["_subcontainersuffix"]; +_subcontainersuffix = []; + +clearweaponcargoglobal _vehicle; +clearitemcargoglobal _vehicle; +clearmagazinecargoglobal _vehicle; +clearbackpackcargoglobal _vehicle; + { _objType = _forEachIndex; _objTypes = _x; @@ -78,26 +86,23 @@ params [["_vehicle",objnull],["_items",[]]]; }; // Sub-Containers case 4: { - _type = _x select 0; - _subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []}; - if !(_subContainers isequalto []) then { - _subContainer = _subContainers select 0 select 1; - [_subContainer,_x select 1] call EPOCH_server_CargoFill; - } - else { - if (_type isKindOf "Bag_Base") then { - _vehicle addBackpackCargoGlobal [_type, 1]; - } - else { - _vehicle addItemCargoGlobal [_type, 1]; - }; - _subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []}; - if !(_subContainers isequalto []) then { - _subContainer = _subContainers select 0 select 1; - [_subContainer,_x select 1] call EPOCH_server_CargoFill; - }; - }; + _subcontainersuffix pushback _x; }; }; } forEach _objTypes; } forEach _items; +_subContainers = (everycontainer _vehicle); +{ + clearweaponcargoglobal (_x select 1); + clearitemcargoglobal (_x select 1); + clearmagazinecargoglobal (_x select 1); + clearbackpackcargoglobal (_x select 1); +} foreach _subContainers; +{ + _type = _x select 0; + _subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []}; + if !(_subContainers isequalto []) then { + _subContainer = _subContainers select 0 select 1; + [_subContainer,_x select 1] call EPOCH_server_CargoFill; + }; +} foreach _subcontainersuffix; \ No newline at end of file diff --git a/changelog.md b/changelog.md index a4d4c7fb..4046f412 100644 --- a/changelog.md +++ b/changelog.md @@ -23,7 +23,10 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a - Cleaned up some scripts - more usage of already existing sub functions (EPOCH_server_CargoSave / EPOCH_server_CargoLoad) - Option in cfgepochclient "SupressBaseSpawnOnHomekillTime" to prevent Base spawn for xxx seconds after BaseKill - Karma variable is currently broken and caused community stats to not save correctly. - -Community save should be fixed now. Karma is still WIP + - Community save should be fixed now. Karma is still WIP +- Added a Config "BaseCamOnlyHome" in cfgepochclient to allow Players to use Basecamterminal (from Inventory) outside their Base + - Picture get more and more noisy by distance +- Fixed an issue, that new expansion Backpacks could get doubled on restarts ## [1.3.2.0] - 2019-11-02 ### Added