Merge branch 'master' into vi-VN

SITUVNgcd · Jan 15, 2025 · 0428063 · 0428063
2 parents 7e36b6e + d355ea9
commit 0428063
Show file tree

Hide file tree

Showing 82 changed files with 778 additions and 347 deletions.
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-phase-cell.png b/core/assets-raw/sprites/units/weapons/scathe-missile-phase-cell.png
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-phase.png b/core/assets-raw/sprites/units/weapons/scathe-missile-phase.png
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-surge-cell.png b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-cell.png
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split-cell.png b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split-cell.png
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split.png b/core/assets-raw/sprites/units/weapons/scathe-missile-surge-split.png
diff --git a/core/assets-raw/sprites/units/weapons/scathe-missile-surge.png b/core/assets-raw/sprites/units/weapons/scathe-missile-surge.png
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
@@ -301,6 +301,7 @@ disconnect.error = Connection error.
 disconnect.closed = Connection closed.
 disconnect.timeout = Timed out.
 disconnect.data = Failed to load world data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connecting...
 reconnecting = [accent]Reconnecting...
@@ -1139,8 +1140,8 @@ bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray] ammo/item
 bullet.reload = [stat]{0}%[lightgray] fire rate
 bullet.range = [stat]{0}[lightgray] tiles range
-bullet.notargetsmissiles = [stat] ignores buildings
-bullet.notargetsbuildings = [stat] ignores missiles
+bullet.notargetsmissiles = [stat] ignores missiles
+bullet.notargetsbuildings = [stat] ignores buildings
 
 unit.blocks = blocks
 unit.blockssquared = blocks\u00B2

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
@@ -290,6 +290,7 @@ disconnect.error = Памылка злучэння.
 disconnect.closed = Злучэнне закрыта.
 disconnect.timeout = Час чакання скончыўся.
 disconnect.data = Памылка пры загрузцы дадзеных свету!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Не ўдаецца далучыцца да гульні ([accent]{0}[]).
 connecting = [accent]Падключэнне…
 reconnecting = [accent]Перападключэнне...

diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
@@ -295,6 +295,7 @@ disconnect.error = Проблем със връзката.
 disconnect.closed = Връзката приключи.
 disconnect.timeout = Загубена връзка.
 disconnect.data = Грешка при зареждане на информация за света!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Неуспех при свързване към игра ([accent]{0}[]).
 connecting = [accent]Свързване...
 reconnecting = [accent]Повторно свързване...

diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
@@ -295,6 +295,7 @@ disconnect.error = Error de connexió.
 disconnect.closed = Connexió tancada.
 disconnect.timeout = S’ha esgotat el temps d’espera.
 disconnect.data = No s’han pogut carregar les dades del món!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = No és possible unir-se a la partida ([accent]{0}[]).
 connecting = [accent]Es connecta…
 reconnecting = [accent]Es torna a connectar…

diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
@@ -295,6 +295,7 @@ disconnect.error = Chyba připojení.
 disconnect.closed = Připojení bylo uzavřeno.
 disconnect.timeout = Vypršel čas pro připojení.
 disconnect.data = Chyba načtení dat ze serveru!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Není možno se připojit ke hře ([accent]{0}[]).
 connecting = [accent]Připojuji se...[]
 reconnecting = [accent]Znovu se připojuji...

diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
@@ -291,6 +291,7 @@ disconnect.error = Forbindelsesfejl.
 disconnect.closed = Forbindelse afbrudt.
 disconnect.timeout = Maksimal ventetid overskredet.
 disconnect.data = Kunne ikke indlæse bane-data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Kunne ikke deltage i spil ([accent]{0}[]).
 connecting = [accent]Forbinder...
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
@@ -298,6 +298,7 @@ disconnect.error = Verbindungsfehler.
 disconnect.closed = Verbindung geschlossen.
 disconnect.timeout = Zeitüberschreitung.
 disconnect.data = Fehler beim Laden der Welt!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Nicht möglich beizutreten ([accent]{0}[]).
 connecting = [accent] Verbinde...
 reconnecting = [accent]Verbindung wird wiederhergestellt...

diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
@@ -295,6 +295,7 @@ disconnect.error = Error de conexión.
 disconnect.closed = Conexión cerrada.
 disconnect.timeout = Tiempo de espera agotado.
 disconnect.data = ¡Hubo un fallo al cargar los datos!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = No es posible unirse a la partida ([accent]{0}[]).
 connecting = [accent]Conectando...
 reconnecting = [accent]Reconectado...

diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
@@ -291,6 +291,7 @@ disconnect.error = Ühenduse viga.
 disconnect.closed = Ühendus on suletud.
 disconnect.timeout = Ühendus aegus.
 disconnect.data = Maailma andmete allalaadimine ebaõnnestus!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Mänguga ei saanud liituda ([accent]{0}[]).
 connecting = [accent]Ühendamine...
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
@@ -293,6 +293,7 @@ disconnect.error = Konexio errorea.
 disconnect.closed = Konexioa itxita.
 disconnect.timeout = Denbor-muga agortuta.
 disconnect.data = Huts egin du munduaren datuak eskuratzean!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Ezin izan da partidara elkartu ([accent]{0}[]).
 connecting = [accent]Konektatzen...
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
@@ -291,6 +291,7 @@ disconnect.error = Yhteysvirhe.
 disconnect.closed = Yhteys poistettu.
 disconnect.timeout = Yhteys aikakatkaistiin.
 disconnect.data = Maailman tietojen lataaminen epäonnistui!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Peliin ei voitu liittyä ([accent]{0}[]).
 connecting = [accent]Yhdistetään...
 reconnecting = [accent]Yhdistetään uudelleen...

diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
@@ -291,6 +291,7 @@ disconnect.error = Connection error.
 disconnect.closed = Connection closed.
 disconnect.timeout = Na-time out.
 disconnect.data = Pumalya ang pag-load ng world data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Hindi kayant sumali sa larong ([accent]{0}[]).
 connecting = [accent]Connecting...
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
@@ -301,6 +301,7 @@ disconnect.error = Un problème est survenu lors de la connexion.
 disconnect.closed = Connexion fermée.
 disconnect.timeout = Délai de connexion expiré.
 disconnect.data = Les données du monde n'ont pas pu être chargées !
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Impossible de rejoindre ([accent]{0}[]).
 connecting = [accent]Connexion...
 reconnecting = [accent]Reconnexion...

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
@@ -301,6 +301,7 @@ disconnect.error = Kapcsolódási hiba.
 disconnect.closed = Kapcsolat lezárva.
 disconnect.timeout = Időtúllépés.
 disconnect.data = Nem sikerült betölteni a világ adatait!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Nem sikerült kapcsolódni a(z) ([accent]{0}[]) játékhoz.
 connecting = [accent]Kapcsolódás...
 reconnecting = [accent]Újrakapcsolódás...

diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
@@ -301,6 +301,7 @@ disconnect.error = Sambungan bermasalah.
 disconnect.closed = Sambungan ditutup.
 disconnect.timeout = Waktu koneksi habis.
 disconnect.data = Gagal memuat data dunia!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Gagal tersambung ke permainan ([accent]{0}[]).
 connecting = [accent]Menghubungkan...
 reconnecting = [accent]Menghubungkan kembali...

diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
@@ -293,6 +293,7 @@ disconnect.error = Errore di connessione.
 disconnect.closed = Connessione chiusa.
 disconnect.timeout = Connessione scaduta.
 disconnect.data = Errore durante il caricamento del mondo!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Impossibile unirsi alla partita ([accent]{0}[]).
 connecting = [accent]Connessione in corso...
 reconnecting = [accent]Riconnessione in corso...

diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
@@ -295,6 +295,7 @@ disconnect.error = 接続にエラーが発生しました。
 disconnect.closed = 接続が切断されました。
 disconnect.timeout = タイムアウトしました。
 disconnect.data = ワールドデータの読み込みに失敗しました!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = ゲームに参加できませんでした。 ([accent]{0}[])
 connecting = [accent]接続中...
 reconnecting = [accent]再接続中...

diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
@@ -301,6 +301,7 @@ disconnect.error = 연결 오류
 disconnect.closed = 연결이 종료되었습니다.
 disconnect.timeout = 시간 초과
 disconnect.data = 맵 데이터를 로드하지 못했습니다!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = [accent]{0}[] 게임에 참여할 수 없습니다.
 connecting = [accent] 연결중...
 reconnecting = [accent]재접속중...

diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
@@ -291,6 +291,7 @@ disconnect.error = Prisijungimo klaida.
 disconnect.closed = Prisijungimas uždarytas.
 disconnect.timeout = Baigėsi laikas.
 disconnect.data = Nepavyko užkrauti pasaulio informacijos!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Negalima prisijungti prie žaidimo ([accent]{0}[]).
 connecting = [accent]Prisijungiama...
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
@@ -299,6 +299,7 @@ disconnect.error = Verbindingsfout.
 disconnect.closed = Verbinding gestopt.
 disconnect.timeout = Verbinding afgekapt.
 disconnect.data = Kon de wereld niet laden!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Geen verbinding mogelijk ([accent]{0}[]).
 connecting = [accent]Aan het verbinden...
 reconnecting = [accent]Aan het herverbinden...

diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
@@ -291,6 +291,7 @@ disconnect.error = Verbindingsfout.
 disconnect.closed = Verbinding afgesloten.
 disconnect.timeout = Het duurde te lang voordat de server antwoordde.
 disconnect.data = Laden van mapdata mislukt!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Kon niet tot het spel toetreden. ([accent]{0}[]).
 connecting = [accent]Verbinden...
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
@@ -295,6 +295,7 @@ disconnect.error = Błąd połączenia.
 disconnect.closed = Połączenie zostało zamknięte.
 disconnect.timeout = Przekroczono limit czasu.
 disconnect.data = Nie udało się załadować mapy!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Nie można dołączyć do gry ([accent]{0}[]).
 connecting = [accent]Łączenie...
 reconnecting = [accent]Ponowne łączenie...

diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
@@ -295,6 +295,7 @@ disconnect.error = Erro de conexão.
 disconnect.closed = Conexão fechada.
 disconnect.timeout = Tempo esgotado.
 disconnect.data = Falha ao carregar os dados do mundo!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Impossível conectar ([accent]{0}[]).
 connecting = [accent]Conectando...
 reconnecting = [accent]Reconectando...

diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
@@ -291,6 +291,7 @@ disconnect.error = Erro de conexão.
 disconnect.closed = Conexão fechada.
 disconnect.timeout = Tempo esgotado.
 disconnect.data = Falha ao abrir os dados do mundo!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Impossível conectar ([accent]{0}[]).
 connecting = [accent]Conectando...
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
@@ -295,6 +295,7 @@ disconnect.error = Eroare de conexiune.
 disconnect.closed = Conexiune închisă.
 disconnect.timeout = Întârzie să răspundă.
 disconnect.data = Nu s-au putut încărca datele lumii!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Nu te-ai putut alătura jocului ([accent]{0}[]).
 connecting = [accent]Conectare...
 reconnecting = [accent]Reconectare...

diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
@@ -295,6 +295,7 @@ disconnect.error = Ошибка соединения.
 disconnect.closed = Соединение закрыто.
 disconnect.timeout = Время ожидания истекло.
 disconnect.data = Ошибка при загрузке данных мира!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Не удаётся присоединиться к игре ([accent]{0}[]).
 connecting = [accent]Подключение…
 reconnecting = [accent]Переподключение…

diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
@@ -295,6 +295,7 @@ disconnect.error = Greška u povezivanju.
 disconnect.closed = Connection closed.
 disconnect.timeout = Timed out.
 disconnect.data = Neuspešno učitavanje podataka!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Ne može se pridružiti igri ([accent]{0}[]).
 connecting = [accent]Povezivanje...
 reconnecting = [accent]Ponovno povezivanje...

diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
@@ -291,6 +291,7 @@ disconnect.error = Kopplingsfel.
 disconnect.closed = Koppling stängd.
 disconnect.timeout = Timed out.
 disconnect.data = Failed to load world data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Ansluter...
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
@@ -295,6 +295,7 @@ disconnect.error = การเชื่อมต่อมีปัญหา
 disconnect.closed = การเชื่อมต่อถูกปิดแล้ว
 disconnect.timeout = หมดเวลา
 disconnect.data = การโหลดข้อมูลของโลกผิดพลาด!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = ไม่สามารถเข้าร่วมเซิร์ฟเวอร์ ([accent]{0}[])
 connecting = [accent]กำลังเชื่อมต่อ...
 reconnecting = [accent]กำลังเชื่อมต่อใหม่...

diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
@@ -291,6 +291,7 @@ disconnect.error = Connection error.
 disconnect.closed = Connection closed.
 disconnect.timeout = Timed out.
 disconnect.data = Oyunun geri yuklenemedi!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Baglaniliyor
 reconnecting = [accent]Reconnecting...

diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
@@ -295,6 +295,7 @@ disconnect.error = Bağlantı hatası.
 disconnect.closed = Bağlantı kapatıldı.
 disconnect.timeout = Zaman aşımı.
 disconnect.data = Dünya verisi yüklenemedi!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Oyuna girilemiyor ([accent]{0}[]).
 connecting = [accent]Bağlanılıyor...
 reconnecting = [accent]Yeniden Bağlanılıyor...

diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
@@ -297,6 +297,7 @@ disconnect.error = Помилка з’єднання.
 disconnect.closed = З’єднання закрито.
 disconnect.timeout = Час вийшов.
 disconnect.data = Не вдалося завантажити світові дані!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Не вдалося під’єднатися до гри ([accent]{0}[]).
 connecting = [accent]Приєднання…
 reconnecting = [accent]Повторне з’єднання…

diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
@@ -298,6 +298,7 @@ disconnect.error = 连接错误。
 disconnect.closed = 连接关闭。
 disconnect.timeout = 连接超时。
 disconnect.data = 地图加载失败！
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = 无法加入游戏（[accent]{0}[]）。
 connecting = [accent]连接中…
 reconnecting = [accent]重新连接中…

diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
@@ -295,6 +295,7 @@ disconnect.error = 連線錯誤。
 disconnect.closed = 連線關閉。
 disconnect.timeout = 連線逾時。
 disconnect.data = 無法載入地圖資料！
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = 無法加入遊戲 ([accent]{0}[]).
 connecting = [accent]連線中……
 reconnecting = [accent]重新連接中……

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
@@ -592,3 +592,6 @@
 63090=remove-ore|block-remove-ore-ui
 63089=small-heat-redirector|block-small-heat-redirector-ui
 63088=large-cliff-crusher|block-large-cliff-crusher-ui
+63087=scathe-missile-phase|unit-scathe-missile-phase-ui
+63086=scathe-missile-surge|unit-scathe-missile-surge-ui
+63085=scathe-missile-surge-split|unit-scathe-missile-surge-split-ui
diff --git a/core/src/mindustry/ai/BaseBuilderAI.java b/core/src/mindustry/ai/BaseBuilderAI.java
@@ -258,7 +258,7 @@ private boolean tryPlace(BasePart part, int x, int y){
 
         //queue it
         for(Stile tile : result.tiles){
-            data.plans.add(new BlockPlan(cx + tile.x, cy + tile.y, tile.rotation, tile.block.id, tile.config));
+            data.plans.add(new BlockPlan(cx + tile.x, cy + tile.y, tile.rotation, tile.block, tile.config));
         }
 
         return true;

diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java
@@ -39,7 +39,8 @@ public class Pathfinder implements Runnable{
     public static final int
         costGround = 0,
         costLegs = 1,
-        costNaval = 2;
+        costNaval = 2,
+        costHover = 3;
 
     public static final Seq<PathCost> costTypes = Seq.with(
         //ground
@@ -63,7 +64,13 @@ public class Pathfinder implements Runnable{
             PathTile.health(tile) * 5 +
             (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) +
             (PathTile.deep(tile) ? 0 : 1) +
-            (PathTile.damages(tile) ? 35 : 0)
+            (PathTile.damages(tile) ? 35 : 0),
+
+        //hover
+        (team, tile) ->
+            (((PathTile.team(tile) == team && !PathTile.teamPassable(tile)) || PathTile.team(tile) == 0) && PathTile.solid(tile)) ? impassable : 1 +
+            PathTile.health(tile) * 5 +
+            (PathTile.nearSolid(tile) ? 2 : 0)
     );
 
     /** tile data, see PathTileStruct - kept as a separate array for threading reasons */

diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java
@@ -179,12 +179,12 @@ public void updateMovement(){
                 BlockPlan block = blocks.first();
 
                 //check if it's already been placed
-                if(world.tile(block.x, block.y) != null && world.tile(block.x, block.y).block().id == block.block){
+                if(world.tile(block.x, block.y) != null && world.tile(block.x, block.y).block() == block.block){
                     blocks.removeFirst();
-                }else if(Build.validPlace(content.block(block.block), unit.team(), block.x, block.y, block.rotation) && (!alwaysFlee || !nearEnemy(block.x, block.y))){ //it's valid
+                }else if(Build.validPlace(block.block, unit.team(), block.x, block.y, block.rotation) && (!alwaysFlee || !nearEnemy(block.x, block.y))){ //it's valid
                     lastPlan = block;
                     //add build plan
-                    unit.addBuild(new BuildPlan(block.x, block.y, block.rotation, content.block(block.block), block.config));
+                    unit.addBuild(new BuildPlan(block.x, block.y, block.rotation, block.block, block.config));
                     //shift build plan to tail so next unit builds something else
                     blocks.addLast(blocks.removeFirst());
                 }else{