alysbrooks-public/games/isometric-park-fna Commit - r78:89c651b103f6

alysbrooks-public » games » isometric-park-fna

Commit `r78:89c651b103f6` public

parent | child

Description:

Toggle for Forest Policy plus more tweaks to crowding.

Commit status:

[Not Reviewed]

References:

m1-money

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r78:89c651b103f6 - Thu, 04 Feb 2021 07:24:35

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

             			this.showBudget = !this.showBudget;
             		}
+            		if (keyboardCur.IsKeyDown(Keys.F) && keyboardPrev.IsKeyUp(Keys.F))
+            		{
+            			this.showForest = !this.showForest;
+            		}
             		if (keyboardCur.IsKeyDown(Keys.C) && keyboardPrev.IsKeyUp(Keys.C))
             		{
             			this.camera.Jump(Vector2.Zero);
             		}
-            		if (keyboardCur.IsKeyDown(Keys.O) && keyboardPrev.IsKeyUp(Keys.O))
-            			this.simulation.tree_planting -= 1;
-            		if (keyboardCur.IsKeyDown(Keys.P) && keyboardPrev.IsKeyUp(Keys.P))
-            			this.simulation.tree_planting += 1;
             		if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift))
             		{
             			sound.Play(volume, pitch, pan);
                             ref this.simulation.paused, debugWindow.monoFont, this.currentNode);
                     }
-            		ForestWindow.Render(ref this.showForest, debugWindow.monoFont, this.simulation);
+            		if (this.showForest)
+            		{
+                        ForestWindow.Render(ref this.showForest, debugWindow.monoFont, this.simulation);
+            		}
                     _imGuiRenderer.AfterLayout();

isometric-park-fna/Simulation.cs ¶ +27 -16

                     private const float NEIGHBOR_NEW_TREE_CHANCE = 0.995f;
                     private const float NEIGHBOR_CROWDS_TREE_CHANCE = 0.995f;
-                    public const int TREE_PLANT_COST = 1000;
+                    public const int TREE_PLANT_COST = 750;
-                    public const int TREE_CLEAR_COST = 750;
+                    public const int TREE_CLEAR_COST = 500;
                     public int Tick
                     {
                             _tree_planting = MathUtils.Clamp(value, 0, 25);
                         }
                     }
-                    public int _tree_clearing = 5;
+                    public int _tree_clearing = 0;
                     public int tree_clearing
                     {
                         get {
                         }
                     }
+                    public int crowded_trees
+                    {
+                        get {
+                            return this.map.iterate_cells_with_neighbors(7).Where(c => c.hasTree).Count();
+                        }
+                    }
                     public float healthy_percent
                     {
                         get {
-                            return ((float)(this.map.tree_count - this.map.iterate_cells_with_neighbors(7).Count()) / this.map.tree_count) * 100;
+                            return (float)(this.map.tree_count - this.map.iterate_cells_with_neighbors(7).Where(c => c.hasTree).Count()) / this.map.tree_count * 100;
                         }
                     }
                         this.DateTime = this.DateTime.AddMonths(1);
                         foreach (Cell cell in this.map.iterate_cells())
                         {
                             if (random.NextDouble() > SPONTANEOUS_NEW_TREE_CHANCE)
                             }
                         }
+                        int new_planted = 0;
                         foreach (Cell cell in this.map.iterate_cells_with_neighbors(4))
                         {
                             if (random.NextDouble() > NEIGHBOR_NEW_TREE_CHANCE)
                             {
                                 cell.hasTree = true;
+                                new_planted += 1;
                             }
                         }
+                        System.Console.WriteLine(String.Format("New {0}", new_planted));
+                        int crowded_out = 0;
                         foreach (Cell cell in this.map.iterate_cells_with_neighbors(7))
                         {
                             if (random.NextDouble() > NEIGHBOR_CROWDS_TREE_CHANCE)
                             {
                                 cell.hasTree = false;
+                                crowded_out += 1;
                             }
                         }
+                        System.Console.Write(String.Format("Crowded {0}", crowded_out));
                         int trees_to_plant = this.tree_planting;
                             }
                         }
+                        // while (trees_to_clear > 0 && neigh.Current != null)
                         int trees_to_clear = this.tree_clearing;
+                        System.Console.Write(String.Format("Found {0}; ", this.map.iterate_cells_with_neighbors(7).Where(c => c.hasTree).Count()));
-                        IEnumerator<Cell> neigh = this.map.iterate_cells_with_neighbors(7).GetEnumerator();
+                        foreach (Cell cell in this.map.iterate_cells_with_neighbors(7).Where(c => c.hasTree))
-                        neigh.MoveNext();
-                        while (trees_to_clear > 0 && neigh.Current != null)
                         {
-                            Cell current = neigh.Current;
+                            if (trees_to_clear > 0) {
-                            current.hasTree = false;
+                                cell.hasTree = false;
-                            neigh.MoveNext();
+                                trees_to_clear -= 1;
-                            trees_to_clear -= 1;
                         }
-                        //this.money -= (this.map.tree_count * 1);
-                        //this.money += 1000;
                         Budget newBudget = new Budget
                         {
                             DateTime = this.DateTime,

isometric-park-fna/UI/ForestWindow.cs ¶ +1 -2

             using ImGuiNET;
             using Num = System.Numerics;
-            using System.Linq;
             namespace isometricparkfna.UI
             {
                             ImGui.SliderInt("Tree Clearing", ref new_tree_clearing, 0, 25, string.Format("%d (${0})", new_tree_clearing*Simulation.TREE_CLEAR_COST));
                             sim.tree_clearing = new_tree_clearing;
-                            ImGui.Text(string.Format("Crowded Trees: {0}", sim.map.iterate_cells_with_neighbors(7).Count())); //via LINQ
+                            ImGui.Text(string.Format("Crowded Trees: {0}", sim.crowded_trees ));
                             ImGui.Text(string.Format("Percent Healthy Trees: {0:F2}", sim.healthy_percent));
                             if (ImGui.Button("Okay"))

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

r78:89c651b103f6 - Thu, 04 Feb 2021 07:24:35

Sign in to your account

Commit r78:89c651b103f6 public

Author

r78:89c651b103f6 - Thu, 04 Feb 2021 07:24:35

Commit `r78:89c651b103f6` public