From 71d67b9d8f8e666ae93989211baf71c21ba3ca66 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Sat, 2 Nov 2019 22:14:18 -0700 Subject: [PATCH 1/9] Implement number and directional category/block selection hotkeys --- core/assets/bundles/bundle.properties | 26 +++- core/assets/bundles/bundle_cs.properties | 22 ++- core/assets/bundles/bundle_de.properties | 22 ++- core/assets/bundles/bundle_es.properties | 26 +++- core/assets/bundles/bundle_et.properties | 20 ++- core/assets/bundles/bundle_eu.properties | 24 +++- core/assets/bundles/bundle_fr.properties | 24 +++- core/assets/bundles/bundle_fr_BE.properties | 22 ++- core/assets/bundles/bundle_in_ID.properties | 26 +++- core/assets/bundles/bundle_it.properties | 22 ++- core/assets/bundles/bundle_ja.properties | 20 ++- core/assets/bundles/bundle_ko.properties | 22 ++- core/assets/bundles/bundle_nl.properties | 26 +++- core/assets/bundles/bundle_nl_BE.properties | 26 +++- core/assets/bundles/bundle_pl.properties | 22 ++- core/assets/bundles/bundle_pt.properties | 26 +++- core/assets/bundles/bundle_pt_BR.properties | 26 +++- core/assets/bundles/bundle_ru.properties | 24 +++- core/assets/bundles/bundle_sv.properties | 26 +++- core/assets/bundles/bundle_tk.properties | 22 ++- core/assets/bundles/bundle_tr.properties | 26 +++- core/assets/bundles/bundle_uk_UA.properties | 24 +++- core/assets/bundles/bundle_zh_CN.properties | 20 ++- core/assets/bundles/bundle_zh_TW.properties | 22 ++- .../io/anuke/mindustry/content/Blocks.java | 126 +++++++++--------- .../src/io/anuke/mindustry/input/Binding.java | 18 ++- .../src/io/anuke/mindustry/type/Category.java | 8 ++ .../ui/dialogs/SettingsMenuDialog.java | 2 + .../ui/fragments/PlacementFragment.java | 104 ++++++++++++++- 29 files changed, 687 insertions(+), 137 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f1eb8d8851..af9a585f6c 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -614,7 +614,9 @@ setting.screenshake.name = Screen Shake setting.effects.name = Display Effects setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Save Interval -setting.seconds = {0} Seconds +setting.seconds = {0} seconds +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart) setting.fps.name = Show FPS & Ping @@ -650,12 +652,29 @@ keybind.clear_building.name = Clear Building keybind.press = Press a key... keybind.press.axis = Press an axis or key... keybind.screenshot.name = Map Screenshot -keybind.move_x.name = Move x -keybind.move_y.name = Move y +keybind.move_x.name = Move X +keybind.move_y.name = Move Y +keybind.dash.name = Dash keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Select/Shoot keybind.diagonal_placement.name = Diagonal Placement @@ -669,7 +688,6 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap -keybind.dash.name = Dash keybind.chat.name = Chat keybind.player_list.name = Player list keybind.console.name = Console diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index bdbc7a552b..8725aab78a 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Třes obrazu setting.effects.name = Zobrazit efekty setting.sensitivity.name = Citlivost ovladače setting.saveinterval.name = Interval automatického ukládání -setting.seconds = {0} Sekund +setting.seconds = {0} sekund +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Celá obrazovka setting.borderlesswindow.name = Bezokrajové okno[LIGHT_GRAY] (může vyžadovat restart) setting.fps.name = Ukázat snímky/sekundu @@ -628,10 +630,27 @@ keybind.press.axis = Stiskni osu nebo klávesu... keybind.screenshot.name = Sníměk mapy keybind.move_x.name = Pohyb na X keybind.move_y.name = Pohyb na Y +keybind.dash.name = Sprint keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Vybrat/Střílet keybind.diagonal_placement.name = Diagonal Placement @@ -645,7 +664,6 @@ keybind.menu.name = Hlavní nabídka keybind.pause.name = pauza keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap -keybind.dash.name = Sprint keybind.chat.name = Chat keybind.player_list.name = Seznam hráčů keybind.console.name = Konzole diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 85c9b67684..442d15c947 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Bildschirmwackeln setting.effects.name = Effekte anzeigen setting.sensitivity.name = Controller-Empfindlichkeit setting.saveinterval.name = Autosave Häufigkeit -setting.seconds = {0} Sekunden +setting.seconds = {0} sekunden +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Vollbild setting.borderlesswindow.name = Randloses Fenster[LIGHT_GRAY] (Neustart teilweise erforderlich) setting.fps.name = Zeige FPS @@ -628,10 +630,27 @@ keybind.press.axis = Drücke eine Taste oder bewege eine Achse... keybind.screenshot.name = Karten Screenshot keybind.move_x.name = X-Achse keybind.move_y.name = Y-Achse +keybind.dash.name = Bindestrich keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Auswählen/Schießen keybind.diagonal_placement.name = Diagonal platzieren @@ -645,7 +664,6 @@ keybind.menu.name = Menü keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap -keybind.dash.name = Bindestrich keybind.chat.name = Chat keybind.player_list.name = Spielerliste keybind.console.name = Konsole diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 28e8cc396a..e48e97b5d7 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Movimiento de la Pantalla setting.effects.name = Mostrar Efectos setting.sensitivity.name = Sensibilidad del Control setting.saveinterval.name = Intervalo del Autoguardado -setting.seconds = {0} Segundos +setting.seconds = {0} segundos +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Pantalla Completa setting.borderlesswindow.name = Ventana sin Bordes[LIGHT_GRAY] (podría requerir un reinicio) setting.fps.name = Mostrar FPS @@ -626,12 +628,29 @@ keybind.clear_building.name = Clear Building keybind.press = Presiona una tecla... keybind.press.axis = Pulsa un eje o botón... keybind.screenshot.name = Captura de pantalla de Mapa -keybind.move_x.name = Mover x -keybind.move_y.name = Mover y +keybind.move_x.name = Mover X +keybind.move_y.name = Mover Y +keybind.dash.name = Correr keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Intercambiar con Pantalla Completa keybind.select.name = Seleccionar keybind.diagonal_placement.name = Construcción Diagonal @@ -645,7 +664,6 @@ keybind.menu.name = Menú keybind.pause.name = Pausa keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimapa -keybind.dash.name = Correr keybind.chat.name = Chat keybind.player_list.name = Lista de jugadores keybind.console.name = Consola diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 8bafae658a..4908be94b5 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -591,6 +591,8 @@ setting.effects.name = Näita visuaalefekte setting.sensitivity.name = Kontrolleri tundlikkus setting.saveinterval.name = Salvestamise intervall setting.seconds = {0} sekundit +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Täisekraan setting.borderlesswindow.name = Äärteta ekraan[lightgray] (võib vajada mängu taaskäivitamist) setting.fps.name = Näita kaadrite arvu sekundis @@ -628,10 +630,27 @@ keybind.press.axis = Liiguta juhtkangi või vajuta klahvi... keybind.screenshot.name = Kuvatõmmis keybind.move_x.name = Liigu X-teljel keybind.move_y.name = Liigu Y-teljel +keybind.dash.name = Söösta keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Täisekraan keybind.select.name = Vali/Tulista keybind.diagonal_placement.name = Diagonaalne paigutamine @@ -645,7 +664,6 @@ keybind.menu.name = Menüü keybind.pause.name = Paus keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Kaart -keybind.dash.name = Söösta keybind.chat.name = Vestle keybind.player_list.name = Mängijate nimekiri keybind.console.name = Konsool diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 189574bd6d..faaf7bc916 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -591,6 +591,8 @@ setting.effects.name = Bistaratze-efektuak setting.sensitivity.name = Kontrolagailuaren sentikortasuna setting.saveinterval.name = Gordetzeko tartea setting.seconds = {0} segundo +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Pantaila osoa setting.borderlesswindow.name = Ertzik gabeko leihoa[lightgray] (berrabiaraztea behar lezake) setting.fps.name = Erakutsi FPS @@ -626,12 +628,29 @@ keybind.clear_building.name = Clear Building keybind.press = Sakatu tekla bat... keybind.press.axis = Sakatu ardatza edo tekla... keybind.screenshot.name = Maparen pantaila-argazkia -keybind.move_x.name = Mugitu x -keybind.move_y.name = Mugitu y +keybind.move_x.name = Mugitu X +keybind.move_y.name = Mugitu Y +keybind.dash.name = Arrapalada keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Txandakatu pantaila osoa keybind.select.name = Hautatu/Tirokatu keybind.diagonal_placement.name = Kokatze diagonala @@ -645,7 +664,6 @@ keybind.menu.name = Menua keybind.pause.name = Pausatu keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Mapatxoa -keybind.dash.name = Arrapalada keybind.chat.name = Txata keybind.player_list.name = Jokalarien zerrenda keybind.console.name = Kontsola diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 4341be8753..059e36ff30 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -611,6 +611,8 @@ setting.effects.name = Afficher les effets setting.sensitivity.name = Sensibilité de la manette setting.saveinterval.name = Intervalle des sauvegardes auto setting.seconds = {0} secondes +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Plein Écran setting.borderlesswindow.name = Fenêtre sans bords (Borderless)[lightgray] (peut nécessiter le redémarrage du jeu) setting.fps.name = Afficher FPS @@ -646,12 +648,29 @@ keybind.clear_building.name = Effacer les constructions keybind.press = Appuyer sur une touche... keybind.press.axis = Appuyer sur un axe ou une touche... keybind.screenshot.name = Capture d'écran -keybind.move_x.name = Mouvement x -keybind.move_y.name = Mouvement y +keybind.move_x.name = Mouvement X +keybind.move_y.name = Mouvement Y +keybind.dash.name = Sprint keybind.schematic_select.name = Sélectionner une région keybind.schematic_menu.name = Menu des schéma keybind.schematic_flip_x.name = Retourner le schéma sur l'axe X keybind.schematic_flip_y.name = Retourner le schéma sur l'axe Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Basculer en Plein Écran keybind.select.name = Sélectionner/Tirer keybind.diagonal_placement.name = Placement en diagonale @@ -665,7 +684,6 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pauser/Reprendre la construction keybind.minimap.name = Minimap -keybind.dash.name = Sprint keybind.chat.name = Chat keybind.player_list.name = Liste des joueurs keybind.console.name = Console diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index fce9241eda..256a12b7a4 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Tremblement d'écran setting.effects.name = Montrer les effets setting.sensitivity.name = Contôle de la sensibilité setting.saveinterval.name = Intervalle des sauvegardes auto -setting.seconds = {0} Secondes +setting.seconds = {0} secondes +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Plein écran setting.borderlesswindow.name = Fenêtre sans bordure[LIGHT_GRAY] (peut nécessiter un redémarrage) setting.fps.name = Afficher FPS @@ -628,10 +630,27 @@ keybind.press.axis = Appuyez sur un axe ou une touche... keybind.screenshot.name = Map Screenshot keybind.move_x.name = Mouvement X keybind.move_y.name = Mouvement Y +keybind.dash.name = Sprint keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Basculer en plein écran keybind.select.name = Sélectionner/Tirer keybind.diagonal_placement.name = Placement en diagonal @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Mini-Map -keybind.dash.name = Sprint keybind.chat.name = Tchat keybind.player_list.name = Liste des joueurs keybind.console.name = Console diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index a79ccbb1e7..c73efd6ee6 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Layar Getar setting.effects.name = Munculkan Efek setting.sensitivity.name = Sensitivitas Kontroler setting.saveinterval.name = Jarak Menyimpan -setting.seconds = {0} Detik +setting.seconds = {0} detik +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Layar Penuh setting.borderlesswindow.name = Jendela tak Berbatas[LIGHT_GRAY] (bisa membutuhkan restart) setting.fps.name = Tunjukkan FPS @@ -626,12 +628,29 @@ keybind.clear_building.name = Clear Building keybind.press = Tekan kunci... keybind.press.axis = Tekan sumbu atau kunci... keybind.screenshot.name = Tangkapan Layar Peta -keybind.move_x.name = Pindah x -keybind.move_y.name = Pindah y +keybind.move_x.name = Pindah X +keybind.move_y.name = Pindah Y +keybind.dash.name = Terbang keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Pilih/Tembak keybind.diagonal_placement.name = Penaruhan Diagonal @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Jeda keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Peta Kecil -keybind.dash.name = Terbang keybind.chat.name = Chat keybind.player_list.name = Daftar pemain keybind.console.name = Console diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index c36291d758..90a3212e87 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -591,7 +591,9 @@ setting.screenshake.name = Movimento dello schermo setting.effects.name = Visualizza effetti setting.sensitivity.name = Sensibilità del controller setting.saveinterval.name = Intervallo di salvataggio automatico -setting.seconds = {0} Secondi +setting.seconds = {0} secondi +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Schermo Intero setting.borderlesswindow.name = Schermo senza bordi[LIGHT_GRAY] (potrebbe richiedere riapertura gioco) setting.fps.name = Mostra FPS @@ -629,10 +631,27 @@ keybind.press.axis = Premi un'asse o un tasto... keybind.screenshot.name = Screenshot della mappa keybind.move_x.name = Muovi orizzontale keybind.move_y.name = Muovi verticale +keybind.dash.name = Scatto keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Schermo Intero keybind.select.name = Seleziona keybind.diagonal_placement.name = Posizionamento diagonale @@ -646,7 +665,6 @@ keybind.menu.name = Apri Menu keybind.pause.name = Pausa keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimappa -keybind.dash.name = Scatto keybind.chat.name = Chat keybind.player_list.name = Lista dei Giocatori keybind.console.name = Console diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 6239dad8b0..229e10adb9 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -591,6 +591,8 @@ setting.effects.name = 画面効果 setting.sensitivity.name = 操作感度 setting.saveinterval.name = 自動保存間隔 setting.seconds = {0} 秒 +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = フルスクリーン setting.borderlesswindow.name = 境界の無いウィンドウ[lightgray] (再起動が必要になる場合があります) setting.fps.name = FPSを表示 @@ -628,10 +630,27 @@ keybind.press.axis = 軸またはキーを押してください... keybind.screenshot.name = スクリーンショット keybind.move_x.name = 左右移動 keybind.move_y.name = 上下移動 +keybind.dash.name = ダッシュ keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = フルスクリーンの切り替え keybind.select.name = 選択/ショット keybind.diagonal_placement.name = 斜め設置 @@ -645,7 +664,6 @@ keybind.menu.name = メニュー keybind.pause.name = ポーズ keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = ミニマップ -keybind.dash.name = ダッシュ keybind.chat.name = チャット keybind.player_list.name = プレイヤーリスト keybind.console.name = コンソール diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index fbc5bcb8c4..dd2601f211 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -613,7 +613,9 @@ setting.screenshake.name = 화면 흔들기 setting.effects.name = 화면 효과 setting.sensitivity.name = 컨트롤러 감도 setting.saveinterval.name = 저장 간격 -setting.seconds = 초 +setting.seconds = {0} 초 +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = 전체 화면 setting.borderlesswindow.name = 테두리 없는 창모드[LIGHT_GRAY] (재시작이 필요할 수 있습니다) setting.fps.name = FPS 표시 @@ -651,10 +653,27 @@ keybind.press.axis = 마우스 휠 또는 키를 누르세요... keybind.screenshot.name = 맵 스크린샷 keybind.move_x.name = 오른쪽/왼쪽 이동 keybind.move_y.name = 위 / 아래 중간 +keybind.dash.name = 달리기 keybind.schematic_select.name = 영역 설정 keybind.schematic_menu.name = 설계도 메뉴 keybind.schematic_flip_x.name = 설계도 X축 뒤집기 keybind.schematic_flip_y.name = 설계도 Y축 뒤집기 +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = 전체 화면 keybind.select.name = 선택/공격 keybind.diagonal_placement.name = 대각선 설치 @@ -668,7 +687,6 @@ keybind.menu.name = 메뉴 keybind.pause.name = 일시중지 keybind.pause_building.name = 건설 일시정지/계속하기 keybind.minimap.name = 미니맵 -keybind.dash.name = 달리기 keybind.chat.name = 채팅 keybind.player_list.name = 플레이어 목록 keybind.console.name = 콘솔 diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 8c63a05598..8e9e6d25d4 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Screen Shake setting.effects.name = Display Effects setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Autosave Interval -setting.seconds = {0} Seconds +setting.seconds = {0} seconds +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = Show FPS @@ -626,12 +628,29 @@ keybind.clear_building.name = Clear Building keybind.press = Press a key... keybind.press.axis = Press an axis or key... keybind.screenshot.name = Map Screenshot -keybind.move_x.name = Move x -keybind.move_y.name = Move y +keybind.move_x.name = Move X +keybind.move_y.name = Move Y +keybind.dash.name = Dash keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Select/Shoot keybind.diagonal_placement.name = Diagonal Placement @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap -keybind.dash.name = Dash keybind.chat.name = Chat keybind.player_list.name = Player list keybind.console.name = Console diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 9740efd921..1d8950a10d 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Screen Shake setting.effects.name = Display Effects setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Autosave Interval -setting.seconds = {0} Seconds +setting.seconds = {0} seconds +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = Show FPS @@ -626,12 +628,29 @@ keybind.clear_building.name = Clear Building keybind.press = Press a key... keybind.press.axis = Press an axis or key... keybind.screenshot.name = Map Screenshot -keybind.move_x.name = Move x -keybind.move_y.name = Move y +keybind.move_x.name = Move X +keybind.move_y.name = Move Y +keybind.dash.name = Dash keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Select/Shoot keybind.diagonal_placement.name = Diagonal Placement @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap -keybind.dash.name = Dash keybind.chat.name = Chat keybind.player_list.name = Player list keybind.console.name = Console diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 02056031d3..34f1d57403 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Trzęsienie się ekranu setting.effects.name = Wyświetlanie efektów setting.sensitivity.name = Czułość kontrolera setting.saveinterval.name = Interwał automatycznego zapisywania -setting.seconds = {0} Sekundy +setting.seconds = {0} sekundy +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Pełny ekran setting.borderlesswindow.name = Bezramkowe okno[LIGHT_GRAY] (może wymagać restartu) setting.fps.name = Pokazuj FPS @@ -628,10 +630,27 @@ keybind.press.axis = Naciśnij oś lub klawisz... keybind.screenshot.name = Zrzut ekranu mapy keybind.move_x.name = Poruszanie w poziomie keybind.move_y.name = Poruszanie w pionie +keybind.dash.name = Przyspieszenie keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Przełącz Pełny Ekran keybind.select.name = Zaznacz keybind.diagonal_placement.name = Budowa po skosie @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Pauza keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimapa -keybind.dash.name = Przyspieszenie keybind.chat.name = Czat keybind.player_list.name = Lista graczy keybind.console.name = Konsola diff --git a/core/assets/bundles/bundle_pt.properties b/core/assets/bundles/bundle_pt.properties index 0c31d54495..650b251ca5 100644 --- a/core/assets/bundles/bundle_pt.properties +++ b/core/assets/bundles/bundle_pt.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Balanço do Ecrã setting.effects.name = Efeitos setting.sensitivity.name = Sensibilidade do Controle setting.saveinterval.name = Intervalo de autogravamento -setting.seconds = {0} Segundos +setting.seconds = {0} segundos +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Ecrã inteiro setting.borderlesswindow.name = Janela sem borda[LIGHT_GRAY] (Pode precisar reiniciar) setting.fps.name = Mostrar FPS @@ -626,12 +628,29 @@ keybind.clear_building.name = Limpar Edificio keybind.press = Pressione uma tecla... keybind.press.axis = Pressione uma Axis ou tecla... keybind.screenshot.name = Captura do mapa -keybind.move_x.name = mover_x -keybind.move_y.name = mover_y +keybind.move_x.name = Mover X +keybind.move_y.name = Mover Y +keybind.dash.name = Correr keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Alterar ecrã inteiro keybind.select.name = selecionar keybind.diagonal_placement.name = Colocação diagonal @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Pausar keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimapa -keybind.dash.name = Correr keybind.chat.name = Conversa keybind.player_list.name = Lista_de_jogadores keybind.console.name = console diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 169b5c0673..4e6fef0289 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Balanço da Tela setting.effects.name = Efeitos setting.sensitivity.name = Sensibilidade do Controle setting.saveinterval.name = Intervalo de autosalvamento -setting.seconds = {0} Segundos +setting.seconds = {0} segundos +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Tela Cheia setting.borderlesswindow.name = Janela sem borda[LIGHT_GRAY] (Pode precisar reiniciar) setting.fps.name = Mostrar FPS @@ -626,12 +628,29 @@ keybind.clear_building.name = Clear Building keybind.press = Pressione uma tecla... keybind.press.axis = Pressione uma Axis ou tecla... keybind.screenshot.name = Captura do mapa -keybind.move_x.name = mover_x -keybind.move_y.name = mover_y +keybind.move_x.name = Mover X +keybind.move_y.name = Mover Y +keybind.dash.name = Correr keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Alterar tela cheia keybind.select.name = selecionar keybind.diagonal_placement.name = Colocação diagonal @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Pausar keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimapa -keybind.dash.name = Correr keybind.chat.name = Conversa keybind.player_list.name = Lista_de_jogadores keybind.console.name = console diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index b7d907e9fb..9318cc9022 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -613,6 +613,8 @@ setting.effects.name = Эффекты setting.sensitivity.name = Чувствительность контроллера setting.saveinterval.name = Интервал сохранения setting.seconds = {0} секунд +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Полноэкранный режим setting.borderlesswindow.name = Безрамочное окно[lightgray] (может потребоваться перезапуск) setting.fps.name = Показывать FPS @@ -648,12 +650,29 @@ keybind.clear_building.name = Очистить план строительств keybind.press = Нажмите клавишу… keybind.press.axis = Нажмите оси или клавишу… keybind.screenshot.name = Скриншот карты -keybind.move_x.name = Движение по оси x -keybind.move_y.name = Движение по оси y +keybind.move_x.name = Движение по оси X +keybind.move_y.name = Движение по оси Y +keybind.dash.name = Полёт/Ускорение keybind.schematic_select.name = Выбрать область keybind.schematic_menu.name = Меню схем keybind.schematic_flip_x.name = Отразить схему по оси X keybind.schematic_flip_y.name = Отразить схему по оси Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Полноэкранный режим keybind.select.name = Выбор/Выстрел keybind.diagonal_placement.name = Диагональное размещение @@ -667,7 +686,6 @@ keybind.menu.name = Меню keybind.pause.name = Пауза keybind.pause_building.name = Приостановить/возобновить строительство keybind.minimap.name = Мини-карта -keybind.dash.name = Полёт/Ускорение keybind.chat.name = Чат keybind.player_list.name = Список игроков keybind.console.name = Консоль diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index e395024fd0..dece92a085 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Skärmskak setting.effects.name = Visa Effekter setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Save Interval -setting.seconds = {0} Sekunder +setting.seconds = {0} sekunder +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Fullskärm setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart) setting.fps.name = Show FPS @@ -626,12 +628,29 @@ keybind.clear_building.name = Clear Building keybind.press = Press a key... keybind.press.axis = Press an axis or key... keybind.screenshot.name = Map Screenshot -keybind.move_x.name = Move x -keybind.move_y.name = Move y +keybind.move_x.name = Move X +keybind.move_y.name = Move Y +keybind.dash.name = Dash keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Select/Shoot keybind.diagonal_placement.name = Diagonal Placement @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap -keybind.dash.name = Dash keybind.chat.name = Chat keybind.player_list.name = Player list keybind.console.name = Console diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 557617d16e..ca35bef588 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -590,7 +590,9 @@ setting.screenshake.name = Ekran sallanmasi setting.effects.name = Efekleri goster setting.sensitivity.name = Kumanda hassasligi setting.saveinterval.name = Otomatik kaydetme suresi -setting.seconds = {0} Saniye +setting.seconds = {0} saniye +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Tam ekran setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = FPS'i goster @@ -628,10 +630,27 @@ keybind.press.axis = Bir yone cevir yada tusa bas... keybind.screenshot.name = Map Screenshot keybind.move_x.name = Sol/Sag hareket keybind.move_y.name = Yukari/asagi hareket +keybind.dash.name = Kos keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Sec/silahi sik keybind.diagonal_placement.name = Diagonal Placement @@ -645,7 +664,6 @@ keybind.menu.name = Menu keybind.pause.name = Durdur keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap -keybind.dash.name = Kos keybind.chat.name = konus keybind.player_list.name = Oyuncu listesi keybind.console.name = Konsol diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index e9e1a97614..e5bbaa5ffe 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -608,7 +608,9 @@ setting.screenshake.name = Ekranı Salla setting.effects.name = Efektleri Görüntüle setting.sensitivity.name = Kontrolcü Hassasiyeti setting.saveinterval.name = Kayıt Aralığı -setting.seconds = {0} Saniye +setting.seconds = {0} saniye +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Tam Ekran setting.borderlesswindow.name = Kenarsız Pencere[lightgray] (yeniden açmak gerekebilir) setting.fps.name = FPS Göster @@ -644,12 +646,29 @@ keybind.clear_building.name = Binayı Temizle keybind.press = Bir tuşa basın... keybind.press.axis = Bir tuşa ya da yöne basın... keybind.screenshot.name = Harita Ekran Görüntüsü -keybind.move_x.name = x Ekseninde Hareket -keybind.move_y.name = y Ekseninde Hareket +keybind.move_x.name = X Ekseninde Hareket +keybind.move_y.name = Y Ekseninde Hareket +keybind.dash.name = Sıçrama keybind.schematic_select.name = Bölge Seç keybind.schematic_menu.name Şema Menüsü keybind.schematic_flip_x.name = Şemayı X ekseninde Döndür keybind.schematic_flip_y.name Şemayı Y Ekseninde Döndür +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Tam Ekran keybind.select.name = Seç/Ateş Et keybind.diagonal_placement.name = Çapraz Yerleştirme @@ -663,7 +682,6 @@ keybind.menu.name = Menü keybind.pause.name = Durdur keybind.pause_building.name = İnşaatı Duraklat/İnşaata Devam Et keybind.minimap.name = Mini Harita -keybind.dash.name = Sıçrama keybind.chat.name = Konuş keybind.player_list.name = Oyuncu Listesi keybind.console.name = Konsol diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 4a005511b5..bbf690afe3 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -603,6 +603,8 @@ setting.effects.name = Ефекти setting.sensitivity.name = Чутливість контролера setting.saveinterval.name = Інтервал збереження setting.seconds = {0} сек. +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = Повноекранний режим setting.borderlesswindow.name = Вікно без полів[lightgray] (може потребувати перезапуску) setting.fps.name = Показувати FPS @@ -638,12 +640,29 @@ keybind.clear_building.name = Clear Building keybind.press = Натисніть клавішу… keybind.press.axis = Натисніть клавішу… keybind.screenshot.name = Зняток мапи -keybind.move_x.name = Рух по осі x -keybind.move_y.name = Рух по осі y +keybind.move_x.name = Рух по осі X +keybind.move_y.name = Рух по осі Y +keybind.dash.name = Прискоритися/Літати keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Повноекранний keybind.select.name = Вибір/Постріл keybind.diagonal_placement.name = Діагональне розміщення @@ -657,7 +676,6 @@ keybind.menu.name = Меню keybind.pause.name = Пауза keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Мінімапа -keybind.dash.name = Прискоритися/Літати keybind.chat.name = Чат keybind.player_list.name = Список гравців keybind.console.name = Консоль diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 0b14969b5c..663900baba 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -591,6 +591,8 @@ setting.effects.name = 显示效果 setting.sensitivity.name = 控制器灵敏度 setting.saveinterval.name = 自动保存间隔 setting.seconds = {0} 秒 +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = 全屏 setting.borderlesswindow.name = 无边框窗口[LIGHT_GRAY] (可能需要重启) setting.fps.name = 显示 FPS @@ -628,10 +630,27 @@ keybind.press.axis = 按一下轴或键…… keybind.screenshot.name = 地图截图 keybind.move_x.name = 水平移动 keybind.move_y.name = 竖直移动 +keybind.dash.name = 冲刺 keybind.schematic_select.name = 选择区域 keybind.schematic_menu.name = 蓝图目录 keybind.schematic_flip_x.name = 水平翻转 keybind.schematic_flip_y.name = 竖直翻转 +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = 切换全屏 keybind.select.name = 选择/射击 keybind.diagonal_placement.name = 自动铺设 @@ -645,7 +664,6 @@ keybind.menu.name = 菜单 keybind.pause.name = 暂停 keybind.pause_building.name = 暂停/继续建造 keybind.minimap.name = 小地图 -keybind.dash.name = 冲刺 keybind.chat.name = 聊天 keybind.player_list.name = 玩家列表 keybind.console.name = 控制台 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index e4d636ae93..81527afb77 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -596,7 +596,9 @@ setting.screenshake.name = 畫面抖動 setting.effects.name = 顯示特效 setting.sensitivity.name = 控制器靈敏度 setting.saveinterval.name = 自動存檔間隔 -setting.seconds = {0}秒 +setting.seconds = {0} 秒 +setting.blockselecttimeout.name = Block Select Timeout +setting.milliseconds = {0} milliseconds setting.fullscreen.name = 全螢幕 setting.borderlesswindow.name = 無邊框窗口[LIGHT_GRAY]（可能需要重啟遊戲） setting.fps.name = 顯示FPS @@ -634,10 +636,27 @@ keybind.press.axis = 按一下軸向或按鍵…… keybind.screenshot.name = 地圖截圖 keybind.move_x.name = 水平移動 keybind.move_y.name = 垂直移動 +keybind.dash.name = 衝刺 keybind.schematic_select.name = 選擇區域 keybind.schematic_menu.name = 藍圖目錄 keybind.schematic_flip_x.name = X軸翻轉 keybind.schematic_flip_y.name = Y軸翻轉 +keybind.category_prev.name = Previous Category +keybind.category_next.name = Next Category +keybind.block_select_left = Block Select Left +keybind.block_select_right = Block Select Right +keybind.block_select_up = Block Select Up +keybind.block_select_down = Block Select Down +keybind.block_select_01.name = Category/Block Select 1 +keybind.block_select_02.name = Category/Block Select 2 +keybind.block_select_03.name = Category/Block Select 3 +keybind.block_select_04.name = Category/Block Select 4 +keybind.block_select_05.name = Category/Block Select 5 +keybind.block_select_06.name = Category/Block Select 6 +keybind.block_select_07.name = Category/Block Select 7 +keybind.block_select_08.name = Category/Block Select 8 +keybind.block_select_09.name = Category/Block Select 9 +keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = 全螢幕切換 keybind.select.name = 選取 keybind.diagonal_placement.name = 對角線放置 @@ -651,7 +670,6 @@ keybind.menu.name = 主選單 keybind.pause.name = 暫停遊戲 keybind.pause_building.name = 暫停/恢復建造 keybind.minimap.name = 小地圖 -keybind.dash.name = 衝刺 keybind.chat.name = 聊天 keybind.player_list.name = 玩家列表 keybind.console.name = 終端機 diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index fc713253ff..cb1af2d0a0 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -47,13 +47,10 @@ public class Blocks implements ContentList{ siliconSmelter, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer, melter, separator, sporePress, pulverizer, incinerator, coalCentrifuge, - //sandbox - powerVoid, powerSource, itemSource, liquidSource, itemVoid, message, - //defense - scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mender, mendProjector, overdriveProjector, forceProjector, shockMine, + scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet //transport conveyor, titaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router, overflowGate, massDriver, @@ -79,7 +76,10 @@ public class Blocks implements ContentList{ fortressFactory, repairPoint, //upgrades - dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad; + dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad, + + //sandbox + powerVoid, powerSource, itemSource, liquidSource, itemVoid, message; @Override public void load(){ @@ -710,69 +710,11 @@ public class Blocks implements ContentList{ consumes.power(0.50f); }}; - //endregion - //region sandbox - - powerVoid = new PowerVoid("power-void"){{ - requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with()); - alwaysUnlocked = true; - }}; - powerSource = new PowerSource("power-source"){{ - requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with()); - alwaysUnlocked = true; - }}; - itemSource = new ItemSource("item-source"){{ - requirements(Category.distribution, BuildVisibility.sandboxOnly, ItemStack.with()); - alwaysUnlocked = true; - }}; - itemVoid = new ItemVoid("item-void"){{ - requirements(Category.distribution, BuildVisibility.sandboxOnly, ItemStack.with()); - alwaysUnlocked = true; - }}; - liquidSource = new LiquidSource("liquid-source"){{ - requirements(Category.liquid, BuildVisibility.sandboxOnly, ItemStack.with()); - alwaysUnlocked = true; - }}; - message = new MessageBlock("message"){{ - requirements(Category.effect, ItemStack.with(Items.graphite, 5)); - }}; - //endregion //region defense int wallHealthMultiplier = 4; - scrapWall = new Wall("scrap-wall"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.with()); - health = 60 * wallHealthMultiplier; - variants = 5; - }}; - - scrapWallLarge = new Wall("scrap-wall-large"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.with()); - health = 60 * 4 * wallHealthMultiplier; - size = 2; - variants = 4; - }}; - - scrapWallHuge = new Wall("scrap-wall-huge"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.with()); - health = 60 * 9 * wallHealthMultiplier; - size = 3; - variants = 3; - }}; - - scrapWallGigantic = new Wall("scrap-wall-gigantic"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.with()); - health = 60 * 16 * wallHealthMultiplier; - size = 4; - }}; - - thruster = new Wall("thruster"){{ - health = 55 * 16 * wallHealthMultiplier; - size = 4; - }}; - copperWall = new Wall("copper-wall"){{ requirements(Category.defense, ItemStack.with(Items.copper, 6)); health = 80 * wallHealthMultiplier; @@ -854,6 +796,37 @@ public class Blocks implements ContentList{ size = 2; }}; + scrapWall = new Wall("scrap-wall"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.with()); + health = 60 * wallHealthMultiplier; + variants = 5; + }}; + + scrapWallLarge = new Wall("scrap-wall-large"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.with()); + health = 60 * 4 * wallHealthMultiplier; + size = 2; + variants = 4; + }}; + + scrapWallHuge = new Wall("scrap-wall-huge"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.with()); + health = 60 * 9 * wallHealthMultiplier; + size = 3; + variants = 3; + }}; + + scrapWallGigantic = new Wall("scrap-wall-gigantic"){{ + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.with()); + health = 60 * 16 * wallHealthMultiplier; + size = 4; + }}; + + thruster = new Wall("thruster"){{ + health = 55 * 16 * wallHealthMultiplier; + size = 4; + }}; + mender = new MendProjector("mender"){{ requirements(Category.effect, ItemStack.with(Items.lead, 30, Items.copper, 25)); consumes.power(0.3f); @@ -1805,6 +1778,33 @@ public class Blocks implements ContentList{ consumes.power(1.2f); }}; + //endregion + //region sandbox + + powerVoid = new PowerVoid("power-void"){{ + requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with()); + alwaysUnlocked = true; + }}; + powerSource = new PowerSource("power-source"){{ + requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with()); + alwaysUnlocked = true; + }}; + itemSource = new ItemSource("item-source"){{ + requirements(Category.distribution, BuildVisibility.sandboxOnly, ItemStack.with()); + alwaysUnlocked = true; + }}; + itemVoid = new ItemVoid("item-void"){{ + requirements(Category.distribution, BuildVisibility.sandboxOnly, ItemStack.with()); + alwaysUnlocked = true; + }}; + liquidSource = new LiquidSource("liquid-source"){{ + requirements(Category.liquid, BuildVisibility.sandboxOnly, ItemStack.with()); + alwaysUnlocked = true; + }}; + message = new MessageBlock("message"){{ + requirements(Category.effect, ItemStack.with(Items.graphite, 5)); + }}; + //endregion } } diff --git a/core/src/io/anuke/mindustry/input/Binding.java b/core/src/io/anuke/mindustry/input/Binding.java index 24421b26cd..fec053b022 100644 --- a/core/src/io/anuke/mindustry/input/Binding.java +++ b/core/src/io/anuke/mindustry/input/Binding.java @@ -9,6 +9,7 @@ import io.anuke.arc.input.KeyCode; public enum Binding implements KeyBind{ move_x(new Axis(KeyCode.A, KeyCode.D), "general"), move_y(new Axis(KeyCode.S, KeyCode.W)), + dash(KeyCode.SHIFT_LEFT), select(KeyCode.MOUSE_LEFT), deselect(KeyCode.MOUSE_RIGHT), break_block(KeyCode.MOUSE_RIGHT), @@ -22,7 +23,22 @@ public enum Binding implements KeyBind{ schematic_flip_x(KeyCode.Z), schematic_flip_y(KeyCode.X), schematic_menu(KeyCode.T), - dash(KeyCode.SHIFT_LEFT), + category_prev(KeyCode.COMMA), + category_next(KeyCode.PERIOD), + block_select_left(KeyCode.LEFT), + block_select_right(KeyCode.RIGHT), + block_select_up(KeyCode.UP), + block_select_down(KeyCode.DOWN), + block_select_01(KeyCode.NUM_1), + block_select_02(KeyCode.NUM_2), + block_select_03(KeyCode.NUM_3), + block_select_04(KeyCode.NUM_4), + block_select_05(KeyCode.NUM_5), + block_select_06(KeyCode.NUM_6), + block_select_07(KeyCode.NUM_7), + block_select_08(KeyCode.NUM_8), + block_select_09(KeyCode.NUM_9), + block_select_10(KeyCode.NUM_0), zoom_hold(KeyCode.CONTROL_LEFT, "view"), zoom(new Axis(KeyCode.SCROLL)), menu(Core.app.getType() == ApplicationType.Android ? KeyCode.BACK : KeyCode.ESCAPE), diff --git a/core/src/io/anuke/mindustry/type/Category.java b/core/src/io/anuke/mindustry/type/Category.java index a22b742345..c75451bc64 100644 --- a/core/src/io/anuke/mindustry/type/Category.java +++ b/core/src/io/anuke/mindustry/type/Category.java @@ -23,4 +23,12 @@ public enum Category{ effect; public static final Category[] all = values(); + + public Category prev(){ + return all[(this.ordinal() - 1 + all.length) % all.length]; + } + + public Category next(){ + return all[(this.ordinal() + 1) % all.length]; + } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 2f539b789d..0c8f6084d2 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -221,6 +221,8 @@ public class SettingsMenuDialog extends SettingsDialog{ game.sliderPref("saveinterval", 60, 10, 5 * 120, i -> Core.bundle.format("setting.seconds", i)); if(!mobile){ + game.sliderPref("blockselecttimeout", 750, 0, 2000, i -> Core.bundle.format("setting.milliseconds", i)); + game.checkPref("crashreport", true); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index fd088ae3b6..f0bfa46f37 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -26,7 +26,7 @@ import static io.anuke.mindustry.Vars.*; public class PlacementFragment extends Fragment{ final int rowWidth = 4; - public Category currentCategory = Category.distribution; + public Category currentCategory = Category.turret; Array returnArray = new Array<>(); Array returnCatArray = new Array<>(); boolean[] categoryEmpty = new boolean[Category.all.length]; @@ -36,6 +36,25 @@ public class PlacementFragment extends Fragment{ Tile hoverTile; Table blockTable, toggler, topTable; boolean lastGround; + boolean blockSelectEnd; + int blockSelectSeq; + long blockSelectSeqMillis; + Binding[] blockSelect = { + Binding.block_select_01, + Binding.block_select_02, + Binding.block_select_03, + Binding.block_select_04, + Binding.block_select_05, + Binding.block_select_06, + Binding.block_select_07, + Binding.block_select_08, + Binding.block_select_09, + Binding.block_select_10, + Binding.block_select_left, + Binding.block_select_right, + Binding.block_select_up, + Binding.block_select_down + }; public PlacementFragment(){ Events.on(WorldLoadEvent.class, event -> { @@ -83,6 +102,75 @@ public class PlacementFragment extends Fragment{ return true; } } + + if(ui.chatfrag.chatOpen()) return false; + for(int i = 0; i < blockSelect.length; i++){ + if(Core.input.keyTap(blockSelect[i])){ + if(i > 9) { //select block directionally + Array blocks = getByCategory(currentCategory); + Block currentBlock = getSelectedBlock(currentCategory); + for(int j = 0; j < blocks.size; j++){ + if(blocks.get(j) == currentBlock){ + switch(i){ + case 10: //left + j = (j - 1 + blocks.size) % blocks.size; + break; + case 11: //right + j = (j + 1) % blocks.size; + break; + case 12: //up + j = (j > 3 ? j - 4 : blocks.size - blocks.size % 4 + j); + j -= (j < blocks.size ? 0 : 4); + break; + case 13: //down + j = (j < blocks.size - 4 ? j + 4 : j % 4); + } + input.block = (unlocked(blocks.get(j))) ? blocks.get(j) : null; + selectedBlocks.put(currentCategory, input.block); + break; + } + } + }else if(blockSelectEnd || Time.timeSinceMillis(blockSelectSeqMillis) > Core.settings.getInt("blockselecttimeout")){ //1st number of combo, select category + currentCategory = Category.all[i]; + if(input.block != null){ + input.block = getSelectedBlock(currentCategory); + } + blockSelectSeq = 0; + blockSelectEnd = false; + blockSelectSeqMillis = Time.millis(); + }else{ //select block + if(blockSelectSeq == 0){ //2nd number of combo + blockSelectSeq = i + 1; + }else{ //3rd number of combo + //entering "X,1,0" selects the same block as "X,0" + i += (blockSelectSeq - (i != 9 ? 0 : 1)) * 10; + blockSelectEnd = true; + } + Array blocks = getByCategory(currentCategory); + input.block = (i < blocks.size && unlocked(blocks.get(i))) ? blocks.get(i) : null; + selectedBlocks.put(currentCategory, input.block); + blockSelectSeqMillis = Time.millis(); + } + return true; + } + } + + if(Core.input.keyTap(Binding.category_prev)){ + do{ + currentCategory = currentCategory.prev(); + }while(categoryEmpty[currentCategory.ordinal()]); + input.block = getSelectedBlock(currentCategory); + return true; + } + + if(Core.input.keyTap(Binding.category_next)){ + do{ + currentCategory = currentCategory.next(); + }while(categoryEmpty[currentCategory.ordinal()]); + input.block = getSelectedBlock(currentCategory); + return true; + } + return false; } @@ -280,10 +368,7 @@ public class PlacementFragment extends Fragment{ categories.addImageButton(Core.atlas.drawable("icon-" + cat.name() + "-smaller"), Styles.clearToggleTransi, () -> { currentCategory = cat; if(control.input.block != null){ - if(selectedBlocks.get(currentCategory) == null){ - selectedBlocks.put(currentCategory, getByCategory(currentCategory).find(this::unlocked)); - } - control.input.block = selectedBlocks.get(currentCategory); + control.input.block = getSelectedBlock(currentCategory); } rebuildCategory.run(); }).group(group).update(i -> i.setChecked(currentCategory == cat)).name("category-" + cat.name()); @@ -308,7 +393,7 @@ public class PlacementFragment extends Fragment{ Array getByCategory(Category cat){ returnArray.clear(); for(Block block : content.blocks()){ - if(block.category == cat && block.isVisible()){ + if(block.category == cat && block.isVisible() && unlocked(block)){ returnArray.add(block); } } @@ -320,6 +405,13 @@ public class PlacementFragment extends Fragment{ return returnArray; } + Block getSelectedBlock(Category cat){ + if(selectedBlocks.get(cat) == null){ + selectedBlocks.put(cat, getByCategory(cat).find(this::unlocked)); + } + return selectedBlocks.get(cat); + } + boolean unlocked(Block block){ return !world.isZone() || data.isUnlocked(block); } From 258670e0b5acd2dd81583c31be88988c9c8b497c Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Sat, 2 Nov 2019 22:37:06 -0700 Subject: [PATCH 2/9] Clean up --- core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index f0bfa46f37..fcf3a7bc41 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -135,8 +135,8 @@ public class PlacementFragment extends Fragment{ if(input.block != null){ input.block = getSelectedBlock(currentCategory); } - blockSelectSeq = 0; blockSelectEnd = false; + blockSelectSeq = 0; blockSelectSeqMillis = Time.millis(); }else{ //select block if(blockSelectSeq == 0){ //2nd number of combo From abd76fe89fa7563372bce92f23c675c00fcde158 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Sun, 3 Nov 2019 00:04:15 -0700 Subject: [PATCH 3/9] Checking unlocked status of blocks from getByCategory() is no longer necessary --- .../mindustry/ui/fragments/PlacementFragment.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index fcf3a7bc41..3c7d7b4cd0 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -125,7 +125,7 @@ public class PlacementFragment extends Fragment{ case 13: //down j = (j < blocks.size - 4 ? j + 4 : j % 4); } - input.block = (unlocked(blocks.get(j))) ? blocks.get(j) : null; + input.block = blocks.get(j); selectedBlocks.put(currentCategory, input.block); break; } @@ -147,7 +147,7 @@ public class PlacementFragment extends Fragment{ blockSelectEnd = true; } Array blocks = getByCategory(currentCategory); - input.block = (i < blocks.size && unlocked(blocks.get(i))) ? blocks.get(i) : null; + input.block = (i < blocks.size) ? blocks.get(i) : null; selectedBlocks.put(currentCategory, input.block); blockSelectSeqMillis = Time.millis(); } @@ -197,11 +197,6 @@ public class PlacementFragment extends Fragment{ blockTable.row(); } - if(!unlocked(block)){ - blockTable.add().size(46); - continue; - } - ImageButton button = blockTable.addImageButton(Icon.lockedSmall, Styles.selecti, () -> { if(unlocked(block)){ control.input.block = control.input.block == block ? null : block; @@ -353,7 +348,7 @@ public class PlacementFragment extends Fragment{ //update category empty values for(Category cat : Category.all){ Array blocks = getByCategory(cat); - categoryEmpty[cat.ordinal()] = blocks.isEmpty() || !unlocked(blocks.first()); + categoryEmpty[cat.ordinal()] = blocks.isEmpty(); } int f = 0; From 339213897243875c6eb0bbdd5ffcfa0fd70a5750 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Sun, 3 Nov 2019 01:34:32 -0700 Subject: [PATCH 4/9] Add settings slider steps --- .../src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 0c8f6084d2..9da6eabfe3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -218,10 +218,10 @@ public class SettingsMenuDialog extends SettingsDialog{ control.setInput(new MobileInput()); } }*/ - game.sliderPref("saveinterval", 60, 10, 5 * 120, i -> Core.bundle.format("setting.seconds", i)); + game.sliderPref("saveinterval", 60, 10, 5 * 120, 10, i -> Core.bundle.format("setting.seconds", i)); if(!mobile){ - game.sliderPref("blockselecttimeout", 750, 0, 2000, i -> Core.bundle.format("setting.milliseconds", i)); + game.sliderPref("blockselecttimeout", 750, 0, 2000, 50, i -> Core.bundle.format("setting.milliseconds", i)); game.checkPref("crashreport", true); } From 33da381892082b07400af4b66f50ae1fa0e1d94e Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Tue, 5 Nov 2019 10:48:49 -0800 Subject: [PATCH 5/9] Add hover info key combo hint --- .../mindustry/ui/fragments/PlacementFragment.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 3c7d7b4cd0..d92cec1454 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -253,9 +253,21 @@ public class PlacementFragment extends Fragment{ lastGround = false; topTable.table(header -> { + String keyCombo = new String(); + if(!mobile){ + keyCombo = " [accent][" + Core.keybinds.get(blockSelect[currentCategory.ordinal()]).key.toString(); + Array blocks = getByCategory(currentCategory); + for(int i = 0; i < blocks.size; i++){ + if(blocks.get(i) == lastDisplay){ + keyCombo += (i < 10 ? "" : "," + Core.keybinds.get(blockSelect[(i + 1) / 10 - 1]).key.toString()) + "," + Core.keybinds.get(blockSelect[i % 10]).key.toString() + "]"; + break; + } + } + } + final String keyComboFinal = keyCombo; header.left(); header.add(new Image(lastDisplay.icon(Cicon.medium))).size(8 * 4); - header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("block.unknown") : lastDisplay.localizedName) + header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("block.unknown") : lastDisplay.localizedName + (mobile ? "" : keyComboFinal)) .left().width(190f).padLeft(5); header.add().growX(); if(unlocked(lastDisplay)){ From dbb64f1d879dfd120c4ac25998bb1ddc3616b195 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Tue, 5 Nov 2019 17:25:21 -0800 Subject: [PATCH 6/9] Add hotkey tutorial to tutorial mission --- core/assets/bundles/bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index af9a585f6c..dd05f308e9 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1016,7 +1016,7 @@ unit.reaper.name = Reaper tutorial.next = [lightgray] tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse [[WASD] to move.\n[accent] Hold [[Ctrl] while scrolling[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent] Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper -tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building. +tutorial.drill = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nClick the drill tab in the bottom right.\nSelect the [accent]mechanical drill[]. Place it on a copper vein by clicking.\nYou can also select the drill by tapping [accent][[2][] then [accent][[1][] quickly, regardless of what tab is open.\n[accent]Right-click[] to stop building. tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement. tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[] tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\nUse the scrollwheel to rotate blocks before placing them.\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core. From 8a6d39d5d0d0da961db2c978a60a70f8c3e39e86 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Thu, 7 Nov 2019 07:20:43 -0800 Subject: [PATCH 7/9] Revert changes to localization files --- core/assets/bundles/bundle_cs.properties | 22 ++--------------- core/assets/bundles/bundle_de.properties | 22 ++--------------- core/assets/bundles/bundle_es.properties | 26 ++++----------------- core/assets/bundles/bundle_et.properties | 20 +--------------- core/assets/bundles/bundle_eu.properties | 24 +++---------------- core/assets/bundles/bundle_fr.properties | 24 +++---------------- core/assets/bundles/bundle_fr_BE.properties | 22 ++--------------- core/assets/bundles/bundle_in_ID.properties | 26 ++++----------------- core/assets/bundles/bundle_it.properties | 22 ++--------------- core/assets/bundles/bundle_ja.properties | 20 +--------------- core/assets/bundles/bundle_ko.properties | 22 ++--------------- core/assets/bundles/bundle_nl.properties | 26 ++++----------------- core/assets/bundles/bundle_nl_BE.properties | 26 ++++----------------- core/assets/bundles/bundle_pl.properties | 22 ++--------------- core/assets/bundles/bundle_pt.properties | 26 ++++----------------- core/assets/bundles/bundle_pt_BR.properties | 26 ++++----------------- core/assets/bundles/bundle_ru.properties | 24 +++---------------- core/assets/bundles/bundle_sv.properties | 26 ++++----------------- core/assets/bundles/bundle_tk.properties | 22 ++--------------- core/assets/bundles/bundle_tr.properties | 26 ++++----------------- core/assets/bundles/bundle_uk_UA.properties | 24 +++---------------- core/assets/bundles/bundle_zh_CN.properties | 20 +--------------- core/assets/bundles/bundle_zh_TW.properties | 22 ++--------------- 23 files changed, 63 insertions(+), 477 deletions(-) diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 8725aab78a..bdbc7a552b 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Třes obrazu setting.effects.name = Zobrazit efekty setting.sensitivity.name = Citlivost ovladače setting.saveinterval.name = Interval automatického ukládání -setting.seconds = {0} sekund -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Sekund setting.fullscreen.name = Celá obrazovka setting.borderlesswindow.name = Bezokrajové okno[LIGHT_GRAY] (může vyžadovat restart) setting.fps.name = Ukázat snímky/sekundu @@ -630,27 +628,10 @@ keybind.press.axis = Stiskni osu nebo klávesu... keybind.screenshot.name = Sníměk mapy keybind.move_x.name = Pohyb na X keybind.move_y.name = Pohyb na Y -keybind.dash.name = Sprint keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Vybrat/Střílet keybind.diagonal_placement.name = Diagonal Placement @@ -664,6 +645,7 @@ keybind.menu.name = Hlavní nabídka keybind.pause.name = pauza keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap +keybind.dash.name = Sprint keybind.chat.name = Chat keybind.player_list.name = Seznam hráčů keybind.console.name = Konzole diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 442d15c947..85c9b67684 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Bildschirmwackeln setting.effects.name = Effekte anzeigen setting.sensitivity.name = Controller-Empfindlichkeit setting.saveinterval.name = Autosave Häufigkeit -setting.seconds = {0} sekunden -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Sekunden setting.fullscreen.name = Vollbild setting.borderlesswindow.name = Randloses Fenster[LIGHT_GRAY] (Neustart teilweise erforderlich) setting.fps.name = Zeige FPS @@ -630,27 +628,10 @@ keybind.press.axis = Drücke eine Taste oder bewege eine Achse... keybind.screenshot.name = Karten Screenshot keybind.move_x.name = X-Achse keybind.move_y.name = Y-Achse -keybind.dash.name = Bindestrich keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Auswählen/Schießen keybind.diagonal_placement.name = Diagonal platzieren @@ -664,6 +645,7 @@ keybind.menu.name = Menü keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap +keybind.dash.name = Bindestrich keybind.chat.name = Chat keybind.player_list.name = Spielerliste keybind.console.name = Konsole diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index e48e97b5d7..28e8cc396a 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Movimiento de la Pantalla setting.effects.name = Mostrar Efectos setting.sensitivity.name = Sensibilidad del Control setting.saveinterval.name = Intervalo del Autoguardado -setting.seconds = {0} segundos -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Segundos setting.fullscreen.name = Pantalla Completa setting.borderlesswindow.name = Ventana sin Bordes[LIGHT_GRAY] (podría requerir un reinicio) setting.fps.name = Mostrar FPS @@ -628,29 +626,12 @@ keybind.clear_building.name = Clear Building keybind.press = Presiona una tecla... keybind.press.axis = Pulsa un eje o botón... keybind.screenshot.name = Captura de pantalla de Mapa -keybind.move_x.name = Mover X -keybind.move_y.name = Mover Y -keybind.dash.name = Correr +keybind.move_x.name = Mover x +keybind.move_y.name = Mover y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Intercambiar con Pantalla Completa keybind.select.name = Seleccionar keybind.diagonal_placement.name = Construcción Diagonal @@ -664,6 +645,7 @@ keybind.menu.name = Menú keybind.pause.name = Pausa keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimapa +keybind.dash.name = Correr keybind.chat.name = Chat keybind.player_list.name = Lista de jugadores keybind.console.name = Consola diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 4908be94b5..8bafae658a 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -591,8 +591,6 @@ setting.effects.name = Näita visuaalefekte setting.sensitivity.name = Kontrolleri tundlikkus setting.saveinterval.name = Salvestamise intervall setting.seconds = {0} sekundit -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds setting.fullscreen.name = Täisekraan setting.borderlesswindow.name = Äärteta ekraan[lightgray] (võib vajada mängu taaskäivitamist) setting.fps.name = Näita kaadrite arvu sekundis @@ -630,27 +628,10 @@ keybind.press.axis = Liiguta juhtkangi või vajuta klahvi... keybind.screenshot.name = Kuvatõmmis keybind.move_x.name = Liigu X-teljel keybind.move_y.name = Liigu Y-teljel -keybind.dash.name = Söösta keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Täisekraan keybind.select.name = Vali/Tulista keybind.diagonal_placement.name = Diagonaalne paigutamine @@ -664,6 +645,7 @@ keybind.menu.name = Menüü keybind.pause.name = Paus keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Kaart +keybind.dash.name = Söösta keybind.chat.name = Vestle keybind.player_list.name = Mängijate nimekiri keybind.console.name = Konsool diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index faaf7bc916..189574bd6d 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -591,8 +591,6 @@ setting.effects.name = Bistaratze-efektuak setting.sensitivity.name = Kontrolagailuaren sentikortasuna setting.saveinterval.name = Gordetzeko tartea setting.seconds = {0} segundo -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds setting.fullscreen.name = Pantaila osoa setting.borderlesswindow.name = Ertzik gabeko leihoa[lightgray] (berrabiaraztea behar lezake) setting.fps.name = Erakutsi FPS @@ -628,29 +626,12 @@ keybind.clear_building.name = Clear Building keybind.press = Sakatu tekla bat... keybind.press.axis = Sakatu ardatza edo tekla... keybind.screenshot.name = Maparen pantaila-argazkia -keybind.move_x.name = Mugitu X -keybind.move_y.name = Mugitu Y -keybind.dash.name = Arrapalada +keybind.move_x.name = Mugitu x +keybind.move_y.name = Mugitu y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Txandakatu pantaila osoa keybind.select.name = Hautatu/Tirokatu keybind.diagonal_placement.name = Kokatze diagonala @@ -664,6 +645,7 @@ keybind.menu.name = Menua keybind.pause.name = Pausatu keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Mapatxoa +keybind.dash.name = Arrapalada keybind.chat.name = Txata keybind.player_list.name = Jokalarien zerrenda keybind.console.name = Kontsola diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 059e36ff30..4341be8753 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -611,8 +611,6 @@ setting.effects.name = Afficher les effets setting.sensitivity.name = Sensibilité de la manette setting.saveinterval.name = Intervalle des sauvegardes auto setting.seconds = {0} secondes -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds setting.fullscreen.name = Plein Écran setting.borderlesswindow.name = Fenêtre sans bords (Borderless)[lightgray] (peut nécessiter le redémarrage du jeu) setting.fps.name = Afficher FPS @@ -648,29 +646,12 @@ keybind.clear_building.name = Effacer les constructions keybind.press = Appuyer sur une touche... keybind.press.axis = Appuyer sur un axe ou une touche... keybind.screenshot.name = Capture d'écran -keybind.move_x.name = Mouvement X -keybind.move_y.name = Mouvement Y -keybind.dash.name = Sprint +keybind.move_x.name = Mouvement x +keybind.move_y.name = Mouvement y keybind.schematic_select.name = Sélectionner une région keybind.schematic_menu.name = Menu des schéma keybind.schematic_flip_x.name = Retourner le schéma sur l'axe X keybind.schematic_flip_y.name = Retourner le schéma sur l'axe Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Basculer en Plein Écran keybind.select.name = Sélectionner/Tirer keybind.diagonal_placement.name = Placement en diagonale @@ -684,6 +665,7 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pauser/Reprendre la construction keybind.minimap.name = Minimap +keybind.dash.name = Sprint keybind.chat.name = Chat keybind.player_list.name = Liste des joueurs keybind.console.name = Console diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index 256a12b7a4..fce9241eda 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Tremblement d'écran setting.effects.name = Montrer les effets setting.sensitivity.name = Contôle de la sensibilité setting.saveinterval.name = Intervalle des sauvegardes auto -setting.seconds = {0} secondes -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Secondes setting.fullscreen.name = Plein écran setting.borderlesswindow.name = Fenêtre sans bordure[LIGHT_GRAY] (peut nécessiter un redémarrage) setting.fps.name = Afficher FPS @@ -630,27 +628,10 @@ keybind.press.axis = Appuyez sur un axe ou une touche... keybind.screenshot.name = Map Screenshot keybind.move_x.name = Mouvement X keybind.move_y.name = Mouvement Y -keybind.dash.name = Sprint keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Basculer en plein écran keybind.select.name = Sélectionner/Tirer keybind.diagonal_placement.name = Placement en diagonal @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Mini-Map +keybind.dash.name = Sprint keybind.chat.name = Tchat keybind.player_list.name = Liste des joueurs keybind.console.name = Console diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index c73efd6ee6..a79ccbb1e7 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Layar Getar setting.effects.name = Munculkan Efek setting.sensitivity.name = Sensitivitas Kontroler setting.saveinterval.name = Jarak Menyimpan -setting.seconds = {0} detik -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Detik setting.fullscreen.name = Layar Penuh setting.borderlesswindow.name = Jendela tak Berbatas[LIGHT_GRAY] (bisa membutuhkan restart) setting.fps.name = Tunjukkan FPS @@ -628,29 +626,12 @@ keybind.clear_building.name = Clear Building keybind.press = Tekan kunci... keybind.press.axis = Tekan sumbu atau kunci... keybind.screenshot.name = Tangkapan Layar Peta -keybind.move_x.name = Pindah X -keybind.move_y.name = Pindah Y -keybind.dash.name = Terbang +keybind.move_x.name = Pindah x +keybind.move_y.name = Pindah y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Pilih/Tembak keybind.diagonal_placement.name = Penaruhan Diagonal @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Jeda keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Peta Kecil +keybind.dash.name = Terbang keybind.chat.name = Chat keybind.player_list.name = Daftar pemain keybind.console.name = Console diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 90a3212e87..c36291d758 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -591,9 +591,7 @@ setting.screenshake.name = Movimento dello schermo setting.effects.name = Visualizza effetti setting.sensitivity.name = Sensibilità del controller setting.saveinterval.name = Intervallo di salvataggio automatico -setting.seconds = {0} secondi -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Secondi setting.fullscreen.name = Schermo Intero setting.borderlesswindow.name = Schermo senza bordi[LIGHT_GRAY] (potrebbe richiedere riapertura gioco) setting.fps.name = Mostra FPS @@ -631,27 +629,10 @@ keybind.press.axis = Premi un'asse o un tasto... keybind.screenshot.name = Screenshot della mappa keybind.move_x.name = Muovi orizzontale keybind.move_y.name = Muovi verticale -keybind.dash.name = Scatto keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Schermo Intero keybind.select.name = Seleziona keybind.diagonal_placement.name = Posizionamento diagonale @@ -665,6 +646,7 @@ keybind.menu.name = Apri Menu keybind.pause.name = Pausa keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimappa +keybind.dash.name = Scatto keybind.chat.name = Chat keybind.player_list.name = Lista dei Giocatori keybind.console.name = Console diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 229e10adb9..6239dad8b0 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -591,8 +591,6 @@ setting.effects.name = 画面効果 setting.sensitivity.name = 操作感度 setting.saveinterval.name = 自動保存間隔 setting.seconds = {0} 秒 -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds setting.fullscreen.name = フルスクリーン setting.borderlesswindow.name = 境界の無いウィンドウ[lightgray] (再起動が必要になる場合があります) setting.fps.name = FPSを表示 @@ -630,27 +628,10 @@ keybind.press.axis = 軸またはキーを押してください... keybind.screenshot.name = スクリーンショット keybind.move_x.name = 左右移動 keybind.move_y.name = 上下移動 -keybind.dash.name = ダッシュ keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = フルスクリーンの切り替え keybind.select.name = 選択/ショット keybind.diagonal_placement.name = 斜め設置 @@ -664,6 +645,7 @@ keybind.menu.name = メニュー keybind.pause.name = ポーズ keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = ミニマップ +keybind.dash.name = ダッシュ keybind.chat.name = チャット keybind.player_list.name = プレイヤーリスト keybind.console.name = コンソール diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index dd2601f211..fbc5bcb8c4 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -613,9 +613,7 @@ setting.screenshake.name = 화면 흔들기 setting.effects.name = 화면 효과 setting.sensitivity.name = 컨트롤러 감도 setting.saveinterval.name = 저장 간격 -setting.seconds = {0} 초 -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = 초 setting.fullscreen.name = 전체 화면 setting.borderlesswindow.name = 테두리 없는 창모드[LIGHT_GRAY] (재시작이 필요할 수 있습니다) setting.fps.name = FPS 표시 @@ -653,27 +651,10 @@ keybind.press.axis = 마우스 휠 또는 키를 누르세요... keybind.screenshot.name = 맵 스크린샷 keybind.move_x.name = 오른쪽/왼쪽 이동 keybind.move_y.name = 위 / 아래 중간 -keybind.dash.name = 달리기 keybind.schematic_select.name = 영역 설정 keybind.schematic_menu.name = 설계도 메뉴 keybind.schematic_flip_x.name = 설계도 X축 뒤집기 keybind.schematic_flip_y.name = 설계도 Y축 뒤집기 -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = 전체 화면 keybind.select.name = 선택/공격 keybind.diagonal_placement.name = 대각선 설치 @@ -687,6 +668,7 @@ keybind.menu.name = 메뉴 keybind.pause.name = 일시중지 keybind.pause_building.name = 건설 일시정지/계속하기 keybind.minimap.name = 미니맵 +keybind.dash.name = 달리기 keybind.chat.name = 채팅 keybind.player_list.name = 플레이어 목록 keybind.console.name = 콘솔 diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 8e9e6d25d4..8c63a05598 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Screen Shake setting.effects.name = Display Effects setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Autosave Interval -setting.seconds = {0} seconds -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Seconds setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = Show FPS @@ -628,29 +626,12 @@ keybind.clear_building.name = Clear Building keybind.press = Press a key... keybind.press.axis = Press an axis or key... keybind.screenshot.name = Map Screenshot -keybind.move_x.name = Move X -keybind.move_y.name = Move Y -keybind.dash.name = Dash +keybind.move_x.name = Move x +keybind.move_y.name = Move y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Select/Shoot keybind.diagonal_placement.name = Diagonal Placement @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap +keybind.dash.name = Dash keybind.chat.name = Chat keybind.player_list.name = Player list keybind.console.name = Console diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 1d8950a10d..9740efd921 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Screen Shake setting.effects.name = Display Effects setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Autosave Interval -setting.seconds = {0} seconds -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Seconds setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = Show FPS @@ -628,29 +626,12 @@ keybind.clear_building.name = Clear Building keybind.press = Press a key... keybind.press.axis = Press an axis or key... keybind.screenshot.name = Map Screenshot -keybind.move_x.name = Move X -keybind.move_y.name = Move Y -keybind.dash.name = Dash +keybind.move_x.name = Move x +keybind.move_y.name = Move y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Select/Shoot keybind.diagonal_placement.name = Diagonal Placement @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap +keybind.dash.name = Dash keybind.chat.name = Chat keybind.player_list.name = Player list keybind.console.name = Console diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 34f1d57403..02056031d3 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Trzęsienie się ekranu setting.effects.name = Wyświetlanie efektów setting.sensitivity.name = Czułość kontrolera setting.saveinterval.name = Interwał automatycznego zapisywania -setting.seconds = {0} sekundy -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Sekundy setting.fullscreen.name = Pełny ekran setting.borderlesswindow.name = Bezramkowe okno[LIGHT_GRAY] (może wymagać restartu) setting.fps.name = Pokazuj FPS @@ -630,27 +628,10 @@ keybind.press.axis = Naciśnij oś lub klawisz... keybind.screenshot.name = Zrzut ekranu mapy keybind.move_x.name = Poruszanie w poziomie keybind.move_y.name = Poruszanie w pionie -keybind.dash.name = Przyspieszenie keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Przełącz Pełny Ekran keybind.select.name = Zaznacz keybind.diagonal_placement.name = Budowa po skosie @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Pauza keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimapa +keybind.dash.name = Przyspieszenie keybind.chat.name = Czat keybind.player_list.name = Lista graczy keybind.console.name = Konsola diff --git a/core/assets/bundles/bundle_pt.properties b/core/assets/bundles/bundle_pt.properties index 650b251ca5..0c31d54495 100644 --- a/core/assets/bundles/bundle_pt.properties +++ b/core/assets/bundles/bundle_pt.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Balanço do Ecrã setting.effects.name = Efeitos setting.sensitivity.name = Sensibilidade do Controle setting.saveinterval.name = Intervalo de autogravamento -setting.seconds = {0} segundos -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Segundos setting.fullscreen.name = Ecrã inteiro setting.borderlesswindow.name = Janela sem borda[LIGHT_GRAY] (Pode precisar reiniciar) setting.fps.name = Mostrar FPS @@ -628,29 +626,12 @@ keybind.clear_building.name = Limpar Edificio keybind.press = Pressione uma tecla... keybind.press.axis = Pressione uma Axis ou tecla... keybind.screenshot.name = Captura do mapa -keybind.move_x.name = Mover X -keybind.move_y.name = Mover Y -keybind.dash.name = Correr +keybind.move_x.name = mover_x +keybind.move_y.name = mover_y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Alterar ecrã inteiro keybind.select.name = selecionar keybind.diagonal_placement.name = Colocação diagonal @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Pausar keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimapa +keybind.dash.name = Correr keybind.chat.name = Conversa keybind.player_list.name = Lista_de_jogadores keybind.console.name = console diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 4e6fef0289..169b5c0673 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Balanço da Tela setting.effects.name = Efeitos setting.sensitivity.name = Sensibilidade do Controle setting.saveinterval.name = Intervalo de autosalvamento -setting.seconds = {0} segundos -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Segundos setting.fullscreen.name = Tela Cheia setting.borderlesswindow.name = Janela sem borda[LIGHT_GRAY] (Pode precisar reiniciar) setting.fps.name = Mostrar FPS @@ -628,29 +626,12 @@ keybind.clear_building.name = Clear Building keybind.press = Pressione uma tecla... keybind.press.axis = Pressione uma Axis ou tecla... keybind.screenshot.name = Captura do mapa -keybind.move_x.name = Mover X -keybind.move_y.name = Mover Y -keybind.dash.name = Correr +keybind.move_x.name = mover_x +keybind.move_y.name = mover_y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Alterar tela cheia keybind.select.name = selecionar keybind.diagonal_placement.name = Colocação diagonal @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Pausar keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimapa +keybind.dash.name = Correr keybind.chat.name = Conversa keybind.player_list.name = Lista_de_jogadores keybind.console.name = console diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 9318cc9022..b7d907e9fb 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -613,8 +613,6 @@ setting.effects.name = Эффекты setting.sensitivity.name = Чувствительность контроллера setting.saveinterval.name = Интервал сохранения setting.seconds = {0} секунд -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds setting.fullscreen.name = Полноэкранный режим setting.borderlesswindow.name = Безрамочное окно[lightgray] (может потребоваться перезапуск) setting.fps.name = Показывать FPS @@ -650,29 +648,12 @@ keybind.clear_building.name = Очистить план строительств keybind.press = Нажмите клавишу… keybind.press.axis = Нажмите оси или клавишу… keybind.screenshot.name = Скриншот карты -keybind.move_x.name = Движение по оси X -keybind.move_y.name = Движение по оси Y -keybind.dash.name = Полёт/Ускорение +keybind.move_x.name = Движение по оси x +keybind.move_y.name = Движение по оси y keybind.schematic_select.name = Выбрать область keybind.schematic_menu.name = Меню схем keybind.schematic_flip_x.name = Отразить схему по оси X keybind.schematic_flip_y.name = Отразить схему по оси Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Полноэкранный режим keybind.select.name = Выбор/Выстрел keybind.diagonal_placement.name = Диагональное размещение @@ -686,6 +667,7 @@ keybind.menu.name = Меню keybind.pause.name = Пауза keybind.pause_building.name = Приостановить/возобновить строительство keybind.minimap.name = Мини-карта +keybind.dash.name = Полёт/Ускорение keybind.chat.name = Чат keybind.player_list.name = Список игроков keybind.console.name = Консоль diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index dece92a085..e395024fd0 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Skärmskak setting.effects.name = Visa Effekter setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Save Interval -setting.seconds = {0} sekunder -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Sekunder setting.fullscreen.name = Fullskärm setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart) setting.fps.name = Show FPS @@ -628,29 +626,12 @@ keybind.clear_building.name = Clear Building keybind.press = Press a key... keybind.press.axis = Press an axis or key... keybind.screenshot.name = Map Screenshot -keybind.move_x.name = Move X -keybind.move_y.name = Move Y -keybind.dash.name = Dash +keybind.move_x.name = Move x +keybind.move_y.name = Move y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Select/Shoot keybind.diagonal_placement.name = Diagonal Placement @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Pause keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap +keybind.dash.name = Dash keybind.chat.name = Chat keybind.player_list.name = Player list keybind.console.name = Console diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index ca35bef588..557617d16e 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -590,9 +590,7 @@ setting.screenshake.name = Ekran sallanmasi setting.effects.name = Efekleri goster setting.sensitivity.name = Kumanda hassasligi setting.saveinterval.name = Otomatik kaydetme suresi -setting.seconds = {0} saniye -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Saniye setting.fullscreen.name = Tam ekran setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = FPS'i goster @@ -630,27 +628,10 @@ keybind.press.axis = Bir yone cevir yada tusa bas... keybind.screenshot.name = Map Screenshot keybind.move_x.name = Sol/Sag hareket keybind.move_y.name = Yukari/asagi hareket -keybind.dash.name = Kos keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Sec/silahi sik keybind.diagonal_placement.name = Diagonal Placement @@ -664,6 +645,7 @@ keybind.menu.name = Menu keybind.pause.name = Durdur keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Minimap +keybind.dash.name = Kos keybind.chat.name = konus keybind.player_list.name = Oyuncu listesi keybind.console.name = Konsol diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index e5bbaa5ffe..e9e1a97614 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -608,9 +608,7 @@ setting.screenshake.name = Ekranı Salla setting.effects.name = Efektleri Görüntüle setting.sensitivity.name = Kontrolcü Hassasiyeti setting.saveinterval.name = Kayıt Aralığı -setting.seconds = {0} saniye -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0} Saniye setting.fullscreen.name = Tam Ekran setting.borderlesswindow.name = Kenarsız Pencere[lightgray] (yeniden açmak gerekebilir) setting.fps.name = FPS Göster @@ -646,29 +644,12 @@ keybind.clear_building.name = Binayı Temizle keybind.press = Bir tuşa basın... keybind.press.axis = Bir tuşa ya da yöne basın... keybind.screenshot.name = Harita Ekran Görüntüsü -keybind.move_x.name = X Ekseninde Hareket -keybind.move_y.name = Y Ekseninde Hareket -keybind.dash.name = Sıçrama +keybind.move_x.name = x Ekseninde Hareket +keybind.move_y.name = y Ekseninde Hareket keybind.schematic_select.name = Bölge Seç keybind.schematic_menu.name Şema Menüsü keybind.schematic_flip_x.name = Şemayı X ekseninde Döndür keybind.schematic_flip_y.name Şemayı Y Ekseninde Döndür -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Tam Ekran keybind.select.name = Seç/Ateş Et keybind.diagonal_placement.name = Çapraz Yerleştirme @@ -682,6 +663,7 @@ keybind.menu.name = Menü keybind.pause.name = Durdur keybind.pause_building.name = İnşaatı Duraklat/İnşaata Devam Et keybind.minimap.name = Mini Harita +keybind.dash.name = Sıçrama keybind.chat.name = Konuş keybind.player_list.name = Oyuncu Listesi keybind.console.name = Konsol diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index bbf690afe3..4a005511b5 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -603,8 +603,6 @@ setting.effects.name = Ефекти setting.sensitivity.name = Чутливість контролера setting.saveinterval.name = Інтервал збереження setting.seconds = {0} сек. -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds setting.fullscreen.name = Повноекранний режим setting.borderlesswindow.name = Вікно без полів[lightgray] (може потребувати перезапуску) setting.fps.name = Показувати FPS @@ -640,29 +638,12 @@ keybind.clear_building.name = Clear Building keybind.press = Натисніть клавішу… keybind.press.axis = Натисніть клавішу… keybind.screenshot.name = Зняток мапи -keybind.move_x.name = Рух по осі X -keybind.move_y.name = Рух по осі Y -keybind.dash.name = Прискоритися/Літати +keybind.move_x.name = Рух по осі x +keybind.move_y.name = Рух по осі y keybind.schematic_select.name = Select Region keybind.schematic_menu.name = Schematic Menu keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = Повноекранний keybind.select.name = Вибір/Постріл keybind.diagonal_placement.name = Діагональне розміщення @@ -676,6 +657,7 @@ keybind.menu.name = Меню keybind.pause.name = Пауза keybind.pause_building.name = Pause/Resume Building keybind.minimap.name = Мінімапа +keybind.dash.name = Прискоритися/Літати keybind.chat.name = Чат keybind.player_list.name = Список гравців keybind.console.name = Консоль diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 663900baba..0b14969b5c 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -591,8 +591,6 @@ setting.effects.name = 显示效果 setting.sensitivity.name = 控制器灵敏度 setting.saveinterval.name = 自动保存间隔 setting.seconds = {0} 秒 -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds setting.fullscreen.name = 全屏 setting.borderlesswindow.name = 无边框窗口[LIGHT_GRAY] (可能需要重启) setting.fps.name = 显示 FPS @@ -630,27 +628,10 @@ keybind.press.axis = 按一下轴或键…… keybind.screenshot.name = 地图截图 keybind.move_x.name = 水平移动 keybind.move_y.name = 竖直移动 -keybind.dash.name = 冲刺 keybind.schematic_select.name = 选择区域 keybind.schematic_menu.name = 蓝图目录 keybind.schematic_flip_x.name = 水平翻转 keybind.schematic_flip_y.name = 竖直翻转 -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = 切换全屏 keybind.select.name = 选择/射击 keybind.diagonal_placement.name = 自动铺设 @@ -664,6 +645,7 @@ keybind.menu.name = 菜单 keybind.pause.name = 暂停 keybind.pause_building.name = 暂停/继续建造 keybind.minimap.name = 小地图 +keybind.dash.name = 冲刺 keybind.chat.name = 聊天 keybind.player_list.name = 玩家列表 keybind.console.name = 控制台 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 81527afb77..e4d636ae93 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -596,9 +596,7 @@ setting.screenshake.name = 畫面抖動 setting.effects.name = 顯示特效 setting.sensitivity.name = 控制器靈敏度 setting.saveinterval.name = 自動存檔間隔 -setting.seconds = {0} 秒 -setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} milliseconds +setting.seconds = {0}秒 setting.fullscreen.name = 全螢幕 setting.borderlesswindow.name = 無邊框窗口[LIGHT_GRAY]（可能需要重啟遊戲） setting.fps.name = 顯示FPS @@ -636,27 +634,10 @@ keybind.press.axis = 按一下軸向或按鍵…… keybind.screenshot.name = 地圖截圖 keybind.move_x.name = 水平移動 keybind.move_y.name = 垂直移動 -keybind.dash.name = 衝刺 keybind.schematic_select.name = 選擇區域 keybind.schematic_menu.name = 藍圖目錄 keybind.schematic_flip_x.name = X軸翻轉 keybind.schematic_flip_y.name = Y軸翻轉 -keybind.category_prev.name = Previous Category -keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 keybind.fullscreen.name = 全螢幕切換 keybind.select.name = 選取 keybind.diagonal_placement.name = 對角線放置 @@ -670,6 +651,7 @@ keybind.menu.name = 主選單 keybind.pause.name = 暫停遊戲 keybind.pause_building.name = 暫停/恢復建造 keybind.minimap.name = 小地圖 +keybind.dash.name = 衝刺 keybind.chat.name = 聊天 keybind.player_list.name = 玩家列表 keybind.console.name = 終端機 From 4a987677aca35c6f78f2e9bc2e0380f0aa92cf5a Mon Sep 17 00:00:00 2001 From: Joshua Fan Date: Sat, 9 Nov 2019 07:59:00 -0500 Subject: [PATCH 8/9] Add 'Show Block Select Keys' graphics option, implement requested changes --- core/assets/bundles/bundle.properties | 12 +++++++----- core/src/io/anuke/mindustry/content/Blocks.java | 6 +++--- .../mindustry/ui/dialogs/SettingsMenuDialog.java | 3 +++ .../mindustry/ui/fragments/PlacementFragment.java | 13 +++++++------ 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index dd05f308e9..096c35d7b1 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -620,6 +620,7 @@ setting.milliseconds = {0} milliseconds setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart) setting.fps.name = Show FPS & Ping +setting.blockselectkeys.name = Show Block Select Keys setting.vsync.name = VSync setting.pixelate.name = Pixelate[lightgray] (disables animations) setting.minimap.name = Show Minimap @@ -648,6 +649,7 @@ category.multiplayer.name = Multiplayer command.attack = Attack command.rally = Rally command.retreat = Retreat +placement.blockselectkeys = \n[lightgray]Key: [{0}, keybind.clear_building.name = Clear Building keybind.press = Press a key... keybind.press.axis = Press an axis or key... @@ -661,10 +663,10 @@ keybind.schematic_flip_x.name = Flip Schematic X keybind.schematic_flip_y.name = Flip Schematic Y keybind.category_prev.name = Previous Category keybind.category_next.name = Next Category -keybind.block_select_left = Block Select Left -keybind.block_select_right = Block Select Right -keybind.block_select_up = Block Select Up -keybind.block_select_down = Block Select Down +keybind.block_select_left.name = Block Select Left +keybind.block_select_right.name = Block Select Right +keybind.block_select_up.name = Block Select Up +keybind.block_select_down.name = Block Select Down keybind.block_select_01.name = Category/Block Select 1 keybind.block_select_02.name = Category/Block Select 2 keybind.block_select_03.name = Category/Block Select 3 @@ -1016,7 +1018,7 @@ unit.reaper.name = Reaper tutorial.next = [lightgray] tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse [[WASD] to move.\n[accent] Hold [[Ctrl] while scrolling[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent] Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper -tutorial.drill = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nClick the drill tab in the bottom right.\nSelect the [accent]mechanical drill[]. Place it on a copper vein by clicking.\nYou can also select the drill by tapping [accent][[2][] then [accent][[1][] quickly, regardless of what tab is open.\n[accent]Right-click[] to stop building. +tutorial.drill = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\nYou can also select the drill by tapping [accent][[2][] then [accent][[1][] quickly, regardless of what tab is open.\n[accent]Right-click[] to stop building. tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement. tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[] tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent]Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\nUse the scrollwheel to rotate blocks before placing them.\n[accent]Place 2 conveyors with the line tool, then deliver an item into the core. diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index cb1af2d0a0..cdf7e11e95 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -79,7 +79,7 @@ public class Blocks implements ContentList{ dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad, //sandbox - powerVoid, powerSource, itemSource, liquidSource, itemVoid, message; + powerSource, powerVoid, itemSource, itemVoid, liquidSource, message; @Override public void load(){ @@ -1781,11 +1781,11 @@ public class Blocks implements ContentList{ //endregion //region sandbox - powerVoid = new PowerVoid("power-void"){{ + powerSource = new PowerSource("power-source"){{ requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with()); alwaysUnlocked = true; }}; - powerSource = new PowerSource("power-source"){{ + powerVoid = new PowerVoid("power-void"){{ requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with()); alwaysUnlocked = true; }}; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 9da6eabfe3..5f21305233 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -298,6 +298,9 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("minimap", !mobile); graphics.checkPref("position", false); graphics.checkPref("fps", false); + if(!mobile){ + graphics.checkPref("blockselectkeys", true); + } graphics.checkPref("indicators", true); graphics.checkPref("animatedwater", !mobile); if(Shaders.shield != null){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index d92cec1454..2e0ef60a4c 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -26,7 +26,7 @@ import static io.anuke.mindustry.Vars.*; public class PlacementFragment extends Fragment{ final int rowWidth = 4; - public Category currentCategory = Category.turret; + public Category currentCategory = Category.distribution; Array returnArray = new Array<>(); Array returnCatArray = new Array<>(); boolean[] categoryEmpty = new boolean[Category.all.length]; @@ -253,13 +253,14 @@ public class PlacementFragment extends Fragment{ lastGround = false; topTable.table(header -> { - String keyCombo = new String(); - if(!mobile){ - keyCombo = " [accent][" + Core.keybinds.get(blockSelect[currentCategory.ordinal()]).key.toString(); + String keyCombo = ""; + if(!mobile && Core.settings.getBool("blockselectkeys")){ Array blocks = getByCategory(currentCategory); for(int i = 0; i < blocks.size; i++){ if(blocks.get(i) == lastDisplay){ - keyCombo += (i < 10 ? "" : "," + Core.keybinds.get(blockSelect[(i + 1) / 10 - 1]).key.toString()) + "," + Core.keybinds.get(blockSelect[i % 10]).key.toString() + "]"; + keyCombo = Core.bundle.format("placement.blockselectkeys", Core.keybinds.get(blockSelect[currentCategory.ordinal()]).key.toString()) + + (i < 10 ? "" : Core.keybinds.get(blockSelect[(i + 1) / 10 - 1]).key.toString() + ",") + + Core.keybinds.get(blockSelect[i % 10]).key.toString() + "]"; break; } } @@ -267,7 +268,7 @@ public class PlacementFragment extends Fragment{ final String keyComboFinal = keyCombo; header.left(); header.add(new Image(lastDisplay.icon(Cicon.medium))).size(8 * 4); - header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("block.unknown") : lastDisplay.localizedName + (mobile ? "" : keyComboFinal)) + header.labelWrap(() -> !unlocked(lastDisplay) ? Core.bundle.get("block.unknown") : lastDisplay.localizedName + keyComboFinal) .left().width(190f).padLeft(5); header.add().growX(); if(unlocked(lastDisplay)){ From 7e5c276e7f658cdb21acabbe51deb77cf21f7c61 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 18 Nov 2019 19:21:43 -0500 Subject: [PATCH 9/9] Update PlacementFragment.java --- .../ui/fragments/PlacementFragment.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 2e0ef60a4c..95bdd5affa 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -131,13 +131,16 @@ public class PlacementFragment extends Fragment{ } } }else if(blockSelectEnd || Time.timeSinceMillis(blockSelectSeqMillis) > Core.settings.getInt("blockselecttimeout")){ //1st number of combo, select category - currentCategory = Category.all[i]; - if(input.block != null){ - input.block = getSelectedBlock(currentCategory); + //select only visible categories + if(!getByCategory(Category.all[i]).isEmpty()){ + currentCategory = Category.all[i]; + if(input.block != null){ + input.block = getSelectedBlock(currentCategory); + } + blockSelectEnd = false; + blockSelectSeq = 0; + blockSelectSeqMillis = Time.millis(); } - blockSelectEnd = false; - blockSelectSeq = 0; - blockSelectSeqMillis = Time.millis(); }else{ //select block if(blockSelectSeq == 0){ //2nd number of combo blockSelectSeq = i + 1; @@ -459,4 +462,4 @@ public class PlacementFragment extends Fragment{ Block tileDisplayBlock(){ return hoverTile == null ? null : hoverTile.block().synthetic() ? hoverTile.block() : hoverTile.drop() != null ? hoverTile.overlay().itemDrop != null ? hoverTile.overlay() : hoverTile.floor() : null; } -} \ No newline at end of file +}