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

              	this.newsItems = newItems.ToList();
-                 using (var sr = new StreamReader(@"Content/news_items.yaml"))
+                 {
-                     this.newsItems.AddRange(NewsItem.FromYaml(sr.ReadToEnd()));
+                 }
-                 using (var sr_pregenerated = new StreamReader(@"Content/news_items_pregenerated.yaml"))
+                 {
-                     this.newsItems.AddRange(NewsItem.FromYaml(sr_pregenerated.ReadToEnd()));
+                 }
-             	this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList().Shuffle();
+             	using (var sr = new StreamReader(@"Content/news_items.yaml"))
+             	{
+             		this.newsItems.AddRange(NewsItem.FromYaml(sr.ReadToEnd()));
+             	}
+             	using (var sr_pregenerated = new StreamReader(@"Content/news_items_pregenerated.yaml"))
+             	{
+             		this.newsItems.AddRange(NewsItem.FromYaml(sr_pregenerated.ReadToEnd()));
+             	}
+             	this.simulation.LoadContent(this.newsItems, this.grammar);
+             	// this.newsItems = this.newsItems.Select(s => s.Flatten(this.grammar)).ToList().Shuffle();
                  this.remainingDialog = new Queue<Node<DialogOption>>();
                      if (this.showNews)
                      {
-                         NewsWindow.Render(ref this.showNews, debugWindow.monoFont, this.simulation, this.newsItems);
+                         NewsWindow.Render(ref this.showNews, debugWindow.monoFont, this.simulation);
                      }
              		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

                      }
-             		public static bool Between(int val, int x, int y)
+             		{
-             			return ((x < val && val < y) || (y < val && val < x));
+             	public static bool Between(int val, int x, int y)
+             	{
+             		return ((x < val && val < y) || (y < val && val < x));
+             	}
+             		}
+                     public static bool BetweenInclusive(float val, float x, float y)
+                     {
+                         return ((x <= val && val <= y) || (y <= val && val <= x));
+                     }
+             	public static bool BetweenInclusive(int val, int x, int y)
+             	{
+             		return ((x <= val && val <= y) || (y <= val && val <= x));
+             	}
              		public static int Clamp(int val, int min, int max)
                      {

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