alysbrooks-public/games/isometric-park-fna Commit - r297:796d32fa41fc

alysbrooks-public » games » isometric-park-fna

Commit `r297:796d32fa41fc` public

parent | child

Description:

Rudimentary game state.

Commit status:

[Not Reviewed]

References:

m4-beginning

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r297:796d32fa41fc - Tue, 08 Jun 2021 07:00:05

TODO.taskpaper ¶ +5 -1

              		- Add tree simulation @milestone(3: Contracts) @done(2021-04-27)
              		- Add contract generation @milestone(3: Contracts) @done(2021-04-12)
              		- Outline reserved areas @milestone(3: Contracts) @done(2021-04-09)
-             		- Add company images @milestone(3: Contracts) @maybe
+             		- Add company images @milestone(3: Contracts) @maybe @done(2021-05-21)
+             		- Contracts should end
+             			-
              	Trees:
              		- Add basic maintenance cost @milestone(1: Basic Money) @done(2021-01-27)
              		- Add basic age simulation
              		- Biodiversity @maybe
              Bugs:
              	Graphics:
              		- Trees jump around when pressing show/hide grid
+             		- Grids sometimes overlap trees.
              		- Trees sometimes
              		- Sometimes framerate jumps to 180-200 fps. (Better than reverse, but kinda weird)
              	Misc:

isometric-park-fna/Engines/GameBridgeEngine.cs ¶ +7 -1

              	[Receives(typeof(ToggleWindowTypeMessage), typeof(ToggleWindowMessage),
              			typeof(ToggleVisibilityMessage))]
-             	[Reads(typeof(AreaComponent))]
+             	[Reads(typeof(AreaComponent),
+             			typeof(ContractStatusComponent))]
              	class GameBridgeEngine : Engine
              	{
                          foreach (ref readonly var entity in ReadEntities<AreaComponent>())
                          {
                              var areaComponent = GetComponent<AreaComponent>(entity);
+                             var contractStatusComponent = GetComponent<ContractStatusComponent>(entity);
              				foreach  (var square in areaComponent.squares)
              				{
              					if (game.mouseGrid == square)
              					{
              						game.in_zone = true;
+             						if(contractStatusComponent.status == ContractStatus.Active)
+             						{
+             							game.in_active_zone = true;
+             						}
              					}
              				}

isometric-park-fna/FNAGame.cs ¶ +75 -26

                  private SpriteBatch batch;
                  private SoundEffect sound;
                  private SpriteFont monoFont;
+                 private SpriteFont largeMonoFont;
                  private Camera camera = new Camera(new float[] { 0.25f, 0.5f, 1.0f, 2.0f, 4.0f });
                  //for now
                  public bool in_zone;
+                 public bool in_active_zone;
+                 public bool isPlaying = false;
                  private ImGuiRenderer _imGuiRenderer;
                  private DebugWindow debugWindow;
                              }
                          );
+                     var bakedMonoLarge = TtfFontBaker.Bake(File.OpenRead(@"Content/iosevka-term-extendedmedium.ttf"),
+,
+,
+,
+                             new[]
+                             {
+                                 CharacterRange.BasicLatin,
+                                 CharacterRange.Latin1Supplement,
+                                 CharacterRange.LatinExtendedA,
+                                 CharacterRange.Cyrillic,
+                                 CharacterRange.LatinExtendedB,
+                                 new CharacterRange((char) 0x00B7)
+                             }
+                         );
                      this.output = grammar.Flatten("#greeting#");
                      var result = grammar.Flatten("#[assistantName:#assistantNames#][whatever:whatever]vars#");
                      //font = fontBakeResult.CreateSpriteFont(GraphicsDevice);
                      monoFont = bakedMono.CreateSpriteFont(GraphicsDevice);
+                     largeMonoFont = bakedMonoLarge.CreateSpriteFont(GraphicsDevice);
                      this.budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0);
              		{
              			sound.Play(volume, pitch, pan);
              		}
+             		if (keyboardCur.IsKeyDown(Keys.A) && keyboardPrev.IsKeyUp(Keys.A))
+             		{
+             			this.isPlaying = !this.isPlaying;
+             		}
              		#endregion misc_keys
              //
                      frameCounter++;
                      string fps = string.Format("fps: {0}", frameRate);
+                     bool has_tree = false;
                      Stopwatch stopWatch = new Stopwatch();
                      stopWatch.Start();
                      GraphicsDevice.Clear(Color.CornflowerBlue);
