# HG changeset patch # User Alys Brooks # Date 2022-11-27 23:26:30 # Node ID 165a4d8c9174991eb09bec9055ded04405221f22 # Parent f9401e682f4b865de42e2ffce4476fa66af728c8 Add little ponds and improve water status messages. No longer render water cells as "Water Oak." (Oak is the value of the enum when set to zero.) diff --git a/isometric-park-fna/Engines/Spawners/GameSpawner.cs b/isometric-park-fna/Engines/Spawners/GameSpawner.cs --- a/isometric-park-fna/Engines/Spawners/GameSpawner.cs +++ b/isometric-park-fna/Engines/Spawners/GameSpawner.cs @@ -92,6 +92,13 @@ } } + for (int i = 0; i < Simulation.NUM_PONDS; i++) { + var water_x = this.random_generator.Next(0, this.simulation.map.MapWidth); + var water_y = this.random_generator.Next(0, this.simulation.map.MapHeight); + this.simulation.map.WaterCells.Add(new Vector2(water_x, water_y)); + this.simulation.map.cells[water_x][water_y].AddWater(); + Logging.Info(String.Format("Adding water at {0},{1}", water_x, water_y)); + } #endregion @@ -112,9 +119,6 @@ cell.AddTree(random_date, (TreeType)random_type); } - // else if (next > 0.625) { - // cell.AddWater(); - // } } } #endregion diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -894,11 +894,15 @@ if (MathUtils.BetweenExclusive(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.BetweenExclusive(this.mouseGrid.Y, -1, this.simulation.map.MapHeight)) { - var treeStatus = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].Status; + var cellStatus = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].Status; var treeStatusAdjective = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].StatusAdjective; var treeType = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].TypeName; var useStatus = this.CurrentStatus(); - if (treeStatus != CellStatus.Clear) + if (cellStatus == CellStatus.Water) { + + status_left = String.Format("{0:},{1:} Water ({2})", this.mouseGrid.X, this.mouseGrid.Y, useStatus); + } + else if (cellStatus != CellStatus.Clear) { status_left = String.Format("{0:},{1:} {2} {3} ({4})", this.mouseGrid.X, this.mouseGrid.Y, treeStatusAdjective, diff --git a/isometric-park-fna/Simulation.cs b/isometric-park-fna/Simulation.cs --- a/isometric-park-fna/Simulation.cs +++ b/isometric-park-fna/Simulation.cs @@ -73,6 +73,7 @@ public const decimal STARTING_FUNDS = 100_000M; public const int NUM_WATER_FEATURES = 5; + public const int NUM_PONDS = 12; public SimulationBridgeEngine BridgeEngine { get; private set; }