From b1764bff8ebad7dedfcdd58e4b2a82dfe3f6682a Mon Sep 17 00:00:00 2001
From: Beefheart <Beefheart@users.noreply.github.com>
Date: Fri, 8 Aug 2014 21:50:19 +0200
Subject: [PATCH 1/3] Update Lada.hpp

fixed some copy-paste errors
---
 SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp
index fd3431484..32dc6980c 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp
@@ -592,7 +592,7 @@ class Lada2_DZE2: Lada2_DZE1 {
 	};
 
 	class Upgrades {
-		ItemLRK[] = {"Lada1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+		ItemLRK[] = {"Lada2_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
 	};
 };
 class LadaLM_DZE2: LadaLM_DZE1 {
@@ -639,7 +639,7 @@ class LadaLM_DZE2: LadaLM_DZE1 {
 	};
 
 	class Upgrades {
-		ItemLRK[] = {"Lada1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+		ItemLRK[] = {"LadaLM_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
 	};
 };
 class Lada1_TK_CIV_EP1_DZE2: Lada1_TK_CIV_EP1_DZE1 {
@@ -686,7 +686,7 @@ class Lada1_TK_CIV_EP1_DZE2: Lada1_TK_CIV_EP1_DZE1 {
 	};
 
 	class Upgrades {
-		ItemLRK[] = {"Lada1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+		ItemLRK[] = {"Lada1_TK_CIV_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
 	};
 };
 class Lada2_TK_CIV_EP1_DZE2: Lada2_TK_CIV_EP1_DZE1 {
@@ -733,7 +733,7 @@ class Lada2_TK_CIV_EP1_DZE2: Lada2_TK_CIV_EP1_DZE1 {
 	};
 
 	class Upgrades {
-		ItemLRK[] = {"Lada1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+		ItemLRK[] = {"Lada2_TK_CIV_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
 	};
 };
 
@@ -799,4 +799,4 @@ class Lada1_TK_CIV_EP1_DZE4: Lada1_TK_CIV_EP1_DZE3 {
 };
 class Lada2_TK_CIV_EP1_DZE4: Lada2_TK_CIV_EP1_DZE3 {
 	fuelCapacity = 210; // car 100
-};
\ No newline at end of file
+};

From f2145b6b8d5f1ced8e4bfd1f4ad018cca5bed976 Mon Sep 17 00:00:00 2001
From: Marko <markokil321@hotmail.com>
Date: Sat, 9 Aug 2014 11:38:36 +0200
Subject: [PATCH 2/3] Add "Cannot fish ehile in combat"  text

To avoid confusion when players try to fish while in combat, google translate was used, so excuse any wonky translations.
---
 SQF/dayz_epoch_b/stringtable.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml
index a3cab929d..7abfb6162 100644
--- a/SQF/dayz_epoch_b/stringtable.xml
+++ b/SQF/dayz_epoch_b/stringtable.xml
@@ -6056,6 +6056,16 @@
 			<!-- <Dutch></Dutch> -->
 			<!-- <German></German> -->
 		</Key>
+		<Key ID="STR_EPOCH_PLAYER_312">
+			<Original>\n\nCannot fish while in combat.</Original>
+			<English>\n\nCannot fish while in combat.</English>
+			<German>\n\nSie können nicht im Kampf zu fischen.</German>
+			<Russian>\n\nВы не можете ловить рыбу в то время как в бою.</Russian>
+			<!-- <Spanish></Spanish> -->
+			<Dutch>\n\nVissen is niet mogelijk tijdens een conflictsituatie.</Dutch>
+			<French>\n\nVous ne pouvez pas pêcher pendant les combats.</French>
+			<Czech>Nemůžete ryby, když v boji.</Czech>
+		</Key>
 		<Key ID="STR_EPOCH_PLAYER_REPAIRV">
 			<Original>Repair Vehicle</Original>
 			<English>Repair Vehicle</English>

From 64d9be91694399d9034bfb93f8a47240c7e37ff5 Mon Sep 17 00:00:00 2001
From: Marko <markokil321@hotmail.com>
Date: Sat, 9 Aug 2014 11:41:43 +0200
Subject: [PATCH 3/3] Update player_goFishing.sqf

Added better message when trying to fish while in combat, to avoid confusion.
---
 SQF/dayz_code/actions/player_goFishing.sqf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SQF/dayz_code/actions/player_goFishing.sqf b/SQF/dayz_code/actions/player_goFishing.sqf
index b7f0b4a13..1d1ef6c02 100644
--- a/SQF/dayz_code/actions/player_goFishing.sqf
+++ b/SQF/dayz_code/actions/player_goFishing.sqf
@@ -17,7 +17,7 @@ if(!(surfaceIsWater _position)) exitWith {DZE_ActionInProgress = false; cutText
 if((currentWeapon player) != "MeleeFishingPole") exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_67"), "PLAIN DOWN"]; };
 
 if(dayz_isSwimming) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_26", "PLAIN DOWN"]; };
-if(player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_68"), "PLAIN DOWN"];};
+if(player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_312"), "PLAIN DOWN"];};
 
 _isOk = true;
 _counter = 0;
@@ -81,4 +81,4 @@ while {_isOk} do {
 		};
 	};
 };
-DZE_ActionInProgress = false;
\ No newline at end of file
+DZE_ActionInProgress = false;