+                     _imGuiRenderer.BeforeLayout(gameTime);
+             	if (this.isPlaying)
+                 {
                      batch.Begin(SpriteSortMode.BackToFront,
                              BlendState.AlphaBlend,
                              null,
                      drawTileAt(3, 2, 140, 2);
              #endif
-                     _imGuiRenderer.BeforeLayout(gameTime);
                      World.Draw();
                      // _imGuiRenderer.AfterLayout();
                      batch.End();
                              null,
                              null);
-                     bool has_tree = false;
                      if (MathUtils.BetweenExclusive(this.mouseGrid.X, 0, this.squaresAcross) && MathUtils.BetweenExclusive(this.mouseGrid.Y, 0, this.squaresAcross))
                      {
                          has_tree = this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].hasTree;
                      {
              			status_left = String.Format("{0:},{1:} {2} ({3})", this.mouseGrid.X, this.mouseGrid.Y,
                           this.simulation.map.cells[(int)this.mouseGrid.X][(int)this.mouseGrid.Y].status,
-                          this.in_zone ? "Contracted" : "Unzoned"
+                          this.in_active_zone ? "Contracted" : (this.in_zone ? "Proposed Contract": "Unzoned")
                           );
                      }
                      batch.End();
+             #region window
+                     if (this.currentNode != null)
+                     {
+                         this.currentNode = DialogInterface.RenderDialog(ref this.showInitial,
+                                 ref this.simulation.paused, debugWindow.monoFont, this.currentNode);
+                     }
+                     if (this.showForest)
+                     {
+                         ForestWindow.Render(this.showForest, debugWindow.monoFont, this.simulation, this.imGuiWindowBridgeEngine);
+                     }
+                     if (this.showNews)
+                     {
+                         NewsWindow.Render(this.showNews, debugWindow.monoFont, this.simulation, this.imGuiWindowBridgeEngine);
+                     }
+             		bool quit = false;
+                     Menu.Render(debugWindow.monoFont, FNAGame.width, this.imGuiWindowBridgeEngine, ref quit, ref this.simulation.paused, ref this.simulation.currentRate, ref this.showBudget, header_left);
+             		if (quit) {
+             			System.Environment.Exit(0);
+             		}
+                 }
+             	else {
+             		GraphicsDevice.Clear(Color.Teal);
+             		batch.Begin(SpriteSortMode.BackToFront,
+             				BlendState.AlphaBlend,
+             				null,
+             				null,
+             				null,
+             				null);
+             		Vector2 middle_dimensions = monoFont.MeasureString("Isometric Park");
+             		float middle_start = (int)((FNAGame.width / 2) - (middle_dimensions.X / 2));
+             		batch.DrawString(largeMonoFont, "Isometric Park",
+             				new Vector2(middle_start, 50),
+             				Color.Black, 0.0f, Vector2.Zero,
+.0f, SpriteEffects.None, 0.5f);
+             		batch.End();
+             	}
+             #endregion
              #region debug_window
                      //Calcs for debug window:
                      //                          new DialogOption{ response="Oh yeah, of course.", choice="..." }};
-                     if (this.currentNode != null)
+                     {
-                         this.currentNode = DialogInterface.RenderDialog(ref this.showInitial,
-                                 ref this.simulation.paused, debugWindow.monoFont, this.currentNode);
+                     }
-                     if (this.showForest)
+                     {
-                         ForestWindow.Render(this.showForest, debugWindow.monoFont, this.simulation, this.imGuiWindowBridgeEngine);
+                     }
-                     if (this.showNews)
+                     {
-                         NewsWindow.Render(this.showNews, debugWindow.monoFont, this.simulation, this.imGuiWindowBridgeEngine);
+                     }
-             		bool quit = false;
-                     Menu.Render(debugWindow.monoFont, FNAGame.width, this.imGuiWindowBridgeEngine, ref quit, ref this.simulation.paused, ref this.simulation.currentRate, ref this.showBudget, header_left);
-             		if (quit) {
-             			System.Environment.Exit(0);
+             		}
                      _imGuiRenderer.AfterLayout();

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

r297:796d32fa41fc - Tue, 08 Jun 2021 07:00:05

Sign in to your account

Commit r297:796d32fa41fc public

Author

r297:796d32fa41fc - Tue, 08 Jun 2021 07:00:05

Commit `r297:796d32fa41fc` public