diff --git a/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png b/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png index ed8121b6b9..67f7ed806b 100644 Binary files a/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png and b/core/assets-raw/sprites/blocks/units/tetrative-reconstructor.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4ae1258e7d..8b4a050c05 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -401,6 +401,8 @@ waves.sort.reverse = Reverse Sort waves.sort.begin = Begin waves.sort.health = Health waves.sort.type = Type +waves.units.hide = Hide All +waves.units.show = Show All #these are intentionally in lower case wavemode.counts = counts diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java index 76bbc82d2b..af80ab18d6 100644 --- a/core/src/mindustry/editor/WaveGraph.java +++ b/core/src/mindustry/editor/WaveGraph.java @@ -181,6 +181,17 @@ public class WaveGraph extends Table{ colors.clear(); colors.left(); + colors.button("@waves.units.hide", Styles.cleart, () -> { + if(hidden.size == usedCopy.size){ + hidden.clear(); + }else{ + hidden.addAll(usedCopy); + } + + used.clear(); + used.addAll(usedCopy); + for(UnitType o : hidden) used.remove(o); + }).update(b -> b.setText(hidden.size == usedCopy.size ? "@waves.units.show" : "@waves.units.hide")).height(32f).width(130f); colors.pane(t -> { t.left(); for(UnitType type : used){ diff --git a/core/src/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java index c94f69f2e2..b718950950 100644 --- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java @@ -36,7 +36,7 @@ public class DatabaseDialog extends BaseDialog{ cont.table(s -> { s.image(Icon.zoom).padRight(8); search = s.field(null, text -> rebuild()).growX().get(); - search.setMessageText(Core.bundle.get("players.search")); + search.setMessageText("@players.search"); }).fillX().padBottom(4).row(); cont.pane(all);