Add a new mode for fill tool: Fill Under Liquids (#11967)

* add fillunderliquid tool

* add toolmode.fillunderliquid into bundles

* fixed

core/assets/bundles/bundle.properties

@@ -634,6 +634,8 @@ toolmode.drawteams.description = Draw teams instead of blocks.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
 

core/assets/bundles/bundle_be.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Змяняе прыналежнасць \nбл
 #unused
 toolmode.underliquid = Пад вадкасцямі
 toolmode.underliquid.description = Малюе паверхні пад вадзяныя блокі.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Няма фільтраў! Дадайце адзін пры дапамозе кнопкі ніжэй.
 

core/assets/bundles/bundle_bg.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Променя отбора, не типа на
 #unused
 toolmode.underliquid = Под течности
 toolmode.underliquid.description = Рисува повърхности под течни полета.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Няма избран филтър! Изберете чрез бутона отдолу.
 

core/assets/bundles/bundle_ca.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Dibuixa els equips en lloc de dibuixar blocs.
 #unused
 toolmode.underliquid = Sota els líquids
 toolmode.underliquid.description = Dibuixa el terra a sota de les caselles de líquids.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Sense filtres! Afegiu-ne un amb el botó de sota.
 

core/assets/bundles/bundle_cs.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Kreslí týmy místo bloků.
 #unused
 toolmode.underliquid = Pod Kapalinami
 toolmode.underliquid.description = Kreslí podlahy pod kostkami kapalin.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Nejsou zadány žádné filtry, přidej filtr tlačítkem níže.[]
 

core/assets/bundles/bundle_da.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Tegner hold i stedet for blokke.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Ingen filtre! Tilføj filter nedenfor.
 

core/assets/bundles/bundle_de.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Zeichnet Teams statt Blöcke.
 #unused
 toolmode.underliquid = Unter Flüssigkeiten
 toolmode.underliquid.description = Malt Boden unter Flüssigkeiten.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Keine Filter! Füge einen mit dem unteren Knopf hinzu.
 

core/assets/bundles/bundle_es.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Dibuja equipos en lugar de bloques.
 #unused
 toolmode.underliquid = Bajo líquidos
 toolmode.underliquid.description = Dibuja suelos bajo bloques con líquidos.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]¡No hay filtros! Añade uno con el botón de abajo.
 

core/assets/bundles/bundle_et.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Joonista blokkide asemel võistkondi.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Filtrid puuduvad! Lisa filtreid alloleva nupuga.
 

core/assets/bundles/bundle_eu.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Marraztu taldeak blokeen ordez.
 #unused
 toolmode.underliquid = Likidoen Azpian
 toolmode.underliquid.description = Mosaiko likidoen azpian solairuak marraztea.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Iragazkirik ez! Gehitu bat beheko botoiarekin.
 

core/assets/bundles/bundle_fi.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Piirrä joukkueita palikkojen sijaan.
 #unused
 toolmode.underliquid = Pinnanalainen tila
 toolmode.underliquid.description = Piirrä lattioita nestelaattojen alle.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Ei filttereitä! Lisää yksi alla olevasta napista.
 

core/assets/bundles/bundle_fil.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Draw teams instead of blocks.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Walang mga filter! Magdagdag ng isa gamit ang button sa ibaba.
 

core/assets/bundles/bundle_fr.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Change les équipes\nau lieu de blocs.
 #unused
 toolmode.underliquid = Sous les liquides
 toolmode.underliquid.description = Dessiner les sols sous les tuiles de liquides.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Aucun filtre !\nAjoutez-en un avec les boutons ci-dessous.
 

core/assets/bundles/bundle_hu.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Csapatok rajzolása blokkok helyett.
 #unused
 toolmode.underliquid = Folyadékok alá
 toolmode.underliquid.description = Padlók rajzolása a folyadékblokkok alá.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Még nincs szűrő! Adj hozzá egyet a lenti gombra kattintva.
 

core/assets/bundles/bundle_id_ID.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Menggambar tim bukannya blok.
 #unused
 toolmode.underliquid = Di Bawah Cairan
 toolmode.underliquid.description = Gambarlah lantai di bawah ubin cair.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Tidak ada penyaring! Tambahkan dengan tombol di bawah.
 

core/assets/bundles/bundle_it.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Disegna squadre al posto di blocchi.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Nessun filtro! Aggiungine uno cliccando il tasto sotto.
 

core/assets/bundles/bundle_ja.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = ブロックの所属チームを上書きし
 #unused
 toolmode.underliquid = 液体タイル
 toolmode.underliquid.description = 液体タイルのみを置換します。
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]フィルターが設定されていません! 下のボタンからフィルターを追加してください。
 

core/assets/bundles/bundle_ko.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = 블록의 팀을 선택한 팀으로 그립니
 #unused
 toolmode.underliquid = 액체 아래로 그리기
 toolmode.underliquid.description = 액체 타일 아래에 바닥을 그립니다.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]필터가 없습니다! 아래 버튼을 눌러 하나를 추가하세요.
 

core/assets/bundles/bundle_lt.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Pieškite komandas, o ne blokus.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Nėra filtrų! Pridėkite su mygtuku easančiu žemiau.
 

core/assets/bundles/bundle_nl.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Tekent teams in plaats van blokken.
 #unused
 toolmode.underliquid = Onder vloeistoffen
 toolmode.underliquid.description = Teken vloeren onder vloeistoffen tegels.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Geen filters! Voeg er <20><>n toe met de onderstaande knop.
 

core/assets/bundles/bundle_nl_BE.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Draw teams instead of blocks.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
 

