diff --git a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_TIRED_Configuration.cfg b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_TIRED_Configuration.cfg
index 1df4528a9..407f869bd 100644
--- a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_TIRED_Configuration.cfg
+++ b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Tired/R3F_TIRED_Configuration.cfg
@@ -12,7 +12,7 @@ along with this program. If not, see .
// #define R3F_TIRED_CSV_EXPORT
//Uncomment to show some informations in game
-#define R3F_TIRED_DEBUG
+// #define R3F_TIRED_DEBUG
//adjustment player weight with helmet jacket Rangers Light equipment (not weapons)
#define R3F_TIRED_WEIGHT_PLAYER_EMPTY 90
diff --git a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Weight/R3F_CfgWeight.h
index 111b108b2..272fc3776 100644
--- a/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Weight/R3F_CfgWeight.h
+++ b/MPMissions/DayZ_Epoch_1.Takistan/R3F_Realism/R3F_Weight/R3F_CfgWeight.h
@@ -1336,6 +1336,24 @@ class CfgWeight
{
weight = 0.003;
};
+ class 7Rnd_45ACP_1911
+ {
+ weight = 0.02;
+ };
+ class ItemZombieParts
+ {
+ weight = 5;
+ };
+ class ItemSandbag
+ {
+ weight = 10;
+ };
+ class ItemSandbagLarge
+ {
+ weight = 50;
+ };
+
+
};
};
\ No newline at end of file
diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_TIRED_Configuration.cfg b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_TIRED_Configuration.cfg
index 1df4528a9..407f869bd 100644
--- a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_TIRED_Configuration.cfg
+++ b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Tired/R3F_TIRED_Configuration.cfg
@@ -12,7 +12,7 @@ along with this program. If not, see .
// #define R3F_TIRED_CSV_EXPORT
//Uncomment to show some informations in game
-#define R3F_TIRED_DEBUG
+// #define R3F_TIRED_DEBUG
//adjustment player weight with helmet jacket Rangers Light equipment (not weapons)
#define R3F_TIRED_WEIGHT_PLAYER_EMPTY 90
diff --git a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h
index 111b108b2..272fc3776 100644
--- a/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h
+++ b/MPMissions/DayZ_Epoch_11.Chernarus/R3F_Realism/R3F_Weight/R3F_CfgWeight.h
@@ -1336,6 +1336,24 @@ class CfgWeight
{
weight = 0.003;
};
+ class 7Rnd_45ACP_1911
+ {
+ weight = 0.02;
+ };
+ class ItemZombieParts
+ {
+ weight = 5;
+ };
+ class ItemSandbag
+ {
+ weight = 10;
+ };
+ class ItemSandbagLarge
+ {
+ weight = 50;
+ };
+
+
};
};
\ No newline at end of file
diff --git a/dayz_code/CfgMagazines.hpp b/dayz_code/CfgMagazines.hpp
index f89699271..6f422a3e7 100644
--- a/dayz_code/CfgMagazines.hpp
+++ b/dayz_code/CfgMagazines.hpp
@@ -29,7 +29,32 @@ class CfgMagazines {
class ItemActions {
class Build {
- text = "Build me";
+ text = "Build Sandbag";
+ script = "spawn player_build;";
+ require = "ItemEtool";
+ create = "Sandbag1_DZ";
+ };
+ class Crafting
+ {
+ text = "Craft Large Sandbag";
+ script = "spawn player_craftItem;";
+ output[] = {"ItemSandbagLarge"};
+ };
+ };
+ };
+
+ class ItemSandbagLarge : CA_Magazine {
+ scope = public;
+ count = 1;
+ type = 256;
+ displayName = "Large Sandbags";
+ 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";
script = "spawn player_build;";
require = "ItemEtool";
create = "Sandbag1_DZ";
diff --git a/dayz_code/actions/player_craftItem.sqf b/dayz_code/actions/player_craftItem.sqf
index 45b815c85..7958ef14b 100644
--- a/dayz_code/actions/player_craftItem.sqf
+++ b/dayz_code/actions/player_craftItem.sqf
@@ -100,6 +100,12 @@ if (inflamed cursorTarget and _canDo) then {
[ ["ItemCopperBar10oz",1] ]
];
+ _recipe_ItemSandbagLarge = [
+ [ ["ItemSandbagLarge",1] ],
+ [ ["ItemSandbag",3],["ItemWire",1] ]
+ ];
+
+
diff --git a/dayz_code/actions/sell_db.sqf b/dayz_code/actions/sell_db.sqf
index fc33e44cc..fcaf82c64 100644
--- a/dayz_code/actions/sell_db.sqf
+++ b/dayz_code/actions/sell_db.sqf
@@ -91,7 +91,7 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
_count = 0;
if(_type == "CfgVehicles") then {
- _count = count (position player nearObjects [_name,10]);
+ _count = {_x == _name} count (position player nearObjects [_name,10]);
};
if(_type == "CfgMagazines") then {
_count = {_x == _name} count magazines player;
diff --git a/dayz_code/cfgVehicles.hpp b/dayz_code/cfgVehicles.hpp
index 2366f4aaf..91027bc5a 100644
--- a/dayz_code/cfgVehicles.hpp
+++ b/dayz_code/cfgVehicles.hpp
@@ -176,13 +176,12 @@ class Citizen1; // External class reference
class Mi17_Civilian;
class Mi17_Civilian_DZ: Mi17_Civilian
{
- displayname = "Mi-17 Civilian";
- displaynameshort = "Mi17_Civilian_DZ";
+ displayname = "Mi-17 (Civilian)";
+ displaynameshort = "Mi-17 (Civ)";
scope = 2;
- side = 2;
+ side = 3;
crew = "";
typicalCargo[] = {};
- hiddenSelections[] = {};
class TransportMagazines{};
class TransportWeapons{};
commanderCanSee = 2+16+32;
@@ -191,8 +190,11 @@ class Citizen1; // External class reference
transportMaxWeapons = 10;
transportMaxMagazines = 50;
transportmaxbackpacks = 10;
+ supplyRadius = 0;
};
+
+
class UH1H_base: Helicopter
{
class Turrets: Turrets
diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf
index 67d1f10e0..cbf92f1f9 100644
--- a/dayz_code/compile/fn_selfActions.sqf
+++ b/dayz_code/compile/fn_selfActions.sqf
@@ -76,6 +76,8 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
_canmove = canmove cursorTarget;
_text = getText (configFile >> "CfgVehicles" >> typeOf cursorTarget >> "displayName");
+ // hintSilent (typeOf cursorTarget);
+
_rawmeat = meatraw;
_hasRawMeat = false;
{
diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp
index 95f4d7def..5c0bd3c38 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.962";
+ version = "0.963";
hiveVersion = 0.96; //0.93
};
};
diff --git a/dayz_code/rscTitles.hpp b/dayz_code/rscTitles.hpp
index 449d57bd6..d34bc10d3 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.962 (1.7.5.1)";
+ text = "DayZ Epoch 0.963 (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 62066eca6..34077db80 100644
--- a/dayz_equip/config.cpp
+++ b/dayz_equip/config.cpp
@@ -1246,6 +1246,14 @@ class CfgMagazines
model = "\dayz_equip\models\woodPile.p3d";
picture = "\dayz_equip\textures\equip_woodPile_ca.paa";
descriptionShort = "$STR_EQUIP_DESC_40";
+ class ItemActions {
+ class Build {
+ text = "Build Branch Fence";
+ script = "spawn player_build;";
+ require = "ItemToolbox";
+ create = "Wall_FenW2_6_EP1";
+ };
+ };
};
class PartVRotor: CA_Magazine
{
diff --git a/dayz_server/system/server_monitor.sqf b/dayz_server/system/server_monitor.sqf
index 48d352991..3951a3073 100644
--- a/dayz_server/system/server_monitor.sqf
+++ b/dayz_server/system/server_monitor.sqf
@@ -98,14 +98,12 @@ diag_log "HIVE: Starting";
clearWeaponCargoGlobal _object;
clearMagazineCargoGlobal _object;
- if (_object isKindOf "TentStorage") then {
+ if (_object isKindOf "TentStorage" or _object isKindOf "Land_HBarrier1" or _object isKindOf "Wall_FenW2_6_EP1") then {
_pos set [2,0];
- _object setpos _pos;
_object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}];
};
- if (_object isKindOf "VaultStorageLocked") then {
- _object setpos _pos;
- };
+
+ _object setpos _pos;
_object setdir _dir;
_object setDamage _damage;