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

AmmoType refactoring

Browse Source
This commit is contained in:
Anuken
2021-07-27 12:42:50 -04:00
parent adbe55b0db
commit 269c48b65b
16 changed files with 176 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -553,19 +553,6 @@ public class HudFragment extends Fragment{
Core.scene.add(image);
}
public void showLaunch(){
Image image = new Image();
image.color.a = 0f;
image.setFillParent(true);
image.actions(Actions.fadeIn(40f / 60f));
image.update(() -> {
if(state.isMenu()){
image.remove();
}
});
Core.scene.add(image);
}
public void showLand(){
Image image = new Image();
image.color.a = 1f;
@@ -726,7 +713,7 @@ public class HudFragment extends Fragment{
t.add(new SideBar(() -> player.unit().healthf(), () -> true, true)).width(bw).growY().padRight(pad);
t.image(() -> player.icon()).scaling(Scaling.bounded).grow().maxWidth(54f);
t.add(new SideBar(() -> player.dead() ? 0f : player.displayAmmo() ? player.unit().ammof() : player.unit().healthf(), () -> !player.displayAmmo(), false)).width(bw).growY().padLeft(pad).update(b -> {
b.color.set(player.displayAmmo() ? player.dead() || player.unit() instanceof BlockUnitc ? Pal.ammo : player.unit().type.ammoType.color : Pal.health);
b.color.set(player.displayAmmo() ? player.dead() || player.unit() instanceof BlockUnitc ? Pal.ammo : player.unit().type.ammoType.color() : Pal.health);
});
t.getChildren().get(1).toFront();