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 +}; 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; 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 @@ + + \n\nCannot fish while in combat. + \n\nCannot fish while in combat. + \n\nSie können nicht im Kampf zu fischen. + \n\nВы не можете ловить рыбу в то время как в бою. + + \n\nVissen is niet mogelijk tijdens een conflictsituatie. + \n\nVous ne pouvez pas pêcher pendant les combats. + Nemůžete ryby, když v boji. + Repair Vehicle Repair Vehicle