diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index bc8ca60339..80d41b2dac 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1587,7 +1587,7 @@ unit.retusa.description = Places proximity mines. Repairs allied units. unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret. unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units. unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies. -unit.navanax.description = Fires massive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets. +unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets. lst.read = Read a number from a linked memory cell. lst.write = Write a number to a linked memory cell. diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 88d1758c6a..8b84a190c7 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1161,7 +1161,7 @@ public class Blocks implements ContentList{ requirements(Category.power, with(Items.copper, 40, Items.graphite, 35, Items.lead, 50, Items.silicon, 35, Items.metaglass, 40)); powerProduction = 1.8f; generateEffect = Fx.redgeneratespark; - effectChance = 0.013f; + effectChance = 0.011f; size = 2; floating = true; ambientSound = Sounds.hum; diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index e0288e4eb8..6b1d87ec06 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1526,12 +1526,16 @@ public class Fx{ }); }), - redgeneratespark = new Effect(80, e -> { - color(Pal.redSpark, Color.gray, e.fin()); - randLenVectors(e.id, 2, e.finpow() * 9f, (x, y) -> { - Fill.circle(e.x + x, e.y + y, e.fslope() * 1.8f); - }); - }), + redgeneratespark = new Effect(90, e -> { + color(Pal.redSpark); + alpha(e.fslope()); + + rand.setSeed(e.id); + for(int i = 0; i < 2; i++){ + v.set(e.finpow() * 9f * rand.nextFloat(), 0).rotate(rand.random(360f)).add(e.x, e.y); + Fill.circle(v.x, v.y, rand.random(1.4f, 2.4f)); + } + }).layer(Layer.bullet - 1f), generatespark = new Effect(18, e -> { randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { diff --git a/core/src/mindustry/world/draw/DrawArcSmelter.java b/core/src/mindustry/world/draw/DrawArcSmelter.java index 957b739b4c..51706aafbe 100644 --- a/core/src/mindustry/world/draw/DrawArcSmelter.java +++ b/core/src/mindustry/world/draw/DrawArcSmelter.java @@ -22,8 +22,6 @@ public class DrawArcSmelter extends DrawBlock{ Draw.rect(bottom, build.x, build.y); if(build.warmup > 0f && flameColor.a > 0.001f){ - - Lines.stroke(circleStroke * build.warmup); float si = Mathf.absin(flameRadiusScl, flameRadiusMag); diff --git a/gradle.properties b/gradle.properties index 7d2ad854bf..f7d316f36e 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=cc2e0588e1a87c732d0d155fe24932ae43d641bf +archash=0242770e4a63299dbaed350f974f4fee1de81cf1