alysbrooks-public/games/isometric-park-fna Commit - r127:bb85edc4862a

FNA/bin/Debug/FNA.dll ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

FNA/bin/Debug/FNA.pdb ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

FNA/obj/Debug/FNA.csproj.CoreCompileInputs.cache ¶ +1 -1

	@@ -1,1 +1,1
	1	d7f0e37253a74f9e09b0aa45e63a243a5e7640d5		1	ccf73b859df7dddc357676bd95436a0b13bdd512

FNA/obj/Debug/FNA.dll ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

FNA/obj/Debug/FNA.pdb ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.pdb ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.dll ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.pdb ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache ¶ +1 -1

	@@ -1,1 +1,1
	1	4365fd40af26f6a84e18b3f7cc9703f84189efab		1	eb53a31a465d1700585a27323fb9618e935e3337

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.dll ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.pdb ¶ binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.dgspec.json ¶ +3 -2

               },
               "projects": {
                 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
-                  "version": "1.0.0",
                   "restore": {
                     "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
                     "projectName": "FNA",
                     }
                   },
                   "frameworks": {
-                    "net45": {}
+                    "net45": {
+                      "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
+                    }
                   }
                 }
               }

SpriteFontPlus/src/obj/SpriteFontPlus.FNA.csproj.nuget.g.props ¶ +1 -1

                 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot>
                 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders>
                 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-                <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.1.0</NuGetToolVersion>
+                <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
               </PropertyGroup>
               <PropertyGroup>
                 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>

SpriteFontPlus/src/obj/project.assets.json ¶ +3 -1

                   }
                 },
                 "frameworks": {
-                  "net45": {}
+                  "net45": {
+                    "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
+                  }
                 }
               }
             }

SpriteFontPlus/src/obj/project.nuget.cache ¶ +2 -2

             {
               "version": 2,
-              "dgSpecHash": "3AWDv+MZriwMxBTBDorp8FiSvyrXQqppePDYsTfATqNGlipF/pJObt6DcBo8NzTLP21oSN3cyqBrcDukFLx64w==",
+              "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==",
               "success": true,
-              "projectFilePath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
+              "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
               "expectedPackageFiles": [],
               "logs": []
             }

isometric-park-fna/Content/news_items.yaml ¶ +10 0

@@ -79,6 +79,16
79	human_adjective1: "#human-adjectives#"	79	human_adjective1: "#human-adjectives#"
80	human_adjective2: "#human-adjectives#"	80	human_adjective2: "#human-adjectives#"
81	human_adjective3: "#human-adjectives#"	81	human_adjective3: "#human-adjectives#"
		82	- hed: "All about the #subject_species#"
		83	contents: ""
		84	source: "Arborist"
		85	variables:
		86	subject_species: "#tree_species#"
		87	- hed: "Flowers for #maleCodedName#"
		88	contents: ""
		89	source: "Arborist"
		90	variables:
		91	subject_species: "#tree_species#"
82	- hed: "Secrets of the #subject_sea#"	92	- hed: "Secrets of the #subject_sea#"
83		93
84	contents: "The waters of the #subject_sea# are #evaluation_adjectives#, almost	94	contents: "The waters of the #subject_sea# are #evaluation_adjectives#, almost

isometric-park-fna/FNAGame.cs ¶ +2 -5

                 {
                     this.newsItems.AddRange(NewsItem.FromYaml(sr.ReadToEnd()));
                 }
-            	this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList();
+            	this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList().Shuffle();
-                    this.remainingDialog = new Queue<Node<DialogOption>>();
+                this.remainingDialog = new Queue<Node<DialogOption>>();
             #if DEBUG
                     this.remainingDialog.Enqueue(DialogTrees.flatten(DialogTrees.testTree, this.grammar));
                     if (this.showNews)
                     {
                         NewsWindow.Render(ref this.showNews, debugWindow.monoFont, this.simulation, this.newsItems);
                     }

isometric-park-fna/UI/NewsWindow.cs ¶ +3 -3

                                     if (ImGui.BeginTabBar("Sources", 0)) {
                                             if (ImGui.BeginTabItem("Wire")) {
-                                                    foreach (NewsItem story in content.Where( s => (s.source == "Wire" ) )) {
+                                                    foreach (NewsItem story in content.Where( s => (s.source == "Wire" ) ).Take(3)) {
                                                             if (ImGui.TreeNode(story.hed)) {
                                                                     ImGui.TextWrapped(story.contents);
                                                                     ImGui.TreePop();
                                             }
                                             ImGui.EndTabItem();
                                             if (ImGui.BeginTabItem("The Naturalist")) {
-                                                    foreach (NewsItem story in content.Where( s => (s.source == "Arborist" ) )) {
+                                                    foreach (NewsItem story in content.Where( s => (s.source == "Arborist" ) ).Take(3)) {
                                                             if (ImGui.TreeNode(story.hed)) {
                                                                     ImGui.TextWrapped(story.contents);
                                                                     ImGui.TreePop();
                                                     ImGui.EndTabItem();
                                             }
                                             if (ImGui.BeginTabItem("All True News")) {
-                                                    foreach (NewsItem story in content.Where( s => (s.source == "True" ) )) {
+                                                    foreach (NewsItem story in content.Where( s => (s.source == "True" ) ).Take(3)) {
                                                             if (ImGui.TreeNode(story.hed)) {
                                                                     ImGui.TextWrapped(story.contents);
                                                                     ImGui.TreePop();

isometric-park-fna/isometric-park-fna.csproj ¶ +1 0

                 <Compile Include="FilledRectangle.cs" />
                 <Compile Include="Simulation.cs" />
                 <Compile Include="Utils\MathUtils.cs" />
+                <Compile Include="Utils\Extensions.cs" />
                 <Compile Include="Utils\Node.cs" />
                 <Compile Include="UI\BudgetWindow.cs" />
                 <Compile Include="UI\DebugWindow.cs" />

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r127:bb85edc4862a - Mon, 15 Mar 2021 06:54:36

Sign in to your account

Commit r127:bb85edc4862a public

Author

r127:bb85edc4862a - Mon, 15 Mar 2021 06:54:36

Commit `r127:bb85edc4862a` public