mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-30 04:10:41 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2024-04-15 12:54:14 -04:00
commit 49409cdc36
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/src/mindustry/world/draw/DrawFlame.java
View file

@ -14,6 +14,7 @@ public class DrawFlame extends DrawBlock{
public TextureRegion top;
public float lightRadius = 60f, lightAlpha = 0.65f, lightSinScl = 10f, lightSinMag = 5;
public float flameRadius = 3f, flameRadiusIn = 1.9f, flameRadiusScl = 5f, flameRadiusMag = 2f, flameRadiusInMag = 1f;
public float flameX = 0, flameY = 0;
public DrawFlame(){
}
@ -43,9 +44,9 @@ public class DrawFlame extends DrawBlock{
Draw.alpha(((1f - g) + Mathf.absin(Time.time, 8f, g) + Mathf.random(r) - r) * build.warmup());
Draw.tint(flameColor);
Fill.circle(build.x, build.y, flameRadius + Mathf.absin(Time.time, flameRadiusScl, flameRadiusMag) + cr);
Fill.circle(build.x + flameX, build.y + flameY, flameRadius + Mathf.absin(Time.time, flameRadiusScl, flameRadiusMag) + cr);
Draw.color(1f, 1f, 1f, build.warmup());
Fill.circle(build.x, build.y, flameRadiusIn + Mathf.absin(Time.time, flameRadiusScl, flameRadiusInMag) + cr);
Fill.circle(build.x + flameX, build.y + flameY, flameRadiusIn + Mathf.absin(Time.time, flameRadiusScl, flameRadiusInMag) + cr);
Draw.color();
}
@ -53,6 +54,6 @@ public class DrawFlame extends DrawBlock{
@Override
public void drawLight(Building build){
Drawf.light(build.x, build.y, (lightRadius + Mathf.absin(lightSinScl, lightSinMag)) * build.warmup() * build.block.size, flameColor, lightAlpha);
Drawf.light(build.x + flameX, build.y + flameY, (lightRadius + Mathf.absin(lightSinScl, lightSinMag)) * build.warmup() * build.block.size, flameColor, lightAlpha);
}
}

2
servers_v7.json
View file

@ -291,7 +291,7 @@
},
{
"name": "NPTS",
"address": ["81.94.156.54"]
"address": ["178.20.45.59"]
},
{
"name": "Skywar.VN",