alysbrooks-public/games/isometric-park-fna Commit - r481:cbdafdb3816f

alysbrooks-public » games » isometric-park-fna

Commit `r481:cbdafdb3816f` public

parent | child

Description:

Tweak style.

Commit status:

[Not Reviewed]

References:

m5-events

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r481:cbdafdb3816f - Mon, 13 Dec 2021 05:17:20

isometric-park-fna/Engines/GameStateEngine.cs ¶ 0 -2

                                 SetComponent(entity, new GameStateComponent { isPlaying = message.isPlaying });
                             }
                         }
                     }
                     public void startGame()
                     {
                     }
                 }
             }

isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs ¶ 0 -1

                         foreach (var message in this.selectedMessages)
                         {
                             SendMessage(message);
-                            // SetComponent<SelectedComponent>(message.Entity, new SelectedComponent { selected = true});
                         }
                         foreach (var message in this.jumpCameraMessages)
                         {

isometric-park-fna/Engines/InputEngine.cs ¶ 0 -4

             namespace isometricparkfna.Engines {
                 [Sends( typeof(ZoomCameraMessage),
                         typeof(MoveCameraMessage),
                         typeof(JumpCameraMessage),
                             if (keyboardCur.IsKeyDown(Keys.Escape) && keyboardPrev.IsKeyUp(Keys.Escape))
                             {
-                                // SendMessage(new TogglePauseMessage());
                                 SendMessage(new ToggleWindowTypeMessage {Window = Window.InGameMenu});
                                 SendMessage(new GameRateMessage { paused = true, rate = null });
                             }
                         if (mouseCur.RightButton == ButtonState.Pressed && mousePrev.RightButton == ButtonState.Released)
                         {
-                            // this.camera.Jump(this.original_point);
                             SendMessage(new JumpCameraMessage {Movement = original_point});
                         }

isometric-park-fna/Engines/SimulationBridgeEngine.cs ¶ 0 -6

                             }
                         }
                         this.all_squares = squares.ToArray();
                     }
                     public int addTick()
                             });
                         }
                         decimal new_contract_amount = 0M;
                         decimal new_enforcement_amount = 0M;
                         decimal new_misc_amount = 0M;
                                     Logging.Info(String.Format("Planted {0} trees, expected {1}, P(destroy)= {2}", added, (expected / 12.0), probability));
                                 }
                             }
                         }
                         this.ticksToSend = 0;
                         simulation.enforcement = new_enforcement_amount;
                         simulation.misc = new_misc_amount;
                         //Move this here?
                         // this.simulation.update(dt);
                     }
                 }
             }

isometric-park-fna/FNAGame.cs ¶ +14 -83

             using Microsoft.Xna.Framework.Graphics;
             using Microsoft.Xna.Framework.Media;
             using System;
             using System.IO;
             using System.Reflection;
                     this.Window.Title = "Isometric Park";
                     Content.RootDirectory = "Content";
                 }
                 protected override void Initialize()
                     World = WorldBuilder.Build();
                     this.output = grammar.Flatten("#greeting#");
                     var result = grammar.Flatten("#[assistantName:#assistantNames#][friendOfThePark:#assistantNames#][whatever:whatever]vars#");
                 Vector2 calculateMousegrid(Vector2 normalizedMousePos)
                 {
-                    //int gridx = (int)(normalizedMousePos.X / Tile.TileSpriteWidth);
-                    //int gridy = (int)(normalizedMousePos.Y  / Tile.TileSpriteHeight);
                     Vector2 adjust = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight);
                     Vector2 adjustedMousePos = normalizedMousePos - adjust;
                     float boardx = ((adjustedMousePos.X / Tile.TileSpriteWidth) + (adjustedMousePos.Y / Tile.TileSpriteHeight));
                     float boardy = ((adjustedMousePos.Y / Tile.TileSpriteHeight) - (adjustedMousePos.X / Tile.TileSpriteWidth));
                     return new Vector2((int)boardx, (int)boardy);
