From c43fd88f559be5e41aac3ca4b0cf177a08e0c3cc Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 13 Jul 2021 17:34:19 -0400 Subject: [PATCH] lasers. --- .../sprites/blocks/drills/beam-drill-top.png | Bin 451 -> 451 bytes .../sprites/effects/drill-laser-end.png | Bin 0 -> 500 bytes core/assets-raw/sprites/effects/drill-laser.png | Bin 0 -> 128 bytes core/src/mindustry/core/UI.java | 4 ++-- .../world/blocks/production/BeamDrill.java | 4 ++-- gradle.properties | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 core/assets-raw/sprites/effects/drill-laser-end.png create mode 100644 core/assets-raw/sprites/effects/drill-laser.png 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 fe1557da79afa89da5ace15e65750db759f03469..fcc4ecbced8cb4da8a8693ca1de1c418f5bbaac1 100644 GIT binary patch delta 257 zcmX@ie3*H{srpDcwdt1=zn$*aVcIb#ztx3d?YZSyEk}bHUjM25?zH~r54rT)!Y4&N za@rM2b{tzNwJ~VQDrYgqMa)7<9ovsAcsNHX;TO{qrYAhpeAqi?wNIGBk;O8>sh8o- z^`w@NhB*sAlxseBPUv9BFj)RM>(s-H9Y@Zs&g}4LtNnO8@$xCjsvX@6V=Q@O{cU?Z zlol+tTi&u&cU>q8N2YrQuhNQ24$p^79?}k-6_#rlKelzS?UJ3*@PnbX^x2yYGw;l> zR!MbgSamdKI;Vst06oTbkpKVy delta 257 zcmX@ie3*H{srr-hYSS+-e0kMfj8W#CK4T|C)Lj3o9No(quKoP{t~KuSN85AT)F)|A zxWVW6qM$d}G-;_uXuA%R3%iPoKz^s=VN2HoUsyd@Pe|&_bj}UGEHIJh_oMBHmrXUUDiCvCS|njLuS#N~ zi$iv=A8U4W%xVsSOMMrlTmn7|Ogh9m!K^{(V^IY2BVIw?5^Dp-kBnTe&)iHj-f39w zajJzOw*TbTo|A0}f22Y#3ocsnwJ*Mw%Vn3`^!^_^az0$2_t>H@_%Q#)4Vz3Z_P@1Y QU|?YIboFyt=akR{0DXvY2><{9 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 0000000000000000000000000000000000000000..29bd7a5cee5c35135282f03eb61cc29f961f4541 GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4d7>k44ofy`glX=O&z_`xS z#WAE}&fD1s0}ng!xTdx-y=ZJy(`d|kz{bue^MLJYfYYo7PyUq*#kacE`%<#^+a%tz zPRq&t7Wv6yQxeEj1_lO(=SMd@eRSWSKl#ay+uzTh-IxCJP@raU$Z4%;9qlx)sTx0( z_8#>K?4HCHemYY_^(0gH$;=fhrTkWXi~ri#w>^ouAKRMruDtz1p?SXiVS_JsgUTHz zp6TqGDI|E+dh#x|&rjBf8XpzD8XUCUA+$&;bkZ)CmD4V-m{2m2_rbzRi~H_+NZU=d z6_qxyp6hv2XV;lIHC?Jjdhg=<>i+%yDix>wOJl>7DR*K)NtJBy{l z2}Vagjv@_Fk-xc1`!=!|opAh=9QxHH_OD3pwm`PEnv-8$%JN`wtuppDo0D6fGNDvN zTRJUm)+Zz3GLi4Qog;#_)r8zk4*L-1e0O@-x5a0<@-CfPy}IY_gQE+X*Uyuch$~3= zbF`6Bi{0&mjKrgo1fCm>jz#SMxbP0l+XkK>Vess literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5c83b76090231635f34acebf14bdd5b5311a19fb GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0y~yU|?ZjU@+idV_;w~le&GBfq{XsILO_JVcj{ImkbOH zR-P`7AsQ2t6BaNg>xw)LNv59v|Nk%Fo4-;h>Hjt}Uas;x iw!a#`ZM(q2z_3Ar$5kal*NuUJfx*+&&t;ucLK6T>0Vb{h literal 0 HcmV?d00001 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