From: melchior Date: Sun, 5 Jul 2020 23:36:50 +0000 (-0400) Subject: Fixes for Translocator, and Coordinate format change for POI TSV file X-Git-Tag: PR7.3~1 X-Git-Url: http://git.osdn.net/view?p=automap%2Fautomap.git;a=commitdiff_plain;h=08c37e7d8a466bbbd00ff085e913c744a206855e Fixes for Translocator, and Coordinate format change for POI TSV file --- diff --git a/Automap/Designators/DefaultDesignators.cs b/Automap/Designators/DefaultDesignators.cs index b4f6d30..d4ac56a 100644 --- a/Automap/Designators/DefaultDesignators.cs +++ b/Automap/Designators/DefaultDesignators.cs @@ -170,11 +170,11 @@ namespace Automap StringBuilder textTarget = new StringBuilder(); //translocatorEntity.GetBlockInfo(clientAPI.World.Player, textTarget); - - textTarget.Append(te.Activated ? "Online " : "offline "); - textTarget.Append(" Dest.: "); - textTarget.Append(te.TargetLocation != null ? te.TargetLocation.PrettyCoords(clientAPI) : "???");//Or ABS coords? - + textTarget.Append(te.FullyRepaired ? "Functional " : "Broken "); + textTarget.Append(te.Activated ? "Online " : "Offline "); + textTarget.Append(" Target: "); + textTarget.Append(te.TargetLocation != null ? "Set" : "Invalid");//Or ABS coords? + textTarget.AppendFormat(" Range ({0} ~ {1})", te.MinTeleporterRangeInBlocks, te.MaxTeleporterRangeInBlocks); poi.AddReplace( new PointOfInterest { diff --git a/Automap/Subsystems/AutomapSystem.cs b/Automap/Subsystems/AutomapSystem.cs index 8bbb0c1..6636ea9 100644 --- a/Automap/Subsystems/AutomapSystem.cs +++ b/Automap/Subsystems/AutomapSystem.cs @@ -395,7 +395,7 @@ namespace Automap using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8)) { - tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\t"); + tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\tDestination"); foreach (var point in this.POIs) { tsvWriter.Write(point.Name + "\t"); @@ -406,6 +406,7 @@ namespace Automap tsvWriter.Write(notes + "\t"); tsvWriter.Write(point.Location.PrettyCoords(ClientAPI) + "\t"); tsvWriter.Write(point.Timestamp.ToString("u") + "\t"); + tsvWriter.Write((point.Destination != null ? point.Destination.PrettyCoords(ClientAPI) : "---") +"\t"); tsvWriter.WriteLine(); } foreach (var entity in this.EOIs) @@ -418,6 +419,7 @@ namespace Automap tsvWriter.Write(notes + "\t"); tsvWriter.Write(entity.Location.PrettyCoords(ClientAPI) + "\t"); tsvWriter.Write(entity.Timestamp.ToString("u") + "\t"); + tsvWriter.Write("n/a\t"); tsvWriter.WriteLine(); } tsvWriter.WriteLine();