From cf43925627a79ca474443b229b70cac61e6e9981 Mon Sep 17 00:00:00 2001
From: vbawol <awol@veteranbastards.com>
Date: Sun, 28 Apr 2013 16:59:47 -0500
Subject: [PATCH] fixes

---
 dayz_code/actions/player_chopWood.sqf | 4 ++--
 dayz_code/actions/remove.sqf          | 8 ++++----
 dayz_code/config.cpp                  | 1 +
 dayz_code/init/variables.sqf          | 2 +-
 dayz_equip/config.cpp                 | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dayz_code/actions/player_chopWood.sqf b/dayz_code/actions/player_chopWood.sqf
index 1fe6110ed..5ca79218a 100644
--- a/dayz_code/actions/player_chopWood.sqf
+++ b/dayz_code/actions/player_chopWood.sqf
@@ -52,7 +52,7 @@ if (_finished) then {
 				_i = 0;
 				// determine where the object name starts
 				{
-					if (ASCII_COLON == _objInfo select _i) exitWith {};
+					if (58 == _objInfo select _i) exitWith {};
 					_i = _i + 1;
 				} forEach _objInfo;
 				_i = _i + 2; // skip the ": " part
@@ -60,7 +60,7 @@ if (_finished) then {
 					_objName = _objName + [_objInfo select _k];
 				};
 				_objName = toLower(toString(_objName));
-				
+
 				// Exit since we found a tree
 				if (_objName in _trees) exitWith { 
 					_findNearestTree set [(count _findNearestTree),_x];
diff --git a/dayz_code/actions/remove.sqf b/dayz_code/actions/remove.sqf
index 65a8f3d12..19aa174fb 100644
--- a/dayz_code/actions/remove.sqf
+++ b/dayz_code/actions/remove.sqf
@@ -121,21 +121,21 @@ if (_proceed) then {
 		dayzDeleteObj = [_objectID,_objectUID];
 		publicVariableServer "dayzDeleteObj";
 
-		_isWreck = typeOf _obj in ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
+		_isWreck = (typeOf _obj) in ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
 
 		deleteVehicle _obj;
-
+		_selectedRemoveOutput = [];
 		if(_isWreck) then {
 			// Find one random part to give back
 			_refundpart = ["PartEngine","PartGeneric","PartFueltank","PartWheel","PartGlass","ItemJerrycan"] call BIS_fnc_selectRandom;
-			_selectedRemoveOutput = [_refundpart];
+			_selectedRemoveOutput set [count _selectedRemoveOutput,[_refundpart,1]];
 		} else {
 			_selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput");
 		};
 		
 		// give refund items
 		if((count _selectedRemoveOutput) > 0) then {
-			// Put items
+			// Put itemsg
 			{
 				_itemOut = _x select 0;
 				_countOut = _x select 1;
diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp
index db833d92f..c3968d9be 100644
--- a/dayz_code/config.cpp
+++ b/dayz_code/config.cpp
@@ -1011,6 +1011,7 @@ class HeliCrash_No50s: Default {
 			0.06, //18
 			0.01, //24
 			0.01, //DZ_Backpack_EP1 24
+			0.01, //45
 			0.30,
 			1.00,
 			5.00, //military
diff --git a/dayz_code/init/variables.sqf b/dayz_code/init/variables.sqf
index 3b8697150..b69249cde 100644
--- a/dayz_code/init/variables.sqf
+++ b/dayz_code/init/variables.sqf
@@ -384,7 +384,7 @@ if(isNil "dayz_oldrefuel") then {
 dayz_updateObjects = ["Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","M240Nest_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ"];
 dayz_disallowedVault = ["TentStorage", "BuiltItems"];
 dayz_reveal = ["AllVehicles","WeaponHolder","TentStorage","VaultStorage","VaultStorageLocked","BuiltItems"];
-dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ"];
+dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ"];
 
 dayz_spawnPos = getPosATL player;
 
diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp
index 2af5bdeda..f317a6a31 100644
--- a/dayz_equip/config.cpp
+++ b/dayz_equip/config.cpp
@@ -1543,11 +1543,11 @@ class CfgMagazines
 		scope = 2;
 		count = 1;
 		type = 256;
-		displayName = "Wood Plywood";
+		displayName = "Plywood";
 		// TODO make custom model and icon
 		model = "\dayz_equip\models\woodPile.p3d";
 		picture = "\dayz_equip\textures\equip_woodPile_ca.paa";
-		descriptionShort = "Wood Plywood";
+		descriptionShort = "Plywood";
 		class ItemActions {
 			class Crafting
 			{