Merge pull request #1710 from oiad/master

Tidyness changes

SQF/dayz_code/actions/modular_build.sqf

@@ -532,7 +532,7 @@ if (_canBuild select 0) then {
 						_tmpbuilt setVariable ["ownerPUID",_playerUID,true];
 						PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location,_playerUID, _vector], []];
 						if (_lockable == 3) then {
-							_friendsArr = [[([player] call FNC_GetPlayerUID),(name player)]];
+							_friendsArr = [[_playerUID,(name player)]];
 							_tmpbuilt setVariable ["doorfriends", _friendsArr, true];
 							PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location,_playerUID, _vector], _friendsArr];
 						};
@@ -553,7 +553,7 @@ if (_canBuild select 0) then {
 						if (DZE_permanentPlot) then {
 							_tmpbuilt setVariable ["ownerPUID",_playerUID,true];
 							if (_canBuild select 1) then {
-								_friendsArr = [[([player] call FNC_GetPlayerUID),(name player)]];
+								_friendsArr = [[_playerUID,(name player)]];
 								_tmpbuilt setVariable ["plotfriends", _friendsArr, true];
 								PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location,_playerUID, _vector], _friendsArr];
 							} else {

SQF/dayz_code/actions/player_build.sqf

@@ -440,7 +440,7 @@ if (_canBuild select 0) then {
 						_tmpbuilt setVariable ["ownerPUID",_playerUID,true];
 						PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location,_playerUID],_classname];
 						if (_lockable == 3) then {
-							_friendsArr = [[([player] call FNC_GetPlayerUID),(name player)]];
+							_friendsArr = [[_playerUID,(name player)]];
 							_tmpbuilt setVariable ["doorfriends", _friendsArr, true];
 							PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location,_playerUID, _vector], _friendsArr];
 						};
@@ -461,7 +461,7 @@ if (_canBuild select 0) then {
 						if (DZE_permanentPlot) then {
 							_tmpbuilt setVariable ["ownerPUID",_playerUID,true];
 							if (_canBuild select 1) then {
-								_friendsArr = [[([player] call FNC_GetPlayerUID),(name player)]];
+								_friendsArr = [[_playerUID,(name player)]];
 								_tmpbuilt setVariable ["plotfriends", _friendsArr, true];
 								PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location,_playerUID],_friendsArr];
 							} else {
@@ -477,7 +477,6 @@ if (_canBuild select 0) then {
 				deleteVehicle _tmpbuilt;
 				localize "str_epoch_player_46" call dayz_rollingMessages;
 			};
-
 		} else {
 			r_interrupt = false;
 			if (vehicle player == player) then {
@@ -489,7 +488,6 @@ if (_canBuild select 0) then {
 
 			localize "str_epoch_player_46" call dayz_rollingMessages;
 		};
-
 	} else {
 		format[localize "str_epoch_player_47",_text,_reason] call dayz_rollingMessages;
 	};

SQF/dayz_code/actions/player_upgrade.sqf

@@ -2,7 +2,7 @@
 	DayZ Base Building Upgrades
 	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 */
-private ["_location","_dir","_classname","_missing","_text","_proceed","_num_removed","_object","_missingQty","_itemIn","_countIn","_qty","_removed","_removed_total","_tobe_removed_total","_objectID","_objectUID","_temp_removed_array","_textMissing","_newclassname","_requirements","_obj","_upgrade","_lockable","_combination_1","_combination_2","_combination_3","_combination","_objectCharacterID","_ownerID"];
+private ["_location","_dir","_classname","_missing","_text","_proceed","_num_removed","_object","_missingQty","_itemIn","_countIn","_qty","_removed","_removed_total","_tobe_removed_total","_objectID","_objectUID","_temp_removed_array","_textMissing","_newclassname","_requirements","_obj","_upgrade","_lockable","_combination_1","_combination_2","_combination_3","_combination","_objectCharacterID","_ownerID","_playerUID"];
 
 if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_52" call dayz_rollingMessages;};
 DZE_ActionInProgress = true;
@@ -19,6 +19,8 @@ _objectID 	= _obj getVariable ["ObjectID","0"];
 // Find objectUID
 _objectUID	= _obj getVariable ["ObjectUID","0"];
 
+_playerUID = [player] call FNC_GetPlayerUID;
+
 if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; localize "str_epoch_player_50" call dayz_rollingMessages;};
 
 // Get classname
