From 6ea1df14cf4773709fd22c9d439310a256f39b0a Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Thu, 21 Apr 2016 19:23:49 -0400
Subject: [PATCH] Add missing string for infection death

---
 CHANGE LOG 1.0.6.txt                      |  3 ++-
 SQF/dayz_code/actions/salvage_vehicle.sqf | 15 ++++++++-------
 SQF/dayz_code/stringtable.xml             |  8 ++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt
index 5eb4a8766..2ffed14fc 100644
--- a/CHANGE LOG 1.0.6.txt	
+++ b/CHANGE LOG 1.0.6.txt	
@@ -30,7 +30,8 @@
 [CHANGED] Several weapon, item and tool classnames changed. Admins see SQL\1.0.6_Updates @ebaydayz
 [CHANGED] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
 [CHANGED] Combattimeout now uses diag_tickTime instead of time.
-[CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox
+[CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model)
+[CHANGED] UH60Wreck and UH1Wreck are replaced with CrashSite_EU/UN/US/RU (new models)
 [CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
 [CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
 [CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
diff --git a/SQF/dayz_code/actions/salvage_vehicle.sqf b/SQF/dayz_code/actions/salvage_vehicle.sqf
index 1d6ee55d1..f2f07e4e7 100644
--- a/SQF/dayz_code/actions/salvage_vehicle.sqf
+++ b/SQF/dayz_code/actions/salvage_vehicle.sqf
@@ -1,7 +1,9 @@
-private ["_part","_color","_vehicle","_PlayerNear","_hitpoints","_cursorTarget","_isATV","_is6WheelType","_HasNoGlassKind",
-"_6WheelTypeArray","_NoGlassArray","_NoExtraWheelsArray","_RemovedPartsArray","_damage","_cmpt","_configVeh","_damagePercent","_string","_handle","_cancel","_type"];
+private ["_part","_color","_vehicle","_PlayerNear","_hitpoints","_isATV","_is6WheelType","_HasNoGlassKind",
+"_6WheelTypeArray","_NoGlassArray","_NoExtraWheelsArray","_RemovedPartsArray","_damage","_cmpt","_configVeh","_damagePercent","_string","_handle","_cancel","_type","_isBicycle"];
 
 _vehicle = _this select 3;
+_isBicycle = _vehicle isKindOf "Bicycle";
+if (_isBicycle) exitWith {}; // No salvage for now. Bicycle wheels should not give full size tires. Also model does not update to show removed wheels.
 {dayz_myCursorTarget removeAction _x} count s_player_repairActions;s_player_repairActions = [];
 
 _PlayerNear = {isPlayer _x} count ((getPosATL _vehicle) nearEntities ["CAManBase", 10]) > 1;
@@ -10,12 +12,11 @@ if (_PlayerNear) exitWith {dayz_myCursorTarget = objNull; localize "str_pickup_l
 dayz_myCursorTarget = _vehicle;
 _hitpoints = _vehicle call vehicle_getHitpoints;
 
-_cursorTarget = cursorTarget;
-_type = typeOf _cursorTarget;
+_type = typeOf _vehicle;
 _isATV = _type in ["ATV_US_EP1","ATV_CZ_EP1"];
 _is6WheelType = false;
 {if (_type isKindOf _x) exitWith {_is6WheelType = true;};} count ["Kamaz_Base","MTVR","Ural_Base","Ural_Base_withTurret","V3S_Base"];
-_HasNoGlassKind = (_cursorTarget isKindOf "Motorcycle") or (_cursorTarget isKindOf "Bicycle");
+_HasNoGlassKind = (_vehicle isKindOf "Motorcycle") or _isBicycle;
 
 _6WheelTypeArray = ["HitLMWheel","HitRMWheel"];
 _NoGlassArray = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","HitGlass6","HitLGlass","HitRGlass"];
@@ -26,11 +27,11 @@ if (_isATV or _HasNoGlassKind) then {
 	_hitpoints = _hitpoints - _NoGlassArray;
 };
 
-if (_cursorTarget isKindOf "tractor") then {
+if (_vehicle isKindOf "tractor") then {
 	_hitpoints = _hitpoints - ["motor","HitLFWheel","HitRFWheel","HitLBWheel","HitRBWheel","HitLF2Wheel","HitRF2Wheel","HitLMWheel","HitRMWheel"];
 };
 
-if ((_cursorTarget isKindOf "Bicycle") or (_cursorTarget isKindOf "Motocycle")) then {
+if (_isBicycle or (_vehicle isKindOf "Motocycle")) then {
 	_hitpoints = _hitpoints - ["HitEngine","HitFuel"];
 };
 
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index def083fd0..c52d5e958 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -7565,6 +7565,14 @@
 			<French>une déshydratation</French>
 			<Czech>na dehydrataci.</Czech>
 		</Key>
+		<Key ID="str_death_sick">
+			<English>infection</English>
+			<German>infektion</German>
+			<Russian>инфекционное заболевание</Russian>
+			<Spanish>infección</Spanish>
+			<French>maladie</French>
+			<Czech>nemoc</Czech>
+		</Key>
 		<Key ID="str_death_starve">
 			<English>starvation</English>
 			<German>durch Verhungern.</German>