mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-09 02:09:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2023-05-08 12:15:06 -04:00
commit ccd2727ab5
53 changed files with 283 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/items/liquid-arkycite.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 502 B

After

Width:  |  Height:  |  Size: 431 B

BIN
core/assets-raw/sprites/items/liquid-cyanogen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 304 B

BIN
core/assets-raw/sprites/items/liquid-hydrogen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 304 B

BIN
core/assets-raw/sprites/items/liquid-nitrogen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 285 B

BIN
core/assets-raw/sprites/items/liquid-ozone.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 291 B

3
core/assets/bundles/bundle.properties
View File

@ -462,6 +462,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1237,6 +1239,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Waves Wait for Enemies
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
rules.unitammo = Units Require Ammo [red](may be removed)
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_be.properties
View File

@ -453,6 +453,8 @@ waves.sort.reverse = Рэверсіўнае Сартаванне
waves.sort.begin = Пачатак
waves.sort.health = Здароўе
waves.sort.type = Тып
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Схаваць Усё
waves.units.show = Паказаць Усё
@ -1212,6 +1214,7 @@ rules.buildcostmultiplier = Множнік выдаткаў на будаўні
rules.buildspeedmultiplier = Множнік хуткасці будаўніцтва
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Хвалі чакаюць ворагаў
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Радыус зоны высадкі ворагаў: [lightgray] (блокаў)
rules.unitammo = Адзінкі Патрабуюць Боезапас
rules.enemyteam = Варожая Каманда

3
core/assets/bundles/bundle_bg.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1223,6 +1225,7 @@ rules.buildcostmultiplier = Множител на Необходимите Ре
rules.buildspeedmultiplier = Множител на Скоростта за Строене
rules.deconstructrefundmultiplier = Множител на Възстановени Ресурси при Деконструкция
rules.waitForWaveToEnd = Вълните Изчакват за Врагове
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Радиус на Начална Точка на Враговете:[lightgray] (полета)
rules.unitammo = Единиците се Нуждаят от Боеприпаси
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_ca.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Ordre invers
waves.sort.begin = Comença
waves.sort.health = Salut
waves.sort.type = Tipus
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Amaga-les totes
waves.units.show = Mostra-les totes
@ -1227,6 +1229,7 @@ rules.buildcostmultiplier = Multiplicador del cost de construcció
rules.buildspeedmultiplier = Multiplicador de la velocitat de construcció
rules.deconstructrefundmultiplier = Multiplicador dels elements recuperats per desmuntatge
rules.waitForWaveToEnd = Les onades esperen fins veure enemics
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Radi de la zona d’aterratge:[lightgray] (caselles)
rules.unitammo = Les unitats necessiten munició
rules.enemyteam = Equip enemic

3
core/assets/bundles/bundle_cs.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Obrátit řazení
waves.sort.begin = Začít
waves.sort.health = Životy
waves.sort.type = Typ
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Schovat vše
waves.units.show = Zobrazit vše
@ -1225,6 +1227,7 @@ rules.buildcostmultiplier = Násobek ceny stavění
rules.buildspeedmultiplier = Násobek rychlosti stavění
rules.deconstructrefundmultiplier = Násobek vratky při rozebrání
rules.waitForWaveToEnd = Vlny čekají na nepřátele
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Poloměr oblasti pro vylíhnutí: [lightgray](dlaždic)[]
rules.unitammo = Jednotky vyžadují munici
rules.enemyteam = Nepřátelský Tým

3
core/assets/bundles/bundle_da.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1213,6 +1215,7 @@ rules.buildcostmultiplier = Byggepris-forstærker
rules.buildspeedmultiplier = Byggehastigheds-forstærker
rules.deconstructrefundmultiplier = Dekonstruerings-tilbagebetalings-forstærker
rules.waitForWaveToEnd = Bølge-ventetid for fjender
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Drop-zone-radius:[lightgray] (felter)
rules.unitammo = Enheder kræver ammunition
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_de.properties
View File

@ -461,6 +461,8 @@ waves.sort.reverse = Reihenfolge umkehren
waves.sort.begin = Anfang
waves.sort.health = Lebenspunkte
waves.sort.type = Sorte
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Alle verstecken
waves.units.show = Alle anzeigen
@ -1236,6 +1238,7 @@ rules.buildcostmultiplier = Bau-Kosten Multiplikator
rules.buildspeedmultiplier = Bau-Schnelligkeit Multiplikator
rules.deconstructrefundmultiplier = Abbau Ressourcen-Rückerstattung
rules.waitForWaveToEnd = Warten bis Welle endet
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Drop-Zonen-Radius:[lightgray] (Kacheln)
rules.unitammo = Einheiten benötigen Munition [red](wird vielleicht entfernt)
rules.enemyteam = Gegnerteam

3
core/assets/bundles/bundle_es.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Invertir orden
waves.sort.begin = Inicio
waves.sort.health = Vida
waves.sort.type = Tipo
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Ocultar todo
waves.units.show = Mostrar todo
@ -1233,6 +1235,7 @@ rules.buildcostmultiplier = Multiplicador de coste de construcción
rules.buildspeedmultiplier = Multiplicador de velocidad de construcción
rules.deconstructrefundmultiplier = Multiplicador de devolución de desconstrucción
rules.waitForWaveToEnd = Las oleadas esperan a los enemigos
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Radio de zona de aterrizaje:[lightgray] (bloques)
rules.unitammo = Las unidades necesitan munición
rules.enemyteam = Equipo enemigo

3
core/assets/bundles/bundle_et.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1213,6 +1215,7 @@ rules.buildcostmultiplier = Ehitamise maksumuse kordaja
rules.buildspeedmultiplier = Ehitamise kiiruse kordaja
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Järgmine laine ootab eelmise laine lõpuni
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Maandumisala raadius:[lightgray] (ühik)
rules.unitammo = Units Require Ammo
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_eu.properties
View File

@ -456,6 +456,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1215,6 +1217,7 @@ rules.buildcostmultiplier = Eraikitze kostu-biderkatzailea
rules.buildspeedmultiplier = Eraikitze abiadura-biderkatzailea
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Atzeratu bolada etsairik geratzen bada
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Erruntze puntuaren erradioa:[lightgray] (lauzak)
rules.unitammo = Units Require Ammo
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_fi.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Järjestä käänteisesti
waves.sort.begin = Alkutaso
waves.sort.health = Elämäpisteet
waves.sort.type = Tyyppi
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Piilota kaikki
waves.units.show = Näytä kaikki
@ -1212,6 +1214,7 @@ rules.buildcostmultiplier = Rakentamisen hintakerroin
rules.buildspeedmultiplier = Rakentamisen nopeuskerroin
rules.deconstructrefundmultiplier = Purkamisen palautuskerroin
rules.waitForWaveToEnd = Tasot odottavat edellisen tason loppumista
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Syntypisteen säde:[lightgray] (laattoina)
rules.unitammo = Yksiköt tarvitsevat ammuksia
rules.enemyteam = Vihollisjoukkue

