better cliff editing

stabu-dev · stabu-dev · commit bda91a8ca46b · 2026-03-25T15:30:10.000+02:00
diff --git a/main/assets/bundles/bundle.properties b/main/assets/bundles/bundle.properties
@@ -18,6 +18,8 @@ button.omaloon-install-update = Install it and restart now?
 fragment.omaloon-darkness-painter = [#FEB380]Darkness Painter
 fragment.omaloon-darkness-painter.clear-darkness = Clears all custom darkness from the map. [scarlet]This cannot be fully undone[].
 fragment.omaloon-darkness-painter.clear-darkness.confirm = Are you sure you want to remove all custom darkness from the map?
+keybind.open_darkness_painter.name = Show Darkness Painter
+keybind.paint_darkness.name = Paint Darkness
 ui.omaloon-flat-mode = Uniform Brush
 ui.omaloon-flat-mode.tooltip = Paints darkness in a square.
 ui.omaloon-noise-circle-mode = Noisy Circular Brush
@@ -96,7 +98,9 @@ item.omaloon-magnetite.name = Magnetite
 
 ## environment
 block.omaloon-cliff.name = Cliff
-block.omaloon-cliff-helper.name = Cliff Helper
+block.omaloon-cliff.draw-upward = Cliff
+block.omaloon-cliff.draw-downward = Canyon
+block.omaloon-cliff.cleanup = Clear Markers
 
 block.omaloon-glasmore-metal.name = Glasmore Metal
 block.omaloon-glasmore-metal-plus.name = Glasmore Metal Plus
diff --git a/main/src/omaloon/content/blocks/OlEnvironmentBlocks.java b/main/src/omaloon/content/blocks/OlEnvironmentBlocks.java
@@ -18,7 +18,7 @@
 public class OlEnvironmentBlocks{
     public static Block
     // Cliff
-    cliff, cliffHelper,
+    cliff,
 
     // Ores
     oreCobalt, oreNickel, oreCoal, magnetiteCrystals,
@@ -74,7 +74,6 @@ public class OlEnvironmentBlocks{
     public static void load(){
         // Cliff
         cliff = new OlCliff("cliff");
-        cliffHelper = new CliffHelper("cliff-helper");
 
         // Ores
         oreCobalt = new OreBlock("ore-cobalt", OlItems.cobalt){{
diff --git a/main/src/omaloon/core/OlBinding.java b/main/src/omaloon/core/OlBinding.java
@@ -6,7 +6,5 @@ public class OlBinding {
     public static final KeyBind
 
     openDarknessPainter = KeyBind.add("open_darkness_painter", KeyCode.p, "omaloon"),
-    paintDarkness = KeyBind.add("paint_darkness", KeyCode.mouseLeft, "omaloon"),
-
-    flushCliffs = KeyBind.add("flush_cliffs", KeyCode.l, "omaloon");
+    paintDarkness = KeyBind.add("paint_darkness", KeyCode.mouseLeft, "omaloon");
 }
diff --git a/main/src/omaloon/world/blocks/environment/CliffHelper.java b/main/src/omaloon/world/blocks/environment/CliffHelper.java
diff --git a/main/src/omaloon/world/blocks/environment/OlCliff.java b/main/src/omaloon/world/blocks/environment/OlCliff.java
@@ -3,22 +3,17 @@
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.geom.*;
+import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
-import mindustry.game.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.ui.*;
 import mindustry.world.*;
-import omaloon.core.*;
-
-import static arc.Core.*;
 
 public class OlCliff extends Block{
-    static {
-        Events.run(EventType.Trigger.update, () -> {
-            if (input.keyTap(OlBinding.flushCliffs)) OlCliff.flushCliffs();
-        });
-    }
     public float colorMultiplier = 1.5f;
     public boolean useMapColor = true;
     public TextureRegion[] cliffs;
@@ -27,58 +22,140 @@ public OlCliff(String name){
         super(name);
         breakable = alwaysReplace = false;
         solid = true;
-        saveData = true;
+        saveData = saveConfig = true;
         cacheLayer = CacheLayer.walls;
-        fillsTile = false;
-        hasShadow = false;
+        fillsTile = hasShadow = false;
+        editorConfigurable = true;
     }
 
-    public static void flushCliffs(){
-        Vars.world.tiles.eachTile(tile -> {
-            if(tile.block() instanceof OlCliff && tile.data == 0){
-                for(int i = 0; i < 4; i++){
-                    if(tile.nearby(i).block() instanceof CliffHelper) tile.data = (byte)(i + 1);
-                }
-                if(tile.data == 0) for(int i = 0; i < 4; i++){
-                    if(tile.nearby(Geometry.d8edge(i)).block() instanceof CliffHelper) tile.data = (byte)(i + 5);
-                }
-                for(int i = 0; i < 4; i++){
-                    if(
-                    tile.nearby(i).block() instanceof CliffHelper &&
-                    tile.nearby((i + 1) % 4).block() instanceof CliffHelper
-                    ) tile.data = (byte)(i + 9);
-                }
-                if(tile.data == 0) tile.setBlock(Blocks.air);
-            }
-        });
-        Vars.world.tiles.eachTile(tile -> {
-            if(tile.block() instanceof CliffHelper) mindustry.gen.Call.setTile(tile, Blocks.air, Team.derelict, 0);
-        });
+    @Override
+    public void init(){
+        super.init();
+        lastConfig = 0;
+    }
+
+    @Override
+    public void load(){
+        super.load();
+        cliffs = new TextureRegion[12];
+        for(int i = 0; i < 12; i++){
+            cliffs[i] = Core.atlas.find(name + "-" + (i + 1), "omaloon-cliff-" + (i + 1));
+        }
+    }
+
+    @Override
+    public void buildEditorConfig(Table table){
+        table.table(t -> {
+            t.defaults().growX().height(42f).pad(2f);
+
+            t.button("@block." + name + ".draw-upward", Icon.upOpen, Styles.flatTogglet, () -> lastConfig = 0)
+             .update(b -> b.setChecked(lastConfig instanceof Integer i && i == 0))
+             .margin(12f);
+
+            t.button("@block." + name + ".draw-downward", Icon.downOpen, Styles.flatTogglet, () -> lastConfig = 1)
+             .update(b -> b.setChecked(lastConfig instanceof Integer i && i == 1))
+             .margin(12f);
+        }).growX().padBottom(2f).row();
+
+        table.button("@block." + name + ".cleanup", Icon.trash, Styles.cleart, OlCliff::cleanUp)
+             .growX().height(42f).pad(2f).margin(12f).row();
+    }
+
+    @Override
+    public Object getConfig(Tile tile){
+        return tile.data >= 13 ? 0 : 1;
+    }
+
+    @Override
+    public void editorPicked(Tile tile){
+        lastConfig = tile.data >= 13 ? 0 : 1;
+    }
+
+    @Override
+    public void placeEnded(Tile tile, @Nullable Unit builder, int rotation, @Nullable Object config){
+        tile.data = (byte)((config instanceof Integer i && i == 0) ? 13 : 0);
     }
 
     @Override
     public void drawBase(Tile tile){
-        if(tile.data == 0){
+        int d = tile.data;
+        boolean down = d >= 13;
+        int face = (d == 0 || d == 13) ? face(tile, down) : (down ? d - 13 : d);
+
+        if(face == 0){
             Draw.color();
             Draw.rect(region, tile.drawx(), tile.drawy());
         }else{
             if(useMapColor) Draw.color(Tmp.c1.set(tile.floor().mapColor).mul(colorMultiplier));
-            Draw.rect(cliffs[tile.data - 1], tile.drawx(), tile.drawy());
+            Draw.rect(cliffs[face - 1], tile.drawx(), tile.drawy());
         }
         Draw.color();
     }
 
     @Override
-    public void load(){
-        super.load();
-        cliffs = new TextureRegion[12];
-        for(int i = 0; i < 12; i++){
-            cliffs[i] = Core.atlas.find(name + "-" + (i + 1), "omaloon-cliff-" + (i + 1));
+    public int minimapColor(Tile tile){
+        return Tmp.c1.set(tile.floor().mapColor).mul(1.2f).rgba();
+    }
+
+    /** @return face index (1-12) based on neighbours, or 0 if none. */
+    public static int face(Tile tile, boolean downward){
+        return downward ? downFace(tile) : upFace(tile);
+    }
+
+    //                            0  1  2  3  4  5   6   7  8   9  10  11  12  13  14  15
+    static final int[] upFaces = {0, 1, 2, 9, 3, 3, 10, 10, 4, 12,  4, 12, 11, 12, 11, 12};
+    static final int[] downFaces = {0, 0, 0, 5, 0, 0,  6,  2, 0,  8,  0,  1,  7,  4,  3,  0};
+
+    static int upFace(Tile tile){
+        int mask = 0;
+        for(int i = 0; i < 4; i++) if(!cliff(tile.nearby(i))) mask |= (1 << i);
+        if(mask != 0) return upFaces[mask];
+
+        for(int i = 3; i >= 0; i--){
+            if(!cliff(tile.nearby(Geometry.d8edge(i)))) return i + 5;
         }
+        return 0;
     }
 
-    @Override
-    public int minimapColor(Tile tile){
-        return Tmp.c1.set(tile.floor().mapColor).mul(1.2f).rgba();
+    static int downFace(Tile tile){
+        int mask = 0;
+        for(int i = 0; i < 4; i++) if(cliff(tile.nearby(i))) mask |= (1 << i);
+        if(mask != 0b1111) return downFaces[mask];
+
+        if(!cliff(tile.nearby(-1, -1))) return 9;
+        if(!cliff(tile.nearby( 1, -1))) return 10;
+        if(!cliff(tile.nearby( 1,  1))) return 11;
+        if(!cliff(tile.nearby(-1,  1))) return 12;
+        return 0;
+    }
+
+    static boolean cliff(Tile t){
+        return t != null && t.block() instanceof OlCliff;
+    }
+
+    public static void cleanUp(){
+        IntSeq remove = new IntSeq();
+        Vars.world.tiles.eachTile(tile -> {
+            if(!(tile.block() instanceof OlCliff)) return;
+            int d = tile.data;
+            boolean down = d >= 13;
+            if(d != 0 && d != 13) return;
+
+            Vars.editor.addTileOp(TileOp.get(tile.x, tile.y, (byte)5 /*opData*/, TileOpData.get(tile.data, tile.floorData, tile.overlayData)));
+
+            int f = face(tile, down);
+            if(f == 0){
+                remove.add(tile.pos());
+            }else{
+                tile.data = (byte)(down ? f + 13 : f);
+            }
+        });
+
+        for(int i = 0; i < remove.size; i++){
+            Tile t = Vars.world.tile(remove.get(i));
+            if(t != null) t.setBlock(Blocks.air);
+        }
+
+        Vars.editor.flushOp();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,5 @@ public class OlBinding {`
`6`	`6`	`public static final KeyBind`
`7`	`7`
`8`	`8`	`openDarknessPainter = KeyBind.add("open_darkness_painter", KeyCode.p, "omaloon"),`
`9`		`- paintDarkness = KeyBind.add("paint_darkness", KeyCode.mouseLeft, "omaloon"),`
`10`		`-`
`11`		`- flushCliffs = KeyBind.add("flush_cliffs", KeyCode.l, "omaloon");`
	`9`	`+ paintDarkness = KeyBind.add("paint_darkness", KeyCode.mouseLeft, "omaloon");`
`12`	`10`	`}`