Commit: f5ba0cca3cc3904cc386bcbd37c3a2b1f8211e64 - automap (git)

Automap (client) [VS plugin mod]

Commit MetaInfo

• Revision: f5ba0cca3cc3904cc386bcbd37c3a2b1f8211e64 (tree)
• Time: 2020-02-20 09:59:46
• Author: melchior <melchior@user...>
• Commiter: melchior

Log Message

Adjusted notes GUI, POI/EOI JSON metadata added

Change Summary

• modified: Automap/Subsystems/AutomapGUIDialog.cs
• modified: Automap/Subsystems/AutomapSystem.cs
• modified: Automap/modinfo.json

Incremental Difference

--- a/Automap/Subsystems/AutomapGUIDialog.cs
+++ b/Automap/Subsystems/AutomapGUIDialog.cs
@@ -57,14 +57,14 @@ namespace Automap
 		txtStatusBounds.fixedHeight = 16;
 		txtStatusBounds.percentWidth = 1;
 
-		ElementBounds txtNoteArea = textBounds.CopyOffsetedSibling(20, 42, 1, 6);
-		txtNoteArea.fixedHeight = 24;
-		txtNoteArea.percentWidth = 25;
-		
 		ElementBounds btnNoteArea = textBounds.CopyOffsetedSibling(0, 42, 2, 5);
 		btnNoteArea.fixedHeight = 24;
 		btnNoteArea.fixedWidth = 20;
 
+		ElementBounds txtNoteArea = btnNoteArea.CopyOffsetedSibling(64, 0, 1, 6);
+		txtNoteArea.fixedHeight = 24;
+		txtNoteArea.fixedWidth = 256;
+
 
 		this.SingleComposer = capi.Gui.CreateCompo("automapControlPanel", dialogBounds)
 			.AddShadedDialogBG(bgBounds)
@@ -126,7 +126,7 @@ namespace Automap
 
 		capi.Event.PushEvent(AutomapSystem.AutomapCommandEventKey, noteCmd);
 		}
-		return true;//???
+		return false;//???
 		}
 
 		private void AutomapStatusMsg(string eventName, ref EnumHandling handling, IAttribute data)

--- a/Automap/Subsystems/AutomapSystem.cs
+++ b/Automap/Subsystems/AutomapSystem.cs
@@ -38,8 +38,8 @@ namespace Automap
 
 		private ConcurrentDictionary<Vec2i, uint> columnCounter = new ConcurrentDictionary<Vec2i, uint>(3, 150 );
 		private ColumnsMetadata chunkTopMetadata;
-		private PointsOfInterest POIs;
-		private EntitiesOfInterest EOIs;
+		private PointsOfInterest POIs = new PointsOfInterest();
+		private EntitiesOfInterest EOIs = new EntitiesOfInterest();
 
 		internal Dictionary<int, BlockDesignator> BlockID_Designators { get; private set;}
 		internal Dictionary<AssetLocation, EntityDesignator> Entity_Designators { get; private set; }
@@ -126,6 +126,9 @@ namespace Automap
 		//ClientAPI.TriggerChatMessage($"Automap {updatedChunksTotal} Updates - MAX (N:{chunkTopMetadata.North_mostChunk},S:{chunkTopMetadata.South_mostChunk},E:{chunkTopMetadata.East_mostChunk}, W:{chunkTopMetadata.West_mostChunk} - TOTAL: {chunkTopMetadata.Count})");
 		//#endif
 		}
+		else if (CurrentState == RunState.Snapshot) {
+		//TODO: Snapshot generator second thread...
+		}
 
 		}
 