core/assets/bundles/bundle_pl.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Rysuje drużyny zamiast bloków.
 #unused
 toolmode.underliquid = Pod Cieczami
 toolmode.underliquid.description = Narysuj podłogi pod płynnymi obszarami.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Brak filtrów! Dodaj jeden za pomocą przycisku poniżej.
 

core/assets/bundles/bundle_pt_BR.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Muda o time do qual o bloco pertence.
 #unused
 toolmode.underliquid = sob líquidos
 toolmode.underliquid.description = Desenhe pisos sob ladrilhos líquidos.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Sem filtros! Adicione um usando o botão abaixo.
 

core/assets/bundles/bundle_pt_PT.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Muda a equipa da qual o bloco pertence.
 #unused
 toolmode.underliquid = Debaixo de Líquidos
 toolmode.underliquid.description = Desenha o fundo de poças de líquidos.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Sem filtros! Adicione um com o botão abaixo.
 

core/assets/bundles/bundle_ro.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Desenează echipe în loc de blocuri.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Fără filtre! Adaugă unul folosind butonul de mai jos.
 

core/assets/bundles/bundle_ru.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Изменяет принадлежность\n
 #unused
 toolmode.underliquid = Под жидкостями
 toolmode.underliquid.description = Рисует пол под плитками жидкости.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Нет фильтров! Добавьте один при помощи кнопки ниже.
 

core/assets/bundles/bundle_sr.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Crtaj timove umesto blokova.
 #unused
 toolmode.underliquid = Ispod Tečnosti
 toolmode.underliquid.description = Crtaj podove ispod tečnosti.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Nema filtera! Dodaj jedan preko dugmati ispod.
 

core/assets/bundles/bundle_sv.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Draw teams instead of blocks.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
 

core/assets/bundles/bundle_th.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = วาดทีมแทนที่จะเ
 #unused
 toolmode.underliquid = ใต้พื้นของเหลว
 toolmode.underliquid.description = วาดพื้นด้านใต้ช่องของเหลว
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]ไม่มีฟิลเตอร์! เพิ่มฟิลเตอร์ด้วยปุ่มด้านล่างนี้
 

core/assets/bundles/bundle_tk.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Draw teams instead of blocks.
 #unused
 toolmode.underliquid = Under Liquids
 toolmode.underliquid.description = Draw floors under liquid tiles.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]No filters! Add one with the button below.
 

core/assets/bundles/bundle_tr.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Bloklar yerine takımları çizer.
 #unused
 toolmode.underliquid = Sıvı Altı
 toolmode.underliquid.description = Sıvıların altına zemin koyma.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Hiç filtre yok! Aşağıdaki düğmelerle bir adet ekle.
 

core/assets/bundles/bundle_uk_UA.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Змінює належність\nблока
 #unused
 toolmode.underliquid = Під рідинами
 toolmode.underliquid.description = Малюйте поверхні під плитками рідин.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Немає фільтрів! Додайте хоча б один за допомогою кнопки нижче.
 

core/assets/bundles/bundle_vi.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = Vẽ các đội thay vì các khối.
 #unused
 toolmode.underliquid = Dưới chất lỏng
 toolmode.underliquid.description = Vẽ nền dưới các ô chất lỏng.
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]Không có bộ lọc! Thêm một bộ bằng nút bên dưới.
 

core/assets/bundles/bundle_zh_CN.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = 绘制队伍颜色而不是方块。
 #unused
 toolmode.underliquid = 水下地形
 toolmode.underliquid.description = 绘制位于液体下的地形
+toolmode.fillunderliquid = 填充水下地形
+toolmode.fillunderliquid.description = 填充位于液体下的地形
 
 filters.empty = [lightgray]未创建生成器！用下方的按钮创建。
 

core/assets/bundles/bundle_zh_TW.properties

@@ -631,6 +631,8 @@ toolmode.drawteams.description = 繪製團隊而非方塊。
 #unused
 toolmode.underliquid = 水下地形
 toolmode.underliquid.description = 繪製液體下的地形
+toolmode.fillunderliquid = Fill Under Liquids
+toolmode.fillunderliquid.description = Fill floors under liquid tiles.
 
 filters.empty = [lightgray]沒有過濾器！使用下面的按鈕新增一個。
 

core/assets/contributors

@@ -193,4 +193,5 @@ TheCuber
 萌新-hhgs
 Jovinull
 Alon
-硫缺铅/PyratiteNoLead
+硫缺铅/PyratiteNoLead
+Space

core/src/mindustry/editor/EditorTool.java

@@ -94,7 +94,7 @@ public enum EditorTool{
             });
         }
     },
-    fill(KeyCode.g, "replaceall", "fillteams", "fillerase", "fillcliffs"){
+    fill(KeyCode.g, "replaceall", "fillteams", "fillerase", "fillcliffs", "fillunderliquid"){
         {
             edit = true;
         }
@@ -213,6 +213,23 @@ public enum EditorTool{
 
                     t.data = (byte)rotation;
                 });
+            }else if(mode == 4){ //fill under liquid
+                if(editor.drawBlock instanceof Floor f && !f.isLiquid){
+                    if(!tile.floor().isLiquid) return;
+
+                    Block dest = tile.floor(), destoverlay = tile.overlay();
+
+                    Boolf<Tile> tester;
+                    Cons<Tile> setter;
+                    tester = t -> t.floor() == dest && t.overlay() == destoverlay;
+                    setter = t -> {
+                        if(t.overlay() != editor.drawBlock){
+                            t.setOverlay(editor.drawBlock.asFloor());
+                        }
+                    };
+                    
+                    fill(x, y, false, tester, setter);
+                }
             }
         }