3
core/assets/bundles/bundle_fil.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Pabaliktad na Sort
waves.sort.begin = Simula
waves.sort.health = Health
waves.sort.type = Uri
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Itago lahat
waves.units.show = Ipakita lahat
@ -1212,6 +1214,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Waves Wait for Enemies
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
rules.unitammo = Units Require Ammo
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_fr.properties
View File

@ -462,6 +462,8 @@ waves.sort.reverse = Tri inversé
waves.sort.begin = Vague
waves.sort.health = Santé
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Masquer tout
waves.units.show = Afficher tout
@ -1237,6 +1239,7 @@ rules.buildcostmultiplier = Multiplicateur du prix de construction
rules.buildspeedmultiplier = Multiplicateur du temps de construction
rules.deconstructrefundmultiplier = Multiplicateur du remboursement lors de la déconstruction
rules.waitForWaveToEnd = Les Vagues attendent la mort des ennemis
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Rayon d'Apparition des ennemis :[lightgray] (tuiles)
rules.unitammo = Les Unités nécessitent des munitions
rules.enemyteam = Équipe ennemie

3
core/assets/bundles/bundle_hu.properties
View File

@ -457,6 +457,8 @@ waves.sort.reverse = Rendezés visszafelé
waves.sort.begin = Begin
waves.sort.health = Élet
waves.sort.type = Típus
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1222,6 +1224,7 @@ rules.buildcostmultiplier = Építési költség szorzó
rules.buildspeedmultiplier = Építési sebesség szorzó
rules.deconstructrefundmultiplier = Bontási visszatérítés szorzó
rules.waitForWaveToEnd = Waves Wait for Enemies
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Ledobási zóna sugara:[lightgray] (mező)
rules.unitammo = Egységeknek kell lövedék
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_id_ID.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Urut Balik
waves.sort.begin = Mulai
waves.sort.health = Darah
waves.sort.type = Tipe
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Sembunyikan Semua
waves.units.show = Lihat Semua
@ -1233,6 +1235,7 @@ rules.buildcostmultiplier = Penggandaan Harga Bangunan
rules.buildspeedmultiplier = Penggandaan Waktu Pembuatan Bangunan
rules.deconstructrefundmultiplier = Penggandaan Kembalinya Bahan Bangunan yang Dihancurkan
rules.waitForWaveToEnd = Gelombang Menunggu Musuh
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Radius Titik Muncul:[lightgray] (ubin)
rules.unitammo = Unit Membutuhkan Amunisi
rules.enemyteam = Tim Musuh

33
core/assets/bundles/bundle_it.properties
View File

@ -49,7 +49,7 @@ mods.browser.noreleases = [scarlet]Nessuna versione trovata\n[accent]Cerca se la
mods.browser.latest = <Ultima versione>
mods.browser.releases = Versioni
mods.github.open = Repo
mods.github.open-release = Pagina delle versioni di mindustry
mods.github.open-release = Pagina delle versioni di Mindustry
mods.browser.sortdate = Ordinato per data
mods.browser.sortstars = Ordinato per stelle
@ -456,6 +456,8 @@ waves.sort.reverse = Inverti ordine
waves.sort.begin = Inizia
waves.sort.health = Salute
waves.sort.type = Tipo
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Nascondi tutto
waves.units.show = Mostra tutto
@ -837,7 +839,7 @@ paused = [accent]< In Pausa >
clear = Pulisci
banned = [scarlet]Bandito
unsupported.environment = [scarlet]Ambiente non supportato
yes = Si
yes = Sì
no = No
info.title = Info
error.title = [scarlet]Si è verificato un errore
@ -875,7 +877,7 @@ stat.poweruse = Consumo Energetico
stat.powerdamage = Energia/Danno
stat.itemcapacity = Capacità Oggetti
stat.memorycapacity = Capacità di Memoria
stat.basepowergeneration = Generazione Minina di Energia
stat.basepowergeneration = Generazione Minima di Energia
stat.productiontime = Tempo di Produzione
stat.repairtime = Tempo di Riparazione Completa
stat.repairspeed = Velocità di riparazione
@ -892,7 +894,7 @@ stat.maxunits = Unità Attive Massime
stat.health = Salute
stat.armor = Armatura
stat.buildtime = Tempo di Costruzione
stat.maxconsecutive = Limite Consecutive
stat.maxconsecutive = Limite Consecutivi
stat.buildcost = Costo di Costruzione
stat.inaccuracy = Inaccuratezza
stat.shots = Colpi
@ -985,9 +987,9 @@ bullet.knockback = [stat]{0}[lightgray] contraccolpo
bullet.pierce = [stat]{0}[lightgray]x perforazione
bullet.infinitepierce = [stat]perforazione
bullet.healpercent = [stat]{0}[lightgray]% guarigione
bullet.healamount = [stat]{0}[lightgray] qquantità di cura
bullet.healamount = [stat]{0}[lightgray] quantità di cura
bullet.multiplier = [stat]{0}[lightgray]x moltiplicatore munizioni
bullet.reload = [stat]{0}[lightgray]x ricarica
bullet.reload = [stat]{0}%[lightgray] ricarica
bullet.range = [stat]{0}[lightgray] raggio in blocchi
unit.blocks = blocchi
@ -1026,7 +1028,7 @@ setting.shadows.name = Ombre
setting.blockreplace.name = Suggerimento Blocchi Automatico
setting.linear.name = Filtro Lineare
setting.hints.name = Suggerimenti
setting.logichints.name = Suggerimenti
setting.logichints.name = Suggerimenti sulla logica
setting.backgroundpause.name = Metti in pausa quando in background
setting.buildautopause.name = Pausa Automatica nella Costruzione
setting.doubletapmine.name = Doppio click per minare
@ -1052,7 +1054,7 @@ setting.difficulty.hard = Difficile
setting.difficulty.insane = Impossibile
setting.difficulty.name = Difficoltà:
setting.screenshake.name = Movimento dello Schermo
setting.bloomintensity.name = Intensità d'illuminazione (bloom)
setting.bloomintensity.name = Intensità d'illuminazione (Bloom Intensity)
setting.bloomblur.name = Illuminazione sfocata (Bloom Blur)
setting.effects.name = Visualizza Effetti
setting.destroyedblocks.name = Visualizza Blocchi Distrutti
@ -1072,7 +1074,7 @@ setting.smoothcamera.name = Visuale fluida
setting.vsync.name = VSync
setting.pixelate.name = Pixellato
setting.minimap.name = Mostra Minimappa
setting.coreitems.name = Mostra Oggetti Nucleo (WIP)
setting.coreitems.name = Mostra Oggetti Nucleo
setting.position.name = Mostra Posizione Giocatori
setting.mouseposition.name = Mostra mouse
setting.musicvol.name = Volume Musica
@ -1162,9 +1164,9 @@ keybind.chat.name = Chat
keybind.player_list.name = Lista dei Giocatori
keybind.console.name = Console
keybind.rotate.name = Ruota
keybind.rotateplaced.name = Ruota Blocco Esistente (premuto)
keybind.rotateplaced.name = Ruota Blocco Esistente (mantenere premuto)
keybind.toggle_menus.name = Mostra/Nascondi Menu
keybind.chat_history_prev.name = Scorri Chat vero l'alto
keybind.chat_history_prev.name = Scorri Chat verso l'alto
keybind.chat_history_next.name = Scorri Chat verso il basso
keybind.chat_scroll.name = Scorri Chat
keybind.chat_mode.name = Cambia modalità chat
@ -1193,8 +1195,8 @@ rules.wavesending = Wave Sending
rules.waves = Ondate
rules.attack = Modalità Attacco
rules.rtsai = RTS AI
rules.rtsminsquadsize = Dimensione squadra minima
rules.rtsmaxsquadsize = Dimensione squadra massima
rules.rtsminsquadsize = Dimensione minima squadra
rules.rtsmaxsquadsize = Dimensione massima squadra
rules.rtsminattackweight = Min Attack Weight
rules.cleanupdeadteams = Cancella costruzioni delle squadre sconfitte (PvP)
rules.corecapture = Cattura nucleo alla distruzione
@ -1219,6 +1221,7 @@ rules.buildcostmultiplier = Moltiplicatore Costo Costruzione
rules.buildspeedmultiplier = Moltiplicatore Velocità Costruzione
rules.deconstructrefundmultiplier = Moltiplicatore Rimborso di Smantellamento
rules.waitForWaveToEnd = Le ondate aspettano fino a quando l'ondata precedente finisce
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Raggio di Generazione:[lightgray] (blocchi)
rules.unitammo = Unità Richiedono Munizioni
rules.enemyteam = Squadra avversaria
@ -1416,7 +1419,7 @@ block.dirt.name = Terra
block.dirt-wall.name = Muro di Terra
block.mud.name = Fango
block.white-tree-dead.name = Albero Bianco Morto
block.white-tree.name = Albero Morto
block.white-tree.name = Albero Bianco
block.spore-cluster.name = Agglomerato di Spore
block.metal-floor.name = Pavimento Metallico 1
block.metal-floor-2.name = Pavimento Metallico 2
@ -1550,7 +1553,7 @@ block.segment.name = Segmentatore
block.ground-factory.name = Fabbrica Terrestre
block.air-factory.name = Fabbrica Aerea
block.naval-factory.name = Fabbrica Navale
block.additive-reconstructor.name = Ricostruttore Adattivo
block.additive-reconstructor.name = Ricostruttore Additivo
block.multiplicative-reconstructor.name = Ricostruttore Moltiplicativo
block.exponential-reconstructor.name = Ricostruttore Esponenziale
block.tetrative-reconstructor.name = Ricostruttore Tetrattivo

