Skip to content

Commit fb514f0

Browse files
DMagic1DMagic1
authored
Merge pull request #327 from DMagic1/release
Version 18.7
2 parents 73df75b + 99c9a03 commit fb514f0

File tree

7 files changed

+89
-56
lines changed

7 files changed

+89
-56
lines changed

‎SCANassets/Resources/Localization/ru/Contracts.cfg‎

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,56 @@
11
Localization
22
{
3-
ru
3+
ru //Tanslation made by RarogCmex
44
{
55
// *** Exceptional ***
66

7-
#autoLOC_SCANsat_exceptional0001 = Do a group of high resolution SCANsat surveys of @/targetBodyValid3.
8-
#autoLOC_SCANsat_exceptional0002 = Do a group of high resolution SCANsat surveys of @/targetBodyValid3.
9-
#autoLOC_SCANsat_exceptional0003 = Scanning can take place while the vessel is not loaded.
10-
#autoLOC_SCANsat_exceptional0004 = Perform several high resolution scans of @/targetBodyValid3
11-
#autoLOC_SCANsat_exceptional0005 = We now have a detailed map and survey for the surface of @/targetBodyValid3
12-
#autoLOC_SCANsat_exceptional0006 = Must have less than a 90% high resolution altimetry scan of the target body.
13-
#autoLOC_SCANsat_exceptional0007 = Must have less than a 90% ore scan of the target body.
14-
#autoLOC_SCANsat_exceptional0008 = Must have orbited the target body, or the target body must be next on the list.
7+
#autoLOC_SCANsat_exceptional0001 = Сделайте группу сканирований высокого разрешения методом SCANsat на @/targetBodyValid3.
8+
//Do a group of high resolution SCANsat surveys of @/targetBodyValid3.
9+
#autoLOC_SCANsat_exceptional0002 = Сделайте группу сканирований высокого разрешения методом SCANsat на @/targetBodyValid3.
10+
//Do a group of high resolution SCANsat surveys of @/targetBodyValid3.
11+
#autoLOC_SCANsat_exceptional0003 = Сканирование может происходить только когда судно не управляется игроком явно (не загружено).
12+
//Scanning can take place while the vessel is not loaded.
13+
#autoLOC_SCANsat_exceptional0004 = Выполните несколько сканирований высокого разрешения на @/targetBodyValid3
14+
//Perform several high resolution scans of @/targetBodyValid3
15+
#autoLOC_SCANsat_exceptional0005 = Мы получили детализированную карту и рельеф поверхности @/targetBodyValid3
16+
We now have a detailed map and survey for the surface of @/targetBodyValid3
17+
#autoLOC_SCANsat_exceptional0006 = Должно быть менее 90% альтиметрического сканирования поверхности цели с высоким разрешением.
18+
//Must have less than a 90% high resolution altimetry scan of the target body.
19+
#autoLOC_SCANsat_exceptional0007 = Должно быть менее 90% сканирования руды на поверхности цели.
20+
//Must have less than a 90% ore scan of the target body.
21+
#autoLOC_SCANsat_exceptional0008 = Должно быть на орбите цели, или цель должна быть следующей в списке.
22+
//Must have orbited the target body, or the target body must be next on the list.
1523

1624
// *** Significant ***
1725

18-
#autoLOC_SCANsat_significant_0001 = Do a group of SCANsat surveys of @/targetBodyValid2.
19-
#autoLOC_SCANsat_significant_0002 = Do a group of SCANsat surveys of @/targetBodyValid2.
20-
#autoLOC_SCANsat_significant_0003 = Scanning can take place while the vessel is not loaded.
21-
#autoLOC_SCANsat_significant_0004 = Perform several scans of @/targetBodyValid2
22-
#autoLOC_SCANsat_significant_0005 = Excellent work, these scans will provide much valuable data for our survey teams.
23-
#autoLOC_SCANsat_significant_0006 = Must have less than an 80% low resolution altimetry scan of the target body.
24-
#autoLOC_SCANsat_significant_0007 = Must have less than an 80% biome scan of the target body.
25-
#autoLOC_SCANsat_significant_0008 = Must have less than an 80% M700 resources scan of the target body.
26-
#autoLOC_SCANsat_significant_0009 = Must have orbited the target body.
26+
#autoLOC_SCANsat_significant_0001 = Сделайте группу сканирований методом SCANsat на @/targetBodyValid2.
27+
//Do a group of SCANsat surveys of @/targetBodyValid2.
28+
#autoLOC_SCANsat_significant_0002 = Сделайте группу сканирований методом SCANsat на @/targetBodyValid2.
29+
//Do a group of SCANsat surveys of @/targetBodyValid2.
30+
#autoLOC_SCANsat_significant_0003 = Сканирование может происходить только когда судно не управляется игроком явно (не загружено игроком).
31+
//Scanning can take place while the vessel is not loaded.
32+
#autoLOC_SCANsat_significant_0004 = Выполните несколько сканирований @/targetBodyValid2
33+
//Perform several scans of @/targetBodyValid2
34+
#autoLOC_SCANsat_significant_0005 = Отличная работа, эти сканирования предоставят много ценных данных для наших исследовательских групп.
35+
//Excellent work, these scans will provide much valuable data for our survey teams.
36+
#autoLOC_SCANsat_significant_0006 = Должно быть менее 80% альтиметрического сканирования цели с низким разрешением.
37+
//Must have less than an 80% low resolution altimetry scan of the target body.
38+
#autoLOC_SCANsat_significant_0007 = Должно быть менее 80% сканирования биома целевого тела.
39+
//Must have less than an 80% biome scan of the target body.
40+
#autoLOC_SCANsat_significant_0008 = Должно быть менее 80% ресурсов сканирования целевого тела.
41+
//Must have less than an 80% M700 resources scan of the target body.
42+
#autoLOC_SCANsat_significant_0009 = Должно быть на орбите цели.
43+
//Must have orbited the target body.
2744

2845
// *** Trivial ***
2946

30-
#autoLOC_SCANsat_trivial_0001 = Conduct @/scanReadString1 SCANsat survey of @/targetBodyValid1.
31-
#autoLOC_SCANsat_trivial_0002 = Conduct @/scanReadString1 SCANsat survey of @/targetBodyValid1.
32-
#autoLOC_SCANsat_trivial_0003 = Scanning can take place while the vessel is not loaded.
33-
#autoLOC_SCANsat_trivial_0004 = Perform a simple scan of @/targetBodyValid1
34-
#autoLOC_SCANsat_trivial_0005 = Excellent work, this simple survey will give our experts much to study.
35-
#autoLOC_SCANsat_trivial_0006 = Target is part of home system.
36-
#autoLOC_SCANsat_trivial_0007 = Must have scanned less than 70% of the target body.
47+
#autoLOC_SCANsat_trivial_0001 = Выполните @/scanReadString1 обзор методом SCANsat @/targetBodyValid1.
48+
#autoLOC_SCANsat_trivial_0002 = Выполните @/scanReadString1 обзор методом SCANsat @/targetBodyValid1.
49+
#autoLOC_SCANsat_trivial_0003 = Сканирование может происходить только когда судно не управляется игроком явно (не загружено игроком).
50+
#autoLOC_SCANsat_trivial_0004 = Выполните простое сканирование @/targetBodyValid1
51+
#autoLOC_SCANsat_trivial_0005 = Отличная работа, этот простой обзор даст нашим специалистам многое для изучения.
52+
#autoLOC_SCANsat_trivial_0006 = Цель-часть домашней системы.
53+
#autoLOC_SCANsat_trivial_0007 = Должно быть просканировано менее 70% цели.
54+
//Must have scanned less than 70% of the target body.
3755
}
3856
}

