alysbrooks-public/games/isometric-park-fna Commit - r549:f1b00533ab6a

alysbrooks-public » games » isometric-park-fna

Commit `r549:f1b00533ab6a` public

parent | child

Description:

Spawn trees differently in preserves.

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

r549:f1b00533ab6a - Sun, 20 Feb 2022 09:29:39

isometric-park-fna/Engines/SimulationBridgeEngine.cs ¶ +14 -1

                         typeof(BudgetComponent),
                         typeof(BudgetLineComponent),
                         typeof(ContractStatusComponent),
-                        typeof(TreeDeltaComponent))]
+                        typeof(TreeDeltaComponent),
+             	   typeof(PreserveComponent))]
                  [Writes(typeof(BudgetComponent))]
                  public class SimulationBridgeEngine : Engine
                  {
                          decimal new_enforcement_amount = 0M;
                          decimal new_misc_amount = 0M;
                          // decimal new_upkeep_amount = 0M;
+             	    this.simulation.PreserveCells.Clear();
+             	    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]);
+             		}
+             	    }
                          foreach (ref readonly var entity in ReadEntities<BudgetLineComponent>())
                          {

isometric-park-fna/Engines/Spawners/ContractSpawner.cs ¶ +3 -1

                              Logging.Debug(String.Format("Creating contract {0} without organizations.", message.name ));
                          }
-                         foreach (var (entity, status) in ReadEntities<AreaComponent>().SelectWhereF((e) => (e, GetComponent<ContractStatusComponent>(e)), (e) => ((e.Item2.status != ContractStatus.Broken) && (e.Item2.status != ContractStatus.Rejected) && (e.Item2.status != ContractStatus.Expired)))) {
+                         foreach (var (entity, status) in ReadEntities<AreaComponent>()
+             			    .WhereF((e) => HasComponent<ContractStatusComponent>(e))
+             			    .SelectWhereF((e) => (e, GetComponent<ContractStatusComponent>(e)), (e) => ((e.Item2.status != ContractStatus.Broken) && (e.Item2.status != ContractStatus.Rejected) && (e.Item2.status != ContractStatus.Expired)))) {
                              var entitySquares = GetComponent<AreaComponent>(entity).squares;
                              occupied.AddRange(entitySquares);
                          }

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

                      private const float NEIGHBOR_NEW_TREE_CHANCE = 0.995f;
                      private const float NEIGHBOR_CROWDS_TREE_CHANCE = 0.995f;
+                     private const float PRESERVE_SPONTANEOUS_NEW_TREE_CHANCE = 0.995f;
+                     private const float PRESERVE_NEIGHBOR_NEW_TREE_CHANCE = 0.995f;
+                     private const float PRESERVE_NEIGHBOR_CROWDS_TREE_CHANCE = 0.9995f;
                      public const int TREE_PLANT_COST = 500;
                      public const int TREE_CLEAR_COST = 250;
                      public CellMap map;
+                     public HashSet<Cell> PreserveCells;
                      public int ticksPerAdvance;
                      private float lastAdvance;
                      public bool paused;
                          this.budgets = new List<Budget>();
                          this.BridgeEngine = new SimulationBridgeEngine(this);
+                         this.PreserveCells = new HashSet<Cell>();
                      }
                      private void advanceSimulation()
                          foreach (Cell cell in this.map.iterate_cells())
                          {
-                             if (random.NextDouble() > SPONTANEOUS_NEW_TREE_CHANCE)
+                             if (random.NextDouble() > (this.PreserveCells.Contains(cell) ? PRESERVE_SPONTANEOUS_NEW_TREE_CHANCE : SPONTANEOUS_NEW_TREE_CHANCE ))
                              {
                                  var random_type = random.Next(0, 4);
                                  cell.AddTree(this.DateTime, (TreeType)random_type);
                              var neighbor = this.map.iterate_neighbors(x, y).First();
                              var cell = this.map.cells[x][y];
-                             if (random.NextDouble() > NEIGHBOR_NEW_TREE_CHANCE)
+                             if (random.NextDouble() > (this.PreserveCells.Contains(cell) ? PRESERVE_NEIGHBOR_NEW_TREE_CHANCE : NEIGHBOR_NEW_TREE_CHANCE ))
                              {
                                  var random_type = random.Next(0, 4);
                                  cell.AddTree(this.DateTime, neighbor.Type);
                          int crowded_out = 0;
                          foreach (Cell cell in this.map.iterate_cells_with_neighbors(7))
                          {
-                             if (random.NextDouble() > NEIGHBOR_CROWDS_TREE_CHANCE)
+                             if (random.NextDouble() > (this.PreserveCells.Contains(cell) ? PRESERVE_NEIGHBOR_CROWDS_TREE_CHANCE : NEIGHBOR_CROWDS_TREE_CHANCE ) )
                              {
                                  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

r549:f1b00533ab6a - Sun, 20 Feb 2022 09:29:39

Sign in to your account

Commit r549:f1b00533ab6a public

Author

r549:f1b00533ab6a - Sun, 20 Feb 2022 09:29:39

Commit `r549:f1b00533ab6a` public