From e9499d6b17778d1fcc7d4ea5477f2d1e70be200b Mon Sep 17 00:00:00 2001 From: He-Man Date: Wed, 9 Aug 2017 19:10:00 +0200 Subject: [PATCH 1/2] Missing config for upgrading Cinder Floor --- Sources/epoch_config/Configs/CfgBaseBuilding.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp index 3ba3a503..faa89e29 100644 --- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp +++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp @@ -219,6 +219,7 @@ class CfgBaseBuilding class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {}; class MetalFloor_EPOCH : Default { + upgradeBuilding[] = {{"CinderFloor_EPOCH",{{"CinderBlocks",2},{"MortarBucket",2}}}}; removeParts[] = {{"ItemCorrugatedLg",2}}; simulClass = "MetalFloor_SIM_EPOCH"; staticClass = "MetalFloor_EPOCH"; From 8185d0dbf5079435940f294326f47ecb3cfb460d Mon Sep 17 00:00:00 2001 From: He-Man Date: Sun, 13 Aug 2017 20:43:33 +0200 Subject: [PATCH 2/2] Fixed wrong EPOCH_InteractedItem on crates This has no effect to Epoch, but if you are working with EPOCH_InteractedItem in custom scripts, the crate items are from the wrong wh (if a crate and a groundWH is in target. --- .../compile/inventory/EPOCH_selectInventoryItem.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf b/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf index e8950ce2..e7c63db3 100644 --- a/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf +++ b/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf @@ -46,8 +46,8 @@ if (_data == "") then { _container = switch (_idc) do { case 633: { uniformContainer player }; case 638: { vestContainer player }; - case 632: { EPOCH_targetContainer }; - case 640: { EPOCH_secondaryContainer }; + case 632: { if (isnull EPOCH_secondaryContainer) then {EPOCH_targetContainer} else {EPOCH_secondaryContainer} }; + case 640: { EPOCH_targetContainer }; default { backpackContainer player }; }; _weaponsAndItems = ((getWeaponCargo _container) select 0);