alysbrooks-public/games/isometric-park-fna Commit - r52:6014d57fc049

alysbrooks-public » games » isometric-park-fna

Commit `r52:6014d57fc049` public

parent | child

Description:

Add super basic Budget UI.

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

r52:6014d57fc049 - Thu, 28 Jan 2021 03:47:41

isometric-park-fna/BudgetWindow.cs ¶ created 644 +96 0

@@ -0,0 +1,96
	1	using System;
	2	using Microsoft.Xna.Framework;
	3	using Microsoft.Xna.Framework.Graphics;
	4	using Microsoft.Xna.Framework.Input;
	5
	6	namespace isometricparkfna
	7	{
	8	public class BudgetWindow
	9	{
	10	private Budget budget;
	11	private SpriteFont font;
	12	public int x;
	13	public int y;
	14
	15
	16	private Vector2 mouseEnd;
	17	private Vector2 mouseStart;
	18	private MouseState mousePrev;
	19
	20	public BudgetWindow(Budget budget, SpriteFont font, int start_x, int start_y)
	21	{
	22
	23	this.budget = budget;
	24	this.font = font;
	25	this.x = start_x;
	26	this.y = start_y;
	27	}
	28
	29	public void update(MouseState mouseCur, Budget budget)
	30	{
	31	this.budget = budget;
	32
	33	if ((mouseCur.LeftButton == ButtonState.Pressed)
	34	&& MathUtils.Between(mouseCur.X, x, 700+x)
	35	&& MathUtils.Between(mouseCur.Y, y, 500 + y))
	36	{
	37	if (mousePrev.LeftButton == ButtonState.Released)
	38	{
	39	this.mouseStart = new Vector2(mouseCur.X, mouseCur.Y);
	40
	41	}
	42	else
	43	{
	44	this.mouseEnd = new Vector2(mouseCur.X, mouseCur.Y);
	45	}
	46	}
	47	else if (mousePrev.LeftButton == ButtonState.Pressed)
	48	{
	49	this.x = MathUtils.Clamp(this.x + (int)(this.mouseEnd.X - this.mouseStart.X), 0, 700);
	50	this.y = MathUtils.Clamp(this.y + (int)(this.mouseEnd.Y - this.mouseStart.Y), 0, 400);
	51
	52	}
	53
	54	this.mousePrev = mouseCur;
	55
	56	//if ((mouseCur.LeftButton == ButtonState.Pressed)
	57	// && MathUtils.Between(mouseCur.X, x, 700 + x)
	58	// && MathUtils.Between(mouseCur.Y, y, 500 + y))
	59	//{
	60	// this.x += 50;
	61	//}
	62	}
	63
	64	public void draw(SpriteBatch batch)
	65	{
	66	int bar_height = 25;
	67	int height = 500;
	68
	69	for (int i = 1; i < (height / bar_height); i++)
	70	{
	71	Rectangle position = new Rectangle(this.x, bar_height * i + this.y,
	72	700, bar_height);
	73
	74	if ((i % 2) == 0)
	75	{
	76	FilledRectangle.drawFilledRectangle(batch, position, Color.LightGreen, 0.99f);
	77	}
	78	else
	79	{
	80	FilledRectangle.drawFilledRectangle(batch, position, Color.White, 0.99f);
	81	}
	82	}
	83
	84	batch.DrawString(font, String.Format("Starting Funds.........${0:}", this.budget.money), new Vector2(x, bar_height * 1 + y), Color.Black);
	85
	86	batch.DrawString(font, String.Format("REVENUE", this.budget.upkeep), new Vector2(x, bar_height * 3 + y), Color.Black);
	87	batch.DrawString(font, String.Format("Subsidy................${0:}", this.budget.upkeep), new Vector2(x, bar_height * 4 + y), Color.Black);
	88
	89	batch.DrawString(font, String.Format("EXPENSES", this.budget.upkeep), new Vector2(x, bar_height * 6 + y), Color.Black);
	90	batch.DrawString(font, String.Format("Upkeep.................${0:}", this.budget.upkeep), new Vector2(x, bar_height * 7 + y), Color.Black);
	91
	92	batch.DrawString(font, String.Format("Ending Funds.........${0:}", this.budget.final_money), new Vector2(x, bar_height * 10 + y), Color.Black);
	93
	94	}
	95	}
	96	}

