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

clean up wave info, with info-pushed bug

Browse Source
This commit is contained in:
sharlottes
2022-04-10 00:17:48 +09:00
parent d1ecbafa66
commit acd9514307
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/UnitInfo/ui/windows/UnitDisplay.java
View File

@@ -87,7 +87,7 @@ public class UnitDisplay extends WindowTable implements Updatable {
else if (target instanceof Building b && b.block != null) ui.content.show(b.block); else if (target instanceof Building b && b.block != null) ui.content.show(b.block);
}); });
ttt.add(imagebt).update((i) -> { ttt.add(imagebt).update((i) -> {
i.getStyle().imageUp = reg.get().tint(Tmp.c1.set(SVars.hud.locked ? Color.red.shiftHue(2 * 60 % Time.delta) : Color.white)); i.getStyle().imageUp = reg.get().tint(Tmp.c1.set(SVars.hud.locked ? Color.red.cpy().shiftHue(2 * Time.time) : Color.white));
i.getStyle().imageDown = reg.get().tint(Tmp.c1.mul(Color.darkGray)); i.getStyle().imageDown = reg.get().tint(Tmp.c1.mul(Color.darkGray));
i.layout(); i.layout();
}).size(4 * 8f).get().parent = null; }).size(4 * 8f).get().parent = null;

41
src/UnitInfo/ui/windows/WaveDisplay.java
View File

@@ -38,7 +38,7 @@ public class WaveDisplay extends WindowTable {
table(Styles.black8, t -> { table(Styles.black8, t -> {
ScrollPane pane = new OverScrollPane(rebuild(), Styles.nonePane, waveScrollPos).disableScroll(true, false); ScrollPane pane = new OverScrollPane(rebuild(), Styles.nonePane, waveScrollPos).disableScroll(true, false);
t.add(pane).get().parent = null; t.add(pane);
Events.on(EventType.WorldLoadEvent.class, e -> { Events.on(EventType.WorldLoadEvent.class, e -> {
pane.clearChildren(); pane.clearChildren();
pane.setWidget(rebuild()); pane.setWidget(rebuild());
@@ -76,22 +76,27 @@ public class WaveDisplay extends WindowTable {
public Table rebuild(){ public Table rebuild(){
return new Table(table -> { return new Table(table -> {
table.touchable = Touchable.enabled; table.touchable = Touchable.enabled;
for (int i = settings.getBool("pastwave") ? 0 : state.wave - 1; for (int i = settings.getBool("pastwave") ? 1 : state.wave;
i <= Math.min(state.wave + settings.getInt("wavemax"), (state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE) - 2); i <= Math.min(state.wave + settings.getInt("wavemax"), (state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE));
i++) { i++) {
final int j = i; final int index = i;
table.stack( table.table(waveRow -> {
new Table(t -> { waveRow.background(Tex.underline);
t.label(() -> "[#" + (state.wave == j ? Color.red.toString() : Pal.accent.toString()) + "]" + j + "[]").padRight(24 * 8f); waveRow.add(index+"").update(label -> {
}), Color color = Pal.accent;
new Table(Tex.underline, t -> { if (state.wave == index) color = Color.red;
if (settings.getBool("emptywave") && state.rules.spawns.find(g -> g.getSpawned(j) > 0) == null) { else if (state.wave - 1 == index && state.enemies > 0) color = Color.red.cpy().shiftHue(Time.time);
t.add(bundle.get("empty")).center();
label.setColor(label.color.cpy().lerp(color, Time.delta));
});
waveRow.table(t -> {
if (state.rules.spawns.find(g -> g.getSpawned(index-1) > 0) == null) {
if (settings.getBool("emptywave")) t.add(bundle.get("empty")).center();
return; return;
} }
ObjectIntMap<SpawnGroup> groups = getWaveGroup(j-2); ObjectIntMap<SpawnGroup> groups = getWaveGroup(index-1);
int row = 0; int row = 0;
for (SpawnGroup group : groups.keys()) { for (SpawnGroup group : groups.keys()) {
@@ -106,14 +111,14 @@ public class WaveDisplay extends WindowTable {
new Table(ttt -> { new Table(ttt -> {
ttt.bottom().left(); ttt.bottom().left();
ttt.add(amount+"").padTop(2f).fontScale(0.9f); ttt.add(amount + "").padTop(2f).fontScale(0.9f);
ttt.add("[gray]x"+spawners).padTop(10f).fontScale(0.7f); ttt.add("[gray]x" + spawners).padTop(10f).fontScale(0.7f);
ttt.pack(); ttt.pack();
}), }),
new Table(ttt -> { new Table(ttt -> {
ttt.top().right(); ttt.top().right();
ttt.image(Icon.warning.getRegion()).update(img->img.setColor(Tmp.c2.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f)))).size(12f); ttt.image(Icon.warning.getRegion()).update(img -> img.setColor(Tmp.c2.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f)))).size(12f);
ttt.visible(() -> group.effect == StatusEffects.boss); ttt.visible(() -> group.effect == StatusEffects.boss);
ttt.pack(); ttt.pack();
}) })
@@ -123,14 +128,14 @@ public class WaveDisplay extends WindowTable {
to.add("[stat]" + group.type.localizedName + "[]").row(); to.add("[stat]" + group.type.localizedName + "[]").row();
to.row(); to.row();
to.add(bundle.format("shar-stat-waveAmount", amount + " [lightgray]x" + spawners + "[]")).row(); to.add(bundle.format("shar-stat-waveAmount", amount + " [lightgray]x" + spawners + "[]")).row();
to.add(bundle.format("shar-stat-waveShield", group.getShield(j))).row(); to.add(bundle.format("shar-stat-waveShield", group.getShield(index-1))).row();
if (group.effect != null && group.effect != StatusEffects.none) if (group.effect != null && group.effect != StatusEffects.none)
to.add(bundle.get("shar-stat.waveStatus") + group.effect.emoji() + "[stat]" + group.effect.localizedName).row(); to.add(bundle.get("shar-stat.waveStatus") + group.effect.emoji() + "[stat]" + group.effect.localizedName).row();
})); }));
if (++row % 4 == 0) t.row(); if (++row % 4 == 0) t.row();
} }
}) });
); });
table.row(); table.row();
} }
}); });