alysbrooks-public/games/isometric-park-fna Commit - r633:4be429fdfde1

alysbrooks-public » games » isometric-park-fna

Commit `r633:4be429fdfde1` public

parent | child

Description:

Add bulldozer tool. Adds a bulldozer tool for removing structures. For the moment, works like dezone, i.e., it can delete entire areas rather than working on one area at a time.

Commit status:

[Not Reviewed]

References:

m6-tiles-and-trees

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r633:4be429fdfde1 - Sat, 01 Oct 2022 22:50:03

isometric-park-fna/Components/ToggleToolComponents.cs ¶ +2 -1

                      None,
                      Preserve,
                      Dezone,
-                     Tower
+                     Tower,
+                     Bulldozer
                  }

isometric-park-fna/Engines/BuildToolEngine.cs ¶ +70 -6

                          }
                      }
-                     private void clear(Vector2[] clear_squares) {
+                     private void clear_areas(Vector2[] clear_squares) {
                          List<Entity> entities = new List<Entity>();
                          foreach(ref readonly var entity in ReadEntities<AreaComponent>() ) {
                              var squares = GetComponent<AreaComponent>(entity).squares;
                          }
                      }
+                     private void clear_structures(Vector2[] clear_squares) {
+                         List<Entity> entities = new List<Entity>();
+                         foreach(ref readonly var entity in ReadEntities<StructureComponent>() ) {
+                             var square = GetComponent<PointComponent>(entity).Square;
+                             foreach(var clear_square in clear_squares) {
+                                 if(square == clear_square) {
+                                     entities.Add(entity);
+                                 }
+                             }
+                         }
+                         foreach(var entity in entities) {
+                             Logging.Debug("Deleting entity.");
+                             Destroy(entity);
+                         }
+                     }
                      public List<Vector2> GetOccupied() {
                          List<Vector2> occupied = new List<Vector2>();
                              }
                          }
                          else if (statuses.ContainsKey(Tool.Dezone) && statuses[Tool.Dezone]) {
                              foreach (ref readonly var message in ReadMessages<SpawnSelection>())
                              {
                                  if (message.Start.X >= 0 && message.Start.X < this.Map.MapWidth
                                          }
                                          else if(message.Type == AdjustmentType.Complete) {
                                                  var squares = GetComponent<AreaComponent>(entity).squares;
-                                                 clear(squares);
+                                                 clear_areas(squares);
                                          }
                                          else {
                                              var area = GetComponent<AreaComponent>(entity);
                              }
                              foreach (ref readonly var message in ReadMessages<AdjustSelection>()) {
-                                 foreach (ref readonly   var entity in ReadEntities<SelectedComponent>()) {
+                                 foreach (ref readonly var entity in ReadEntities<SelectedComponent>()) {
                                      var selection = GetComponent<SelectedComponent>(entity);
                                      if (selection.Type == SelectionType.Area
                                          if(message.Type == AdjustmentType.Clear) {
                                              Destroy(entity);
                                          }
-                                         else if(message.Type == AdjustmentType.Complete) {
+                                         else if (message.Type == AdjustmentType.Complete) {
                                              var point = GetComponent<PointComponent>(entity);
                                              var structure_entity = CreateEntity();
                                              var cell = this.Map.cells[(int)point.Square.X][(int)point.Square.Y];
                                                  AddComponent(structure_entity, new PointComponent {Square = point.Square,
                                                          Tool = point.Tool} );
-                                                 AddComponent(structure_entity,
+                                                 AddComponent(structure_entity,
                                                          new StructureComponent { Structure = Structure.Tower});
                                                  Destroy(entity);
                                                  SendMessage(new PlaySoundMessage { SoundName = "ConstructionShort" });
                                  }
                              }
                          }
+                         else if ((statuses.ContainsKey(Tool.Bulldozer) && statuses[Tool.Bulldozer])) {
+                             foreach (ref readonly var message in ReadMessages<SpawnSelection>())
+                             {
+                                 if (message.Start.X >= 0 && message.Start.X < this.Map.MapWidth
+                                         && message.Start.Y >= 0 && message.Start.Y < this.Map.MapHeight) {
+                                     var entity = CreateEntity();
+                                     AddComponent(entity, new AreaComponent { squares = new[] {message.Start},
+                                             Tool = Tool.Bulldozer });
+                                     AddComponent(entity, new SelectedComponent { selected = true, Type= SelectionType.Area});
+                                 }
+                             }
+                             foreach (ref readonly var message in ReadMessages<AdjustSelection>()) {
+                                 foreach (ref readonly var entity in ReadEntities<SelectedComponent>()) {
+                                     var selection = GetComponent<SelectedComponent>(entity);
+                                     if(selection.Type == SelectionType.Area
+                                             && selection.selected) {
+                                         if (message.Type == AdjustmentType.Clear) {
+                                             Destroy(entity);
+                                         }
+                                         else if (message.Type == AdjustmentType.Complete) {
+                                             var squares = GetComponent<AreaComponent>(entity).squares;
+                                             clear_structures(squares);
+                                             Destroy(entity); //Dezone destroys itself, so it doesn't need this command.
+                                         }
+                                         else {
+                                             var area = GetComponent<AreaComponent>(entity);
+                                             var newSquares = new List<Vector2>();
+                                             var end_x = MathUtils.Clamp(message.End.X, 0.0f, this.Map.MapWidth);
+                                             var end_y = MathUtils.Clamp(message.End.Y, 0.0f, this.Map.MapHeight);
+                                             foreach (var i in step_until(area.squares[0].X, end_x)) {
+                                                 foreach (var j in step_until(area.squares[0].Y, end_y)) {
+                                                     var newSquare = new Vector2(i, j);
+                                                     newSquares.Add(newSquare);
+                                                 }
+                                             }
+                                             SetComponent(entity, new AreaComponent { squares = newSquares.ToArray(), Tool = area.Tool});
+                                         }
+                                     }
+                                 }
+                             }
+                         }
                      }
                  }
              }

isometric-park-fna/UI/Menu.cs ¶ +5 -2

                              ImGui.Text(header);
-                             var dimensions = ImGui.CalcTextSize("X Tower X Preserve X Dezone | X Graph X Contracts $ Budget X Forest X News X | Pause 1 2 3 4 5") ;
+                             var dimensions = ImGui.CalcTextSize("X Tower X Preserve X Dezone X Bulldozer | X Graph X Contracts $ Budget X Forest X News X | Pause 1 2 3 4 5") ;
                              // ImGui.SetCursorPosX(width - 520);
                              // Add 12 pixels for each button, plus separator
                              {
                                  bridgeEngine.toggleToolMessages.Add(new ToggleToolMessage {Tool = Tool.Dezone});
                              }
+                             if (Menu.activeButton("\ue122 Bulldozer", bridgeEngine.toolStatuses[Tool.Bulldozer], StyleSets.selected, StyleSets.white))
+                             {
+                                 bridgeEngine.toggleToolMessages.Add(new ToggleToolMessage {Tool = Tool.Bulldozer});
+                             }
                              ImGui.Text("|");
                              if (Menu.activeButton("\ue03e Graph", bridgeEngine.windowStatuses[Window.Graph], StyleSets.selected, StyleSets.white))

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

r633:4be429fdfde1 - Sat, 01 Oct 2022 22:50:03

Sign in to your account

Commit r633:4be429fdfde1 public

Author

r633:4be429fdfde1 - Sat, 01 Oct 2022 22:50:03

Commit `r633:4be429fdfde1` public