alysbrooks-public/games/isometric-park-fna Commit - r607:200264937666

alysbrooks-public » games » isometric-park-fna

Commit `r607:200264937666` public

parent | child

Description:

Draw water at the base tile level.

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

r607:200264937666 - Mon, 25 Jul 2022 06:36:51

isometric-park-fna/CellMap.cs ¶ +11 0

                 public class CellMap
                 {
                     public List<List<Cell>> cells;
+                    public List<Vector2> WaterCells;
                     //Defaults; overridden by settings from FNAGame in practice:
                     public int MapWidth = 50;
                     public int MapHeight = 50;
                         this.cells = new List<List<Cell>>();
+                        //Cached:
+                        this.WaterCells = new List<Vector2>();
                         this.LinearMultiplier = (int)(((this.MapWidth / 50) + (this.MapHeight / 50)) / 2);
                         this.AreaMultiplier = (int)((this.MapWidth * this.MapHeight) / (50 * 50));
                             }
                         }
+                        public Boolean HasWater {
+                            get {
+                                return this.Status == CellStatus.Water;
+                            }
+                        }
                         public DateTime Planted;
                         public void AddTree(DateTime datetime, TreeType type) {

isometric-park-fna/Engines/Spawners/GameSpawner.cs ¶ +5 -2

                             var squares_to_add = new HashSet<Vector2>();
                             var odds = 0.50;
-                            while (water_squares.Count < 50) {
+                            var water_size = random_generator.Next(50, 250);
+                            while (water_squares.Count < water_size) {
                                 foreach (var square in water_squares)
                                 {
                                     foreach (var new_square in new[] {new Vector2(square.X + 1, square.Y),
                                 water_squares.AddRange(squares_to_add);
                                 squares_to_add.Clear();
                             }
+                            this.simulation.map.WaterCells.AddRange(water_squares);
                             foreach (var square in water_squares) {
                                 this.simulation.map.cells[(int)square.X][(int)square.Y].AddWater();
                             foreach (Cell cell in row)
                             {
                                 var next = this.random_generator.NextDouble();
-                                if (next > 0.75)
+                                if (next > 0.75 && !cell.HasWater)
                                 {
                                     int random_year = (int)MathHelper.Clamp((float)MathUtils.NextNormal(random_generator, 2010.0f, 40.0f), 1800, Simulation.START_YEAR);
                                     int random_month = random_generator.Next(1, 13);

isometric-park-fna/FNAGame.cs ¶ +28 -9

                              && MathUtils.BetweenExclusive(original.Y, -Tile.TileSpriteHeight, FNAGame.height)));
                 }
                 //Convenience method I'm not super sure about anymore.
-                protected void drawTileAt(int x, int y, int tileIndex, int height, Color color)
+                protected void drawTileAt(int x, int y, int tileIndex, int height, Color color, SpriteBatch batch)
                 {
                     float maxdepth = ((this.squaresAcross + 1) + ((this.squaresDown + 1) * Tile.TileWidth)) * 10;
                     float depthOffset = 0.7f - ((x + (y * Tile.TileWidth)) / maxdepth);
-                    Tile.drawTileAt(this.tileBatch, x, y, tileIndex, height, depthOffset, color);
+                    Tile.drawTileAt(batch, x, y, tileIndex, height, depthOffset, color);
+                }
+                protected void drawTileAt(int x, int y, int tileIndex, int height, Color color) {
+                    drawTileAt(x, y, tileIndex, height, Color.White, this.tileBatch);
                 }
                 protected void drawTileAt(int x, int y, int tileIndex, int height) {
                 }
                 protected void drawWaterTileAt(int x, int y, int height) {
+                    drawWaterTileAt(x, y, height, this.tileBatch);
+                }
+                protected void drawWaterTileAt(int x, int y, int height, SpriteBatch batch) {
                     var tile_index = 85;
                     var cells = this.simulation.map.cells;
                     //Unfortunately this is tileset dependent and pretty awkward to type out :(
                     var northwest = cells[x-1][y].Status == CellStatus.Water;
                        tile_index = 101;
                     }
+                    drawTileAt(x, y, tile_index, height, Color.White, batch);
-                    drawTileAt(x, y, tile_index, height, Color.White);
                 }
                         //reset
                         this.tilesDrawn = 0;
+                        /*
                         var scale_factor = 1;
                         var x_adjust = scale_factor > 1 ? -scale_factor : 0;
                         var y_adjust = scale_factor > 1 ? -scale_factor/2 : 0;
                                 this.tilesDrawn++;
                                 // }
                             }
+                        }*/
+                        for (int i = 0; i < this.simulation.map.MapHeight; i++)
+                        {
+                            for (int j = 0; j < this.simulation.map.MapWidth; j += 1)
+                            {
+                                    drawTileAt(i, j, 1, 1, Color.White, batch);
+                                this.tilesDrawn++;
+                            }
+                        }
+                        foreach (var cell  in this.simulation.map.WaterCells) {
+                            drawWaterTileAt((int)cell.X, (int)cell.Y, 1, batch);
                         }
                         batch.End();
                         stopWatch2.Stop();
                                         drawTileAt(i, j, 141, 2);
                                         // System.Console.WriteLine(String.Format("Drew Dead Tree at {0},{1}", i, j));
                                     }
-                                    else if (this.simulation.map.cells[i][j].Status == CellStatus.Water) {
+                                    // else if (this.simulation.map.cells[i][j].Status == CellStatus.Water) {
-                                        drawWaterTileAt(i, j, 1);
+                                    //     drawWaterTileAt(i, j, 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

r607:200264937666 - Mon, 25 Jul 2022 06:36:51

Sign in to your account

Commit r607:200264937666 public

Author

r607:200264937666 - Mon, 25 Jul 2022 06:36:51

Commit `r607:200264937666` public