3
core/assets/bundles/bundle_ja.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = 降順
waves.sort.begin = 開始
waves.sort.health = 体力
waves.sort.type = タイプ
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = すべて非表示
waves.units.show = すべて表示
@ -1225,6 +1227,7 @@ rules.buildcostmultiplier = 建設コストの倍率
rules.buildspeedmultiplier = 建設速度の倍率
rules.deconstructrefundmultiplier = ブロック破壊時の還元倍率
rules.waitForWaveToEnd = 敵が倒されるまでウェーブの進行を中断
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = 出現範囲の半径:[lightgray] (タイル)
rules.unitammo = ユニットは弾丸が必要
rules.enemyteam = 敵チーム

3
core/assets/bundles/bundle_ko.properties
View File

@ -457,6 +457,8 @@ waves.sort.reverse = 정렬 뒤집기
waves.sort.begin = 시작 단계
waves.sort.health = 체력
waves.sort.type = 기체 유형
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = 모두 숨기기
waves.units.show = 모두 보이기
@ -1225,6 +1227,7 @@ rules.buildcostmultiplier = 건설 비용 배수
rules.buildspeedmultiplier = 건설 속도 배수
rules.deconstructrefundmultiplier = 철거 환불 배수
rules.waitForWaveToEnd = 한 단계가 끝날때까지 대기
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = 스폰 구역 범위: [lightgray] (타일)
rules.unitammo = 기체 탄약 필요
rules.enemyteam = 적 팀

3
core/assets/bundles/bundle_lt.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1213,6 +1215,7 @@ rules.buildcostmultiplier = Statymo Kainų Daugiklis
rules.buildspeedmultiplier = Statymo Greičio Daugiklis
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Laukti, kol pasibaigs banga
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Išmetimo Zonos Spindulys:[lightgray] (blokais)
rules.unitammo = Units Require Ammo
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_nl.properties
View File

@ -462,6 +462,8 @@ waves.sort.reverse = Omgekeerd Sorteren
waves.sort.begin = Begin
waves.sort.health = Levenspunten
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Verberg Alle
waves.units.show = Toon Alle
@ -1225,6 +1227,7 @@ rules.buildcostmultiplier = Bouwkosten Vermenigvuldiger
rules.buildspeedmultiplier = Bouwsnelheid Vermenigvuldiger
rules.deconstructrefundmultiplier = Deconstructie Terugbetalings Vermenigvuldiger
rules.waitForWaveToEnd = Golven wachten tot alle vijanden zijn verslagen
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Vijandelijke Spawn Diameter:[lightgray] (tegels)
rules.unitammo = Eenheden Gebruiken Ammunitie
rules.enemyteam = Vijandelijk Team

3
core/assets/bundles/bundle_nl_BE.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1213,6 +1215,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Waves wait for enemies
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
rules.unitammo = Units Require Ammo
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_pl.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Odwrotne Sortowanie
waves.sort.begin = Rozpocznij
waves.sort.health = Zdrowie
waves.sort.type = Typ
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Schowaj Wszystkie
waves.units.show = Pokaż Wszystkie
@ -1223,6 +1225,7 @@ rules.buildcostmultiplier = Mnożnik Kosztów Budowania
rules.buildspeedmultiplier = Mnożnik Prędkości Budowania
rules.deconstructrefundmultiplier = Mnożnik Zwrotu Dekonstrukcji
rules.waitForWaveToEnd = Fale Czekają Na Przeciwników
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Zasięg Strefy Zrzutu:[lightgray] (kratki)
rules.unitammo = Jednostki Potrzebują Amunicji
rules.enemyteam = Drużyna Wroga

3
core/assets/bundles/bundle_pt_BR.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Inverter ordem
waves.sort.begin = Começar
waves.sort.health = Vida
waves.sort.type = Tipo
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Esconder tudo
waves.units.show = Mostrar tudo
@ -1234,6 +1236,7 @@ rules.buildcostmultiplier = Multiplicador de custo de construção
rules.buildspeedmultiplier = Multiplicador de velocidade de construção
rules.deconstructrefundmultiplier = Multiplicador de reembolso de desconstrução
rules.waitForWaveToEnd = Hordas esperam inimigos
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Raio da zona de spawn:[lightgray] (blocos)
rules.unitammo = Unidades requerem munição
rules.enemyteam = Time Inimigo