-                    /*
-                    int gridx = (int)((normalizedMousePos.X + (this.baseOffsetX + 4)) / Tile.TileWidth) ;
-                    int gridy = (int)((normalizedMousePos.Y + (this.baseOffsetX + 4) + (2*baseOffsetY)) / (Tile.TileStepY));
-                    int within_gridx = (int)((normalizedMousePos.X) % Tile.TileWidth) - (Tile.TileWidth/2);
-                    int within_gridy = (int)((normalizedMousePos.Y) % Tile.TileHeight) - (Tile.TileHeight / 2);
-                    int middle_distance = Math.Abs(within_gridx) + Math.Abs(within_gridx);
-                    Vector2 adjustment_vector;
-                    return new Vector2(gridx, gridy);
-                    if (middle_distance < (Tile.TileWidth / 2))
-                        return new Vector2(gridx, gridy);
-                    else if ((Math.Sign(within_gridx) == -1) && (Math.Sign(within_gridy) == 1))
-                        adjustment_vector = new Vector2(-1, -1);
-                        return new Vector2(gridx, gridy) + adjustment_vector;
-                    else if ((Math.Sign(within_gridx) == -1) && (Math.Sign(within_gridy) == -1))
-                        adjustment_vector = new Vector2(-1, 1);
-                        return new Vector2(gridx, gridy) + adjustment_vector;
-                    else if ((Math.Sign(within_gridx) == 1) && (Math.Sign(within_gridy) == 1))
-                        adjustment_vector = new Vector2(0, -1);
-                        return new Vector2(gridx, gridy) + adjustment_vector;
-                    else if ((Math.Sign(within_gridx) == 1) && (Math.Sign(within_gridy) == -1))
-                        adjustment_vector = new Vector2(0, 1);
-                        return new Vector2(gridx, gridy) + adjustment_vector;
-                    else {
-                        return new Vector2(gridx, gridy);
-                    */
                 }
                 protected override void Update(GameTime gameTime)
                 {
                     Stopwatch stopWatch = new Stopwatch();
                     stopWatch.Start();
                     MouseState mouseCur = Mouse.GetState();
                     #region input
-                    //
                     #region misc_keys
             #if DEBUG
                     if (keyboardCur.IsKeyDown(Keys.OemBackslash)
                         sound.Play(volume, pitch, pan);
                     }
             #endif
-                    // if (keyboardCur.IsKeyDown(Keys.V) && keyboardPrev.IsKeyUp(Keys.V))
-                    // {
-                    //     debugWindow.setMonoFont(debugWindow.addFont("Roboto", 25, false));
-                    // }
                     #endregion misc_keys
                     #endregion input
                     this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice)));
-                    //int gridx = (int)((this.original_point.X-baseOffsetX) / Tile.TileStepX);
-                    /* int gridx = (int)(this.original_point.Y / Tile.TileHeight + this.original_point.X / Tile.TileWidth); */
-                    //int gridy = (int)((this.original_point.Y-baseOffsetY) / (Tile.TileStepY*2));
-                    /* int gridy = (int)(this.original_point.Y / Tile.TileHeight - this.original_point.X / Tile.TileWidth); */
-                    //this.mouseGrid = new Vector2(gridx, gridy);
                     this.mouseGrid = this.calculateMousegrid(this.original_point);
                     elapsedTime += gameTime.ElapsedGameTime;
                         Tile.OutlineSquare(batch, 5, 1, Color.Green, 2);
                         Tile.OutlineSquare(batch, 7, 1, Color.Orange, 2);
                         Tile.OutlineSquare(batch, 9, 1, Color.Orange, 3);