@@ -217,8 +220,7 @@ namespace Automap
 
 		private void Prefill_POI_Designators( )
 		{
-		this.POIs = new PointsOfInterest( );
-		this.EOIs = new EntitiesOfInterest( );
+
 		this.BlockID_Designators = new Dictionary<int, BlockDesignator>( );
 		this.Entity_Designators = new Dictionary<AssetLocation, EntityDesignator>( );
 		this.RockIdCodes = Helpers.ArbitrarytBlockIdHunter(ClientAPI, new AssetLocation(GlobalConstants.DefaultDomain, "rock"), EnumBlockMaterial.Stone);
@@ -473,6 +475,7 @@ namespace Automap
 			{
 			jsonWriter.WriteLine("var worldSeedNum = {0};", ClientAPI.World.Seed);
 			jsonWriter.WriteLine("var genTime = new Date('{0}');", DateTimeOffset.UtcNow.ToString("O"));
+			jsonWriter.WriteLine("var startCoords = {{X:{0},Y:{1}}};", startChunkColumn.X, startChunkColumn.Y);
 			jsonWriter.WriteLine("var chunkSize = {0};", chunkSize);
 			jsonWriter.WriteLine("var northMostChunk ={0};", chunkTopMetadata.North_mostChunk);
 			jsonWriter.WriteLine("var southMostChunk ={0};", chunkTopMetadata.South_mostChunk);
@@ -484,23 +487,43 @@ namespace Automap
 				{
 				jsonWriter.Write("['{0}_{1}',", shard.Location.X, shard.Location.Y);
 				jsonWriter.Write("{");
-				jsonWriter.Write("ChunkAge : '{0}',", shard.ChunkAge);//World age - relative? or last edit ??
-				jsonWriter.Write("Temperature : {0},", shard.Temperature.ToString("F1"));
-				jsonWriter.Write("YMax : {0},", shard.YMax);
-				jsonWriter.Write("Fertility : {0},", shard.Fertility.ToString("F1"));
-				jsonWriter.Write("ForestDensity : {0},", shard.ForestDensity.ToString("F1"));
-				jsonWriter.Write("Rainfall : {0},", shard.Rainfall.ToString("F1"));
-				jsonWriter.Write("ShrubDensity : {0},", shard.ShrubDensity.ToString("F1"));
-				jsonWriter.Write("AirBlocks : {0},", shard.AirBlocks);
-				jsonWriter.Write("NonAirBlocks : {0},", shard.NonAirBlocks);
+				jsonWriter.Write("ChunkAge: '{0}',", shard.ChunkAge);//World age - relative? or last edit ??
+				jsonWriter.Write("Temperature: {0},", shard.Temperature.ToString("F1"));
+				jsonWriter.Write("YMax: {0},", shard.YMax);
+				jsonWriter.Write("Fertility: {0},", shard.Fertility.ToString("F1"));
+				jsonWriter.Write("ForestDensity: {0},", shard.ForestDensity.ToString("F1"));
+				jsonWriter.Write("Rainfall: {0},", shard.Rainfall.ToString("F1"));
+				jsonWriter.Write("ShrubDensity: {0},", shard.ShrubDensity.ToString("F1"));
+				jsonWriter.Write("AirBlocks: {0},", shard.AirBlocks);
+				jsonWriter.Write("NonAirBlocks: {0},", shard.NonAirBlocks);
 				//TODO: Heightmap
 				//TODO: Rock-ratio
 				jsonWriter.Write("}],");				
 				}
 			jsonWriter.Write("]);\n\n");
 
-		//TODO: POIs
+			
+			jsonWriter.Write("let pointsOfInterest = new Map([");
+			foreach (var poi in POIs) 
+				{
+					jsonWriter.Write("['{0}_{1}',", poi.Location.X, poi.Location.Y);
+					jsonWriter.Write("{");
+					jsonWriter.Write("notes: '{0}',", poi.Notes.Replace("'"," "));
+					jsonWriter.Write("timestamp : new Date('{0}'),", poi.Timestamp.ToString("O"));
+					jsonWriter.Write("chunkPos:'{0}_{1}',", (poi.Location.X/chunkSize), (poi.Location.Y/chunkSize));
+					jsonWriter.Write("}],");
+				}
 
+			foreach (var poi in EOIs.PointsList) 
+				{
+				jsonWriter.Write("['{0}_{1}',", poi.Location.X, poi.Location.Y);
+				jsonWriter.Write("{");
+				jsonWriter.Write("notes: '{0}',", poi.Notes.Replace("'", " "));
+				jsonWriter.Write("timestamp : new Date('{0}'),", poi.Timestamp.ToString("O"));
+				jsonWriter.Write("chunkPos:'{0}_{1}',", (poi.Location.X / chunkSize), (poi.Location.Y / chunkSize));
+				jsonWriter.Write("}],");
+				}
+			jsonWriter.Write("]);\n\n");
 
 		jsonWriter.Flush( );
 		}

--- a/Automap/modinfo.json
+++ b/Automap/modinfo.json
@@ -7,7 +7,7 @@
   "version": "0.1.2",
     "side":"Client",
   "dependencies": { 
-	"game": "1.11.0"	
+	"game": "1.12.0"	
   },
   "website": "http://nowebsite.nope"
 }
\ No newline at end of file