@@ -126,10 +128,10 @@ if ((count _upgrade) > 0) then {
 			};
 			if (DZE_permanentPlot) then {
 				_ownerID = _obj getVariable["ownerPUID","0"];
-				if (_ownerID == "0") then { _ownerID = [player] call FNC_GetPlayerUID; }; //APFL is on but UID is 0 so we will claim it to record the ownership.
+				if (_ownerID == "0") then { _ownerID = _playerUID; }; //APFL is on but UID is 0 so we will claim it to record the ownership.
 				_object setVariable ["ownerPUID",_ownerID,true];
 				if (_lockable == 3) then {
-					_friendsArr = [[([player] call FNC_GetPlayerUID),(name player)]];
+					_friendsArr = [[_playerUID,(name player)]];
 					_object setVariable ["doorfriends", _friendsArr, true];
 					PVDZE_obj_Swap = [_objectCharacterID,_object,[_dir,_location,_ownerID,_vector],_classname,_obj,player,_friendsArr];
 				} else {

SQF/dayz_code/stringtable.xml

@@ -16196,23 +16196,23 @@
 			<Russian>Вы можете купить в снаряжение: оружия-%1, пистолетов-%2, инструментов-%3.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_MAGS_FULL">
-			<English>You can only buy %1 magazines in your gear.</English>
+			<English>You can only buy %1 magazines into your gear.</English>
 			<Russian>Вы можете купить предметов в снаряжение: %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_BAG_FULL">
-			<English>You can only buy %1 backpacks in your gear.</English>
+			<English>You can only buy %1 backpacks into your gear.</English>
 			<Russian>Вы можете купить рюкзаков в снаряжение: %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_VEHICLE_WEPS">
-			<English>You can only buy %1 weapons in your vehicle.</English>
+			<English>You can only buy %1 weapons into your vehicle.</English>
 			<Russian>Вы можете купить оружия в ваш автомобиль: %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_VEHICLE_MAGS">
-			<English>You can only buy %1 magazines in your vehicle.</English>
+			<English>You can only buy %1 magazines into your vehicle.</English>
 			<Russian>Вы можете купить предметов в ваш автомобиль: %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_VEHICLE_BAGS">
-			<English>You can only buy %1 backpacks in your vehicle.</English>
+			<English>You can only buy %1 backpacks into your vehicle.</English>
 			<Russian>Вы можете купить рюкзаков в ваш транспорт: %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_NEED_BAG">
@@ -16223,15 +16223,15 @@
 			<English>Total backpack space exceeded.</English>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_BAG_WEPS">
-			<English>Only %1 weapons fit in the backpack.</English>
+			<English>Only %1 weapons will fit into your backpack.</English>
 			<Russian>В рюкзак поместится оружия: %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_BAG_MAGS">
-			<English>Only %1 mags fit in the backpack.</English>
+			<English>Only %1 mags will fit into your backpack.</English>
 			<Russian>В рюкзак поместится предметов: %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_BAG_BAGS">
-			<English>Only %1 bags fit in the backpack.</English>
+			<English>Only %1 bags will fit into your backpack.</English>
 			<Russian>В рюкзак поместится рюкзаков: %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_BUY_IN_BACKPACK">
@@ -16257,19 +16257,19 @@
 			<Russian>Продажа завершена.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_BUY_SUCCESS">
-			<English>Trade successfull, paid:%1.</English>
+			<English>Trade successfull, you paid:%1.</English>
 			<Russian>Продано! С вас %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_SELL_SUCCESS">
-			<English>Trade successfull, received:%1.</English>
+			<English>Trade successfull, you received:%1.</English>
 			<Russian>Продажа завершена. Получено:%1</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_SUCCESS_COINS">
-			<English>Trade successfull, paid %1 %2.</English>
+			<English>Trade successfull, you paid %1 %2.</English>
 			<Russian>Продано! С вас %1 %2.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_SUCCESS_CHANGE">
-			<English>Trade successfull, received %1 %2</English>
+			<English>Trade successfull, you received %1 %2</English>
 			<Russian>Продажа завершена. Получено %1 %2</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_DEBUG">
@@ -16307,7 +16307,7 @@
 			<Russian>Выбрано: %1</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_BUYING_IN">
-			<English>Buying in %1.</English>
+			<English>Buying into %1.</English>
 			<Russian>Покупка в %1.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_SELLING_FROM">
@@ -16343,12 +16343,12 @@
 			<Russian>ОШИБКА: Требуется денег: %1 %2 !</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST">
-			<English>Already on the list</English>
+			<English>That user is already on the list</English>
 			<Russian>Уже в списке друзей</Russian>
 			<German>Schon auf der Liste</German>
 		</Key>
 		<Key ID="STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_FRIENDLIMIT">
-			<English>Only %1 friends allowed</English>
+			<English>Only %1 friends are allowed</English>
 			<Russian>Можно добавить друзей: %1</Russian>
 			<German>Nur %1 Freunde erlaubt</German>
 		</Key>