diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 7799e73de5..02fe60de81 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -591,7 +591,6 @@ setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart) setting.fps.name = Show FPS setting.vsync.name = VSync -setting.lasers.name = Show Power Lasers setting.pixelate.name = Pixelate[lightgray] (disables animations) setting.minimap.name = Show Minimap setting.musicvol.name = Music Volume @@ -603,6 +602,7 @@ setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chat Opacity +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Display Player Bubble Chat public.confirm = Do you want to make your game public?\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility. uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds... diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 4205ec11db..c8210aeefa 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Celá obrazovka setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = Ukázat snímky/sekundu setting.vsync.name = Vertikální synchronizace -setting.lasers.name = Ukázat laser energie setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance) setting.minimap.name = Ukázat minimapu setting.musicvol.name = Hlasitost hudby @@ -557,6 +556,7 @@ setting.crashreport.name = Poslat anonymní spis o zhroucení hry setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chat Opacity +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Display In-Game Chat uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings... uiscale.cancel = Cancel & Exit diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index bf80cfd8a5..72c5bec0e4 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Vollbild setting.borderlesswindow.name = Randloses Fenster[LIGHT_GRAY] (Neustart teilweise erforderlich) setting.fps.name = Zeige FPS setting.vsync.name = VSync -setting.lasers.name = Zeige Stromlaser setting.pixelate.name = Verpixeln [LIGHT_GRAY](Könnte die Leistung beeinträchtigen) setting.minimap.name = Zeige die Minimap setting.musicvol.name = Musiklautstärke @@ -557,6 +556,7 @@ setting.crashreport.name = Anonyme Absturzberichte senden setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chat Deckkraft +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Chat im Spiel anzeigen uiscale.reset = UI-Skalierung wurde geändert.\nDrücke "OK", um diese Skalierung zu bestätigen.\n[scarlet]Zurückkehren und Beenden in[accent] {0}[] Einstellungen... uiscale.cancel = Abbrechen & Beenden diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 74396541de..53df4adeb8 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Pantalla Completa setting.borderlesswindow.name = Ventana sin Bordes[LIGHT_GRAY] (podría requerir un reinicio) setting.fps.name = Mostrar FPS setting.vsync.name = VSync -setting.lasers.name = Mostrar Energía de los Láseres setting.pixelate.name = Pixelar [LIGHT_GRAY](podría reducir el rendimiento) setting.minimap.name = Mostrar Minimapa setting.musicvol.name = Volumen de la Música @@ -557,6 +556,7 @@ setting.crashreport.name = Enviar informes de fallos anónimos setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Opacidad del Chat +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Display In-Game Chat uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds... uiscale.cancel = Cancel & Exit diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 41a5139272..7b15c1fb47 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Täisekraan setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = Show FPS setting.vsync.name = VSync -setting.lasers.name = Näita Energia Lasereid setting.pixelate.name = Pixelate[LIGHT_GRAY] (disables animations) setting.minimap.name = Näita Kaarti setting.musicvol.name = Heli tase @@ -557,6 +556,7 @@ setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chat Opacity +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Display In-Game Chat uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds... uiscale.cancel = Cancel & Exit diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 239532b6f1..45372c50fb 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Pantaila osoa setting.borderlesswindow.name = Ertzik gabeko leihoa[lightgray] (berrabiaraztea behar lezake) setting.fps.name = Erakutsi FPS setting.vsync.name = VSync -setting.lasers.name = Erakutsi energia laserrak setting.pixelate.name = Pixelatu[lightgray] (animazioak desgaitzen ditu) setting.minimap.name = Erakutsi mapatxoa setting.musicvol.name = Musikaren bolumena @@ -557,6 +556,7 @@ setting.crashreport.name = Bidali kraskatze txosten automatikoak setting.savecreate.name = Gorde automatikoki setting.publichost.name = Public Game Visibility setting.chatopacity.name = Txataren opakotasuna +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Erakutsi jolas barneko txata uiscale.reset = Interfazearen eskala aldatu da.\nSakatu "Ados" eskala hau berresteko.\n[scarlet][accent] {0}[] segundo atzera egin eta irteteko... uiscale.cancel = Utzi eta irten diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index d3ca00c607..12b5e1e058 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Plein Écran setting.borderlesswindow.name = Fenêtre sans bords (Borderless)[lightgray] (peut requérir le redémarrage du jeu) setting.fps.name = Afficher FPS setting.vsync.name = VSync -setting.lasers.name = Afficher les connections Électriques setting.pixelate.name = Pixeliser[lightgray] (désactive les animations) setting.minimap.name = Montrer la Minimap setting.musicvol.name = Volume Musique @@ -557,6 +556,7 @@ setting.crashreport.name = Envoyer un Rapport de Crash Anonyme setting.savecreate.name = Sauvegardes Auto setting.publichost.name = Visibilité de la Partie Publique setting.chatopacity.name = Opacité du Chat +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Montrer le Chat uiscale.reset = L'échelle de l'interface a été modifiée.\nAppuyez sur "OK" pour confirmer.\n[scarlet]Rétablissement aux parametres d'avant et fermeture dans [accent] {0}[]... uiscale.cancel = Annuler & Quitter diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index c8f6705117..63c8e1e3da 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -545,7 +545,6 @@ 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 setting.vsync.name = VSync -setting.lasers.name = Afficher les rayons des lasers setting.pixelate.name = Pixélisé [LIGHT_GRAY](peut diminuer les performances)[] setting.minimap.name = Montrer la minimap setting.musicvol.name = Volume de la musique @@ -557,6 +556,7 @@ setting.crashreport.name = Envoyer des rapports d'incident anonymement. setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Opacité du tchat +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Afficher le tchat en jeu uiscale.reset = L'échelle de l'interface a été modifiée.\nAppuyez sur "OK" pour confirmer cette échelle.\n[scarlet]Revenir et sortir en[accent] {0}[] réglages... uiscale.cancel = Annuler et quitter diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 3bcca3a7c8..6fffc0d1b4 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Layar Penuh setting.borderlesswindow.name = Jendela tak Berbatas[LIGHT_GRAY] (bisa membutuhkan restart) setting.fps.name = Tunjukkan FPS setting.vsync.name = VSync -setting.lasers.name = Tunjukkan Laser setting.pixelate.name = Mode Pixel[LIGHT_GRAY] (menonaktifkan animasi) setting.minimap.name = Tunjukkan Peta kecil setting.musicvol.name = Volume Musik @@ -557,6 +556,7 @@ setting.crashreport.name = Laporkan Masalah setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Jelas-Beningnya Chat +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Tunjukkan Chat dalam Permainan uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings... uiscale.cancel = Cancel & Exit diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index bace89f989..beecd93a3b 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Schermo Intero setting.borderlesswindow.name = Schermo senza bordi[LIGHT_GRAY] (potrebbe richiedere riapertura gioco) setting.fps.name = Mostra FPS setting.vsync.name = VSync -setting.lasers.name = Mostra Laser Energetici setting.pixelate.name = Sfocare [LIGHT_GRAY](potrebbe ridure il rendimento) setting.minimap.name = Mostra minimappa setting.musicvol.name = Volume Musica @@ -557,6 +556,7 @@ setting.crashreport.name = Invia rapporti sugli arresti anomali anonimamente setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Opacità chat +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Mostra Chat in-game uiscale.reset = La scala dell'interfaccia utente è stata modificata.\nPremere "OK" per confermare questa scala.\n[scarlet] Ripristina ed esci dalle impostazioni [accent] {0}[] impostazioni... uiscale.cancel = Annulla ed esci diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 4ab893b67c..804ba0e656 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = フルスクリーン setting.borderlesswindow.name = 境界の無いウィンドウ[lightgray] (再起動が必要になる場合があります) setting.fps.name = FPSを表示 setting.vsync.name = VSync -setting.lasers.name = 電力線を表示 setting.pixelate.name = ピクセル化[lightgray] (アニメーションが無効化されます) setting.minimap.name = ミニマップを表示 setting.musicvol.name = 音楽 音量 @@ -557,6 +556,7 @@ setting.crashreport.name = 匿名でクラッシュレポートを送信する setting.savecreate.name = 自動保存 setting.publichost.name = 誰でもゲームに参加できるようにする setting.chatopacity.name = チャットの透明度 +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = ゲーム内にチャットを表示 uiscale.reset = UIサイズが変更されました。\nこのままでよければ「OK」を押してください。\n[scarlet][accent]{0}[] 秒で元の設定に戻ります... uiscale.cancel = キャンセル & 終了 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index c3a679fba3..20f9b2b91c 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = 전체 화면 setting.borderlesswindow.name = 테두리 없는 창모드[LIGHT_GRAY] (재시작이 필요할 수 있습니다) setting.fps.name = FPS 표시 setting.vsync.name = VSync 활성화 -setting.lasers.name = 전력 노드 레이저 표시 setting.pixelate.name = 픽셀화[LIGHT_GRAY] (애니메이션 효과가 꺼집니다) setting.minimap.name = 미니맵 보기 setting.musicvol.name = 음악 크기 @@ -557,6 +556,7 @@ setting.crashreport.name = 오류 보고서 보내기 setting.savecreate.name = 자동 저장 활성화 setting.publichost.name = 공용 서버 보이기 setting.chatopacity.name = 채팅 투명도 +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = 인게임 채팅 표시 uiscale.reset = UI 스케일이 변경되었습니다.\n"확인"버튼을 눌러 스케일을 확인하세요.\n[scarlet]Reverting and exiting in[accent] {0}[] settings... uiscale.cancel = 취소 & 나가기 diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index b342c715d6..ace0cf6f11 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = Show FPS setting.vsync.name = VSync -setting.lasers.name = Show Power Lasers setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance) setting.minimap.name = Show Minimap setting.musicvol.name = Music Volume @@ -557,6 +556,7 @@ setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chat Opacity +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Display In-Game Chat uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings... uiscale.cancel = Cancel & Exit diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 08335fbdd5..1151996f3c 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = Show FPS setting.vsync.name = VSync -setting.lasers.name = Show Power Lasers setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance, disables animations) setting.minimap.name = Show Minimap setting.musicvol.name = Music Volume @@ -557,6 +556,7 @@ setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chat Opacity +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Display In-Game Chat uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings... uiscale.cancel = Cancel & Exit diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index cd93643188..6821067bad 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Pełny ekran setting.borderlesswindow.name = Bezramkowe okno[LIGHT_GRAY] (może wymagać restartu) setting.fps.name = Pokazuj FPS setting.vsync.name = Synchronizacja pionowa -setting.lasers.name = Pokaż lasery zasilające setting.pixelate.name = Pikselacja [LIGHT_GRAY](wyłącza animacje) setting.minimap.name = Pokaż Minimapę setting.musicvol.name = Głośność muzyki @@ -557,6 +556,7 @@ setting.crashreport.name = Wysyłaj anonimowo dane o crashu gry setting.savecreate.name = Automatyczne tworzenie zapisu setting.publichost.name = Widoczność gry publicznej setting.chatopacity.name = Przezroczystość czatu +setting.lasersopacity.name = Przezroczystość laserów zasilających setting.playerchat.name = Wyświetlaj czat w grze uiscale.reset = Skala interfejsu uległa zmianie.\nNaciśnij "OK" by potwierdzić zmiany.\n[scarlet]Cofanie zmian i wyjście z gry za[accent] {0}[] uiscale.cancel = Anuluj i wyjdź diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index dd40cf5588..cde736c89c 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -560,7 +560,6 @@ setting.fullscreen.name = Tela Cheia setting.borderlesswindow.name = Janela sem borda[LIGHT_GRAY] (Pode precisar reiniciar) setting.fps.name = Mostrar FPS setting.vsync.name = VSync -setting.lasers.name = Mostrar lasers setting.pixelate.name = Pixelizado [LIGHT_GRAY](Pode diminuir a performace) setting.minimap.name = Mostrar minimapa setting.musicvol.name = Volume da Música @@ -572,6 +571,7 @@ setting.crashreport.name = Enviar denuncias de crash anonimas setting.savecreate.name = Criar salvamentos automaticamente setting.publichost.name = Visibilidade do jogo público setting.chatopacity.name = Opacidade do chat +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Mostrar chat em jogo uiscale.reset = A escala da IU foi mudada.\nPressione "OK" para confirmar esta escala.\n[scarlet]Revertendo e saindo em[accent] {0}[] settings... uiscale.cancel = Cancelar e sair diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 6bdd3c2b16..b020766974 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Полноэкранный режим setting.borderlesswindow.name = Безрамочное окно[lightgray] (может потребоваться перезапуск) setting.fps.name = Показывать FPS setting.vsync.name = Вертикальная синхронизация -setting.lasers.name = Показывать лазеры энергоснабжения setting.pixelate.name = Пикселизация[lightgray] (отключает анимации) setting.minimap.name = Показать миникарту setting.musicvol.name = Громкость музыки @@ -557,6 +556,7 @@ setting.crashreport.name = Отправлять анонимные отчёты setting.savecreate.name = Автоматическое создание сохранений setting.publichost.name = Общедоступность игры setting.chatopacity.name = Непрозрачность чата +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Отображать облака чата над игроками uiscale.reset = Масштаб пользовательского интерфейса был изменён.\nНажмите «ОК» для подтверждения этого масштаба.\n[scarlet]Возврат настроек и выход через[accent] {0}[] секунд… uiscale.cancel = Отменить & Выйти diff --git a/core/assets/bundles/bundle_se.properties b/core/assets/bundles/bundle_se.properties index 7c3a20a924..90329f5052 100644 --- a/core/assets/bundles/bundle_se.properties +++ b/core/assets/bundles/bundle_se.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Fullskärm setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart) setting.fps.name = Show FPS setting.vsync.name = VSync -setting.lasers.name = Show Power Lasers setting.pixelate.name = Pixellera[lightgray] (disables animations) setting.minimap.name = Visa Minikarta setting.musicvol.name = Musikvolym @@ -557,6 +556,7 @@ setting.crashreport.name = Skicka Anonyma Krashrapporter setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chattgenomskinlighet +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Visa Chatt uiscale.reset = UI-skalan har ändrats.\nTryck "OK" för att använda den här skalan.\n[scarlet]Avslutar och återställer om[accent] {0}[] sekunder... uiscale.cancel = Avbryt och Avsluta diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 9406b7e9fc..ad48272f7d 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Tam ekran setting.borderlesswindow.name = Borderless Window[LIGHT_GRAY] (may require restart) setting.fps.name = FPS'i goster setting.vsync.name = VSync -setting.lasers.name = Guc lazerlerini goster setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance) setting.minimap.name = Haritayi goster setting.musicvol.name = Ses yuksekligi @@ -557,6 +556,7 @@ setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chat Opacity +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Display In-Game Chat uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings... uiscale.cancel = Cancel & Exit diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 715ca2e128..dea313d429 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = Fullscreen setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart) setting.fps.name = Show FPS setting.vsync.name = VSync -setting.lasers.name = Show Power Lasers setting.pixelate.name = Pixelate[lightgray] (disables animations) setting.minimap.name = Show Minimap setting.musicvol.name = Music Volume @@ -557,6 +556,7 @@ setting.crashreport.name = Send Anonymous Crash Reports setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = Chat Opacity +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Display In-Game Chat uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds... uiscale.cancel = Cancel & Exit diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 4e709d929f..aafae6c08f 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -551,7 +551,6 @@ setting.fullscreen.name = Повноекранний режим setting.borderlesswindow.name = Вікно без полів[lightgray] (може потребувати перезапуску) setting.fps.name = Показувати FPS setting.vsync.name = Вертикальна синхронізація -setting.lasers.name = Показувати енергію лазерів setting.pixelate.name = Пікселізація[lightgray] (вимикає анімації) setting.minimap.name = Показувати міні-мапу setting.musicvol.name = Гучність музики @@ -563,6 +562,7 @@ setting.crashreport.name = Відсилати анонімні звіти про setting.savecreate.name = Автоматичне створення збережень setting.publichost.name = Загальнодоступність гри setting.chatopacity.name = Непрозорість чату +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = Відображати хмару чата над гравцями public.confirm = Ви хочете зробити цю гру загальнодоступною?\n[lightgray]Це можна змінити у Налаштування->Гра->Public Game Visibility. uiscale.reset = Масштаб користувальницького інтерфейсу було змінено.\nНатисніть «ОК» для підтверждення цього масшатабу.\n[scarlet]Повернення налаштувань і вихід через[accent] {0}[] … diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 048ecf55e3..f8d5173ecf 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = 全屏 setting.borderlesswindow.name = 无边框窗口[LIGHT_GRAY] (可能需要重启) setting.fps.name = 显示 FPS setting.vsync.name = 垂直同步 -setting.lasers.name = 显示能量射线 setting.pixelate.name = 像素画面 [LIGHT_GRAY](禁用动画) setting.minimap.name = 显示小地图 setting.musicvol.name = 音乐音量 @@ -557,6 +556,7 @@ setting.crashreport.name = 发送匿名崩溃报告 setting.savecreate.name = 自动创建存档 setting.publichost.name = 公共游戏旁观 setting.chatopacity.name = 聊天界面透明度 +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = 显示游戏内聊天界面 uiscale.reset = UI缩放比例已经改变。\n按下“确定”来确定缩放比例\n[accent]{0}[]秒后[scarlet]退出并恢复设定。 uiscale.cancel = 取消并退出 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index b61fc23823..e206bd44a1 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -545,7 +545,6 @@ setting.fullscreen.name = 全螢幕 setting.borderlesswindow.name = 無邊框窗口[LIGHT_GRAY](可能需要重啟) setting.fps.name = 顯示FPS setting.vsync.name = 垂直同步 -setting.lasers.name = 顯示雷射光束 setting.pixelate.name = 像素化[LIGHT_GRAY](可能降低性能) setting.minimap.name = 顯示小地圖 setting.musicvol.name = 音樂音量 @@ -557,6 +556,7 @@ setting.crashreport.name = 發送匿名崩潰報告 setting.savecreate.name = Auto-Create Saves setting.publichost.name = Public Game Visibility setting.chatopacity.name = 聊天框不透明度 +setting.lasersopacity.name = Power Laser Opacity setting.playerchat.name = 在遊戲中顯示聊天框 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] settings... uiscale.cancel = Cancel & Exit diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index e07f10316e..3b8306a353 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -241,28 +241,34 @@ public class BlockRenderer implements Disposable{ } public void drawBlocks(Layer stopAt){ - + int startIdx = iterateidx; for(; iterateidx < requestidx; iterateidx++){ + BlockRequest request = requests.get(iterateidx); - if(iterateidx < requests.size && requests.get(iterateidx).layer.ordinal() > stopAt.ordinal()){ + if(request.layer.ordinal() > stopAt.ordinal()){ break; } - BlockRequest req = requests.get(iterateidx); - Block block = req.tile.block(); + if(request.layer == Layer.power){ + if(iterateidx - startIdx > 0 && request.tile.pos() == requests.get(iterateidx - 1).tile.pos()){ + continue; + } + } - if(req.layer == Layer.block){ - block.draw(req.tile); - if(req.tile.entity != null && req.tile.entity.damaged()){ - block.drawCracks(req.tile); + Block block = request.tile.block(); + + if(request.layer == Layer.block){ + block.draw(request.tile); + if(request.tile.entity != null && request.tile.entity.damaged()){ + block.drawCracks(request.tile); } - if(block.synthetic() && req.tile.getTeam() != player.getTeam()){ - block.drawTeam(req.tile); + if(block.synthetic() && request.tile.getTeam() != player.getTeam()){ + block.drawTeam(request.tile); } - }else if(req.layer == block.layer){ - block.drawLayer(req.tile); - }else if(req.layer == block.layer2){ - block.drawLayer2(req.tile); + }else if(request.layer == block.layer){ + block.drawLayer(request.tile); + }else if(request.layer == block.layer2){ + block.drawLayer2(request.tile); } } } @@ -327,7 +333,9 @@ public class BlockRenderer implements Disposable{ @Override public int compareTo(BlockRequest other){ - return layer.compareTo(other.layer); + int compare = layer.compareTo(other.layer); + + return (compare != 0) ? compare : Integer.compare(tile.pos(), other.tile.pos()); } @Override diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index f7e873305c..ad8d9d7e16 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -254,6 +254,7 @@ public class SettingsMenuDialog extends SettingsDialog{ }); graphics.sliderPref("fpscap", 240, 15, 245, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s))); graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%"); + graphics.sliderPref("lasersopacity", 100, 0, 100, 5, s -> s + "%"); if(!mobile){ graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b)); @@ -299,7 +300,6 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("animatedshields", !mobile); } graphics.checkPref("bloom", false, val -> renderer.toggleBloom(val)); - graphics.checkPref("lasers", true); graphics.checkPref("pixelate", false, val -> { if(val){ Events.fire(Trigger.enablePixelation); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 2896de80fa..453b4032c5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -275,15 +275,18 @@ public class PowerNode extends PowerBlock{ @Override public void drawLayer(Tile tile){ - if(!Core.settings.getBool("lasers")) return; + if(Core.settings.getInt("lasersopacity") == 0) return; TileEntity entity = tile.entity(); for(int i = 0; i < entity.power.links.size; i++){ Tile link = world.tile(entity.power.links.get(i)); - if(linkValid(tile, link) && (link.pos() < tile.pos() || !(link.block() instanceof PowerNode) || !Core.camera.bounds(Tmp.r1).contains(link.drawx(), link.drawy()))){ - drawLaser(tile, link); - } + + if(!linkValid(tile, link)) continue; + + if(link.block() instanceof PowerNode && !(link.pos() < tile.pos())) continue; + + drawLaser(tile, link); } Draw.reset(); @@ -318,6 +321,11 @@ public class PowerNode extends PowerBlock{ } protected void drawLaser(Tile tile, Tile target){ + int opacityPercentage = Core.settings.getInt("lasersopacity"); + if(opacityPercentage == 0) return; + + float opacity = opacityPercentage / 100f; + float x1 = tile.drawx(), y1 = tile.drawy(), x2 = target.drawx(), y2 = target.drawy(); @@ -333,7 +341,8 @@ public class PowerNode extends PowerBlock{ float fract = 1f-tile.entity.power.graph.getSatisfaction(); Draw.color(Color.white, Pal.powerLight, fract*0.86f + Mathf.absin(3f, 0.1f)); - Drawf.laser(laser, laserEnd, x1, y1, x2, y2, 0.3f); + Draw.alpha(opacity); + Drawf.laser(laser, laserEnd, x1, y1, x2, y2, 0.25f); Draw.color(); }