‎SCANassets/SCANsat.version‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"MAJOR":1,
1212
"MINOR":1,
1313
"PATCH":8,
14-
"BUILD":6
14+
"BUILD":7
1515
},
1616
"KSP_VERSION":{
1717
"MAJOR":1,
1818
"MINOR":4,
19-
"PATCH":3
19+
"PATCH":5
2020
},
2121
"KSP_VERSION_MIN":{
2222
"MAJOR":1,

‎SCANmechjeb/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.8.6.0")]
36-
[assembly: AssemblyFileVersion("1.8.6.0")]
37-
[assembly: AssemblyInformationalVersion ("v18.6")]
35+
[assembly: AssemblyVersion("1.8.7.0")]
36+
[assembly: AssemblyFileVersion("1.8.7.0")]
37+
[assembly: AssemblyInformationalVersion ("v18.7")]
3838

3939
[assembly: KSPAssembly ("SCANmechjeb", 0, 5)]
4040
[assembly: KSPAssemblyDependency ("SCANsat", 1, 8)]

‎SCANsat.Unity/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323
[assembly: Guid("0c523d04-a52e-48bb-85b6-d75e8b7a63b9")]
2424

25-
[assembly: AssemblyVersion("1.8.6.0")]
26-
[assembly: AssemblyFileVersion("1.8.6.0")]
25+
[assembly: AssemblyVersion("1.8.7.0")]
26+
[assembly: AssemblyFileVersion("1.8.7.0")]

‎SCANsat/CHANGELOG.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Version 18.7 - 2018-7-27
2+
-----------------------
3+
4+
- Update for KSP 1.4.5
5+
6+
- Fix lat/long display coordinates
7+
8+
19
Version 18.6 - 2018-4-30
210
-----------------------
311

‎SCANsat/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
1515
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
1616
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
17-
[assembly: AssemblyVersion ("1.8.6.0")]
18-
[assembly: AssemblyFileVersion ("1.8.6.0")]
19-
[assembly: AssemblyInformationalVersion ("v18.6")]
17+
[assembly: AssemblyVersion ("1.8.7.0")]
18+
[assembly: AssemblyFileVersion ("1.8.7.0")]
19+
[assembly: AssemblyInformationalVersion ("v18.7")]
2020

2121
[assembly: KSPAssembly ("SCANsat", 1, 8)]
2222

‎SCANsat/SCAN_UI/UI_Framework/SCANuiUtil.cs‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,17 @@ internal static void getMouseOverElevation(StringBuilder sb, double Lon, double
241241
}
242242
}
243243

