diff --git a/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf b/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf index f828094d..a1df58cb 100644 --- a/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf @@ -110,7 +110,7 @@ if !(_jammer isEqualTo []) then { _buildingCountLimit = _buildingCountLeader + (_buildingCountPerMember * _membercount); }; if (_useSplitCountLimits) then { - if(_objType in ["WorkBench_EPOCH","StorageShelf_EPOCH","Tipi_EPOCH","LockBox_EPOCH","Safe_EPOCH","StorageShelf_SIM_EPOCH","LockBox_SIM_EPOCH","Safe_SIM_EPOCH","Workbench_SIM_EPOCH","Tipi_SIM_EPOCH"]) then { + if(_objType in ["WorkBench_EPOCH","StorageShelf_EPOCH","Tipi_EPOCH","TentA_EPOCH","TentDome_EPOCH","LockBox_EPOCH","Safe_EPOCH","StorageShelf_SIM_EPOCH","LockBox_SIM_EPOCH","Safe_SIM_EPOCH","Workbench_SIM_EPOCH","Tipi_SIM_EPOCH"]) then { if ((count (nearestObjects[_nearestJammer,["Buildable_Storage","Constructions_lockedstatic_F","LockBox_SIM_EPOCH","Safe_SIM_EPOCH","StorageShelf_SIM_EPOCH","WorkBench_SIM_EPOCH"],_buildingJammerRange]-[_obj])) >= _storageCountLimit) exitwith { _buildingAllowed = false; [format["Building Disallowed: Max. %1 Storage Objects",_storageCountLimit],5] call Epoch_message diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp index faa89e29..b54f1269 100644 --- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp +++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp @@ -550,6 +550,42 @@ class CfgBaseBuilding removeParts[] = {}; }; class Tipi_Ghost_EPOCH : Tipi_SIM_EPOCH {}; + class TentA_EPOCH : Default + { + removeParts[] = {{"Pelt_EPOCH",2},{"PartPlankPack",1}}; + GhostPreview = "TentA_Ghost_EPOCH"; + staticClass = "TentA_EPOCH"; + simulClass = "TentA_SIM_EPOCH"; + limitNearby = 2; + bypassJammer = 1; + }; + class TentA_SIM_EPOCH : TentA_EPOCH + { + simulClass = "TentA_SIM_EPOCH"; + staticClass = "TentA_EPOCH"; + limitNearby = 2; + bypassJammer = 1; + removeParts[] = {}; + }; + class TentA_Ghost_EPOCH : TentA_SIM_EPOCH {}; + class TentDome_EPOCH : Default + { + removeParts[] = {{"Pelt_EPOCH",2},{"PartPlankPack",1}}; + GhostPreview = "TentDome_Ghost_EPOCH"; + staticClass = "TentDome_EPOCH"; + simulClass = "TentDome_SIM_EPOCH"; + limitNearby = 2; + bypassJammer = 1; + }; + class TentDome_SIM_EPOCH : TentA_EPOCH + { + simulClass = "TentDome_SIM_EPOCH"; + staticClass = "TentDome_EPOCH"; + limitNearby = 2; + bypassJammer = 1; + removeParts[] = {}; + }; + class TentDome_Ghost_EPOCH : TentDome_SIM_EPOCH {}; class StorageShelf_EPOCH : Default { removeParts[] = {{"ItemCorrugated",2}}; diff --git a/Sources/epoch_config/Configs/CfgObjectInteractions.hpp b/Sources/epoch_config/Configs/CfgObjectInteractions.hpp index e97b3d96..7cf76ee1 100644 --- a/Sources/epoch_config/Configs/CfgObjectInteractions.hpp +++ b/Sources/epoch_config/Configs/CfgObjectInteractions.hpp @@ -41,6 +41,22 @@ class CfgObjectInteractions { interactMode = 1; }; + class TentA_EPOCH : Default + { + interactMode = 4; + }; + class TentA_SIM_EPOCH : Default + { + interactMode = 1; + }; + class TentDome_EPOCH : Default + { + interactMode = 4; + }; + class TentDome_SIM_EPOCH : Default + { + interactMode = 1; + }; class StorageShelf_EPOCH : Default { interactMode = 4; diff --git a/changelog.md b/changelog.md index a03cac9a..894bc0a9 100644 --- a/changelog.md +++ b/changelog.md @@ -11,7 +11,7 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a - Vehicle Upgrade System - Upgrade your ride by using one of the new vehicle upgrade documents found in the world. @DirtySanchez - Vector Base Building (uses Arrow keys by default and with SHIFT / ALT you can control the steps). @DirtySanchez & @Ignatz-Heman -- New Base Building Objects: Quarter and Half wood floors @DirtySanchez, Cinder block full floor @Helion. +- New Base Building Objects: Quarter and Half wood floors @DirtySanchez, Cinder block floor, Cinder wall with window. @Helion. - Medical items: Adrenaline Shot (adrenaline_epoch), Caffeine Pills (caffeinepills_epoch). Orlistat Pills (orlistat_epoch) by @Helion and configs by @DirtySanchez - Food items: ItemCereals, ItemPowderMilk_F, ItemRiceBox, ItemVitamins. @DirtySanchez