diff --git a/Changelogs/0.3.4.0.txt b/Changelogs/0.3.4.0.txt index c07a3589..f305233a 100644 --- a/Changelogs/0.3.4.0.txt +++ b/Changelogs/0.3.4.0.txt @@ -7,6 +7,7 @@ Client: [Fixed] Dog not taming due to var reset in wrong place / BIS animal update. [Fixed] Reduce client fps lag when first joining the server by preloading objects before exiting loadig screen. [Fixed] Being unable to remove a solar generator. +[Fixed] Shadow artifact at top of Jammer. [Changed] Removed debug hint text for 3d rotation of objects as it was not needed. [Changed] Re-enable Move button, this system will stay and be refined in the next few patches. diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 207d9ec0..6513f70c 100644 Binary files a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo differ diff --git a/Server_Install_Pack/sc/battleye/createvehicle.txt b/Server_Install_Pack/sc/battleye/createvehicle.txt index 1822de59..aeaef851 100644 --- a/Server_Install_Pack/sc/battleye/createvehicle.txt +++ b/Server_Install_Pack/sc/battleye/createvehicle.txt @@ -1,3 +1,3 @@ 5 "" !="I_UAV_01_F" !="(I|B|O)_UAV_AI" !"_EPOCH" !="B_65x39_Minigun_Caseless_Red_splash" !="B_762x51_Minigun_Tracer_Yellow_splash" !="B_(Swing|Stick)" !"^SmokeShell" !"^G_40mm_" !"^F_40mm_" !"Sub_F_" !"^F_Signal_" !="mini_Grenade" !="GrenadeHand" !="LaserTarget(C|W|E)" !"^Chemlight_" !="(ClaymoreDirectionalMine|DemoCharge|SatchelCharge)_Remote_Ammo" !="SLAMDirectionalMine_Wire_Ammo" !="(CMflare_Chaff|Sapper_Charge|SapperB_Charge|ATMine_Range)_Ammo" !="APERS(TripMine_Wire|BoundingMine_Range|Mine_Range)_Ammo" !="Epoch_(Sapper|SapperB|Cloak)_F" !="GreatWhite_F" !="groundWeaponHolder" !="WeaponHolderSimulated" !="Epoch_(Male|Female)_F" !"Supply[0-9]" !"Steerable_Parachute_F" !="Epoch_Female_CamoRed_F" !="Land_Cages_F" !="(O|I|B)_UAV_01_backpack_F" !="I_(helipilot|helicrew)_F" -5 "_EPOCH" !="(SapperHead|Jack|SolarGen)_SIM_EPOCH" !="Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower)_EPOCH" !="(Tipi|Workbench|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower))_Ghost_EPOCH" !="(Tipi|StorageShelf|Safe|LockBox|FirePlace|FirePlaceOn|PlotPole|SolarGen|Jack|Freezer|Tarp|CinderWallHalf)_EPOCH" !="I_(Soldier[1-3]|Soldier)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="(Safe|LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp|Ladder|Tower)_SIM_EPOCH" !="(WoodFoundation|Foundation)_EPOCH" !="WoodWall[1-4](_SIM|_Ghost|)_EPOCH" +5 "_EPOCH" !="(SapperHead|Jack|SolarGen)_SIM_EPOCH" !="Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower)_EPOCH" !="(Tipi|Workbench|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower))_Ghost_EPOCH" !="(Tipi|StorageShelf|Safe|LockBox|FirePlace|FirePlaceOn|PlotPole|SolarGen|Jack|Freezer|Tarp|CinderWallHalf)_EPOCH" !="I_(Soldier[1-3]|Soldier)_EPOCH" !="(Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Rabbit|Cabinet)_EPOCH" !="(Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH" !="(Safe|Workbench|LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace)_SIM_EPOCH" !="Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp|Ladder|Tower)_SIM_EPOCH" !="(WoodFoundation|Foundation)_EPOCH" !="WoodWall[1-4](_SIM|_Ghost|)_EPOCH" 5 SeaGull diff --git a/Sources/epoch_config/Configs/CfgMagazines.hpp b/Sources/epoch_config/Configs/CfgMagazines.hpp index 5f7d2c29..fcc725c9 100644 --- a/Sources/epoch_config/Configs/CfgMagazines.hpp +++ b/Sources/epoch_config/Configs/CfgMagazines.hpp @@ -1189,6 +1189,20 @@ class CfgMagazines buildClass = "StorageShelf_SIM_EPOCH"; isStorage = 1; }; + class KitWorkbench : CA_Magazine + { + model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; + picture = "\x\addons\a3_epoch_assets_1\pictures\equip_wooden_crate_ca.paa"; + displayName = "Workbench Kit"; + scope = 2; + descriptionShort = "Workbench"; + count = 1; + mass = 20; + interactAction = 3; // 0 = examine, 1 = eat, 2 = drink, 3 = build + interactText = "BUILD"; + buildClass = "Workbench_SIM_EPOCH"; + isStorage = 1; + }; class KitFoundation : CA_Magazine { model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf index 65c85fdd..65e5dfc4 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf @@ -1,8 +1,12 @@ /* -Load Buildings + Load Buildings + by Aaron Clark - EpochMod.com -Epoch Mod - EpochMod.com -All Rights Reserved. + This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License. + http://creativecommons.org/licenses/by-nc-nd/4.0/ + + Improvements and or bugfixes and other contributions are welcome via the github: + https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf */ _maxTTL = parseNumber EPOCH_expiresBuilding; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf index 1873641c..187c140b 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf @@ -59,23 +59,29 @@ if (getNumber(configFile >> "CfgVehicles" >> _type >> "isSecureStorage") == 1) t _plyrUID = getPlayerUID _plyr; _plyrGroup = _plyr getVariable ["GROUP",""]; if (_plyrGroup != "") then { - _response = ["Group", _plyrGroup] call EPOCH_fnc_server_hiveGETRANGE; - if ((_response select 0) == 1 && typeName (_response select 1) == "ARRAY") then { - _gArray = _response select 1; - diag_log format["_gArray2 %1 _plyrUID %2 _plyrGroup %3", _gArray, _plyrUID, _plyrGroup]; - if ( - {(_x select 0) in _owners}count(_gArray select 3) > 0 || - {(_x select 0) in _owners}count(_gArray select 4) > 0 || - _plyrUID in _owners - ) then { - _parent setVariable ["EPOCH_Locked", _lockStatus, true]; - _currentPos = getPosATL _unit; - _currentPos set[2, -10]; - _unit setPosATL _currentPos; + if (_plyrGroup in _owners) then { + _parent setVariable ["EPOCH_Locked", _lockStatus, true]; + _currentPos = getPosATL _unit; + _currentPos set[2, -10]; + _unit setPosATL _currentPos; + } else { + _response = ["Group", _plyrGroup] call EPOCH_fnc_server_hiveGETRANGE; + if ((_response select 0) == 1 && typeName (_response select 1) == "ARRAY") then { + _gArray = _response select 1; + diag_log format["_gArray2 %1 _plyrUID %2 _plyrGroup %3", _gArray, _plyrUID, _plyrGroup]; + if ( + {(_x select 0) in _owners}count(_gArray select 3) > 0 || + {(_x select 0) in _owners}count(_gArray select 4) > 0 || + _plyrUID in _owners + ) then { + _parent setVariable ["EPOCH_Locked", _lockStatus, true]; + _currentPos = getPosATL _unit; + _currentPos set[2, -10]; + _unit setPosATL _currentPos; + }; }; }; - } - else { + } else { if (_plyrUID in _owners) then { _parent setVariable ["EPOCH_Locked", _lockStatus, true]; _currentPos = getPosATL _unit;