Fix height offset bug, adjust height offset calculation to allow repl…

…acing back cliffs
CnCNet · Jan 17, 2024 · 47e807c · 47e807c
1 parent bc26f31
commit 47e807c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/TSMapEditor/Mutations/Classes/PlaceTerrainTileMutation.cs b/src/TSMapEditor/Mutations/Classes/PlaceTerrainTileMutation.cs
@@ -71,14 +71,23 @@ public override void Perform()
                 if (image.TmpImage == null)
                     continue;
 
-                int cx = targetCellCoords.X + (tile.Width) + i % tile.Width;
-                int cy = targetCellCoords.Y + (tile.Height) + i / tile.Width;
+                int cx = targetCellCoords.X + i % tile.Width;
+                int cy = targetCellCoords.Y + i / tile.Width;
 
                 var mapTile = MutationTarget.Map.GetTile(cx, cy);
+
                 if (mapTile != null)
                 {
-                    if (originLevel < 0 || mapTile.Level < originLevel)
-                        originLevel = mapTile.Level;
+                    var existingTile = Map.TheaterInstance.GetTile(mapTile.TileIndex).GetSubTile(mapTile.SubTileIndex);
+
+                    int cellLevel = mapTile.Level;
+
+                    // Allow replacing back cliffs
+                    if (existingTile.TmpImage.Height == image.TmpImage.Height)
+                        cellLevel -= existingTile.TmpImage.Height;
+
+                    if (originLevel < 0 || cellLevel < originLevel)
+                        originLevel = cellLevel;
                 }
             }
 

diff --git a/src/TSMapEditor/UI/CursorActions/PlaceTerrainCursorAction.cs b/src/TSMapEditor/UI/CursorActions/PlaceTerrainCursorAction.cs
@@ -67,14 +67,23 @@ private void DoActionForCells(Point2D cellCoords, Action<MapTile> action)
                 if (image.TmpImage == null)
                     continue;
 
-                int cx = adjustedCellCoords.X + Tile.Width + i % Tile.Width;
-                int cy = adjustedCellCoords.Y + Tile.Height + i / Tile.Width;
+                int cx = adjustedCellCoords.X + i % Tile.Width;
+                int cy = adjustedCellCoords.Y + i / Tile.Width;
 
                 var mapTile = MutationTarget.Map.GetTile(cx, cy);
+
                 if (mapTile != null)
                 {
-                    if (originLevel < 0 || mapTile.Level < originLevel)
-                        originLevel = mapTile.Level;
+                    var existingTile = Map.TheaterInstance.GetTile(mapTile.TileIndex).GetSubTile(mapTile.SubTileIndex);
+
+                    int cellLevel = mapTile.Level;
+
+                    // Allow replacing back cliffs
+                    if (existingTile.TmpImage.Height == image.TmpImage.Height)
+                        cellLevel -= existingTile.TmpImage.Height;
+
+                    if (originLevel < 0 || cellLevel < originLevel)
+                        originLevel = cellLevel;
                 }
             }