diff --git a/core/assets-raw/sprites/blocks/drills/beam-drill-top.png b/core/assets-raw/sprites/blocks/drills/beam-drill-top.png index fe1557da79..fcc4ecbced 100644 Binary files a/core/assets-raw/sprites/blocks/drills/beam-drill-top.png and b/core/assets-raw/sprites/blocks/drills/beam-drill-top.png differ diff --git a/core/assets-raw/sprites/effects/drill-laser-end.png b/core/assets-raw/sprites/effects/drill-laser-end.png new file mode 100644 index 0000000000..29bd7a5cee Binary files /dev/null and b/core/assets-raw/sprites/effects/drill-laser-end.png differ diff --git a/core/assets-raw/sprites/effects/drill-laser.png b/core/assets-raw/sprites/effects/drill-laser.png new file mode 100644 index 0000000000..5c83b76090 Binary files /dev/null and b/core/assets-raw/sprites/effects/drill-laser.png differ diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index d6aff3d11d..3e80cb9011 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -33,7 +33,7 @@ import static arc.scene.actions.Actions.*; import static mindustry.Vars.*; public class UI implements ApplicationListener, Loadable{ - private static String billions, millions, thousands; + public static String billions, millions, thousands; public static PixmapPacker packer; @@ -587,7 +587,7 @@ public class UI implements ApplicationListener, Loadable{ if(mag >= 1_000_000_000){ return sign + Strings.fixed(mag / 1_000_000_000f, 1) + "[gray]" + billions+ "[]"; }else if(mag >= 1_000_000){ - return sign + Strings.fixed(mag / 1_000_000f, 1) + "[gray]" +millions + "[]"; + return sign + Strings.fixed(mag / 1_000_000f, 1) + "[gray]" + millions + "[]"; }else if(mag >= 10_000){ return number / 1000 + "[gray]" + thousands + "[]"; }else if(mag >= 1000){ diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java index f210e774ae..0825369155 100644 --- a/core/src/mindustry/world/blocks/production/BeamDrill.java +++ b/core/src/mindustry/world/blocks/production/BeamDrill.java @@ -19,8 +19,8 @@ import mindustry.world.meta.*; import static mindustry.Vars.*; public class BeamDrill extends Block{ - public @Load("minelaser") TextureRegion laser; - public @Load("minelaser-end") TextureRegion laserEnd; + public @Load("drill-laser") TextureRegion laser; + public @Load("drill-laser-end") TextureRegion laserEnd; public @Load("@-top") TextureRegion topRegion; public float drillTime = 200f; diff --git a/gradle.properties b/gradle.properties index 69dad80b1d..da2c038cd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ kapt.include.compile.classpath=false kotlin.stdlib.default.dependency=false #needed for android compilation android.useAndroidX=true -archash=4b1c4b4565f24298c9c5c7e9b40d94957d4aa226 +archash=b8db131172548e1f10ba86392e09819c34296711