mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

LCanvas cleanup

Browse Source
This commit is contained in:
Anuken 2025-02-11 11:07:51 -05:00
parent 4768bf0aeb
commit 9507292107
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@ -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;

10
core/src/mindustry/logic/LCanvas.java
View File

@ -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);