diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -21,12 +21,15 @@ msbuild -restore:True ${FRAMEWORK_SOLUTION} -p:Configuration=Debug -run-core-debug: +run-core-debug: cd isometric-park-fna/bin/Debug/netcoreapp3.1; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="/Users/alys/repos/isometric-park-fna/fnalibs/osx" dotnet ./isometric-park-fna.dll -run-core-release: +run-core-release: cd isometric-park-fna/bin/Release/netcoreapp3.1; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="/Users/alys/repos/isometric-park-fna/fnalibs/osx" dotnet ./isometric-park-fna.dll +# lint: +# yamllint -d relaxed isometric-park-fna/Content/news_items.yaml + #CONVENIENCE # Just using framework for releases since I know it works for now: diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index b1aadf3307e53889f912658f1636bb20dc243b06..90204bffad9a6dc2d757fc908f2da3a7f3e3ee2b GIT binary patch literal 38685 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 ROcLjd1cF?sLk83>{tv?4AUFU3 diff --git a/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.dgspec.json b/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.dgspec.json --- a/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.dgspec.json +++ b/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.dgspec.json @@ -32,7 +32,7 @@ "/usr/share/dotnet/sdk/NuGetFallbackFolder" ], "configFilePaths": [ - "/home/alys/.nuget/NuGet/NuGet.Config" + "/home/alys/.config/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net45" @@ -42,7 +42,6 @@ }, "frameworks": { "net45": { - "targetAlias": "net45", "projectReferences": { "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": { "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj" @@ -57,19 +56,8 @@ } }, "frameworks": { - "net45": { - "targetAlias": "net45", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies": { - "suppressParent": "All", - "target": "Package", - "version": "[1.0.0, )", - "autoReferenced": true - } - }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/5.0.201/RuntimeIdentifierGraph.json" - } + "net45": {} } } } -} +} \ No newline at end of file diff --git a/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.props b/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.props --- a/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.props +++ b/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.props @@ -7,13 +7,9 @@ /home/alys/.nuget/packages/ /home/alys/.nuget/packages/;/usr/share/dotnet/sdk/NuGetFallbackFolder PackageReference - 5.9.0 + 5.6.0 - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.targets b/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.targets --- a/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.targets +++ b/SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.targets @@ -3,7 +3,4 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - \ No newline at end of file diff --git a/SpriteFontPlus/src/obj/project.assets.json b/SpriteFontPlus/src/obj/project.assets.json --- a/SpriteFontPlus/src/obj/project.assets.json +++ b/SpriteFontPlus/src/obj/project.assets.json @@ -639,4 +639,4 @@ } } } -} +} \ No newline at end of file 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 @@ -10,4 +10,4 @@ "/usr/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg.sha512" ], "logs": [] -} +} \ No newline at end of file diff --git a/isometric-park-fna/Content/grammar.json b/isometric-park-fna/Content/grammar.json --- a/isometric-park-fna/Content/grammar.json +++ b/isometric-park-fna/Content/grammar.json @@ -194,7 +194,7 @@ "Wadden Sea" ], - "admin-areas": [ + "admin-area": [ "Cimişlia", "Ngatpang", "Cova Lima", "Tébessa", "North", "Chin", "Plateaux", "Buriram", "Auvergne-Rhône-Alpes", "Štore", "Il-Fontana", "Guanajuato", "Turkana", "T'bilisi", "Västernorrland", "Cotai", "Lima", "Poltava Oblast", @@ -1337,6 +1337,8 @@ "digital artist", "photographer", "basoonist", "singer-songwriter", "epic poet", "historian", "watercolorist", "author", "documentarian", "biographer"], + "environmental_problem": ["climate change", "deforestation", "global warming", + "wildfires", "invasive species"], "large_number": ["billions", "millions", "tens of millions", "hundreds of millions"], "secrets_etc": ["mysteries", "secrets", "enigmas"], "many": ["#large_number# of", "many", "numerous"], diff --git a/isometric-park-fna/Content/news_items.yaml b/isometric-park-fna/Content/news_items.yaml --- a/isometric-park-fna/Content/news_items.yaml +++ b/isometric-park-fna/Content/news_items.yaml @@ -105,3 +105,13 @@ subject_sea: "#seas#" object1: "#object#" object2: "#object#" +- hed: "How the people of #subject_area.capitalize# are fighting #subject_problem.capitalize#" + contents: "#femaleCodedName# #surname#, an #occupation#, stares out at the wilderness of #subject_area#. + + Like many places, it has not been spared by #subject_problem#." + source: "Arborist" + variables: + subject_problem: "#environmental_problem#" + subject_area: "#admin-area#" + subject_person_first: "#femaleCodedName#" + subject_person_last: "#surname#" diff --git a/isometric-park-fna/Sources.md b/isometric-park-fna/Sources.md --- a/isometric-park-fna/Sources.md +++ b/isometric-park-fna/Sources.md @@ -23,6 +23,7 @@ * large_number * occupation * many +* problem [dariusk-sport]: https://github.com/dariusk/corpora/blob/master/data/sports/sports.json [dariusk-objects]: https://github.com/dariusk/corpora/blob/master/data/objects/objects.json