W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from vbawol/master

Browse Source 
pull from epoch master
This commit is contained in:
Uro1
2014-08-11 14:32:19 +01:00
parent 7dd6aac669 ca37210345
commit d1b40385a9
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp
View File

@@ -592,7 +592,7 @@ class Lada2_DZE2: Lada2_DZE1 {
}; };
class Upgrades { 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 { class LadaLM_DZE2: LadaLM_DZE1 {
@@ -639,7 +639,7 @@ class LadaLM_DZE2: LadaLM_DZE1 {
}; };
class Upgrades { 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 { 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 { 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 { 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 { 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 { class Lada2_TK_CIV_EP1_DZE4: Lada2_TK_CIV_EP1_DZE3 {
fuelCapacity = 210; // car 100 fuelCapacity = 210; // car 100
}; };

4
SQF/dayz_code/actions/player_goFishing.sqf
View File

@@ -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((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(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; _isOk = true;
_counter = 0; _counter = 0;
@@ -81,4 +81,4 @@ while {_isOk} do {
}; };
}; };
}; };
DZE_ActionInProgress = false; DZE_ActionInProgress = false;

10
SQF/dayz_epoch_b/stringtable.xml
View File

@@ -6056,6 +6056,16 @@
<!-- <Dutch></Dutch> --> <!-- <Dutch></Dutch> -->
<!-- <German></German> --> <!-- <German></German> -->
</Key> </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"> <Key ID="STR_EPOCH_PLAYER_REPAIRV">
<Original>Repair Vehicle</Original> <Original>Repair Vehicle</Original>
<English>Repair Vehicle</English> <English>Repair Vehicle</English>