Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed MendProjector phase coloration

Browse Source
This commit is contained in:
Anuken
2021-07-21 21:03:26 -04:00
parent 95fd073432
commit b3be906e28
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Fx.java
View File

@@ -1532,7 +1532,7 @@ public class Fx{
rand.setSeed(e.id); rand.setSeed(e.id);
for(int i = 0; i < 2; i++){ 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)); Fill.circle(v.x, v.y, rand.random(1.4f, 2.4f));
} }
}).layer(Layer.bullet - 1f), }).layer(Layer.bullet - 1f),

4
core/src/mindustry/world/blocks/defense/MendProjector.java
View File

@@ -18,7 +18,7 @@ import static mindustry.Vars.*;
public class MendProjector extends Block{ public class MendProjector extends Block{
public final int timerUse = timers++; public final int timerUse = timers++;
public Color baseColor = Color.valueOf("84f491"); public Color baseColor = Color.valueOf("84f491");
public Color phaseColor = Color.valueOf("ffd59e"); public Color phaseColor = baseColor;
public @Load("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public float reload = 250f; public float reload = 250f;
public float range = 60f; public float range = 60f;
@@ -91,7 +91,7 @@ public class MendProjector extends Block{
float realRange = range + phaseHeat * phaseRangeBoost; float realRange = range + phaseHeat * phaseRangeBoost;
charge = 0f; 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()); other.heal(other.maxHealth() * (healPercent + phaseHeat * phaseBoost) / 100f * efficiency());
Fx.healBlockFull.at(other.x, other.y, other.block.size, baseColor); Fx.healBlockFull.at(other.x, other.y, other.block.size, baseColor);
}); });

2
gradle.properties
View File

@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
#needed for android compilation #needed for android compilation
android.useAndroidX=true android.useAndroidX=true
archash=0242770e4a63299dbaed350f974f4fee1de81cf1 archash=a81197126a9190337ab9065734b5134d5f08ac05