From 95072921071a54663a570f1323cfdd27098908aa Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 11 Feb 2025 11:07:51 -0500 Subject: [PATCH] LCanvas cleanup --- core/src/mindustry/content/Blocks.java | 4 ++-- core/src/mindustry/logic/LCanvas.java | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 1d1c788b2b..e8750eab48 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2915,7 +2915,7 @@ public class Blocks{ drillMultipliers.put(Items.beryllium, 1.35f); liquidBoostIntensity = 2f; - + //TODO different requirements consumePower(6f); consumeLiquid(Liquids.hydrogen, 4f / 60f); @@ -4565,7 +4565,7 @@ public class Blocks{ }}, Items.surgeAlloy, new BasicBulletType(){{ - reloadMultiplier = 0.5f; + reloadMultiplier = 0.75f; damage = 65; rangeChange = 8f * 3f; lightning = 3; diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java index ec78dbb05d..2bfd96ac4b 100644 --- a/core/src/mindustry/logic/LCanvas.java +++ b/core/src/mindustry/logic/LCanvas.java @@ -31,7 +31,6 @@ public class LCanvas extends Table{ public DragLayout statements; public ScrollPane pane; - public Group jumps; // compatibility StatementElem dragging; StatementElem hovered; @@ -110,15 +109,14 @@ public class LCanvas extends Table{ clear(); statements = new DragLayout(); - jumps = statements.jumps; pane = pane(t -> { t.center(); t.add(statements).pad(2f).center().width(targetWidth); t.addChild(statements.jumps); - jumps.touchable = Touchable.disabled; - jumps.update(()->jumps.setCullingArea(t.getCullingArea())); + statements.jumps.touchable = Touchable.disabled; + statements.jumps.update(() -> statements.jumps.setCullingArea(t.getCullingArea())); statements.jumps.cullable = false; }).grow().get(); pane.setFlickScroll(false); @@ -604,7 +602,7 @@ public class LCanvas extends Table{ if(stage == null){ curve.remove(); }else{ - canvas.jumps.addChild(curve); + canvas.statements.jumps.addChild(curve); } } } @@ -641,7 +639,7 @@ public class LCanvas extends Table{ //MDTX(WayZer, 2024/8/6) Support Cull invertedHeight = false; - Group desc = canvas.jumps.parent; + Group desc = canvas.statements.jumps.parent; Vec2 t = Tmp.v1.set(button.getWidth() / 2f, button.getHeight() / 2f); button.localToAscendantCoordinates(desc, t); setPosition(t.x, t.y);