W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update vanilla player build

Browse Source 
Vanilla development commits applied:

a2193626a0

deb7207672

2de1d90edd

8a914606cf
This commit is contained in:
ebaydayz
2016-08-21 11:58:32 -04:00
parent f0e0f6d6e4
commit fd90eda8ae
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp
View File

@@ -8,7 +8,6 @@ class ItemTent : CA_Magazine
picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
displayName = $STR_EQUIP_NAME_20; displayName = $STR_EQUIP_NAME_20;
descriptionShort = $STR_EQUIP_DESC_20; descriptionShort = $STR_EQUIP_DESC_20;
class ItemActions class ItemActions
{ {
class Build class Build
@@ -52,9 +51,7 @@ class ItemDomeTent : CA_Magazine
picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
displayName = $STR_VEH_NAME_DOME_TENT; displayName = $STR_VEH_NAME_DOME_TENT;
descriptionShort = $STR_EQUIP_DESC_20; descriptionShort = $STR_EQUIP_DESC_20;
bypassCollision = "true";
class ItemActions class ItemActions
{ {
class Build class Build

2
SQF/dayz_code/actions/player_breakin.sqf
View File

@@ -99,7 +99,7 @@ while {_isOk} do {
}; };
if (_isWoodenGate) then { if (_isWoodenGate) then {
if ([0.06] call fn_chance) then { if ([0.04] call fn_chance) then {
_isOk = false; _isOk = false;
_proceed = true; _proceed = true;
_brokein = true; _brokein = true;

4
SQF/dayz_code/actions/player_buildVanilla.sqf
View File

@@ -17,7 +17,7 @@ _item = _this select 0;
_action = _this select 1; _action = _this select 1;
_classType = "ItemActions"; _classType = "ItemActions";
diag_log (_item); //diag_log (_item);
if (count _this > 2) then { if (count _this > 2) then {
_classType = _this select 2; _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 // check now that ghost is not colliding
call _checkBuildingCollision; call _checkBuildingCollision;
diag_log ("Collision Test"); //diag_log ("Collision Test");
}; };
// try to dock a beam from current ghost to another beams nearby // try to dock a beam from current ghost to another beams nearby

2
SQF/dayz_code/compile/fn_upgradeActions.sqf
View File

@@ -46,7 +46,7 @@ if (!isNull _cursorTarget and !_inVehicle and (player distance _cursorTarget < 4
s_player_building = -1; 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 { 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, "", ""]; s_player_maintenance = player addAction [format[localize "str_maintenance",_text], "\z\addons\dayz_code\actions\object_maintenance.sqf",_cursorTarget, 0, false, true, "", ""];
}; };

14
SQF/dayz_code/compile/obj_handleDam.sqf
View File

@@ -6,23 +6,23 @@ Called by "HandleDamage" vehicle Event Handler
- [unit, damage] call fnc_obj_handleDam; - [unit, damage] call fnc_obj_handleDam;
- return : updated damage - return : updated damage
************************************************************/ ************************************************************/
private["_obj","_total","_currentDamage"]; private["_obj","_total","_damage"];
_obj = _this select 0; _obj = _this select 0;
_damage = _this select 2; _damage = _this select 1;
_total = (damage _obj); _total = (damage _obj);
if (_damage > 0) then { if (_damage > 0) then {
_total = (damage _obj) + _damage;
if (!isServer) then { if (!isServer) then {
PVDZ_veh_Save = [_obj,"objWallDamage",_total]; PVDZ_veh_Save = [_obj,"objWallDamage",(_total + _damage)];
publicVariableServer "PVDZ_veh_Save"; publicVariableServer "PVDZ_veh_Save";
} else { } 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 // all "HandleDamage event" functions should return the effective damage that the engine will record for that part
_total 0