From fa8d43bbc9f9eddaea4b6469e20c5003f3073658 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 19 Jan 2021 19:55:21 -0500 Subject: [PATCH] Misc cleanup --- core/assets-raw/sprites/units/vanguard-cell.png | Bin 611 -> 0 bytes core/assets-raw/sprites/units/vanguard.png | Bin 1290 -> 0 bytes core/src/mindustry/content/Blocks.java | 1 + core/src/mindustry/content/Bullets.java | 10 +++++----- .../mindustry/entities/bullet/BulletType.java | 3 +-- core/src/mindustry/graphics/OverlayRenderer.java | 2 +- .../world/blocks/experimental/BlockForge.java | 9 +++++++++ 7 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 core/assets-raw/sprites/units/vanguard-cell.png delete mode 100644 core/assets-raw/sprites/units/vanguard.png diff --git a/core/assets-raw/sprites/units/vanguard-cell.png b/core/assets-raw/sprites/units/vanguard-cell.png deleted file mode 100644 index 4366b2167b0e3e7259edb97f81f1340fbba5a701..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 611 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F|M2mv-m%Sl&i}Rib#=~BhWQ>gr+F@`-BXx% zZwv3a-$xR|ri4B!ezd|Gu1BAwpF2%vohNB_d1d7zgN+d{5|%bcUcAz=yhC}_ zvfzCa3L~HHIU1=Q9{GCSpVotO_H8;-I!oCjLC|}Gf|H}D>Xbxfx7B`Kts-xa+x|K1 zyWd5xHAdB-NM`{PZ_#D`f9(5rZ~Zh`I4{V6uVlZ)x#JoaHglU~^?j~=W6>*o;6G2y z%iQ{V5ur*P{6rJ@-l(7#L=Gx;TbpG`_v& z$km`A(E2dFWU}AGzvA;2ZN9OJW1_;$>D~YGRXH9@t1EIcfI#qXSZ}Lud3q<-z1Zf_@!5U{*WWN}Tz}y} zj){RZ@0M>tZQtA?)h=+q;?Vb8y>wMgWAvWJYk%+mKYLH(G)tAE>_f(ceauX*s(tI` RPgn@D*3;F`Wt~$(696WX7n}e9 diff --git a/core/assets-raw/sprites/units/vanguard.png b/core/assets-raw/sprites/units/vanguard.png deleted file mode 100644 index feacbacc6eb7dee74207517f22a3ded34fb94278..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1290 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F^X_+~x z3=A3*YbV-z9Cna78XxScJC!d?pzuV%+$aIj!Yf)L3!PSoMwJ@u{K7rUL`74tuPOWB z!TzJGn!7iz<6GCH@PqNuqgP8_D5?Hiueqh;|M2mv-m%Sl&i}Rib#=~BhWQ>gr+F@`-BXx% zZwv3a-$xR|ri4B!ezd|Gu1BAwpF2%vohNB_d1d7zgN+d{5|%bcUcAz=yhC}_ zvfzCa3L~HHIU1=Q9{GCSpVotO_H8;-I!oCjLC|}Gf|H}D>Xbxfx7B`Kts-xa+x|K1 zyWd5xHAdB-NM`{PZ_#D`f9(5rZ~Zh`I4{V6uVlZ)x#JoaHglU~^?j~=W6>*o;6G2y z%iQ{V5ur*P{7L;x|uXU|@Fiba4#HXnY%K z+kM+Xpf)>bW=QzV2Zvg<1q-SRT%Aspyj)+l&gz}|4|R!f@vGP4pI@?wz16(nR4cde zALb@+?cOlSwP|VTsqqRA*xSCotJ$-B?$j{t2Tk01Kh{4yC;Gy$o{53S?QqcM+xg{u z4DXh0Pd|A(vO&GZe6Q)`?+cVN=IFgpIiS9D!=&#Ylr(mAcnD2+ZrS%@`!DBDtDj0S zOh`>;a0tv{V3==LpYx+osmdb3YVIt{nJiB#*@7 z=R)7Cm#rOK3&P`@TWeOWRsHU1{NSMAr>DZ(Oy}!)2nk%N-+BMtq9XQ?fH_A`eUsXTB_}7B1XBvKH zwY*L$DsDY_c4}5}R$eeCuiN2Y>W#|hw_4u55+kyz;rO4EA|A^6UnA3!45T($$8!Zb zxY}8@iha5?BhY1KX9BColkn4~T}hWcWFkAXR;=$oZF|#HaBb+iiO(lp7P_5Z{^QrT z>c9VQzvpMT@QS;34?|bM?bw^UJ}g~s$}INj$h5c1pB&z1+GZl082?32CHLBrBT|u> zIR;W?_cpF#V)?}9^YUlVgpNygS>6v;-3a6pS;TPgVqrO7;{>jA%e&^PG>Iz2DlUlI zlX~P@%Yp4GsY}ioxOyMhucUv(Lrig6far>K->)m^AK`MfcpJG`_t7mw75+c9A5`+r zNd+WLam*_W*Wz3utMch!eYlA9XGO{M^_?7+fdxz)1JZ8Zm{|S)^;|E51*w;RW*B^UTM{(SggMg8ji3Gd z<{zo0AD8$j-A{jiNAT|w?nze6>%3C7rQXu=<*H*H8XKb0vcx-~Ii}3NBrG|=br^9|#DNhSHo*&k`r2A)&@{BzZrh2cWJVY)k zfubqcV$PqLU;iauTNS!eXO*dQpx(31n`>X~ebB`BgZW7B=52uod8RQiFfe$!`njxg HN@xNA*STXt diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index ed8013c4d2..7bdce7d094 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1838,6 +1838,7 @@ public class Blocks implements ContentList{ shootType = new ContinuousLaserBulletType(70){{ length = 200f; hitEffect = Fx.hitMeltdown; + hitColor = Pal.meltdownHit; drawSize = 420f; incendChance = 0.4f; diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index dbed9cc7ac..2777ca1e2d 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -235,9 +235,9 @@ public class Bullets implements ContentList{ fragExplosive = new FlakBulletType(4f, 5){{ shootEffect = Fx.shootBig; - ammoMultiplier = 4f; - splashDamage = 18f; - splashDamageRadius = 55f; + ammoMultiplier = 5f; + splashDamage = 26f; + splashDamageRadius = 60f; collidesGround = true; status = StatusEffects.blasted; @@ -245,9 +245,9 @@ public class Bullets implements ContentList{ }}; fragSurge = new FlakBulletType(4.5f, 13){{ - ammoMultiplier = 4f; + ammoMultiplier = 5f; splashDamage = 50f; - splashDamageRadius = 40f; + splashDamageRadius = 38f; lightning = 2; lightningLength = 7; shootEffect = Fx.shootBig; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 318fbd6f04..2844cb22d1 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -277,8 +277,7 @@ public abstract class BulletType extends Content{ } if(weaveMag > 0){ - float scl = Mathf.randomSeed(id, 0.9f, 1.1f); - b.vel.rotate(Mathf.sin(b.time + Mathf.PI * weaveScale/2f * scl, weaveScale * scl, weaveMag) * Time.delta); + b.vel.rotate(Mathf.sin(b.time + Mathf.PI * weaveScale/2f, weaveScale, weaveMag * (Mathf.randomSeed(b.id, 0, 1) == 1 ? -1 : 1)) * Time.delta); } if(trailChance > 0){ diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index fc1ff87726..d811af6fbc 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -90,7 +90,7 @@ public class OverlayRenderer{ } for(int i = 0; i < 4; i++){ - float rot = i * 90f + 45f + (-Time.time / 1.5f) % 360f; + float rot = i * 90f + 45f + (-Time.time) % 360f; float length = select.hitSize() * 1.5f + (unitFade * 2.5f); Draw.rect("select-arrow", select.x + Angles.trnsx(rot, length), select.y + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f); } diff --git a/core/src/mindustry/world/blocks/experimental/BlockForge.java b/core/src/mindustry/world/blocks/experimental/BlockForge.java index 83f9bc032a..506593db03 100644 --- a/core/src/mindustry/world/blocks/experimental/BlockForge.java +++ b/core/src/mindustry/world/blocks/experimental/BlockForge.java @@ -18,6 +18,7 @@ import mindustry.world.blocks.*; import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.production.*; import mindustry.world.consumers.*; +import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -56,6 +57,14 @@ public class BlockForge extends PayloadAcceptor{ bars.add("progress", (BlockForgeBuild entity) -> new Bar("bar.progress", Pal.ammo, () -> entity.recipe == null ? 0f : (entity.progress / entity.recipe.buildCost))); } + @Override + public void setStats(){ + super.setStats(); + + stats.add(Stat.output, "@x@ ~ @x@", minBlockSize, minBlockSize, maxBlockSize, maxBlockSize); + } + + @Override public void drawRequestRegion(BuildPlan req, Eachable list){ Draw.rect(region, req.drawx(), req.drawy());