Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental

Browse Source
This commit is contained in:
vbawol 2017-08-14 18:35:27 -05:00
commit 7cbcb2c530
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf
View File

@ -46,8 +46,8 @@ if (_data == "") then {
_container = switch (_idc) do { _container = switch (_idc) do {
case 633: { uniformContainer player }; case 633: { uniformContainer player };
case 638: { vestContainer player }; case 638: { vestContainer player };
case 632: { EPOCH_targetContainer }; case 632: { if (isnull EPOCH_secondaryContainer) then {EPOCH_targetContainer} else {EPOCH_secondaryContainer} };
case 640: { EPOCH_secondaryContainer }; case 640: { EPOCH_targetContainer };
default { backpackContainer player }; default { backpackContainer player };
}; };
_weaponsAndItems = ((getWeaponCargo _container) select 0); _weaponsAndItems = ((getWeaponCargo _container) select 0);

1
Sources/epoch_config/Configs/CfgBaseBuilding.hpp
View File

@ -219,6 +219,7 @@ class CfgBaseBuilding
class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {}; class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {};
class MetalFloor_EPOCH : Default class MetalFloor_EPOCH : Default
{ {
upgradeBuilding[] = {{"CinderFloor_EPOCH",{{"CinderBlocks",2},{"MortarBucket",2}}}};
removeParts[] = {{"ItemCorrugatedLg",2}}; removeParts[] = {{"ItemCorrugatedLg",2}};
simulClass = "MetalFloor_SIM_EPOCH"; simulClass = "MetalFloor_SIM_EPOCH";
staticClass = "MetalFloor_EPOCH"; staticClass = "MetalFloor_EPOCH";