alysbrooks-public/games/isometric-park-fna Commit - r145:16a78cafe246

alysbrooks-public » games » isometric-park-fna

Commit `r145:16a78cafe246` public

parent | child

Description:

Add updates.

Commit status:

[Not Reviewed]

References:

m2-procgen

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r145:16a78cafe246 - Mon, 22 Mar 2021 07:01:39

TODO.taskpaper ¶ +2 -2

             			- Write a small number of testing @done(2021-03-15)
             			- Write five stories for each source
             				- Arborist
-            				- Wire
+            				- Wire @done(2021-03-22)
             				- True
-            			- Figure out update interval
+            			- Figure out update interval @done(2021-03-22)
             		- Better NEWS tab
             			- Images for some stories
             			- More stories—a dozen for each source?

isometric-park-fna/FNAGame.cs ¶ +12 -10

@@ -208,15 +208,17
208		208
209	this.newsItems = newItems.ToList();	209	this.newsItems = newItems.ToList();
210		210
211	using (var sr = new StreamReader(@"Content/news_items.yaml"))	211	using (var sr = new StreamReader(@"Content/news_items.yaml"))
212	{	212	{
213	this.newsItems.AddRange(NewsItem.FromYaml(sr.ReadToEnd()));	213	this.newsItems.AddRange(NewsItem.FromYaml(sr.ReadToEnd()));
214	}	214	}
215	using (var sr_pregenerated = new StreamReader(@"Content/news_items_pregenerated.yaml"))	215	using (var sr_pregenerated = new StreamReader(@"Content/news_items_pregenerated.yaml"))
216	{	216	{
217	this.newsItems.AddRange(NewsItem.FromYaml(sr_pregenerated.ReadToEnd()));	217	this.newsItems.AddRange(NewsItem.FromYaml(sr_pregenerated.ReadToEnd()));
218	}	218	}
219	this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList().Shuffle();	219	this.simulation.LoadContent(this.newsItems, this.grammar);
		220	// this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList().Shuffle();
		221
220		222
221	this.remainingDialog = new Queue<Node<DialogOption>>();	223	this.remainingDialog = new Queue<Node<DialogOption>>();
222		224
@@ -905,7 +907,7
905		907
906	if (this.showNews)	908	if (this.showNews)
907	{	909	{
908	NewsWindow.Render(ref this.showNews, debugWindow.monoFont, this.simulation, ~~this~~.~~newsItems~~);	910	NewsWindow.Render(ref this.showNews, debugWindow.monoFont, this.simulation);
909	}	911	}
910		912
911	bool quit = false;	913	bool quit = false;

isometric-park-fna/Simulation.cs ¶ +34 -3

             using static isometricparkfna.CellMap;
             using System.Linq;
+            using isometricparkfna.UI; //purely for news item
+            using TraceryNet;
             namespace isometricparkfna
             {
                 public struct Budget
                         }
                     }
+                    private Grammar grammar;
+                    private List<NewsItem> sourceNewsItems;
+                    public List<NewsItem> latestNewsItems;
                     public float[] millisecondsPerAdvance { get; private set; }
                     public String Season { get
                         {
-                            if (MathUtils.Between(this.DateTime.Month, 3, 5))
+                            if (MathUtils.BetweenInclusive(this.DateTime.Month, 3, 5))
                             {
                                 return "Spring";
                             }
-                            else if (MathUtils.Between(this.DateTime.Month, 6, 8))
+                            else if (MathUtils.BetweenInclusive(this.DateTime.Month, 6, 8))
                             {
                                 return "Summer";
                             }
-                            else if (MathUtils.Between(this.DateTime.Month, 9, 11))
+                            else if (MathUtils.BetweenInclusive(this.DateTime.Month, 9, 11))
                             {
                                 return "Fall";
                             }
                     private void advanceSimulation()
                     {
+                        var oldSeason = this.Season;
                         this.DateTime = this.DateTime.AddMonths(1);
+                        var newSeason = this.Season;
+                        var seasonChanged = oldSeason != newSeason;
                         foreach (Cell cell in this.map.iterate_cells())
                         newBudget = this.applyBudget(newBudget); ;
                         this.budgets.Add(newBudget);
+                        if (seasonChanged) {
+                                this.updateNews();
+                        }
                     }
                     public Budget applyBudget(Budget budget)
                             this.currentRate = newRate;
                         }
                     }
+                    public void updateNews() {
+                            this.latestNewsItems = this.sourceNewsItems.Select(s => s.Flatten(this.grammar)).ToList().Shuffle();
+                    }
+                    public void LoadContent(List<NewsItem> sourceNewsItems, Grammar grammar) {
+                            this.sourceNewsItems = sourceNewsItems;
+                            this.grammar = grammar;
+                            this.updateNews();
+                    }
                     public void update(TimeSpan deltaTime)
                     {

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

                     public static class NewsWindow
                 {
-                    public static void Render(ref bool show, ImFontPtr font, Simulation sim, List<NewsItem> content)
+                    public static void Render(ref bool show, ImFontPtr font, Simulation sim)
                     {
                             if (show)
                             {
                                     ImGui.PushStyleColor(ImGuiCol.Text, new Num.Vector4(0f, 0f, 0f, 1f));
             			ImGui.SetNextWindowSize(new Num.Vector2(400, 400));
                                     ImGui.Begin("NEWS", ref show, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings);
+            			var content = sim.latestNewsItems;
                                     if (ImGui.BeginTabBar("Sources", 0)) {

isometric-park-fna/Utils/MathUtils.cs ¶ +16 -4

@@ -13,11 +13,23
13		13
14	}	14	}
15		15
16	public static bool Between(int val, int x, int y)	16	public static bool Between(int val, int x, int y)
17	{	17	{
18	return ((x < val && val < y) \|\| (y < val && val < x));	18	return ((x < val && val < y) \|\| (y < val && val < x));
		19
		20	}
19		21
20	}	22	public static bool BetweenInclusive(float val, float x, float y)
		23	{
		24	return ((x <= val && val <= y) \|\| (y <= val && val <= x));
		25
		26	}
		27
		28	public static bool BetweenInclusive(int val, int x, int y)
		29	{
		30	return ((x <= val && val <= y) \|\| (y <= val && val <= x));
		31
		32	}
21		33
22	public static int Clamp(int val, int min, int max)	34	public static int Clamp(int val, int min, int max)
23	{	35	{

Write
Preview

You need to be logged in to leave comments. Login now

	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

r145:16a78cafe246 - Mon, 22 Mar 2021 07:01:39

Sign in to your account

Commit r145:16a78cafe246 public

Author

r145:16a78cafe246 - Mon, 22 Mar 2021 07:01:39

Commit `r145:16a78cafe246` public