3
core/assets/bundles/bundle_pt_PT.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1213,6 +1215,7 @@ rules.buildcostmultiplier = Multiplicador de custo de construção
rules.buildspeedmultiplier = Multiplicador de velocidade de construção
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = hordas esperam inimigos
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Raio da zona de spawn:[lightgray] (blocos)
rules.unitammo = Units Require Ammo
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_ro.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Inversează Sortarea
waves.sort.begin = Început
waves.sort.health = Viață
waves.sort.type = Tip
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Ascunde
waves.units.show = Vezi Tot
@ -1225,6 +1227,7 @@ rules.buildcostmultiplier = Multiplicatorul Costului Construcției
rules.buildspeedmultiplier = Multiplicatorul Vitezei de Construcție
rules.deconstructrefundmultiplier = Multiplicatorul Recompensei la Deconstrucție
rules.waitForWaveToEnd = Valurile Așteaptă Inamicii
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Raza Zonei de Lansare:[lightgray] (pătrate)
rules.unitammo = Unitățile Necesită Muniție
rules.enemyteam = Echipa Inamică

3
core/assets/bundles/bundle_ru.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Обратная сортировка
waves.sort.begin = Начало
waves.sort.health = Здоровье
waves.sort.type = Тип
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Скрыть все
waves.units.show = Показать все
@ -1226,6 +1228,7 @@ rules.buildcostmultiplier = Множитель затрат на строите
rules.buildspeedmultiplier = Множитель скорости строительства
rules.deconstructrefundmultiplier = Множитель возврата ресурсов при разборке
rules.waitForWaveToEnd = Волны ожидают врагов
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Радиус зоны высадки врагов:[lightgray] (блоков)
rules.unitammo = Боев. ед. требуют боеприпасы
rules.enemyteam = Команда Врагов

3
core/assets/bundles/bundle_sr.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Suprotno Sortiraj
waves.sort.begin = Početak
waves.sort.health = Snaga
waves.sort.type = Tip
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Sakrij Sve
waves.units.show = Pokaži Sve
@ -1227,6 +1229,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Talasi Čekaju Za Neprijatelje
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Radijus Zone Prijema:[lightgray] (polja)
rules.unitammo = Jedinice Zahtevaju Municiju [red](može biti uklonjena)
rules.enemyteam = Neprilateljski Tim

3
core/assets/bundles/bundle_sv.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1213,6 +1215,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Waves wait for enemies
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
rules.unitammo = Units Require Ammo
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_th.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = เรียงย้อนกลับ
waves.sort.begin = เริ่มต้น
waves.sort.health = พลังชีวิต
waves.sort.type = ชนิด
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = ซ่อนทั้งหมด
waves.units.show = แสดงทั้งหมด
@ -1227,6 +1229,7 @@ rules.buildcostmultiplier = พหุคูณราคาทรัพยาก
rules.buildspeedmultiplier = พหุคูณความเร็วการสร้าง
rules.deconstructrefundmultiplier = พหุคูณการคืนทรัพยากรเมื่อทำลาย
rules.waitForWaveToEnd = คลื่นจะรอศัตรู
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = รัศมีจุดเกิดของศัตรู:[lightgray] (ช่อง)
rules.unitammo = ยูนิตต้องใช้กระสุน
rules.enemyteam = ทีมศัตรู

3
core/assets/bundles/bundle_tk.properties
View File

@ -454,6 +454,8 @@ waves.sort.reverse = Reverse Sort
waves.sort.begin = Begin
waves.sort.health = Health
waves.sort.type = Type
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hide All
waves.units.show = Show All
@ -1213,6 +1215,7 @@ rules.buildcostmultiplier = Build Cost Multiplier
rules.buildspeedmultiplier = Build Speed Multiplier
rules.deconstructrefundmultiplier = Deconstruct Refund Multiplier
rules.waitForWaveToEnd = Waves wait for enemies
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
rules.unitammo = Units Require Ammo
rules.enemyteam = Enemy Team

3
core/assets/bundles/bundle_tr.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = Ters Sırala
waves.sort.begin = Başla
waves.sort.health = Can
waves.sort.type = Tür
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Hepsini Gizle
waves.units.show = Hepsini Göster
@ -1224,6 +1226,7 @@ rules.buildcostmultiplier = İnşa Ücreti Çarpanı
rules.buildspeedmultiplier = İnşa Hızı Çarpanı
rules.deconstructrefundmultiplier = Yıkım İade Çarpanı
rules.waitForWaveToEnd = Dalgalar Düşmanı Bekler
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = İniş Noktası Yarıçapı: [lightgray](kare)
rules.unitammo = Birlikler Mermi Gerektirir
rules.enemyteam = Düşman Takım

3
core/assets/bundles/bundle_uk_UA.properties
View File

@ -460,6 +460,8 @@ waves.sort.reverse = Зворотне сортування
waves.sort.begin = Хвилями
waves.sort.health = Здоров’ям
waves.sort.type = Типом
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Сховати все
waves.units.show = Показати все
@ -1235,6 +1237,7 @@ rules.buildcostmultiplier = Множник затрат на будування
rules.buildspeedmultiplier = Множник швидкості будування
rules.deconstructrefundmultiplier = Множник відшкодування в разі демонтажу
rules.waitForWaveToEnd = Хвилі чекають на завершення попередньої
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Радіус зони висадки:[lightgray] (плитки)
rules.unitammo = Бойові одиниці потребують боєприпасів
rules.enemyteam = Ворожа команда

3
core/assets/bundles/bundle_vi.properties
View File

@ -459,6 +459,8 @@ waves.sort.reverse = Đảo ngược sắp xếp
waves.sort.begin = Bắt đầu
waves.sort.health = Máu
waves.sort.type = Thể loại
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = Ẩn tất cả
waves.units.show = Hiện tất cả
@ -1228,6 +1230,7 @@ rules.buildcostmultiplier = Hệ số chi phí xây dựng
rules.buildspeedmultiplier = Hệ số tốc độ xây dựng
rules.deconstructrefundmultiplier = Hệ số số vật phẩm hoàn lại khi phá công trình
rules.waitForWaveToEnd = Đợt chờ hết kẻ địch
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = Bán kính vùng thả:[lightgray] (ô)
rules.unitammo = Quân lính cần đạn
rules.enemyteam = Đội quân địch

3
core/assets/bundles/bundle_zh_CN.properties
View File

@ -461,6 +461,8 @@ waves.sort.reverse = 反向排序
waves.sort.begin = 出场顺序
waves.sort.health = 生命值
waves.sort.type = 类型
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = 全部隐藏
waves.units.show = 全部显示
@ -1236,6 +1238,7 @@ rules.buildcostmultiplier = 建造花费倍率
rules.buildspeedmultiplier = 建造速度倍率
rules.deconstructrefundmultiplier = 拆除返还倍率
rules.waitForWaveToEnd = 等待波次结束
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = 敌人出生点禁区大小：[lightgray]（格）
rules.unitammo = 单位有弹药限制
rules.enemyteam = 敌方队伍

