alysbrooks-public/games/isometric-park-fna Commit - r535:0d56136b7883

alysbrooks-public » games » isometric-park-fna

Commit `r535:0d56136b7883` public

parent | child

Description:

Clean up some constants and add comments.

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

r535:0d56136b7883 - Mon, 07 Feb 2022 00:24:03

isometric-park-fna/CellMap.cs ¶ +24 -5

             using System;
             using System.Collections.Generic;
             namespace isometricparkfna
                     public int ZoneHeight = 10;
-                    public int MapMultiplier; //Adjusts for larger maps.
+                    //These coefficients modify values I set based on the original 50x50 maps.
+                    //Eventually I'll probably allow for multiple map sizes, so instead of changing those constants,
+                    //I'm adding a multiplier based on the size of the map.
+                    //
+                    //What's the difference between these two multipliers?
+                    //If you double the sides of the map, the linear multiplier is 2,
+                    //but the area multiplier is 4 (2 x 2).
+                    public int LinearMultiplier;
+                    public int AreaMultiplier;
                     public int tree_count
                     {
                         this.cells = new List<List<Cell>>();
-                        this.MapMultiplier = (int)(((this.MapWidth / 50) + (this.MapHeight / 50)) / 2);
+                        this.LinearMultiplier = (int)(((this.MapWidth / 50) + (this.MapHeight / 50)) / 2);
+                        this.AreaMultiplier = (int)((this.MapWidth * this.MapHeight) / (50 * 50));
                         for (int i = 0; i < height; i++)
                         {
                         return MathUtils.BetweenExclusive(x, 0, MapWidth - 1) && MathUtils.BetweenExclusive(y, 0, MapHeight - 1);
                     }
-                    public System.Collections.Generic.IEnumerable<Cell> iterate_neighbors(int x, int y)
+                    public System.Collections.Generic.IEnumerable<Cell> iterate_neighbor_cells(int x, int y)
                     {
                         //iterates over neighbors (clockwise starting at noon/midnight)
                         if (inBounds(x, y + 1))
                         }
                     }
+                    public System.Collections.Generic.IEnumerable<Cell> iterate_neighbors(int x, int y)
+                    {
+                        foreach (Cell neighbor in this.iterate_neighbor_cells(x, y))
+                        {
+                            if (neighbor.HasTree) {
+                                yield return neighbor;
+                            }
+                        }
+                    }
                     private int countNeighbors(int x, int y)
                     {
                         int count = 0;
-                        foreach (Cell neighbor in this.iterate_neighbors(x, y))
+                        foreach (Cell neighbor in this.iterate_neighbor_cells(x, y))
                         {
                             if (neighbor.HasTree) {
                                 count++;

isometric-park-fna/Engines/Spawners/ContractSpawner.cs ¶ +5 -8

                     private int MapWidth;
                     private int MapHeight;
-                    private int MapMultiplier; //Adjustment factor for larger maps
                     private Simulation simulation;
                     private Grammar grammar;
                         this.simulation = simulation;
                         this.grammar = grammar;
-                        this.MapMultiplier = this.simulation.map.MapMultiplier;
                     }
                     private Vector2 FindStart(HashSet<Vector2> occupied_squares)
                     {
                         var squares_to_add = new HashSet<Vector2>();
                         var attempts = 0;
-                        var maxAttempts = max_size * this.MapMultiplier * 10;
+                        var maxAttempts = max_size * this.simulation.map.LinearMultiplier * 10;
                         while (squares.Count < max_size)
                         {
                         var image_index = random_generator.Next(1, 7);
                         int max_squares = (organization_type, message.min_squares) switch {
-                            (OrganizationType.Family, null) => random_generator.Next(50, 100 * this.MapMultiplier),
+                            (OrganizationType.Family, null) => random_generator.Next(50, 100 * this.simulation.map.LinearMultiplier),
-                                (OrganizationType.LargeCorporation, null) => random_generator.Next(90, 250 * this.MapMultiplier),
+                                (OrganizationType.LargeCorporation, null) => random_generator.Next(90, 250 * this.simulation.map.LinearMultiplier),
-                                (OrganizationType.Cooperative, null) => random_generator.Next(50, 75 * this.MapMultiplier),
+                                (OrganizationType.Cooperative, null) => random_generator.Next(50, 75 * this.simulation.map.LinearMultiplier),
-                                (_, null) => random_generator.Next(DEFAULT_MIN_SQUARES, DEFAULT_SQUARES * this.MapMultiplier),
+                                (_, null) => random_generator.Next(DEFAULT_MIN_SQUARES, DEFAULT_SQUARES * this.simulation.map.LinearMultiplier),
                                 _ => (message.max_squares == 0) ? DEFAULT_SQUARES : message.max_squares
                         };

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

                     public const int MAX_TREES_TO_PLANT = 25;
                     public const int MAX_TREES_TO_CLEAR = 25;
+                    public const decimal STARTING_FUNDS = 100_000M;
                     public SimulationBridgeEngine BridgeEngine { get; private set; }
                     public decimal Subsidy {
                         this.DateTime = new DateTime(START_YEAR, START_MONTH, START_DAY);
                         this.map = new CellMap(width, height);
-                        this.money = 100000M;
+                        this.money = STARTING_FUNDS;
                         this.millisecondsPerAdvance = millisecondsPerAdvance;
                         this.paused = true;

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

r535:0d56136b7883 - Mon, 07 Feb 2022 00:24:03

Sign in to your account

Commit r535:0d56136b7883 public

Author

r535:0d56136b7883 - Mon, 07 Feb 2022 00:24:03

Commit `r535:0d56136b7883` public