isometric-park-fna/FNAGame.cs ¶ +34 -4

             	private Queue<Node<DialogOption>> remainingDialog;
-            	private bool showGrid = true;
+            	private bool showGrid;
                 private Grammar grammar;
                 private string output;
                 private bool showSecond = true;
                 private GraphicsDeviceManager gdm;
+                private bool showBudget;
+                private BudgetWindow budgetWindow;
                 private static void Main(string[] args)
             	{
             		showInitial = true;
             		messageIndex = 0;
+            		showBudget = false;
+            		showGrid = true;
             		this.Window.Title = "Isometric Park";
             		currentNode = DialogTrees.introTree;
             	}
             		//font = fontBakeResult.CreateSpriteFont(GraphicsDevice);
             		monoFont = bakedMono.CreateSpriteFont(GraphicsDevice);
+            		this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0);
             	}
             	protected override void UnloadContent()
             			this.showGrid = !this.showGrid;
             		}
+            		if (keyboardCur.IsKeyDown(Keys.B) && keyboardPrev.IsKeyUp(Keys.B))
+            		{
+            			this.showBudget = !this.showBudget;
+            		}
             		if (keyboardCur.IsKeyDown(Keys.C) && keyboardPrev.IsKeyUp(Keys.C))
             		{
             			this.camera.Jump(Vector2.Zero);
             		#endregion input
             		this.simulation.update(gameTime.ElapsedGameTime);
+            		if (this.showBudget)
+            		{
+            			this.budgetWindow.update(mouseCur, this.simulation.latestBudget);
+            		}
             		if (!this.showInitial && this.remainingDialog.Count > 0)
             		{
                     batch.DrawString(monoFont, header_left, new Vector2(1, 1), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f);
                     batch.DrawString(monoFont, header_middle, new Vector2(middle_start, 1), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f);
-            #endregion draw_header
+            		#endregion draw_header
-                    batch.End();
+            		#region budget
+            		if (this.showBudget)
+                    {
+            			budgetWindow.draw(batch);
+            		}
+            		#endregion budget
+            		batch.End();
             #region debug_window
                     //Calcs for debug window:

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

                 public struct Budget
                 {
                     public DateTime DateTime;
+                    //assets
                     public decimal money;
                     public decimal upkeep;
+                    public decimal final_money;
                     //misc
                     public int trees;
                         this.applyBudget(newBudget); ;
                     }
-                    public void applyBudget(Budget budget)
+                    public void applyBudget(Budget budget) ///hacky
                     {
                         this.money = budget.money
                             - (budget.upkeep)
                             + (budget.subsidy);
+                        budget.final_money = this.money;
                     }
                     public void update(TimeSpan deltaTime)

isometric-park-fna/Utils/MathUtils.cs ¶ +16 0

@@ -19,6 +19,22
19		19
20	}	20	}
21		21
		22	public static int Clamp(int val, int min, int max)
		23	{
		24	if(val > max)
		25	{
		26	return max;
		27	}
		28	else if (val < min)
		29	{
		30	return min;
		31	}
		32	else
		33	{
		34	return val;
		35	}
		36	}
		37
22	protected float Decrement(float value, float delta)	38	protected float Decrement(float value, float delta)
23	{	39	{
24	float magnitude = Math.Abs(value);	40	float magnitude = Math.Abs(value);

isometric-park-fna/isometric-park-fna.csproj ¶ +1 0

                 <Compile Include="Utils\MathUtils.cs" />
                 <Compile Include="Utils\Node.cs" />
                 <Compile Include="Dialog.cs" />
+                <Compile Include="BudgetWindow.cs" />
               </ItemGroup>
               <ItemGroup>
                 <ProjectReference Include="..\FNA\FNA.csproj">

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

r52:6014d57fc049 - Thu, 28 Jan 2021 03:47:41

Sign in to your account

Commit r52:6014d57fc049 public

Author

r52:6014d57fc049 - Thu, 28 Jan 2021 03:47:41

Commit `r52:6014d57fc049` public