3
core/assets/bundles/bundle_zh_TW.properties
View File

@ -458,6 +458,8 @@ waves.sort.reverse = 反向排序
waves.sort.begin = 開始
waves.sort.health = 血量
waves.sort.type = 兵種
waves.search = Search waves...
waves.filter.unit = Unit Filter
waves.units.hide = 全部隱藏
waves.units.show = 全部顯示
@ -1232,6 +1234,7 @@ rules.buildcostmultiplier = 建設成本倍數
rules.buildspeedmultiplier = 建設速度倍數
rules.deconstructrefundmultiplier = 拆除資源返還比例
rules.waitForWaveToEnd = 等待所有敵人毀滅才開始下一波次
rules.wavelimit = Map Ends After Wave
rules.dropzoneradius = 空降區半徑：[lightgray]（格）
rules.unitammo = 單位需要彈藥
rules.enemyteam = 敵方隊伍

3
core/src/mindustry/core/Logic.java
View File

@ -310,6 +310,9 @@ public class Logic implements ApplicationListener{
Events.fire(new GameOverEvent(left == null ? Team.derelict : left.team));
state.gameOver = true;
}
}else if(!state.gameOver && state.rules.waves && (state.enemies == 0 && state.rules.winWave > 0 && state.wave >= state.rules.winWave && !spawner.isSpawning())){
state.gameOver = true;
Events.fire(new GameOverEvent(state.rules.defaultTeam));
}
}
}

6
core/src/mindustry/editor/MapEditorDialog.java
View File

@ -752,9 +752,9 @@ public class MapEditorDialog extends Dialog implements Disposable{
cont.table(search -> {
search.image(Icon.zoom).padRight(8);
search.field("", this::rebuildBlockSelection)
search.field("", this::rebuildBlockSelection).growX()
.name("editor/search").maxTextLength(maxNameLength).get().setMessageText("@players.search");
}).pad(-2);
}).growX().pad(-2).padLeft(6f);
cont.row();
cont.table(Tex.underline, extra -> extra.labelWrap(() -> editor.drawBlock.localizedName).width(200f).center()).growX();
cont.row();
@ -803,7 +803,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
}
if(i == 0){
blockSelection.add("@none").color(Color.lightGray).padLeft(80f).padTop(10f);
blockSelection.add("@none.found").color(Color.lightGray).padLeft(54f).padTop(10f);
}
}
}

13
core/src/mindustry/editor/MapLoadDialog.java
View File

