W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-24 17:39:18 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename vanilla strings from #1708

Browse Source 
When localizing vanilla strings please do not put "EPOCH" in their name
or include them in the dayz_epoch package of the stringtable. This
creates more work to backport common translation updates and vice versa.
This commit is contained in:
ebaydayz
2016-07-17 14:02:04 -04:00
parent b9f4aa3ae0
commit 7751914428
17 changed files with 108 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ if (_playerNear) exitWith {localize "str_pickup_limit_5" call dayz_rollingMessag
if (_x in items player) then {_knifeArray set [count _knifeArray, _x];};
} count Dayz_Gutting;
if ((count _knifeArray) < 1) exitWith {format[localize "str_cannotCraft",localize "STR_EQUIP_NAME_4"] call dayz_rollingMessages; DZE_ActionInProgress = false; };
if ((count _knifeArray) < 1) exitWith {format[localize "str_missing_to_do_this",localize "STR_EQUIP_NAME_4"] call dayz_rollingMessages; DZE_ActionInProgress = false; };
if ((count _knifeArray > 0) && !_hasHarvested) then {
private "_qty";

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

@@ -20,7 +20,7 @@ s_player_disassembly = -1;
//Normal blocked stuff
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_isWater = (surfaceIsWater (getPosATL player)) or dayz_isSwimming;
if(_isWater or _onLadder) exitWith { localize "str_disassemble_cant_do" call dayz_rollingMessages; };
if(_isWater or _onLadder) exitWith { localize "str_water_ladder_cant_do" call dayz_rollingMessages; };
_alreadyRemoving = _cursorTarget getVariable["ObjectLocked",0];
if (_alreadyRemoving == 1) exitWith { localize "str_disassembleInProgress" call dayz_rollingMessages; };

12
SQF/dayz_code/actions/object_dismantle.sqf
View File

@@ -33,7 +33,7 @@ _tools = getArray (configFile >> "CfgVehicles" >> (typeOf _object) >> "dismantle
{
private ["_end"];
if ((_x select 0) in items player) then {_end = false;} else { format [localize "STR_EPOCH_DISMANTLE_MISSING",(_x select 0)] call dayz_rollingMessages; _end = true; _proceed = false; };
if ((_x select 0) in items player) then {_end = false;} else { format [localize "STR_BLD_DISMANTLE_MISSING",(_x select 0)] call dayz_rollingMessages; _end = true; _proceed = false; };
if (_end) exitwith { _exit = true; };
} foreach _tools;
@@ -46,7 +46,7 @@ if (_exit) exitwith {};
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_isWater = (surfaceIsWater (getPosATL player)) or dayz_isSwimming;
if(_isWater or _onLadder) exitWith { localize "str_CannotUpgrade" call dayz_rollingMessages; };
if(_isWater or _onLadder) exitWith { localize "str_water_ladder_cant_do" call dayz_rollingMessages; };
//Start loop
_isOk = true;
@@ -57,7 +57,7 @@ while {_isOk} do {
//Check if we have the tools to start
{
private ["_end"];
if ((_x select 0) in items player) then {_end = false;} else { format [localize "STR_EPOCH_DISMANTLE_MISSING",_x] call dayz_rollingMessages; _end = true; _proceed = false; };
if ((_x select 0) in items player) then {_end = false;} else { format [localize "STR_BLD_DISMANTLE_MISSING",_x] call dayz_rollingMessages; _end = true; _proceed = false; };
if (_end) exitwith { _exit = true; };
}foreach _tools;
@@ -130,7 +130,7 @@ while {_isOk} do {
if ([(_x select 1)] call fn_chance) then {
player removeWeapon (_x select 0);
player addWeapon (_x select 2);
localize "STR_EPOCH_DISMANTLE_DAMAGED" call dayz_rollingMessages;
localize "STR_BLD_DISMANTLE_DAMAGED" call dayz_rollingMessages;
};
}foreach _tools;
};
@@ -142,7 +142,7 @@ while {_isOk} do {
_proceed = true;
};
format [localize "STR_EPOCH_DISMANTLE_ATTEMPT",_counter,_limit] call dayz_rollingMessages;
format [localize "STR_BLD_DISMANTLE_ATTEMPT",_counter,_limit] call dayz_rollingMessages;
uiSleep 0.10;
};
@@ -152,7 +152,7 @@ if (_proceed) then {
if (_claimedBy != _playerID) exitWith { format[localize "str_player_beinglooted",_text] call dayz_rollingMessages; };
format [localize "STR_EPOCH_DISMANTLED",typeOf _object] call dayz_rollingMessages;
format [localize "STR_BLD_DISMANTLED",typeOf _object] call dayz_rollingMessages;
_activatingPlayer = player;
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];

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

@@ -46,7 +46,7 @@ _upgradeParts = [];
_startMaintenance = true;
if(_isWater or _onLadder) exitWith {
localize "STR_EPOCH_PLAYER_326" call dayz_rollingMessages;
localize "str_water_ladder_cant_do" call dayz_rollingMessages;
};
// lets check player has requiredTools for upgrade

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

@@ -67,7 +67,7 @@ if(_isWater or _onLadder) exitWith { localize "str_CannotUpgrade" call dayz_roll
_missingPartsConfig = configFile >> "CfgVehicles" >> _x;
_textMissingParts = getText (_missingPartsConfig >> "displayName");
//systemChat format["Missing %1 to upgrade storage.", _textMissingParts];
format [localize "STR_EPOCH_PLAYER_325", _textMissingParts] call dayz_rollingMessages;
format [localize "str_missing_to_do_this", _textMissingParts] call dayz_rollingMessages;
_startUpgrade = false;
};
} count _requiredTools;
@@ -78,7 +78,7 @@ if(_isWater or _onLadder) exitWith { localize "str_CannotUpgrade" call dayz_roll
_missingPartsConfig = configFile >> "CfgMagazines" >> _x;
_textMissingParts = getText (_missingPartsConfig >> "displayName");
//systemChat format["Missing %1 to upgrade storage.", _textMissingParts];
format [localize "STR_EPOCH_PLAYER_325", _textMissingParts] call dayz_rollingMessages;
format [localize "str_missing_to_do_this", _textMissingParts] call dayz_rollingMessages;
_startUpgrade = false;
};
if (_x IN magazines player) then {

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

@@ -61,7 +61,7 @@ if(_isWater or _onLadder) exitWith { localize "str_CannotUpgrade" call dayz_roll
_missingPartsConfig = configFile >> "CfgWeapons" >> _x;
_textMissingParts = getText (_missingPartsConfig >> "displayName");
format [localize "STR_EPOCH_PLAYER_325", _textMissingParts] call dayz_rollingMessages;
format [localize "str_missing_to_do_this", _textMissingParts] call dayz_rollingMessages;
_startUpgrade = false;
};
@@ -73,7 +73,7 @@ if(_isWater or _onLadder) exitWith { localize "str_CannotUpgrade" call dayz_roll
_missingPartsConfig = configFile >> "CfgMagazines" >> _x;
_textMissingParts = getText (_missingPartsConfig >> "displayName");
format [localize "STR_EPOCH_PLAYER_325", _textMissingParts] call dayz_rollingMessages;
format [localize "str_missing_to_do_this", _textMissingParts] call dayz_rollingMessages;
_startUpgrade = false;
};
if (_x IN magazines player) then {

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

@@ -47,7 +47,7 @@ if (!isClass _upgradeClass) exitWith { localize "str_upgradeNoOption" call dayz_
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_isWater = (surfaceIsWater (getPosATL player)) or dayz_isSwimming;
if(_isWater or _onLadder) exitWith { localize "str_disassemble_cant_do" call dayz_rollingMessages; };
if(_isWater or _onLadder) exitWith { localize "str_water_ladder_cant_do" call dayz_rollingMessages; };
// lets check player has requiredTools for upgrade
_ok = true;

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

@@ -26,7 +26,7 @@ _attachment = _this select 0;
if (!(_attachment in magazines player)) exitWith
{
closeDialog 0;
localize "STR_EPOCH_PLAYER_330" call dayz_rollingMessages;
localize "str_missingAttachment" call dayz_rollingMessages;
};
//Get player's primary weapon or sidearm

18
SQF/dayz_code/actions/player_breakin.sqf
View File

@@ -9,12 +9,12 @@ _hasSledgeHammer = "ItemSledge" in items player;
_hasCrowbar = "ItemCrowbar" in items player;
if (!_hasSledgeHammer) exitWith {
localize "STR_EPOCH_BREAKIN_NEED_SLEDGE" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_NEED_SLEDGE" call dayz_rollingMessages;
uiSleep 1;
};
if (!_hasCrowbar) exitWith {
localize "STR_EPOCH_BREAKIN_NEED_CROWBAR" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_NEED_CROWBAR" call dayz_rollingMessages;
uiSleep 1;
};
@@ -30,13 +30,13 @@ while {_isOk} do {
if (!_hasSledgeHammer) exitWith {
_proceed = nil;
localize "STR_EPOCH_BREAKIN_NEED_SLEDGE" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_NEED_SLEDGE" call dayz_rollingMessages;
uiSleep 1;
};
if (!_hasCrowbar) exitWith {
_proceed = nil;
localize "STR_EPOCH_BREAKIN_NEED_CROWBAR" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_NEED_CROWBAR" call dayz_rollingMessages;
uiSleep 1;
};
@@ -106,13 +106,13 @@ while {_isOk} do {
player removeWeapon "ItemSledge";
player addMagazine "ItemSledgeHandle";
player addMagazine "ItemSledgeHead";
localize "STR_EPOCH_BREAKIN_BROKEN_SLEDGE" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_BROKEN_SLEDGE" call dayz_rollingMessages;
};
if ([0.04] call fn_chance) then {
player removeWeapon "ItemCrowbar";
player addWeapon "ItemCrowbarBent";
localize "STR_EPOCH_BREAKIN_BENT_CROWBAR" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_BENT_CROWBAR" call dayz_rollingMessages;
};
};
@@ -136,7 +136,7 @@ if (!_proceed) then {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
localize "STR_EPOCH_BREAKIN_CANCELLED" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_CANCELLED" call dayz_rollingMessages;
};
// Working-Factor for chopping wood.
@@ -144,11 +144,11 @@ if (!_proceed) then {
//Completed but no success.
if (_proceed and !_brokein) then {
localize "STR_EPOCH_BREAKIN_COMPLETE_FAIL" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_COMPLETE_FAIL" call dayz_rollingMessages;
};
//Completed and successful
if (_proceed and _brokein) then {
localize "STR_EPOCH_BREAKIN_COMPLETE" call dayz_rollingMessages;
localize "STR_BLD_BREAKIN_COMPLETE" call dayz_rollingMessages;
//Open Gate.
_target animate ["DoorR", 1];

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

@@ -51,7 +51,7 @@ if(!r_drag_sqf and !r_player_unconscious and !_onLadder) then {
if (!("MeleeHatchet" in weapons player)) then {
if (!(DayZ_onBack == "MeleeHatchet")) then {
if (!(_x IN items player)) then {
systemChat format[localize "str_cannotCraft", _x];
systemChat format[localize "str_missing_to_do_this", _x];
_hasTools = false;
};
};

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

@@ -31,7 +31,7 @@ if ((getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState p
};
//player doesn't have the consumable item
if (!(_this in magazines player)) exitWith { localize "STR_EPOCH_PLAYER_329" call dayz_rollingMessages; };
if (!(_this in magazines player)) exitWith { localize "str_misplaced_container" call dayz_rollingMessages; };
//Remove container
player removeMagazine _this;

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

@@ -17,13 +17,13 @@ closeDialog 1;
// item is missing or tools are missing
if (isNil "_waterUsed") exitWith {
//_displayName = getText (configFile >> "CfgMagazines" >> _use >> "displayName");
localize "STR_EPOCH_PLAYER_327" call dayz_rollingMessages;
localize "str_sharpen_missing_water" call dayz_rollingMessages;
};
// item is missing or tools are missing
if (!(_item IN items player)) exitWith {
_displayName = getText (configFile >> "CfgWeapons" >> _item >> "displayName");
format [localize "str_cannotCraft",_displayName] call dayz_rollingMessages;
format [localize "str_missing_to_do_this",_displayName] call dayz_rollingMessages;
};
if (player hasWeapon _item) then {
@@ -44,5 +44,5 @@ if (player hasWeapon _item) then {
//Remove Later
player removeMagazine "equip_brick";
format [localize "STR_EPOCH_PLAYER_328",_displayName] call dayz_rollingMessages;
format [localize "str_sharpen_success",_displayName] call dayz_rollingMessages;
};