From a89a42079bc63e89659ad113177260a934b21a9f Mon Sep 17 00:00:00 2001
From: maisvendoo <maisvendoo@gmail.com>
Date: Thu, 3 Oct 2019 23:57:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=201.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cfg/settings.xml                                       | 2 +-
 cfg/vehicles/IMR_pass_rzd-11100/IMR_pass_rzd-11100.xml | 2 +-
 cfg/vehicles/IMR_pass_rzd-13819/IMR_pass_rzd-13819.xml | 2 +-
 cfg/vehicles/IMR_pass_rzd-16733/IMR_pass_rzd-16733.xml | 2 +-
 cfg/vehicles/IMR_pass_rzd-17669/IMR_pass_rzd-17669.xml | 2 +-
 cfg/vehicles/IMR_pass_rzd-25924/IMR_pass_rzd-25924.xml | 2 +-
 cfg/vehicles/vl60pk-1543/3SL-2M.xml                    | 2 +-
 cfg/vehicles/vl60pk-1543/brakes-init.xml               | 2 ++
 setup/setup.iss                                        | 4 ++--
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cfg/settings.xml b/cfg/settings.xml
index b7e99910..c51a4878 100644
--- a/cfg/settings.xml
+++ b/cfg/settings.xml
@@ -22,6 +22,6 @@
 		<ReconnectInterval>1000</ReconnectInterval>
 		<MotionBlur>0.05</MotionBlur>
 		<NotifyLevel>INFO</NotifyLevel>
-		<ViewDistance>5000.0</ViewDistance>
+		<ViewDistance>1000.0</ViewDistance>
 	</Viewer>                
 </Config>
\ No newline at end of file
diff --git a/cfg/vehicles/IMR_pass_rzd-11100/IMR_pass_rzd-11100.xml b/cfg/vehicles/IMR_pass_rzd-11100/IMR_pass_rzd-11100.xml
index 6ae2ea5d..09972928 100644
--- a/cfg/vehicles/IMR_pass_rzd-11100/IMR_pass_rzd-11100.xml
+++ b/cfg/vehicles/IMR_pass_rzd-11100/IMR_pass_rzd-11100.xml
@@ -6,7 +6,7 @@
 		<PayloadMass>4000</PayloadMass>
 		<Length>25.0</Length>
 		<WheelDiameter>0.95</WheelDiameter>
-		<MainResist>default</MainResist>
+		<MainResist>passcar</MainResist>
 		<NumAxis>4</NumAxis>		
 		<DegreesOfFreedom>5</DegreesOfFreedom>
                 <WheelInertia>2.0</WheelInertia>
diff --git a/cfg/vehicles/IMR_pass_rzd-13819/IMR_pass_rzd-13819.xml b/cfg/vehicles/IMR_pass_rzd-13819/IMR_pass_rzd-13819.xml
index da3ee371..10a5ef66 100644
--- a/cfg/vehicles/IMR_pass_rzd-13819/IMR_pass_rzd-13819.xml
+++ b/cfg/vehicles/IMR_pass_rzd-13819/IMR_pass_rzd-13819.xml
@@ -6,7 +6,7 @@
 		<PayloadMass>4000</PayloadMass>
 		<Length>25.0</Length>
 		<WheelDiameter>0.95</WheelDiameter>
-		<MainResist>default</MainResist>
+		<MainResist>passcar</MainResist>
 		<NumAxis>4</NumAxis>		
 		<DegreesOfFreedom>5</DegreesOfFreedom>
                 <WheelInertia>2.0</WheelInertia>
diff --git a/cfg/vehicles/IMR_pass_rzd-16733/IMR_pass_rzd-16733.xml b/cfg/vehicles/IMR_pass_rzd-16733/IMR_pass_rzd-16733.xml
index 7b80594c..e67e9d2e 100644
--- a/cfg/vehicles/IMR_pass_rzd-16733/IMR_pass_rzd-16733.xml
+++ b/cfg/vehicles/IMR_pass_rzd-16733/IMR_pass_rzd-16733.xml
@@ -6,7 +6,7 @@
 		<PayloadMass>4000</PayloadMass>
 		<Length>25.0</Length>
 		<WheelDiameter>0.95</WheelDiameter>
-		<MainResist>default</MainResist>
+		<MainResist>passcar</MainResist>
 		<NumAxis>4</NumAxis>		
 		<DegreesOfFreedom>5</DegreesOfFreedom>
                 <WheelInertia>2.0</WheelInertia>
