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

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2021-10-12 14:14:56 -04:00
parent 25c8623e30 21549d2518
commit da225d15c7
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ import mindustry.game.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.world.Block;
import static arc.graphics.g2d.Draw.rect;
import static arc.graphics.g2d.Draw.*;
@@ -26,6 +27,19 @@ public class Fx{
public static final Effect
none = new Effect(0, 0f, e -> {}),
blockCrash = new Effect(100f, e -> {
Block block = (Block)e.data;
if(block == null){
return;
}
alpha(e.fin() + 0.5f);
float offset = Mathf.lerp(0f, 200f, e.fout());
color(0f, 0f, 0f, 0.44f);
rect(block.fullIcon, e.x - offset * 4f, e.y, (float)block.size * 8f, (float)block.size * 8f);
color(Color.white);
rect(block.fullIcon, e.x + offset, e.y + offset * 5f, (float)block.size * 8f, (float)block.size * 8f);
}),
trailFade = new Effect(400f, e -> {
if(!(e.data instanceof Trail trail)) return;

7
core/src/mindustry/core/NetClient.java
View File

@@ -181,6 +181,13 @@ public class NetClient implements ApplicationListener{
effect.at(x, y, rotation, color);
}
@Remote(variants = Variant.both, unreliable = true)
public static void effect(Effect effect, float x, float y, float rotation, Color color, Object data){
if(effect == null) return;
effect.at(x, y, rotation, color, data);
}
@Remote(variants = Variant.both)
public static void effectReliable(Effect effect, float x, float y, float rotation, Color color){