mirror of
https://github.com/yawaflua/Informatis.git
synced 2025-12-10 12:09:27 +02:00
fixed scaling 1
This commit is contained in:
sharlotte
@@ -3,12 +3,8 @@ package UnitInfo.ui;
|
||||
import arc.Core;
|
||||
import arc.graphics.Color;
|
||||
import arc.math.Mathf;
|
||||
import arc.scene.Element;
|
||||
import arc.scene.event.HandCursorListener;
|
||||
import arc.scene.ui.Image;
|
||||
import arc.scene.ui.Label;
|
||||
import arc.scene.ui.ScrollPane;
|
||||
import arc.scene.ui.Tooltip;
|
||||
import arc.scene.ui.*;
|
||||
import arc.scene.ui.layout.*;
|
||||
import arc.struct.*;
|
||||
import arc.util.Strings;
|
||||
@@ -24,9 +20,7 @@ import mindustry.type.*;
|
||||
import mindustry.ui.*;
|
||||
import mindustry.world.blocks.storage.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import static UnitInfo.SVars.modUiScale;
|
||||
import static UnitInfo.SVars.*;
|
||||
import static arc.Core.*;
|
||||
import static mindustry.Vars.*;
|
||||
|
||||
@@ -39,7 +33,9 @@ public class CoresItemsDisplay {
|
||||
private CoreBlock.CoreBuild core;
|
||||
public Team[] teams;
|
||||
public Seq<Table> tables = new Seq<>();
|
||||
|
||||
float heat;
|
||||
boolean once;
|
||||
|
||||
public CoresItemsDisplay(Team[] teams) {
|
||||
this.teams = teams;
|
||||
@@ -82,7 +78,7 @@ public class CoresItemsDisplay {
|
||||
public Table setTable(Team team){
|
||||
return new Table(t -> {
|
||||
t.clear();
|
||||
t.background(Styles.black6).margin(2).defaults().width(Scl.scl(Math.min(modUiScale, 1)) * 48 * 8f);
|
||||
t.background(Styles.black6).margin(2).defaults().width(scaledScale * 48 * 8f);
|
||||
|
||||
t.update(() -> {
|
||||
core = team.core();
|
||||
@@ -92,98 +88,94 @@ public class CoresItemsDisplay {
|
||||
heat = 0;
|
||||
updateItem(team);
|
||||
}
|
||||
if(coreAmount.get(team) != team.cores().size ||
|
||||
content.items().contains(item -> core != null && core.items.get(item) > 0 && usedItems.get(team).add(item)) ||
|
||||
content.units().contains(unit -> Groups.unit.count(u -> u.type == unit && u.team == team) > 0 && usedUnits.get(team).add(unit))){
|
||||
if(coreAmount.get(team) != team.cores().size){
|
||||
coreAmount.put(team, team.cores().size);
|
||||
rebuild();
|
||||
}
|
||||
});
|
||||
|
||||
final int[] i = {0};
|
||||
t.table(coretable -> {
|
||||
final int[] i = {0};
|
||||
for(CoreBlock.CoreBuild core : team.cores()) {
|
||||
coretable.table().update(tt -> {
|
||||
tt.clear();
|
||||
tt.table(ttt -> {
|
||||
ttt.stack(
|
||||
new Table(s -> {
|
||||
s.center();
|
||||
Image image = new Image(core.block.uiIcon);
|
||||
image.clicked(() -> {
|
||||
if(control.input instanceof DesktopInput)
|
||||
((DesktopInput) control.input).panning = true;
|
||||
Core.camera.position.set(core.x, core.y);
|
||||
});
|
||||
if(!mobile) {
|
||||
HandCursorListener listener1 = new HandCursorListener();
|
||||
image.addListener(listener1);
|
||||
image.update(() -> image.color.lerp(!listener1.isOver() ? Color.lightGray : Color.white, Mathf.clamp(0.4f * Time.delta)));
|
||||
}
|
||||
image.addListener(new Tooltip(tttt -> {
|
||||
Label label = new Label(() -> "([#" + Tmp.c1.set(Color.green).lerp(Color.red, 1 - core.healthf()).toString() + "]" + Strings.fixed(core.health, 2) + "[]/" + Strings.fixed(core.block.health, 2) + ")");
|
||||
if (modUiScale < 1) label.setFontScale(Scl.scl(modUiScale));
|
||||
tttt.background(Tex.button).add(label);
|
||||
}));
|
||||
s.add(image).size(iconLarge * Scl.scl(Math.min(modUiScale, 1)));
|
||||
}),
|
||||
new Table(h -> {
|
||||
h.bottom().defaults().height(Scl.scl(modUiScale) * 9f).width(Scl.scl(modUiScale) * iconLarge * 1.5f).growX();
|
||||
h.add(new SBar(() -> "", () -> Pal.health, () -> core.health / core.block.health).rect().init());
|
||||
h.pack();
|
||||
})
|
||||
);
|
||||
ttt.row();
|
||||
Label label = new Label(() -> "(" + (int) core.x / 8 + ", " + (int) core.y / 8 + ")");
|
||||
label.setFontScale(Scl.scl(Math.min(modUiScale, 1)) * 0.75f);
|
||||
ttt.add(label);
|
||||
});
|
||||
if(++i[0] % 5 == 0) coretable.row();
|
||||
}).padLeft(4).padRight(4);
|
||||
coretable.table(tt -> {
|
||||
tt.stack(
|
||||
new Table(s -> {
|
||||
s.center();
|
||||
Image image = new Image(core.block.uiIcon);
|
||||
image.clicked(() -> {
|
||||
if(control.input instanceof DesktopInput)
|
||||
((DesktopInput) control.input).panning = true;
|
||||
Core.camera.position.set(core.x, core.y);
|
||||
});
|
||||
if(!mobile) {
|
||||
HandCursorListener listener1 = new HandCursorListener();
|
||||
image.addListener(listener1);
|
||||
image.update(() -> image.color.lerp(!listener1.isOver() ? Color.lightGray : Color.white, Mathf.clamp(0.4f * Time.delta)));
|
||||
}
|
||||
image.addListener(new Tooltip(tttt -> {
|
||||
Label label = new Label(() -> "([#" + Tmp.c1.set(Color.green).lerp(Color.red, 1 - core.healthf()).toString() + "]" + Strings.fixed(core.health, 2) + "[]/" + Strings.fixed(core.block.health, 2) + ")");
|
||||
if (modUiScale < 1) label.setFontScale(Scl.scl(modUiScale));
|
||||
tttt.background(Tex.button).add(label);
|
||||
}));
|
||||
s.add(image).size(iconLarge * scaledScale);
|
||||
}),
|
||||
new Table(h -> {
|
||||
h.bottom().defaults().height(Scl.scl(modUiScale) * 9f).width(Scl.scl(modUiScale) * iconLarge * 1.5f).growX();
|
||||
h.add(new SBar(() -> "", () -> Pal.health, () -> core.health / core.block.health).rect().init());
|
||||
h.pack();
|
||||
})
|
||||
);
|
||||
tt.row();
|
||||
Label label = new Label(() -> "(" + (int) core.x / 8 + ", " + (int) core.y / 8 + ")");
|
||||
label.setFontScale(scaledScale * 0.75f);
|
||||
tt.add(label);
|
||||
}).padTop(scaledScale * 2).padLeft(scaledScale * 4).padRight(scaledScale * 4);
|
||||
if(++i[0] % 5 == 0) coretable.row();
|
||||
}
|
||||
});
|
||||
t.row();
|
||||
i[0] = 0;
|
||||
t.table(itemTable -> {
|
||||
itemTable.center();
|
||||
t.table().update(itemTable -> {
|
||||
itemTable.clear();
|
||||
final int[] i = {0};
|
||||
for(Item item : content.items()){
|
||||
itemTable.table().update(tt -> {
|
||||
tt.clear();
|
||||
if(team.core() != null && team.core().items.has(item)) {
|
||||
tt.stack(
|
||||
new Table(ttt -> {
|
||||
ttt.image(item.uiIcon).size(iconSmall * Scl.scl(Math.min(modUiScale, 1))).tooltip(tttt -> tttt.background(Styles.black6).margin(2f * Scl.scl(Math.min(modUiScale, 1))).add(item.localizedName).style(Styles.outlineLabel));
|
||||
Label label = new Label(() -> core == null ? "0" : UI.formatAmount(core.items.get(item)));
|
||||
label.setFontScale(Scl.scl(Math.min(modUiScale, 1)));
|
||||
ttt.add(label).minWidth(5 * 8f * Scl.scl(Math.min(modUiScale, 1))).left();
|
||||
}),
|
||||
new Table(ttt -> {
|
||||
ttt.bottom().right();
|
||||
Label label = new Label(() -> {
|
||||
int amount = updateItems.get(team).get(item.id).amount;
|
||||
return (amount > 0 ? "[green]+" : amount == 0 ? "[orange]" : "[red]") + amount + "[]";
|
||||
});
|
||||
label.setFontScale(0.65f * Scl.scl(Math.min(modUiScale, 1)));
|
||||
ttt.add(label).bottom().right().padTop(16f * Scl.scl(Math.min(modUiScale, 1)));
|
||||
ttt.pack();
|
||||
})
|
||||
).padRight(3 * Scl.scl(Math.min(modUiScale, 1))).left();
|
||||
if(++i[0] % 5 == 0) itemTable.row();
|
||||
};
|
||||
});
|
||||
itemTable.table(tt -> {
|
||||
tt.center();
|
||||
if(team.core() != null && team.core().items.has(item)) {
|
||||
tt.stack(
|
||||
new Table(ttt -> {
|
||||
ttt.image(item.uiIcon).size(iconSmall * scaledScale).tooltip(tttt -> tttt.background(Styles.black6).margin(2f * scaledScale).add(item.localizedName).style(Styles.outlineLabel));
|
||||
Label label = new Label(() -> core == null ? "0" : UI.formatAmount(core.items.get(item)));
|
||||
label.setFontScale(scaledScale);
|
||||
ttt.add(label).minWidth(5 * 8f * scaledScale).left();
|
||||
}),
|
||||
new Table(ttt -> {
|
||||
ttt.bottom().right();
|
||||
Label label = new Label(() -> {
|
||||
int amount = updateItems.get(team).get(item.id).amount;
|
||||
return (amount > 0 ? "[green]+" : amount == 0 ? "[orange]" : "[red]") + amount + "[]";
|
||||
});
|
||||
label.setFontScale(0.65f * scaledScale);
|
||||
ttt.add(label).bottom().right().padTop(16f * scaledScale);
|
||||
ttt.pack();
|
||||
})
|
||||
).padRight(3 * scaledScale).left();
|
||||
if(++i[0] % 5 == 0) itemTable.row();
|
||||
};
|
||||
});
|
||||
}
|
||||
});
|
||||
t.row();
|
||||
i[0] = 0;
|
||||
t.table(unitTable -> {
|
||||
unitTable.center();
|
||||
t.table().update(unitTable -> {
|
||||
unitTable.clear();
|
||||
final int[] i = {0};
|
||||
for(UnitType unit : content.units()){
|
||||
unitTable.table().update(tt -> {
|
||||
tt.clear();
|
||||
unitTable.table(tt -> {
|
||||
tt.center();
|
||||
if(unit != UnitTypes.block && Groups.unit.contains(u -> u.type == unit && u.team == team)){
|
||||
tt.image(unit.uiIcon).size(iconSmall * Scl.scl(Math.min(modUiScale, 1))).padRight(3 * Scl.scl(Math.min(modUiScale, 1))).tooltip(ttt -> ttt.background(Styles.black6).margin(2f * Scl.scl(Math.min(modUiScale, 1))).add(unit.localizedName).style(Styles.outlineLabel));
|
||||
tt.image(unit.uiIcon).size(iconSmall * scaledScale).padRight(3 * scaledScale).tooltip(ttt -> ttt.background(Styles.black6).margin(2f * scaledScale).add(unit.localizedName).style(Styles.outlineLabel));
|
||||
Label label = new Label(() -> core == null ? "0" : UI.formatAmount(Groups.unit.count(u -> u.team == team && u.type == unit)));
|
||||
label.setFontScale(Scl.scl(Math.min(modUiScale, 1)));
|
||||
tt.add(label).padRight(3 * Scl.scl(Math.min(modUiScale, 1))).minWidth(5 * 8f * Scl.scl(Math.min(modUiScale, 1))).left();
|
||||
label.setFontScale(scaledScale);
|
||||
tt.add(label).padRight(3 * scaledScale).minWidth(5 * 8f * scaledScale).left();
|
||||
if(++i[0] % 5 == 0) unitTable.row();
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user