From 571e8d7b11a939ed5dd1d259f9703ba0e980002d Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 6 Jan 2017 15:53:38 -0500 Subject: [PATCH] Add LightPole_DZ to DZE_isRemovable #1859 --- CHANGE LOG 1.0.6.1.txt | 1 + SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp | 2 ++ SQF/dayz_code/actions/remove.sqf | 3 +-- SQF/dayz_code/init/variables.sqf | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt index 8ce6ce8fb..7617b28fc 100644 --- a/CHANGE LOG 1.0.6.1.txt +++ b/CHANGE LOG 1.0.6.1.txt @@ -50,6 +50,7 @@ [FIXED] Combining M24 or 2Rnd shotgun ammo can no longer be abused to dupe mags via the method described in #1848. @DeVloek [FIXED] Rapid starvation or dehydration when using chainsaw, chopping wood or pushing plane. Also lowered or removed nutrition hit for several actions. [FIXED] Unable to repair or salvage vehicle parts not listed in the RepairParts config, like Merlin glass and tank tracks. #1828 #1856 @ndavalos @schwanzkopfhegel @oiad +[FIXED] Unable to remove LightPole_DZ. #1859 @TheZog [NOTE] The fixes below are included in the 1.0.6 Build C server package released December 29th, 2016 (http://dayzepoch.com/a2dayzepoch.php) [FIXED] Hive child 309 errors that resulted in broken saving of newly built storage object inventory. @icomrade diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp index c0609f0f5..de6ed5432 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp @@ -659,6 +659,7 @@ class LightPole_DZ: ASC_EU_LHVOld displayName = $STR_EPOCH_LIGHTPOLE; vehicleClass = "Fortifications"; maintainBuilding[] = {{"ItemLightBulb",1}}; + removeoutput[] = {{"light_pole_kit",1}}; }; class Land_Misc_Scaffolding; class Scaffolding_DZ: Land_Misc_Scaffolding @@ -678,6 +679,7 @@ class Scaffolding_DZ: Land_Misc_Scaffolding typicalCargo[] = {}; offset[] = {0,9,3}; cost = 0; + removeoutput[] = {{"ItemScaffoldingKit",1}}; }; class WoodGate_DZ: BuiltItems { diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index f97ea2358..83c9749da 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -73,7 +73,6 @@ _nameVehicle = getText(configFile >> "CfgVehicles" >> _objType >> "displayName") format[localize "str_epoch_player_162",_nameVehicle] call dayz_rollingMessages; if (_isModular) then { - //allow previous cutText to show, then show this if modular. localize "STR_EPOCH_ACTIONS_21" call dayz_rollingMessages; }; @@ -131,7 +130,7 @@ while {_isOk} do { if(_finished) then { _counter = _counter + 1; - // 10% chance to break a required tool each pass + // 4% chance to break a required tool each pass if((_isDestructable || _isRemovable) && !_isOwnerOfObj) then { if (dayz_toolBreaking && {[0.04] call fn_chance}) then {_brokenTool = true;}; }; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index ed20f767d..43f149abf 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -531,7 +531,7 @@ DZE_UnLockedStorage = ["VaultStorage","LockboxStorage"]; DZE_maintainClasses = ["ModularItems","DZE_Housebase","LightPole_DZ","BuiltItems","Generator_DZ","DZ_buildables","Plastic_Pole_EP1_DZ","Fence_corrugated_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","StickFence_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ","M240Nest_DZ"]; DZE_DoorsLocked = ["Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallDoorLocked_DZ","CinderWallDoorSmallLocked_DZ"]; // List of removable items that require crowbar -DZE_isRemovable = ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","Plastic_Pole_EP1_DZ","FireBarrel_DZ","Scaffolding_DZ","CanvasHut_DZ"]; +DZE_isRemovable = ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","Plastic_Pole_EP1_DZ","FireBarrel_DZ","Scaffolding_DZ","CanvasHut_DZ","LightPole_DZ"]; DZE_isWreck = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"]; DZE_isWreckBuilding = ["Land_wreck_cinder","Land_wood_wreck_quarter","Land_wood_wreck_floor","Land_wood_wreck_third","Land_wood_wreck_frame","Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gold_vein_wreck","Land_ammo_supply_wreck"]; DZE_isNewStorage = ["VaultStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ"];