diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp index 7fe3a1bc4..86f5ae2db 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp @@ -8,7 +8,6 @@ class ItemTent : CA_Magazine picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_EQUIP_NAME_20; descriptionShort = $STR_EQUIP_DESC_20; - class ItemActions { class Build @@ -52,9 +51,7 @@ class ItemDomeTent : CA_Magazine picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_VEH_NAME_DOME_TENT; descriptionShort = $STR_EQUIP_DESC_20; - - bypassCollision = "true"; - + class ItemActions { class Build diff --git a/SQF/dayz_code/actions/player_breakin.sqf b/SQF/dayz_code/actions/player_breakin.sqf index d24d901c4..1ecfca378 100644 --- a/SQF/dayz_code/actions/player_breakin.sqf +++ b/SQF/dayz_code/actions/player_breakin.sqf @@ -99,7 +99,7 @@ while {_isOk} do { }; if (_isWoodenGate) then { - if ([0.06] call fn_chance) then { + if ([0.04] call fn_chance) then { _isOk = false; _proceed = true; _brokein = true; diff --git a/SQF/dayz_code/actions/player_buildVanilla.sqf b/SQF/dayz_code/actions/player_buildVanilla.sqf index eb7d85d75..7da8226b5 100644 --- a/SQF/dayz_code/actions/player_buildVanilla.sqf +++ b/SQF/dayz_code/actions/player_buildVanilla.sqf @@ -17,7 +17,7 @@ _item = _this select 0; _action = _this select 1; _classType = "ItemActions"; -diag_log (_item); +//diag_log (_item); if (count _this > 2) then { _classType = _this select 2; @@ -285,7 +285,7 @@ while {r_action_count != 0 and Dayz_constructionContext select 4} do { // check now that ghost is not colliding call _checkBuildingCollision; - diag_log ("Collision Test"); + //diag_log ("Collision Test"); }; // try to dock a beam from current ghost to another beams nearby diff --git a/SQF/dayz_code/compile/fn_upgradeActions.sqf b/SQF/dayz_code/compile/fn_upgradeActions.sqf index 4106e8c90..4f3308511 100644 --- a/SQF/dayz_code/compile/fn_upgradeActions.sqf +++ b/SQF/dayz_code/compile/fn_upgradeActions.sqf @@ -46,7 +46,7 @@ if (!isNull _cursorTarget and !_inVehicle and (player distance _cursorTarget < 4 s_player_building = -1; }; - if (_maintenanceMode and (_cursorTarget iskindof "DZ_buildables") and isClass(configFile >> "CfgVehicles" >> (typeof _cursorTarget) >> "Maintenance")) then { + if ((_maintenanceMode or (damage _cursorTarget > 0)) and (_cursorTarget iskindof "DZ_buildables") and isClass(configFile >> "CfgVehicles" >> (typeof _cursorTarget) >> "Maintenance")) then { if (s_player_maintenance < 0) then { s_player_maintenance = player addAction [format[localize "str_maintenance",_text], "\z\addons\dayz_code\actions\object_maintenance.sqf",_cursorTarget, 0, false, true, "", ""]; }; diff --git a/SQF/dayz_code/compile/obj_handleDam.sqf b/SQF/dayz_code/compile/obj_handleDam.sqf index 01f9fbb5e..20f6866db 100644 --- a/SQF/dayz_code/compile/obj_handleDam.sqf +++ b/SQF/dayz_code/compile/obj_handleDam.sqf @@ -6,23 +6,23 @@ Called by "HandleDamage" vehicle Event Handler - [unit, damage] call fnc_obj_handleDam; - return : updated damage ************************************************************/ -private["_obj","_total","_currentDamage"]; +private["_obj","_total","_damage"]; _obj = _this select 0; -_damage = _this select 2; +_damage = _this select 1; _total = (damage _obj); if (_damage > 0) then { - _total = (damage _obj) + _damage; - if (!isServer) then { - PVDZ_veh_Save = [_obj,"objWallDamage",_total]; + PVDZ_veh_Save = [_obj,"objWallDamage",(_total + _damage)]; publicVariableServer "PVDZ_veh_Save"; } else { - [_obj,"objWallDamage",_total] call server_updateObject; + [_obj,"objWallDamage",(_total + _damage)] call server_updateObject; }; }; +//diag_log format["INFO - %1(%3) - %2(%4)",_obj,_damage,(typeof _obj),(_total + _damage)]; + // all "HandleDamage event" functions should return the effective damage that the engine will record for that part -_total +0