-                        // Tile.OutlineSquare2(batch, 12, 1, Color.Orange, 2);
-                        //Tile.drawEdge(batch, new Edge {Start=new Vector2(14, 1), End= new Vector2(15, 1)}, Color.Orange);
                         //donut
                         Tile.DrawOutlinedSquares(batch, new Vector2[] {new Vector2(19, 1), new Vector2(19, 2), new Vector2(20, 1), new Vector2(21, 1),
                         Quad.FillSquare2(batch, 8, 7, Color.Teal, .125f, 0.79f);
             #endif
                         #endregion draw_cursor
                         #region draw_trees
                         if (this.showTrees) {
                             for (int i = 0; i < this.simulation.map.MapHeight; i++)
                                     null,
                                     null);
-                        if (MathUtils.BetweenExclusive(this.mouseGrid.X, 0, this.squaresAcross) && MathUtils.BetweenExclusive(this.mouseGrid.Y, 0, this.squaresAcross))
+                        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;
                         }
                         String status_left = "";
-                        if (MathUtils.BetweenExclusive(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.BetweenExclusive(this.mouseGrid.Y, -1, this.simulation.map.MapHeight))
+                        if (MathUtils.BetweenExclusive(this.mouseGrid.X, -1, this.simulation.map.MapWidth)
+                                && MathUtils.BetweenExclusive(this.mouseGrid.Y, -1, this.simulation.map.MapHeight))
                         {
                             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,
                         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_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);
-                        // batch.DrawString(monoFont, header_right, new Vector2(right_start, 1), Color.Black, 0.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.5f);
                         #endregion draw_header
                         #region budget
                         if (this.showBudget)
                         batch.End();
                         #region window
-                        // 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) {
                         past_fps.Enqueue(this.frameRate);
                         /*
-                                    if (this.frameRate > 60.0)
+                           if (this.frameRate > 60.0)
+                           {
-                                        Logging.Warning(String.Format("Framerate is higher than limit: {0}", this.frameRate));
+                           Logging.Warning(String.Format("Framerate is higher than limit: {0}", this.frameRate));
+                           }
-                                    if (this.frameRate < 30.0)
+                           if (this.frameRate < 30.0)
+                           {
-                                        Logging.Warning(String.Format("Framerate is lower than desired: {0}", this.frameRate));
+                           Logging.Warning(String.Format("Framerate is lower than desired: {0}", this.frameRate));
-                                    }*/
+                         */
                     }
                     /*
                     if (this.frameRate > 120.0)
                     base.Draw(gameTime);
                 }
                 public void setResolution(Vector2 newResolution, bool fullscreen)
                 {
                     FNAGame.width = (int)newResolution.X;
                     this.gdm.IsFullScreen = fullscreen;
                     this.gdm.ApplyChanges();
                 }
             }

isometric-park-fna/Simulation.cs ¶ +2 -12

                     public const int MAX_TREES_TO_PLANT = 25;
                     public const int MAX_TREES_TO_CLEAR = 25;
+                    public SimulationBridgeEngine BridgeEngine { get; private set; }
                     public decimal Subsidy {
                         get; set;
                         /* {
                     private List<Budget> budgets;
-                    public SimulationBridgeEngine BridgeEngine { get; private set; }
-                    // public SimulationBridgeEngine bridgeEngine {get;}
                     public decimal contracts;
                     public decimal enforcement;
                     public decimal misc;
                         }
                     }
                     private Grammar grammar;
                     private List<NewsItem> sourceNewsItems;
                     public List<NewsItem> latestNewsItems;
                     private void advanceSimulation()
                     {
                         var oldSeason = this.Season;
                         this.DateTime = this.DateTime.AddMonths(1);
                         this.Subsidy = Math.Max(0, this.Subsidy + this.SubsidyDelta);
                         this.BridgeEngine.addTick();
                         foreach (Cell cell in this.map.iterate_cells())
                         {
                             if (random.NextDouble() > SPONTANEOUS_NEW_TREE_CHANCE)
                             }
                         }
                         int trees_to_clear = this.tree_clearing;
                         foreach (Cell cell in this.map.iterate_cells_with_neighbors(7).Where(c => c.hasTree))
                         {
                             misc = this.misc
                         };
                         newBudget = this.applyBudget(newBudget); ;
                         this.budgets.Add(newBudget);
                         this.grammar = grammar;
                         this.updateNews();
                     }
                     public void update(TimeSpan deltaTime)

isometric-park-fna/UI/OptionsWindow.cs ¶ +2 -2

                         ImGui.DragFloat("##Scale", ref io.FontGlobalScale, 0.005f, 0.2f, 5.0f, "%.2f");
                         ImGui.SameLine();
-            	    Widgets.LabelTooltip("(?)", "Adjust this if increasing font size isn't enough.");
+                        Widgets.LabelTooltip("(?)", "Adjust this if increasing font size isn't enough.");
                         ImGui.Checkbox("Fullscreen", ref newFullscreen);
                             ImGui.EndCombo();
                         }
                         ImGui.SameLine();
-            	    Widgets.LabelTooltip("(?)", "Removes profanity from the game, if you must.");
+                        Widgets.LabelTooltip("(?)", "Removes profanity from the game, if you must.");
                         ImGui.Separator();

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

r481:cbdafdb3816f - Mon, 13 Dec 2021 05:17:20

Sign in to your account

Commit r481:cbdafdb3816f public

Author

r481:cbdafdb3816f - Mon, 13 Dec 2021 05:17:20

Commit `r481:cbdafdb3816f` public