From da524041ee90913f08ed68e598ba27457361ae19 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Mon, 3 Oct 2016 12:27:43 -0400 Subject: [PATCH] Update vanilla fences Vanilla commits applied: https://github.com/DayZMod/DayZ/commit/c5f2447f14f29121426b6b4006f86e95973f7b9b https://github.com/DayZMod/DayZ/commit/45e757ece2fdb099dade57350eb62eaf7986375d --- SQF/dayz_code/compile/fence_handleDam.sqf | 4 ++-- SQF/dayz_server/system/server_monitor.sqf | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/compile/fence_handleDam.sqf b/SQF/dayz_code/compile/fence_handleDam.sqf index b9f67cc6d..5dc4f38c7 100644 --- a/SQF/dayz_code/compile/fence_handleDam.sqf +++ b/SQF/dayz_code/compile/fence_handleDam.sqf @@ -15,8 +15,8 @@ _total = (damage _obj); //Modify damage done based on level of fence _damage = switch (1==1) do { - case ((typeof _obj) in ["WoodenFence_3","WoodenFence_4","WoodenFence_5","WoodenGate_2","WoodenGate_3"]): { 0.5 }; - case ((typeof _obj) in ["WoodenFence_6","WoodenFence_7","WoodenGate_4"]): { 0.35 }; + case ((typeof _obj) in ["WoodenFence_3","WoodenFence_4","WoodenFence_5","WoodenFence_6","WoodenFence_7","WoodenGate_2","WoodenGate_3","WoodenGate_4"]): { 0.5 }; + //case ((typeof _obj) in ["WoodenFence_6","WoodenFence_7","WoodenGate_4"]): { 0.35 }; default { 1 }; }; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index f2c72089b..db4e4c66e 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -162,7 +162,7 @@ diag_log ("HIVE: Streamed " + str(_val) + " objects"); }; //diag_log format["OBJ: %1 - %2,%3,%4,%5,%6,%7,%8", _idKey,_type,_ownerID,_worldspace,_inventory,_hitPoints,_fuel,_damage]; - + /* if (_type in _tempMaint) then { //Use hitpoints for Maintenance system and other systems later. //Enable model swap for a damaged model. @@ -173,6 +173,7 @@ diag_log ("HIVE: Streamed " + str(_val) + " objects"); //TODO add remove object and readd old fence (hideobject would be nice to use here :-( ) //Pending change to new fence models\Layout }; + */ _nonCollide = _type in DayZ_nonCollide; //Create it if (_nonCollide) then {