244+
private const char WEST = 'W';
245+
private const char EAST = 'E';
246+
private const char SOUTH = 'S';
247+
private const char NORTH = 'N';
248+
private const char HOURS = '°';
249+
private const string MINUTES = "'";
250+
private const string SECONDS = "\"";
251+
244252
/* UI: conversions to and from DMS */
245253
/* FIXME: These do not belong here. And they are only used once! */
246-
private static string toDMS(double thing, string neg, string pos, int prec)
254+
private static string toDMS(double thing, char neg, char pos, int prec)
247255
{
248256
StringBuilder sb = SCANStringBuilderCache.Acquire();
249257

@@ -253,56 +261,55 @@ private static string toDMS(double thing, string neg, string pos, int prec)
253261
thing = Math.Abs(thing);
254262

255263
sb.Append(Math.Floor(thing).ToString());
256-
sb.Append("°");
264+
sb.Append(HOURS);
265+
thing = (thing - Math.Floor(thing)) * 60;
257266

258267
sb.Append(Math.Floor(thing).ToString());
259-
sb.Append("'");
268+
sb.Append(MINUTES);
269+
thing = (thing - Math.Floor(thing)) * 60;
260270

261271
sb.Append(thing.ToString(string.Format("F{0}", prec.ToString())));
262-
sb.Append("\"");
272+
sb.Append(SECONDS);
263273

264-
return sb.SCANToStringAndRelease();
274+
sb.Append(neg);
265275

266-
//string dms = "";
267-
//dms += Math.Floor(thing).ToString() + "°";
268-
//thing = (thing - Math.Floor(thing)) * 60;
269-
//dms += Math.Floor(thing).ToString() + "'";
270-
//thing = (thing - Math.Floor(thing)) * 60;
271-
//dms += thing.ToString("F" + prec.ToString()) + "\"";
272-
//dms += neg;
273-
//return dms;
276+
return sb.SCANToStringAndRelease();
274277
}
275278

276-
private static void toDMS(StringBuilder sb, double thing, string neg, string pos)
279+
private static void toDMS(StringBuilder sb, double thing, char neg, char pos)
277280
{
278281
if (thing >= 0)
279282
neg = pos;
280283

281284
thing = Math.Abs(thing);
282285

283286
sb.Append(Math.Floor(thing).ToString());
284-
sb.Append("°");
287+
sb.Append(HOURS);
288+
thing = (thing - Math.Floor(thing)) * 60;
285289

286290
sb.Append(Math.Floor(thing).ToString());
287-
sb.Append("'");
291+
sb.Append(MINUTES);
292+
thing = (thing - Math.Floor(thing)) * 60;
288293

289294
sb.Append(thing.ToString("F2"));
290-
sb.Append("\"");
295+
sb.Append(SECONDS);
296+
297+
sb.Append(neg);
291298
}
292299

293300
internal static string toDMS(double lat, double lon, int precision = 2)
294301
{
295-
return string.Format("{0} {1}", toDMS(lat, "S", "N", precision), toDMS(lon, "W", "E", precision));
302+
return string.Format("{0} {1}", toDMS(lat, SOUTH, NORTH, precision), toDMS(lon, WEST, EAST, precision));
296303
}
297304

298305
internal static void toDMS(StringBuilder sb, double lat, double lon)
299306
{
300-
toDMS(sb, lat, "S", "N");
307+
toDMS(sb, lat, SOUTH, NORTH);
301308
sb.Append(" ");
302-
toDMS(sb, lon, "W", "E");
309+
toDMS(sb, lon, WEST, EAST);
303310
}
304311

305-
internal static string distanceString(double dist, double cutoff, double cutoff2 = double.MaxValue)
312+
internal static string distanceString(double dist, double cutoff, double cutoff2 = double.MaxValue)
306313
{
307314
if (dist < cutoff)
308315
return string.Format("{0}m", dist.ToString("N1"));

0 commit comments

Comments
 (0)