Description:
Show a random selection of three stories, rather than one of each.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
| @@ -5,7 +5,6 | |||
|
|
5 | 5 | }, |
|
|
6 | 6 | "projects": { |
|
|
7 | 7 | "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": { |
|
|
8 | "version": "1.0.0", | |
|
|
9 | 8 | "restore": { |
|
|
10 | 9 | "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj", |
|
|
11 | 10 | "projectName": "FNA", |
| @@ -54,7 +53,9 | |||
|
|
54 | 53 | } |
|
|
55 | 54 | }, |
|
|
56 | 55 | "frameworks": { |
|
|
57 |
"net45": { |
|
|
|
56 | "net45": { | |
|
|
57 | "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json" | |
|
|
58 | } | |
|
|
58 | 59 | } |
|
|
59 | 60 | } |
|
|
60 | 61 | } |
| @@ -7,7 +7,7 | |||
|
|
7 | 7 | <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot> |
|
|
8 | 8 | <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders> |
|
|
9 | 9 | <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> |
|
|
10 |
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5. |
|
|
|
10 | <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion> | |
|
|
11 | 11 | </PropertyGroup> |
|
|
12 | 12 | <PropertyGroup> |
|
|
13 | 13 | <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> |
| @@ -62,7 +62,9 | |||
|
|
62 | 62 | } |
|
|
63 | 63 | }, |
|
|
64 | 64 | "frameworks": { |
|
|
65 |
"net45": { |
|
|
|
65 | "net45": { | |
|
|
66 | "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json" | |
|
|
67 | } | |
|
|
66 | 68 | } |
|
|
67 | 69 | } |
|
|
68 | 70 | } No newline at end of file |
| @@ -1,8 +1,8 | |||
|
|
1 | 1 | { |
|
|
2 | 2 | "version": 2, |
|
|
3 | "dgSpecHash": "3AWDv+MZriwMxBTBDorp8FiSvyrXQqppePDYsTfATqNGlipF/pJObt6DcBo8NzTLP21oSN3cyqBrcDukFLx64w==", | |
|
|
3 | "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==", | |
|
|
4 | 4 | "success": true, |
|
|
5 |
"projectFilePath": "/ |
|
|
|
5 | "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", | |
|
|
6 | 6 | "expectedPackageFiles": [], |
|
|
7 | 7 | "logs": [] |
|
|
8 | 8 | } No newline at end of file |
| @@ -79,6 +79,16 | |||
|
|
79 | 79 | human_adjective1: "#human-adjectives#" |
|
|
80 | 80 | human_adjective2: "#human-adjectives#" |
|
|
81 | 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 | 92 | - hed: "Secrets of the #subject_sea#" |
|
|
83 | 93 | |
|
|
84 | 94 | contents: "The waters of the #subject_sea# are #evaluation_adjectives#, almost |
| @@ -212,9 +212,9 | |||
|
|
212 | 212 | { |
|
|
213 | 213 | this.newsItems.AddRange(NewsItem.FromYaml(sr.ReadToEnd())); |
|
|
214 | 214 | } |
|
|
215 | this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList(); | |
|
|
215 | this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList().Shuffle(); | |
|
|
216 | 216 | |
|
|
217 |
|
|
|
|
217 | this.remainingDialog = new Queue<Node<DialogOption>>(); | |
|
|
218 | 218 | |
|
|
219 | 219 | #if DEBUG |
|
|
220 | 220 | this.remainingDialog.Enqueue(DialogTrees.flatten(DialogTrees.testTree, this.grammar)); |
| @@ -901,9 +901,6 | |||
|
|
901 | 901 | |
|
|
902 | 902 | if (this.showNews) |
|
|
903 | 903 | { |
|
|
904 | ||
|
|
905 | ||
|
|
906 | ||
|
|
907 | 904 | NewsWindow.Render(ref this.showNews, debugWindow.monoFont, this.simulation, this.newsItems); |
|
|
908 | 905 | } |
|
|
909 | 906 | |
| @@ -93,7 +93,7 | |||
|
|
93 | 93 | |
|
|
94 | 94 | if (ImGui.BeginTabBar("Sources", 0)) { |
|
|
95 | 95 | if (ImGui.BeginTabItem("Wire")) { |
|
|
96 | foreach (NewsItem story in content.Where( s => (s.source == "Wire" ) )) { | |
|
|
96 | foreach (NewsItem story in content.Where( s => (s.source == "Wire" ) ).Take(3)) { | |
|
|
97 | 97 | if (ImGui.TreeNode(story.hed)) { |
|
|
98 | 98 | ImGui.TextWrapped(story.contents); |
|
|
99 | 99 | ImGui.TreePop(); |
| @@ -103,7 +103,7 | |||
|
|
103 | 103 | } |
|
|
104 | 104 | ImGui.EndTabItem(); |
|
|
105 | 105 | if (ImGui.BeginTabItem("The Naturalist")) { |
|
|
106 | foreach (NewsItem story in content.Where( s => (s.source == "Arborist" ) )) { | |
|
|
106 | foreach (NewsItem story in content.Where( s => (s.source == "Arborist" ) ).Take(3)) { | |
|
|
107 | 107 | if (ImGui.TreeNode(story.hed)) { |
|
|
108 | 108 | ImGui.TextWrapped(story.contents); |
|
|
109 | 109 | ImGui.TreePop(); |
| @@ -112,7 +112,7 | |||
|
|
112 | 112 | ImGui.EndTabItem(); |
|
|
113 | 113 | } |
|
|
114 | 114 | if (ImGui.BeginTabItem("All True News")) { |
|
|
115 | foreach (NewsItem story in content.Where( s => (s.source == "True" ) )) { | |
|
|
115 | foreach (NewsItem story in content.Where( s => (s.source == "True" ) ).Take(3)) { | |
|
|
116 | 116 | if (ImGui.TreeNode(story.hed)) { |
|
|
117 | 117 | ImGui.TextWrapped(story.contents); |
|
|
118 | 118 | ImGui.TreePop(); |
| @@ -43,6 +43,7 | |||
|
|
43 | 43 | <Compile Include="FilledRectangle.cs" /> |
|
|
44 | 44 | <Compile Include="Simulation.cs" /> |
|
|
45 | 45 | <Compile Include="Utils\MathUtils.cs" /> |
|
|
46 | <Compile Include="Utils\Extensions.cs" /> | |
|
|
46 | 47 | <Compile Include="Utils\Node.cs" /> |
|
|
47 | 48 | <Compile Include="UI\BudgetWindow.cs" /> |
|
|
48 | 49 | <Compile Include="UI\DebugWindow.cs" /> |
You need to be logged in to leave comments.
Login now