alysbrooks-public/games/isometric-park-fna Commit - r553:da13ec49a1f1

alysbrooks-public » games » isometric-park-fna

Commit `r553:da13ec49a1f1` public

parent | child

Description:

Calculate surrounding cells for preserve.

Commit status:

[Not Reviewed]

References:

m6-tiles-and-trees

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r553:da13ec49a1f1 - Mon, 14 Mar 2022 05:44:38

isometric-park-fna/Engines/SimulationBridgeEngine.cs ¶ +16 -3

                          decimal new_misc_amount = 0M;
                          // decimal new_upkeep_amount = 0M;
-             	    this.simulation.PreserveCells.Clear();
+             	    // this.simulation.PreserveCells.Clear();
+             	    var preserve_cells = new HashSet<isometricparkfna.CellMap.Cell>();
+             	    var count = 0;
              	    foreach (ref readonly var entity in ReadEntities<PreserveComponent>()) {
              		ref readonly var areaComponent = ref GetComponent<AreaComponent>(entity);
              		foreach (var square in areaComponent.squares) {
-             			this.simulation.PreserveCells.Add(this.simulation.map.cells[(int)square.X][(int)square.Y]);
+             			preserve_cells.Add(this.simulation.map.cells[(int)square.X][(int)square.Y]);
              		}
+             	    }
+             	    for (int i = 0; i < this.simulation.PreserveCounts.GetLength(0); i++) {
+             		    for (int j = 0; j < this.simulation.PreserveCounts.GetLength(0); j++) {
+             			    count = 0;
+             			    foreach (var cell in this.simulation.map.iterate_neighbor_cells(i, j)) {
+             				    if (preserve_cells.Contains(cell)) {
+             					    count++;
+             				    }
+             			    }
+             			    this.simulation.PreserveCounts[i, j]  = count;
+             		    }
              	    }
                          foreach (ref readonly var entity in ReadEntities<BudgetLineComponent>())

isometric-park-fna/Renderers/AreaRenderer.cs ¶ +1 -1

                      public override void Render()
                      {
-                         var budgetWindow = new BudgetWindow(new Budget { }, this.font, 0, 0);
+                         var budgetWindow = new BudgetWindow(new Budget {}, this.font, 0, 0);
                          foreach (ref readonly var entity in ReadEntities<AreaComponent>())
                          {

isometric-park-fna/Simulation.cs ¶ +18 -10

                      public CellMap map;
-                     public HashSet<Cell> PreserveCells;
+                     // public HashSet<Cell> PreserveCells;
+                     public int[,] PreserveCounts;
                      public int ticksPerAdvance;
                      private float lastAdvance;
                          this.BridgeEngine = new SimulationBridgeEngine(this);
-                         this.PreserveCells = new HashSet<Cell>();
+                         // this.PreserveCells = new HashSet<Cell>();
+                         this.PreserveCounts = new int[this.map.MapWidth, this.map.MapHeight];
                      }
                      private void advanceSimulation()
                          this.BridgeEngine.addTick();
-                         foreach (Cell cell in this.map.iterate_cells())
+                         // foreach (Cell cell in this.map.iterate_cells())
+                         for(int i = 0; i < this.map.MapWidth; i++)
                          {
-                             if (random.NextDouble() > (this.PreserveCells.Contains(cell) ? PRESERVE_SPONTANEOUS_NEW_TREE_CHANCE : SPONTANEOUS_NEW_TREE_CHANCE ))
+                             for(int j = 0; j < this.map.MapHeight; j++)
                              {
-                                 var random_type = random.Next(0, 4);
-                                 cell.AddTree(this.DateTime, (TreeType)random_type);
+                                 var cell = this.map.cells[i][j];
+                                 if (random.NextDouble() > (this.PreserveCounts[i, j] > 0 ? PRESERVE_SPONTANEOUS_NEW_TREE_CHANCE : SPONTANEOUS_NEW_TREE_CHANCE ))
+                                 {
+                                     var random_type = random.Next(0, 4);
+                                     cell.AddTree(this.DateTime, (TreeType)random_type);
+                                 }
                              }
                          }
                          foreach (var (x, y) in this.map.iterate_cell_locations_with_neighbors(4))
                          {
                              var neighbor = this.map.iterate_neighbors(x, y).First();
-                             var cell = this.map.cells[x][y];
-                             if (random.NextDouble() > (this.PreserveCells.Contains(cell) ? PRESERVE_NEIGHBOR_NEW_TREE_CHANCE : NEIGHBOR_NEW_TREE_CHANCE ))
+                             if (random.NextDouble() > (this.PreserveCounts[x, y] > 0 ? PRESERVE_NEIGHBOR_NEW_TREE_CHANCE : NEIGHBOR_NEW_TREE_CHANCE ))
                              {
+                                 var cell = this.map.cells[x][y];
                                  var random_type = random.Next(0, 4);
                                  cell.AddTree(this.DateTime, neighbor.Type);
                                  new_planted += 1;
                          }
                          int crowded_out = 0;
-                         foreach (Cell cell in this.map.iterate_cells_with_neighbors(7))
+                         foreach (var (x, y) in this.map.iterate_cell_locations_with_neighbors(7))
                          {
-                             if (random.NextDouble() > (this.PreserveCells.Contains(cell) ? PRESERVE_NEIGHBOR_CROWDS_TREE_CHANCE : NEIGHBOR_CROWDS_TREE_CHANCE ) )
+                             if (random.NextDouble() > (this.PreserveCounts[x, y] > 0 ? PRESERVE_NEIGHBOR_CROWDS_TREE_CHANCE : NEIGHBOR_CROWDS_TREE_CHANCE ) )
                              {
+                                 var cell = this.map.cells[x][y];
                                  cell.MarkTreeDead();
                                  crowded_out += 1;
                              }

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

r553:da13ec49a1f1 - Mon, 14 Mar 2022 05:44:38

Sign in to your account

Commit r553:da13ec49a1f1 public

Author

r553:da13ec49a1f1 - Mon, 14 Mar 2022 05:44:38

Commit `r553:da13ec49a1f1` public