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 some unnecessary translations

Browse Source 
Using "Wait for the previous action to complete to perform another" is
more accurate in these cases, because dayz_actionInProgress could have
been set by any action, not necessarily the same one.
This commit is contained in:
ebayShopper
2017-04-15 14:19:26 -04:00
parent f20982fe85
commit 78fbd7ac53
13 changed files with 19 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/boil.sqf
View File

@@ -1,6 +1,6 @@
private ["_bottletext","_tin1text","_tin2text","_tintext","_hastinitem","_qty","_dis","_sfx","_WB2Add"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_22" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
_bottletext = getText (configFile >> "CfgMagazines" >> "ItemWaterBottle" >> "displayName");

2
SQF/dayz_code/actions/cook.sqf
View File

@@ -1,5 +1,5 @@
private ["_rawmeat","_cookedmeat","_meat","_meatcooked","_text","_qty","_dis","_sfx"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_23" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
//diag_log ("Cook Enabled");
player removeAction s_player_cook;

6
SQF/dayz_code/actions/gather_meat.sqf
View File

@@ -2,11 +2,7 @@ private ["_item","_type","_hasHarvested","_knifeArray","_PlayerNear","_isListed"
_isZombie = _this isKindOf "zZombie_base";
if (dayz_actionInProgress) exitWith {
if (_isZombie) then {
localize "str_epoch_player_31" call dayz_rollingMessages;
} else {
localize "str_epoch_player_29" call dayz_rollingMessages;
};
localize "str_player_actionslimit" call dayz_rollingMessages;
};
dayz_actionInProgress = true;

2
SQF/dayz_code/actions/player_addToolbelt.sqf
View File

@@ -5,7 +5,7 @@
3. Removing tool from toolbelt and converting it to primary
*/
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_39" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_item","_config","_onLadder","_text","_create","_config2","_primaryFull","_removed","_toolsFull"];

2
SQF/dayz_code/actions/player_craftItem.sqf
View File

@@ -25,7 +25,7 @@ class ItemActions
*/
private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_boiled","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_selectedRecipeInputStrict","_num_removed","_removed_total","_temp_removed_array","_abort","_waterLevel","_waterLevel_lowest","_reason","_isNear","_selectedRecipeTools","_distance","_crafting","_needNear","_item","_baseClass","_num_removed_weapons","_outputWeapons","_inputWeapons","_randomOutput","_craft_doLoop","_selectedWeapon","_selectedMag","_sfx"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
// This is used to find correct recipe based what itemaction was click allows multiple recipes per item.

2
SQF/dayz_code/actions/player_craftItemVanilla.sqf
View File

@@ -12,7 +12,7 @@
//diag_log("crafting system");
private ["_config","_input","_output","_required","_failChance","_hasInput","_availabeSpace","_classname","_isClass","_onLadder","_hasTools","_avail","_selection","_item","_amount","_itemName","_freeSlots","_slotType","_i","_j","_dis","_sfx"];
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
//diag_log(str(isnil "r_player_crafting"));

2
SQF/dayz_code/actions/player_wearClothes.sqf
View File

@@ -6,7 +6,7 @@ _playerNear = {isPlayer _x} count (([player] call FNC_GetPos) nearEntities ["CAM
if (_playerNear) exitWith {localize "STR_EPOCH_PLAYER_84" call dayz_rollingMessages;};
if (_this in DZE_RestrictSkins) exitWith { format[localize "str_epoch_player_315",_this] call dayz_rollingMessages; };
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_83" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
/*
_item call player_wearClothes;

2
SQF/dayz_code/actions/remove.sqf
View File

@@ -1,4 +1,4 @@
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_88" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
/*
delete object from db with extra waiting by [VB]AWOL

2
SQF/dayz_code/actions/repair.sqf
View File

@@ -1,4 +1,4 @@
if (dayz_actionInProgress) exitWith {localize "str_epoch_player_92" call dayz_rollingMessages;};
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_array","_vehicle","_part","_hitpoint","_type","_hasToolbox","_section","_nameType","_namePart","_damage","_selection","_dis","_sfx","_hitpoints","_allFixed","__FILE__"];

9
SQF/dayz_code/compile/fn_getPos.sqf Normal file
View File

@@ -0,0 +1,9 @@
private "_pos";
_pos = getPosASL (_this select 0);
if !(surfaceIsWater _pos) then {
_pos = ASLToATL _pos;
};
_pos

11
SQF/dayz_code/compile/fnc_getPos.sqf
View File

@@ -1,11 +0,0 @@
private "_pos";
//if (isNil {_this select 0}) exitWith {[0,0,0]};
_thingy = _this select 0;
_pos = getPosASL _thingy;
if !(surfaceIsWater _pos) then {
_pos = ASLToATL _pos;
};
_pos

2
SQF/dayz_code/init/compiles.sqf
View File

@@ -622,7 +622,7 @@ BIS_fnc_findNestedElement = compile preprocessFileLineNumbers "\z\addons\dayz_co
BIS_fnc_param = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\BIS_fnc\fn_param.sqf";
BIS_fnc_relativeDirTo = compile("private '_dir';_dir=_this call{" + (preprocessFileLineNumbers "ca\modules\Functions\geometry\fn_relativeDirTo.sqf")+"};if(_dir>180)then{_dir=_dir-360;};if(_dir<-180)then{_dir=_dir+360;};_dir");
fnc_buildWeightedArray = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildWeightedArray.sqf"; //Checks which actions for nearby casualty
fnc_getPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fnc_getPos.sqf";
fnc_getPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_getPos.sqf";
fnc_spawnObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_spawnObjects.sqf";
object_getHit = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_getHit.sqf"; //gets the hit value for a HitPoint (i.e. HitLegs) against the selection (i.e. "legs"), returns the value
object_setHit = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_setHit.sqf"; //process the hit as a NORMAL damage (useful for persistent vehicles)

72
SQF/dayz_code/stringtable.xml
View File

@@ -11535,22 +11535,6 @@
<French>Le déverrouillage est déjà en cours.</French>
<Czech>Odemykání již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_22">
<English>Boil is already in progress.</English>
<German>Aufkochen bereits im Gange.</German>
<Russian>Уже кипятится.</Russian>
<Dutch>Je bent al aan ket koken.</Dutch>
<French>L'ébullition est déjà en cours.</French>
<Czech>Převařování již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_23">
<English>Cooking is already in progress.</English>
<German>Kochen bereits im Gange.</German>
<Russian>Уже готовится.</Russian>
<Dutch>Je bent al aan het koken.</Dutch>
<French>La cuisson est déjà en cours.</French>
<Czech>Vaření již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_25">
<English>Preparing to fuel and start generator, move to cancel.</English>
<German>Betanken und Starten des Generators, bewege dich um den Vorgang abzubrechen.</German>
@@ -11583,22 +11567,6 @@
<French>Le générateur a été démarré.</French>
<Czech>Generátor byl nastartován.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_29">
<English>Gutting animal is already in progress.</English>
<German>Ausweiden des Tieres bereits im Gange.</German>
<Russian>Животное уже разделывается.</Russian>
<Dutch>Je bent dit dier al aan het opensnijden.</Dutch>
<French>Le dépeçage de l'animal est déjà en cours.</French>
<Czech>Kuchání zvířete již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_31">
<English>Gutting zombie is already in progress.</English>
<German>Ausweiden des Zombies bereits im Gange.</German>
<Russian>Зомби уже разделывается.</Russian>
<Dutch>Je bent deze zombie al aan het opensnijden.</Dutch>
<French>Le dépeçage du zombie est déjà en cours.</French>
<Czech>Kuchání zombie již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_32">
<English>Hotwire vehicle is already in progress.</English>
<German>Aufbrechen des Fahrzeuges bereits im Gange.</German>
@@ -11636,14 +11604,6 @@
<French>Le verrouillage du véhicule est déjà en cours.</French>
<Czech>Zamykání vozidla již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_39">
<English>Add to toolbelt is already in progress.</English>
<German>Hinzufügen zum Werkzeuggürtel bereits im Gange.</German>
<Russian>Уже добавляется на пояс.</Russian>
<Dutch>Reeds bezig met toevoegen aan gereedschapsriem</Dutch>
<French>L'ajout à la ceinture est déjà en cours.</French>
<Czech>Přidávání do opasku na nářadí již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_40">
<English>Building already in progress.</English>
<German>Bau bereits im Gange.</German>
@@ -11795,14 +11755,6 @@
<French>Construction démarré</French>
<Czech>Tvorba začala</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_63">
<English>Crafting already in progress.</English>
<German>Herstellung bereits im Gange.</German>
<Russian>Уже создаётся.</Russian>
<Dutch>Je bent al bezig met creëren</Dutch>
<French>La construction est déjà en cours.</French>
<Czech>Vytváření již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_64">
<English>Canceled crafting.</English>
<German>Herstellung abgebrochen.</German>
@@ -11891,14 +11843,6 @@
<French>Aucune amélioration disponible</French>
<Czech>Nejsou dostupné žádné upgrady</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_83">
<English>Changing clothes already in progress.</English>
<German>Wechseln der Kleidung bereits im Gange.</German>
<Russian>Вы уже переодеваетесь.</Russian>
<Dutch>Je bent je al aan het omkleden.</Dutch>
<French>Le changement de vêtements est déjà en cours.</French>
<Czech>Změna oblečení již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_84">
<English>You cannot change clothes when another player is nearby.</English>
<German>Du kannst deine Kleidung nicht wechseln, wenn ein anderer Spieler in der Nähe ist.</German>
@@ -11915,14 +11859,6 @@
<French>Vous ne pouvez pas porter les vêtements du sexe opposé.</French>
<Czech>Nemůžete nosit oblečení opačného pohlaví.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_88">
<English>Remove is already in progress.</English>
<German>Entfernen bereits im Gange.</German>
<Russian>Уже убирается/снимается.</Russian>
<Dutch>Al bezig met verwijderen.</Dutch>
<French>Le démontage est déjà en cours.</French>
<Czech>Odstranění již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_89">
<English>Cannot remove a running generator.</English>
<German>Ein laufender Generator kann nicht entfernt werden.</German>
@@ -11947,14 +11883,6 @@
<French>Échec, l'objet n'existe plus.</French>
<Czech>Chyba. Objekt již neexistuje.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_92">
<English>Repair is already in progress.</English>
<German>Reperatur bereits im Gange.</German>
<Russian>Уже чинится.</Russian>
<Dutch>Wordt al reeds gerepareerd.</Dutch>
<French>La réparation est déjà en cours.</French>
<Czech>Opravování již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_96">
<English>already in progress.</English>
<German>bereits im Gange.</German>