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

FX cast cleanup

Browse Source
This commit is contained in:
Anuken
2021-10-12 18:25:37 -04:00
parent 90d589939a
commit 5e8a3137c1
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,9 +79,8 @@ public class Fx{
}), }),
unitControl = new Effect(30f, e -> { unitControl = new Effect(30f, e -> {
if(!(e.data instanceof Unit)) return; if(!(e.data instanceof Unit select)) return;
Unit select = e.data();
boolean block = select instanceof BlockUnitc; boolean block = select instanceof BlockUnitc;
mixcol(Pal.accent, 1f); mixcol(Pal.accent, 1f);
@@ -96,9 +95,8 @@ public class Fx{
}), }),
unitDespawn = new Effect(100f, e -> { unitDespawn = new Effect(100f, e -> {
if(!(e.data instanceof Unit) || e.<Unit>data().type == null) return; if(!(e.data instanceof Unit select) || select.type == null) return;
Unit select = e.data();
float scl = e.fout(Interp.pow2Out); float scl = e.fout(Interp.pow2Out);
float p = Draw.scl; float p = Draw.scl;
Draw.scl *= scl; Draw.scl *= scl;
@@ -111,8 +109,7 @@ public class Fx{
}), }),
unitSpirit = new Effect(17f, e -> { unitSpirit = new Effect(17f, e -> {
if(!(e.data instanceof Position)) return; if(!(e.data instanceof Position to)) return;
Position to = e.data();
color(Pal.accent); color(Pal.accent);
@@ -130,8 +127,7 @@ public class Fx{
}), }),
itemTransfer = new Effect(12f, e -> { itemTransfer = new Effect(12f, e -> {
if(!(e.data instanceof Position)) return; if(!(e.data instanceof Position to)) return;
Position to = e.data();
Tmp.v1.set(e.x, e.y).interpolate(Tmp.v2.set(to), e.fin(), Interp.pow3) Tmp.v1.set(e.x, e.y).interpolate(Tmp.v2.set(to), e.fin(), Interp.pow3)
.add(Tmp.v2.sub(e.x, e.y).nor().rotate90(1).scl(Mathf.randomSeedRange(e.id, 1f) * e.fslope() * 10f)); .add(Tmp.v2.sub(e.x, e.y).nor().rotate90(1).scl(Mathf.randomSeedRange(e.id, 1f) * e.fslope() * 10f));
float x = Tmp.v1.x, y = Tmp.v1.y; float x = Tmp.v1.x, y = Tmp.v1.y;
@@ -145,9 +141,7 @@ public class Fx{
}), }),
pointBeam = new Effect(25f, 300f, e -> { pointBeam = new Effect(25f, 300f, e -> {
if(!(e.data instanceof Position)) return; if(!(e.data instanceof Position pos)) return;
Position pos = e.data();
Draw.color(e.color, e.fout()); Draw.color(e.color, e.fout());
Lines.stroke(1.5f); Lines.stroke(1.5f);
@@ -241,11 +235,10 @@ public class Fx{
}), }),
unitWreck = new Effect(200f, e -> { unitWreck = new Effect(200f, e -> {
if(!(e.data instanceof TextureRegion)) return; if(!(e.data instanceof TextureRegion reg)) return;
Draw.mixcol(Pal.rubble, 1f); Draw.mixcol(Pal.rubble, 1f);
TextureRegion reg = e.data();
float vel = e.fin(Interp.pow5Out) * 2f * Mathf.randomSeed(e.id, 1f); float vel = e.fin(Interp.pow5Out) * 2f * Mathf.randomSeed(e.id, 1f);
float totalRot = Mathf.randomSeed(e.id + 1, 10f); float totalRot = Mathf.randomSeed(e.id + 1, 10f);
Tmp.v1.trns(Mathf.randomSeed(e.id + 2, 360f), vel); Tmp.v1.trns(Mathf.randomSeed(e.id + 2, 360f), vel);
@@ -1900,9 +1893,7 @@ public class Fx{
}).layer(Layer.groundUnit + 1f), }).layer(Layer.groundUnit + 1f),
unitShieldBreak = new Effect(35, e -> { unitShieldBreak = new Effect(35, e -> {
if(!(e.data instanceof Unitc)) return; if(!(e.data instanceof Unit unit)) return;
Unit unit = e.data();
float radius = unit.hitSize() * 1.3f; float radius = unit.hitSize() * 1.3f;