diff --git a/cfg/vehicles/IMR_pass_rzd-17669/IMR_pass_rzd-17669.xml b/cfg/vehicles/IMR_pass_rzd-17669/IMR_pass_rzd-17669.xml
index 6efa7117..449b10b7 100644
--- a/cfg/vehicles/IMR_pass_rzd-17669/IMR_pass_rzd-17669.xml
+++ b/cfg/vehicles/IMR_pass_rzd-17669/IMR_pass_rzd-17669.xml
@@ -6,7 +6,7 @@
 		<PayloadMass>4000</PayloadMass>
 		<Length>25.0</Length>
 		<WheelDiameter>0.95</WheelDiameter>
-		<MainResist>default</MainResist>
+		<MainResist>passcar</MainResist>
 		<NumAxis>4</NumAxis>		
 		<DegreesOfFreedom>5</DegreesOfFreedom>
                 <WheelInertia>2.0</WheelInertia>
diff --git a/cfg/vehicles/IMR_pass_rzd-25924/IMR_pass_rzd-25924.xml b/cfg/vehicles/IMR_pass_rzd-25924/IMR_pass_rzd-25924.xml
index 56c22d9f..e9e5a33a 100644
--- a/cfg/vehicles/IMR_pass_rzd-25924/IMR_pass_rzd-25924.xml
+++ b/cfg/vehicles/IMR_pass_rzd-25924/IMR_pass_rzd-25924.xml
@@ -6,7 +6,7 @@
 		<PayloadMass>4500</PayloadMass>
 		<Length>25.0</Length>
 		<WheelDiameter>0.95</WheelDiameter>
-		<MainResist>default</MainResist>
+		<MainResist>passcar</MainResist>
 		<NumAxis>4</NumAxis>		
 		<DegreesOfFreedom>5</DegreesOfFreedom>
                 <WheelInertia>2.0</WheelInertia>
diff --git a/cfg/vehicles/vl60pk-1543/3SL-2M.xml b/cfg/vehicles/vl60pk-1543/3SL-2M.xml
index db0e5d6b..4a4f4193 100644
--- a/cfg/vehicles/vl60pk-1543/3SL-2M.xml
+++ b/cfg/vehicles/vl60pk-1543/3SL-2M.xml
@@ -4,7 +4,7 @@
 		<Order>2</Order>
 		
 		<MaxSpeed>150</MaxSpeed>
-		<WearGap>1.0</WearGap>
+		<WearGap>0.0</WearGap>
 		<SoundSpeed>2.0</SoundSpeed>
 		<FreqCoeff>2.0</FreqCoeff>
 
diff --git a/cfg/vehicles/vl60pk-1543/brakes-init.xml b/cfg/vehicles/vl60pk-1543/brakes-init.xml
index d9d2fac9..405da454 100644
--- a/cfg/vehicles/vl60pk-1543/brakes-init.xml
+++ b/cfg/vehicles/vl60pk-1543/brakes-init.xml
@@ -20,6 +20,8 @@
 		<!-- Состояние устройства блокировки тормозов 
 		(1 - разблокирована, 0 - заблокирована) -->
 		<BrakeLockDevice>1</BrakeLockDevice>
+
+		<CombineCranePos>0</CombineCranePos>
 		
 	</BrakesState>
 </Config>
\ No newline at end of file
diff --git a/setup/setup.iss b/setup/setup.iss
index 3972e8f8..45041d9b 100644
--- a/setup/setup.iss
+++ b/setup/setup.iss
@@ -65,8 +65,8 @@ Source: "{#SdkDir}\*.*"; DestDir: "{app}\sdk"; Flags: ignoreversion recursesubdi
 Source: "{#ThemesDir}\*.*"; DestDir: "{app}\themes"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#FontsDir}\*.*"; DestDir: "{app}\fonts"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#DocsDir}\*.*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#RRS_DEV_ROOT}\LICENSE"; DestDir: "{app}\LICENSE"; Flags: ignoreversion
-Source: "{#RRS_DEV_ROOT}\LICENSE-Russian"; DestDir: "{app}\LICENSE-Russian"; Flags: ignoreversion
+Source: "{#RRS_DEV_ROOT}\LICENSE"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#RRS_DEV_ROOT}\LICENSE-Russian"; DestDir: "{app}"; Flags: ignoreversion
 
 
 [Icons]