Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lasers.

Browse Source
This commit is contained in:
Anuken
2021-07-13 17:34:19 -04:00
parent cfb7d29013
commit c43fd88f55
6 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/drills/beam-drill-top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 451 B

After

Width:  |  Height:  |  Size: 451 B

BIN
core/assets-raw/sprites/effects/drill-laser-end.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 500 B

BIN
core/assets-raw/sprites/effects/drill-laser.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 128 B

4
core/src/mindustry/core/UI.java
View File

@@ -33,7 +33,7 @@ import static arc.scene.actions.Actions.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class UI implements ApplicationListener, Loadable{ public class UI implements ApplicationListener, Loadable{
private static String billions, millions, thousands; public static String billions, millions, thousands;
public static PixmapPacker packer; public static PixmapPacker packer;
@@ -587,7 +587,7 @@ public class UI implements ApplicationListener, Loadable{
if(mag >= 1_000_000_000){ if(mag >= 1_000_000_000){
return sign + Strings.fixed(mag / 1_000_000_000f, 1) + "[gray]" + billions+ "[]"; return sign + Strings.fixed(mag / 1_000_000_000f, 1) + "[gray]" + billions+ "[]";
}else if(mag >= 1_000_000){ }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){ }else if(mag >= 10_000){
return number / 1000 + "[gray]" + thousands + "[]"; return number / 1000 + "[gray]" + thousands + "[]";
}else if(mag >= 1000){ }else if(mag >= 1000){

4
core/src/mindustry/world/blocks/production/BeamDrill.java
View File

@@ -19,8 +19,8 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class BeamDrill extends Block{ public class BeamDrill extends Block{
public @Load("minelaser") TextureRegion laser; public @Load("drill-laser") TextureRegion laser;
public @Load("minelaser-end") TextureRegion laserEnd; public @Load("drill-laser-end") TextureRegion laserEnd;
public @Load("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public float drillTime = 200f; public float drillTime = 200f;

2
gradle.properties
View File

@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
#needed for android compilation #needed for android compilation
android.useAndroidX=true android.useAndroidX=true
archash=4b1c4b4565f24298c9c5c7e9b40d94957d4aa226 archash=b8db131172548e1f10ba86392e09819c34296711