diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -763,15 +763,19 @@ if (MathUtils.Between(this.mouseGrid.X, 0, this.squaresAcross) && MathUtils.Between(this.mouseGrid.Y, 0, this.squaresAcross)) { has_tree = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].hasTree; - //batch.DrawString(font, has_tree.ToString(), new Vector2(500, 33), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); - //batch.DrawString(font, has_tree.ToString(), new Vector2(499, 32), Color.White, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.49f); } //*/ + String status_left = ""; + if (MathUtils.Between(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.Between(this.mouseGrid.Y, -1, this.simulation.map.MapHeight)) + { + status_left = String.Format("{0:},{1:} {2}", this.mouseGrid.X, this.mouseGrid.Y, this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status); + } String header_left = String.Format("${0:}|{1:} trees⚘𐂷🌳", this.simulation.money, this.simulation.map.tree_count); String header_middle = String.Format("{0:MMMMM yyyy} ({1:})", this.simulation.DateTime, this.simulation.Season); - String header_right = String.Format("Hotkeys: Arrow keys; (F)orest Policy; (B)udget; 0 toggles pause"); + // String header_right = String.Format("Press H for help."); + String header_right = ""; this.Window.Title = String.Format("Isometric Park [{0:}]", header_middle); Vector2 middle_dimensions = monoFont.MeasureString(header_middle); @@ -784,9 +788,8 @@ FilledRectangle.drawFilledRectangle(batch, new Rectangle(0, (int)top, width, (int)middle_dimensions.Y), Color.White, 0.51f); - batch.DrawString(monoFont, header_left, new Vector2(1, top), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); - batch.DrawString(monoFont, header_middle, new Vector2(middle_start, top), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); - batch.DrawString(monoFont, header_right, new Vector2(right_start, top), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); + batch.DrawString(monoFont, status_left, new Vector2(1, top), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); + // batch.DrawString(monoFont, header_right, new Vector2(right_start, top), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f); #endregion draw_header diff --git a/isometric-park-fna/UI/Menu.cs b/isometric-park-fna/UI/Menu.cs --- a/isometric-park-fna/UI/Menu.cs +++ b/isometric-park-fna/UI/Menu.cs @@ -71,7 +71,7 @@ { paused = !paused; } - if (Menu.activeButton("1 ①", (rate == 0), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) + if (Menu.activeButton("1", (rate == 0), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) { paused = false; rate = 0; @@ -101,8 +101,6 @@ ImGui.EndMainMenuBar(); - // ImGui.Button("Toolbar goes here", new Num.Vector2(0, 37)); - // ImGui.End(); ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left;