W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove duplicate drink string

Browse Source 
Vanilla development commit:

c25213fbb4
This commit is contained in:
ebaydayz
2016-08-19 15:41:50 -04:00
parent f3370cbc4b
commit 38e30d2565
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/compile/fn_selfActions.sqf
View File

@@ -103,7 +103,7 @@ if (_canDo && !_inVehicle && !dayz_isSwimming) then {
} count _waterHoles; } count _waterHoles;
if (_canDoThis) exitWith { if (_canDoThis) exitWith {
if (s_player_Drinkfromhands < 0) then { if (s_player_Drinkfromhands < 0) then {
s_player_Drinkfromhands = player addAction [localize "str_player_31_drink", "\z\addons\dayz_code\actions\player_drinkWater.sqf",player, 0.5, false, true]; s_player_Drinkfromhands = player addAction [localize "STR_ACTIONS_DRINK2", "\z\addons\dayz_code\actions\player_drinkWater.sqf",player, 0.5, false, true];
}; };
}; };
} foreach nearestObjects [player, ["waterHoleProxy", "Land_pumpa"], 50]; } foreach nearestObjects [player, ["waterHoleProxy", "Land_pumpa"], 50];

19
SQF/dayz_code/stringtable.xml
View File

@@ -989,18 +989,13 @@
<French>Prendre Antibiotiques</French> <French>Prendre Antibiotiques</French>
<Czech>Vzít si antibiotika</Czech> <Czech>Vzít si antibiotika</Czech>
</Key> </Key>
<Key ID="STR_ACTIONS_DRINK">
<English>Drink %1</English>
<German>%1 trinken</German>
<Russian>Выпить</Russian>
<Spanish>Tomar %1</Spanish>
<French>Boire %1</French>
<Czech>Vypít %1</Czech>
</Key>
<Key ID="STR_ACTIONS_DRINK2"> <Key ID="STR_ACTIONS_DRINK2">
<English>Drink</English> <English>Drink</English>
<Russian>Выпить</Russian> <Russian>Выпить</Russian>
<German>Trinken</German> <German>Trinken</German>
<Spanish>Tomar</Spanish>
<Czech>Vypít</Czech>
<French>Boire</French>
</Key> </Key>
<Key ID="STR_ACTIONS_FILL_W"> <Key ID="STR_ACTIONS_FILL_W">
<English>Fill Water</English> <English>Fill Water</English>
@@ -7313,14 +7308,6 @@
<German>braten</German> <German>braten</German>
<French>cuire</French> <French>cuire</French>
</Key> </Key>
<Key ID="str_player_31_drink">
<English>Drink</English>
<Russian>выпить</Russian>
<Spanish>beberlo</Spanish>
<Czech>vypít</Czech>
<German>trinken</German>
<French>boire</French>
</Key>
<Key ID="str_player_31_fill"> <Key ID="str_player_31_fill">
<English>fill</English> <English>fill</English>
<Russian>наполнить</Russian> <Russian>наполнить</Russian>