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 4366b2167b..0000000000 Binary files a/core/assets-raw/sprites/units/vanguard-cell.png and /dev/null differ diff --git a/core/assets-raw/sprites/units/vanguard.png b/core/assets-raw/sprites/units/vanguard.png deleted file mode 100644 index feacbacc6e..0000000000 Binary files a/core/assets-raw/sprites/units/vanguard.png and /dev/null differ 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());