alysbrooks-public/games/isometric-park-fna Commit - r74:2ba450025c9e

alysbrooks-public » games » isometric-park-fna

Commit `r74:2ba450025c9e` public

parent | child

Description:

Add tree clearing parameter.

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

r74:2ba450025c9e - Thu, 04 Feb 2021 05:20:24

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

                     }
-                    public System.Collections.IEnumerable tree_cells()
+                    public System.Collections.Generic.IEnumerable<Cell> tree_cells()
                     {
                         foreach (List<Cell> row in cells)
                         {
                         }
                     }
-                    public System.Collections.IEnumerable tree_cells(int zone)
+                    public System.Collections.Generic.IEnumerable<Cell> tree_cells(int zone)
                     {
                         foreach (List<Cell> row in cells)
                         {
                         }
                     }
-                    public System.Collections.IEnumerable iterate_cells()
+                    public System.Collections.Generic.IEnumerable<Cell> iterate_cells()
                     {
                         foreach (List<Cell> row in cells)
                         {
                         return MathUtils.Between(x, 0, MapWidth - 1) && MathUtils.Between(y, 0, MapHeight - 1);
                     }
-                    private System.Collections.IEnumerable iterate_neighbors(int x, int y)
+                    private System.Collections.Generic.IEnumerable<Cell> iterate_neighbors(int x, int y)
                     {
                         //iterates over neighbors (clockwise starting at noon/midnight)
                         if (inBounds(x, y + 1))
                         return count;
                     }
-                    public System.Collections.IEnumerable iterate_cells_with_neighbors(int neighbors)
+                    public System.Collections.Generic.IEnumerable<Cell> iterate_cells_with_neighbors(int neighbors)
                     {
                         for (int i = 0; i < MapHeight; i++)
                         {

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

                     //expenses
                     public decimal upkeep;
                     public decimal tree_planting;
+                    public decimal tree_clearing;
                     public decimal final_money;
+                    public decimal cashflow;
                     //misc
                             _tree_planting = MathUtils.Clamp(value, 0, 25);
                         }
                     }
+                    public int _tree_clearing = 5;
+                    public int tree_clearing
+                    {
+                        get {
+                            return _tree_clearing;
+                        }
+                        set {
+                            _tree_clearing = MathUtils.Clamp(value, 0, 25);
+                        }
+                    }
                             }
                         }
+                        int trees_to_clear = this.tree_clearing;
+                        IEnumerator<Cell> neigh = this.map.iterate_cells_with_neighbors(7).GetEnumerator();
+                        while (trees_to_clear > 0 && neigh.Current != null)
+                        {
+                            Cell current = neigh.Current;
+                            current.hasTree = false;
+                            neigh.MoveNext();
+                            trees_to_clear -= 1;
+                        }
                         //this.money -= (this.map.tree_count * 1);
                         //this.money += 1000;
                             trees = this.map.tree_count,
                             subsidy = 1000,
                             upkeep = this.map.tree_count * 1,
-                            tree_planting = this.tree_planting * 100
+                            tree_planting = this.tree_planting * 100,
+                            tree_clearing = this.tree_clearing * 100
                         };
                     {
                         this.money = budget.money
-                            - (budget.upkeep + budget.tree_planting)
+                            - (budget.upkeep + budget.tree_planting + budget.tree_clearing)
                             + (budget.subsidy);
                         budget.final_money = this.money;
+                        budget.cashflow = budget.final_money - budget.money;
                         return budget;
                     }

isometric-park-fna/UI/BudgetWindow.cs ¶ +12 -1

@@ -107,8 +107,19
107	batch.DrawString(font, String.Format("EXPENSES", this.budget.upkeep), new Vector2(x, bar_height * 9 + y), Color.Black);	107	batch.DrawString(font, String.Format("EXPENSES", this.budget.upkeep), new Vector2(x, bar_height * 9 + y), Color.Black);
108	batch.DrawString(font, String.Format("Upkeep.................${0:}....${1:}", this.budget.upkeep, this.previous_budget.upkeep), new Vector2(x, bar_height * 10 + y), Color.Black);	108	batch.DrawString(font, String.Format("Upkeep.................${0:}....${1:}", this.budget.upkeep, this.previous_budget.upkeep), new Vector2(x, bar_height * 10 + y), Color.Black);
109	batch.DrawString(font, String.Format("Tree Planting..........${0:}....${1:}", this.budget.tree_planting, this.previous_budget.tree_planting), new Vector2(x, bar_height * 11 + y), Color.Black);	109	batch.DrawString(font, String.Format("Tree Planting..........${0:}....${1:}", this.budget.tree_planting, this.previous_budget.tree_planting), new Vector2(x, bar_height * 11 + y), Color.Black);
		110	batch.DrawString(font, String.Format("Tree Clearing..........${0:}....${1:}", this.budget.tree_clearing, this.previous_budget.tree_clearing), new Vector2(x, bar_height * 12 + y), Color.Black);
110		111
111	batch.DrawString(font, String.Format("Ending Funds.........${0:}....${1:}", this.budget.final_money, this.previous_budget.final_money), new Vector2(x, bar_height * 14 + y), Color.Black);	112	Color cashflow_color = Color.Black;
		113	if (this.budget.cashflow < 0) {
		114	cashflow_color = Color.Red;
		115	}
		116	Color final_color = Color.Black;
		117	if (this.budget.final_money < 0) {
		118	final_color = Color.Red;
		119	}
		120
		121	batch.DrawString(font, String.Format("Cashflow.............${0:}....${1:}", this.budget.cashflow, this.previous_budget.cashflow), new Vector2(x, bar_height * 14 + y), cashflow_color);
		122	batch.DrawString(font, String.Format("Ending Funds.........${0:}....${1:}", this.budget.final_money, this.previous_budget.final_money), new Vector2(x, bar_height * 15 + y), final_color);
112		123
113		124
114	FilledRectangle.drawFilledRectangle(batch, new Rectangle(50, 50, 50, 50), new Color (0, 0,0, 0), 0.99f);	125	FilledRectangle.drawFilledRectangle(batch, new Rectangle(50, 50, 50, 50), new Color (0, 0,0, 0), 0.99f);

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

r74:2ba450025c9e - Thu, 04 Feb 2021 05:20:24

Sign in to your account

Commit r74:2ba450025c9e public

Author

r74:2ba450025c9e - Thu, 04 Feb 2021 05:20:24

Commit `r74:2ba450025c9e` public