alysbrooks-public/games/isometric-park-fna Commit - r539:99b285f3e6d3

alysbrooks-public » games » isometric-park-fna

Commit `r539:99b285f3e6d3` public

parent | child

Description:

Allow finalizing preserve areas.

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

r539:99b285f3e6d3 - Sun, 13 Feb 2022 12:29:50

isometric-park-fna/Components/PreserveComponent.cs ¶ created 644 +10 0

			@@ -0,0 +1,10
		1
		2	using Encompass;
		3	using System;
		4
		5	namespace isometricparkfna.Components {
		6
		7	public struct PreserveComponent : IComponent {
		8	public DateTime date;
		9	}
		10	}

isometric-park-fna/Engines/BuildToolEngine.cs ¶ +15 -11

                  [Receives(typeof(SpawnSelection),
                            typeof(AdjustSelection))]
-                 [Writes(typeof(AreaComponent))]
+                 [Writes(typeof(AreaComponent),
+                         // typeof(SelectedComponent),
+                         typeof(PreserveComponent))]
                  [Reads(typeof(SelectedComponent),
                         typeof(AreaComponent))]
                  public class BuildToolEngine : Engine {
                          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} });
                              AddComponent(entity, new SelectedComponent { selected = true, Type= SelectionType.ActiveTool});
+                             }
                          }
-                         foreach (ref readonly var message in ReadMessages<AdjustSelection>())
+                         {
-                             foreach (ref readonly var entity in ReadEntities<SelectedComponent>())
+                             {
+                         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.ActiveTool) {
-                                     if(message.Clear) {
+                                 if(selection.Type == SelectionType.ActiveTool
+                                         && selection.selected) {
+                                     if(message.Type == AdjustmentType.Clear) {
                                          Destroy(entity);
                                      }
+                                     else if(message.Type == AdjustmentType.Complete) {
+                                         SetComponent(entity, new PreserveComponent {});
+                                         // SetComponent(entity, new SelectedComponent {selected = false });
+                                     }
                                      else {
                                          var area = GetComponent<AreaComponent>(entity);
                                          var newSquares = new List<Vector2>();
-                                         newSquares.Add(area.squares[0]);
                                          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);
                                              }
                                          }
-                                         newSquares.Add(message.End);
                                          SetComponent(entity, new AreaComponent { squares = newSquares.ToArray() /*( new[]{ area.squares[0], message.End}*/});
                                      }
                                  }

isometric-park-fna/Engines/InputEngine.cs ¶ +2 -1

                              {
                                  SendMessage(new ToggleWindowTypeMessage {Window = Window.InGameMenu});
                                  SendMessage(new GameRateMessage { paused = true, rate = null });
+             		SendMessage(new AdjustSelection {Type = AdjustmentType.Complete });
                              }
                          }
                          if ( mouseCur.LeftButton == ButtonState.Released && mousePrev.LeftButton == ButtonState.Pressed )
                          {
-                             SendMessage(new AdjustSelection {Clear = true });
+                             SendMessage(new AdjustSelection {Type = AdjustmentType.Complete });
                          }
                          if (mouseCur.LeftButton == ButtonState.Pressed && mousePrev.LeftButton == ButtonState.Pressed)

isometric-park-fna/Engines/UIEngine.cs ¶ +17 -3

                            typeof(SetWindowVisibilityMessage),
                            typeof(SelectMessage),
                            typeof(SetDialogMessage),
-                           typeof(DialogChoiceMessage))]
+                           typeof(DialogChoiceMessage),
+             			  typeof(AdjustSelection))]
                  [Reads(typeof(DialogComponent),
                         typeof(WindowTypeComponent),
                         typeof(VisibilityComponent),
                                                              new SelectedComponent { selected = true });
                          }
+                         foreach (ref readonly var message in ReadMessages<AdjustSelection>()) {
+             				if(message.Type == AdjustmentType.Complete) {
+             					foreach (ref readonly var entity in ReadEntities<SelectedComponent>()) {
+             						var selection = GetComponent<SelectedComponent>(entity);
+             						if(selection.Type == SelectionType.ActiveTool
+             								&& selection.selected) {
+             							SetComponent(entity, new SelectedComponent {Type = SelectionType.ActiveTool,
+             									selected = false });
+             						}
+             					}
+             				}
+             			}
+                     }
+                 }
+             		}
+             	}
              }

isometric-park-fna/Messages/AdjustSelection.cs ¶ +8 -1

              using Encompass;
              namespace isometricparkfna.Messages {
+                 public enum AdjustmentType {
+                     None,
+                     Clear,
+                     Complete
+                 }
                  public struct AdjustSelection : IMessage {
                      public Vector2 End;
-                     public bool Clear;
+                     public AdjustmentType Type;
                  }
              }

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

r539:99b285f3e6d3 - Sun, 13 Feb 2022 12:29:50

Sign in to your account

Commit r539:99b285f3e6d3 public

Author

r539:99b285f3e6d3 - Sun, 13 Feb 2022 12:29:50

Commit `r539:99b285f3e6d3` public