Alternative area mode (Left Ctrl + Left Shift) to affect all the stat… (

#25) * Alternative area mode (Left Ctrl + Left Shift) to affect all the statics in a tile * improvements * fix
kaczy93 · Oct 2, 2024 · 224a2c8 · 224a2c8
1 parent b6f6bea
commit 224a2c8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/CentrED/Map/MapManager.cs b/CentrED/Map/MapManager.cs
@@ -553,7 +553,7 @@ public void RemoveTiles(ushort x, ushort y)
         }
     }
 
-    public IEnumerable<TileObject> GetTopTiles(TileObject? t1, TileObject? t2)
+    public IEnumerable<TileObject> GetTiles(TileObject? t1, TileObject? t2, bool topTilesOnly)
     {
         var landOnly = ActiveTool.Name == "Draw" && CEDGame.UIManager.GetWindow<TilesWindow>().LandMode;
         if (t1 == null || t2 == null)
@@ -574,7 +574,17 @@ public IEnumerable<TileObject> GetTopTiles(TileObject? t1, TileObject? t2)
                     var landTile = LandTiles[x, y];
                     if (tiles != null && tiles.Any() && !landOnly)
                     {
-                        yield return tiles.Last();
+                        if (topTilesOnly)
+                        {
+                            yield return tiles.Last();
+                        }
+                        else
+                        {
+                            foreach (var tile in tiles)
+                            {
+                                yield return tile;
+                            }
+                        }
                     }
                     else if (landTile != null && CanDrawLand(landTile))
                     {

diff --git a/CentrED/Tools/BaseTool.cs b/CentrED/Tools/BaseTool.cs
@@ -17,6 +17,7 @@ public abstract class BaseTool : Tool
     protected static int _chance = 100;
     protected bool _pressed;
     protected bool _areaMode;
+    protected bool _topTilesOnly = true;
     private TileObject? _areaStartTile;
 
     internal override void Draw()
@@ -26,17 +27,31 @@ internal override void Draw()
 
     public sealed override void OnKeyPressed(Keys key)
     {
-        if (key == Keys.LeftControl && !_pressed)
+        if (!_pressed)
         {
-            _areaMode = true;
+            if (key == Keys.LeftControl)
+            {
+                _areaMode = true;
+            }
+            if (key == Keys.LeftShift)
+            {
+                _topTilesOnly = false;
+            }
         }
     }
 
     public sealed override void OnKeyReleased(Keys key)
     {
-        if (key == Keys.LeftControl && !_pressed)
+        if (!_pressed)
         {
-            _areaMode = false;
+            if (key == Keys.LeftControl)
+            {
+                _areaMode = false;
+            }
+            if (key == Keys.LeftShift)
+            {
+                _topTilesOnly = true;
+            }
         }
     }
 
@@ -64,7 +79,7 @@ public sealed override void OnMouseReleased(TileObject? o)
         {
             if (_areaMode)
             {
-                foreach (var to in MapManager.GetTopTiles(_areaStartTile, o))
+                foreach (var to in MapManager.GetTiles(_areaStartTile, o, _topTilesOnly))
                 {
                     TileObject to2 = to;                    
                     if (CEDGame.MapManager.UseVirtualLayer && tilesWindow.LandMode && to2 is VirtualLayerTile)
@@ -101,7 +116,7 @@ public sealed override void OnMouseEnter(TileObject? o)
 
         if (_areaMode && _pressed)
         {
-            foreach (var to in MapManager.GetTopTiles(_areaStartTile, o))
+            foreach (var to in MapManager.GetTiles(_areaStartTile, o, _topTilesOnly))
             {
                 if (Random.Next(100) < _chance)
                 {
@@ -144,7 +159,7 @@ public sealed override void OnMouseLeave(TileObject? o)
         }
         if (_pressed && _areaMode)
         {
-            foreach (var to in MapManager.GetTopTiles(_areaStartTile, o))
+            foreach (var to in MapManager.GetTiles(_areaStartTile, o, _topTilesOnly))
             {
                 TileObject to2 = to;
                 if (CEDGame.MapManager.UseVirtualLayer && tilesWindow.LandMode && to2 is VirtualLayerTile)