Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-09-22 13:01:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Leave sinking wreckage when units die over liquids (#12633)

Browse Source
This commit is contained in:
Александр Голомшток
2026-09-12 17:37:17 +03:00
committed by GitHub
parent b0a3e52aad
commit 1ee9684d96
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,6 +118,22 @@ public class Fx{
Draw.scl = p;
}),
//water equivalent of wreck decals - Effect.decal() doesn't render on liquids
unitDrown = new Effect(3600f, e -> {
if(!(e.data instanceof TextureRegion reg)) return;
Draw.z(Layer.scorch);
mixcol(e.color, 1f);
alpha(0.85f * (1f - Mathf.curve(e.fin(), 0.98f)));
rect(reg, e.x, e.y, e.rotation);
reset();
//small ripples drifting over the debris, so the water still reads as moving on top of it
if(Mathf.chanceDelta(0.02f)){
Fx.ripple.at(e.x + Mathf.range(reg.width / 3f), e.y + Mathf.range(reg.height / 3f), 0.6f, e.color);
}
}),
unitSpirit = new Effect(17f, e -> {
if(!(e.data instanceof Position to)) return;

11
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -929,11 +929,20 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
}
if(!headless && type.createScorch){
Tile deathTile = world.tileWorld(x, y);
//decals don't render on liquids, so wreckage sinks instead of leaving a mark on top
boolean sinks = deathTile != null && !deathTile.floor().hasSurface();
Color sinkColor = sinks ? deathTile.floor().mapColor : null;
for(int i = 0; i < type.wreckRegions.length; i++){
if(type.wreckRegions[i].found()){
float range = type.hitSize /4f;
Tmp.v1.rnd(range);
Effect.decal(type.wreckRegions[i], x + Tmp.v1.x, y + Tmp.v1.y, rotation - 90);
if(sinks){
Fx.unitDrown.at(x + Tmp.v1.x, y + Tmp.v1.y, rotation - 90, sinkColor, type.wreckRegions[i]);
}else{
Effect.decal(type.wreckRegions[i], x + Tmp.v1.x, y + Tmp.v1.y, rotation - 90);
}
}
}
}