diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache index fa583116edf1dfeb60f3c50d140933201a36585a..7dcce0e548e46b90764d6354561e1e2dd771f572 GIT binary patch literal 137 zc$^FHc6a1rU|`6Y`Lft-vc#^t2G_eM*SatqnQarhm({N558oPxa1XnEtqg<#BM{5z ihZd(673(MFR2J*&<&~zVmgpBGCTAz6rxxqu(+mI~z8cH` diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index d271a987f2fa2633776c1cb4ae13575c7d89b696..19d8f0dc064423116c7daf5990c0adab93ee406a GIT binary patch literal 20937 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 1.0.0", - "Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0" - ], - ".NETStandard,Version=v2.0": [ - "FNA >= 1.0.0", - "NETStandard.Library >= 2.0.3" + "FNA >= 1.0.0" ] }, "packageFolders": { @@ -558,37 +31,26 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", + "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", "projectName": "SpriteFontPlus", - "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", + "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", "packagesPath": "/Users/alys/.nuget/packages/", "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/", "projectStyle": "PackageReference", - "crossTargeting": true, "configFilePaths": [ - "/Users/alys/.nuget/NuGet/NuGet.Config" + "/Users/alys/.config/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ - "net45", - "netstandard2.0" + "net45" ], "sources": { "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net45": { - "targetAlias": "net45", "projectReferences": { - "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": { - "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj" - } - } - }, - "netstandard2.0": { - "targetAlias": "netstandard2.0", - "projectReferences": { - "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": { - "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj" + "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": { + "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj" } } } @@ -601,38 +63,7 @@ }, "frameworks": { "net45": { - "targetAlias": "net45", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies": { - "suppressParent": "All", - "target": "Package", - "version": "[1.0.0, )", - "autoReferenced": true - } - }, - "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.202/RuntimeIdentifierGraph.json" - }, - "netstandard2.0": { - "targetAlias": "netstandard2.0", - "dependencies": { - "NETStandard.Library": { - "suppressParent": "All", - "target": "Package", - "version": "[2.0.3, )", - "autoReferenced": true - } - }, - "imports": [ - "net461", - "net462", - "net47", - "net471", - "net472", - "net48" - ], - "assetTargetFallback": true, - "warn": true, - "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.202/RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json" } } } diff --git a/SpriteFontPlus/src/obj/project.nuget.cache b/SpriteFontPlus/src/obj/project.nuget.cache --- a/SpriteFontPlus/src/obj/project.nuget.cache +++ b/SpriteFontPlus/src/obj/project.nuget.cache @@ -1,13 +1,8 @@ { "version": 2, - "dgSpecHash": "3R9WDhpmDP/ybl/9zAzE/8D8e7oHOYnPI6vqSMFXlQArdzsXsOcO+zrPKGiDeMip0lN4Lm30Wumk1II5bYeXkA==", + "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==", "success": true, - "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", - "expectedPackageFiles": [ - "/Users/alys/.nuget/packages/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "/Users/alys/.nuget/packages/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg.sha512", - "/Users/alys/.nuget/packages/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg.sha512", - "/Users/alys/.nuget/packages/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg.sha512" - ], + "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", + "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/isometric-park-fna/Engines/Spawners/ContractSpawner.cs b/isometric-park-fna/Engines/Spawners/ContractSpawner.cs --- a/isometric-park-fna/Engines/Spawners/ContractSpawner.cs +++ b/isometric-park-fna/Engines/Spawners/ContractSpawner.cs @@ -77,7 +77,7 @@ if (attempts >= maxAttempts && squares.Count < max_size) { - System.Console.WriteLine(string.Format("Failed to generate enough squares. {0} were requested, only {1} were found ({2} attempts)", max_size, squares.Count, attempts)); + Logging.Warning(string.Format("Failed to generate enough squares. {0} were requested, only {1} were found ({2} attempts)", max_size, squares.Count, attempts)); break; } } @@ -87,9 +87,11 @@ protected override void Spawn(in SpawnContractMessage message) { + //for now: var occupied = new List(); + foreach (var (entity, status) in ReadEntities().SelectWhereF((e) => (e, GetComponent(e)), (e) => (e.Item2.status != ContractStatus.Expired)) ) @@ -101,6 +103,9 @@ var start_x = random_generator.Next(0, 50); var start_y = random_generator.Next(0, 50); + Logging.Spy(start_x, nameof(start_x)); + Logging.Spy(new {start_x}); + int max_squares = (message.max_squares == 0) ? DEFAULT_SQUARES : message.max_squares; int min_squares = (message.min_squares == null) ? DEFAULT_MIN_SQUARES : (int)message.min_squares; Vector2[] squares = (message.squares == null) ? CreateArea(start_x, start_y, max_squares, new HashSet(occupied)) : message.squares; diff --git a/isometric-park-fna/Logging.cs b/isometric-park-fna/Logging.cs --- a/isometric-park-fna/Logging.cs +++ b/isometric-park-fna/Logging.cs @@ -15,7 +15,8 @@ Success, Info, Debug, - Trace + Trace, + Spy } public class Logging @@ -32,6 +33,8 @@ {LogLevel.Info, (ConsoleColor.White, ConsoleColor.Black)}, {LogLevel.Debug, (ConsoleColor.White, ConsoleColor.Blue)}, {LogLevel.Trace, (ConsoleColor.White, ConsoleColor.DarkGray)}, + {LogLevel.Spy, (ConsoleColor.Black, ConsoleColor.White)}, + }; @@ -130,5 +133,30 @@ Logging.Log_(LogLevel.Trace, message, lineNumber, caller, path); } + + public static void Spy(object value, + string name, + [CallerLineNumber] int lineNumber = 0, + [CallerMemberName] string caller = null, + [CallerFilePath] string path = "" + + ) + { + string message = string.Format("{0} ({1}) = {2}", + value.GetType().ToString(), name, value.ToString()); + Logging.Log_(LogLevel.Spy, message, lineNumber, caller, path); + } + + public static void Spy(T value, + [CallerLineNumber] int lineNumber = 0, + [CallerMemberName] string caller = null, + [CallerFilePath] string path = "" + + ) where T : class + { + string message = string.Format("{0} = {1}", + value.ToString(), typeof(T).GetProperties()[0].ToString() ); + Logging.Log_(LogLevel.Spy, message, lineNumber, caller, path); + } } }