diff --git a/dayz_code/CfgMagazines.hpp b/dayz_code/CfgMagazines.hpp index 6f422a3e7..779f27880 100644 --- a/dayz_code/CfgMagazines.hpp +++ b/dayz_code/CfgMagazines.hpp @@ -47,17 +47,17 @@ class CfgMagazines { scope = public; count = 1; type = 256; - displayName = "Large Sandbags"; + displayName = "H-barrier cube"; model = "\dayz_equip\models\sandbags.p3d"; picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; descriptionShort = "Sacks made of hessian and wire that can be filled with sand or soil and used for military fortification."; class ItemActions { class Build { - text = "Build Sandbag Wall"; + text = "Build H-barrier cube"; script = "spawn player_build;"; require = "ItemEtool"; - create = "Sandbag1_DZ"; + create = "Land_HBarrier1_DZ"; }; }; }; diff --git a/dayz_code/cfgVehicles.hpp b/dayz_code/cfgVehicles.hpp index ff4f450db..161ebd6a3 100644 --- a/dayz_code/cfgVehicles.hpp +++ b/dayz_code/cfgVehicles.hpp @@ -694,8 +694,18 @@ class HMMWV_Base; }; - - + class BAF_Soldier_W; + class Soldier1_DZ: BAF_Soldier_W { + displayName = "Soldier"; + side = 1; + weapons[] = {"Throw","Put"}; + backpack = ""; + magazines[] = {}; + respawnWeapons[] = {"Throw","Put"}; + respawnMagazines[] = {}; + weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; + canHideBodies = 1; + }; class BAF_Soldier_SniperH_W; class Sniper1_DZ: BAF_Soldier_SniperH_W { displayName = "Sniper"; diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf index f05fe51d8..bc650ec12 100644 --- a/dayz_code/compile/fn_selfActions.sqf +++ b/dayz_code/compile/fn_selfActions.sqf @@ -142,7 +142,7 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6)) }; */ - if((_isVehicle or _isTent) and _canDo and !_isMan) then { + if((_isVehicle or _isTent or (cursorTarget isKindOf "VaultStorage")) and _canDo and !_isMan) then { if (s_player_checkGear < 0) then { s_player_checkGear = player addAction ["Cargo Check", "\z\addons\dayz_code\actions\cargocheck.sqf",cursorTarget, 1, true, true, "", ""]; }; diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index 2f8f1ee56..1b2215726 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -33,7 +33,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.dayzepoch.com"; - version = "0.973"; + version = "0.974"; hiveVersion = 0.96; //0.93 }; }; diff --git a/dayz_code/rscTitles.hpp b/dayz_code/rscTitles.hpp index bc3995f79..34ce6fa4a 100644 --- a/dayz_code/rscTitles.hpp +++ b/dayz_code/rscTitles.hpp @@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ Epoch 0.973 (1.7.5.1)"; + text = "DayZ Epoch 0.974 (1.7.5.1)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; class CA_TitleMainMenu; diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp index 7b3a7bdc6..c8605e160 100644 --- a/dayz_equip/config.cpp +++ b/dayz_equip/config.cpp @@ -1980,6 +1980,29 @@ class CfgVehicles vehicleClass = "Fortifications"; }; + class Land_HBarrier1_DZ : BuiltItems { + scope = 2; + animated = 0; + vehicleClass = "Fortifications"; + typicalCargo[] = {}; + irTarget = 0; + accuracy = 0.3; + transportAmmo = 0; + transportRepair = 0; + transportFuel = 0; + destrType = "DestructBuilding"; + armor = 500; + coefInside = 0.5; + coefInsideHeur = 0.8; + cost = 0; + picture = "\CA\ui\data\icon_wf_barriers_ca.paa"; + model = "\ca\misc2\HBarrier1.p3d"; + icon = "\Ca\misc2\data\Icons\icon_hescoBarrier1_ca.paa"; + mapSize = 2; + displayName = "H-barrier cube"; + GhostPreview = "Land_HBarrier1Preview"; + }; + class WoodGate_DZ: BuiltItems { scope = 2; @@ -1991,6 +2014,14 @@ class CfgVehicles armor = 50; displayName = "Locked Wood Gate"; vehicleClass = "Fortifications"; + class AnimationSources + { + class DoorR { + source = "User"; + animPeriod = 1; + initPhase = 0; + } + } }; class BearTrap_DZ: TrapItems {