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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-01-24 13:08:05 -05:00
parent 18a3f8bb68 623b7ada11
commit 9f926ef71e
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1306,6 +1306,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
case health -> health;
case maxHealth -> maxHealth;
case efficiency -> efficiency();
case range -> this instanceof Ranged r ? r.range() / tilesize : 0;
case rotation -> rotation;
case totalItems -> items == null ? 0 : items.total();
case totalLiquids -> liquids == null ? 0 : liquids.total();

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

@@ -130,6 +130,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
case y -> World.conv(y);
case team -> team.id;
case shooting -> isShooting() ? 1 : 0;
case range -> range() / tilesize;
case shootX -> World.conv(aimX());
case shootY -> World.conv(aimY());
case mining -> mining() ? 1 : 0;

12
core/src/mindustry/graphics/Drawf.java
View File

@@ -221,9 +221,13 @@ public class Drawf{
}
public static void construct(float x, float y, TextureRegion region, float rotation, float progress, float speed, float time){
construct(x, y, region, Pal.accent, rotation, progress, speed, time);
}
public static void construct(float x, float y, TextureRegion region, Color color, float rotation, float progress, float speed, float time){
Shaders.build.region = region;
Shaders.build.progress = progress;
Shaders.build.color.set(Pal.accent);
Shaders.build.color.set(color);
Shaders.build.color.a = speed;
Shaders.build.time = -time / 20f;
@@ -235,9 +239,13 @@ public class Drawf{
}
public static void construct(Building t, TextureRegion region, float rotation, float progress, float speed, float time){
construct(t, region, Pal.accent, rotation, progress, speed, time);
}
public static void construct(Building t, TextureRegion region, Color color, float rotation, float progress, float speed, float time){
Shaders.build.region = region;
Shaders.build.progress = progress;
Shaders.build.color.set(Pal.accent);
Shaders.build.color.set(color);
Shaders.build.color.a = speed;
Shaders.build.time = -time / 20f;

1
core/src/mindustry/logic/LAccess.java
View File

@@ -26,6 +26,7 @@ public enum LAccess{
y,
shootX,
shootY,
range,
shooting,
mineX,
mineY,