yawaflua/Informatis
1
0
Fork 0
mirror of https://github.com/yawaflua/Informatis.git synced 2025-12-10 12:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

scalescalescalescaleeeeeeeeeeeeeeeeeeeeeeeeeaaaaaaaaahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh

Browse Source
This commit is contained in:
sharlottes
2021-05-17 22:07:29 +09:00
parent f1cd3af0e1
commit f4c3ecf79f
1 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/UnitInfo/core/HudUi.java
View File

@@ -112,8 +112,8 @@ public class HudUi {
bars.add(new Stack(){{ bars.add(new Stack(){{
add(new Table(t -> { add(new Table(t -> {
t.defaults().width(23 * 8f); t.defaults().width(Scl.scl(23 * 8f));
t.defaults().height(4f * 8f); t.defaults().height(Scl.scl(4f * 8f));
t.top(); t.top();
t.add(new SBar( t.add(new SBar(
() -> { () -> {
@@ -272,7 +272,7 @@ public class HudUi {
if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) return; if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) return;
super.draw(); super.draw();
} }
}).size(30f).scaling(Scaling.bounded).padBottom(4 * 8f).padRight(6 * 8f); }).size(Scl.scl(30f)).scaling(Scaling.bounded).padBottom(Scl.scl(4 * 8f)).padRight(Scl.scl(6 * 8f));
t.pack(); t.pack();
})); }));
}}); }});
@@ -309,8 +309,8 @@ public class HudUi {
)); ));
bars.add(new Stack(){{ bars.add(new Stack(){{
add(new Table(t -> { add(new Table(t -> {
t.defaults().width(23 * 8f); t.defaults().width(Scl.scl(23 * 8f));
t.defaults().height(4f * 8f); t.defaults().height(Scl.scl(4f * 8f));
t.top(); t.top();
t.add(new SBar( t.add(new SBar(
() -> Core.bundle.format("shar-stat.ammos", getUnit().ammo, getUnit().type.ammoCapacity), () -> Core.bundle.format("shar-stat.ammos", getUnit().ammo, getUnit().type.ammoCapacity),
@@ -336,7 +336,7 @@ public class HudUi {
} }
setDrawable(region); setDrawable(region);
}); });
}}).size(30f).scaling(Scaling.bounded).padBottom(4 * 8f).padRight(6 * 8f); }}).size(Scl.scl(30f)).scaling(Scaling.bounded).padBottom(Scl.scl(4 * 8f)).padRight(Scl.scl(6 * 8f));
t.pack(); t.pack();
})); }));
}}); }});
@@ -344,13 +344,13 @@ public class HudUi {
public void addWeapon(){ public void addWeapon(){
weapon = new Table(tx -> { weapon = new Table(tx -> {
tx.defaults().minSize(12 * 8f); tx.defaults().minSize(Scl.scl(12 * 8f));
tx.left(); tx.left();
if(settings.getBool("commandedunitui") && Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()) != 0) if(settings.getBool("commandedunitui") && Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()) != 0)
tx.add(new Table(scene.getStyle(Button.ButtonStyle.class).up, t1 -> t1.table(tt -> { tx.add(new Table(scene.getStyle(Button.ButtonStyle.class).up, t1 -> t1.table(tt -> {
tt.defaults().width(24/3f * 8f); tt.defaults().width(Scl.scl(24/3f * 8f));
tt.defaults().minHeight(12/3f * 8f); tt.defaults().minHeight(Scl.scl(12/3f * 8f));
tt.left(); tt.left();
tt.top(); tt.top();
@@ -368,13 +368,13 @@ public class HudUi {
unittable.add(new Stack(){{ unittable.add(new Stack(){{
add(new Table(o -> { add(new Table(o -> {
o.left(); o.left();
o.image(region).size(30).scaling(Scaling.bounded); o.image(region).size(Scl.scl(30)).scaling(Scaling.bounded);
})); }));
add(new Table(h -> { add(new Table(h -> {
h.add(new Stack(){{ h.add(new Stack(){{
add(new Table(e -> { add(new Table(e -> {
e.defaults().growX().height(9).width(42f).padRight(2*8).padTop(8*2f); e.defaults().growX().height(Scl.scl(9)).width(Scl.scl(42f)).padRight(Scl.scl(2*8)).padTop(Scl.scl(8*2f));
e.left(); e.left();
Bar healthBar = new Bar( Bar healthBar = new Bar(
() -> "", () -> "",
@@ -385,7 +385,7 @@ public class HudUi {
})); }));
add(new Table(e -> e.add(new Stack(){{ add(new Table(e -> e.add(new Stack(){{
add(new Table(t -> { add(new Table(t -> {
t.defaults().growX().height(9).width(42f).padRight(2*8).padTop(8*5f); t.defaults().growX().height(Scl.scl(9)).width(Scl.scl(42f)).padRight(Scl.scl(2*8)).padTop(Scl.scl(8*5f));
t.left(); t.left();
t.add(new Bar( t.add(new Bar(
() -> "", () -> "",
@@ -402,12 +402,12 @@ public class HudUi {
if(!Core.settings.getBool("weaponui")) return; if(!Core.settings.getBool("weaponui")) return;
setDrawable(unit.stack.item == null || unit.stack.amount <= 0 ? Core.atlas.find("clear") : unit.stack.item.icon(Cicon.small)); setDrawable(unit.stack.item == null || unit.stack.amount <= 0 ? Core.atlas.find("clear") : unit.stack.item.icon(Cicon.small));
}); });
}}).size(2.5f * 8f).scaling(Scaling.bounded).padBottom(4 * 8f).padLeft(2 * 8f) }}).size(Scl.scl(2.5f * 8f)).scaling(Scaling.bounded).padBottom(Scl.scl(4 * 8f)).padLeft(Scl.scl(2 * 8f))
)); ));
Table table = new Table(tt -> { Table table = new Table(tt -> {
Label label = new Label(() -> unit.stack.item == null || unit.stack.amount <= 0 ? "" : unit.stack.amount + ""); Label label = new Label(() -> unit.stack.item == null || unit.stack.amount <= 0 ? "" : unit.stack.amount + "");
tt.add(label).padBottom(1 * 8f).padLeft(2 * 8f); tt.add(label).padBottom(Scl.scl(1 * 8f)).padLeft(Scl.scl(2 * 8f));
tt.pack(); tt.pack();
}); });
add(table); add(table);
@@ -415,7 +415,7 @@ public class HudUi {
t.pack(); t.pack();
})); }));
}}))); }})));
}}).padTop(2*8).padRight(2*8); }}).padTop(Scl.scl(2*8)).padRight(Scl.scl(2*8));
h.pack(); h.pack();
})); }));
}}).left(); }}).left();
@@ -430,12 +430,12 @@ public class HudUi {
Draw.color(color.r, color.g, color.b, (settings.getInt("uiopacity") / 100f) * this.parentAlpha); Draw.color(color.r, color.g, color.b, (settings.getInt("uiopacity") / 100f) * this.parentAlpha);
getBackground().draw(x, y, width, height); getBackground().draw(x, y, width, height);
} }
}).padRight(24 * 8f); }).padRight(Scl.scl(24 * 8f));
tx.row(); tx.row();
if(settings.getBool("weaponui") && type != null && type.weapons.size != 0) tx.add(new Table(scene.getStyle(Button.ButtonStyle.class).up, tt -> { if(settings.getBool("weaponui") && type != null && type.weapons.size != 0) tx.add(new Table(scene.getStyle(Button.ButtonStyle.class).up, tt -> {
tt.defaults().width(24/3f * 8f); tt.defaults().width(Scl.scl(24/3f * 8f));
tt.defaults().minHeight(12/3f * 8f); tt.defaults().minHeight(Scl.scl(12/3f * 8f));
tt.left(); tt.left();
tt.top(); tt.top();
@@ -478,13 +478,13 @@ public class HudUi {
y += recoil; y += recoil;
if(getDrawable() != null) getDrawable().draw(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY); if(getDrawable() != null) getDrawable().draw(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);
} }
}).size(6 * 8f).scaling(Scaling.bounded); }).size(Scl.scl(6 * 8f)).scaling(Scaling.bounded);
})); }));
add(new Table(h -> { add(new Table(h -> {
h.add(new Stack(){{ h.add(new Stack(){{
add(new Table(e -> { add(new Table(e -> {
e.defaults().growX().height(9).width(31.5f).padTop(9*2f); e.defaults().growX().height(Scl.scl(9)).width(Scl.scl(31.5f)).padTop(Scl.scl(9*2f));
Bar reloadBar = new Bar( Bar reloadBar = new Bar(
() -> "", () -> "",
() -> Pal.accent.cpy().lerp(Color.orange, mount.reload / weapon.reload), () -> Pal.accent.cpy().lerp(Color.orange, mount.reload / weapon.reload),
@@ -492,7 +492,7 @@ public class HudUi {
e.add(reloadBar); e.add(reloadBar);
e.pack(); e.pack();
})); }));
}}).padLeft(8f); }}).padLeft(Scl.scl(8f));
h.pack(); h.pack();
})); }));
}}).left(); }}).left();
@@ -507,7 +507,7 @@ public class HudUi {
Draw.color(color.r, color.g, color.b, (settings.getInt("uiopacity") / 100f) * this.parentAlpha); Draw.color(color.r, color.g, color.b, (settings.getInt("uiopacity") / 100f) * this.parentAlpha);
getBackground().draw(x, y, width, height); getBackground().draw(x, y, width, height);
} }
}).padRight(24 * 8f); }).padRight(Scl.scl(24 * 8f));
tx.setColor(tx.color.cpy().a(1f)); tx.setColor(tx.color.cpy().a(1f));
}); });
} }
@@ -540,7 +540,7 @@ public class HudUi {
table.left(); table.left();
addBars(); addBars();
table.add(new Table(scene.getStyle(Button.ButtonStyle.class).up, t -> { table.add(new Table(scene.getStyle(Button.ButtonStyle.class).up, t -> {
t.defaults().width(25 * 8f); t.defaults().width(Scl.scl(25 * 8f));
t.table(Tex.underline2, tt -> { t.table(Tex.underline2, tt -> {
Stack stack = new Stack(){{ Stack stack = new Stack(){{
@@ -571,7 +571,7 @@ public class HudUi {
Label label = new Label(() -> (int)(getUnit().type == null ? 0 : getUnit().type.armor) + ""); Label label = new Label(() -> (int)(getUnit().type == null ? 0 : getUnit().type.armor) + "");
label.setColor(Pal.surge); label.setColor(Pal.surge);
label.setSize(0.6f); label.setSize(0.6f);
temp.add(label).center().padLeft(getUnit().type == null || getUnit().type.armor < 10 ? -4f : 0f); temp.add(label).center().padLeft(getUnit().type == null || getUnit().type.armor < Scl.scl(10) ? Scl.scl(-4f) : Scl.scl(0f));
temp.pack(); temp.pack();
}){ }){
@Override @Override
@@ -580,7 +580,7 @@ public class HudUi {
super.draw(); super.draw();
} }
}); });
}}).growX().left().padLeft(5 * 8f); }}).growX().left().padLeft(Scl.scl(5 * 8f));
})); }));
}}; }};
@@ -602,17 +602,17 @@ public class HudUi {
ttt.add(stack); ttt.add(stack);
}).left(); }).left();
tt.table(ttt -> { //unit name tt.table(ttt -> { //unit name
ttt.defaults().width(12 * 8f); ttt.defaults().width(Scl.scl(12 * 8f));
ttt.add(label).padLeft(24f); ttt.add(label).padLeft(Scl.scl(24f));
}).center(); }).center();
tt.table(ttt -> { //unit info tt.table(ttt -> { //unit info
ttt.defaults().size(5 * 8f); ttt.defaults().size(Scl.scl(5 * 8f));
ttt.add(button).padLeft(-24f); ttt.add(button).padLeft(Scl.scl(-24f));
}).right(); }).right();
}); });
t.row(); t.row();
t.table(tt -> { t.table(tt -> {
tt.defaults().width(23 * 8f).height(4f * 8f).top(); tt.defaults().width(Scl.scl(23 * 8f)).height(Scl.scl(4f * 8f)).top();
for(Element bar : bars){ for(Element bar : bars){
tt.add(bar).growX().left(); tt.add(bar).growX().left();
tt.row(); tt.row();
@@ -627,7 +627,7 @@ public class HudUi {
Draw.color(color.r, color.g, color.b, (settings.getInt("uiopacity") / 100f) * this.parentAlpha); Draw.color(color.r, color.g, color.b, (settings.getInt("uiopacity") / 100f) * this.parentAlpha);
getBackground().draw(x, y, width, height); getBackground().draw(x, y, width, height);
} }
}).padRight(24 * 8f); }).padRight(Scl.scl(24 * 8f));
table.row(); table.row();
Unit unittemp = getUnit(); Unit unittemp = getUnit();
table.update(() -> { table.update(() -> {
@@ -665,7 +665,7 @@ public class HudUi {
core = new Table(tx -> { core = new Table(tx -> {
tx.left(); tx.left();
tx.add(new Table(tt -> { tx.add(new Table(tt -> {
tt.defaults().maxWidth(24/3f * 3f).left().top(); tt.defaults().maxWidth(Scl.scl(24/3f * 3f)).left().top();
int row = 0; int row = 0;
if(Vars.player.unit() == null) return; if(Vars.player.unit() == null) return;
@@ -687,13 +687,13 @@ public class HudUi {
coretable.add(new Stack(){{ coretable.add(new Stack(){{
add(new Table(o -> { add(new Table(o -> {
o.left(); o.left();
o.add(new Image(region)).size(6 * 8f).scaling(Scaling.bounded); o.add(new Image(region)).size(Scl.scl(6 * 8f)).scaling(Scaling.bounded);
})); }));
add(new Table(h -> { add(new Table(h -> {
h.add(new Stack(){{ h.add(new Stack(){{
add(new Table(e -> { add(new Table(e -> {
e.defaults().growX().height(9).width(6f * 8f).padTop(6 * 8f); e.defaults().growX().height(Scl.scl(9)).width(Scl.scl(6f * 8f)).padTop(Scl.scl(6 * 8f));
Bar healthBar = new Bar( Bar healthBar = new Bar(
() -> "", () -> "",
() -> Pal.health, () -> Pal.health,
@@ -719,7 +719,7 @@ public class HudUi {
Draw.color(color.r, color.g, color.b, (settings.getInt("coreuiopacity") / 100f) * this.parentAlpha); Draw.color(color.r, color.g, color.b, (settings.getInt("coreuiopacity") / 100f) * this.parentAlpha);
getBackground().draw(x, y, width, height); getBackground().draw(x, y, width, height);
} }
}).padLeft(6 * 8f); }).padLeft(Scl.scl(6 * 8f));
tx.setColor(tx.color.cpy().a(1f)); tx.setColor(tx.color.cpy().a(1f));
}); });
} }
@@ -907,10 +907,7 @@ public class HudUi {
}); });
waveTable.update(() -> { waveTable.update(() -> {
if(Vars.state.isMenu()) { if(Vars.state.isMenu()) ui.hudGroup.removeChild(waveTable); //h
ui.hudGroup.removeChild(waveTable); //h
Log.info(savedwave + ", " + state.wave);
}
}); });
ui.hudGroup.addChild(waveTable); ui.hudGroup.addChild(waveTable);
} }