@ -30,6 +30,7 @@ public class MapLoadDialog extends BaseDialog{
buttons.defaults().size(200f, 50f);
buttons.button("@cancel", this::hide);
buttons.add(button);
addCloseListener();
}
public void rebuild(){
@ -48,13 +49,13 @@ public class MapLoadDialog extends BaseDialog{
table.defaults().size(200f, 90f).pad(4f);
table.margin(10f);
ScrollPane pane = new ScrollPane(table, Styles.horizontalPane);
ScrollPane pane = new ScrollPane(table);
pane.setFadeScrollBars(false);
for(Map map : maps.all()){
TextButton button = new TextButton(map.name(), Styles.togglet);
button.add(new BorderImage(map.safeTexture(), 2f).setScaling(Scaling.fit)).size(16 * 4f);
TextButton button = new TextButton(map.name(), Styles.flatTogglet);
button.add(new BorderImage(map.safeTexture(), 2f).setScaling(Scaling.fit)).padLeft(5f).size(16 * 4f);
button.getCells().reverse();
button.clicked(() -> selected = map);
button.getLabelCell().grow().left().padLeft(5f);
@ -63,14 +64,12 @@ public class MapLoadDialog extends BaseDialog{
if(++i % maxcol == 0) table.row();
}
if(maps.all().size == 0){
if(maps.all().isEmpty()){
table.add("@maps.none").center();
}else{
cont.add("@editor.loadmap");
}
cont.row();
cont.add(pane);
cont.add(pane).growX();
}
}

176
core/src/mindustry/editor/WaveInfoDialog.java
View File

@ -1,7 +1,9 @@
package mindustry.editor;
import arc.*;
import arc.func.*;
import arc.graphics.*;
import arc.input.*;
import arc.math.*;
import arc.math.geom.*;
import arc.scene.event.*;
@ -21,19 +23,18 @@ import mindustry.type.*;
import mindustry.ui.*;
import mindustry.ui.dialogs.*;
import java.util.*;
import static mindustry.Vars.*;
import static mindustry.game.SpawnGroup.*;
public class WaveInfoDialog extends BaseDialog{
private int displayed = 20;
private int start = 0, displayed = 20;
Seq<SpawnGroup> groups = new Seq<>();
private SpawnGroup expandedGroup;
private @Nullable SpawnGroup expandedGroup;
private Table table;
private int start = 0;
private int search = -1;
private UnitType lastType = UnitTypes.dagger;
private @Nullable UnitType filterType;
private Sort sort = Sort.begin;
private boolean reverseSort = false;
private float updateTimer, updatePeriod = 1f;
@ -49,45 +50,22 @@ public class WaveInfoDialog extends BaseDialog{
});
hidden(() -> state.rules.spawns = groups);
addCloseListener();
onResize(this::setup);
buttons.button(Icon.filter, () -> {
BaseDialog dialog = new BaseDialog("@waves.sort");
dialog.setFillParent(false);
dialog.cont.table(Tex.button, t -> {
for(Sort s : Sort.all){
t.button("@waves.sort." + s, Styles.flatTogglet, () -> {
sort = s;
dialog.hide();
buildGroups();
}).size(150f, 60f).checked(s == sort);
}
}).row();
dialog.cont.check("@waves.sort.reverse", b -> {
reverseSort = b;
buildGroups();
}).padTop(4).checked(reverseSort).padBottom(8f);
dialog.addCloseButton();
dialog.show();
buildGroups();
}).size(60f, 64f);
addCloseButton();
buttons.button("@waves.edit", Icon.pencil, () -> {
buttons.button("@waves.edit", Icon.edit, () -> {
BaseDialog dialog = new BaseDialog("@waves.edit");
dialog.addCloseButton();
dialog.setFillParent(false);
dialog.cont.table(Tex.button, t -> {
var style = Styles.flatt;
t.defaults().size(210f, 58f);
var style = Styles.cleart;
t.defaults().size(280f, 64f).pad(2f);
t.button("@waves.copy", Icon.copy, style, () -> {
ui.showInfoFade("@waves.copied");
Core.app.setClipboardText(maps.writeWaves(groups));
dialog.hide();
}).disabled(b -> groups == null).marginLeft(12f).row();
}).disabled(b -> groups == null || groups.isEmpty()).marginLeft(12f).row();
t.button("@waves.load", Icon.download, style, () -> {
try{
@ -98,16 +76,16 @@ public class WaveInfoDialog extends BaseDialog{
ui.showErrorMessage("@waves.invalid");
}
dialog.hide();
}).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null || Core.app.getClipboardText().isEmpty()).row();
}).disabled(Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith("[")).marginLeft(12f).row();
t.button("@settings.reset", Icon.upload, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
groups = JsonIO.copy(waves.get());
t.button("@clear", Icon.none, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
groups.clear();
buildGroups();
dialog.hide();
})).marginLeft(12f).row();
t.button("@clear", Icon.cancel, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
groups.clear();
t.button("@settings.reset", Icon.refresh, style, () -> ui.showConfirm("@confirm", "@settings.clear.confirm", () -> {
groups = JsonIO.copy(waves.get());
buildGroups();
dialog.hide();
})).marginLeft(12f);
@ -144,7 +122,7 @@ public class WaveInfoDialog extends BaseDialog{
buttons.button(Core.bundle.get("waves.random"), Icon.refresh, () -> {
groups.clear();
groups = Waves.generate(1f / 10f);
updateWaves();
buildGroups();
}).width(200f);
}
}
@ -171,19 +149,53 @@ public class WaveInfoDialog extends BaseDialog{
void setup(){
groups = JsonIO.copy(state.rules.spawns.isEmpty() ? waves.get() : state.rules.spawns);
if(groups == null) groups = new Seq<>();
cont.clear();
cont.stack(new Table(Tex.clear, main -> {
main.pane(t -> table = t).growX().growY().padRight(8f).scrollX(false);
main.row();
main.button("@add", () -> {
if(groups == null) groups = new Seq<>();
main.table(s -> {
s.image(Icon.zoom).padRight(8);
s.field(search < 0 ? "" : (search + 1) + "", TextFieldFilter.digitsOnly, text -> {
search = groups.any() ? Strings.parseInt(text, 0) - 1 : -1;
start = Math.max(search - (displayed / 2) - (displayed % 2), 0);
buildGroups();
}).growX().maxTextLength(8).get().setMessageText("@waves.search");
s.button(Icon.units, Styles.emptyi, () -> showUnits(type -> filterType = type, true)).size(46f).tooltip("@waves.filter.unit")
.update(b -> b.getStyle().imageUp = filterType != null ? new TextureRegionDrawable(filterType.uiIcon) : Icon.filter);
}).growX().pad(6f).row();
main.pane(t -> table = t).grow().padRight(8f).scrollX(false).row();
main.table(t -> {
t.button("@add", () -> {
SpawnGroup newGroup = new SpawnGroup(lastType);
groups.add(newGroup);
expandedGroup = newGroup;
showUpdate(newGroup);
showUnits(type -> newGroup.type = lastType = type, false);
buildGroups();
}).growX().height(70f);
t.button(Icon.filter, () -> {
BaseDialog dialog = new BaseDialog("@waves.sort");
dialog.setFillParent(false);
dialog.cont.table(Tex.button, f -> {
for(Sort s : Sort.all){
f.button("@waves.sort." + s, Styles.flatTogglet, () -> {
sort = s;
dialog.hide();
buildGroups();
}).size(150f, 60f).checked(s == sort);
}
}).row();
dialog.cont.check("@waves.sort.reverse", b -> {
reverseSort = b;
buildGroups();
}).padTop(4).checked(reverseSort).padBottom(8f);
dialog.addCloseButton();
dialog.show();
}).size(64f, 70f).padLeft(6f);
}).growX();
}), new Label("@waves.none"){{
visible(() -> groups.isEmpty());
this.touchable = Touchable.disabled;
@ -202,10 +214,13 @@ public class WaveInfoDialog extends BaseDialog{
table.margin(10f);
if(groups != null){
groups.sort(sort.sort);
groups.sort(Structs.comps(Structs.comparingFloat(sort.sort), Structs.comparingFloat(sort.secondary)));
if(reverseSort) groups.reverse();
for(SpawnGroup group : groups){
if(group.effect == StatusEffects.none) group.effect = null;
if((search >= 0 && group.getSpawned(search) <= 0) || (filterType != null && group.type != filterType)) continue;
table.table(Tex.button, t -> {
t.margin(0).defaults().pad(3).padLeft(5f).growX().left();
t.button(b -> {
@ -218,24 +233,31 @@ public class WaveInfoDialog extends BaseDialog{
b.label(() -> (group.begin + 1) + "").color(Color.lightGray).minWidth(45f).labelAlign(Align.left).left();
b.button(Icon.copySmall, Styles.emptyi, () -> {
SpawnGroup newGroup = group.copy();
expandedGroup = newGroup;
groups.add(newGroup);
SpawnGroup copy = group.copy();
expandedGroup = copy;
groups.insert(groups.indexOf(group) + 1, copy);
buildGroups();
}).pad(-6).size(46f);
}).pad(-6).size(46f).tooltip("@editor.copy");
b.button(group.effect != null && group.effect != StatusEffects.none ?
b.button(group.effect != null ?
new TextureRegionDrawable(group.effect.uiIcon) :
Icon.logicSmall,
Styles.emptyi, () -> showEffect(group)).pad(-6).size(46f);
Styles.emptyi, () -> showEffects(group)).pad(-6).size(46f).scaling(Scaling.fit).tooltip(group.effect != null ? group.effect.localizedName : "@none");
b.button(Icon.unitsSmall, Styles.emptyi, () -> showUpdate(group)).pad(-6).size(46f);
b.button(Icon.unitsSmall, Styles.emptyi, () -> showUnits(type -> group.type = lastType = type, false)).pad(-6).size(46f).tooltip("@stat.unittype");
b.button(Icon.cancel, Styles.emptyi, () -> {
groups.remove(group);
if(expandedGroup == group) expandedGroup = null;
table.getCell(t).pad(0f);
t.remove();
buildGroups();
}).pad(-6).size(46f).padRight(-12f);
}).pad(-6).size(46f).padRight(-12f).tooltip("@waves.remove");
b.clicked(KeyCode.mouseMiddle, () -> {
SpawnGroup copy = group.copy();
groups.insert(groups.indexOf(group) + 1, copy);
expandedGroup = copy;
buildGroups();
});
}, () -> {
expandedGroup = expandedGroup == group ? null : group;
buildGroups();
@ -369,7 +391,7 @@ public class WaveInfoDialog extends BaseDialog{
dialog.hide();
}).size(110f, 45f).checked(-1 == group.spawn);
}
});
}).grow();
dialog.setFillParent(false);
dialog.addCloseButton();
dialog.show();
@ -381,6 +403,10 @@ public class WaveInfoDialog extends BaseDialog{
table.row();
}
if(table.getChildren().isEmpty() && groups.any()){
table.add("@none.found");
}
}else{
table.add("@editor.default");
}
@ -388,11 +414,23 @@ public class WaveInfoDialog extends BaseDialog{
updateWaves();
}
void showUpdate(SpawnGroup group){
void showUnits(Cons<UnitType> cons, boolean reset){
BaseDialog dialog = new BaseDialog("");
dialog.setFillParent(true);
dialog.cont.pane(p -> {
int i = 0;
p.defaults().pad(2).fillX();
if(reset){
p.button(t -> {
t.left();
t.image(Icon.none).size(8 * 4).scaling(Scaling.fit).padRight(2f);
t.add("@settings.resetKey");
}, () -> {
cons.get(null);
dialog.hide();
buildGroups();
}).margin(12f);
}
int i = reset ? 1 : 0;
for(UnitType type : content.units()){
if(type.isHidden()) continue;
p.button(t -> {
@ -400,19 +438,18 @@ public class WaveInfoDialog extends BaseDialog{
t.image(type.uiIcon).size(8 * 4).scaling(Scaling.fit).padRight(2f);
t.add(type.localizedName);
}, () -> {
lastType = type;
group.type = type;
cons.get(type);
dialog.hide();
buildGroups();
}).pad(2).margin(12f).fillX();
}).margin(12f);
if(++i % 3 == 0) p.row();
}
});
}).growX().scrollX(false);
dialog.addCloseButton();
dialog.show();
}
void showEffect(SpawnGroup group){
void showEffects(SpawnGroup group){
BaseDialog dialog = new BaseDialog("");
dialog.setFillParent(true);
dialog.cont.pane(p -> {
@ -434,28 +471,33 @@ public class WaveInfoDialog extends BaseDialog{
t.add("@settings.resetKey");
}
}, () -> {
group.effect = effect;
group.effect = effect != StatusEffects.none ? effect : null;
dialog.hide();
buildGroups();
}).pad(2).margin(12f).fillX();
if(++i % 3 == 0) p.row();
}
});
}).growX().scrollX(false);
dialog.addCloseButton();
dialog.show();
}
enum Sort{
begin(Structs.comps(Structs.comparingFloat(g -> g.begin), Structs.comparingFloat(g -> g.type.id))),
health(Structs.comps(Structs.comparingFloat(g -> g.type.health), Structs.comparingFloat(g -> g.begin))),
type(Structs.comps(Structs.comparingFloat(g -> g.type.id), Structs.comparingFloat(g -> g.begin)));
begin(g -> g.begin, g -> g.type.id),
health(g -> g.type.health),
type(g -> g.type.id);
static final Sort[] all = values();
final Comparator<SpawnGroup> sort;
final Floatf<SpawnGroup> sort, secondary;
Sort(Comparator<SpawnGroup> sort){
Sort(Floatf<SpawnGroup> sort){
this(sort, g -> g.begin);
}
Sort(Floatf<SpawnGroup> sort, Floatf<SpawnGroup> secondary){
this.sort = sort;
this.secondary = secondary;
}
}

2
core/src/mindustry/game/Rules.java
View File

@ -113,7 +113,7 @@ public class Rules{
public float waveSpacing = 2 * Time.toMinutes;
/** Starting wave spacing; if <=0, uses waveSpacing * 2. */
public float initialWaveSpacing = 0f;
/** Wave after which the player 'wins'. Used in sectors. Use a value <= 0 to disable. */
/** Wave after which the player 'wins'. Use a value <= 0 to disable. */
public int winWave = 0;
/** Base unit cap. Can still be increased by blocks. */
public int unitCap = 0;

8
core/src/mindustry/game/SpawnGroup.java
View File

@ -118,7 +118,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
if(unitAmount != 1) json.writeValue("amount", unitAmount);
if(effect != null) json.writeValue("effect", effect.name);
if(spawn != -1) json.writeValue("spawn", spawn);
if(payloads != null && payloads.size > 0) json.writeValue("payloads", payloads.map(u -> u.name).toArray(String.class));
if(payloads != null && payloads.any()) json.writeValue("payloads", payloads.map(u -> u.name).toArray(String.class));
if(items != null && items.amount > 0) json.writeValue("items", items);
}
@ -127,7 +127,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
public void read(Json json, JsonValue data){
String tname = data.getString("type", "dagger");
type = content.getByName(ContentType.unit, LegacyIO.unitMap.get(tname, tname));
type = content.unit(LegacyIO.unitMap.get(tname, tname));
if(type == null) type = UnitTypes.dagger;
begin = data.getInt("begin", 0);
end = data.getInt("end", never);
@ -138,7 +138,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
shieldScaling = data.getFloat("shieldScaling", 0);
unitAmount = data.getInt("amount", 1);
spawn = data.getInt("spawn", -1);
if(data.has("payloads")) payloads = Seq.with(json.readValue(String[].class, data.get("payloads"))).map(s -> content.getByName(ContentType.unit, s));
if(data.has("payloads")) payloads = Seq.with(json.readValue(String[].class, data.get("payloads"))).map(s -> content.unit(s));
if(data.has("items")) items = json.readValue(ItemStack.class, data.get("items"));
@ -146,7 +146,7 @@ public class SpawnGroup implements JsonSerializable, Cloneable{
if(data.has("effect") && data.get("effect").isNumber() && data.getInt("effect", -1) == 8){
effect = StatusEffects.boss;
}else{
effect = content.getByName(ContentType.status, data.has("effect") && data.get("effect").isString() ? data.getString("effect", "none") : "none");
effect = content.statusEffect(data.has("effect") && data.get("effect").isString() ? data.getString("effect", "none") : "none");
}
}

3
core/src/mindustry/maps/filters/FilterOption.java
View File

@ -108,6 +108,7 @@ public abstract class FilterOption{
.setRegion(supplier.get() == Blocks.air ? Icon.none.getRegion() : supplier.get().uiIcon)).size(iconSmall), () -> {
BaseDialog dialog = new BaseDialog("@filter.option." + name);
dialog.cont.pane(t -> {
t.margin(14f);
int i = 0;
for(Block block : Vars.content.blocks()){
if(!filter.get(block)) continue;
@ -120,7 +121,7 @@ public abstract class FilterOption{
if(++i % 10 == 0) t.row();
}
dialog.setFillParent(i > 100);
}).padRight(8f).scrollX(false);
}).scrollX(false);
dialog.addCloseButton();

24
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@ -68,7 +68,7 @@ public class CustomRulesDialog extends BaseDialog{
b.image(con.uiIcon).size(iconMed).padRight(3);
b.add(con.localizedName).color(Color.lightGray).padLeft(3).growX().left().wrap();
b.button(Icon.cancel, Styles.clearNonei, () -> {
b.button(Icon.cancel, Styles.emptyi, () -> {
set.remove(con);
rebuild[0].run();
}).size(70f).pad(-4f).padLeft(0f);
@ -91,7 +91,7 @@ public class CustomRulesDialog extends BaseDialog{
set.add(b);
rebuild[0].run();
dialog.hide();
}).size(60f);
}).size(60f).tooltip(b.localizedName);
if(++i[0] % cols == 0){
t.row();
@ -101,7 +101,7 @@ public class CustomRulesDialog extends BaseDialog{
dialog.addCloseButton();
dialog.show();
}).size(300f, 64f);
}).size(300f, 64f).disabled(b -> set.size == content.<T>getBy(type).count(pred));
};
bd.shown(rebuild[0]);
@ -139,15 +139,16 @@ public class CustomRulesDialog extends BaseDialog{
title("@rules.title.waves");
check("@rules.waves", b -> rules.waves = b, () -> rules.waves);
check("@rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer);
check("@rules.wavesending", b -> rules.waveSending = b, () -> rules.waveSending);
check("@rules.waitForWaveToEnd", b -> rules.waitEnemies = b, () -> rules.waitEnemies);
number("@rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> rules.waveTimer, 1, Float.MAX_VALUE);
check("@rules.wavesending", b -> rules.waveSending = b, () -> rules.waveSending, () -> rules.waves);
check("@rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer, () -> rules.waves);
check("@rules.waitForWaveToEnd", b -> rules.waitEnemies = b, () -> rules.waitEnemies, () -> rules.waves && rules.waveTimer);
numberi("@rules.wavelimit", f -> rules.winWave = f, () -> rules.winWave, () -> rules.waves, 0, Integer.MAX_VALUE);
number("@rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> rules.waves && rules.waveTimer, 1, Float.MAX_VALUE);
//this is experimental, because it's not clear that 0 makes it default.
if(experimental){
number("@rules.initialwavespacing", false, f -> rules.initialWaveSpacing = f * 60f, () -> rules.initialWaveSpacing / 60f, () -> true, 0, Float.MAX_VALUE);
number("@rules.initialwavespacing", false, f -> rules.initialWaveSpacing = f * 60f, () -> rules.initialWaveSpacing / 60f, () -> rules.waves && rules.waveTimer, 0, Float.MAX_VALUE);
}
number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> true);
number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> rules.waves);
title("@rules.title.resourcesbuilding");
check("@rules.infiniteresources", b -> {
@ -281,7 +282,10 @@ public class CustomRulesDialog extends BaseDialog{
main.button("[#" + team.color + "]" + team.localized() + (team.emoji.isEmpty() ? "" : "[] " + team.emoji), Icon.downOpen, Styles.togglet, () -> {
shown[0] = !shown[0];
}).marginLeft(14f).width(260f).height(55f).checked(a -> shown[0]).row();
}).marginLeft(14f).width(260f).height(55f).update(t -> {
((Image)t.getChildren().get(1)).setDrawable(shown[0] ? Icon.upOpen : Icon.downOpen);
t.setChecked(shown[0]);
}).row();
main.collapser(t -> {
t.left().defaults().fillX().left().pad(5);

10
core/src/mindustry/ui/dialogs/LoadDialog.java
View File

@ -24,7 +24,7 @@ import static mindustry.Vars.*;
public class LoadDialog extends BaseDialog{
Table slots;
String searchString;
Seq<Gamemode> filteredModes;
Seq<Gamemode> hidden;
TextField searchField;
ScrollPane pane;
@ -50,7 +50,7 @@ public class LoadDialog extends BaseDialog{
cont.clear();
slots = new Table();
filteredModes = new Seq<>();
hidden = new Seq<>();
pane = new ScrollPane(slots);
rebuild();
@ -67,9 +67,9 @@ public class LoadDialog extends BaseDialog{
boolean sandbox = mode == Gamemode.sandbox;
if(Core.atlas.isFound(icon.getRegion()) || sandbox){
search.button(sandbox ? Icon.terrain : icon, Styles.emptyTogglei, () -> {
if(!filteredModes.addUnique(mode)) filteredModes.remove(mode);
if(!hidden.addUnique(mode)) hidden.remove(mode);
rebuild();
}).size(60f).padLeft(-8f).checked(b -> !filteredModes.contains(mode)).tooltip("@mode." + mode.name() + ".name");
}).size(60f).padLeft(-12f).checked(b -> !hidden.contains(mode)).tooltip("@mode." + mode.name() + ".name");
}
}
@ -98,7 +98,7 @@ public class LoadDialog extends BaseDialog{
for(SaveSlot slot : array){
if(slot.isHidden()
|| (searchString != null && !Strings.stripColors(slot.getName()).toLowerCase().contains(searchString))
|| (!filteredModes.isEmpty() && filteredModes.contains(slot.mode()))){
|| (!hidden.isEmpty() && hidden.contains(slot.mode()))){
continue;
}

2
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@ -725,7 +725,7 @@ public class SchematicsDialog extends BaseDialog{
r.image(s.item.uiIcon).left().size(iconMed);
r.label(() -> {
Building core = player.core();
if(core == null || state.rules.infiniteResources || core.items.has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
if(core == null || state.isMenu() || state.rules.infiniteResources || core.items.has(s.item, s.amount)) return "[lightgray]" + s.amount + "";
return (core.items.has(s.item, s.amount) ? "[lightgray]" : "[scarlet]") + Math.min(core.items.get(s.item), s.amount) + "[lightgray]/" + s.amount;
}).padLeft(2).left().padRight(4);

4
core/src/mindustry/ui/fragments/HudFragment.java
View File

@ -52,7 +52,7 @@ public class HudFragment{
//warn about guardian/boss waves
Events.on(WaveEvent.class, e -> {
int max = 10;
int winWave = state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
int winWave = state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
outer:
for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave - 2); i++){
for(SpawnGroup group : state.rules.spawns){
@ -822,7 +822,7 @@ public class HudFragment{
return builder;
}
if(state.rules.winWave > 1 && state.rules.winWave >= state.wave && state.isCampaign()){
if(state.rules.winWave > 1 && state.rules.winWave >= state.wave){
builder.append(wavefc.get(state.wave, state.rules.winWave));
}else{
builder.append(wavef.get(state.wave));

8
core/src/mindustry/world/blocks/ItemSelection.java
View File

@ -85,9 +85,11 @@ public class ItemSelection{
Table main = new Table().background(Styles.black6);
if(rowCount > rows * 1.5f){
search = main.field(null, text -> rebuild.run()).width(40 * columns).padBottom(4).left().growX().get();
main.table(s -> {
s.image(Icon.zoom).padLeft(4f);
search = s.field(null, text -> rebuild.run()).width(40 * columns).padBottom(4).left().growX().get();
search.setMessageText("@players.search");
main.row();
}).row();
}
ScrollPane pane = new ScrollPane(cont, Styles.smallPane);
@ -101,7 +103,7 @@ public class ItemSelection{
}
pane.setOverscroll(false, false);
main.add(pane).maxHeight(40 * rows);
main.add(pane).growX().maxHeight(40 * rows);
table.top().add(main);
}
}

2
servers_v7.json
View File

@ -1,7 +1,7 @@
[
{
"name": "Tamazia",
"address": ["83.150.217.98:25566"]
"address": ["83.150.217.98:25566", "83.150.217.98:25568"]
},
{
"name": "RCM",