diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 6b1d87ec06..2eb71b595b 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1532,7 +1532,7 @@ public class Fx{ 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); + v.trns(rand.random(360f), rand.random(e.finpow() * 9f)).add(e.x, e.y); Fill.circle(v.x, v.y, rand.random(1.4f, 2.4f)); } }).layer(Layer.bullet - 1f), diff --git a/core/src/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java index 036863d530..f61f3c0355 100644 --- a/core/src/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/mindustry/world/blocks/defense/MendProjector.java @@ -18,7 +18,7 @@ import static mindustry.Vars.*; public class MendProjector extends Block{ public final int timerUse = timers++; public Color baseColor = Color.valueOf("84f491"); - public Color phaseColor = Color.valueOf("ffd59e"); + public Color phaseColor = baseColor; public @Load("@-top") TextureRegion topRegion; public float reload = 250f; public float range = 60f; @@ -91,7 +91,7 @@ public class MendProjector extends Block{ float realRange = range + phaseHeat * phaseRangeBoost; charge = 0f; - indexer.eachBlock(this, realRange, other -> other.damaged(), other -> { + indexer.eachBlock(this, realRange, Building::damaged, other -> { other.heal(other.maxHealth() * (healPercent + phaseHeat * phaseBoost) / 100f * efficiency()); Fx.healBlockFull.at(other.x, other.y, other.block.size, baseColor); }); diff --git a/gradle.properties b/gradle.properties index f7d316f36e..a5a0e68fcb 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=0242770e4a63299dbaed350f974f4fee1de81cf1 +archash=a81197126a9190337ab9065734b5134d5f08ac05