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

Remove shooteffect when missile unit dies without target (#11644)

Browse Source
This commit is contained in:
EggleEgg
2026-02-10 10:53:28 -05:00
committed by GitHub
parent dd4b07b2a2
commit 43a913fa78
7 changed files with 95 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Fx.java
+67
View File
@@ -1891,6 +1891,73 @@ public class Fx{
}).layer(Layer.effect + 1f),
shootQuellPulse = new Effect(40f, e -> {
rand.setSeed(e.id);
float randSize = 0.1f;
float fout = e.fout() * rand.random(1f - randSize, 1f);
float fin = e.fin() * rand.random(1f - randSize, 1f);
float coreRadius = 30f * e.fout(Interp.smooth2);
Color coreColor = Tmp.c1.set(e.color).mul(0.8f);
Color edgeColor = e.color;
e.scaled(10, i -> {
stroke(4f * i.fout());
Lines.circle(e.x, e.y, 2f + i.fin() * 40f);
});
int count = 8;
for(int i = 0; i < count; i++){
float t = (i + 1f) / count;
float radius = coreRadius + 5f;
color(Tmp.c1.set(coreColor).mul(1f + fout / 8f));
alpha(Mathf.pow(1f - t, 2.5f) * fout * 0.5f);
Fill.circle(e.x, e.y, Mathf.lerp(coreRadius * 0.6f, coreRadius * 1.7f, t));
}
color(Tmp.c1.set(edgeColor).mul(1.2f));
e.scaled(fout * 0.8f, i -> {
stroke(3f * i.fout());
Lines.circle(e.x, e.y, coreRadius * 0.6f);
});
color(coreColor);
alpha(0.5f * e.fout(Interp.smooth) + 0.8f);
stroke(e.fout(Interp.pow2InInverse) * 3f);
float circleRad = e.finpow() * 28f;
Lines.circle(e.x, e.y, circleRad);
stroke(e.fout(Interp.smooth) * 3f);
for(int i = 0; i < 9; i++){
float angle = rand.random(360f);
float lenRand = rand.random(0.5f, 1.2f);
Tmp.v1.trns(angle, circleRad);
for(int s : Mathf.signs){
Drawf.tri(e.x + Tmp.v1.x, e.y + Tmp.v1.y, e.fout() * 10f, e.fout() * 10f * lenRand + 8f, angle + 90f + s * 90f);
}
}
color(edgeColor);
alpha(e.fout(Interp.pow2InInverse) + 0.5f);
for(int i = 0; i < rand.random(8, 13); i++){
float randomPos = rand.random(0.9f, 1.1f);
float angle = rand.random(360f);
float len = rand.random(0.7f, 1.3f) * 10f + fout * 2f;
float width = rand.random(1f, 4f) * 1.5f * fout + 1f;
float dist = 8f + coreRadius * rand.random(0.8f, 1.4f);
Tmp.v1.trns(angle, circleRad);
for(int s : Mathf.signs){
Drawf.tri(e.x + Angles.trnsx(angle, dist) - Tmp.v1.x / 2, e.y + Angles.trnsy(angle, dist) * randomPos - Tmp.v1.y * randomPos / 2, width, len, angle + 90f + s * 90f);
}
}
reset();
}),
shootTitan = new Effect(10, e -> {
color(Pal.lightOrange, e.color, e.fin());
float w = 1.3f + 10 * e.fout();
core/src/mindustry/content/UnitTypes.java
+8 -5
View File
@@ -3504,8 +3504,9 @@ public class UnitTypes{
mirror = false;
reload = 1f;
shootOnDeath = true;
shootOnDeathEffect = Fx.massiveExplosion;
bullet = new ExplosionBulletType(140f, 25f){{
shootEffect = new MultiEffect(Fx.massiveExplosion, new WrapEffect(Fx.dynamicSpikes, Pal.techBlue, 24f), new WaveEffect(){{
shootEffect = new MultiEffect(new WrapEffect(Fx.dynamicSpikes, Pal.techBlue, 24f), new WaveEffect(){{
colorFrom = colorTo = Pal.techBlue;
sizeTo = 40f;
lifetime = 12f;
@@ -4147,8 +4148,9 @@ public class UnitTypes{
mirror = false;
reload = 1f;
shootOnDeath = true;
bullet = new ExplosionBulletType(110f, 25f) {{
shootEffect = Fx.massiveExplosion;
shootOnDeathEffect = Fx.massiveExplosion;
bullet = new ExplosionBulletType(110f, 25f){{
shootEffect = new WrapEffect(Fx.shootQuellPulse, Pal.suppress);
collidesAir = false;
}};
}});
@@ -4289,14 +4291,15 @@ public class UnitTypes{
mirror = false;
reload = 1f;
shootOnDeath = true;
shootOnDeathEffect = Fx.massiveExplosion;
bullet = new ExplosionBulletType(140f, 25f){{
collidesAir = false;
suppressionRange = 140f;
shootEffect = new ExplosionEffect(){{
lifetime = 50f;
waveStroke = 5f;
waveLife = 8f;
waveColor = Color.white;
waveLife = 12f;
waveColor = Pal.sap.cpy().mul(1.8f);
sparkColor = smokeColor = Pal.suppress;
waveRad = 40f;
smokeSize = 4f;