diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index e4d269b54c..020604efd7 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2694,6 +2694,9 @@ public class UnitTypes{ engineSize = 0; payloadCapacity = Mathf.sqr(3f) * tilePayload; + drawBuildBeam = false; + rotateToBuilding = false; + float es = 3.8f; setEnginesMirror( @@ -2717,9 +2720,6 @@ public class UnitTypes{ shootY = 5.75f; recoil = 2f; - drawBuildBeam = false; - rotateToBuilding = false; - bullet = new BasicBulletType(5f, 17){{ width = 7f; height = 12f; diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index fe7e89cc17..7db6191701 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -23,6 +23,7 @@ import static mindustry.Vars.*; public class BlockRenderer{ //TODO cracks take up far to much space, so I had to limit it to 7. this means larger blocks won't have cracks - draw tiling mirrored stuff instead? public static final int crackRegions = 8, maxCrackSize = 7; + public static boolean drawQuadtreeDebug = false; private static final int initialRequests = 32 * 32; private static final Color shadowColor = new Color(0, 0, 0, 0.71f), blendShadowColor = Color.white.cpy().lerp(Color.black, shadowColor.a); @@ -402,15 +403,17 @@ public class BlockRenderer{ } } - //TODO remove - Draw.z(Layer.overlayUI); - Lines.stroke(1f, Color.green); + if(drawQuadtreeDebug){ + //TODO remove + Draw.z(Layer.overlayUI); + Lines.stroke(1f, Color.green); - blockTree.intersect(camera.bounds(Tmp.r1), tile -> { - Lines.rect(tile.getHitbox(Tmp.r2)); - }); + blockTree.intersect(camera.bounds(Tmp.r1), tile -> { + Lines.rect(tile.getHitbox(Tmp.r2)); + }); - Draw.reset(); + Draw.reset(); + } } static class BlockQuadtree extends QuadTree{ diff --git a/core/src/mindustry/type/weapons/BuildWeapon.java b/core/src/mindustry/type/weapons/BuildWeapon.java index ecdcfeb612..0a99677e76 100644 --- a/core/src/mindustry/type/weapons/BuildWeapon.java +++ b/core/src/mindustry/type/weapons/BuildWeapon.java @@ -46,7 +46,6 @@ public class BuildWeapon extends Weapon{ super.draw(unit, mount); if(unit.activelyBuilding()){ - float rotation = unit.rotation - 90, weaponRotation = rotation + (rotate ? mount.rotation : 0), @@ -57,7 +56,5 @@ public class BuildWeapon extends Weapon{ unit.drawBuildingBeam(px, py); } - - } }