From 8a3c4b4ddd36b4c57d4c4f44a3b6ab43e26dce00 Mon Sep 17 00:00:00 2001 From: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Date: Wed, 18 Nov 2020 14:13:28 +0700 Subject: [PATCH 001/123] [Bundle][ID] Updated translation Sector names are reverted back to previous translation name along with the updated new sectors, Foreshadow block description, sector captured/attacked/lost popup, threats, stats, and other fixes. --- core/assets/bundles/bundle_in_ID.properties | 216 +++++++++++--------- 1 file changed, 125 insertions(+), 91 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 1616c1ef5e..1e87e96419 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -17,7 +17,9 @@ linkfail = Gagal membuka tautan!\nURL disalin ke papan ke papan klip. screenshot = Tangkapan layar disimpan di {0} screenshot.invalid = Peta terlalu besar, tidak cukup memori untuk menangkap layar. gameover = Permainan Habis +gameover.disconnect = Terputus gameover.pvp = Tim[accent] {0}[] menang! +gameover.waiting = [accent]Menunggu peta selanjutnya... highscore = [accent]Rekor Baru! copied = Tersalin. indevpopup = [accent]v6[] saat ini dalam versi [accent]alpha[].\n[lightgray]Artinya:[]\n[scarlet]- Kampanye belum sepenuhnya selesai[]\n- Beberapa konten tidak tersedia\n - Beberapa [scarlet]Unit AI[] tidak sepenuhnya bekerja\n- Beberapa unit belum sepenuhnya selesai\n- Semua yang kamu lihat dapat berubah atau dihapus sewaktu-waktu.\n\nLaporkan bug atau crash di [accent]Github[]. @@ -57,6 +59,7 @@ schematic.rename = Ganti nama Skema schematic.info = {0}x{1}, {2} blok schematic.disabled = [scarlet]Skema dilarang[]\nAnda tidak diperbolehkan untuk menggunakan skema di [accent]peta[] atau [accent]server ini. +stats = Statistik stat.wave = Gelombang Terkalahkan:[accent] {0} stat.enemiesDestroyed = Musuh Terhancurkan:[accent] {0} stat.built = Jumlah Blok yang Dibangun:[accent] {0} @@ -189,6 +192,10 @@ servers.local = Server Lokal servers.remote = Server Jarak Jauh (Simpanan) servers.global = Server Komunitas +servers.showhidden = Tampilkan Server Tersembunyi +server.shown = Ditampilkan +server.hidden = Disembunyikan + trace = Melacak Pemain trace.playername = Nama pemain: [accent]{0} trace.ip = IP: [accent]{0} @@ -286,6 +293,7 @@ cancelbuilding = [accent][[{0}][] untuk menghapus rencana selectschematic = [accent][[{0}][] untuk memilih+salin pausebuilding = [accent][[{0}][] untuk berhenti membangun resumebuilding = [scarlet][[{0}][] untuk lanjut membangun +showui = UI disembunyikan.\nTekan [accent][[{0}][] untuk menampilkan UI. wave = [accent]Gelombang {0} wave.cap = [accent]Gelombang {0}/{1} wave.waiting = [lightgray]Gelombang di {0} @@ -293,6 +301,8 @@ wave.waveInProgress = [lightgray]Gelombang sedang berlangsung waiting = [lightgray]Menunggu... waiting.players = Menunggu pemain lainnya... wave.enemies = [lightgray]{0} Musuh Tersisa +wave.enemycores = [accent]{0}[lightgray] Inti Musuh +wave.enemycore = [accent]{0}[lightgray] Inti Musuh wave.enemy = [lightgray]{0} Musuh Tersisa wave.guardianwarn = Guardian akan tiba dalam [accent]{0}[] gelombang. wave.guardianwarn.one = Guardian akan tiba dalam [accent]{0}[] gelombang. @@ -525,34 +535,50 @@ weather.fog.name = Kabut sectors.unexplored = [lightgray]Belum Ditelusuri sectors.resources = Sumber Daya: sectors.production = Produksi: +sectors.export = Ekspor: +sectors.time = Waktu: +sectors.threat = Threat: +sectors.wave = Gelombang: sectors.stored = Terisi: sectors.resume = Lanjutkan sectors.launch = Luncurkan sectors.select = Pilih sectors.nonelaunch = [lightgray]tidak ada sectors.rename = Ganti Nama Sektor + +sector.curcapture = Sektor Ditaklukkan sector.missingresources = [scarlet]Sumber Daya Inti Tidak Cukup +sector.attacked = Sektor [accent]{0}[white] sedang diserang! +sector.lost = Sektor [accent]{0}[white] telah dihancurkan! +#note: the missing space in the line below is intentional +sector.captured = Sektor [accent]{0}[white]ditaklukkan! + +threat.low = Rendah +threat.medium = Sedang +threat.high = Tinggi +threat.extreme = Ekstrem +threat.eradication = Pemusnahan + +planets = Planet planet.serpulo.name = Serpulo -#TODO better name planet.sun.name = Matahari -#NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway -sector.groundZero.name = Ground Zero -sector.craters.name = The Craters -sector.frozenForest.name = Frozen Forest -sector.ruinousShores.name = Ruinous Shores -sector.stainedMountains.name = Stained Mountains -sector.desolateRift.name = Desolate Rift -sector.nuclearComplex.name = Nuclear Production Complex -sector.overgrowth.name = Overgrowth -sector.tarFields.name = Tar Fields -sector.saltFlats.name = Salt Flats -sector.fungalPass.name = Fungal Pass - -#unused -#sector.impact0078.name = Impact 0078 -#sector.crags.name = Crags +sector.impact0078.name = Impact 0078 +sector.groundZero.name = Titik Nol +sector.craters.name = Kawah +sector.frozenForest.name = Hutan Beku +sector.ruinousShores.name = Pantai Hancur +sector.stainedMountains.name = Gunung Bernoda +sector.desolateRift.name = Retakan Terpencil +sector.nuclearComplex.name = Kompleks Produksi Nuklir +sector.overgrowth.name = Pertumbuhan +sector.tarFields.name = Lahan Tar +sector.saltFlats.name = Dataran Garam +sector.fungalPass.name = Lintasan Jamur +sector.biomassFacility.name = Pabrik Sintesis Biomassa +sector.windsweptIslands.name = Pulau Bersemilir +sector.extractionOutpost.name = Pos Ekstraksi sector.groundZero.description = Lokasi yang optimal untuk bermain satu kali lagi. Sangat sedikit musuh. Beberapa sumber daya dapat dikumpulkan.\nKumpulkan timah dan tembaga sebanyak yang kamu bisa.\nMulai dari sini. sector.frozenForest.description = Disini, dekat dengan gunung, spora sudah menyebar. Suhu dingin tidak dapat menahannya.\n\nHasilkan listrik. Bangun generator pembakar. Pelajari cara menggunakan mender. @@ -624,6 +650,8 @@ stat.memorycapacity = Kapasitas Memori stat.basepowergeneration = Basis Generasi Tenaga stat.productiontime = Waktu Produksi stat.repairtime = Waktu Memperbaiki Blok Penuh +stat.weapons = Senjata +stat.bullet = Peluru stat.speedincrease = Tambahan Kecepatan stat.range = Jarak stat.drilltier = Sumber Daya yang Bisa di Bor @@ -632,22 +660,22 @@ stat.boosteffect = Efek Pendorong stat.maxunits = Maks Unit Aktif stat.health = Darah stat.buildtime = Waktu Pembuatan -stat.maxconsecutive = Max Consecutive +stat.maxconsecutive = Maks Konsekutif stat.buildcost = Biaya Bangunan stat.inaccuracy = Jarak Melenceng stat.shots = Tembakan stat.reload = Tembakan/Detik stat.ammo = Amunisi stat.shieldhealth = Darah Perisai -stat.cooldowntime = Cooldown Time -stat.explosiveness = Explosiveness -stat.basedeflectchance = Base Deflect Chance -stat.lightningchance = Lightning Chance -stat.lightningdamage = Lightning Damage -stat.flammability = Flammability -stat.radioactivity = Radioactivity -stat.heatcapacity = Heat Capacity -stat.viscosity = Viscosity +stat.cooldowntime = Waktu Pendinginan +stat.explosiveness = Ledakan +stat.basedeflectchance = Peluang Defleksi Dasar +stat.lightningchance = Peluang Menghasilkan Petir +stat.lightningdamage = Kerusakan Petir +stat.flammability = Pembakar +stat.radioactivity = Radiasi +stat.heatcapacity = Kapasitas Panas +stat.viscosity = Kelekatan stat.temperature = Temperatur stat.speed = Kecepatan stat.buildspeed = Kecepatan Membangun @@ -655,15 +683,16 @@ stat.minespeed = Kecepatan Menambang stat.minetier = Tingkat Menambang stat.payloadcapacity = Kapasitas Muatan stat.commandlimit = Batas Perintah -stat.abilities = Abilities -stat.canboost = Can Boost +stat.abilities = Kemampuan +stat.canboost = Dapat dipercepat stat.flying = Terbang -ability.forcefield = Force Field -ability.repairfield = Repair Field -ability.statusfield = Status Field +ability.forcefield = Bidang Kekuatan +ability.repairfield = Bidang Perbaikan +ability.statusfield = Bidang Status ability.unitspawn = {0} Pabrik -ability.shieldregenfield = Shield Regen Field +ability.shieldregenfield = Bidang Regenerasi Perisai +ability.movelightning = Pergerakan Petir bar.drilltierreq = Membutuhkan Bor yang Lebih Baik bar.noresources = Sumber Daya Tidak Ditemukan @@ -692,12 +721,14 @@ units.processorcontrol = [lightgray]Dikendalikan Prosesor bullet.damage = [stat]{0}[lightgray] kekuatan (dmg) bullet.splashdamage = [stat]{0}[lightgray] kekuatan percikan~[stat] {1}[lightgray] kotak bullet.incendiary = [stat]membakar +bullet.sapping = [stat]sapping bullet.homing = [stat]mengejar bullet.shock = [stat]mengkejut bullet.frag = [stat]menyebar bullet.knockback = [stat]{0}[lightgray] pantulan kembali bullet.pierce = [stat]{0}[lightgray]x tembus bullet.infinitepierce = [stat]menembus +bullet.healpercent = [stat]{0}[lightgray]% menyembuhkan bullet.freezing = [stat]membeku bullet.tarred = [stat]tar bullet.multiplier = [stat]{0}[lightgray]x multiplikasi amunisi @@ -897,7 +928,7 @@ rules.buildspeedmultiplier = Multiplikasi Waktu Pembuatan Bangunan rules.deconstructrefundmultiplier = Penggembalian Dana Mendekonstruksi Blok rules.waitForWaveToEnd = Gelombang menunggu musuh rules.dropzoneradius = Radius Titik Muncul:[lightgray] (Blok) -rules.unitammo = Unit Membutuhkan AMunisi +rules.unitammo = Unit Membutuhkan Amunisi rules.title.waves = Gelombang rules.title.resourcesbuilding = Sumber Daya & Bangunan rules.title.enemy = Musuh @@ -917,6 +948,7 @@ content.item.name = Item content.liquid.name = Zat Cair content.unit.name = Unit content.block.name = Blok +content.sector.name = Sektor item.copper.name = Tembaga item.lead.name = Timah @@ -935,7 +967,7 @@ item.pyratite.name = Pyratit item.metaglass.name = Metaglass item.scrap.name = Rongsokan liquid.water.name = Air -liquid.slag.name = Terak +liquid.slag.name = Lava liquid.oil.name = Minyak liquid.cryofluid.name = Cairan Pendingin @@ -978,7 +1010,7 @@ block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Batu Pasir Besar block.grass.name = Rumput -block.slag.name = Slag +block.slag.name = Lahar block.space.name = Luar Angkasa block.salt.name = Garam block.salt-wall.name = Bukit Garam @@ -1066,7 +1098,7 @@ block.thorium-wall-large.name = Dinding Thorium Besar block.door.name = Pintu block.door-large.name = Pintu Besar block.duo.name = Duo -block.scorch.name = Scorch +block.scorch.name = Penyembur Api block.scatter.name = Scatter block.hail.name = Hail block.lancer.name = Lancer @@ -1078,11 +1110,11 @@ block.junction.name = Simpangan block.router.name = Pengarah block.distributor.name = Distributor block.sorter.name = Penyortir -block.inverted-sorter.name = Penyortir terbalik +block.inverted-sorter.name = Penyortir Terbalik block.message.name = Pesan -block.illuminator.name = Penerang +block.illuminator.name = Lampu block.overflow-gate.name = Gerbang Luap -block.underflow-gate.name = Gerbang Tidak Meluap +block.underflow-gate.name = Gerbang Luap Terbalik block.silicon-smelter.name = Pelebur Silikon block.phase-weaver.name = Pengrajut Phase block.pulverizer.name = Pulverisator @@ -1119,7 +1151,7 @@ block.unloader.name = Pembongkar Muatan block.vault.name = Gudang block.wave.name = Wave block.tsunami.name = Tsunami -block.swarmer.name = Swarmer +block.swarmer.name = Peluncur Misil block.salvo.name = Salvo block.ripple.name = Ripple block.phase-conveyor.name = Pengantar Berbahan Phase @@ -1146,7 +1178,7 @@ block.thermal-pump.name = Pompa Suhu Panas block.thermal-generator.name = Generator Suhu Panas block.alloy-smelter.name = Pelebur Paduan Listrik block.mender.name = Mender -block.mend-projector.name = Mender Proyektor +block.mend-projector.name = Mender Projektor block.surge-wall.name = Dinding Listrik block.surge-wall-large.name = Dinding Listrik Besar block.cyclone.name = Cyclone @@ -1177,14 +1209,14 @@ block.disassembler.name = Pembongkar block.silicon-crucible.name = Multi-Lebur block.overdrive-dome.name = Kubah Proyeksi Percepat #experimental, may be removed -block.block-forge.name = Block Forge -block.block-loader.name = Block Loader -block.block-unloader.name = Block Unloader +block.block-forge.name = Pemadu Blok +block.block-loader.name = Pemuat Blok +block.block-unloader.name = Pembongkar Blok block.switch.name = Saklar block.micro-processor.name = Prosesor Mikro block.logic-processor.name = Prosesor Logika -block.hyper-processor.name = Prosesor Cepat +block.hyper-processor.name = Prosesor Raksasa block.logic-display.name = Tampilan Logika block.large-logic-display.name = Tampilan Logika Besar block.memory-cell.name = Sel Memori @@ -1192,7 +1224,7 @@ block.memory-bank.name = Bank Memori team.blue.name = biru team.crux.name = merah -team.sharded.name = oranye +team.sharded.name = kuning team.orange.name = jingga team.derelict.name = abu-abu team.green.name = hijau @@ -1226,28 +1258,29 @@ item.lead.description = Bahan dasar di awal permainan. Digunakan di elektronik d item.lead.details = Padat. Lembam. Biasanya digunakan dalam baterai.\nCatatan : Kemungkinan beracun untuk kehidupan biologis. Bukan berarti tidak banyak disini. item.metaglass.description = Kaca yang super-kuat. Digunakan untuk distribusi zar cair dan penyimpanan. item.graphite.description = Karbon termineralisasi, dipakai untuk amunisi dan penyekatan listrik. -item.sand.description = Bahan umum yang digunakan di berbagai peleburan -item.coal.description = Bahan bakar umum. +item.sand.description = Digunakan sebagai produksi untuk material yang akan dimurnikan. +item.coal.description = Digunakan sebagai bahan bakar dan memurnikan material. item.coal.details = Hasil dari tumbuhan yang menjadi fosil, sudah terjadi sangat lama sebelum spora-spora menyebar. -item.titanium.description = Logam langka yang sangat ringan digunakan di transportasi zat cair, bor dan pesawat terbang. -item.thorium.description = Logam yang padat dan radioaktif, sebagai bantuan struktur ban bahan bakar nuklir. -item.scrap.description = Peninggalan bangunan dan unit tua. mengandung beberapa zat logam. +item.titanium.description = Digunakan di transportasi zat cair, bor dan pesawat terbang. +item.thorium.description = Digunakan dalam struktur tahan lama dan sebagai bahan bakar nuklir. +item.scrap.description = Dilebur dan dimurnikan menjadi material lain. item.scrap.details = Sisa sisa bangunan dan unit tua. -item.silicon.description = Semi-konduktor yang sangat berguna, penerapan di panel surya dan banyak benda elektronik. -item.plastanium.description = Bahan yang ringan dan elastis, digunakan di pesawat terbang canggih dan amunisi kepingan. -item.phase-fabric.description = Zat yang hampir tidak ada bobot ini digunakan di elektronik canggih dan teknologi reparasi. -item.surge-alloy.description = Paduan canggih dengan properti listrik yang unik. +item.silicon.description = Digunakan di panel surya, bahan elektronik yang kompleks, dan amunisi yang bisa mengejar. +item.plastanium.description = Digunakan dalam unit canggih, isolasi dan amunisi fragmentasi . +item.phase-fabric.description = Digunakan di elektronik canggih dan teknologi perbaikan diri sendiri. +item.surge-alloy.description = Digunakan di pertahanan yang lebih canggih dan struktur pertahanan reaktif. item.spore-pod.description = Digunakan untuk produksi minyak, bahan peledak dan bahan bakar. item.spore-pod.details = Spora. Sepertinya bentuk kehidupan sintetis. Menghasilkan gas beracun yang meracuni kehidupan biologis lainnya. Sangat mudah menyebar. Sangat mudah terbakar dalam kondisi tertentu. -item.blast-compound.description = Senyawa yang digunakan di bom dan peledak lainnya. Bisa dipakai untuk bahan bakar, tetapi tidak disarankan. -item.pyratite.description = Zat yang mudah dibakar ini digunakan di senjata pembakar. +item.blast-compound.description = Senyawa yang digunakan di bom dan amunisi peledak. +item.pyratite.description = Digunakan di senjata pembakar dan generator yang membutuhkan bahan mudah terbakar. + liquid.water.description = Umumnya digunakan untuk mendinginkan mesin-mesin dan pendaur ulang. -liquid.slag.description = Berbagai tipe logam yang meleleh. Dapat dipisahkan menjadi mineral masing-masing, atau disemprokat ke musuh dijadikn senjata. -liquid.oil.description = Bisa dibakar, diledakkan atau sebagai pendigin. -liquid.cryofluid.description = Zat cair paling efisien untuk mendinginkan hal-hal. +liquid.slag.description = Berbagai campuran tipe logam yang meleleh. Dapat dipisahkan menjadi mineral masing-masing, atau disemprokan ke musuh sebagai senjata. +liquid.oil.description = Digunakan di produksi material lanjutan dan sebagai amunisi yang mudah terbakar. +liquid.cryofluid.description = Digunakan sebagai pendingin di reaktor, turret, dan pabrik. block.armored-conveyor.description = Memindahkan barang sama cepatnya dengan pengantar titanium, namun memiliki lebih banyak armor. Tidak dapat menerima masukan dari samping dari apapun kecuali dari pengantar. -block.illuminator.description = Sebuah benda berukuran kecil, sumber penghasil cahaya. Membutuhkan tenaga untuk berfungsi. +block.illuminator.description = Sebuah lampu kecil untuk menerangi daerah sekitar. Perlu listrik untuk bekerja. block.message.description = Menyimpan pesan. Digunakan untuk komunikasi antar sekutu. block.graphite-press.description = Memadatkan bongkahan batu bara menjadi lempengan grafit murni. block.multi-press.description = Versi pemadat grafit yang lebih bagus. Membutuhkan air dan tenaga untuk memproses batu bara lebih cepat dan efisien. @@ -1259,8 +1292,8 @@ block.alloy-smelter.description = Memproduksi campuran logam dari titanium, tima block.cryofluidmixer.description = Mencampur air dan titanium menjadi cairan dingin yang lebih efisien untuk pendingin. block.blast-mixer.description = Menggunakan minyak untuk membentuk pyratite menjadi senyawa peledak yang kurang mudah terbakar tetapi lebih eksplosif. block.pyratite-mixer.description = Mencampur batu bara, timah dan pasir menjadi pyratite yang sangat mudah terbakar. -block.melter.description = Melelehkan kepingan menjadi terak untuk proses selanjutnya atau digunakan menara. -block.separator.description = Mengekstrak logam-logam berguna dari terak. +block.melter.description = Melelehkan rongsokan menjadi lava. +block.separator.description = Mengekstrak komponen mineral dari lava. block.spore-press.description = Menekan polong spora menjadi minyak. block.pulverizer.description = Menghancurkan kepingan menjadi pasir. Berguna jika tidak ada pasir disekitar. block.coal-centrifuge.description = Memadatkan minyak menjadi bongkahan batu bara. @@ -1286,7 +1319,7 @@ block.surge-wall-large.description = Blok pelindung terkuat.\nMempunyai kemungki block.door.description = Pintu kecil yang bisa dibuka-tutup dengan menekannya.\nJika dibuka, musuh bisa masuk dan menembak. block.door-large.description = Pintu kecil yang bisa dibuka-tutup dengan menekannya.\nJika dibuka, musuh bisa masuk dan menembak.\nSebesar 4 blok. block.mender.description = Menyembuhkan blok di sekelilingnya secara berkala. Menjaga keutuhan pertahanan di sela-sela gelombang.\nDapat menggunakan silikon untuk meningkatkan jangkauan dan efisiensi. -block.mend-projector.description = Versi reparator yang lebih baik. Menyembuhkan blok di sekelilingnya secara berkala.\nDapat menggunakan silikon untuk meningkatkan jangkauan dan efisiensi. +block.mend-projector.description = Versi mender yang lebih besar. Menyembuhkan blok di sekelilingnya secara berkala.\nDapat menggunakan phase untuk meningkatkan jangkauan dan efisiensi. block.overdrive-projector.description = Menambah kecepatan bangunan sekitar, seperti bor dan pengantar. block.force-projector.description = Membentuk medan gaya berbentuk heksagon disekitar, melindungi bangunan dan unit didalamnya dari tembakan. Dapat mengalami kelebihan panas jika membendung terlalu banyak kerusakan. Bisa menggunakan cairan untuk mendinginkan. Gunakan fabrik phase untuk memperbesar jangkauan. block.shock-mine.description = Mencedera musuh yang menginjak ranjau. Hampir tak kasat mata kepada musuh. @@ -1336,13 +1369,13 @@ block.laser-drill.description = Mengebor lebih cepat lewat teknologi laser, tapi block.blast-drill.description = Bor tercanggih. Membutuhkan banyak tenaga. block.water-extractor.description = Mengekstrak air dari tanah. Gunakan jika tidak ada sumber air disekitar. block.cultivator.description = Membudidaya spora kecil menjadi polong siap diolah. -block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo. +block.cultivator.details = Teknologi yang dipulihkan. Digunakan untuk memproduksi biomassa secara efesien. Kemungkinan merupakan inkubator awal dari spora yang sekarang menutupi Serpulo. block.oil-extractor.description = Menggunakan tenaga cukup besar untuk mengekstrak minyak dari pasir. Gunakan jika tidak ada sumber minyak disekitar. block.core-shard.description = Versi pertama dari pengulangan kapsul inti. Jika hancur, Semua kontak dengan daerah akan hilang. Jangan biarkan ini terjadi. block.core-shard.details = Iterasi pertama. Padat. Bisa menggandakan dirinya (untuk menguasai sektor disekitarnya). Dilengkapi dengan pendorong yang sekali pakai. Tidak didesain untuk perjalanan antar planet. -block.core-foundation.description = Versi kedua dari intk. Lebih kuat. Menyimpan banyak sumber daya. +block.core-foundation.description = Versi kedua dari inti. Lebih kuat. Menyimpan banyak sumber daya. block.core-foundation.details = Iterasi kedua. -block.core-nucleus.description = Versi ketiga dan pengulangan terakhir dari kapsul inti. Sangkat kuat. Menyimpan sangat banyak sumberr daya. +block.core-nucleus.description = Versi ketiga dan pengulangan terakhir dari kapsul inti. Sangat kuat. Menyimpan sangat banyak sumber daya. block.core-nucleus.details = Iterasi ketiga dan yang terakhir. block.vault.description = Menyimpan semua tipe item berkuantitas besar. [lightgray] pembongkar muatan[] bisa digunakan untuk mengeluarkan item dari gudang. block.container.description = Menyimpan semua tipe item. [lightgray] pembongkar muatan[] bisa digunakan untuk mengeluarkan item dari kontainer. @@ -1363,31 +1396,32 @@ block.ripple.description = Menara meriam besar yang menembak beberapa peluru sek block.cyclone.description = Menara penembak beruntun besar. block.spectre.description = Menara besar yang menembak dua peluru kuat sekaligus. block.meltdown.description = Menara besar ini menembak sinar panjang yang kuat. +block.foreshadow.description = Menembak laser besar dalam jarak yang jauh ke satu target. block.repair-point.description = Terus menerus memulihkan unit terluka disekitar. block.segment.description = Merusakkan dan menghancurkan proyektil yang datang. Proyektil laser tidak akan ditargetkan. -block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process. -block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water. -block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations. -block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium. -block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate. -block.payload-conveyor.description = Moves large payloads, such as units from factories. -block.payload-router.description = Splits input payloads into 3 output directions. -block.command-center.description = Controls unit behavior with several different commands. -block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading. -block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading. -block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading. -block.additive-reconstructor.description = Upgrades inputted units to the second tier. -block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier. -block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier. -block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier. -block.switch.description = A toggleable switch. State can be read and controlled with logic processors. -block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. -block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor. -block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor. -block.memory-cell.description = Stores information for a logic processor. -block.memory-bank.description = Stores information for a logic processor. High capacity. -block.logic-display.description = Displays arbitrary graphics from a logic processor. -block.large-logic-display.description = Displays arbitrary graphics from a logic processor. +block.parallax.description = Menembak laser yang menarik target udara, juga merusaknya selama dalam proses. +block.tsunami.description = Menembak cairan dalam jumlah dan tekanan besar ke arah musuh. Akan memadamkan api secara otomatis jika diisi dengan air. +block.silicon-crucible.description = Memurnikan silikon dari pasir dan batubara, menggunakan pyratit sebagai sumber panas tambahan. Lebih efesien jika diletakkan di area yang panas. +block.disassembler.description = Memisahkan lava menjadi mineral langka dalam efesiensi rendah. Bisa memproduksi thorium. +block.overdrive-dome.description = Menambah kecepatan kepada bangunan disekitarnya. Membutuhkan phase dan silikon untuk bekerja. +block.payload-conveyor.description = Memindahkan muatan yang besar, seperti unit dari pabrik. +block.payload-router.description = Membagi muatan masukan menjadi 3 arah keluaran. +block.command-center.description = Mengontrol perilaku unit dengan beberapa perintah berbeda. +block.ground-factory.description = Memproduksi unit darat. Hasil unit dapat digunakan secara langsung, atau dipindah ke rekonstruktor untuk ditingkatkan. +block.air-factory.description = Memproduksi unit udara. Hasil unit dapat digunakan secara langsung, atau dipindah ke rekonstruktor untuk ditingkatkan. +block.naval-factory.description = Memproduksi unit laut. Hasil unit dapat digunakan secara langsung, atau dipindah ke rekonstruktor untuk ditingkatkan. +block.additive-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat dua +block.multiplicative-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat tiga. +block.exponential-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat empat. +block.tetrative-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat lima. +block.switch.description = Sakelar yang dapat dialihkan. Status dapat dibaca dan dikontrol dengan prosesor logika. +block.micro-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. +block.logic-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. Lebih cepat dibandingkan prosesor mikro. +block.hyper-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. Lebih cepat dibandingkan prosesor logika. +block.memory-cell.description = Menyimpan informasi untuk prosesor. +block.memory-bank.description = Menyimpan informasi untuk prosesor. Berkapasitas besar. +block.logic-display.description = Menampilkan grafik sembarang dari prosesor. +block.large-logic-display.description = Menampilkan grafik sembarang dari prosesor. Lebih besar. unit.dagger.description = Menembak musuh terdekat dengan amunisi standar. unit.mace.description = Menyerang musuh terdekat dengan cara membakarnya. From 071d98dbfa6e521c57ed19b721f1abd2be2cb28e Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Wed, 18 Nov 2020 20:48:12 +0100 Subject: [PATCH 002/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 138 +++++++++++------------ 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index dad6c44fa3..dd2e03f2cc 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -34,30 +34,30 @@ load.mod = Mods load.scripts = Scripts be.update = Una nueva e innovadora versión disponible: -be.update.confirm = Descargar y reiniciar ahora? +be.update.confirm = ¿Descargar y reiniciar ahora? be.updating = Actualizando... be.ignore = Ignorar be.noupdates = No se encontraron actualizaciones. be.check = Revisando actualizaciones -schematic = Esquema -schematic.add = Guardar esquema... -schematics = Esquemas -schematic.replace = Un esquema con ese nombre ya existe. ¿Deseas remplazarlo? -schematic.exists = Un esquema con ese nombre ya existe. -schematic.import = Importar esquema... +schematic = Plantilla +schematic.add = Guardar plantilla... +schematics = Plantillas +schematic.replace = Ya existe una plantilla con ese nombre. ¿Deseas remplazarla? +schematic.exists = Ya existe una plantilla con ese nombre. +schematic.import = Importar plantilla... schematic.exportfile = Exportar archivo schematic.importfile = Importar archivo schematic.browseworkshop = Buscar en el Steam Workshop schematic.copy = Copiar al portapapeles. schematic.copy.import = Importar desde el portapapeles. schematic.shareworkshop = Compartir en el Steam Workshop -schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Girar esquemático -schematic.saved = Esquemático guardado. -schematic.delete.confirm = Esto esquemático será completamente borrado. -schematic.rename = Renombrar esquemático +schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Girar plantilla +schematic.saved = Plantilla guardada. +schematic.delete.confirm = Esta plantilla será completamente borrada. +schematic.rename = Renombrar plantilla schematic.info = {0}x{1}, {2} bloques -schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server. +schematic.disabled = [scarlet]Plantillas desactivadas.[]\nNo puedes usar plantillas en este [accent]mapa[] o [accent]servidor. stat.wave = Oleadas Derrotadas:[accent] {0} stat.enemiesDestroyed = Enemigos Destruidos:[accent] {0} @@ -69,13 +69,13 @@ stat.playtime = Tiempo jugado:[accent] {0} stat.rank = Rango final: [accent]{0} globalitems = [accent]Global Items -map.delete = ¿Estás seguro que quieres borrar el mapa "[accent]{0}[]"? +map.delete = ¿Estás seguro de que quieres borrar el mapa "[accent]{0}[]"? level.highscore = Puntuación más alta: [accent]{0} level.select = Selección de nivel level.mode = Modo de juego: coreattack = < ¡El núcleo está bajo ataque! > nearpoint = [[ [scarlet]ABANDONA EL PUNTO DE APARICIÓN INMEDIATAMENTE[] ]\nAniquilación inminente -database = Base de datos del núcleo +database = Base de datos savegame = Guardar Partida loadgame = Cargar Partida joingame = Unirse a la Partida @@ -92,7 +92,7 @@ maps = Mapas maps.browse = Navegar por los Mapas continue = Continuar maps.none = [lightgray]¡No se han encontrado mapas! -invalid = Invalido +invalid = No es válido pickcolor = Escoge Color preparingconfig = Preparando Configuración preparingcontent = Preparando Contenido @@ -104,43 +104,43 @@ feature.unsupported = Tu dispositivo no soporta esta función. mods.alphainfo = Ten en cuenta que los mods estan en versión Alpha, y[scarlet] pueden tener varios problemas[].\nReporta cualquier error que encuentres en la página de GitHub de Mindustry o Discord. mods = Mods -mods.none = [lightgray]No se encontraron Mods! +mods.none = [lightgray]¡No se encontraron Mods! mods.guide = Guía de Modding mods.report = Reportar Error mods.openfolder = Abrir carpeta de mods mods.reload = Recargar -mods.reloadexit = El juego se va a cerrar para recargar los mods. +mods.reloadexit = A continuación se cerrará el juego para recargar los mods. mod.display = [gray]Mod:[orange] {0} mod.enabled = [lightgray]Activado mod.disabled = [scarlet]Desactivado mod.disable = Desactivar mod.content = Contenido: -mod.delete.error = Fallo al elminar el mod. Quizás el archivo esta en uso. -mod.requiresversion = [scarlet]Requiere mínima versión del juego: [accent]{0} +mod.delete.error = No se pudo elminar el mod. Tal vez esté en uso por el juego. +mod.requiresversion = [scarlet]Requiere como mínimo la versión del juego: [accent]{0} mod.outdated = [scarlet]No es compatible con la V6 (no minGameVersion: 105) mod.missingdependencies = [scarlet]Dependencias faltantes: {0} -mod.erroredcontent = [scarlet]Errores de contenido -mod.errors = Ocurrieron fallos al cargar el contenido. -mod.noerrorplay = [scarlet]Tienes mods con fallos.[]Deshabilita las modificaciones afectadas o arregla los errores antes de jugar. +mod.erroredcontent = [scarlet]Contenido erróneo +mod.errors = Ha ocurrido un fallo al cargar el contenido. +mod.noerrorplay = [scarlet]Se están ejecutando algunos mods con fallos.[]Deshabilítalos o arregla los errores antes de jugar. mod.nowdisabled = [scarlet]Al/Los Mod/s '{0}'le esta/n faltando dependencias:[accent] {1}\n[lightgray]Estos mods necesitan descargarse primero.\nEste mod será automaticamente desactivado. mod.enable = Activar mod.requiresrestart = El juego se cerrará para aplicar los mods. -mod.reloadrequired = [scarlet]Se requiere actualizar +mod.reloadrequired = [scarlet]Se requiere volver a cargar mod.import = Importar mod mod.import.file = Importar archivo mod.import.github = Importar Mod de Github -mod.jarwarn = [scarlet]Los mods JAR pueden ser inseguros.[]\nAsegúrate de que los descargaste de una fuente segura! +mod.jarwarn = [scarlet]Los mods JAR pueden no ser seguros.[]\n¡Asegúrate de haberlos descargado de una fuente en la que confíes! mod.item.remove = Este objeto es parte del[accent] '{0}'[] mod. Para eliminarlo, desinstala ese mod. mod.remove.confirm = Este mod va a ser eliminado.\n¿Quieres continuar? mod.author = [lightgray]Autor:[] {0} -mod.missing = Esta partida guardada usa mods que has actualizado recientemente o que ya no has instalado. Se puede corromper la partida guardada. ¿Estás seguro de que quieres cargarla?\n[lightgray]Mods:\n{0} +mod.missing = Esta partida guardada usa mods que has actualizado recientemente o que no tienes instalados. Se puede corromper la partida guardada. ¿Quieres cargarla a pesar de ello?\n[lightgray]Mods:\n{0} mod.preview.missing = Antes de publicar este mod en el Steam Workshop, debe añadir una imagen de vista previa.\nAñada una imagen con nombre[accent] preview.png[] en la carpeta del mod e intente nuevamente. mod.folder.missing = Solo los mods en forma de carpeta se pueden publicar en el Steam Workshop.\nPara convertir cualquier mod en una carpeta, simplemente descomprima su archivo a una carpeta y elimine el zip anterior, luego reinicie su juego o vuelva a cargar sus mods. mod.scripts.disable = Tu dispositivo no soporta los mods con scripts. Debes deshabilitar esos mods para jugar. -about.button = Acerca de +about.button = Acerca del juego name = Nombre: noname = Elige un[accent] nombre de jugador[] primero. planetmap = Mapa del planeta @@ -149,45 +149,45 @@ filename = Nombre del archivo: unlocked = ¡Nuevo Bloque Desbloqueado! completed = [accent]Completado techtree = Árbol de Tecnologías -research.list = [lightgray]investigación: +research.list = [lightgray]Investigación: research = Investigación researched = [lightgray]{0} investigado. research.progress = {0}% completado players = {0} jugadores online players.single = {0} jugador online -players.search = buscar +players.search = Buscar players.notfound = [gray]No se encontraron jugadores server.closing = [accent]Cerrando servidor... -server.kicked.kick = ¡Has sido expulsado del servidor! -server.kicked.whitelist = No estas en la lista blanca de aqui. -server.kicked.serverClose = El servidor ha cerrado. -server.kicked.vote = Te han expulsado por votación. Adiós! -server.kicked.clientOutdated = ¡Cliente desactualizado! ¡Actualiza tu juego! +server.kicked.kick = ¡Te han echado del servidor! +server.kicked.whitelist = No estás en la lista blanca de este servidor. +server.kicked.serverClose = El servidor se ha cerrado. +server.kicked.vote = Has sido expulsado por votación. ¡Adiós! +server.kicked.clientOutdated = ¡Cliente desactualizado! ¡Actualiza el juego! server.kicked.serverOutdated = ¡Servidor desactualizado! ¡Pídele al anfitrión que lo actualice! -server.kicked.banned = Has sido expulsado del servidor. +server.kicked.banned = Has sido baneado en este servidor. server.kicked.typeMismatch = Este servidor no es compatible con su tipo de compilación. -server.kicked.playerLimit = Este servidor está lleno. Espera un espacio vacío. +server.kicked.playerLimit = Este servidor está lleno. Aunque siempre puedes esperar a que alguien deje un hueco... server.kicked.recentKick = Has sido expulsado recientemente.\nEspera para poder conectarte de nuevo. server.kicked.nameInUse = Ya hay alguien con ese\nnombre en el servidor. -server.kicked.nameEmpty = Tu nombre debe por lo menos contener un carácter o número. -server.kicked.idInUse = ¡Ya estás en el servidor! Conectarse con dos cuentas no está permitido. +server.kicked.nameEmpty = Tu nombre debe contener al menos un carácter o número. +server.kicked.idInUse = ¡Ya estás en el servidor! No está permitido conectarse con dos cuentas. server.kicked.customClient = Este servidor no soporta versiones personalizadas. Descarga una versión oficial. server.kicked.gameover = ¡Fin del juego! server.kicked.serverRestarting = Se esta reiniciando el servidor. server.versions = Tu versión:[accent] {0}[]\nVersión del servidor:[accent] {1}[] -host.info = El botón [accent]host[] crea un servidor en el puerto [scarlet]6567[]. \nCualquier persona en la misma [lightgray]wifi o red local[] debería poder ver tu servidor en la lista de servidores.\n\nSi quieres que cualquier persona se pueda conectar de cualquier lugar por IP, la [accent]asignación de puertos[] es requerida.\n\n[lightgray]Nota: Si alguien experimenta problemas conectándose a tu partida LAN, asegúrate de permitir a Mindustry acceso a tu red local mediante la configuración de tu firewall. -join.info = Aquí, puedes escribir la [accent]IP de un server[] para conectarte, o descubrir servidores de [accent]red local[] para conectarte.\nLAN y WAN es soportado para jugar en multijugador.\n\n[lightgray]Nota: No hay una lista automática global de servidores; si quieres conectarte por IP, tendrás que preguntarle al anfitrión por la IP. +host.info = El botón [accent]host[] crea un servidor en el puerto [scarlet]6567[]. \nCualquier persona en la misma [lightgray]wifi []o [lightgray]red local[] debería poder ver tu servidor en la lista de servidores.\n\nSi quieres que cualquier persona se pueda conectar de cualquier lugar mediante IP, se requiere [accent]asignación de puertos[].\n\n[lightgray]Nota: Si alguien experimenta problemas conectándose a tu partida LAN, asegúrate de permitir a Mindustry acceso a tu red local mediante la configuración de tu firewall. +join.info = Aquí, puedes escribir la [accent]IP de un servidor[] para conectarte, o descubrir servidores en tu [accent]red local[] para conectarte.\nTambién se puede jugar multijugador en redes LAN y WAN.\n\n[lightgray]Nota: No hay una lista automática global de servidores; si quieres conectarte por IP, tendrás que preguntarle al anfitrión por la IP. hostserver = Crear Servidor invitefriends = Invitar Amigos hostserver.mobile = Crear\nJuego host = Servidor hosting = [accent]Abriendo servidor... hosts.refresh = Actualizar -hosts.discovering = Descubrir partidas LAN -hosts.discovering.any = Descubrir juegos +hosts.discovering = Buscando partidas en LAN... +hosts.discovering.any = Buscando partidas server.refreshing = Actualizando servidor... -hosts.none = [lightgray]¡No se han encontrado partidas LAN! -host.invalid = [scarlet]No se ha podido conectar al anfitrión. +hosts.none = [lightgray]No se han encontrado partidas en LAN +host.invalid = [scarlet]No se ha podido conectar al anfitrión servers.local = Servidores Locales servers.remote = Servidores Remotos @@ -197,13 +197,13 @@ trace = Rastrear Jugador trace.playername = Nombre de jugador: [accent]{0} trace.ip = IP: [accent]{0} trace.id = ID Única: [accent]{0} -trace.mobile = Cliente de movíl: [accent]{0} +trace.mobile = Cliente de móvil: [accent]{0} trace.modclient = Cliente Personalizado: [accent]{0} invalidid = ¡ID de cliente inválida! Envía un informe del error. server.bans = Expulsiones -server.bans.none = ¡Ningún usuario ha sido expulsado! +server.bans.none = No se ha expulsado a ningún usuario aún server.admins = Administradores -server.admins.none = ¡Ningún administrador ha sido encontrado! +server.admins.none = No se ha encontrado ningún administrador server.add = Agregar Servidor server.delete = ¿Estás seguro de querer borrar este servidor? server.edit = Editar Servidor @@ -211,26 +211,26 @@ server.outdated = [crimson]¡Servidor desactualizado![] server.outdated.client = [crimson]¡Cliente desactualizado![] server.version = [lightgray]Versión: {0} server.custombuild = [accent]Versión personalizada -confirmban = ¿Estás seguro de querer banear este jugador? +confirmban = ¿Quieres banear a este jugador? confirmkick = ¿Estás seguro de querer expulsar este jugador? -confirmvotekick = ¿Estás seguro de querer hechar por votación a este jugador? -confirmunban = ¿Estás seguro de querer desbanear este jugador? -confirmadmin = ¿Estás seguro de querer hacer administrador a este jugador? -confirmunadmin = ¿Estás seguro de querer quitar los permisos de administrador a este jugador? +confirmvotekick = ¿Estás de acuerdo en expulsar este jugador? +confirmunban = ¿Quieres desbanear a este jugador? +confirmadmin = ¿Quieres hacer administrador a este jugador? +confirmunadmin = ¿Quieres quitar los permisos de administrador a este jugador? joingame.title = Unirse a la partida joingame.ip = IP: disconnect = Desconectado. disconnect.error = Error en la conexión. disconnect.closed = Conexión cerrada. disconnect.timeout = Desconectado. -disconnect.data = ¡Se ha fallado la carga de datos del mundo! +disconnect.data = ¡Hubo un fallo con la carga de datos! cantconnect = No es posible unirse a la partida ([accent]{0}[]). connecting = [accent]Conectando... connecting.data = [accent]Cargando datos del mundo... server.port = Puerto: server.addressinuse = ¡La dirección ya está en uso! server.invalidport = ¡El número de puerto es invalido! -server.error = [crimson]Error creando el servidor: error [accent]{0} +server.error = [crimson]Error al crear el servidor: error [accent]{0} save.new = Nuevo Punto de Guardado save.overwrite = ¿Estás seguro de querer sobrescribir\neste punto de guardado? overwrite = Sobrescribir @@ -249,17 +249,17 @@ save.rename.text = Nuevo nombre: selectslot = Selecciona un Punto de Guardado. slot = [accent]Casilla {0} editmessage = Editar mensaje -save.corrupted = [accent]¡El punto de guardado está corrupto o es inválido!\nSi acabas de actualizar el juego, esto debe ser probablemente un cambio en el formato de guardado y[scarlet] no[] un error. +save.corrupted = [accent]¡El punto de guardado está corrupto o es inválido!\nSi acabas de actualizar el juego, probablemente se deba a un cambio en el formato de guardado y[scarlet] no[] un a error. empty = -on = Encendido -off = Apagado +on = ON +off = OFF save.autosave = Autoguardado: {0} save.map = Mapa: {0} save.wave = Oleada {0} -save.mode = ModoJuego: {0} +save.mode = Modo de Juego: {0} save.date = Última vez guardado: {0} save.playtime = Tiempo de juego: {0} -warning = Aviso. +warning = Aviso confirm = Confirmar delete = Borrar view.workshop = Ver en el Steam Workshop @@ -283,22 +283,22 @@ loading = [accent]Cargando... reloading = [accent]Recargando mods... saving = [accent]Guardando... -respawn = [accent][[{0}][] para respawnear en el nucleo +respawn = [accent][[{0}][] para reaparecer en el núcleo cancelbuilding = [accent][[{0}][] para limpiar el plan selectschematic = [accent][[{0}][] para seleccionar+copiar pausebuilding = [accent][[{0}][] para pausar la construcción -resumebuilding = [scarlet][[{0}][] para resumir la construcción +resumebuilding = [scarlet][[{0}][] para reanudar la construcción wave = [accent]Oleada {0} -wave.cap = [accent]Wave {0}/{1} +wave.cap = [accent]Oleada {0}/{1} wave.waiting = Oleada en {0} wave.waveInProgress = [lightgray]Oleada en progreso waiting = Esperando... waiting.players = Esperando jugadores... wave.enemies = [lightgray]{0} Enemigos Restantes wave.enemy = [lightgray]{0} Enemigo Restante -wave.guardianwarn = Guardian approaching in [accent]{0}[] waves. -wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave. +wave.guardianwarn = Se aproxima un Guardián en [accent]{0}[] oleadas. +wave.guardianwarn.one = Se aproxima un Guardián en [accent]{0}[] oleada. loadimage = Cargar Imagen saveimage = Guardar Imagen unknown = Desconocido @@ -306,9 +306,9 @@ custom = Personalizado builtin = Incorporado map.delete.confirm = ¿Estás seguro de querer borrar este mapa? ¡Recuerda que está acción no se puede deshacer! map.random = [accent]Mapa Aleatorio -map.nospawn = ¡Este mapa no tiene ningún núcleo en el cual pueda aparecer el jugador! Agrega un núcleo[accent] orange[] [white]al mapa con el editor. -map.nospawn.pvp = ¡Este mapa no tiene ningún núcleo enemigo para que aparezca el jugador! Añade un núcleo[scarlet] red[] a este mapa en el editor. -map.nospawn.attack = ¡Este mapa no tiene núcleos para que el jugador ataque! Añade núcleos[scarlet] red[] a este mapa en el editor. +map.nospawn = ¡Este mapa no tiene ningún núcleo en que pueda aparecer el jugador! Agrega un núcleo[accent] naranja[] al mapa con el editor. +map.nospawn.pvp = ¡Este mapa no tiene ningún núcleo enemigo para que aparezca el jugador! Añade un núcleo[scarlet] "de otro color"[] a este mapa en el editor. +map.nospawn.attack = ¡Este mapa no tiene núcleos a los que los jugadores deban atacar! Añade núcleos[scarlet] rojos[] a este mapa en el editor. map.invalid = Error cargando el mapa: archivo corrupto o inválido. workshop.update = Actualizar artículo workshop.error = Error al obtener detalles del Steam Workshop: {0} @@ -319,7 +319,7 @@ changelog = Lista de cambios (optional): eula = EULA de Steam missing = Este artículo ha sido movido o eliminado.\n[lightgray]La lista del taller ahora se ha desvinculado automáticamente. publishing = [accent]Publicando... -publish.confirm = ¿Estás seguro de que quieres publicar esto?\n\n[lightgray]¡Asegúrese de aceptar primero el EULA del taller, o sus artículos no aparecerán! +publish.confirm = ¿Estás seguro de que quieres publicar esto?\n\n[lightgray]¡Asegúrese de aceptar primero el EULA del Steam Workshop, o sus artículos no aparecerán! publish.error = Error publicando el artículo: {0} steam.error = Error al inicializar los servicios de Steam.\nError: {0} @@ -337,7 +337,7 @@ editor.generation = Generación: editor.ingame = Editar dentro del juego editor.publish.workshop = Publicar en el Steam Workshop editor.newmap = Nuevo Mapa -editor.center = Center +editor.center = Centrar workshop = Steam Workshop waves.title = Oleadas waves.remove = Borrar @@ -386,7 +386,7 @@ editor.savemap = Guardar Mapa editor.saved = ¡Guardado! editor.save.noname = ¡Tu mapa no tiene un nombre! Pon uno en el menú 'Info del Mapa'. editor.save.overwrite = ¡Tu mapa sobrescribe uno ya incorporado! Elige un nombre diferente en el menú 'Info del Mapa'. -editor.import.exists = [scarlet]¡No se ha podido importar:[] un mapa incorporado con el nombre '{0}' ya existe! +editor.import.exists = [scarlet]¡No se ha podido importar:[] ya existe un mapa incorporado con el nombre '{0}'. editor.import = Importar... editor.importmap = Importar Mapa editor.importmap.description = Importar un mapa ya existente From 224cd7bb444b026acbb86b3d6998ef1c6e58a8b7 Mon Sep 17 00:00:00 2001 From: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Date: Thu, 19 Nov 2020 08:50:31 +0700 Subject: [PATCH 003/123] changed boss.health and new lines addition "Darah Bos" to "Darah Guardian" indev.campaign and interplanetary-accelerator planetaryTerminal sector --- core/assets/bundles/bundle_in_ID.properties | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 1e87e96419..e2d2b48725 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -24,6 +24,7 @@ highscore = [accent]Rekor Baru! copied = Tersalin. indevpopup = [accent]v6[] saat ini dalam versi [accent]alpha[].\n[lightgray]Artinya:[]\n[scarlet]- Kampanye belum sepenuhnya selesai[]\n- Beberapa konten tidak tersedia\n - Beberapa [scarlet]Unit AI[] tidak sepenuhnya bekerja\n- Beberapa unit belum sepenuhnya selesai\n- Semua yang kamu lihat dapat berubah atau dihapus sewaktu-waktu.\n\nLaporkan bug atau crash di [accent]Github[]. indev.notready = Bagian tersebut saat ini belum siap +indev.campaign = [accent]Youve reached the end of the campaign![]\n\nThis is as far as the content goes. Interplanetary travel will be added in future updates. load.sound = Suara load.map = Peta @@ -504,6 +505,7 @@ loadout = Muatan resources = Sumber Daya bannedblocks = Balok yang dilarang addall = Tambah Semua +launch.from = Meluncurkan Dari: [accent]{0} launch.destination = Destinasi: {0} configure.invalid = Jumlah harus berupa angka diantara 0 dan {0}. zone.unlocked = [lightgray]{0} terbuka. @@ -513,7 +515,7 @@ zone.objective = [lightgray]Objektif: [accent]{0} zone.objective.survival = Bertahan zone.objective.attack = Hancurkan Inti Musuh add = Menambahkan... -boss.health = Darah Bos +boss.health = Darah Guardian connectfail = [scarlet]Gagal menyambung ke server:\n\n[accent]{0} error.unreachable = Server tak terjangkau.\nApakah alamatnya benar? @@ -579,6 +581,7 @@ sector.fungalPass.name = Lintasan Jamur sector.biomassFacility.name = Pabrik Sintesis Biomassa sector.windsweptIslands.name = Pulau Bersemilir sector.extractionOutpost.name = Pos Ekstraksi +sector.planetaryTerminal.name = Planetary Launch Terminal sector.groundZero.description = Lokasi yang optimal untuk bermain satu kali lagi. Sangat sedikit musuh. Beberapa sumber daya dapat dikumpulkan.\nKumpulkan timah dan tembaga sebanyak yang kamu bisa.\nMulai dari sini. sector.frozenForest.description = Disini, dekat dengan gunung, spora sudah menyebar. Suhu dingin tidak dapat menahannya.\n\nHasilkan listrik. Bangun generator pembakar. Pelajari cara menggunakan mender. @@ -1212,6 +1215,7 @@ block.overdrive-dome.name = Kubah Proyeksi Percepat block.block-forge.name = Pemadu Blok block.block-loader.name = Pemuat Blok block.block-unloader.name = Pembongkar Blok +block.interplanetary-accelerator.name = Interplanetary Accelerator block.switch.name = Saklar block.micro-processor.name = Prosesor Mikro @@ -1422,6 +1426,7 @@ block.memory-cell.description = Menyimpan informasi untuk prosesor. block.memory-bank.description = Menyimpan informasi untuk prosesor. Berkapasitas besar. block.logic-display.description = Menampilkan grafik sembarang dari prosesor. block.large-logic-display.description = Menampilkan grafik sembarang dari prosesor. Lebih besar. +block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment. unit.dagger.description = Menembak musuh terdekat dengan amunisi standar. unit.mace.description = Menyerang musuh terdekat dengan cara membakarnya. From 7515d1aca7f70f08a1b6bda73b235df1496d5298 Mon Sep 17 00:00:00 2001 From: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> Date: Thu, 19 Nov 2020 13:32:21 +0700 Subject: [PATCH 004/123] New entity translate and minor change --- core/assets/bundles/bundle_in_ID.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index e2d2b48725..097bde8d99 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -24,7 +24,7 @@ highscore = [accent]Rekor Baru! copied = Tersalin. indevpopup = [accent]v6[] saat ini dalam versi [accent]alpha[].\n[lightgray]Artinya:[]\n[scarlet]- Kampanye belum sepenuhnya selesai[]\n- Beberapa konten tidak tersedia\n - Beberapa [scarlet]Unit AI[] tidak sepenuhnya bekerja\n- Beberapa unit belum sepenuhnya selesai\n- Semua yang kamu lihat dapat berubah atau dihapus sewaktu-waktu.\n\nLaporkan bug atau crash di [accent]Github[]. indev.notready = Bagian tersebut saat ini belum siap -indev.campaign = [accent]Youve reached the end of the campaign![]\n\nThis is as far as the content goes. Interplanetary travel will be added in future updates. +indev.campaign = [accent]Kamu telah mencapai batas dari kampanye![]\n\nHanya sejauh ini yang kamu bisa. Perjalanan antarplanet akan ditambahkan di masa mendatang. load.sound = Suara load.map = Peta @@ -569,19 +569,19 @@ planet.sun.name = Matahari sector.impact0078.name = Impact 0078 sector.groundZero.name = Titik Nol sector.craters.name = Kawah -sector.frozenForest.name = Hutan Beku -sector.ruinousShores.name = Pantai Hancur +sector.frozenForest.name = Hutan Yang Beku +sector.ruinousShores.name = Pantai Yang Hancur sector.stainedMountains.name = Gunung Bernoda sector.desolateRift.name = Retakan Terpencil sector.nuclearComplex.name = Kompleks Produksi Nuklir sector.overgrowth.name = Pertumbuhan sector.tarFields.name = Lahan Tar sector.saltFlats.name = Dataran Garam -sector.fungalPass.name = Lintasan Jamur +sector.fungalPass.name = Lintasan Spora sector.biomassFacility.name = Pabrik Sintesis Biomassa sector.windsweptIslands.name = Pulau Bersemilir sector.extractionOutpost.name = Pos Ekstraksi -sector.planetaryTerminal.name = Planetary Launch Terminal +sector.planetaryTerminal.name = Pusat Peluncuran Planet sector.groundZero.description = Lokasi yang optimal untuk bermain satu kali lagi. Sangat sedikit musuh. Beberapa sumber daya dapat dikumpulkan.\nKumpulkan timah dan tembaga sebanyak yang kamu bisa.\nMulai dari sini. sector.frozenForest.description = Disini, dekat dengan gunung, spora sudah menyebar. Suhu dingin tidak dapat menahannya.\n\nHasilkan listrik. Bangun generator pembakar. Pelajari cara menggunakan mender. @@ -928,7 +928,7 @@ rules.enemycorebuildradius = Dilarang Membangun Radius Inti Musuh :[lightgray] ( rules.wavespacing = Jarak Gelombang:[lightgray] (detik) rules.buildcostmultiplier = Multiplikasi Harga Bangunan rules.buildspeedmultiplier = Multiplikasi Waktu Pembuatan Bangunan -rules.deconstructrefundmultiplier = Penggembalian Dana Mendekonstruksi Blok +rules.deconstructrefundmultiplier = Penggembalian Bahan Mendekonstruksi Blok rules.waitForWaveToEnd = Gelombang menunggu musuh rules.dropzoneradius = Radius Titik Muncul:[lightgray] (Blok) rules.unitammo = Unit Membutuhkan Amunisi @@ -1215,7 +1215,7 @@ block.overdrive-dome.name = Kubah Proyeksi Percepat block.block-forge.name = Pemadu Blok block.block-loader.name = Pemuat Blok block.block-unloader.name = Pembongkar Blok -block.interplanetary-accelerator.name = Interplanetary Accelerator +block.interplanetary-accelerator.name = Akselerator Antarplanet block.switch.name = Saklar block.micro-processor.name = Prosesor Mikro @@ -1426,7 +1426,7 @@ block.memory-cell.description = Menyimpan informasi untuk prosesor. block.memory-bank.description = Menyimpan informasi untuk prosesor. Berkapasitas besar. block.logic-display.description = Menampilkan grafik sembarang dari prosesor. block.large-logic-display.description = Menampilkan grafik sembarang dari prosesor. Lebih besar. -block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment. +block.interplanetary-accelerator.description = Sebuah menara railgun elektromagnetik. Mempercepat Inti dengan kecepatan tinggi untuk peluncuran antarplanet. unit.dagger.description = Menembak musuh terdekat dengan amunisi standar. unit.mace.description = Menyerang musuh terdekat dengan cara membakarnya. From c3df430a4e00d3667f7477a3c3697cf488d03ae4 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Thu, 19 Nov 2020 14:56:12 +0100 Subject: [PATCH 005/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 475 +++++++++++------------ 1 file changed, 237 insertions(+), 238 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index dd2e03f2cc..94702f042b 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -229,7 +229,7 @@ connecting = [accent]Conectando... connecting.data = [accent]Cargando datos del mundo... server.port = Puerto: server.addressinuse = ¡La dirección ya está en uso! -server.invalidport = ¡El número de puerto es invalido! +server.invalidport = ¡El número de puerto no es valido! server.error = [crimson]Error al crear el servidor: error [accent]{0} save.new = Nuevo Punto de Guardado save.overwrite = ¿Estás seguro de querer sobrescribir\neste punto de guardado? @@ -342,7 +342,7 @@ workshop = Steam Workshop waves.title = Oleadas waves.remove = Borrar waves.never = -waves.every = cada +waves.every = waves.waves = oleada(s) waves.perspawn = por lugar de aparición waves.shields = escudo/oleadas @@ -357,9 +357,9 @@ waves.copied = Oleadas copiadas. waves.none = No hay enemigos definidos.\nNótese que las listas de oleadas vacías se sustituirán por la lista por defecto. -wavemode.counts = Cuentas -wavemode.totals = Totales -wavemode.health = Salud +wavemode.counts = limitadas +wavemode.totals = totales +wavemode.health = por salud editor.default = [lightgray] @@ -413,41 +413,41 @@ toolmode.replace = Sustituir toolmode.replace.description = Solo dibuja en bloques sólidos. toolmode.replaceall = Sustituir Todo toolmode.replaceall.description = Sustituye todos los bloques del mapa. -toolmode.orthogonal = Ortogonal +toolmode.orthogonal = Perpendicular toolmode.orthogonal.description = Solo dibuja líneas ortogonales. toolmode.square = Cuadrado toolmode.square.description = Pincel cuadrado. toolmode.eraseores = Borrar Vetas toolmode.eraseores.description = Solo borra vetas. -toolmode.fillteams = Llenar Equipos -toolmode.fillteams.description = Llena equipos en vez de bloques. +toolmode.fillteams = Rellenar Equipos +toolmode.fillteams.description = Rellena equipos en lugar de bloques. toolmode.drawteams = Dibujar Equipos -toolmode.drawteams.description = Dibuja equipos en vez de bloques. +toolmode.drawteams.description = Dibuja equipos en lugar de bloques. filters.empty = [lightgray]¡No hay filtros! Añade uno con el botón de abajo. filter.distort = Distorsionar filter.noise = Ruido -filter.enemyspawn = Elegir punto de aparición enemigo -filter.spawnpath = Path To Spawn +filter.enemyspawn = Punto de aparición enemigo +filter.spawnpath = Ruta hasta el punto de aterrizaje filter.corespawn = Elegir Núcleo -filter.median = Median -filter.oremedian = Veta Median -filter.blend = Mezcla +filter.median = Calcular probabilidades de generación +filter.oremedian = Probabilidad de vetas +filter.blend = Mezclar filter.defaultores = Vetas por defecto -filter.ore = Vetas -filter.rivernoise = Ruido de rio +filter.ore = Vetas de Minerales +filter.rivernoise = Añadir Río filter.mirror = Espejo filter.clear = Despejar filter.option.ignore = Ignorar filter.scatter = Dispersar filter.terrain = Terreno filter.option.scale = Escala -filter.option.chance = Chance +filter.option.chance = Probabilidad filter.option.mag = Magnitud filter.option.threshold = Umbral filter.option.circle-scale = Escala del círculo -filter.option.octaves = Octaves -filter.option.falloff = Caída +filter.option.octaves = Continuidad +filter.option.falloff = Aterrizaje filter.option.angle = Ángulo filter.option.amount = Cantidad filter.option.block = Bloque @@ -456,7 +456,7 @@ filter.option.flooronto = Suelo objetivo filter.option.target = Target filter.option.wall = Muro filter.option.ore = Veta -filter.option.floor2 = Piso secundario +filter.option.floor2 = Terreno secundario filter.option.threshold2 = Umbral secundario filter.option.radius = Radio filter.option.percentile = Porcentaje @@ -470,12 +470,12 @@ load = Cargar save = Guardar fps = FPS: {0} ping = Ping: {0} ms -language.restart = Por favor reinicia el juego para que los cambios del idioma tengan efecto. +language.restart = Reinicia el juego para que los cambios en el idioma tengan efecto. settings = Ajustes tutorial = Tutorial -tutorial.retake = Volver a hacer tutorial +tutorial.retake = Volver a jugar el tutorial editor = Editor -mapeditor = Editor de Mapa +mapeditor = Editor de Mapas abandon = Abandonar abandon.text = Esta zona y sus recursos se perderán ante el enemigo. @@ -483,18 +483,18 @@ locked = Bloqueado complete = [lightgray]Completado: requirement.wave = Alcanzar la oleada {0} en {1} requirement.core = Destruir el núcleo enemigo en {0} -requirement.research = Research {0} -requirement.capture = Capture {0} +requirement.research = Investigar {0} +requirement.capture = Capturar {0} bestwave = [lightgray]Récord: {0} -launch.text = Launch -research.multiplayer = Only the host can research items. +launch.text = Lanzar +research.multiplayer = Solo el anfitrión de la partida puede \nrealizar investigaciones tecnologías. uncover = Descubrir configure = Configurar carga inicial -loadout = Loadout -resources = Resources +loadout = Carga Inicial +resources = Recursos bannedblocks = Bloques prohibidos addall = Añadir todo -launch.destination = Destination: {0} +launch.destination = Destino: {0} configure.invalid = La cantidad debe estar entre 0 y {0}. zone.unlocked = [lightgray]{0} desbloqueado. zone.requirement.complete = Oleada {0} alcanzada:\nrequerimientos de la zona {1} cumplidos. @@ -503,7 +503,7 @@ zone.objective = [lightgray]Objetivo: [accent]{0} zone.objective.survival = Sobrevivir zone.objective.attack = Destruir Núcleo Enemigo add = Añadir... -boss.health = Salud del Jefe +boss.health = Jefe connectfail = [crimson]Ha fallado la conexión con el servidor: [accent]{0} error.unreachable = Servidor inaccesible. @@ -530,9 +530,9 @@ sectors.stored = Almacenado: sectors.resume = Reanudar sectors.launch = Lanzar sectors.select = Elegir -sectors.nonelaunch = [lightgray]ninguno (sun) -sectors.rename = Rename Sector -sector.missingresources = [scarlet]Insuficientes recursos +sectors.nonelaunch = [lightgray]Ninguno (Sol) +sectors.rename = Renombrar Sector +sector.missingresources = [scarlet]Recursos Insuficientes planet.serpulo.name = Serpulo planet.sun.name = Sol @@ -571,31 +571,30 @@ settings.controls = Controles settings.game = Juego settings.sound = Sonido settings.graphics = Gráficos -settings.cleardata = Limpiar Datos del Juego... -settings.clear.confirm = ¿Estas seguro de querer limpiar estos datos?\n¡Esta acción no puede deshacerse! -settings.clearall.confirm = [scarlet]ADVERTENCIA![]\nEsto va a eliminar todos tus datos, incluyendo guardados, mapas, desbloqueos y atajos de teclado.\nUna vez presiones 'ok', el juego va a borrrar todos tus datos y saldrá del juego automáticamente. +settings.cleardata = Eliminando Datos del Juego... +settings.clear.confirm = ¿Estas seguro de querer eliminar estos datos?\n¡Esta acción no se puede deshacer! +settings.clearall.confirm = [scarlet]¡ADVERTENCIA![]\nEsto va a eliminar todos tus datos, incluyendo guardados, mapas, desbloqueos y atajos de teclado.\nUna vez presiones 'ok', el juego borrrará todos tus datos y se cerrará automáticamente. -settings.clearsaves.confirm = Estas seguro de que quieres borrar tus partidas guardadas? +settings.clearsaves.confirm = ¿Estas seguro de que quieres borrar tus partidas guardadas? settings.clearsaves = Limpiar partidas guardadas -settings.clearresearch = Borrar descubrimientos -settings.clearresearch.confirm = Estas seguro? -settings.clearcampaignsaves = Borrar Guardados de campaña -settings.clearcampaignsaves.confirm = Estas seguro de que quieres borrar tus partidas guardadas en el modo campaña? - +settings.clearresearch = Borrar Investigaciones Tecnológicas +settings.clearresearch.confirm = ¿Estas seguro? +settings.clearcampaignsaves = Borrar datos de campaña +settings.clearcampaignsaves.confirm = ¿Estas seguro de que quieres borrar tus partidas guardadas en el modo campaña? paused = [accent] < Pausado > clear = Limpiar banned = [scarlet]Baneado -unplaceable.sectorcaptured = [scarlet]Necesita que el sector esté capturado. +unplaceable.sectorcaptured = [scarlet]Necesitas que el sector esté capturado. yes = Sí no = No info.title = [accent]Información -error.title = [crimson]Un error ha ocurrido. -error.crashtitle = Un error ha ocurrido. - -unit.nobuild = [scarlet]La unidad no puede construir +error.title = [crimson]Ha ocurrido un error. +error.crashtitle = Ha ocurrido un error. +unit.nobuild = [scarlet]Esta unidad no puede construir lastaccessed = [lightgray]Anteriormente usado: {0} block.unknown = [lightgray]??? +stat.description = Descripción stat.input = Entrada stat.output = Salida stat.booster = Potenciador @@ -613,21 +612,21 @@ stat.size = Tamaño stat.displaysize = Tamaño mostrado stat.liquidcapacity = Capacidad de Líquidos stat.powerrange = Rango de Energía -stat.linkrange = Rango de conexión -stat.instructions = Instructions -stat.powerconnections = Conexiones maximas +stat.linkrange = Alcance de conexión +stat.instructions = Instrucciones +stat.powerconnections = Conexiones máximas stat.poweruse = Consumo de Energía stat.powerdamage = Energía/Daño stat.itemcapacity = Capacidad de Objetos -stat.memorycapacity = Memory Capacity +stat.memorycapacity = Capacidad de memoria stat.basepowergeneration = Generación de energía base stat.productiontime = Tiempo de producción stat.repairtime = Tiempo para Reparar Bloque Completamente stat.speedincrease = Aumento de Velocidad -stat.range = Rango +stat.range = Alcance stat.drilltier = Taladrables stat.drillspeed = Velocidad Base del Taladro -stat.boosteffect = Efecto del Potenciador +stat.boosteffect = Efecto de Potenciador stat.maxunits = Máximo de Unidades Activas stat.health = Vida stat.buildtime = Tiempo de construcción @@ -635,34 +634,34 @@ stat.maxconsecutive = Máximo consecutivo stat.buildcost = Coste de construcción stat.inaccuracy = Imprecisión stat.shots = Disparos -stat.reload = Recarga +stat.reload = Disparos/segundo stat.ammo = Munición -stat.shieldhealth = Salud del escudo -stat.cooldowntime = Tiempo de enfriamiento -stat.explosiveness = Explosiveness -stat.basedeflectchance = Probabilidad de desvío base -stat.lightningchance = Probabilidad de rayo +stat.shieldhealth = Escudo +stat.cooldowntime = Enfriamiento +stat.explosiveness = Explosividad +stat.basedeflectchance = Probabilidad de desvío +stat.lightningchance = Probabilidad de descarga stat.lightningdamage = Daño por rayo stat.flammability = Inflamabilidad -stat.radioactivity = Radiactividad -stat.heatcapacity = HeatCapacity +stat.radioactivity = Radioactividad +stat.heatcapacity = Resistencia temperatura stat.viscosity = Viscosidad stat.temperature = Temperatura stat.speed = Velocidad stat.buildspeed = Velocidad de construcción -stat.minespeed = Velocidad de la mina -stat.minetier = Nivel de mina -stat.payloadcapacity = Capacidad de carga útil +stat.minespeed = Velocidad de extracción +stat.minetier = Nivel de taladro +stat.payloadcapacity = Capacidad de carga stat.commandlimit = Límite de comando stat.abilities = Habilidades -skill.forcefield = Campo de fuerza -skill.repairfield = Campo de reparación -skill.statusfield = Campo de estado +skill.forcefield = Campo de Escudo +skill.repairfield = Campo de Reparación +skill.statusfield = Campo de Estado skill.unitspawn = {0} Fábrica -skill.shieldregenfield = Campo de regeneración del escudo +skill.shieldregenfield = Campo de Regeneración de Escudos -bar.drilltierreq = Se requiere un mejor taladro. +bar.drilltierreq = Se requiere un taladro mejor. bar.noresources = Recursos faltantes bar.corereq = Se requiere de un núcleo base @@ -673,7 +672,7 @@ bar.powerbalance = Energía: {0} bar.powerstored = Almacenados: {0}/{1} bar.poweramount = Energía: {0} bar.poweroutput = Salida de Energía: {0} -bar.powerlines = Connections: {0}/{1} +bar.powerlines = Conexiones: {0}/{1} bar.items = Objetos: {0} bar.capacity = Capacidad: {0} bar.unitcap = {0} {1}/{2} @@ -685,24 +684,24 @@ bar.progress = Progreso de construcción bar.input = Entrada bar.output = Salida -units.processorcontrol = [lightgray]Processor Controlled +units.processorcontrol = [lightgray]Procesador Controlado -bullet.damage = [stat]{0}[lightgray] daño +bullet.damage = [stat]{0}[lightgray] Daño bullet.splashdamage = [stat]{0}[lightgray] daño de área ~[stat] {1}[lightgray] casillas bullet.incendiary = [stat]Incendiaria bullet.homing = [stat]Rastreadora bullet.shock = [stat]Electrizante bullet.frag = [stat]Explosiva -bullet.knockback = [stat]{0}[lightgray]Retroceso -bullet.pierce = [stat]{0}[lightgray]x pierce -bullet.infinitepierce = [stat]pierce +bullet.knockback = [stat]{0}[lightgray]Empuje +bullet.pierce = [stat]{0}[lightgray]x Penetración +bullet.infinitepierce = [stat]Penetrante bullet.freezing = [stat]Congelación bullet.tarred = [stat]Relantizado bullet.multiplier = [stat]{0}[lightgray]x multiplicador de munición bullet.reload = [stat]{0}[lightgray]x recarga unit.blocks = bloques -unit.blockssquared = blocks² +unit.blockssquared = bloques² unit.powersecond = unidades de energía/segundo unit.liquidsecond = unidades de líquido/segundo unit.itemssecond = objetos/segundo @@ -716,7 +715,7 @@ unit.perminute = /min unit.timesspeed = x velocidad unit.percent = % -unit.shieldhealth = Vida del escudo +unit.shieldhealth = Escudo unit.items = objetos unit.thousands = k @@ -727,57 +726,57 @@ category.power = Energía category.liquids = Líquidos category.items = Objetos category.crafting = Fabricación -category.function = Function +category.function = Función category.optional = Mejoras Opcionales -setting.landscape.name = Bloquear modo paisaje +setting.landscape.name = Bloquear modo horizontal setting.shadows.name = Sombras setting.blockreplace.name = Sugerir bloques al construir setting.linear.name = Filtrado Lineal -setting.hints.name = Pistas +setting.hints.name = Consejos -setting.flow.name = Mostrar tasa de flujo de recursos[scarlet] (experimental) +setting.flow.name = Mostrar tasa de flujo de recursos setting.buildautopause.name = Auto-pausar construcción -setting.animatedwater.name = Agua Animada -setting.animatedshields.name = Escudos Animados +setting.animatedwater.name = Animaciones de Terreno +setting.animatedshields.name = Animación de Escudos setting.antialias.name = Antialias[lightgray] (necesita un reinicio)[] -setting.playerindicators.name = Indicadores de jugadores -setting.indicators.name = Indicadores de Aliados -setting.autotarget.name = Auto apuntado +setting.playerindicators.name = Indicadores de Jugadores +setting.indicators.name = Indicadores de Enemigos +setting.autotarget.name = Auto-Apuntado setting.keyboard.name = Controles de Ratón+Teclado -setting.touchscreen.name = Controles táctiles -setting.fpscap.name = Máx FPS +setting.touchscreen.name = Controles Táctiles +setting.fpscap.name = Máximos FPS setting.fpscap.none = Nada setting.fpscap.text = {0} FPS -setting.uiscale.name = Escala de UI[lightgray] (necesita reiniciar)[] -setting.swapdiagonal.name = Siempre Colocar Diagonalmente +setting.uiscale.name = Escala de Interfaz[lightgray] (necesita reiniciar)[] +setting.swapdiagonal.name = Siempre Construir Diagonalmente setting.difficulty.training = entrenamiento setting.difficulty.easy = fácil setting.difficulty.normal = normal setting.difficulty.hard = difícil setting.difficulty.insane = locura setting.difficulty.name = Dificultad: -setting.screenshake.name = Movimiento de la Pantalla -setting.effects.name = Mostrar Efectos +setting.screenshake.name = Movimiento de la pantalla +setting.effects.name = Mostrar efectos setting.destroyedblocks.name = Mostrar bloques destruidos setting.blockstatus.name = Mostrar estado de los bloques -setting.conveyorpathfinding.name = Colocación del transportador en búsqueda de caminos -setting.sensitivity.name = Sensibilidad del Control +setting.conveyorpathfinding.name = Construcción de transportadores Inteligente +setting.sensitivity.name = Sensibilidad del Mando setting.saveinterval.name = Intervalo del Autoguardado setting.seconds = {0} Segundos setting.blockselecttimeout.name = Tiempo de espera de selección de bloque setting.milliseconds = {0} milisegundos setting.fullscreen.name = Pantalla Completa setting.borderlesswindow.name = Ventana sin Bordes[lightgray] (podría requerir un reinicio) -setting.fps.name = Mostrar FPS -setting.smoothcamera.name = Cámara suave +setting.fps.name = Mostrar FPS y Ping +setting.smoothcamera.name = Movimiento de cámara suave setting.vsync.name = Vsync (Limita los fps a los Hz de tu pantalla) -setting.pixelate.name = Pixelar [lightgray](podría reducir el rendimiento) +setting.pixelate.name = Pixelar setting.minimap.name = Mostrar Minimapa setting.coreitems.name = Mostrar elementos en el nucleo (WIP) -setting.position.name = Mostrar posición del jugador. +setting.position.name = Mostrar indicadores de posición de jugadores. setting.musicvol.name = Volumen de la Música setting.atmosphere.name = Mostrar atmosfera del planeta setting.ambientvol.name = Volumen del Ambiente @@ -785,18 +784,18 @@ setting.mutemusic.name = Silenciar Musica setting.sfxvol.name = Volumen de los efectos de sonido setting.mutesound.name = Silenciar Sonido setting.crashreport.name = Enviar informes de fallos anónimos -setting.savecreate.name = Crear puntos de guardado automáticamente -setting.publichost.name = Visibilidad del juego público +setting.savecreate.name = Autoguardar la Partida +setting.publichost.name = Visibilidad de la Partida setting.playerlimit.name = Limite de Jugadores setting.chatopacity.name = Opacidad del Chat -setting.lasersopacity.name = Opacidad de los rayos láser -setting.bridgeopacity.name = Opacidad de Puentes +setting.lasersopacity.name = Opacidad del Laser de Nodos de Energía +setting.bridgeopacity.name = Opacidad de Puentes Transportadores setting.playerchat.name = Mostrar el chat de burbuja -public.confirm = ¿Quieres hacer público tu juego?\n[lightgray]Esto se puede cambiar más tarde en Configuración->Juego->Visibilidad pública del juego. -public.beta = Recuerda que en las versiones beta del juego no puedes crear partidas públicas. -uiscale.reset = La escala de la interfaz ha sido modificada con éxito.\nPulsa "OK" para conservar esta escala.\n[scarlet]Deshaciendo los cambios y saliendo al menu en [accent] {0}[]segundos... -uiscale.cancel = Cancelar & Salir -setting.bloom.name = Brillo +public.confirm = ¿Quieres hacer pública tu partida?\n[lightgray]Esto se puede cambiar más tarde en "Configuración->Juego->Visibilidad pública de la partida". +public.beta = Recuerda que no puedes crear partidas públicas en las versiones beta del juego. +uiscale.reset = La escala de la interfaz ha sido modificada.\nPulsa "OK" para conservar esta escala.\n[scarlet]Se desharán los cambios automáticamente en [accent] {0}[] segundos... +uiscale.cancel = Cancelar y Salir +setting.bloom.name = Desenfoque de movimiento keybind.title = Cambiar accesos de teclado keybinds.mobile = [scarlet]Los accesos del teclado aquí mostrados no estan disponible en Móviles o Tablets. Solo aceptan movimiento básico. category.general.name = General @@ -807,72 +806,72 @@ command.attack = Atacar command.rally = Patrullar command.retreat = Retirarse command.idle = Esperar -placement.blockselectkeys = \n[lightgray]LLaves: [{0}, +placement.blockselectkeys = \n[lightgray]Claves: [{0}, keybind.respawn.name = Reaparecer keybind.control.name = Controlar unidad keybind.clear_building.name = Eliminar construcción -keybind.press = Presiona una tecla... +keybind.press = Pulsa una tecla... keybind.press.axis = Pulsa un eje o botón... keybind.screenshot.name = Captura de pantalla de Mapa -keybind.toggle_power_lines.name = Activar láser de potencia -keybind.toggle_block_status.name = Cambiar estado de los bloques +keybind.toggle_power_lines.name = Ocultar Láser de Red Eléctrica +keybind.toggle_block_status.name = Alternar estado de los bloques keybind.move_x.name = Mover x keybind.move_y.name = Mover y -keybind.mouse_move.name = Seguír al ratón +keybind.mouse_move.name = Seguír al Cursor del Ratón -keybind.pan.name = Vista panorámica -keybind.boost.name = Impulsar +keybind.pan.name = Desplazar la cámara +keybind.boost.name = Acelerar keybind.schematic_select.name = Seleccionar región -keybind.schematic_menu.name = Menu de esquemas -keybind.schematic_flip_x.name = Girar esquemático desde X -keybind.schematic_flip_y.name = Girar esquemático desde Y +keybind.schematic_menu.name = Menu de Plantillas +keybind.schematic_flip_x.name = Invertir Plantilla desde X +keybind.schematic_flip_y.name = Invertir Plantilla desde Y keybind.category_prev.name = Categoría anterior keybind.category_next.name = Siguiente categoría -keybind.block_select_left.name = Seleccionar bloque a la izquierda -keybind.block_select_right.name = Seleccionar bloque a la derecha -keybind.block_select_up.name = Seleccionar bloque hacia arriba -keybind.block_select_down.name = Seleccionar bloque hacia abajo -keybind.block_select_01.name = Seleccionar categoría / bloque 1 -keybind.block_select_02.name = Seleccionar categoría / bloque 2 -keybind.block_select_03.name = Seleccionar categoría / bloque 3 -keybind.block_select_04.name = Seleccionar categoría / bloque 4 -keybind.block_select_05.name = Seleccionar categoría / bloque 5 -keybind.block_select_06.name = Seleccionar categoría / bloque 6 -keybind.block_select_07.name = Seleccionar categoría / bloque 7 -keybind.block_select_08.name = Seleccionar categoría / bloque 8 -keybind.block_select_09.name = Seleccionar categoría / bloque 9 -keybind.block_select_10.name = Seleccionar categoría / bloque 10 -keybind.fullscreen.name = Intercambiar con Pantalla Completa +keybind.block_select_left.name = Seleccionar bloque - Izquierda +keybind.block_select_right.name = Seleccionar bloque - Derecha +keybind.block_select_up.name = Seleccionar bloque - Arriba +keybind.block_select_down.name = Seleccionar bloque - Abajo +keybind.block_select_01.name = Seleccionar Categoría/Bloque 1 +keybind.block_select_02.name = Seleccionar Categoría/Bloque 2 +keybind.block_select_03.name = Seleccionar Categoría/Bloque 3 +keybind.block_select_04.name = Seleccionar Categoría/Bloque 4 +keybind.block_select_05.name = Seleccionar Categoría/Bloque 5 +keybind.block_select_06.name = Seleccionar Categoría/Bloque 6 +keybind.block_select_07.name = Seleccionar Categoría/Bloque 7 +keybind.block_select_08.name = Seleccionar Categoría/Bloque 8 +keybind.block_select_09.name = Seleccionar Categoría/Bloque 9 +keybind.block_select_10.name = Seleccionar Categoría/Bloque 10 +keybind.fullscreen.name = Cambiar a Pantalla Completa keybind.select.name = Seleccionar keybind.diagonal_placement.name = Construcción Diagonal keybind.pick.name = Elegir bloque keybind.break_block.name = Destruir Bloque keybind.deselect.name = Deseleccionar -keybind.pickupCargo.name = Pickup Cargo -keybind.dropCargo.name = Drop Cargo -keybind.command.name = Command +keybind.pickupCargo.name = Recoger carga +keybind.dropCargo.name = Soltar carga +keybind.command.name = Ordenar keybind.shoot.name = Disparar keybind.zoom.name = Zoom keybind.menu.name = Menú keybind.pause.name = Pausa -keybind.pause_building.name = Pausar/Resumir construcción +keybind.pause_building.name = Pausar/Reanudar construcción keybind.minimap.name = Minimapa keybind.chat.name = Chat keybind.player_list.name = Lista de jugadores keybind.console.name = Consola keybind.rotate.name = Rotar keybind.rotateplaced.name = Rotar existente (mantener) -keybind.toggle_menus.name = Alternar menús -keybind.chat_history_prev.name = Historial de chat anterior -keybind.chat_history_next.name = Historial de chat siguiente -keybind.chat_scroll.name = Desplazamiento de chat -keybind.drop_unit.name = Caida de la unidad +keybind.toggle_menus.name = Ocultar menús +keybind.chat_history_prev.name = Historial de chat - Anterior +keybind.chat_history_next.name = Historial de chat - Siguiente +keybind.chat_scroll.name = Desplazar el chat +keybind.drop_unit.name = Soltar unidad keybind.zoom_minimap.name = Zoom del minimapa mode.help.title = Descripción de modos mode.survival.name = Supervivencia mode.survival.description = El modo normal. Recursos limitados y oleadas automáticas. -mode.sandbox.name = Arenero +mode.sandbox.name = Modo Libre mode.sandbox.description = Recursos ilimitados y sin temporizador para las oleadas. mode.editor.name = Editor mode.pvp.name = JcJ @@ -881,14 +880,14 @@ mode.attack.name = Ataque mode.attack.description = No hay oleadas, el objetivo es destruir la base enemiga. mode.custom = Normas personalizadas -rules.infiniteresources = Recursos Infinitos -rules.reactorexplosions = Reactor Explosions -rules.schematic = Schematics Allowed -rules.wavetimer = Temportzador de Oleadas +rules.infiniteresources = Recursos infinitos +rules.reactorexplosions = Los reactores pueden explotar +rules.schematic = Permitir Plantillas +rules.wavetimer = Temporizador de Oleadas rules.waves = Oleadas -rules.attack = Modo de Ataque -rules.buildai = Construccion de la IA -rules.enemyCheat = Recursos infinitos de la IA +rules.attack = Ataque +rules.buildai = La IA enemiga puede construir +rules.enemyCheat = La IA enemiga tiene recursos infinitos rules.blockhealthmultiplier = Multiplicador de salud de bloque rules.blockdamagemultiplier = Multiplicador de daño de bloque rules.unitbuildspeedmultiplier = Multiplicador de velocidad de creación de unidades @@ -898,7 +897,7 @@ rules.enemycorebuildradius = Radio de No-Construcción del Núcleo Enemigo:[ligh rules.wavespacing = Tiempo entre oleadas:[lightgray] (seg) 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.deconstructrefundmultiplier = Multiplicador de devolución de desconstrucción rules.waitForWaveToEnd = Las oleadas esperan a los enemigos rules.dropzoneradius = Radio de zona de caída:[lightgray] (casillas) rules.unitammo = Las unidades necesitan munición @@ -943,7 +942,7 @@ item.scrap.name = Chatarra liquid.water.name = Agua liquid.slag.name = Fundido liquid.oil.name = Petróleo -liquid.cryofluid.name = Criogénico +liquid.cryofluid.name = Líquido criogénico unit.dagger.name = Daga @@ -985,10 +984,10 @@ block.resupply-point.name = Punto de reabastecimiento block.parallax.name = Paralaje block.cliff.name = Acantilado -block.sand-boulder.name = Piedra de Arena +block.sand-boulder.name = Piedra de arena block.grass.name = Hierba block.slag.name = Escoria -block.space.name = Space +block.space.name = Espacio block.salt.name = Sal block.salt-wall.name = Muro de sal @@ -1002,17 +1001,17 @@ block.snow-boulder.name = Roca de nieve block.snow-pine.name = Pino de nieve block.shale.name = Pizarra -block.shale-boulder.name = Piedra de Pizarra +block.shale-boulder.name = Piedra de pizarra block.moss.name = Musgo block.shrubs.name = Arbustos block.spore-moss.name = Musgo de esporas block.shale-wall.name = Muro de pizarra -block.scrap-wall.name = Muro de Chatarra -block.scrap-wall-large.name = Muro de Chatarra grande -block.scrap-wall-huge.name = Muro de Chatarra muy grande -block.scrap-wall-gigantic.name = Muro de Chatarra gigante +block.scrap-wall.name = Muro de chatarra +block.scrap-wall-large.name = Muro de chatarra grande +block.scrap-wall-huge.name = Muro de chatarra muy grande +block.scrap-wall-gigantic.name = Muro de chatarra gigante block.thruster.name = Propulsor block.kiln.name = Horno block.graphite-press.name = Prensa de grafito @@ -1024,26 +1023,26 @@ block.core-foundation.name = Núcleo: Fundación block.core-nucleus.name = Núcleo: Núcleo block.deepwater.name = Aguas profundas block.water.name = Agua -block.tainted-water.name = Agua Contaminada -block.darksand-tainted-water.name = Agua Contaminada con Arena Oscura +block.tainted-water.name = Agua contaminada +block.darksand-tainted-water.name = Agua contaminada con arena oscura block.tar.name = Alquitrán block.stone.name = Piedra block.sand.name = Arena -block.darksand.name = Arena Oscura +block.darksand.name = Arena oscura block.ice.name = Hielo block.snow.name = Nieve block.craters.name = Cráteres -block.sand-water.name = Agua con Arena -block.darksand-water.name = Agua con Arena Oscura +block.sand-water.name = Agua con arena +block.darksand-water.name = Agua con arena oscura block.char.name = Carbonizado block.dacite.name = Dacita -block.dacite-wall.name = Pared de Dacita -block.dacite-boulder.name = Dacite Boulder -block.ice-snow.name = Hielo Nieve +block.dacite-wall.name = Pared de dacita +block.dacite-boulder.name = Roca de dacita +block.ice-snow.name = Hielo-Nieve block.stone-wall.name = Pared de piedra block.ice-wall.name = Pared de hielo block.snow-wall.name = Pared de nieve -block.dune-wall.name = Pared de duna +block.dune-wall.name = Pared de arena block.pine.name = Pino block.dirt.name = Tierra block.dirt-wall.name = Pared de tierra @@ -1095,7 +1094,7 @@ block.sorter.name = Clasificador block.inverted-sorter.name = Clasificador Invertido block.message.name = Mensaje block.illuminator.name = Iluminador -block.illuminator.description = Una fuente de luz pequeña, compacta y configurable. Requiere poder para funcionar. +block.illuminator.description = Una fuente de luz compacta y configurable. Requiere poder para funcionar. block.overflow-gate.name = Compuerta de Desborde block.underflow-gate.name = Compuerta de Subdesbordamiento block.silicon-smelter.name = Horno para Silicio @@ -1145,7 +1144,7 @@ block.blast-mixer.name = Mezclador de Explosivos block.solar-panel.name = Panel Solar block.solar-panel-large.name = Panel Solar Grande block.oil-extractor.name = Extractor de Petróleo -block.repair-point.name = Punto de Reparación +block.repair-point.name = Punto de Reparación de Unidades block.pulse-conduit.name = Conducto de Pulso block.plated-conduit.name = Conducto Chapado block.phase-conduit.name = Conducto de Fase @@ -1167,12 +1166,12 @@ block.surge-wall-large.name = Muro de Sobretensión grande block.cyclone.name = Ciclón block.fuse.name = Fusible block.shock-mine.name = Mina electrizante -block.overdrive-projector.name = Proyector de sobremarcha -block.force-projector.name = Proyector de fuerza +block.overdrive-projector.name = Proyector de Aceleración +block.force-projector.name = Proyector de Escudo block.arc.name = Arco block.rtg-generator.name = Generador RTG block.spectre.name = Espectro -block.meltdown.name = Fusión de Reactor +block.meltdown.name = Fusión block.foreshadow.name = Foreshadow block.container.name = Contenedor block.launch-pad.name = Pad de Lanzamiento @@ -1189,74 +1188,74 @@ block.multiplicative-reconstructor.name = Reconstructor multiplicativo block.exponential-reconstructor.name = Reconstructor exponencial block.tetrative-reconstructor.name = Reconstructor tetrativo -block.payload-conveyor.name = Transportador masivo -block.payload-router.name = Enrutador de carga útil +block.payload-conveyor.name = Transportador de carga +block.payload-router.name = Enrutador de carga block.disassembler.name = Desensamblador block.silicon-crucible.name = Crisol de silicio -block.overdrive-dome.name = Cupula de sobremarcha +block.overdrive-dome.name = Campo de Aceleración block.switch.name = Interruptor block.micro-processor.name = Micro Processador block.logic-processor.name = Procesador lógico block.hyper-processor.name = Hiperprocesador block.logic-display.name = Pantalla lógica -block.large-logic-display.name = Gran pantalla lógica -block.memory-cell.name = Celda de memoria -block.memory-bank.name = Banco de memoria +block.large-logic-display.name = Pantalla lógica grande +block.memory-cell.name = Unidad de memoria +block.memory-bank.name = Disco de memoria team.blue.name = Azul -team.crux.name = rojo -team.sharded.name = naranja +team.crux.name = Rojo +team.sharded.name = Naranja team.orange.name = Naranja -team.derelict.name = derelicto +team.derelict.name = Abandonado team.green.name = Verde -team.purple.name = Púrpura +team.purple.name = Morado tutorial.next = [lightgray] -tutorial.intro = Has entrado en el[scarlet]Tutorial de Mindustry.[]\nComienza[accent]minando cobre[]. Toca en una veta de cobre cercana al núcleo para hacer esto.\n\n[accent]{0}/{1} cobre -tutorial.intro.mobile = Has entrado en el[scarlet] Tutorial de Mindustry.[]\nArrastra la pantalla para moverte.\n[accent]Pellizca con 2 dedos [] para alejar y acercar la vista.\nComienza por[accent] minar cobre[]. Muevete cerca de el, luego toca una veta de mineral de cobre cerca de su núcleo para hacer esto.\n\n[accent]{0}/{1} cobre -tutorial.drill = Minar manualmente es ineficiente.\nLos [accent]taladros pueden minar automáticamente.\nColoca uno en una veta de cobre. -tutorial.drill.mobile = Minar manualmente no es muy eficiente.\nLos [accent]Taladros[] pueden minar automáticamente.\nToca la sección de taladros el la esquina de abajo a la derecha.\nSelecciona el[accent]taladro mecánico[].\nColócalo en una veta de cobre tocándola, después pulsa el [accent]botón de confirmación de debajo para confirmar tu selección.\nPulsa el[accent]botón "X" para cancelar la construcción. -tutorial.blockinfo = Cada bloque tiene diferentes estadísticas. Cada taladro solo puede minar ciertos minerales.\nPara comprobar la información y estadísticas de un bloque,[accent] toca el botón "?" mientras lo tienes seleccionado en el menú de construcción.[]\n\n[accent]Accede a las estadísticas del Taladro Mecánico ahora.[] -tutorial.conveyor = Las [accent]Cintas Transportadoras[] se usan para transportar recursos al núcleo.\nConstruye una línea de transportadores del taladro al núcleo. -tutorial.conveyor.mobile = Las [accent]Cintas Transportadoras[] se usan para transportar recursos al núcleo.\nConstruye una línea de transportadores del taladro al núcleo.\n[accent] Construye una línea manteniendo el dedo unos segundos[] y arrastrando hacia una dirección.\n\n[accet]{0}/{1} cintas colocadas en línea\n[ccent]]0/1 recursos transportados. -tutorial.turret = Debes construir estructuras defensivas para repeler al [lightgray]enemigo[].\nConstruye una torreta dúo cerca de tu base. -tutorial.drillturret = Los dúos requieren[accent] munición de cobre[]para disparar.\nColoca un taladro junto a la torre para darle cobre. \nTambien puedes hacer una línea de transportadores desde el taladro hasta el dúo. -tutorial.pause = Durante la batalla, puedes[accent]pausar el juego.[]\nPuedes dejar estructuras en cola mientras pausas.\n\n[accent]Pulsa Espacio para pausar. -tutorial.pause.mobile = Durante la batalla, puedes[accent] pausar el juego.[]\nPuedes dejar estructuras en cola mientras pausas.\n\n[accent]Pulsa este boton de arriba a la izquierda para pausar. -tutorial.unpause = Ahora toca Espacio otra vez para dejar de pausar. -tutorial.unpause.mobile = Ahora tócalo otra vez para dejar de pausar. -tutorial.breaking = Muchas veces hace falta destruir bloques.\n[accent]Mantén el botón derecho[] para destruir todos los bloques en una selección.[]\n\n[accent]Destruye todos los bloques de chatarra de la izquierda de tu núcleo usando selección de área. -tutorial.breaking.mobile = Muchas veces hace falta destruir bloques.\n[accent]Selecciona el modo de desonstrucción[], después toca un bloque para comenzar a romperlo.\nDestruye un área manteniendo tu dedo algunos segundos[] y arrastrando hacia una dirección.\nUsa el botón de confirmación para confirmar la destrucción.\n\n[accent]Destruye todos los bloques de chatarra de la izquierda de tu núcleo usando la selección de área.[] -tutorial.withdraw = En algunas situaciones, es necesario coger recursos directamente de bloques.\nPara hacer esto, [accent]toca un bloque[] con recursos en él, después [accent]toca el recurso[] en el inventario.\nSe pueden sacar múltiples recursos [accent]tocando y manteniendo[].\n\n[accent]Saca algo de cobre del núcleo.[] -tutorial.deposit = Deposita recursos en bloques arrastrándolos de tu nave al bloque de destino.\n\n[accent]Deposita tu cobre otra vez al núcleo.[] +tutorial.intro = Has entrado en el[scarlet]Tutorial de Mindustry.[]\nComienza[accent]minando cobre[]. Para ello, toca en una veta de cobre cercana al núcleo.\n\n[accent]{0}/{1} cobre +tutorial.intro.mobile = Has entrado en el[scarlet] Tutorial []de Mindustry.\nArrastra la pantalla para moverte.\n[accent]Pellizca con 2 dedos [] para alejar y acercar la vista.\nComienza por[accent] minar cobre[]. Para ello, aproxímate a una veta de mineral de cobre cercana al núcleo y tócala.\n\n[accent]{0}/{1} cobre +tutorial.drill = Minar manualmente es ineficiente.\nLos [accent]taladros []pueden minar automáticamente.\nColoca uno sobre una veta de cobre. +tutorial.drill.mobile = Minar manualmente no es muy eficiente.\nLos [accent]taladros []pueden minar automáticamente.\nToca la sección de taladros en la esquina inferior derecha.\nSelecciona el [accent]taladro mecánico[].\nColócalo en una veta de cobre tocándola, después pulsa el [accent]botón de confirmación[] de debajo para confirmar tu selección.\nTambién puedes pulsar el [accent]botón "X" []para cancelar la construcción. +tutorial.blockinfo = Cada bloque tiene diferentes estadísticas. Cada taladro solo puede minar ciertos minerales.\nPara comprobar la información y estadísticas de un bloque, toca el botón [accent]"?"[] mientras lo tienes seleccionado en el menú de construcción.\n\nPrueba a acceder a las [accent]estadísticas[] del Taladro Mecánico. +tutorial.conveyor = Las [accent]Cintas Transportadoras[] se usan para transportar recursos.\nConstruye una línea de transportadores del taladro al núcleo. +tutorial.conveyor.mobile = Las [accent]Cintas Transportadoras[] se usan para transportar recursos.\nConstruye una línea de transportadores del taladro al núcleo.\n[accent] Puedes construir una línea manteniendo el dedo unos segundos y arrastrando hacia una dirección.[]\n\n[accet]{0}/{1} cintas colocadas en línea\n[ccent]]0/1 recursos transportados. +tutorial.turret = Debes construir estructuras defensivas para repeler al [lightgray]enemigo[].\nConstruye una torreta "dúo" cerca de tu base. +tutorial.drillturret = Los dúos requieren[accent] munición de cobre[] para disparar.\nColoca un taladro junto a la torre para suministrarle cobre. \nTambien puedes hacer una línea de transportadores desde el taladro hasta el dúo. +tutorial.pause = Durante la batalla, puedes [accent]pausar el juego.[]\nPuedes dejar estructuras en cola mientras está pausado.\n\n[accent]Pulsa Espacio para pausar. +tutorial.pause.mobile = Durante la batalla, puedes[accent] pausar el juego.[]\nPuedes dejar estructuras en cola mientras está pausado.\n\n[accent]Pulsa este boton de arriba a la izquierda para pausar.[] +tutorial.unpause = Ahora pulsa Espacio otra vez para reanudar. +tutorial.unpause.mobile = Ahora púlsalo otra vez para reanudar. +tutorial.breaking = En muchas ocasiones, será necesario destruir bloques.\n[accent]Mantén el botón derecho[] para deconstruir todos los bloques en una selección.[]\n\n[accent]Deconstruye todos los bloques de chatarra de la izquierda de tu núcleo usando selección de área. +tutorial.breaking.mobile = En muchas ocasiones, será necesario destruir bloques.\n[accent]Selecciona el modo de desonstrucción[], después toca un bloque para comenzar a deconstruirlo.\nDestruye un área manteniendo tu dedo algunos segundos[] y arrastrando hacia una dirección.\nUsa el botón de confirmación para confirmar la destrucción.\n\n[accent]Destruye todos los bloques de chatarra de la izquierda de tu núcleo usando la selección de área.[] +tutorial.withdraw =A veces, es necesario coger recursos directamente de bloques.\nPara hacer esto, [accent]toca un bloque[] con recursos en él, después [accent]toca el recurso[] en el inventario.\nSe pueden sacar múltiples recursos [accent]tocando y manteniendo[].\n\n[accent]Saca algo de cobre del núcleo.[] +tutorial.deposit = Deposita recursos en bloques arrastrándolos de tu nave al bloque de destino.\n\n[accent]Deposita tu cobre otra vez en el núcleo.[] tutorial.waves = El[lightgray] enemigo[] se acerca.\n\nDefiende tu núcleo por 2 oleadas. Construye más torretas y taladros. Mina más cobre. -tutorial.waves.mobile = El[lightgray] enemigo[] se acerca.\n\nDefiende tu núcleo por 2 oleadas. Tu nave disparará automáticamente a los enemigos.\nConstruye más torretas y taladros. Mina más cobre. +tutorial.waves.mobile = El[lightgray] enemigo[] se acerca.\n\nDefiende tu núcleo por 2 oleadas. Tu nave puede disparar automáticamente a los enemigos.\nConstruye más torretas y taladros. Mina más cobre. tutorial.launch = Una vez llegues a cierta oleada, podrás[accent]lanzar el núcleo[], dejando atrás tus defensas y los recursos en tu núcleo.[]\nEstos recursos pueden ser usados para investigar nueva tecnología.\n\n[accent]Pulsa el botón de lanzamiento. item.copper.description = Un útil material de estructura. Usado extensivamente en todo tipo de bloques. -item.lead.description = Un material básico. Usado extensivamente en electrónicos y bloques de transferencia de líquidos. +item.lead.description = Un material básico. Usado en electrónicos y bloques de transferencia de líquidos. item.metaglass.description = Un compuesto muy duro de cristal. Usado extensivamente para almacenamiento y distribución de líquidos. -item.graphite.description = Carbón mineralizado, usasdo para munición y aislamiento eléctrico. -item.sand.description = Un material común que es usado extensivamente en la fundición, para aleaciones y como fundente. +item.graphite.description = Carbón mineralizado, usado para munición y aislamiento eléctrico. +item.sand.description = Un material común que es usado sobre todo en la fundición, o para aleaciones. item.coal.description = Un combustible común y preparado para ser quemado. -item.titanium.description = Un metal raro muy ligero usado extensivamente en transportación de liquidos, taladros y aeronaves. -item.thorium.description = Un metal radiactivo, muy denso y usado en soporte de estructuras y combustible nuclear. +item.titanium.description = Un metal raro usado extensivamente en transporte de liquidos, taladros y aeronaves. +item.thorium.description = Un metal radioactivo, muy denso y usado en soporte de estructuras y combustible nuclear. item.scrap.description = Restos de estructuras y unidades antiguas. Contiene pequeñas cantidades de muchos metales diferentes. item.silicon.description = Un semiconductor muy útil, se usa para paneles solares y muchos electrónicos complejos. item.plastanium.description = Un material dúctil y ligero usado en aeronaves y proyectiles de fragmentación. -item.phase-fabric.description = Una sustancia casi sin peso usada en electrónica avanzada y en tecnología autoreparadora. +item.phase-fabric.description = Una sustancia muy ligera usada en electrónica avanzada y en tecnología autoreparadora. item.surge-alloy.description = Una aleación avanzada con propiedades eléctricas únicas. item.spore-pod.description = Utilizado para ser convertido en petróleo, explosivos y combustible. -item.blast-compound.description = Un compuesto volátil usado en bombas y explosivos. Aunque se puede quemar como combustible, esto no es recomendable. -item.pyratite.description = Una sustancia extremadamente inflamable usada en armas incendiarias. +item.blast-compound.description = Un compuesto volátil usado en bombas y explosivos. Se puede quemar como combustible, pero no es recomendable. +item.pyratite.description = Un compuesto extremadamente inflamable usada en armas incendiarias. liquid.water.description = Usada comúnmente para enfriar máquinas y para procesar residuos. liquid.slag.description = Diferentes tipos de metales fundidos mezclados. Puede ser separado en sus minerales constituyentes, o expulsado a unidades enemigas como arma. -liquid.oil.description = Puede ser quemado, explotado o como un enfriador. -liquid.cryofluid.description = El líquido más eficiente pra enfriar las cosas. +liquid.oil.description = Puede ser quemado, explotado o usado como un enfriador. +liquid.cryofluid.description = El líquido más eficiente para enfriar cosas. block.message.description = Almacena un mensaje. Puedes usarlo para comunicarte con aliados o dejar recordatorios. block.graphite-press.description = Comprime carbón en piezas de grafito puro. @@ -1275,12 +1274,12 @@ block.spore-press.description = Comprime esporas en petróleo. block.pulverizer.description = Despedaza la piedra en arena. Útil cuando no hay arena natural. block.coal-centrifuge.description = Solidifica petróleo en piezas de carbón. block.incinerator.description = Se deshace de cualquier líquido o material producido en exceso. -block.power-void.description = Elimina toda la energía que se le da. Solo en disponible en el modo Sandbox. -block.power-source.description = Da energía infinita. Solo disponible en el modo Sandbox. -block.item-source.description = Hace aparecer minerales de forma infinita. Solo disponible en el modo Sandbox. -block.item-void.description = Destruye cuanquier objeto que entra en él. Solo disponible en el modo Sandbox. -block.liquid-source.description = Da líquido infinito. Solo disponible en el modo Sandbox. -block.liquid-void.description = Elimina cualquier liquido que entra en él. Solo disponible en el modo Sandbox. +block.power-void.description = Elimina toda la energía que se le da. Solo en disponible en el modo Libre. +block.power-source.description = Da energía infinita. Solo disponible en el modo Libre. +block.item-source.description = Hace aparecer minerales de forma infinita. Solo disponible en el modo Libre. +block.item-void.description = Destruye cuanquier objeto que entra en él. Solo disponible en el modo Libre. +block.liquid-source.description = Da líquido infinito. Solo disponible en el modo Libre. +block.liquid-void.description = Elimina cualquier liquido que entra en él. Solo disponible en el modo Libre. block.copper-wall.description = Un bloque defensivo barato.\nÚtil para defender el núcleo y las torres en las primeras oleadas. block.copper-wall-large.description = Un bloque defensivo barato.\nÚtil para defender el núcleo y las torres en las primeras oleadas.\nOcupa múltiples casillas. block.titanium-wall.description = Un bloque defensivo moderadamente fuerte.\nProporciona protección moderada contra los enemigos. @@ -1302,7 +1301,7 @@ block.force-projector.description = Crea un área de fuerza hexagonal alrededor block.shock-mine.description = Daña enemigos que pisan a mina. Casi invisible al enemigo. block.conveyor.description = Bloque de transporte básico. Mueve objetos hacia adelante y los deposita automáticamente en torres o fábricas. Rotable. block.titanium-conveyor.description = Bloque de transporte avanzado. Mueve objetos más rápido que los transportadores estándar. -block.plastanium-conveyor.description = Mueve ítems por lotes.\nAcepta ítems por detrás, y los descarga en tres direcciones hacia el frente, como un enrutador. +block.plastanium-conveyor.description = Mueve objetos por lotes.\nAcepta objetos por detrás, y los descarga en tres direcciones hacia el frente, como un enrutador. block.junction.description = Actúa como puente para dos transportadores que se cruzan. Útil en situaciones con dos diferentes transportadores transportando diferentes materiales a diferentes lugares. block.bridge-conveyor.description = Bloque avanzado de transporte. Puede transportar objetos por encima hasta 3 casillas de cualquier terreno o construcción. block.phase-conveyor.description = Bloque de transporte avanzado. Usa energía para transportar objetos a otro transportador de fase conectado a través de varias casillas. @@ -1314,58 +1313,58 @@ block.overflow-gate.description = Un enrutador que solo saca por la izquierda y block.underflow-gate.description = El opuesto de la compuerda de desborde. Solo dispensa hacia el frente si los lados están bloqueados. block.mass-driver.description = El mejor bloque de transorte. Recoge varios objetos y los dispara a otro conductor de masa en un largo rango. Requiere energía para operar. block.mechanical-pump.description = Una bomba de agua barata algo lenta, pero funciona sin energía. -block.rotary-pump.description = Una bomba de agua algo mas avanzada. Bombea más líquido, pero requiere energía. -block.thermal-pump.description = La mejor bomba. Utiliza energía. +block.rotary-pump.description = Una bomba algo mas avanzada. Bombea más líquido, pero requiere energía. +block.thermal-pump.description = La mejor bomba de líquidos. Utiliza energía. block.conduit.description = Bloque de transporte de líquidos básico. Funciona como un transportador, pero con líquidos. Usado con bombas, extractores u otros conductos. block.pulse-conduit.description = Bloque de transporte de líquidos avanzado. Transporta líquidos más rápidamente y almacena más que los conductos estándar. block.plated-conduit.description = Mueve líquidos a la misma velocidad que los conductos de pulso, pero posee más armadura. No acepta líquidos de los lados por otra cosa que no sean conductos.\nGotea menos. block.liquid-router.description = Acepta líquidos de una dirección y los deja en hasta 3 direcciones equitativamente. También puede almacenar cierta capacidad de líquido. Útil para dividir los líquidos de una fuente a varios objetivos. block.liquid-tank.description = Almacena una gran cantidad de líquidos. Úsalo para crear almacenes cuando no hay una demanda constante de materiales o para asegurarse de enfriar bloques vitales. block.liquid-junction.description = Actúa como un puente para dos condusctos que se cruzan. Útil en situaciones en las que hay dos conductos con líquidos diferentes a diferentes lugares. -block.bridge-conduit.description = Bloque avanzado de transporte de líquidos. Permite transportar líquidos por encima hasta 3 casillas de cualquier terreno o construcción. -block.phase-conduit.description = Bloque de transporte de líquidos avanzado. Usa energía para transportar líquidos a otro conducto de fase conectado por varias casillas. -block.power-node.description = Transmite energía a nodos conectados, conecta hasta cuatro fuentes de energía, edificios que usan energía o nodos. El nodo obtendrá o transmitirá energía de cualquier bloque adyacente. -block.power-node-large.description = Tiene un radio más amplio que el nodo de energía y conecta hasta seis fuentes de energía, edificios que usan energía o nodos. -block.surge-tower.description = Un nodo con un gran alcance con menos conexiones disponibles. +block.bridge-conduit.description = Bloque avanzado de transporte de líquidos. Permite transportar líquidos por encima de hasta 3 casillas de cualquier terreno o construcción. +block.phase-conduit.description = Bloque de transporte de líquidos avanzado. Usa energía para transportar líquidos a otro conducto de fase conectado a través de varias casillas. +block.power-node.description = Transmite energía a nodos conectados, conecta hasta diez fuentes de energía, edificios que usan energía o nodos. El nodo obtendrá o transmitirá energía de cualquier bloque adyacente. +block.power-node-large.description = Tiene un radio más amplio que el nodo de energía y conecta hasta diez fuentes de energía, edificios que usan energía o nodos. +block.surge-tower.description = Un nodo con un gran alcance, pero sólo dos conexiones disponibles. block.diode.description = La energía de la batería puede fluir a través de este bloque en una sola dirección, pero solo si el otro lado tiene menos energía almacenada. block.battery.description = Guarda energía cuando hay abundancia y proporciona energía cuando hay escasez de energía mientras la batería tenga energía. block.battery-large.description = Almacena mucha más energía que una batería normal. -block.combustion-generator.description = Genera energía quemando aceite o materiales inflamables. +block.combustion-generator.description = Genera energía quemando materiales inflamables o petróleo. block.thermal-generator.description = Genera una gran cantidad de energía con la lava. block.steam-generator.description = Más eficiente que un generador de combustión, pero requiere agua adicional. -block.differential-generator.description = Genera grandes cantidades de energía. Utiliza la diferencia de temperatura entre el fluído criogenico y la quema de piratita. +block.differential-generator.description = Genera grandes cantidades de energía. Utiliza la diferencia de temperatura entre el fluído criogenico y la quema de pirotita. block.rtg-generator.description = Un generador radioisótropo termoeléctrico que no necesita enfriamiento, pero proporciona menos energía que un reactor de torio. -block.solar-panel.description = Proporciona una pequeña cantidad de energía procedente del sol. -block.solar-panel-large.description = Genera un mucho mejor suministro de energía que un panel solar estándar, pero también es mucho más caro de construir. +block.solar-panel.description = Proporciona una pequeña cantidad de energía. +block.solar-panel-large.description = Genera un mayor suministro de energía que un panel solar estándar, pero también es mucho más caro de construir. block.thorium-reactor.description = Genera grandes cantidades de energía del torio altamente radioactivo. Necesita enfriamiento constante. Explotará violentamente si no se le aporta suficiente enfriamiento. block.impact-reactor.description = Un generador avanzado, capaz de crear cantidades masivas de energía a máxima eficiencia. Requiere una cantidad significante de energía para impulsar el comienzo del proceso. block.mechanical-drill.description = Un taladro barato. Cuando es colocado en casillas apropiadas, extrae objetos lentamente de forma indefinida. Solo es capaz de minar recursos básicos. block.pneumatic-drill.description = Un taladro mejorado, es capaz de minar titanio. Más rápido que un taladro mécanico. -block.laser-drill.description = Permite obtener minerales incluso más rápido con la tecnología láser, pero requiere energía. Además, se puede obtener torio radioactivo con este taladro. +block.laser-drill.description = Su tecnología láser le permite obtener minerales incluso más rápido, pero requiere energía. Además, se puede obtener torio radioactivo con este taladro. block.blast-drill.description = El mejor taladro. Requiere grandes cantidades de energía y refrigeración. block.water-extractor.description = Extrae agua de la tierra. Úsalo cuando no haya lagos cercanos. block.cultivator.description = Cultiva concentraciones de esporas en la atmosfera a vainas. block.oil-extractor.description = Usa grandes cantidades de energía, arena y agua para obtener petróleo. Úsalo cuando no hay fuentes directas de petróleo cerca. block.core-shard.description = La primera iteración de la cápsula del núcleo. Una vez destruido, todo el contacto con la región es perdido. No permitas que esto ocurra. block.core-foundation.description = La segunda versión del núcleo. Mejor blindado. Almacena más recursos. -block.core-nucleus.description = La tercera y última iteración de la cápsula del núcleo. Muy bien blindado. Almacena cantidades masivas dde recursos. -block.vault.description = Almacena una gran cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [lightgray] unloader[] puede usarse para obtener objetos del almacén. -block.container.description = Almacena una pequeña cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [lightgray] unloader[] puede usarse para obtener objetos del contenedor. +block.core-nucleus.description = La tercera y última iteración de la cápsula del núcleo. Muy bien blindado. Almacena cantidades masivas de recursos. +block.vault.description = Almacena una gran cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [lightgray] descargador[] puede usarse para obtener los objetos almacenados. +block.container.description = Almacena una pequeña cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [lightgray] descargador[] puede usarse para obtener objetos del contenedor. block.unloader.description = Descarga objetos de un contenedor, almacén o el núcleo a un transportador o directamente a un bloque adyacente. El tipo de objeto descargado puede ser cambiado tocando el descagador. block.launch-pad.description = Lanza paquetes de recursos sin necesitar lanzar con el núcleo. -block.launch-pad-large.description = Una versión mejorada del pad de lanzamiento. Almacena más recursos y los lanza más frecuentemente. +block.launch-pad-large.description = Una versión mejorada del pad de lanzamiento. Almacena más recursos y los lanza con mayor frecuencia. block.duo.description = Una torre pequeña y barata. Útil contra enemigos terrestres no demasiado fuertes. -block.scatter.description = Una torreta antiaérea de tamaño medio. Dispara fuego anti-aéreo de plomo o chatarra a las unidades enemigas. +block.scatter.description = Una torreta antiaérea de tamaño medio. Dispara proyectiles de plomo o chatarra a las unidades enemigas. block.scorch.description = Quema a cualquier enemigo terrestre cercano a él. Altamente efectivo a corto alcance. block.hail.description = Una torre de artillería pequeña de largo alcance. block.wave.description = Una torre de tamaño mediano. Dispara chorros de líquido a enemigos. Apaga el fuego en su rango de acción si recibe agua. block.lancer.description = Una torre láser anti-terrestre de tamaño mediano. Dispara y carga poderosos rayos de energía. block.arc.description = Una pequeña torre eléctrica de rango corto. Dispara arcos de electricidad a los enemigos. block.swarmer.description = Una torre de tamaño mediano que dispara misiles. Ataca a aire y tierra. Dispara misiles teledirigidos. -block.salvo.description = Una versión más grande y avanzada dela torre dúo. Dispara salvas rápidas al enemigo +block.salvo.description = Una versión más grande y avanzada de la torre dúo. Dispara ráfagas a enemigos terrestres y aéreos. block.fuse.description = Una torre grande de energía de corto alcance. Dispara tres rayos perforantes a enemigos cercanos. -block.ripple.description = Una extramadamente poderosa torre. Dispara conjuntos de balas a los enemigos en grandes distancias. -block.cyclone.description = Una torre grande anti-aérea y anti-terrestre. Dispara conjuntos explosivos de Flak a enemigos cercanos. +block.ripple.description = Una torre extramadamente poderosa. Dispara conjuntos de balas a los enemigos desde grandes distancias. +block.cyclone.description = Una torre grande anti-aérea y anti-terrestre. Dispara conjuntos fragmentados explosivos a enemigos cercanos. block.spectre.description = Un cañon masivo de dos barriles. Dispara balas perforantes a objetivos de aire y tierra. block.meltdown.description = Un cañon láser masivo. Carga y dispara un rayo láser constante a enemigos cercanos. Requiere enfriamiento para operar. block.repair-point.description = Repara la unidad dañada más cercana a su alrededor. From 31d401340ce219857aa846d4f24a561ede0b1adc Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Thu, 19 Nov 2020 14:57:16 +0100 Subject: [PATCH 006/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 94702f042b..6ca86cda4c 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -386,7 +386,7 @@ editor.savemap = Guardar Mapa editor.saved = ¡Guardado! editor.save.noname = ¡Tu mapa no tiene un nombre! Pon uno en el menú 'Info del Mapa'. editor.save.overwrite = ¡Tu mapa sobrescribe uno ya incorporado! Elige un nombre diferente en el menú 'Info del Mapa'. -editor.import.exists = [scarlet]¡No se ha podido importar:[] ya existe un mapa incorporado con el nombre '{0}'. +editor.import.exists = [scarlet]¡No se ha podido importar:[] ya existe un mapa incorporado con el nombre '{0}'! editor.import = Importar... editor.importmap = Importar Mapa editor.importmap.description = Importar un mapa ya existente From ef2ff385b866846e24cf01b373dd3c83f122fe6a Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Thu, 19 Nov 2020 19:21:40 +0100 Subject: [PATCH 007/123] =?UTF-8?q?A=C3=B1adido=20el=20"cada"=20de=20nuevo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sabía que se me olvidaba algo, pero no tuve tiempo de revisarlo. --- core/assets/bundles/bundle_es.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 6ca86cda4c..9523f30677 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -342,7 +342,7 @@ workshop = Steam Workshop waves.title = Oleadas waves.remove = Borrar waves.never = -waves.every = +waves.every = cada waves.waves = oleada(s) waves.perspawn = por lugar de aparición waves.shields = escudo/oleadas From c014f86f2baec9f3e2a65d044d9a8a1bcab4597a Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Fri, 20 Nov 2020 17:39:52 +0100 Subject: [PATCH 008/123] Update bundle_es.properties "Titanium" conveyor duplicated on "Plastanium" --- core/assets/bundles/bundle_es.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 9523f30677..62a4c35662 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1084,7 +1084,7 @@ block.hail.name = Granizo block.lancer.name = Lancero block.conveyor.name = Cinta Transportadora block.titanium-conveyor.name = Cinta Transportadora de Titanio -block.plastanium-conveyor.name = Cinta Transportadora de Titanio +block.plastanium-conveyor.name = Cinta Transportadora de Plastanio block.armored-conveyor.name = Cinta Transportadora Acorazada block.armored-conveyor.description = Mueve items a la misma veolcidad que una cinta de titanio, pero tiene mas defensa. No acepta entradas por los lados a menos que sean lineas transportadoras. block.junction.name = Cruce From 07b12890e8d6be298659a9344bf8559ae5be7638 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Fri, 20 Nov 2020 18:14:55 +0100 Subject: [PATCH 009/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index dad6c44fa3..9a0255191b 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -7,8 +7,8 @@ link.reddit.description = El subreddit de Mindustry link.github.description = Código fuente del juego link.changelog.description = Lista de actualizaciones link.dev-builds.description = Versiones en desarrollo inestables -link.trello.description = Tablero de Trello oficial para las características planificadas -link.itch.io.description = itch.io es la página donde podes descargar las versiones para PC y Servidor +link.trello.description = Tablón de Trello oficial para las características planificadas +link.itch.io.description = Página de itch.io, donde puedes descargar las versiones para PC link.google-play.description = Ficha en la Google Play Store link.f-droid.description = Página de F-Droid del juego link.wiki.description = Wiki oficial de Mindustry @@ -17,12 +17,13 @@ linkfail = ¡Error al abrir el enlace!\nLa URL ha sido copiada a su portapapeles screenshot = Captura de pantalla guardada en {0} screenshot.invalid = Mapa demasiado grande, no hay suficiente memoria para la captura de pantalla. gameover = Tu núcleo ha sido destruido. +gameover.disconnect = Desconectado gameover.pvp = ¡El equipo[accent] {0}[] ha ganado! +gameover.waiting = [accent]Esperando al próximo mapa... highscore = [accent]¡Nuevo récord de puntuación! copied = Copiado. - -indev.popup = [accent]v6[] esta actualmente en [accent]alpha[].\n[lightgray]Esto significa que:[]\n[scarlet]- El modo de campaña no esta totalmente acabado[]\n-Falta contenido dentro del juego\n - Mucha de la [scarlet]AI de enemigos[] no funciona totalmente\n- Algunas unidades todavia no estan acabadas\n- Todo lo que ves es probable que sea cambiado o removido.\n\nReporta bugs o crasheos en [accent]Github[]. -indev.notready = Esta parte del juego no esta lista todavia. +indev.popup = [accent]v6[] esta actualmente en [accent]alpha[].\n[lightgray]Esto significa que:[]\n[scarlet]- El modo de campaña no esta totalmente acabado[]\n-Falta contenido dentro del juego\n - Mucha de la [scarlet]AI de enemigos[] no funciona totalmente\n- Algunas unidades todavia no estan acabadas\n- Todo lo que ves podría ser cambiado o eliminado.\n\nReporta bugs o crasheos en [accent]Github[]. +indev.notready = Esta parte del juego no esta lista todavía. load.sound = Sonidos From 410c609785fa17b0cefaf05c95c611132a95febc Mon Sep 17 00:00:00 2001 From: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> Date: Sat, 21 Nov 2020 13:23:07 +0700 Subject: [PATCH 010/123] Better turret desc --- core/assets/bundles/bundle_in_ID.properties | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 097bde8d99..f83c46446e 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -1386,21 +1386,21 @@ block.container.description = Menyimpan semua tipe item. [lightgray] pembongkar block.unloader.description = Mengeluarkan item dari kontainer, gudang atau inti kedalam pengantar atau langsung ke blok yang dituju. Tipe item yang dimuat bisa diganti dengan mengetuk pembongkar muatan. block.launch-pad.description = Meluncurkan beberapa item tanpa meninggalkan tempat. block.launch-pad-large.description = Sebuah alas luncur yang ditingkatkan. Menyimpan lebih banyak item dan lebih sering meluncur. -block.duo.description = menara yang murah nan kecil. Berguna melawan unit darat. -block.scatter.description = Menara Anti-Udara berukuran sedang. Melempar gumpalan timah atau kepingan ke unit musuh. -block.scorch.description = Membakar musuh yang dekat. Sangat efektif di jarak dekat. -block.hail.description = Menara meriam kecil. -block.wave.description = Menara penembak beruntun ukuran sedang yang menembak gelembung air. -block.lancer.description = Menara ukuran sedang yang menembak sinar listrik. -block.arc.description = Menara kecil jarak dekat ini menembak listrik secara acak ke arah musuh. -block.swarmer.description = Menara ukuran sedang yang menembak misil bertubi-tubi. -block.salvo.description = Menara ukuran sedang yang menembak pelurunya secara serentak. -block.fuse.description = Menara besar ini menembak sinar pendek yang kuat. -block.ripple.description = Menara meriam besar yang menembak beberapa peluru sekaligus. -block.cyclone.description = Menara penembak beruntun besar. -block.spectre.description = Menara besar yang menembak dua peluru kuat sekaligus. -block.meltdown.description = Menara besar ini menembak sinar panjang yang kuat. -block.foreshadow.description = Menembak laser besar dalam jarak yang jauh ke satu target. +block.duo.description = Menembakkan peluru bergantian ke musuh. +block.scatter.description = Menembakkan gumpalan timah, rongsokan atau metaglass ke musuh udara. +block.scorch.description = Membakar musuh darat yang dekat dengannya. Sangat efektif dalam jarak dekat. +block.hail.description = Menembakkan peluru kecil ke musuh darat dari jarak jauh. +block.wave.description = Menembakkan aliran cairan ke musuh. Secara otomatis memadamkan api saat disuplai dengan air. +block.lancer.description = Mengisi dan menembakkan sinar energi yang kuat ke target darat. +block.arc.description = Menembak petir ke musuh darat. +block.swarmer.description = Menembakkan misil yang mengejar ke arah musuh. +block.salvo.description = Menembakkan peluru cepat ke arah musuh. +block.fuse.description = Menembakkan tiga penusuk tajam jarak dekat ke musuh terdekat. +block.ripple.description = Menembak cangkang berkelompok ke musuh darat dari jarak jauh. +block.cyclone.description = Menembakkan gumpalan peledak ke musuh terdekat. +block.spectre.description = Menembakkan peluru besar yang menembus lapis baja ke target udara dan darat. +block.meltdown.description = Mengisi dan menembakkan sinar laser yang terus-menerus ke musuh di sekitar. Membutuhkan pendingin untuk beroperasi. +block.foreshadow.description = Menembak baut besar jarak jauh yang hanya menembak satu target. block.repair-point.description = Terus menerus memulihkan unit terluka disekitar. block.segment.description = Merusakkan dan menghancurkan proyektil yang datang. Proyektil laser tidak akan ditargetkan. block.parallax.description = Menembak laser yang menarik target udara, juga merusaknya selama dalam proses. @@ -1417,7 +1417,7 @@ block.naval-factory.description = Memproduksi unit laut. Hasil unit dapat diguna block.additive-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat dua block.multiplicative-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat tiga. block.exponential-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat empat. -block.tetrative-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat lima. +block.tetrative-reconstructor.description = Meningkatkan unit didalamnya menjadi tingkat lima dan terakhir. block.switch.description = Sakelar yang dapat dialihkan. Status dapat dibaca dan dikontrol dengan prosesor logika. block.micro-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. block.logic-processor.description = Menjalankan urutan instruksi logika dalam satu lingkaran. Dapat digunakan untuk mengontrol unit dan bangunan. Lebih cepat dibandingkan prosesor mikro. From dc00870c2a007e78e74658eb40ade0e0f22c1357 Mon Sep 17 00:00:00 2001 From: Nikolass1000 <68129216+Nikolass1000@users.noreply.github.com> Date: Mon, 23 Nov 2020 01:30:57 +0100 Subject: [PATCH 011/123] Update bundle_pl.properties --- core/assets/bundles/bundle_pl.properties | 55 +++++++++++++++--------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 922c854e69..dc606bc2fb 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -899,6 +899,7 @@ content.item.name = Przedmioty content.liquid.name = Płyny content.unit.name = Jednostki content.block.name = Klocki +content.sector.name = Sektory item.copper.name = Miedź item.lead.name = Ołów @@ -1178,27 +1179,39 @@ team.derelict.name = szary team.green.name = zielony team.purple.name = fioletowy -tutorial.next = [lightgray] -tutorial.intro = Wszedłeś do[scarlet] Samouczka Mindustry.[]\nUżyj [accent][[WASD][], aby poruszyć się.\n[accent]Przytrzymaj [[Ctrl] podczas przewijania[], aby przybliżyć i oddalić widok.\nZacznij od[accent] wydobycia miedzi[]. W tym celu przybliż się, a następnie dotknij żyły rudy miedzi w pobliżu rdzenia.\n\n[accent]{0}/{1} miedź -tutorial.intro.mobile = Wszedłeś do[scarlet] Samouczka Mindustry.[]\nPrzesuń palcem po ekranie, aby poruszyć się.\n[accent]Użyj dwóch palcy[], aby przybliżyć i oddalić widok.\nZacznij od[accent] wydobycia miedzi[]. W tym celu przybliż się, a następnie dotknij żyły rudy miedzi w pobliżu rdzenia.\n\n[accent]{0}/{1} miedź -tutorial.drill = Wydobywanie ręczne nie jest efektywne.\n[accent]Wiertła []mogą kopać automatycznie.\nKliknij zakładkę wiertła w prawym dolnym rogu.\nWybierz[accent] wiertło mechaniczne[]. Umieść go na złożu miedzi, klikając.\n[accent]Kliknij prawym przyciskiem myszy[], aby przestać budować. -tutorial.drill.mobile = Wydobywanie ręczne jest nieefektywne.\n[accent]Wiertła []mogą kopać automatycznie.\nDotknij zakładkę wiertła w prawym dolnym rogu.\nWybierz[accent] wiertło mechaniczne[].\nUmieść go na złożu miedzi poprzez Stuknięcie, potem wciśnij[accent] ptaszek[] na dole by potwierdzić wybór.\nNaciśnij przycisk[accent] X[] by anulować budowe. -tutorial.blockinfo = Każdy blok ma inne statystyki. Każde wiertło może kopać tylko wybrane rudy.\nBy sprawdzić informacje i statystyki bloku,[accent] kliknij przycisk "?" podczas jego wyboru w menu budowy.[]\n\n[accent]Sprawdź teraz statystyki mechanicznego wiertła.[] -tutorial.conveyor = [accent]Przenośnik[] jest używany do transportowania przedmiotów do rdzenia.\nStwórz linie przenośników z wierteł do rdzenia.\n[accent]Przytrzymaj przycisk myszy by położyć w linii.[]\nPrzytrzymaj[accent] CTRL[] podczas wybierania linii, by budować po skosie.\n\n[accent]{0}/{1} Przenośniki położone w linii\n[accent]0/1 Przedmioty dostarczone -tutorial.conveyor.mobile = [accent]Przenośnik[] jest używany do transportowania przedmiotów do rdzenia.\nStwórz linie przenośników z wierteł do rdzenia.\n[accent] Zbuduj w linii poprzez przytrzymanie palcem przez moment[] i przesunięcie w którymś kierunku.\n\n[accent]{0}/{1} Przenośniki położone w linii\n[accent]0/1 Przedmioty dostarczone -tutorial.turret = Kiedy przedmiot dociera do rdzenia, może zostać użyty do budowy.\nPamiętaj że nie każdy przedmiot może zostać użyty do budowy.\nprzedmioty które nie są używane do budowy, takie jak[accent] Węgiel[] lub[accent] złom[], nie moga zostać wprowadzone do rdzenia.\nStruktury obronne muszą zostać zbudowane by odeprzeć[lightgray] wroga[].\nZbuduj[accent] podwójne działko[] niedaleko swojej bazy. -tutorial.drillturret = Podwójne działka wymagają[accent] miedzianej amunicji []do strzelania.\nPołóż wiertło obok działka.\nPoprowadź przenośniki do działek by zaopatrzyć je w miedź.\n\n[accent]Amunicja dostarczona: 0/1 -tutorial.pause = Podczas gry, możesz[accent] zatrzymać grę.[]\nMożesz ustalić kolejkę budowy podczas pauzy.\n\n[accent]Naciśnij spacje by zapauzować. -tutorial.pause.mobile = Podczas gry, możesz[accent] zatrzymać grę.[]\nMożesz ustalić kolejkę budowy podczas pauzy.\n\n[accent]Nacniśnij przycisk w lewym górnym rogu by zapauzować. -tutorial.unpause = Teraz znowu naciśnij spacje by odpauzować. -tutorial.unpause.mobile = Naciśnij go znowu by odpauzować. -tutorial.breaking = Bloki często wymagają rozbiórki.\n[accent]Przytrzymaj prawy przcisk myszy[] by niszczyć wszystkie wybrane bloki.[]\n\n[accent]Zniszcz wszystkie bloki złomu na lewo od twojego rdzenia używając selekcji obszarowej. -tutorial.breaking.mobile = Bloki często wymagają rozbiórki.\n[accent]Wybierz tryb dekonstrukcji[], a następnie dotknij blok by zacząć go niszczyć.\nZdekonstruuj obszarowo poprzez przytrzymanie palcem przez moment[] i przesunięcie go w jakimś kierunku.\nNaciśnij przycisk ptaszka by potwierdzić rozbiórkę.\n\n[accent]Zniszcz wszystkie bloki złomu na lewo od twojego rdzenia używając selekcji obszarowej. -tutorial.withdraw = Czasami, konieczne jest wyjmowanie przedmiotów prosto z bloków.\nBy tego dokonać, [accent]kliknij blok[] z przedmiotami w nim, potem [accent]kliknij przedmiot[] w inwentarzu.\nMożesz zebrać wiele przedmiotów naraz poprzez [accent]kliknięcie i przytrzymanie[].\n\n[accent]Zabierz trochę miedzi z rdzenia.[] -tutorial.deposit = Włóż przedmioty do bloków poprzez przeciągnięcie z twojego statku do danego bloku.\n\n[accent]Włóż miedź z powrotem do rdzenia .[] -tutorial.waves = [lightgray] Wrogowie[] nadchodzą.\n\nBroń swój rdzeń przez 2 fale.[accent] Kliknij[] by strzelać.\nZbuduj wiecej działek i wierteł. Wydobądź więcej miedzi. -tutorial.waves.mobile = [lightgray] Wrogowie[] nadchodzą.\n\nBroń swój rdzeń przez 2 fale. Twój statek będzie automatycznie atakował wrogów.\nZbuduj wiecej działek i wierteł. Wydobądź więcej miedzi. -tutorial.launch = Kiedy dotrzesz do określonej fali, masz możliwość[accent] wystrzelenia rdzenia[], pozostawiając struktury obronne za sobą i[accent] otrzymując wszystkie surowce znajdujące się w rdzeniu.[]\nSurowce te mogą potem zostać użyte do odkrywania nowych technologii.\n\n[accent]Naciśnij przycisk Wystrzału. +hint.skip = Pomiń +hint.desktopMove = Użyj [accent][[WASD][] by się poruszać. +hint.zoom = [accent]Przewiń[] by przybliżać lub oddlać obraz. +hint.mine = Zbliż się do \uf8c4 rudy miedzi i [accent]kliknij[] by kopać manualnie. +hint.desktopShoot = Kliknij [accent][[Lewy przycisk myszy][] by strzelać. +hint.depositItems = By przenosić przedmoty, przeciągij je ze swojego statku do rdzenia. +hint.respawn = By się odrodzić jako statek, kliknij [accent][[V][]. +hint.respawn.mobile = Przełączyłeś się na inną jednoskę/strukturę. By odrodzić się jako statek, [accent]kliknij w awatar w górnym lewym rogu.[] +hint.desktopPause = Naciśnij [accent][[Spację][] by zatrzymać lub wznowić grę. +hint.placeDrill = Wybierz \ue85e [accent]Wiertło[] w menu w prawym dolnym rogu, i wybierz wtedy \uf870 [accent]Wiertło[] i kliknij na miedzi by je postawić. +hint.placeDrill.mobile = Wybierz zakładkę z \ue85e[accent]Wiertłem[] w menu w prawym dolnym rogu, i wtedy wybierz \uf870 [accent]Wietło[] i kliknij na miedzi by je postawić.\n\nNaciśnij \ue800 [accent]znak potwierdzenia[] w dolnym prawym rogu by potwierdzić. +hint.placeConveyor = Przenośniki mogą przenosić przedmioty z wierteł. Wybierz \uf896 [accent]Przenośnik[] z zakładki \ue814 [accent]Dystrybucja[].\n\nKliknij i przeciągnij by położyć wiele przeciągników.\n[accent]Przewiń[] by obrócić. +hint.placeConveyor.mobile = Przenośniki mogą przenosić przedmioty z wierteł. Wybierz \uf896 [accent]Przenośnik[] z zakładki \ue814 [accent]Dystrybucja[].\n\nPrzytrzymaj palcem i przeciągij by położyć wiele przeciągników. +hint.placeTurret = Postaw \uf861 [accent]Działka[] by bronić się przed wrogami.\n\nDziałka potzebują amunicji - w tym wypadku, \uf838copper.\nUżyj przenośników i wierteł by je naładować. +hint.breaking = Użyj [accent]Prawego przycisku myszy[] i przeciągnij by zniszczyć bloki. +hint.breaking.mobile = Aktywuj \ue817 [accent]ikonę młota[] w dolnym prawym rogu by zniszczyć bloki.\n\nPrzytrymaj swój palec i przeciągij by wybrać wiele bloków do zniszczenia. +hint.research = Klikij przycisk \ue875 [accent]Badań[] by odkrwyać nowe technologie. +hint.research.mobile = Użyj przycisku \ue875 [accent]Badań[] w \ue88c [accent]Menu[] by odkrwyać nowe technologie. +hint.unitControl = Przytrzymaj [accent][[Lewy CTRL][] i [accent]kliknij[] to control by kontrolować sojusznicze jednostki i działka. +hint.unitControl.mobile = [accent][Kliknij dwukrotnie[] by kontrolować sojusznicze jednostki i działka. +hint.launch = Gdy zebrałeś wystarczająco materiałów możesz [accent]Wystrzelić[] wybierając \ue827 [accent]Mape[] w dolnym prawym rogu. +hint.launch.mobile = Gdy zebrałeś wystarczająco materiałów możesz [accent]Wystrzelić[] do pobliskich sektorów klikając w \ue827 [accent]Mape[] w \ue88c [accent]Menu[]. +hint.schematicSelect = Przytrzymaj [accent][[F][] by kopiować i wkleić bloki.\n\n[accent][[Środkowy przycisk myszy][] kopiuje pojedyńczy blok. +hint.conveyorPathfind = Przeciągij i przytrzymaj [accent][[Lewy CTRL][] w trakcie budowania przenośników by wygenerować ścieżkę. +hint.conveyorPathfind.mobile = Włącz \ue844 [accent]tryb ukośny[] i przeciągnij w trakcie budowania przenośników by wygenerować ścieżkę. +hint.boost = Przytrzymaj [accent][[Lewy Shift][] by przelecieć ponad przeszkody.\n\nNie wszystkie jednostki tak mogą. +hint.command = Kliknij [accent][[G][] by ukształtować formacje z pobliskich jednostek. +hint.command.mobile = [accent][[Podwójne kliknięcie][] kształtuje formacje z pobliskich jednostek. +hint.payloadPickup = Kliknij [accent][[[] by podnieść małe bloki lub jednostki. +hint.payloadPickup.mobile = [accent]Kliknij i przytrzymaj[] mały blok by go podnieść. +hint.payloadDrop = Kliknij [accent]][] by opuścić podniesoiny towar. +hint.payloadDrop.mobile = [accent]Kliknij i przytrzymaj[] w puste miejsce by opuścić podniesoiny towar. +hint.waveFire = [accent]Strumień[] wypełniony wodą będzie gasić pobiskie pożary. item.copper.description = Przydatny materiał budowlany. Szeroko używany w prawie każdej konstrukcji. item.lead.description = Podstawowy materiał. Używany w przesyle przemiotów i płynów. Nie jest on przypadkiem szkodliwy? From bf60505584b97fddec41501fdd4a33b5f1e9da0e Mon Sep 17 00:00:00 2001 From: Nikolass1000 <68129216+Nikolass1000@users.noreply.github.com> Date: Mon, 23 Nov 2020 10:22:45 +0100 Subject: [PATCH 012/123] Update bundle_pl.properties --- core/assets/bundles/bundle_pl.properties | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index dc606bc2fb..fb874f5e08 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -600,7 +600,7 @@ stat.size = Rozmiar stat.displaysize = Wielkość Wyświetlania stat.liquidcapacity = Pojemność cieczy stat.powerrange = Zakres mocy -stat.linkrange = Link Range +stat.linkrange = Odległość połączeń stat.instructions = Instrukcje stat.powerconnections = Maksymalna ilość połączeń stat.poweruse = Zużycie prądu @@ -642,16 +642,18 @@ stat.minetier = Stopień Wydobycia stat.payloadcapacity = Ładowność stat.commandlimit = Limit Jednostek Zarządanych stat.abilities = Umiejętności +stat.canboost = Może przyspieszyć +stat.flying = Latanie ability.forcefield = Pole Mocy ability.repairfield = Pole Naprawy ability.statusfield = Pole Statusu -ability.unitspawn = {0} Fabryka +ability.unitspawn = Fabryka jednostek {0} ability.shieldregenfield = Strefa Tarczy Regenerującej bar.drilltierreq = Wymagane Lepsze Wiertło -bar.noresources = Missing Resources -bar.corereq = Core Base Required +bar.noresources = Brak Zasobów +bar.corereq = Wymagany Rdzeń bar.drillspeed = Prędkość wiertła: {0}/s bar.pumpspeed = Prędkość pompy: {0}/s bar.efficiency = Efektywność: {0}% @@ -659,7 +661,7 @@ bar.powerbalance = Moc: {0} bar.powerstored = Zmagazynowano: {0}/{1} bar.poweramount = Moc: {0} bar.poweroutput = Wyjście mocy: {0} -bar.powerlines = Connections: {0}/{1} +bar.powerlines = Połączenia: {0}/{1} bar.items = Przedmiotów: {0} bar.capacity = Pojemność: {0} bar.unitcap = {0} {1}/{2} @@ -671,8 +673,7 @@ bar.progress = Postęp Budowy bar.input = Wejście bar.output = Wyjście -units.processorcontrol = [lightgray]Procesor Kontrolowany - +units.processorcontrol = [lightgray]Kontrolowany Procesorem bullet.damage = [stat]{0}[lightgray] Obrażenia bullet.splashdamage = [stat]{0}[lightgray] Obrażenia obszarowe ~[stat] {1}[lightgray] kratki bullet.incendiary = [stat]zapalający @@ -1400,8 +1401,8 @@ unit.oct.description = Broni wszystkie jednostki tarczą regeneracyjną. Może p unit.risso.description = Strzela sporą ilością pocisków i rakiet w najbliższych przeciwników. unit.minke.description = Strzela granatami i standardowymi pociskami w najbliższych przeciwników. unit.bryde.description = Strzela granatami i rakietami na dużą odległość we wrogów. -unit.sei.description = Strzela dużą ilością rakiet oraz przebijających zbroje pocisków we wrogów -unit.omura.description = Strzela przebijającym superszybkim pociskiem we wrogów ze sporej odległości. Produkuje Błyski (jednostki) +unit.sei.description = Strzela dużą ilością rakiet oraz przebijających zbroje pocisków we wrogów. +unit.omura.description = Strzela przebijającym superszybkim pociskiem we wrogów ze sporej odległości. Produkuje Błyski (jednostki). unit.alpha.description = Chroni Rdzeń: Odłamek przed wrogami. Buduje struktury. unit.beta.description = Chroni Rdzeń: Podstawa przed wrogami. Buduje struktury. unit.gamma.description = Chroni Rdzeń: Jądro przed wrogami. Buduje struktury. From ad6a3bf1504917c07f129e9bdba7533fb64e6ce8 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Mon, 23 Nov 2020 11:29:07 +0100 Subject: [PATCH 013/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 66 ++++++++++++++---------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 62a4c35662..0cccefc6ab 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -8,7 +8,7 @@ link.github.description = Código fuente del juego link.changelog.description = Lista de actualizaciones link.dev-builds.description = Versiones en desarrollo inestables link.trello.description = Tablero de Trello oficial para las características planificadas -link.itch.io.description = itch.io es la página donde podes descargar las versiones para PC y Servidor +link.itch.io.description = itch.io es la página donde puedes descargar las versiones para PC y Servidor link.google-play.description = Ficha en la Google Play Store link.f-droid.description = Página de F-Droid del juego link.wiki.description = Wiki oficial de Mindustry @@ -17,13 +17,14 @@ linkfail = ¡Error al abrir el enlace!\nLa URL ha sido copiada a su portapapeles screenshot = Captura de pantalla guardada en {0} screenshot.invalid = Mapa demasiado grande, no hay suficiente memoria para la captura de pantalla. gameover = Tu núcleo ha sido destruido. +gameover.disconnect = Desconectado gameover.pvp = ¡El equipo[accent] {0}[] ha ganado! +gameover.waiting = [accent]Esperando el próximo mapa... highscore = [accent]¡Nuevo récord de puntuación! -copied = Copiado. - -indev.popup = [accent]v6[] esta actualmente en [accent]alpha[].\n[lightgray]Esto significa que:[]\n[scarlet]- El modo de campaña no esta totalmente acabado[]\n-Falta contenido dentro del juego\n - Mucha de la [scarlet]AI de enemigos[] no funciona totalmente\n- Algunas unidades todavia no estan acabadas\n- Todo lo que ves es probable que sea cambiado o removido.\n\nReporta bugs o crasheos en [accent]Github[]. -indev.notready = Esta parte del juego no esta lista todavia. - +copied = Copiado +indev.popup = [accent]v6[] está actualmente en [accent]desarrollo[].\n[lightgray]Esto significa que:[]\n[scarlet]- El modo de campaña no está totalmente acabado[]\n-Falta contenido dentro del juego\n - Mucha de la [scarlet]AI de enemigos[] no funciona totalmente\n- Algunas unidades todavia no estan acabadas\n- Todo lo que ves podría ser cambiado o eliminado.\n\nReporta bugs o cierres inesperados en [accent]Github[]. +indev.notready = Esta parte del juego no esta lista aún. +indev.campaign = [accent]Has llegado al final de la campaña![]\n\nEsto es todo lo lejos que puedes llegar por ahora.\nLos viajes interplanetarios se añadirán en futuras actualizaciones. load.sound = Sonidos load.map = Mapas @@ -59,6 +60,7 @@ schematic.rename = Renombrar plantilla schematic.info = {0}x{1}, {2} bloques schematic.disabled = [scarlet]Plantillas desactivadas.[]\nNo puedes usar plantillas en este [accent]mapa[] o [accent]servidor. +stats = Estadísticas stat.wave = Oleadas Derrotadas:[accent] {0} stat.enemiesDestroyed = Enemigos Destruidos:[accent] {0} stat.built = Estructuras Construidas:[accent] {0} @@ -68,7 +70,7 @@ stat.delivered = Recursos Lanzados: stat.playtime = Tiempo jugado:[accent] {0} stat.rank = Rango final: [accent]{0} -globalitems = [accent]Global Items +globalitems = [accent]Recursos Totales map.delete = ¿Estás seguro de que quieres borrar el mapa "[accent]{0}[]"? level.highscore = Puntuación más alta: [accent]{0} level.select = Selección de nivel @@ -87,7 +89,7 @@ position = Posición close = Cerrar website = Sitio web quit = Salir -save.quit = Guardar & Salir +save.quit = Guardar y Salir maps = Mapas maps.browse = Navegar por los Mapas continue = Continuar @@ -100,7 +102,7 @@ uploadingcontent = Subiendo Contenido uploadingpreviewfile = Subiendo Archivo de Vista Previa committingchanges = Confirmando Cambios done = Hecho -feature.unsupported = Tu dispositivo no soporta esta función. +feature.unsupported = Tu dispositivo no es compatible con esta función. mods.alphainfo = Ten en cuenta que los mods estan en versión Alpha, y[scarlet] pueden tener varios problemas[].\nReporta cualquier error que encuentres en la página de GitHub de Mindustry o Discord. mods = Mods @@ -127,18 +129,16 @@ mod.enable = Activar mod.requiresrestart = El juego se cerrará para aplicar los mods. mod.reloadrequired = [scarlet]Se requiere volver a cargar mod.import = Importar mod - mod.import.file = Importar archivo mod.import.github = Importar Mod de Github mod.jarwarn = [scarlet]Los mods JAR pueden no ser seguros.[]\n¡Asegúrate de haberlos descargado de una fuente en la que confíes! - mod.item.remove = Este objeto es parte del[accent] '{0}'[] mod. Para eliminarlo, desinstala ese mod. mod.remove.confirm = Este mod va a ser eliminado.\n¿Quieres continuar? mod.author = [lightgray]Autor:[] {0} mod.missing = Esta partida guardada usa mods que has actualizado recientemente o que no tienes instalados. Se puede corromper la partida guardada. ¿Quieres cargarla a pesar de ello?\n[lightgray]Mods:\n{0} mod.preview.missing = Antes de publicar este mod en el Steam Workshop, debe añadir una imagen de vista previa.\nAñada una imagen con nombre[accent] preview.png[] en la carpeta del mod e intente nuevamente. mod.folder.missing = Solo los mods en forma de carpeta se pueden publicar en el Steam Workshop.\nPara convertir cualquier mod en una carpeta, simplemente descomprima su archivo a una carpeta y elimine el zip anterior, luego reinicie su juego o vuelva a cargar sus mods. -mod.scripts.disable = Tu dispositivo no soporta los mods con scripts. Debes deshabilitar esos mods para jugar. +mod.scripts.disable = Tu dispositivo no es compatible con mods con scripts. Debes deshabilitar esos mods para jugar. about.button = Acerca del juego name = Nombre: @@ -193,6 +193,10 @@ servers.local = Servidores Locales servers.remote = Servidores Remotos servers.global = Servidores Globales +ervers.showhidden = Mostrar servidores ocultos +server.shown = Visibles +server.hidden = Ocultos + trace = Rastrear Jugador trace.playername = Nombre de jugador: [accent]{0} trace.ip = IP: [accent]{0} @@ -271,6 +275,9 @@ cancel = Cancelar openlink = Abrir Enlace copylink = Copiar Enlace back = Atrás +crash.export = Exportar Registros de errores +crash.none = No se encontraron Registros de errores. +crash.exported = Registros de errores exportados. data.export = Exportar Datos data.import = Importar Datos data.openfolder = Abrir Carpeta de Datos @@ -282,13 +289,12 @@ quit.confirm.tutorial = ¿Estás seguro de que sabes qué estas haciendo?\nSe pu loading = [accent]Cargando... reloading = [accent]Recargando mods... saving = [accent]Guardando... - respawn = [accent][[{0}][] para reaparecer en el núcleo - cancelbuilding = [accent][[{0}][] para limpiar el plan selectschematic = [accent][[{0}][] para seleccionar+copiar pausebuilding = [accent][[{0}][] para pausar la construcción resumebuilding = [scarlet][[{0}][] para reanudar la construcción +showui = Interfaz oculta.\nPulsa [accent][[{0}][] para volver a mostrar la Interfaz. wave = [accent]Oleada {0} wave.cap = [accent]Oleada {0}/{1} wave.waiting = Oleada en {0} @@ -296,9 +302,11 @@ wave.waveInProgress = [lightgray]Oleada en progreso waiting = Esperando... waiting.players = Esperando jugadores... wave.enemies = [lightgray]{0} Enemigos Restantes +wave.enemycores = [accent]{0}[lightgray] Núcleos enemigos +wave.enemycore = [accent]{0}[lightgray] Núcleo enemigo wave.enemy = [lightgray]{0} Enemigo Restante -wave.guardianwarn = Se aproxima un Guardián en [accent]{0}[] oleadas. -wave.guardianwarn.one = Se aproxima un Guardián en [accent]{0}[] oleada. +wave.guardianwarn = El Guardián llegará en [accent]{0}[] oleadas. +wave.guardianwarn.one = El Guardián se aproxima... [accent]{0}[] oleada restante. loadimage = Cargar Imagen saveimage = Guardar Imagen unknown = Desconocido @@ -356,12 +364,11 @@ waves.invalid = Oleadas inválidaas en el portapapeles. waves.copied = Oleadas copiadas. waves.none = No hay enemigos definidos.\nNótese que las listas de oleadas vacías se sustituirán por la lista por defecto. - +#Estos están en minúscula intencionadamente. wavemode.counts = limitadas wavemode.totals = totales wavemode.health = por salud - editor.default = [lightgray] details = Detalles... edit = Editar... @@ -470,6 +477,8 @@ load = Cargar save = Guardar fps = FPS: {0} ping = Ping: {0} ms +memory = Mem: {0}mb +memory2 = Mem:\n {0}mb +\n {1}mb language.restart = Reinicia el juego para que los cambios en el idioma tengan efecto. settings = Ajustes tutorial = Tutorial @@ -488,22 +497,19 @@ requirement.capture = Capturar {0} bestwave = [lightgray]Récord: {0} launch.text = Lanzar research.multiplayer = Solo el anfitrión de la partida puede \nrealizar investigaciones tecnologías. +map.multiplayer = Solo el anfitrión de la partida puede ver los sectores del mapa. uncover = Descubrir configure = Configurar carga inicial + loadout = Carga Inicial resources = Recursos bannedblocks = Bloques prohibidos addall = Añadir todo +launch.from = Lanzando desde: [accent]{0} launch.destination = Destino: {0} configure.invalid = La cantidad debe estar entre 0 y {0}. -zone.unlocked = [lightgray]{0} desbloqueado. -zone.requirement.complete = Oleada {0} alcanzada:\nrequerimientos de la zona {1} cumplidos. -zone.resources = Recursos Detectados: -zone.objective = [lightgray]Objetivo: [accent]{0} -zone.objective.survival = Sobrevivir -zone.objective.attack = Destruir Núcleo Enemigo add = Añadir... -boss.health = Jefe +boss.health = Guardián connectfail = [crimson]Ha fallado la conexión con el servidor: [accent]{0} error.unreachable = Servidor inaccesible. @@ -514,13 +520,12 @@ error.alreadyconnected = Ya estás conectado. error.mapnotfound = ¡Archivo de mapa no encontrado! error.io = Error I/O de conexión. error.any = Error de red desconocido. -error.bloom = Error al cargar el bloom.\nPuede que tu dispositivo no soporte esta característica. +error.bloom = Error al cargar el efecto de bloom.\nPuede que tu dispositivo no sea compatible con esta característica. weather.rain.name = Lluvia weather.snow.name = Nieve weather.sandstorm.name = Tormenta de arena weather.sporestorm.name = Tormenta de esporas - weather.fog.name = Niebla sectors.unexplored = [lightgray]No explorado @@ -1369,3 +1374,10 @@ block.spectre.description = Un cañon masivo de dos barriles. Dispara balas perf block.meltdown.description = Un cañon láser masivo. Carga y dispara un rayo láser constante a enemigos cercanos. Requiere enfriamiento para operar. block.repair-point.description = Repara la unidad dañada más cercana a su alrededor. block.segment.description = Daña y destruye proyectiles enemigos. No apunta a láseres. +# +#511//zone.unlocked = [lightgray]{0} desbloqueado. +#zone.requirement.complete = Oleada {0} alcanzada:\nrequerimientos de la zona {1} cumplidos. +#zone.resources = Recursos Detectados: +#zone.objective = [lightgray]Objetivo: [accent]{0} +#zone.objective.survival = Sobrevivir +#zone.objective.attack = Destruir Núcleo Enemigo From 01a68c210c436e491ea67e3f0410e9f469c83ed9 Mon Sep 17 00:00:00 2001 From: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Date: Mon, 23 Nov 2020 19:31:01 +0700 Subject: [PATCH 014/123] rearranging --- core/assets/bundles/bundle_in_ID.properties | 78 ++++++++++++--------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index f83c46446e..78b380f91d 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -493,14 +493,14 @@ complete = [lightgray]Mencapai: requirement.wave = Capai gelombang {0} dalam {1} requirement.core = Hancurkan inti musuh dalam {0} requirement.research = Kembangkan {0} +requirement.produce = Produksi {0} requirement.capture = Kuasai {0} -bestwave = [lightgray]Gelombang Terbaik: {0} launch.text = Luncurkan research.multiplayer = Hanya host yang dapat meneliti item. +map.multiplayer = Hanya host yang dapat melihat sektor. uncover = Buka configure = Konfigurasi Muatan -#TODO loadout = Muatan resources = Sumber Daya bannedblocks = Balok yang dilarang @@ -508,12 +508,6 @@ addall = Tambah Semua launch.from = Meluncurkan Dari: [accent]{0} launch.destination = Destinasi: {0} configure.invalid = Jumlah harus berupa angka diantara 0 dan {0}. -zone.unlocked = [lightgray]{0} terbuka. -zone.requirement.complete = Gelombang {0} terselesaikan:\nPersyaratan zona {1} tercapai. -zone.resources = [lightgray]Sumber Daya Terdeteksi: -zone.objective = [lightgray]Objektif: [accent]{0} -zone.objective.survival = Bertahan -zone.objective.attack = Hancurkan Inti Musuh add = Menambahkan... boss.health = Darah Guardian @@ -547,8 +541,13 @@ sectors.launch = Luncurkan sectors.select = Pilih sectors.nonelaunch = [lightgray]tidak ada sectors.rename = Ganti Nama Sektor - +sectors.enemybase = [scarlet]Markas Musuh +sectors.vulnerable = [scarlet]Vulnerable +sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged +sectors.survives = [accent]Survives {0} waves +sectors.go = Mulai sector.curcapture = Sektor Ditaklukkan +sector.curlost = Sector Lost sector.missingresources = [scarlet]Sumber Daya Inti Tidak Cukup sector.attacked = Sektor [accent]{0}[white] sedang diserang! sector.lost = Sektor [accent]{0}[white] telah dihancurkan! @@ -799,7 +798,6 @@ setting.conveyorpathfinding.name = Navigasi Pengantar Otomatis setting.sensitivity.name = Sensitivitas Kontroler setting.saveinterval.name = Jarak Menyimpan setting.seconds = {0} detik -setting.blockselecttimeout.name = Waktu Habis Pemilihan Blok setting.milliseconds = {0} milidetik setting.fullscreen.name = Layar Penuh setting.borderlesswindow.name = Jendela tak Berbatas[lightgray] (mungkin memerlukan mengulang kembali) @@ -888,6 +886,8 @@ keybind.menu.name = Menu keybind.pause.name = Jeda keybind.pause_building.name = Jeda/Lanjut Membangun keybind.minimap.name = Peta Kecil +keybind.planet_map.name = Peta Planet +keybind.research.name = Penelitian keybind.chat.name = Pesan keybind.player_list.name = Daftar pemain keybind.console.name = Papan Konsol @@ -908,7 +908,7 @@ mode.editor.name = Sunting mode.pvp.name = PvP mode.pvp.description = Melawan pemain lain. Membutuhkan setidaknya 2 inti berbeda warna didalam peta untuk main. mode.attack.name = Penyerangan -mode.attack.description = Menghancurkan tempat musuh. Tidak ada gelombang. Membutuhkan inti merah di dalam peta untuk main. +mode.attack.description = Hancurkan markas musuh. Membutuhkan inti merah di dalam peta untuk main. mode.custom = Pengaturan Modifikasi rules.infiniteresources = Sumber Daya Tak Terbatas @@ -1012,6 +1012,7 @@ block.resupply-point.name = Titik Pemasok Ulang block.parallax.name = Parallax block.cliff.name = Cliff block.sand-boulder.name = Batu Pasir Besar +block.basalt-boulder.name = Batu Basal Besar block.grass.name = Rumput block.slag.name = Lahar block.space.name = Luar Angkasa @@ -1234,27 +1235,40 @@ team.derelict.name = abu-abu team.green.name = hijau team.purple.name = ungu -tutorial.next = [lightgray] -tutorial.intro = Kamu telah memasuki[scarlet] Tutorial Mindustry.[]\nMulai dengan[accent] menambang tembaga[]. Tekan bijih tembaga dekat intimu.\n\n[accent]{0}/{1} tembaga -tutorial.intro.mobile = Kamu telah memasuki[scarlet] Tutorial Mindustry.[]\nGesek layar untuk bergerak.\n[accent]Gunakan 2 jari [] untuk mengecilkan dan membesarkan gambar.\nMulai dengan[accent] menambang tembaga[]. Dekati tembaganya, kemudian tekan bijih tembaga untuk mulai menambang.\n\n[accent]{0}/{1} tembaga -tutorial.drill = Menambang manual tidak efisien.\n[accent]Bor []bisa menambang otomatis.\nTaruh satu di sekumpulan tembaga. -tutorial.drill.mobile = Menambang manual tidak efisien.\n[accent]Bor []dapat menambang otomatis.\nTekan kategori bor di bawah-kanan.\nPilih[accent] Bor Mekanik[].\nLetakkan di bijih tembaga, kemudian tekan tombol[accent] centang[] dibawah untuk mengonfirmasi pilihanmu.\nTekan[accent] tombol X[] untuk membatalkan rencana. -tutorial.blockinfo = Setiap blok memiliki status berbeda. Setiap bor hanya dapat menambang bijih tertentu.\nUntuk mencari info sebuah blok,[accent] Tekan tombol "?" saat memilih blok dari menu bangunan.[]\n\n[accent]Akses status Bor Mekanik sekarang.[] -tutorial.conveyor = [accent]Pengantar[] digunakan untuk transportasi item ke inti.\nJejerlah pengantar dari bor ke inti. -tutorial.conveyor.mobile = [accent]Pengantar[] digunakan untuk transportasi item ke inti.\nJejerlah pengantar dari bor ke inti.\n[accent] Buat sebuah garis dengan menekan jarimu selama beberapa detik[] dan tarik dengan suatu arah.\n\n[accent]{0}/{1} item dari garis pengantar\n[accent]0/1 terkirim -tutorial.turret = Struktur pertahanan harus dibuat untuk menangkal [lightgray] musuh[].\nBangun menara "duo" dekat intimu. -tutorial.drillturret = Menara "duo" membutuhkan[accent] amunisi tembaga []untuk menembak.\nTaruh bor didekat menara untuk mengisinya dengan tembaga. -tutorial.pause = Disaat bermain, kamu dapat[accent] menjeda game.[]\nKamu berhenti membangun selama jeda.\n\n[accent]Tekan spasi untuk jeda. -tutorial.pause.mobile = Disaat bermain, kamu dapat[accent] menjeda game.[]\nKamu berhenti membangun selama jeda.\n\n[accent]Tekan tombol ini di atas-kiri untuk jeda. -tutorial.unpause = Tekan spasi lagi untuk menghentikan jeda. -tutorial.unpause.mobile = Tekan tombol tersebut lagi untuk berhenti jeda. -tutorial.breaking = Blok biasanya butuh untuk dihapus.\n[accent]Tekan mouse-kanan[] untuk menghapus semua blok yang diseleksi.[]\n\n[accent]Hapus semua blok kepingan di sebelah intimu. -tutorial.breaking.mobile = Blok biasanya butuh untuk dihapus.\n[accent]Tekan mode dekonstraksi[], kemudian tekan blok untuk mulai menghapus.\nHapus sebuah area dengan menahan jari beberapa detik[] dan tarik ke suatu arah .\nTekan tombol centang untuk mengonfirmasi.\n\n[accent]Hapus semua blok kepingan di sebelah intimu. -tutorial.withdraw = Di beberapa situasi, mengambil item dari blok diperlukan.\nUntuk melakukan ini, [accent]tekan sebuah blok[] berisi sebuah item, kemudian [accent]tekan item itu[] dalam inventaris.\nItem dengan jumlah banyak dapat diambil[accent]dengan cara menahan[].\n\n[accent]Ambil beberapa tembaga dari inti.[] -tutorial.deposit = Setor item dari pesawatmu ke suatu blok dengan cara menarik itemnya.\n\n[accent]Setor kembali tembagamu ke inti.[] -tutorial.waves = [lightgray] Musuh[] mendatang.\n\nLindungi intimu selama 2 gelombang. Bangun lebih banyak kubah dan bor. -tutorial.waves.mobile = Para[lightgray] Musuh[] telah muncul.\n\nLindungi intimu selama 2 gelombang. Pesawatmu akan menembak musuh secara otomatis.\nBuat lebih banyak kubah dan bor. Tambang tembaga lebih banyak. -tutorial.launch = Saat kamu mencapai gelombang tertentu, kamu dapat[accent] meluncurkan intimu[], meninggalkan pertahananmu[accent] mendapatkan semua sumber daya di intimu.[]\nSumber daya ini digunakan sebagai riset teknologi.\n\n[accent]Tekan tombol meluncur. +hint.skip = Skip +hint.desktopMove = Use [accent][[WASD][] to move. +hint.zoom = [accent]Scroll[] to zoom in or out. +hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually. +hint.desktopShoot = [accent][[Left-click][] to shoot. +hint.depositItems = To transfer items, drag from your ship to the core. +hint.respawn = To respawn as a ship, press [accent][[V][]. +hint.respawn.mobile = You have switched control a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[] +hint.desktopPause = Press [accent][[Space][] to pause and unpause the game. +hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it. +hint.placeDrill.mobile = Select the \ue85e[accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm. +hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. +hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. +hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. +hint.breaking = [accent]Right-click[] and drag to break blocks. +hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. +hint.research = Use the \ue875 [accent]Research[] button to research new technology. +hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology. +hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets. +hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets. +hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right. +hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[]. +hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. +hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path. +hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path. +hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters. +hint.command = Press [accent][[G][] to command nearby units into formation. +hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation. +hint.payloadPickup = Press [accent][[[] to pick up small blocks or units. +hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up. +hint.payloadDrop = Press [accent]][] to drop a payload. +hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there. +hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. +hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[]. item.copper.description = Bahan struktur yang berguna. Digunakan di semua tipe blok. item.copper.details = Tembaga. Logam yang sangat melimpah di Serpulo. Lemah secara struktural kecuali jika diperkuat. From 23c33d87c16371adb8a2db234052d367eb7519dd Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:56:18 +0200 Subject: [PATCH 015/123] Update bundle_ro.properties This is not ready, hence will be a draft. ea377c6f1608aa17b1167b949aec7a44088d5333 still unfinished. Do not merge as-is. It is unfinished and untested. This is a rushed submission. I did not want to lose my progress; don't have time to finish it right now. --- core/assets/bundles/bundle_ro.properties | 27 ++++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index a88caa9aa8..a7bbe0b61c 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -552,7 +552,7 @@ sectors.enemybase = [scarlet]Bază Inamică sectors.vulnerable = [scarlet]Vulnerabil sectors.underattack = [scarlet]Sectorul e atacat! [accent]{0}% deteriorat sectors.survives = [accent]Supraviețuiește {0} valuri - +sectors.go = Start sector.curcapture = Sector Capturat sector.curlost = Sector Pierdut sector.missingresources = [scarlet]Resurse din Nucleu Insuficiente @@ -1240,19 +1240,18 @@ team.derelict.name = abandonată team.green.name = verde team.purple.name = mov -# A NU SE TRADUCE! NU SUNT GATA! -hint.skip = Skip -hint.desktopMove = Use [accent][[WASD][] to move. -hint.zoom = [accent]Scroll[] to zoom in or out. -hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually. -hint.desktopShoot = [accent][[Left-click][] to shoot. -hint.depositItems = To transfer items, drag from your ship to the core. -hint.respawn = To respawn as a ship, press [accent][[V][]. -hint.respawn.mobile = You have switched control a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[] -hint.desktopPause = Press [accent][[Space][] to pause and unpause the game. -hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it. -hint.placeDrill.mobile = Select the \ue85e[accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm. -hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. +hint.skip = Treci peste +hint.desktopMove = Folosește [accent][[WASD][] ca să te miști. +hint.zoom = [accent]Cu rotița de la mouse[] poți ajusta zoomul. +hint.mine = Du-te lângă \uf8c4 minereul de cupru și [accent]fă click[] pe el pt a mina manual. +hint.desktopShoot = [accent][[Click-stânga][] pt a trage cu armele navei. +hint.depositItems = Pt a transfera materiale, trage-le din nava ta către nucleu. +hint.respawn = Pt a te regenera ca navă în nucleu, apasă [accent][[V][]. +hint.respawn.mobile = Acum controlezi o unitate/structură. Pt a te regenera ca navă în nucleu, [accent]dă click pe avatarul din colțul din stânga-sus.[] +hint.desktopPause = Apasă [accent][[Space][] pt a da pauză jocului. Apasă din nou pt a ieși din modul pauză. +hint.placeDrill = Selectează tabul \ue85e [accent]Burghie[] din meniul din stânga-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina. +hint.placeDrill.mobile = Selectează tabul \ue85e[accent]Burghie[] din meniul din stânga-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina.\n\nApasă pe \ue800 [accent]bifa[] din dreapta-jos pt a confirma. +hint.placeConveyor = Benzile mută materiale din burghie în alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\n Ține click apăsat și trage pe ecran pt a desena o linie de bandă.\n[accent]Folosește rotița mouseului[] pt a roti. hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. hint.breaking = [accent]Right-click[] and drag to break blocks. From 143be734c5a8e47641978af65d8d226579dac3e6 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:13:23 +0100 Subject: [PATCH 016/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 33 +++++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 0cccefc6ab..909659417e 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -531,17 +531,41 @@ weather.fog.name = Niebla sectors.unexplored = [lightgray]No explorado sectors.resources = Recursos: sectors.production = Producción: +sectors.export = Exportado: +sectors.time = Tiempo: +sectors.threat = Amenaza: +sectors.wave = Oleada: sectors.stored = Almacenado: sectors.resume = Reanudar sectors.launch = Lanzar sectors.select = Elegir sectors.nonelaunch = [lightgray]Ninguno (Sol) sectors.rename = Renombrar Sector +sectors.enemybase = [scarlet]Base enemiga +sectors.vulnerable = [scarlet]Vulnerable +sectors.underattack = [scarlet]¡Bajo ataque! [accent]{0}% Dañado +sectors.survives = [accent]Sobrevive {0} oleadas +sectors.go = Ir +sector.curcapture = Sector Capturado +sector.curlost = Sector Perdido sector.missingresources = [scarlet]Recursos Insuficientes +sector.attacked = Sector [accent]{0}[white] bajo ataque[]! +sector.lost = ¡Sector [accent]{0}[white] perdido[]! +#nota: el espacio en blanco en la línea siguiente es intencionado +sector.captured = Sector [accent]{0}[white]capturado[]! + +threat.low = Baja +threat.medium = Media +threat.high = Alta +threat.extreme = Extrema +threat.eradication = Exterminio + +planets = Planetas planet.serpulo.name = Serpulo planet.sun.name = Sol +sector.impact0078.name = Impacto 0078 sector.groundZero.name = Zona de impacto sector.craters.name = Los Cráteres sector.frozenForest.name = Bosque Congelado @@ -553,7 +577,10 @@ sector.overgrowth.name = Crecimiento excesivo sector.tarFields.name = Campos de alquitrán sector.saltFlats.name = Llanuras de sal sector.fungalPass.name = Paso de hongos - +sector.biomassFacility.name = Centro de Sintetización de Biomasa +sector.windsweptIslands.name = Islas Windswept +sector.extractionOutpost.name = Puesto de avanzada de Extracción +sector.planetaryTerminal.name = Terminal de Lanzamiento Interplanetario sector.groundZero.description = La ubicación óptima para empezar una vez más. Baja amenaza enemiga. Pocos recursos.\nReúna la mayor cantidad de plomo y cobre posible.\nSiga adelante. sector.frozenForest.description = Incluso aquí, más cerca de las montañas, las esporas se han extendido. Las gélidas temperaturas no pueden contenerlos para siempre.\n\nComienza la aventura hacia el poder. Construye generadores de combustión. Aprenda a usar reparadores. @@ -579,7 +606,6 @@ settings.graphics = Gráficos settings.cleardata = Eliminando Datos del Juego... settings.clear.confirm = ¿Estas seguro de querer eliminar estos datos?\n¡Esta acción no se puede deshacer! settings.clearall.confirm = [scarlet]¡ADVERTENCIA![]\nEsto va a eliminar todos tus datos, incluyendo guardados, mapas, desbloqueos y atajos de teclado.\nUna vez presiones 'ok', el juego borrrará todos tus datos y se cerrará automáticamente. - settings.clearsaves.confirm = ¿Estas seguro de que quieres borrar tus partidas guardadas? settings.clearsaves = Limpiar partidas guardadas settings.clearresearch = Borrar Investigaciones Tecnológicas @@ -587,9 +613,8 @@ settings.clearresearch.confirm = ¿Estas seguro? settings.clearcampaignsaves = Borrar datos de campaña settings.clearcampaignsaves.confirm = ¿Estas seguro de que quieres borrar tus partidas guardadas en el modo campaña? paused = [accent] < Pausado > -clear = Limpiar +clear = Vaciar banned = [scarlet]Baneado -unplaceable.sectorcaptured = [scarlet]Necesitas que el sector esté capturado. yes = Sí no = No info.title = [accent]Información From 849dd7e2eb0410b1a900ccdf791d5ea23bac047b Mon Sep 17 00:00:00 2001 From: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> Date: Mon, 23 Nov 2020 20:32:22 +0700 Subject: [PATCH 017/123] Hint translate --- core/assets/bundles/bundle_in_ID.properties | 66 ++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 78b380f91d..e83f85d4f3 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -1236,39 +1236,39 @@ team.green.name = hijau team.purple.name = ungu hint.skip = Skip -hint.desktopMove = Use [accent][[WASD][] to move. -hint.zoom = [accent]Scroll[] to zoom in or out. -hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually. -hint.desktopShoot = [accent][[Left-click][] to shoot. -hint.depositItems = To transfer items, drag from your ship to the core. -hint.respawn = To respawn as a ship, press [accent][[V][]. -hint.respawn.mobile = You have switched control a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[] -hint.desktopPause = Press [accent][[Space][] to pause and unpause the game. -hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it. -hint.placeDrill.mobile = Select the \ue85e[accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm. -hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. -hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. -hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. -hint.breaking = [accent]Right-click[] and drag to break blocks. -hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. -hint.research = Use the \ue875 [accent]Research[] button to research new technology. -hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology. -hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets. -hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets. -hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right. -hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[]. -hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. -hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path. -hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path. -hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters. -hint.command = Press [accent][[G][] to command nearby units into formation. -hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation. -hint.payloadPickup = Press [accent][[[] to pick up small blocks or units. -hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up. -hint.payloadDrop = Press [accent]][] to drop a payload. -hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there. -hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. -hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[]. +hint.desktopMove = Tekan [accent][[WASD][] untuk bergerak. +hint.zoom = [accent]Skrol[] untuk membesarkan atau mengecilkan layar. +hint.mine = Dekati \uf8c4 bijih tembaga dan [accent]tekan[] untuk menambangnya secara manual. +hint.desktopShoot = [accent][[Klik kanan][] untuk menembak. +hint.depositItems = Untuk mentransfer item, tekan item dari inti. +hint.respawn = untuk muncul kembali seperti awal, tekan [accent][[V][]. +hint.respawn.mobile = Kamu telah mengambil alih kontrol dari sebuah unit/struktur. Untuk muncul kembali, [accent]tekan avatar di kiri atas.[] +hint.desktopPause = Tekan [accent][[Spasi][] untuk menjeda dan menghentikan jeda. +hint.placeDrill = Pilih \ue85e [accent]Bor[] menu di kanan bawah, lalu pilih \uf870 [accent]Bor[] dan klik diatas bijih tembaga untuk menaruhnya. +hint.placeDrill.mobile = Pilih \ue85e[accent]Bor[] tab di menu di kanan bawah, lalu pilih \uf870 [accent]Bor[] dan klik diatas bijih tembaga untuk menaruhnya.\n\nTekan \ue800 [accent]checkmark[] di bawah kanan untuk menkonfirmasi pembangunan. +hint.placeConveyor = Pengantar dapat memindahkan item dari bor ke blok yang lain. Pilih \uf896 [accent]Pengantar[] dari menu \ue814 [accent]Distribusi[].\n\nKlik dan tarik untuk menaruh beberapa pengantar.\n[accent]Skrol[] untuk memutarnya. +hint.placeConveyor.mobile = Pengantar dapat memindahkan item dari bor ke blok yang lain. Pilih \uf896 [accent]Pengantar[] dari menu \ue814 [accent]Distribusi[].\n\nTahan jari kamu sebentar dan seret untuk menaruh beberapa pengantar. +hint.placeTurret = Taruh \uf861 [accent]Turret[] untuk mempertahankan basismu daru musuh.\n\nTurret membutuhkan amunisi - yang satu ini, \uf838copper.\nGunakan pengantar dan bor untuk mengisinya. +hint.breaking = [accent]Klik kanan[] dan tarik untuk menghancurkan blok. +hint.breaking.mobile = Aktifkan \ue817 [accent]palu[] di kanan bawah dan tekan untuk menghancurkan blok.\n\nTahan jari kamu sebentar dan seret untuk menghancurkannya. +hint.research = Gunakan tombol \ue875 [accent]Riset[] untuk mempelajari teknologi baru. +hint.research.mobile = Gunakan tombol \ue875 [accent]Riset[] di \ue88c [accent]Menu[] untuk mempelajari teknologi baru. +hint.unitControl = Tahan [accent][[L-ctrl][] dan [accent]klik[] untuk mengendalikan unit atau turret teman. +hint.unitControl.mobile = [accent][Klik dua kali[] untuk mengendalikan unit atau turret teman. +hint.launch = Ketika sumber daya sudah mencukupi, kamu bisa [accent]Meluncurkan[] dengan memilih sektor terdekat dari \ue827 [accent]Map[] di kanan bawah. +hint.launch.mobile = Ketika sumber daya sudah mencukupi, kamu bisa [accent]Meluncurkan[] dengan memilih sektor terdekat dari \ue827 [accent]Map[] di \ue88c [accent]Menu[]. +hint.schematicSelect = Tahan [accent][[F][] dan tarik ke bangunan untuk menyalin bangunan.\n\n[accent][[Klik tengah][] untuk menyalin blok setipe. +hint.conveyorPathfind = Tahan [accent][[L-Ctrl][] ketika menarik pengantar untuk membuat jalur secara otomatis. +hint.conveyorPathfind.mobile = Aktifkan \ue844 [accent]diagonal mode[] dan tarik pengantar untuk membuat jalur secara otomatis. +hint.boost = Tahan [accent][[L-Shift][] untuk terbang dengan unit sekarang.\n\nHanya beberapa unit darat yang memiliki pendorong. +hint.command = Tekan [accent][[G][] untuk memperintah unit sekitarmu kedalam formasi. +hint.command.mobile = [accent][[Klik dua kali][] unitmu untuk memperintah unit sekitarmu kedalam formasi. +hint.payloadPickup = Tekan [accent][[[] untuk membawa blok kecil atau unit. +hint.payloadPickup.mobile = [accent]Tekan dan tahan[] untuk membawa blok kecil atau unit. +hint.payloadDrop = Tekan [accent]][] untuk menurunkan muatan. +hint.payloadDrop.mobile = [accent]Tekan dan tahan[] di lokasi yang kosong untuk menurunkan muatan. +hint.waveFire = [accent]Wave[] yang terisi dengan air akan memadamkan air dalam jangkauannya. +hint.generator = \uf879 [accent]Generator Pembakar[] membakar batu bara dan menghasilkan energik ke blok yang berdekatan.\n\nTransmisi energi dapat diperluas menggunakan \uf87f [accent]Tiang Listrik[]. item.copper.description = Bahan struktur yang berguna. Digunakan di semua tipe blok. item.copper.details = Tembaga. Logam yang sangat melimpah di Serpulo. Lemah secara struktural kecuali jika diperkuat. From 370fd149cd0b974f343f25a8683274fd24f71f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ga=C5=A1par=C3=ADk?= Date: Mon, 23 Nov 2020 14:47:08 +0100 Subject: [PATCH 018/123] Czech translation for future v117 --- core/assets/bundles/bundle_cs.properties | 106 ++++++++++++----------- 1 file changed, 57 insertions(+), 49 deletions(-) diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index bf15164929..c3ff3a3946 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -17,15 +17,12 @@ linkfail = Nepodařilo se otevřít odkaz!\nAdresa URL byla zkopírována do sch screenshot = Snímek obrazovky uložen {0} screenshot.invalid = Mapa je moc velká, nemusí být dost paměti pro získání snímku obrazovky. gameover = Konec hry -gameover.disconnect = Odpojit se gameover.pvp = Vyhrál tým [accent]{0}[]! -gameover.waiting = [accent]Hra čeká na další mapu... highscore = [accent]Nový rekord! copied = Zkopírováno. indev.popup = Mindustry [accent]v6[] je aktuálně ve verzi [accent]beta[].\n[lightgray]To znamená:[]\n[scarlet]- Kampaň je nedokončená[]\n- Cokoli, co vidíte, se může změnit nebo být odstraněno.\n\nHlaste prosím chyby na [accent]Github[]. indev.notready = Tato část hry ještě není připravena -indev.campaign = [accent]Dovršil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích. - +indev.campaign = [accent]Završil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích. load.sound = Zvuky load.map = Mapy @@ -498,10 +495,10 @@ requirement.produce = Vyrob {0} requirement.capture = Polap {0} launch.text = Vyslat research.multiplayer = Jen hostitel hry může vynalézat nové technologie. +map.multiplayer = Jen hostitel může prohlížet sektory. uncover = Odkrýt mapu configure = Přizpůsobit vybavení -#TODO loadout = Načtení resources = Zdroje bannedblocks = Zakázané bloky @@ -509,12 +506,6 @@ addall = Přidat vše launch.from = Vysláno z: [accent]{0} launch.destination = Cíl: {0} configure.invalid = Hodnota musí být číslo mezi 0 a {0}. -zone.unlocked = [lightgray]Mapa {0} byla odemknuta.[] -zone.requirement.complete = Bylo dosaženo vlny {0},\nčímž byla splněna podmínka pro mapu {1}. -zone.resources = [lightgray]Byly detekovány tyto suroviny:[] -zone.objective = [lightgray]Úkol: [][accent]{0}[] -zone.objective.survival = Přežij -zone.objective.attack = Znič nepřátelské jádro add = Přidat... boss.health = Životy Strážce @@ -548,12 +539,17 @@ sectors.launch = Vyslat sectors.select = Vybrat sectors.nonelaunch = [lightgray]bez (slunce)[] sectors.rename = Přejmenovat sektor - +sectors.enemybase = [scarlet]Nepřátelská základna +sectors.vulnerable = [scarlet]Zranitelný +sectors.underattack = [scarlet]Pod palbou! [accent]{0}% poškozeno +sectors.survives = [accent]Přežívá již {0} vln +sectors.go = Jdi sector.curcapture = Sektor polapen +sector.curlost = Sektor ztracen sector.missingresources = [scarlet]Nedostatečné zdroje v jádře sector.attacked = Sektor [accent]{0}[white] pod útokem! sector.lost = Sektor [accent]{0}[white] ztracen! :( -#note: the missing space in the line below is intentional +#note: chybějící mezera v řádce níže je záměrná :) sector.captured = Sektor [accent]{0}[white]polapen! :) threat.low = Nízké @@ -584,16 +580,13 @@ sector.windsweptIslands.name = Větrné ostrovy sector.extractionOutpost.name = Extrakční základna sector.planetaryTerminal.name = Planetární odpalovací terminál -#unused -#sector.crags.name = Crags - sector.groundZero.description = Optimální místo, kde znovu začít. Nízký výskyt nepřátel. Několik málo surovin.\nPosbírej co nejvíce olova a mědi.\nBěž dál. sector.frozenForest.description = Dokonce až sem, blízko hor, se dokázaly spóry rozrůst. Mráz je však nemůže zadržet navěky.\n\nPusť se do práce za pomocí energie. Stav spalovací generátory. Nauč se, jak používat opravovací věže. sector.saltFlats.description = Na okraji pouště leží Solné nížiny. V této lokaci se nachází jen několik málo surovin.\n\nNepřítel zde vybudoval zásobovací komplex. Znič jádro v jeho základně. Nenechej kámen na kameni. sector.craters.description = V těchto relikviích starých válek se nahromadilo velké množství vody. Znovu získej tuto oblast. Sbírej písek. Vyrob z něj metasklo. Použij vodu k chlazení svých vrtů a střílen. sector.ruinousShores.description = Za pustinou se nachází pobřeží. Kdysi zde stál obranný pobřežní systém. Moc z něj už dneska nezbylo. Jen základní konstrukce zůstaly ušetřeny, zbytek se rozpadl na šrot.\nPokračuj ve své expanzi hlouběji. Objev ztracenou technologii. sector.stainedMountains.description = Dále ve vnitrozemí leží hory, dosud neposkvrněny spórami.\nVytěž titan, kterým tato oblast oplývá. Nauč se jej používat.\n\nPřítomnost nepřátelských jednotek je zde větší. Radši jim nedej moc času na vyslání jejich nejsilnějších jednotech. -sector.overgrowth.description = Tato přerostlá džungle se nachází blíže ke zdroji spór.\nNepřítel zde zbudoval předsunutou hlídku. Stav jednotky Dýka a znič s jejich pomocí jádro základny. Získej znovu to, co bylo již dávno ztraceno. +sector.overgrowth.description = Tato přerostlá džungle se nachází blíže ke zdroji spór.\nNepřítel zde zbudoval předsunutou hlídku. Stav jednotky Palcát a znič s jejich pomocí jádro základny. sector.tarFields.description = Rozhraní produkční naftové oblasti mezi horami a pouští. Jedna z mála oblastí, kde se stále nachází dehet.\nAčkoliv je oblast opuštěná, stále se v jejím okolí nachází nebezpečné nepřátelské síly. Není radno je podcenit.\n\n[lightgray]Vyzkoumej technologii na zpracování nafty.[] sector.desolateRift.description = Extrémně nebezpečná mapa. Na úkor prostoru se zde nachází přehršel surovin. Vysoká pravděpodobnost zničení. Opusť tuto oblast co nejdříve to půjde. Nenech se zmást dlouhými prodlevami mezi vlnami nepřátel. sector.nuclearComplex.description = Bývalá továrna na zpracování thoria, dnes v troskách.\n[lightgray]Objev thorium a jeho široké využití.[]\n\nNepřátelské jednotky se zde nacházejí v hojném počtu, a neustále prohledávají oblast. @@ -803,16 +796,15 @@ setting.conveyorpathfinding.name = Hledat cestu při umisťování pásu setting.sensitivity.name = Citlivost ovladače setting.saveinterval.name = Interval automatického ukládání setting.seconds = {0} sekund -setting.blockselecttimeout.name = Časový limit pro výběr bloku setting.milliseconds = {0} milisekund setting.fullscreen.name = Celá obrazovka -setting.borderlesswindow.name = Bezokrajové okno[lightgray] (může výt vyžadován restart)[] +setting.borderlesswindow.name = Bezokrajové okno [lightgray](může výt vyžadován restart) setting.fps.name = Ukázat FPS a ping setting.smoothcamera.name = Plynulá kamera setting.vsync.name = Vertikální synchronizace setting.pixelate.name = Rozpixlovat setting.minimap.name = Ukázat mapičku -setting.coreitems.name = Ukázat položky jádra (WIP) +setting.coreitems.name = Ukázat položky jádra setting.position.name = Ukázat pozici hráče setting.musicvol.name = Hlasitost hudby setting.atmosphere.name = Ukázat atmosféru planety @@ -892,6 +884,8 @@ keybind.menu.name = Hlavní nabídka keybind.pause.name = Pozastavení hry keybind.pause_building.name = Pozastavit nebo spustit stavění keybind.minimap.name = Mapička +keybind.planet_map.name = Planetární mapa +keybind.research.name = Výzkum keybind.chat.name = Kanál zpráv keybind.player_list.name = Seznam hráčů keybind.console.name = Terminál @@ -1016,6 +1010,7 @@ block.resupply-point.name = Zásobovací místo block.parallax.name = Paralaxa block.cliff.name = Útes block.sand-boulder.name = Pískovec +block.basalt-boulder.name = Čedičový balvan block.grass.name = Tráva block.slag.name = Struska block.space.name = Vesmír @@ -1239,34 +1234,47 @@ team.derelict.name = opuštěný team.green.name = zelený team.purple.name = fialový -tutorial.next = [lightgray] -tutorial.intro = Vítej ve [scarlet]výuce Mindustry[]. Zde se dozvíš základy hraní.\nPoznámka: výuka předpokládá [accent]výchozí klávesy[] v nastavení, pokud jsi je změnil, bude třeba to vzít v potaz.\nPoužij [accent][[WASD][] pro pohyb a [accent]kolečko myši[] pro přibližování a oddalování.\nZačni [accent]těžením mědi[]. Přibliž se k měděné žíle u Tvého jádra a klikni na ni pro zahájení těžby.\n\n[accent]{0}/{1} mědi[] -tutorial.intro.mobile = Vítej ve [scarlet]výuce Mindustry[].\nPohybuj se táhnutím prstem do strany.\nPřibližuj a oddaluj mapu [accent]2 prsty[].\nZačni [accent] těžením mědi[]. Přibliž se k měděné žíle u Tvého jádra a ťupni na ni pro zahájení těžby.\n\n[accent]{0}/{1} mědi[] -tutorial.drill = Sám vidíš, že ruční těžba není moc efektivní.\n[accent]Vrty[] umožňují těžit automaticky.\nKlikni na vrt v nabídce v pravém dolním rohu.\nVyber [accent]mechanický vrt[]. Umisti jej kliknutím na měděnou žílu.\nTaké můžeš vybrat mechanický vrt stiskem kláves [accent][[2][] a následně [accent][[1][] rychle po sobě, nezávisle na tom, jaká záložka je v nabídce zrovna otevřena.\n[accent]Pravým klikem[] přerušíš stavění. -tutorial.drill.mobile = Sám vidíš, že ruční těžba není moc efektivní.\n[accent]Vrty[] umožňují těžit automaticky.\nŤupni na vrt v nabídce v pravém dolním rohu.\nVyber [accent]mechanický vrt[]. Umisti jej klikutím na měděnou žílu ťupnutím a následně zaškrtni [accent]fajfku[] na spodku nabídky pro potvrzení volby.\nŤupnutím na [accent]X[] přerušíš stavění. -tutorial.blockinfo = Každý blok má jiné vlastnosti. Každý vrt může těžit pouze některé suroviny.\nPro zobrazení informací a statistik o bloku [accent]zvol "?" při vybraném bloku ve stavební nabídce[].\n\nNyní se podívej na [accent]vlastnosti mechanického vrtu[]. -tutorial.conveyor = Pro dopravu materiálu k jádru jsou zapotřebí [accent]dopravníky[].\nVytvoř řadu dopravníků od vrtu až k jádru.\nDrž zmáčknuté [accent]levé tlačítko myši[], abys umístil dopravníky v jedné řadě.\nKdyž zmáčkneš [accent]Ctrl[], řada dopravníků se bude umisťovat navíc úhlopříčně.\nPoužij [accent]kolečko myši[] pro otáčení bloku před umístěním.\n[accent]Umísti dopravníky tak, abys dopravil měď do jádra[]. -tutorial.conveyor.mobile = Pro dopravu materiálu k jádru jsou zapotřebí [accent]dopravníky[].\nVytvoř řadu dopravníků od vrtu až k jádru.\n[accent]Pokládej dopravníky v řadě ťupnutím a delším prstu[] a táhnutím v požadovaném směru.\n[accent]Umísti dopravníky tak, abys dopravil měď do jádra[]. -tutorial.turret = Jakmile se materiál dostane do jádra, může být použit pro konstrukci.\nPamatuj si, že ne všechno lze použít pro konstrukci.\nVěci, které melze použít jako stavební materiál, jako například [accent]uhlí[] nebo [accent]šrot[], nelze do jádra uložit, a zasekne tak celý dopravník na vstupu.\nPro odehnání útočných jednotek [lightgray]nepřítele[] od jádra je třeba postavit obranné konstrukce.\nPostav [accent]střílnu Duo[] poblíž svého jádra. -tutorial.drillturret = Střílny Duo potřebují jako střelivo [accent]měď[].\nPolož mechanický vrt blízko střílny.\nPro zásobování mědí veď dopravníky od vrtu ke střílně.\n\n[accent]Doručeno střeliva: {0}/{1}[] -tutorial.pause = Během hry, například v boji, můžeš [accent]pozastavit hru[].\nPři pozastavení můžeš naplánovat konstrukci do fronty.\n\n[accent]Pozastav hru mezerníkem[]. -tutorial.pause.mobile = Během hry, například v boji, můžeš [accent]pozastavit hru[].\nPři pozastavení můžeš naplánovat konstrukci do fronty.\n\n[accent]Pozastavení hry probedeš ťupnutím na dvě čárky vlevo nahoře. -tutorial.unpause = Teď zmáčkni mezerník znova a pokračuj ve hře. -tutorial.unpause.mobile = Teď ťupni na ikonu na stejném místě a pokračuj ve hře. -tutorial.breaking = Bloky je třeba nejen stavět, ale Často rozbít.\n[accent]Drž pravé tlačítko myšu[] a táhni s ní pro výběr bloků, které potřebuješ rozbít.\n\n[accent]Znič všechen šrot vlevo od Tvého jádra použitím blokového výběru[]. -tutorial.breaking.mobile = Bloky je třeba nejen stavět, ale Často rozbít.\n[accent]Ťupnu na ikonku kladiva dole[] a pak ťupni na blok, který chceš rozbít.\nRozbití více bloků se provádí delším podržením prstu a táhnutím.\nRozbití dokončíš ťupnutím na fajfku.\n\n[accent]Znič všechen šrot vlevo od Tvého jádra použitím blokového výběru[]. -tutorial.withdraw = Někdy je třeba odebírat předměty přímo z bloků.\n[accent]Klikni na blok[], ve kterém jsou předměty a pak [accent]klikni na předmět[] z inventáře bloku.\nVícero předmětů může být odebráno [accent]ťupnutím a držením[].\n\n[accent]Odeber trochu mědi z jádra[]. -tutorial.deposit = Vložit předměty do bloku můžeš přetažením z Tvé lodi na cílový blok.\n\n[accent]Vlož odebranou měď zprátky do Tvého jádra[]. -tutorial.waves = [lightgray]Nepřítel[] se přibližuje.\n\nUbraň své jádro po dobu 2 vln. [accent]Klikni levým tlačítkem[] pro střílení.\nPostav více střílen a vrtů. Natěž více mědi. -tutorial.waves.mobile = [lightgray]Nepřítel[] se přibližuje.\n\nUbraň své jádro po dobu 2 vln. Tvá loď bude automaticky střílet po nepřátelských jednotkách.\nPostav více střílen a vrtů. Natěž více mědi. -tutorial.launch = Jakmile dosáhneš určité vlny, budeš moci [accent]vyslat své jádro zpět[]. Opustíš tím svou základnu a [accent]získáš suroviny uložené v jádře[].\nZískané suroviny mohou být použity pro výzkum nových technologií.\n\n[accent]Stiskni tlačítko pro vyslání jádra zpět[]. +hint.skip = Přeskočit +hint.desktopMove = Použij [accent][[WASD][] k pohybu. +hint.zoom = [accent]Roluj[] prp přiblížení a oddalování obrazvky. +hint.mine = Přesuň se poblíž \uf8c4 měděné rudy a [accent]ťupni[] na ni pro zahájení těžby. +hint.desktopShoot = Klikni na [accent][[levé tlačítko][] myši pro střelbu. +hint.depositItems = Pro přesun položek je přetáhni ze své lodi do jádra. +hint.respawn = Aby ses znovu přepnul na loď, zmáčkni [accent][[V][]. +hint.respawn.mobile = Přepnul ses na ovládání jednotky nebo konstrukce. Aby ses přepnul zpět na loď, klikni na avatara vlevo nahoře. +hint.desktopPause = Zmáčkni [accent][[mezerník][] k pozastavení a zase spuštění hry. +hint.placeDrill = Vyber si záložku \ue85e [accent]Vrtů[] v nabídce vpravo dole, potom vyber \uf870 [accent]Vrt[] a klikni na oblast s mědí k umístění. +hint.placeDrill.mobile = Vyber si záložku \ue85e[accent]Vrtů[] v nabídce vpravo dole, potom vyber \uf870 [accent]Vrt[] a ťupni na oblast s mědí k umístění.\n\Ťupni na \ue800 [accent]zaškrtnutí[] vpravo dole pro potvrzení. +hint.placeConveyor = Dopravníky přesouvají materiál z vrtu do dalších bloků. Vyber \uf896 [accent]Dopravník[] ze záložky \ue814 [accent]Distribuce[].\n\nKlikni a táhni pro umístění vícero dopravníků.\n[accent]Roluj[] pro otočení. +hint.placeConveyor.mobile = Dopravníky přesouvají materiál z vrtu do dalších bloků. Vyber \uf896 [accent]Dopravník[] ze záložky \ue814 [accent]Distribuce[].\n\nPodrž chvíli prst a táhni pro umístění vícero dopravníků. +hint.placeTurret = Umisti \uf861 [accent]Věž[], abys ubránil Tvoji základnu před nepřáteli.\n\nVěže vyžaduj munici - v tomto případě je jí \uf838měď.\nPoužij vrty a dopravníky, abys nějakou získal. +hint.breaking = Klikni [accent]pravým tlačítkem[] a potáhni pro rozbití bloků. +hint.breaking.mobile = Použij \ue817 [accent]kladivo[] v pravém spodním rohu a pak ťupni pro rozbití bloků.\n\nPodrž chvíli prst a táhni pro rozbití bloků ve výběru. +hint.research = Použij tlačítko \ue875 [accent]Výzkum[] pro vyzkoumání nové technologie. +hint.research.mobile = Použij tlačítko \ue875 [accent]Výzkum[] v \ue88c [accent]nabídce[] pro vyzkoumání nové technologie. +hint.unitControl = Podrž [accent][[Levý Ctrl][] a [accent]klikni[] pro ovládání spřátelených jednotek nebo věží. +hint.unitControl.mobile = [accent][Dvojťupni[] pro ovládání spřátelených jednotek nebo věží. +hint.launch = Jakmile je nasbíráno dostatek zdrojových materiálů, můžeš se [accent]vyslat[] do přilehlých sektorů z \ue827 [accent]mapy[] v pravém dolním rohu. +hint.launch.mobile = Jakmile je nasbíráno dostatek zdrojových materiálů, můžeš se [accent]vyslat[] do přilehlých sektorů z \ue827 [accent]mapy[] v the \ue88c [accent]nabídce[]. +hint.schematicSelect = Podrž [accent][[F][] a potáhni pro výběr bloků, které chceš zkopírovat.\n\nKlikni na [accent][[prostřední tlačítko][] myši pro zkopírování jednoho typu bloku. +hint.conveyorPathfind = Podrž [accent][[levý Ctrl][], když táhneš dopravníky, pro automatické vygenerování cesty. +hint.conveyorPathfind.mobile = Povol \ue844 [accent]úhlopříčný režim[] a potáhni dopravníky pro automatické generování cesty. +hint.boost = Podrž [accent][[levý Shift][], abys přeletěl přes překážky se svou současnou jednotkou.\n\nPouze některé jednotky však mají takový posilovač. +hint.command = Zmáčkni [accent][[G][] pro vytvoření formace z blízkých jednotek. +hint.command.mobile = [accent][[Dvojťupni][] na Tvoji jednotku pro vytvoření formace z blízkých jednotek. +hint.payloadPickup = Zmáčkni [accent][[[] pro sebrání malých bloků nebo jednotek. +hint.payloadPickup.mobile = [accent]Ťupni a podrž[] na malém bloku nebo jednotce pro sebrání. +hint.payloadDrop = Zmáčkni [accent]][] pro položení nákladu. +hint.payloadDrop.mobile = [accent]Ťupni a drž[] na prázdném místě pro položení nákladu. +hint.waveFire = [accent]Naplň[] věže vodou místo munice pro automatické hašení okolních požárů. +hint.generator = \uf879 [accent]Spalovací generátory[] pálí uhlí a přenášení energii do sousedících bloků.\n\nPřenos energie na delší vzdálenost se provádí pomocí \uf87f [accent]Energetických uzlů[]. item.copper.description = Používá se ve všech typech bloků a munice. item.copper.details = Měď. Nezvykle nadpočetný kov na Serpulu. Konstrukčně slabý, pokud není rafinovaná. -item.lead.description = Používá se v přepravě kapalin a elektrických konstrukcích. +item.lead.description = Používá se v přepravě kapalin a energetických konstrukcích. item.lead.details = Hutný, netečný materiál. Hojně používán v bateriích.\nPoznámka: Pravděpodobně toxický pro biologické formy života. Ne že by jich tady moc zbývalo. item.metaglass.description = Používá se v přepravě kapalin a úložných konstrukcích. -item.graphite.description = Používá se v elektrických komponentách a nábojích do věží. +item.graphite.description = Používá se v energerických komponentách a nábojích do věží. item.sand.description = Používá se ve výrobě ostatních rafinovaných materiálů. item.coal.description = Používá se na palivo a výrobu rafinovaný materiálů. item.coal.details = Jeví se být zkamenělou rostlinou hmotou, zformovaou dávno před událostí vytvoření tohoto světa náhodným číslem. @@ -1318,21 +1326,21 @@ block.copper-wall.description = Chrání konstrukce před nepřátelskými stře block.copper-wall-large.description = Chrání konstrukce před nepřátelskými střelami. block.titanium-wall.description = Chrání konstrukce před nepřátelskými střelami. block.titanium-wall-large.description = Chrání konstrukce před nepřátelskými střelami. -block.plastanium-wall.description = Chrání konstrukce před nepřátelskými střelami. Pohlcuje laserové a elektrické výboje. Automaticky blokuje energetické spoje. +block.plastanium-wall.description = Chrání konstrukce před nepřátelskými střelami. Pohlcuje laserové a energetické výboje. Automaticky blokuje energetické spoje. block.plastanium-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Absorbs lasers and electric arcs. Automaticky blokuje energetické spoje. block.thorium-wall.description = Chrání konstrukce před nepřátelskými střelami. block.thorium-wall-large.description = Chrání konstrukce před nepřátelskými střelami. block.phase-wall.description = Chrání konstrukce před nepřátelskými střelami, reflecting most bullets upon impact. block.phase-wall-large.description = Chrání konstrukce před nepřátelskými střelami, reflecting most bullets upon impact. -block.surge-wall.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává elektrické výboje. -block.surge-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává elektrické výboje. +block.surge-wall.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává energetické výboje. +block.surge-wall-large.description = Chrání konstrukce před nepřátelskými střelami. Při doteku opakovaně vydává energetické výboje. block.door.description = Zeď, která může být otevřena a zavřena. block.door-large.description = Zeď, která může být otevřena a zavřena. block.mender.description = Opakovaně opravuje bloky ve svém dosahu.\nVolitelně umí použít křemík pro posílení dosahu a efektivity. block.mend-projector.description = Opakovaně opravuje bloky ve svém dosahu.\nVolitelně umí použít fázovou tkaninu pro posílení dosahu a efektivity. block.overdrive-projector.description = Zrychluje funkce budov v okolí.\nVolitelně umí využít fázovou tkaninu pro posílení dosahu a efektivity. block.force-projector.description = Vytváří okolo sebe šestiúhelníkové silové pole. Chrání konstrukce a jednotky uvnitř pole před poškozením.\nPřehřívá se, pokud obdrží moc poškození. Přehřátí lze eliminovat použitím chlazení. Fázová tkanina zvyšje velikost pole. -block.shock-mine.description = Vydává elektrické výboje při dotyku nepřátelskou jednotkou. +block.shock-mine.description = Vydává energetické výboje při dotyku nepřátelskou jednotkou. block.conveyor.description = Přepravuje předměty vpřed. block.titanium-conveyor.description = Přepravuje předměty vpřed. Rychlejší, než standardní dopravník. block.plastanium-conveyor.description = Přepravuje předměty vpřed in batches. Přijímá předměty zezadu, a vykládá je do tří směrů vpředu. Vyžaduje více nakládacích a vykládacích bodů pro špičkový průtok. @@ -1438,7 +1446,7 @@ unit.fortress.description = Střílí dělostřelecké salvy na pozemní cíle. unit.scepter.description = Střílí palbu nabitých střel na všechny okolní nepřátele. unit.reign.description = Střílí palbu masivních střel pronikajících brněním na všechny okolní nepřátele. unit.nova.description = Střílí laserové výboje, které poškozují nepřátele a opravují spojenecké konstrukce. Je schopný letu. -unit.pulsar.description = Střílí oblouky elektřiny, které poškozují nepřátele a opravují spojenecké struktury. Schopný letu. +unit.pulsar.description = Střílí energetické oblouky, které poškozují nepřátele a opravují spojenecké struktury. Schopný letu. unit.quasar.description = Střílí pronikavé laserové paprsky, které poškozují nepřátele a opravují spojenecké struktury. Schopný letu. Oštítovaný. unit.vela.description = Střílí masivní nepřetržitý laserový paprsek, který poškozuje nepřátele, způsobuje požáry a opravuje spojenecké struktury. Schopný letu. unit.corvus.description = Střílí masivní laserový paprsek, který poškozuje nepřátele a opravuje spojenecké struktury. Může překonat většinu z terénů. @@ -1446,7 +1454,7 @@ unit.crawler.description = Běží směrem k nepřátelům, vybuchne a způsobí unit.atrax.description = Střílí oslabující koule strusky na pozemní cíle. Může překonat většinu z terénů. unit.spiroct.description = Střílí mířené laserové paprsky na nepřátele, a zároveň se tím opravuje. Může překročit většinu terénu. unit.arkyid.description = Střílí velké mířené laserové paprsky na nepřátele, a zároveň se tím opravuje. Může překročit většinu terénu. -unit.toxopid.description = Střílí na nepřátele velké elektrické kazetové střely a lasery pronikající brněním. Může překročit většinu z terénů. +unit.toxopid.description = Střílí na nepřátele velké energetické kazetové střely a lasery pronikající brněním. Může překročit většinu z terénů. unit.flare.description = Střílí základní střely na okolní nepřátele. unit.horizon.description = Pouští shluky bomb na pozemní cíle. unit.zenith.description = Střílí salvy raket na všechny blízké nepřátele. From 1cfa5db611305fcf7315d080b0fb9c77235733bb Mon Sep 17 00:00:00 2001 From: simba-fs Date: Mon, 23 Nov 2020 23:48:37 +0800 Subject: [PATCH 019/123] modify zh-TW translation --- core/assets/bundles/bundle_zh_TW.properties | 94 ++++++++++----------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 591ef50191..a6b9f10cf7 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -55,7 +55,7 @@ schematic.saved = 藍圖已儲存。 schematic.delete.confirm = 該藍圖將被完全清除。 schematic.rename = 重新命名藍圖 schematic.info = {0}x{1}, {2}方塊 -schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server. +schematic.disabled = [scarlet]藍圖被進用[]\n你不能在這個[accent]地圖[] 或 [accent]伺服器中使用藍圖. stat.wave = 打敗的波次：[accent]{0} stat.enemiesDestroyed = 摧毀的敵人：[accent]{0} @@ -115,7 +115,7 @@ mod.disable = 禁用 mod.content = 內容： mod.delete.error = 無法刪除模組，檔案可能在使用中。 mod.requiresversion = [scarlet]最低遊戲版本要求：[accent]{0} -mod.outdated = [scarlet]與 V6 不相容（無 minGameVersion: 105） +mod.outdated = [scarlet]與 V6 不相容（無 最低遊戲版本: 105） mod.missingdependencies = [scarlet]缺少依賴關係：{0} mod.erroredcontent = [scarlet]內容錯誤 mod.errors = 載入內容時發生錯誤 @@ -331,7 +331,7 @@ editor.generation = 篩選器: editor.ingame = 在遊戲中編輯 editor.publish.workshop = 在工作坊上發佈 editor.newmap = 新地圖 -editor.center = Center +editor.center = 中心 workshop = 工作坊 waves.title = 波次 waves.remove = 移除 @@ -420,7 +420,7 @@ filters.empty = [lightgray]沒有過濾器！使用下面的按鈕新增一個 filter.distort = 扭曲 filter.noise = 雜訊 filter.enemyspawn = 敵人重生選擇 -filter.spawnpath = Path To Spawn +filter.spawnpath = 生成路徑 filter.corespawn = 核心選擇 filter.median = 平均數 filter.oremedian = 礦石平均數 @@ -445,7 +445,7 @@ filter.option.amount = 數量 filter.option.block = 方塊 filter.option.floor = 地板 filter.option.flooronto = 目標地板 -filter.option.target = Target +filter.option.target = 目標 filter.option.wall = 牆 filter.option.ore = 礦石 filter.option.floor2 = 次要地板 @@ -479,7 +479,7 @@ requirement.research = 研究 {0} requirement.capture = 捕獲 {0} bestwave = [lightgray]最高波次：{0} launch.text = 發射 -research.multiplayer = Only the host can research items. +research.multiplayer = 只有管理者可以使用這個物品 uncover = 探索 configure = 設定 loadout = 裝載 @@ -512,7 +512,7 @@ weather.rain.name = 雨 weather.snow.name = 雪 weather.sandstorm.name = 沙塵暴 weather.sporestorm.name = 孢子風暴 -weather.fog.name = Fog +weather.fog.name = 霧 sectors.unexplored = [lightgray]未探索 sectors.resources = 資源： @@ -522,11 +522,11 @@ sectors.resume = 繼續 sectors.launch = 發射 sectors.select = 選取 sectors.nonelaunch = [lightgray]無（太陽） -sectors.rename = Rename Sector -sector.missingresources = [scarlet]Insufficient Core Resources +sectors.rename = 重新命名區域 +sector.missingresources = [scarlet]核心資源不足 planet.serpulo.name = Serpulo -planet.sun.name = Sun +planet.sun.name = 太陽 sector.groundZero.name = 原點 sector.craters.name = 火山島 @@ -566,10 +566,10 @@ settings.clear.confirm = 您確定要清除資料嗎？\n此動作無法復原 settings.clearall.confirm = [scarlet]警告！[]\n這會清除所有資料，包括存檔、地圖、解鎖項目和快捷鍵綁定。\n按「是」後，遊戲將刪除所有資料並自動結束。 settings.clearsaves.confirm = 您確定您想要清除所有存檔嗎？ settings.clearsaves = 清除存檔 -settings.clearresearch = Clear Research -settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research? -settings.clearcampaignsaves = Clear Campaign Saves -settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves? +settings.clearresearch = 清除研究 +settings.clearresearch.confirm = 你確定要清除所有研究？ +settings.clearcampaignsaves = 清除戰役紀錄 +settings.clearcampaignsaves.confirm = 你確定要清除所有戰役紀錄？ paused = [accent]（已暫停） clear = 清除 banned = [scarlet]已被封鎖 @@ -606,7 +606,7 @@ stat.powerconnections = 最大連結數 stat.poweruse = 能量使用 stat.powerdamage = 能量/傷害 stat.itemcapacity = 物品容量 -stat.memorycapacity = Memory Capacity +stat.memorycapacity = 記憶體容量 stat.basepowergeneration = 基礎能量生產 stat.productiontime = 生產時間 stat.repairtime = 方塊完全修復時間 @@ -626,22 +626,22 @@ stat.reload = 射擊次數/秒 stat.ammo = 彈藥 stat.shieldhealth = 護盾生命值 stat.cooldowntime = 冷確時間 -stat.explosiveness = Explosiveness -stat.basedeflectchance = Base Deflect Chance -stat.lightningchance = Lightning Chance -stat.lightningdamage = Lightning Damage -stat.flammability = Flammability -stat.radioactivity = Radioactivity -stat.heatcapacity = HeatCapacity -stat.viscosity = Viscosity -stat.temperature = Temperature -stat.speed = Speed -stat.buildspeed = Build Speed -stat.minespeed = Mine Speed -stat.minetier = Mine Tier -stat.payloadcapacity = Payload Capacity -stat.commandlimit = Command Limit -stat.abilities = Abilities +stat.explosiveness = 爆炸性 +stat.basedeflectchance = 基礎偏移量 +stat.lightningchance = 燃燒機率 +stat.lightningdamage = 燃燒傷害 +stat.flammability = 易燃性 +stat.radioactivity = 輻射性 +stat.heatcapacity = 熱容量 +stat.viscosity = 黏度 +stat.temperature = 溫度 +stat.speed = 速度 +stat.buildspeed = 建築速度 +stat.minespeed = 挖掘速度 +stat.minetier = 挖掘等級 +stat.payloadcapacity = 負荷量 +stat.commandlimit = 指令限制 +stat.abilities = 能力 ability.forcefield = Force Field ability.repairfield = Repair Field @@ -659,7 +659,7 @@ bar.powerbalance = 能量變化：{0} bar.powerstored = 能量存量: {0}/{1} bar.poweramount = 能量：{0} bar.poweroutput = 能量輸出：{0} -bar.powerlines = Connections: {0}/{1} +bar.powerlines = 連線: {0}/{1} bar.items = 物品：{0} bar.capacity = 容量: {0} bar.unitcap = {0} {1}/{2} @@ -671,7 +671,7 @@ bar.progress = 建造進度 bar.input = 輸入 bar.output = 輸出 -units.processorcontrol = [lightgray]Processor Controlled +units.processorcontrol = [lightgray]由微處理器控制 bullet.damage = [stat]{0}[lightgray]傷害 bullet.splashdamage = [stat]{0}[lightgray]範圍傷害 ~[stat] {1}[lightgray]格 @@ -680,15 +680,15 @@ bullet.homing = [stat]追蹤 bullet.shock = [stat]電擊 bullet.frag = [stat]破片彈 bullet.knockback = [stat]{0}[lightgray]擊退 -bullet.pierce = [stat]{0}[lightgray]x pierce -bullet.infinitepierce = [stat]pierce +bullet.pierce = [stat]{0}[lightgray]×穿刺 +bullet.infinitepierce = [stat]穿刺 bullet.freezing = [stat]冷凍 bullet.tarred = [stat]焦油 bullet.multiplier = [stat]{0}[lightgray]×彈藥倍數 bullet.reload = [stat]{0}[lightgray]×射擊速率 unit.blocks = 方塊 -unit.blockssquared = blocks² +unit.blockssquared = 方塊² unit.powersecond = 能量單位/秒 unit.liquidsecond = 液體單位/秒 unit.itemssecond = 物品/秒 @@ -711,7 +711,7 @@ category.power = 能量 category.liquids = 液體 category.items = 物品 category.crafting = 需求 -category.function = Function +category.function = 方法 category.optional = 可選的強化 setting.landscape.name = 鎖定水平畫面 setting.shadows.name = 陰影 @@ -861,7 +861,7 @@ mode.custom = 自訂規則 rules.infiniteresources = 無限資源 rules.reactorexplosions = 反應爐爆炸 -rules.schematic = Schematics Allowed +rules.schematic = 允許使用藍圖 rules.wavetimer = 波次時間 rules.waves = 波次 rules.attack = 攻擊模式 @@ -1007,7 +1007,7 @@ block.darksand-water.name = 黑沙水 block.char.name = 燒焦 block.dacite.name = 英安岩 block.dacite-wall.name = 英安岩牆 -block.dacite-boulder.name = Dacite Boulder +block.dacite-boulder.name = 英安岩石塊 block.ice-snow.name = 冰雪 block.stone-wall.name = 石牆 block.ice-wall.name = 冰牆 @@ -1151,24 +1151,24 @@ block.command-center.name = 指揮中心 block.ground-factory.name = 地面工廠 block.air-factory.name = 航空工廠 block.naval-factory.name = 海軍工廠 -block.additive-reconstructor.name = 加法重建者 -block.multiplicative-reconstructor.name = 乘法重建者 -block.exponential-reconstructor.name = 指數重建者 -block.tetrative-reconstructor.name = 特殊重建者 +block.additive-reconstructor.name = 一級升級者 +block.multiplicative-reconstructor.name = 二級升級者 +block.exponential-reconstructor.name = 三級升級者 +block.tetrative-reconstructor.name = 四級升級者 block.payload-conveyor.name = 原料輸送帶 block.payload-router.name = 原料分配器 block.disassembler.name = 拆裝機 block.silicon-crucible.name = 矽爐 block.overdrive-dome.name = 高速拱頂 -block.switch.name = 交換器 +block.switch.name = 按鈕 block.micro-processor.name = 微處理器 block.logic-processor.name = 邏輯處理器 block.hyper-processor.name = 超級處理器 -block.logic-display.name = 邏輯顯示 -block.large-logic-display.name = 大型邏輯顯示 +block.logic-display.name = 顯示器 +block.large-logic-display.name = 大型顯示器 block.memory-cell.name = 記憶單元 -block.memory-bank.name = Memory Bank +block.memory-bank.name = 記憶體 team.blue.name = 藍 team.crux.name = 紅 From 45b355508dfdac038723369372d9ff237883cd82 Mon Sep 17 00:00:00 2001 From: Nikolass1000 <68129216+Nikolass1000@users.noreply.github.com> Date: Mon, 23 Nov 2020 18:56:06 +0100 Subject: [PATCH 020/123] Update contributors --- core/assets/contributors | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index 39c29ff93a..d04b442cfe 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -100,4 +100,5 @@ MEEP of Faith jalastram (freesound.org) newlocknew (freesound.org) dsmolenaers (freesound.org) -Headphaze (freesound.org) \ No newline at end of file +Headphaze (freesound.org) +Nikolass From 6f751161973c4efd13cc7c00dd349aeb01a79273 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Mon, 23 Nov 2020 20:06:37 +0100 Subject: [PATCH 021/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 218 ++++++++++++----------- 1 file changed, 110 insertions(+), 108 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 909659417e..1c4d7a716d 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -146,9 +146,10 @@ noname = Elige un[accent] nombre de jugador[] primero. planetmap = Mapa del planeta launchcore = Lanzar núcleo filename = Nombre del archivo: -unlocked = ¡Nuevo Bloque Desbloqueado! +unlocked = ¡Nuevo contenido en la Base de Datos! +available = ¡Nueva investigación disponible! completed = [accent]Completado -techtree = Árbol de Tecnologías +techtree = Tecnologías research.list = [lightgray]Investigación: research = Investigación researched = [lightgray]{0} investigado. @@ -187,7 +188,7 @@ hosts.discovering = Buscando partidas en LAN... hosts.discovering.any = Buscando partidas server.refreshing = Actualizando servidor... hosts.none = [lightgray]No se han encontrado partidas en LAN -host.invalid = [scarlet]No se ha podido conectar al anfitrión +host.invalid = [scarlet]No se pudo conectar con el anfitrión servers.local = Servidores Locales servers.remote = Servidores Remotos @@ -540,10 +541,10 @@ sectors.resume = Reanudar sectors.launch = Lanzar sectors.select = Elegir sectors.nonelaunch = [lightgray]Ninguno (Sol) -sectors.rename = Renombrar Sector +sectors.rename = Renombrar sector sectors.enemybase = [scarlet]Base enemiga sectors.vulnerable = [scarlet]Vulnerable -sectors.underattack = [scarlet]¡Bajo ataque! [accent]{0}% Dañado +sectors.underattack = [scarlet]¡Bajo ataque! [accent]{0}% dañado sectors.survives = [accent]Sobrevive {0} oleadas sectors.go = Ir sector.curcapture = Sector Capturado @@ -552,7 +553,7 @@ sector.missingresources = [scarlet]Recursos Insuficientes sector.attacked = Sector [accent]{0}[white] bajo ataque[]! sector.lost = ¡Sector [accent]{0}[white] perdido[]! #nota: el espacio en blanco en la línea siguiente es intencionado -sector.captured = Sector [accent]{0}[white]capturado[]! +sector.captured = ¡Sector [accent]{0}[white] capturado[]! threat.low = Baja threat.medium = Media @@ -604,31 +605,31 @@ settings.game = Juego settings.sound = Sonido settings.graphics = Gráficos settings.cleardata = Eliminando Datos del Juego... -settings.clear.confirm = ¿Estas seguro de querer eliminar estos datos?\n¡Esta acción no se puede deshacer! +settings.clear.confirm = ¿Quieres eliminar estos datos?\n¡Esta acción no se puede deshacer! settings.clearall.confirm = [scarlet]¡ADVERTENCIA![]\nEsto va a eliminar todos tus datos, incluyendo guardados, mapas, desbloqueos y atajos de teclado.\nUna vez presiones 'ok', el juego borrrará todos tus datos y se cerrará automáticamente. -settings.clearsaves.confirm = ¿Estas seguro de que quieres borrar tus partidas guardadas? +settings.clearsaves.confirm = ¿Quieres borrar tus partidas guardadas? settings.clearsaves = Limpiar partidas guardadas settings.clearresearch = Borrar Investigaciones Tecnológicas -settings.clearresearch.confirm = ¿Estas seguro? +settings.clearresearch.confirm = ¿Quieres eliminar todo el progreso de las Investigaciones Tecnológicas del modo Campaña? settings.clearcampaignsaves = Borrar datos de campaña -settings.clearcampaignsaves.confirm = ¿Estas seguro de que quieres borrar tus partidas guardadas en el modo campaña? +settings.clearcampaignsaves.confirm = ¿Quieres borrar tus partidas guardadas en el modo campaña? paused = [accent] < Pausado > clear = Vaciar banned = [scarlet]Baneado yes = Sí no = No -info.title = [accent]Información +info.title = Información error.title = [crimson]Ha ocurrido un error. error.crashtitle = Ha ocurrido un error. unit.nobuild = [scarlet]Esta unidad no puede construir -lastaccessed = [lightgray]Anteriormente usado: {0} +lastaccessed = [lightgray]Último usado: {0} block.unknown = [lightgray]??? -stat.description = Descripción +stat.description = Objetivo stat.input = Entrada stat.output = Salida stat.booster = Potenciador -stat.tiles = Tiles requeridos +stat.tiles = Terreno requerido stat.affinities = Afinidades stat.powercapacity = Capacidad de Energía stat.powershot = Energía/Disparo @@ -637,9 +638,9 @@ stat.targetsair = Apunta al Aire stat.targetsground = Apunta a Tierra stat.itemsmoved = Velocidad de movimiento stat.launchtime = Tiempo entre lanzamientos -stat.shootrange = Rango de Disparo +stat.shootrange = Alcance stat.size = Tamaño -stat.displaysize = Tamaño mostrado +stat.displaysize = Tamaño de Pantalla stat.liquidcapacity = Capacidad de Líquidos stat.powerrange = Rango de Energía stat.linkrange = Alcance de conexión @@ -649,13 +650,15 @@ stat.poweruse = Consumo de Energía stat.powerdamage = Energía/Daño stat.itemcapacity = Capacidad de Objetos stat.memorycapacity = Capacidad de memoria -stat.basepowergeneration = Generación de energía base +stat.basepowergeneration = Generación de energía stat.productiontime = Tiempo de producción stat.repairtime = Tiempo para Reparar Bloque Completamente +stat.weapons = Armas +stat.bullet = Proyectil stat.speedincrease = Aumento de Velocidad stat.range = Alcance stat.drilltier = Taladrables -stat.drillspeed = Velocidad Base del Taladro +stat.drillspeed = Velocidad del Taladro stat.boosteffect = Efecto de Potenciador stat.maxunits = Máximo de Unidades Activas stat.health = Vida @@ -684,17 +687,19 @@ stat.minetier = Nivel de taladro stat.payloadcapacity = Capacidad de carga stat.commandlimit = Límite de comando stat.abilities = Habilidades +stat.canboost = Puede Acelerar +stat.flying = Aéreo -skill.forcefield = Campo de Escudo -skill.repairfield = Campo de Reparación -skill.statusfield = Campo de Estado -skill.unitspawn = {0} Fábrica -skill.shieldregenfield = Campo de Regeneración de Escudos +skill.forcefield = Zona de Escudo +skill.repairfield = Zona de Reparación +skill.statusfield = Zona de Estado +skill.unitspawn = {0} Fábrica de Drones +skill.shieldregenfield = Zona de Regeneración de Escudos +ability.movelightning = Movimiento Relámpago bar.drilltierreq = Se requiere un taladro mejor. bar.noresources = Recursos faltantes -bar.corereq = Se requiere de un núcleo base - +bar.corereq = Necesitas un núcleo base bar.drillspeed = Velocidad del Taladro: {0}/s bar.pumpspeed = Velocidad de bombeado: {0}/s bar.efficiency = Eficiencia: {0}% @@ -719,16 +724,18 @@ units.processorcontrol = [lightgray]Procesador Controlado bullet.damage = [stat]{0}[lightgray] Daño bullet.splashdamage = [stat]{0}[lightgray] daño de área ~[stat] {1}[lightgray] casillas bullet.incendiary = [stat]Incendiaria +bullet.sapping = [stat]Oxidante bullet.homing = [stat]Rastreadora bullet.shock = [stat]Electrizante -bullet.frag = [stat]Explosiva -bullet.knockback = [stat]{0}[lightgray]Empuje -bullet.pierce = [stat]{0}[lightgray]x Penetración +bullet.frag = [stat]De fragmentación +bullet.knockback = [stat]{0}[lightgray] Empuje +bullet.pierce = [stat]{0}[lightgray]x penetración bullet.infinitepierce = [stat]Penetrante +bullet.healpercent = [stat]{0}[lightgray]% reparación bullet.freezing = [stat]Congelación -bullet.tarred = [stat]Relantizado +bullet.tarred = [stat]Ralentizado bullet.multiplier = [stat]{0}[lightgray]x multiplicador de munición -bullet.reload = [stat]{0}[lightgray]x recarga +bullet.reload = [stat]{0}[lightgray]x cadencia de fuego unit.blocks = bloques unit.blockssquared = bloques² @@ -744,13 +751,12 @@ unit.persecond = /seg unit.perminute = /min unit.timesspeed = x velocidad unit.percent = % - unit.shieldhealth = Escudo - unit.items = objetos unit.thousands = k unit.millions = M unit.billions = b +category.purpose = Objetivo category.general = General category.power = Energía category.liquids = Líquidos @@ -763,10 +769,9 @@ setting.shadows.name = Sombras setting.blockreplace.name = Sugerir bloques al construir setting.linear.name = Filtrado Lineal setting.hints.name = Consejos - setting.flow.name = Mostrar tasa de flujo de recursos +setting.backgroundpause.name = Pausar en segundo plano setting.buildautopause.name = Auto-pausar construcción - setting.animatedwater.name = Animaciones de Terreno setting.animatedshields.name = Animación de Escudos setting.antialias.name = Antialias[lightgray] (necesita un reinicio)[] @@ -780,35 +785,32 @@ setting.fpscap.none = Nada setting.fpscap.text = {0} FPS setting.uiscale.name = Escala de Interfaz[lightgray] (necesita reiniciar)[] setting.swapdiagonal.name = Siempre Construir Diagonalmente -setting.difficulty.training = entrenamiento -setting.difficulty.easy = fácil -setting.difficulty.normal = normal -setting.difficulty.hard = difícil -setting.difficulty.insane = locura +setting.difficulty.training = Entrenamiento +setting.difficulty.easy = Fácil +setting.difficulty.normal = Normal +setting.difficulty.hard = Difícil +setting.difficulty.insane = Demencial setting.difficulty.name = Dificultad: -setting.screenshake.name = Movimiento de la pantalla +setting.screenshake.name = Vibración de pantalla setting.effects.name = Mostrar efectos setting.destroyedblocks.name = Mostrar bloques destruidos setting.blockstatus.name = Mostrar estado de los bloques setting.conveyorpathfinding.name = Construcción de transportadores Inteligente setting.sensitivity.name = Sensibilidad del Mando setting.saveinterval.name = Intervalo del Autoguardado -setting.seconds = {0} Segundos -setting.blockselecttimeout.name = Tiempo de espera de selección de bloque +setting.seconds = {0} segundos setting.milliseconds = {0} milisegundos setting.fullscreen.name = Pantalla Completa setting.borderlesswindow.name = Ventana sin Bordes[lightgray] (podría requerir un reinicio) setting.fps.name = Mostrar FPS y Ping setting.smoothcamera.name = Movimiento de cámara suave - - -setting.vsync.name = Vsync (Limita los fps a los Hz de tu pantalla) +setting.vsync.name = VSync (Limita los fps a los Hz de tu pantalla) setting.pixelate.name = Pixelar setting.minimap.name = Mostrar Minimapa setting.coreitems.name = Mostrar elementos en el nucleo (WIP) setting.position.name = Mostrar indicadores de posición de jugadores. setting.musicvol.name = Volumen de la Música -setting.atmosphere.name = Mostrar atmosfera del planeta +setting.atmosphere.name = Mostrar Atmósfera del planeta setting.ambientvol.name = Volumen del Ambiente setting.mutemusic.name = Silenciar Musica setting.sfxvol.name = Volumen de los efectos de sonido @@ -847,11 +849,9 @@ keybind.toggle_power_lines.name = Ocultar Láser de Red Eléctrica keybind.toggle_block_status.name = Alternar estado de los bloques keybind.move_x.name = Mover x keybind.move_y.name = Mover y -keybind.mouse_move.name = Seguír al Cursor del Ratón - +keybind.mouse_move.name = Seguir al Cursor del Ratón keybind.pan.name = Desplazar la cámara keybind.boost.name = Acelerar - keybind.schematic_select.name = Seleccionar región keybind.schematic_menu.name = Menu de Plantillas keybind.schematic_flip_x.name = Invertir Plantilla desde X @@ -887,6 +887,8 @@ keybind.menu.name = Menú keybind.pause.name = Pausa keybind.pause_building.name = Pausar/Reanudar construcción keybind.minimap.name = Minimapa +keybind.planet_map.name = Mapa del Planeta +keybind.research.name = Investigaciones keybind.chat.name = Chat keybind.player_list.name = Lista de jugadores keybind.console.name = Consola @@ -936,7 +938,6 @@ rules.title.resourcesbuilding = Recursos y Construcción rules.title.enemy = Enemigos rules.title.unit = Unidades rules.title.experimental = Experimental - rules.title.environment = Entorno rules.lighting = Iluminación rules.enemyLights = Luces enemigas @@ -947,11 +948,11 @@ rules.weather = Clima rules.weather.frequency = Frequencia: rules.weather.duration = Duracion: - content.item.name = Objetos content.liquid.name = Líquidos content.unit.name = Unidades content.block.name = Bloques +content.sector.name = Sectores item.copper.name = Cobre item.lead.name = Plomo @@ -974,7 +975,6 @@ liquid.slag.name = Fundido liquid.oil.name = Petróleo liquid.cryofluid.name = Líquido criogénico - unit.dagger.name = Daga unit.mace.name = Mazo unit.fortress.name = Fortaleza @@ -1010,16 +1010,14 @@ unit.vela.name = Vela unit.corvus.name = Corvo block.resupply-point.name = Punto de reabastecimiento - -block.parallax.name = Paralaje +block.parallax.name = Parallax block.cliff.name = Acantilado - -block.sand-boulder.name = Piedra de arena +block.sand-boulder.name = Roca de arena +block.basalt-boulder.name = Roca de basalto block.grass.name = Hierba -block.slag.name = Escoria +block.slag.name = Magma block.space.name = Espacio block.salt.name = Sal - block.salt-wall.name = Muro de sal block.pebbles.name = Guijarros block.tendrils.name = Zarcillos @@ -1028,16 +1026,13 @@ block.spore-pine.name = Pino de esporas block.spore-wall.name = Muro de esporas block.boulder.name = Roca block.snow-boulder.name = Roca de nieve - block.snow-pine.name = Pino de nieve block.shale.name = Pizarra block.shale-boulder.name = Piedra de pizarra block.moss.name = Musgo block.shrubs.name = Arbustos block.spore-moss.name = Musgo de esporas - block.shale-wall.name = Muro de pizarra - block.scrap-wall.name = Muro de chatarra block.scrap-wall-large.name = Muro de chatarra grande block.scrap-wall-huge.name = Muro de chatarra muy grande @@ -1107,7 +1102,7 @@ block.thorium-wall.name = Pared de Torio block.thorium-wall-large.name = Muro de Torio grande block.door.name = Puerta block.door-large.name = Puerta Grande -block.duo.name = Dúo +block.duo.name = Duo block.scorch.name = Quemador block.scatter.name = Dispersor block.hail.name = Granizo @@ -1116,7 +1111,6 @@ block.conveyor.name = Cinta Transportadora block.titanium-conveyor.name = Cinta Transportadora de Titanio block.plastanium-conveyor.name = Cinta Transportadora de Plastanio block.armored-conveyor.name = Cinta Transportadora Acorazada -block.armored-conveyor.description = Mueve items a la misma veolcidad que una cinta de titanio, pero tiene mas defensa. No acepta entradas por los lados a menos que sean lineas transportadoras. block.junction.name = Cruce block.router.name = Enrutador block.distributor.name = Distribuidor @@ -1124,7 +1118,6 @@ block.sorter.name = Clasificador block.inverted-sorter.name = Clasificador Invertido block.message.name = Mensaje block.illuminator.name = Iluminador -block.illuminator.description = Una fuente de luz compacta y configurable. Requiere poder para funcionar. block.overflow-gate.name = Compuerta de Desborde block.underflow-gate.name = Compuerta de Subdesbordamiento block.silicon-smelter.name = Horno para Silicio @@ -1160,8 +1153,8 @@ block.liquid-void.name = Vacío de líquidos block.power-void.name = Vacío de energía block.power-source.name = Energía Infinita block.unloader.name = Descargador -block.vault.name = Bóveda -block.wave.name = Ola +block.vault.name = Almacén +block.wave.name = Wave block.tsunami.name = Tsunami block.swarmer.name = Enjambre block.salvo.name = Salva @@ -1190,7 +1183,7 @@ block.thermal-pump.name = Bomba Térmica block.thermal-generator.name = Generador Térmico block.alloy-smelter.name = Fundidor de Materia block.mender.name = Reparador -block.mend-projector.name = Proyector de reparación +block.mend-projector.name = Proyector de Reparación block.surge-wall.name = Muro de Sobretensión block.surge-wall-large.name = Muro de Sobretensión grande block.cyclone.name = Ciclón @@ -1208,21 +1201,23 @@ block.launch-pad.name = Pad de Lanzamiento block.launch-pad-large.name = Pad de Lanzamiento Grande block.segment.name = Segmento block.command-center.name = Centro de comando - block.ground-factory.name = Fábrica terrestre block.air-factory.name = Fábrica aérea - block.naval-factory.name = Fábrica naval block.additive-reconstructor.name = Reconstructor aditivo block.multiplicative-reconstructor.name = Reconstructor multiplicativo block.exponential-reconstructor.name = Reconstructor exponencial block.tetrative-reconstructor.name = Reconstructor tetrativo - block.payload-conveyor.name = Transportador de carga block.payload-router.name = Enrutador de carga block.disassembler.name = Desensamblador block.silicon-crucible.name = Crisol de silicio block.overdrive-dome.name = Campo de Aceleración +#experimental, puede ser eliminado +block.block-forge.name = Fundidor de Bloques +block.block-loader.name = Cargador de Bloques +block.block-unloader.name = Descargador de Bloques +block.interplanetary-accelerator.name = Acelerador Interplanetario block.switch.name = Interruptor block.micro-processor.name = Micro Processador @@ -1231,40 +1226,53 @@ block.hyper-processor.name = Hiperprocesador block.logic-display.name = Pantalla lógica block.large-logic-display.name = Pantalla lógica grande block.memory-cell.name = Unidad de memoria -block.memory-bank.name = Disco de memoria +block.memory-bank.name = Servidor de memoria +team.blue.name = azul +team.crux.name = rojo +team.sharded.name = naranja +team.orange.name = naranja +team.derelict.name = abandonado +team.green.name = verde +team.purple.name = morado -team.blue.name = Azul -team.crux.name = Rojo -team.sharded.name = Naranja -team.orange.name = Naranja +hint.skip = Omitir +hint.desktopMove = Usa [accent][[WASD][] para moverte. +hint.zoom = [accent]Scroll[] para controlar el zoom. +hint.mine = Acércate a \uf8c4 una veta de cobre [accent]tócala[]\n para extraer cobre manualmente. +hint.desktopShoot = [accent][[Left-click][] para disparar. +hint.depositItems = Deposita objetos arrastrándolos desde tu nave hasta el núcleo. +hint.respawn = Para sacar otra nave, pulsa [accent][[V][]. +hint.respawn.mobile = Has pasado a controlar una unidad/estructura. Para volver a manejar la nave, [accent]toca el icono arriba a la izquierda.[] +hint.desktopPause = Pulsa [accent][[Space][] para pausar y reanudar la partida. +hint.placeDrill = Selecciona la pestaña de \ue85e [accent]Taladros[] en el menú abajo a la derecha, luego escoge un \uf870 [accent]Taladro[] y haz clic sobre una veta de cobre para colocarlo. +hint.placeDrill.mobile = Selecciona la pestaña de \ue85e [accent]Taladros[] en el menú abajo a la derecha, luego escoge un \uf870 [accent]Taladro[] y toca sobre una veta de cobre para colocarlo.\n\nPulsa el botón con la \ue800 [accent]"V"[] abajo a la derecha para confirmar. -team.derelict.name = Abandonado - -team.green.name = Verde -team.purple.name = Morado - -tutorial.next = [lightgray] -tutorial.intro = Has entrado en el[scarlet]Tutorial de Mindustry.[]\nComienza[accent]minando cobre[]. Para ello, toca en una veta de cobre cercana al núcleo.\n\n[accent]{0}/{1} cobre -tutorial.intro.mobile = Has entrado en el[scarlet] Tutorial []de Mindustry.\nArrastra la pantalla para moverte.\n[accent]Pellizca con 2 dedos [] para alejar y acercar la vista.\nComienza por[accent] minar cobre[]. Para ello, aproxímate a una veta de mineral de cobre cercana al núcleo y tócala.\n\n[accent]{0}/{1} cobre -tutorial.drill = Minar manualmente es ineficiente.\nLos [accent]taladros []pueden minar automáticamente.\nColoca uno sobre una veta de cobre. -tutorial.drill.mobile = Minar manualmente no es muy eficiente.\nLos [accent]taladros []pueden minar automáticamente.\nToca la sección de taladros en la esquina inferior derecha.\nSelecciona el [accent]taladro mecánico[].\nColócalo en una veta de cobre tocándola, después pulsa el [accent]botón de confirmación[] de debajo para confirmar tu selección.\nTambién puedes pulsar el [accent]botón "X" []para cancelar la construcción. -tutorial.blockinfo = Cada bloque tiene diferentes estadísticas. Cada taladro solo puede minar ciertos minerales.\nPara comprobar la información y estadísticas de un bloque, toca el botón [accent]"?"[] mientras lo tienes seleccionado en el menú de construcción.\n\nPrueba a acceder a las [accent]estadísticas[] del Taladro Mecánico. -tutorial.conveyor = Las [accent]Cintas Transportadoras[] se usan para transportar recursos.\nConstruye una línea de transportadores del taladro al núcleo. -tutorial.conveyor.mobile = Las [accent]Cintas Transportadoras[] se usan para transportar recursos.\nConstruye una línea de transportadores del taladro al núcleo.\n[accent] Puedes construir una línea manteniendo el dedo unos segundos y arrastrando hacia una dirección.[]\n\n[accet]{0}/{1} cintas colocadas en línea\n[ccent]]0/1 recursos transportados. -tutorial.turret = Debes construir estructuras defensivas para repeler al [lightgray]enemigo[].\nConstruye una torreta "dúo" cerca de tu base. -tutorial.drillturret = Los dúos requieren[accent] munición de cobre[] para disparar.\nColoca un taladro junto a la torre para suministrarle cobre. \nTambien puedes hacer una línea de transportadores desde el taladro hasta el dúo. -tutorial.pause = Durante la batalla, puedes [accent]pausar el juego.[]\nPuedes dejar estructuras en cola mientras está pausado.\n\n[accent]Pulsa Espacio para pausar. -tutorial.pause.mobile = Durante la batalla, puedes[accent] pausar el juego.[]\nPuedes dejar estructuras en cola mientras está pausado.\n\n[accent]Pulsa este boton de arriba a la izquierda para pausar.[] -tutorial.unpause = Ahora pulsa Espacio otra vez para reanudar. -tutorial.unpause.mobile = Ahora púlsalo otra vez para reanudar. -tutorial.breaking = En muchas ocasiones, será necesario destruir bloques.\n[accent]Mantén el botón derecho[] para deconstruir todos los bloques en una selección.[]\n\n[accent]Deconstruye todos los bloques de chatarra de la izquierda de tu núcleo usando selección de área. -tutorial.breaking.mobile = En muchas ocasiones, será necesario destruir bloques.\n[accent]Selecciona el modo de desonstrucción[], después toca un bloque para comenzar a deconstruirlo.\nDestruye un área manteniendo tu dedo algunos segundos[] y arrastrando hacia una dirección.\nUsa el botón de confirmación para confirmar la destrucción.\n\n[accent]Destruye todos los bloques de chatarra de la izquierda de tu núcleo usando la selección de área.[] -tutorial.withdraw =A veces, es necesario coger recursos directamente de bloques.\nPara hacer esto, [accent]toca un bloque[] con recursos en él, después [accent]toca el recurso[] en el inventario.\nSe pueden sacar múltiples recursos [accent]tocando y manteniendo[].\n\n[accent]Saca algo de cobre del núcleo.[] -tutorial.deposit = Deposita recursos en bloques arrastrándolos de tu nave al bloque de destino.\n\n[accent]Deposita tu cobre otra vez en el núcleo.[] -tutorial.waves = El[lightgray] enemigo[] se acerca.\n\nDefiende tu núcleo por 2 oleadas. Construye más torretas y taladros. Mina más cobre. -tutorial.waves.mobile = El[lightgray] enemigo[] se acerca.\n\nDefiende tu núcleo por 2 oleadas. Tu nave puede disparar automáticamente a los enemigos.\nConstruye más torretas y taladros. Mina más cobre. -tutorial.launch = Una vez llegues a cierta oleada, podrás[accent]lanzar el núcleo[], dejando atrás tus defensas y los recursos en tu núcleo.[]\nEstos recursos pueden ser usados para investigar nueva tecnología.\n\n[accent]Pulsa el botón de lanzamiento. +############ +hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. +hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. +hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. +hint.breaking = [accent]Right-click[] and drag to break blocks. +hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. +hint.research = Use the \ue875 [accent]Research[] button to research new technology. +hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology. +hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets. +hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets. +hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right. +hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[]. +hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. +hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path. +hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path. +hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters. +hint.command = Press [accent][[G][] to command nearby units into formation. +hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation. +hint.payloadPickup = Press [accent][[[] to pick up small blocks or units. +hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up. +hint.payloadDrop = Press [accent]][] to drop a payload. +hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there. +hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. +hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[]. +####### item.copper.description = Un útil material de estructura. Usado extensivamente en todo tipo de bloques. item.lead.description = Un material básico. Usado en electrónicos y bloques de transferencia de líquidos. @@ -1282,6 +1290,7 @@ item.surge-alloy.description = Una aleación avanzada con propiedades eléctrica item.spore-pod.description = Utilizado para ser convertido en petróleo, explosivos y combustible. item.blast-compound.description = Un compuesto volátil usado en bombas y explosivos. Se puede quemar como combustible, pero no es recomendable. item.pyratite.description = Un compuesto extremadamente inflamable usada en armas incendiarias. + liquid.water.description = Usada comúnmente para enfriar máquinas y para procesar residuos. liquid.slag.description = Diferentes tipos de metales fundidos mezclados. Puede ser separado en sus minerales constituyentes, o expulsado a unidades enemigas como arma. liquid.oil.description = Puede ser quemado, explotado o usado como un enfriador. @@ -1399,10 +1408,3 @@ block.spectre.description = Un cañon masivo de dos barriles. Dispara balas perf block.meltdown.description = Un cañon láser masivo. Carga y dispara un rayo láser constante a enemigos cercanos. Requiere enfriamiento para operar. block.repair-point.description = Repara la unidad dañada más cercana a su alrededor. block.segment.description = Daña y destruye proyectiles enemigos. No apunta a láseres. -# -#511//zone.unlocked = [lightgray]{0} desbloqueado. -#zone.requirement.complete = Oleada {0} alcanzada:\nrequerimientos de la zona {1} cumplidos. -#zone.resources = Recursos Detectados: -#zone.objective = [lightgray]Objetivo: [accent]{0} -#zone.objective.survival = Sobrevivir -#zone.objective.attack = Destruir Núcleo Enemigo From 741e6b55b04f28d6af5936d547f6ca42fbc48475 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Mon, 23 Nov 2020 20:09:33 +0100 Subject: [PATCH 022/123] Update contributors --- core/assets/contributors | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index 39c29ff93a..4ed0124d4b 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -1,3 +1,4 @@ +Angel_24 Prosta4okua Felix Corvus Vanguard @@ -100,4 +101,4 @@ MEEP of Faith jalastram (freesound.org) newlocknew (freesound.org) dsmolenaers (freesound.org) -Headphaze (freesound.org) \ No newline at end of file +Headphaze (freesound.org) From 7c79ee469e0ea9b1bd0ef0684883b7c6af5770c7 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Mon, 23 Nov 2020 20:11:27 +0100 Subject: [PATCH 023/123] Update contributors --- core/assets/contributors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index 4ed0124d4b..f5c5a36107 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -1,4 +1,4 @@ -Angel_24 +Angel-24 Prosta4okua Felix Corvus Vanguard From 12d045c6312ecc40a2307e524b27315abc5b13c5 Mon Sep 17 00:00:00 2001 From: Skat <55407440+skykatik@users.noreply.github.com> Date: Tue, 24 Nov 2020 09:34:29 +0300 Subject: [PATCH 024/123] [Typo] comiting changes* --- core/assets/bundles/bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 0ba749cc57..147bdb1df2 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -99,7 +99,7 @@ preparingconfig = Preparing Config preparingcontent = Preparing Content uploadingcontent = Uploading Content uploadingpreviewfile = Uploading Preview File -committingchanges = Comitting Changes +committingchanges = Committing Changes done = Done feature.unsupported = Your device does not support this feature. From 8004b6ce1d8a97eb6ac003e1382322bccad904f8 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Tue, 24 Nov 2020 09:39:08 +0100 Subject: [PATCH 025/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 1c4d7a716d..6c7b500266 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -22,7 +22,6 @@ gameover.pvp = ¡El equipo[accent] {0}[] ha ganado! gameover.waiting = [accent]Esperando el próximo mapa... highscore = [accent]¡Nuevo récord de puntuación! copied = Copiado -indev.popup = [accent]v6[] está actualmente en [accent]desarrollo[].\n[lightgray]Esto significa que:[]\n[scarlet]- El modo de campaña no está totalmente acabado[]\n-Falta contenido dentro del juego\n - Mucha de la [scarlet]AI de enemigos[] no funciona totalmente\n- Algunas unidades todavia no estan acabadas\n- Todo lo que ves podría ser cambiado o eliminado.\n\nReporta bugs o cierres inesperados en [accent]Github[]. indev.notready = Esta parte del juego no esta lista aún. indev.campaign = [accent]Has llegado al final de la campaña![]\n\nEsto es todo lo lejos que puedes llegar por ahora.\nLos viajes interplanetarios se añadirán en futuras actualizaciones. From 7ffbb93ba7e06fa76e782733059ce49d873aa130 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Tue, 24 Nov 2020 10:30:33 +0100 Subject: [PATCH 026/123] Update contributors --- core/assets/contributors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index f5c5a36107..6283f50c03 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -1,4 +1,3 @@ -Angel-24 Prosta4okua Felix Corvus Vanguard @@ -102,3 +101,4 @@ jalastram (freesound.org) newlocknew (freesound.org) dsmolenaers (freesound.org) Headphaze (freesound.org) +Angel-24 From 38f4154d180264b56aa8de9d3a529191185c8aae Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Tue, 24 Nov 2020 10:47:35 +0100 Subject: [PATCH 027/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 6c7b500266..515e044a72 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1237,7 +1237,7 @@ team.purple.name = morado hint.skip = Omitir hint.desktopMove = Usa [accent][[WASD][] para moverte. -hint.zoom = [accent]Scroll[] para controlar el zoom. +hint.zoom = Puedes usar la [accent]Rueda del ratón[] para controlar el zoom. hint.mine = Acércate a \uf8c4 una veta de cobre [accent]tócala[]\n para extraer cobre manualmente. hint.desktopShoot = [accent][[Left-click][] para disparar. hint.depositItems = Deposita objetos arrastrándolos desde tu nave hasta el núcleo. @@ -1246,12 +1246,12 @@ hint.respawn.mobile = Has pasado a controlar una unidad/estructura. Para volver hint.desktopPause = Pulsa [accent][[Space][] para pausar y reanudar la partida. hint.placeDrill = Selecciona la pestaña de \ue85e [accent]Taladros[] en el menú abajo a la derecha, luego escoge un \uf870 [accent]Taladro[] y haz clic sobre una veta de cobre para colocarlo. hint.placeDrill.mobile = Selecciona la pestaña de \ue85e [accent]Taladros[] en el menú abajo a la derecha, luego escoge un \uf870 [accent]Taladro[] y toca sobre una veta de cobre para colocarlo.\n\nPulsa el botón con la \ue800 [accent]"V"[] abajo a la derecha para confirmar. - -############ -hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. -hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. +hint.placeConveyor = Las cintas transportadoras pueden sacar objetos de los taladros, y moverlos hasta otros bloques. Selecciona un \uf896 [accent]Transportador[] de la pestaña \ue814 [accent]Distribución[].\n\nHaz clic y arrastra para crear una cadena con múltiples transportadores.\nUsa la [accent]Rueda del ratón[] para rotarlo. +hint.placeConveyor.mobile = Las cintas transportadoras pueden mover objetos de los taladros hasta otros bloques. Selecciona un \uf896 [accent]Transportador[] de la pestaña \ue814 [accent]Distribución[].\n\nMantén el dedo un segundo y arrastra para crear múltiples cintas transportadoras. hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. -hint.breaking = [accent]Right-click[] and drag to break blocks. +hint.breaking = Pulsa [accent]Clic-derecho[] y arrastra para destruir bloques. + +############## hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. hint.research = Use the \ue875 [accent]Research[] button to research new technology. hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology. From 7a59c7bc2496a39a733728ecefb272c7155acd5d Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Tue, 24 Nov 2020 13:22:42 +0200 Subject: [PATCH 028/123] translation checkpoint --- core/assets/bundles/bundle_ro.properties | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index a7bbe0b61c..c05ddca290 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -1249,19 +1249,19 @@ hint.depositItems = Pt a transfera materiale, trage-le din nava ta către nucleu hint.respawn = Pt a te regenera ca navă în nucleu, apasă [accent][[V][]. hint.respawn.mobile = Acum controlezi o unitate/structură. Pt a te regenera ca navă în nucleu, [accent]dă click pe avatarul din colțul din stânga-sus.[] hint.desktopPause = Apasă [accent][[Space][] pt a da pauză jocului. Apasă din nou pt a ieși din modul pauză. -hint.placeDrill = Selectează tabul \ue85e [accent]Burghie[] din meniul din stânga-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina. -hint.placeDrill.mobile = Selectează tabul \ue85e[accent]Burghie[] din meniul din stânga-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina.\n\nApasă pe \ue800 [accent]bifa[] din dreapta-jos pt a confirma. -hint.placeConveyor = Benzile mută materiale din burghie în alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\n Ține click apăsat și trage pe ecran pt a desena o linie de bandă.\n[accent]Folosește rotița mouseului[] pt a roti. -hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. -hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. -hint.breaking = [accent]Right-click[] and drag to break blocks. -hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. -hint.research = Use the \ue875 [accent]Research[] button to research new technology. -hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology. -hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets. -hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets. -hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right. -hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[]. +hint.placeDrill = Selectează tabul \ue85e [accent]Burghie[] din meniul din dreapta-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina. +hint.placeDrill.mobile = Selectează tabul \ue85e[accent]Burghie[] din meniul din stânga-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina.\n\nApasă pe \ue800 [accent]bifa[] din dreapta-jos pt confirmare. +hint.placeConveyor = Benzile transportă materiale din burghie în alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\nFă click pe ecran și trage pt a desena o linie de bandă.\n[accent]Folosește rotița mouseului[] pt rotire. +hint.placeConveyor.mobile = Benzile transportă materiale din burghie în alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\nȚine apăsat cu degetul pt o secundă și trage pt a desena o linie de bandă. +hint.placeTurret = Construiește \uf861 [accent]Arme[] pt a-ți apăra baza de inamici.\n\nArmele necesită muniție. Putem folosi \uf838cupru.\nAlimentează arma folosind benzi și burghie. +hint.breaking = Ține apăsat [accent]click-dreapta[] și trage pe ecran pt a distruge blocuri. +hint.breaking.mobile = Activează \ue817 [accent]ciocanul[] din dreapta-jos și dă click pt a distruge blocuri.\n\nȚine apăsat cu degetul pt o secundă și trage pt a distruge mai multe blocuri deodată. +hint.research = Folosește butonul \ue875 [accent]Cercetează[] pt a cerceta noi tehnologii. +hint.research.mobile = Folosește butonul \ue875 [accent]Cercetează[] din \ue88c [accent]Meniu[] pt a cerceta noi tehnologii. +hint.unitControl = Ține apăsat [accent][[Ctrl][] și [accent]dă click[] pt a controla unități aliate sau arme. +hint.unitControl.mobile = [accent][Dă dublu click[] pt a controla unități aliate sau arme. +hint.launch = Odată ce s-au strâns suficiente resurse, poți [accent]Lansa[] către un altă zonă selectând sectoarele învecinate folosind \ue827 [accent]Harta[] din dreapta-jos. +hint.launch.mobile = Odată ce s-au strâns suficiente resurse, poți [accent]Lansa[] către un altă zonă selectând sectoarele învecinate folosind \ue827 [accent]Harta[] din \ue88c [accent]Meniu[]. hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path. hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path. From 9f8e1b93f1556c85f35c6e275371cbf64148b456 Mon Sep 17 00:00:00 2001 From: CPXMC <62936489+CPXMC@users.noreply.github.com> Date: Tue, 24 Nov 2020 22:02:28 +0800 Subject: [PATCH 029/123] Update bundle_zh_CN.properties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 单位，方块，物品的简介翻译交给你们了（滑稽 --- core/assets/bundles/bundle_zh_CN.properties | 138 +++++++++++++++----- 1 file changed, 105 insertions(+), 33 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 9b0f278d9c..428de78f53 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -17,11 +17,14 @@ linkfail = 打开链接失败！\n网址已复制到您的剪贴板。 screenshot = 屏幕截图已保存到 {0} screenshot.invalid = 地图太大，可能没有足够的内存用于截图。 gameover = 游戏结束 +gameover.disconnect = 断开连接 gameover.pvp = [accent] {0}[]队获胜！ +gameover.waiting = [accent]正在等待下一张地图... highscore = [accent]新纪录！ -copied = 已复制。 +copied = 已复制 indev.popup = [accent]6.0[]仍在[accent]测试版[].\n[lightgray]这意味着:[]\n[scarlet]- 战役玩法完全没有完成[]\n- 很多内容还没有做完\n - 大多[scarlet]单位AI[]无法正确地运行\n- 单位系统完全没有完成\n- 一切您所看到的内容都可能会移除或调整。\n\n在[accent]Github[]提交错误报告。\n[#66ccff]来自译者WinterUnderTheSnow的忠告：不建议新玩家游玩还在测试阶段的6.0！建议您先从[orange]v104.6[#66ccff]或[orange]v104.10[#66ccff]开始游玩！ indev.notready = 这部分玩法还未开发完成。 +indev.campaign = [accent]您已经到达战役模式的结尾！[]\n\n这是内容所能做到的。 未来的更新中将添加行星际旅行。 load.sound = 音乐加载中 load.map = 地图加载中 @@ -57,6 +60,7 @@ schematic.rename = 重命名蓝图 schematic.info = {0}x{1}，{2} 个方块 schematic.disabled = [scarlet]蓝图已禁用！[]\n您不能在此[accent]地图[]或[accent]服务器[]上使用蓝图. +stats = 统计资料 stat.wave = 防守波数：[accent]{0} stat.enemiesDestroyed = 消灭敌人：[accent]{0} stat.built = 建造建筑：[accent]{0} @@ -189,6 +193,10 @@ servers.local = 本地服务器 servers.remote = 远程服务器 servers.global = 全球服务器 +servers.showhidden = 显示隐藏的服务器 +server.shown = 显示 +server.hidden = 隐藏 + trace = 跟踪玩家 trace.playername = 玩家名称：[accent]{0} trace.ip = IP 地址：[accent]{0} @@ -267,6 +275,9 @@ cancel = 取消 openlink = 打开链接 copylink = 复制链接 back = 返回 +crash.export = 导出崩溃日志 +crash.none = 找不到崩溃日志。 +crash.exported = 崩溃日志已导出。 data.export = 导出数据 data.import = 导入数据 data.openfolder = 打开数据文件夹 @@ -283,6 +294,7 @@ cancelbuilding = [accent][[{0}][]来清除规划 selectschematic = [accent][[{0}][]来选择复制 pausebuilding = [accent][[{0}][]来暂停建造 resumebuilding = [scarlet][[{0}][]来恢复建造 +showui = UI已隐藏\n按[accent][[{0}][]显示UI wave = [accent]第{0}波 wave.cap = [accent]Wave {0}/{1} wave.waiting = [lightgray]下一波倒计时：{0}秒 @@ -290,6 +302,8 @@ wave.waveInProgress = [lightgray]波次袭来 waiting = [lightgray]等待中… waiting.players = 等待玩家中… wave.enemies = [lightgray]剩余 {0} 个敌人 +wave.enemycores = [accent]{0}[lightgray] 敌人核心(多个) +wave.enemycore = [accent]{0}[lightgray] 敌人核心 wave.enemy = [lightgray]剩余 {0} 个敌人 wave.guardianwarn = Boss 将在[accent]{0}[]波后到来。 wave.guardianwarn.one = Boss 将在[accent]{0}[]波后到来。 @@ -350,6 +364,7 @@ waves.invalid = 剪贴板中的波次信息无效。 waves.copied = 波次信息已复制。 waves.none = 没有定义敌人。\n请注意，这将自动替换为默认的敌人列表。 +#these are intentionally in lower case wavemode.counts = 数目 wavemode.totals = 总和 wavemode.health = 生命值 @@ -462,6 +477,8 @@ load = 载入游戏 save = 保存 fps = 帧数：{0} ping = 延迟：{0}毫秒 +memory = 内存: {0}mb +memory2 = 内存:\n {0}mb +\n {1}mb language.restart = 为了使语言设置生效请重启游戏。 settings = 设置 tutorial = 教程 @@ -476,24 +493,21 @@ complete = [lightgray]完成： requirement.wave = {1}中的第{0}波次 requirement.core = 在{0}中摧毁敌方核心 requirement.research = 研究 {0} +requirement.produce = 生产 {0} requirement.capture = 占领 {0} -bestwave = [lightgray]最高波次：{0} launch.text = 发射 research.multiplayer = 仅有服主可研究物品。 +map.multiplayer = 仅有服主可查看区域。 uncover = 解锁 configure = 设定装运的数量 + loadout = 装运 resources = 资源 bannedblocks = 禁用建筑 addall = 添加所有 +launch.from = 发射地: [accent]{0} launch.destination = 目的地: {0} configure.invalid = 数量必须是0到{0}之间的数字。 -zone.unlocked = [lightgray]{0} 已解锁。 -zone.requirement.complete = 完成{0}。\n已达成解锁{1}的要求。 -zone.resources = 地图中的资源： -zone.objective = [lightgray]目标：[accent]{0} -zone.objective.survival = 生存 -zone.objective.attack = 摧毁敌方核心 add = 添加… boss.health = Boss 生命值 @@ -517,17 +531,41 @@ weather.fog.name = 雾 sectors.unexplored = [lightgray]未探索 sectors.resources = 资源: sectors.production = 产出: +sectors.export = 输出: +sectors.time = 时间: +sectors.threat = 威胁 +sectors.wave = 进攻波: sectors.stored = 贮存: sectors.resume = 继续 sectors.launch = 发射 sectors.select = 选择 sectors.nonelaunch = [lightgray]无 (太阳) sectors.rename = 重命名区块 +sectors.enemybase = [scarlet]敌人基地 +sectors.vulnerable = [scarlet]脆弱的 +sectors.underattack = [scarlet]遭到攻击！[accent]{0}% 被摧毁 +sectors.survives = [accent]存活{0}波 +sectors.go = 进入 +sector.curcapture = 区域已占领 +sector.curlost = 区域丢失 sector.missingresources = [scarlet]核心资源不足 +sector.attacked = 区域[accent]{0}[white]受到攻击! +sector.lost = 区域[accent]{0}[white]已丢失! +#note: the missing space in the line below is intentional +sector.captured = 区域[accent]{0}[white]已占领! + +threat.low = 低 +threat.medium = 中 +threat.high = 高 +threat.extreme = 极高 +threat.eradication = 根除 + +planets = 行星 planet.serpulo.name = 塞普罗 planet.sun.name = 太阳 +sector.impact0078.name = 影响0078 sector.groundZero.name = 零号地区 sector.craters.name = 陨石带 sector.frozenForest.name = 冰冻森林 @@ -539,6 +577,10 @@ sector.overgrowth.name = 增生区 sector.tarFields.name = 油田 sector.saltFlats.name = 盐碱荒滩 sector.fungalPass.name = 真菌通道 +sector.biomassFacility.name = 生物质合成设施 +sector.windsweptIslands.name = 风吹群岛 +sector.extractionOutpost.name = 萃取前哨 +sector.planetaryTerminal.name = 行星发射终端 sector.groundZero.description = 踏上旅程的最佳位置。这儿的敌人威胁很小，但资源也少。\n收集尽可能多的铅和铜。\n出发吧！ sector.frozenForest.description = 即使是靠近山脉的这里，孢子也已经扩散。他们不能长期停留在寒冷的温度中。\n\n开始运用电力。建造火力发电机并学会使用修理者。 @@ -573,7 +615,6 @@ settings.clearcampaignsaves.confirm = 您确定要清除战役进度? paused = [accent]< 暂停 > clear = 清除 banned = [scarlet]已禁止 -unplaceable.sectorcaptured = [scarlet]需要占领区块 yes = 是 no = 否 info.title = [accent]详情 @@ -583,6 +624,7 @@ unit.nobuild = [scarlet]单位未能建造 lastaccessed = [lightgray]上次操作: {0} block.unknown = [lightgray]??? +stat.description = 介绍 stat.input = 输入 stat.output = 输出 stat.booster = 增强物品/液体 @@ -610,6 +652,8 @@ stat.memorycapacity = 内存容量 stat.basepowergeneration = 基础能源输出 stat.productiontime = 生产时间 stat.repairtime = 建筑完全修复时间 +stat.weapons = 武器 +stat.bullet = 子弹 stat.speedincrease = 提速 stat.range = 范围 stat.drilltier = 可钻探矿物 @@ -642,12 +686,15 @@ stat.minetier = 采矿等级 stat.payloadcapacity = 载货容量 stat.commandlimit = 指挥上限 stat.abilities = 能力 +stat.canboost = 助推器 +stat.flying = 飞行 ability.forcefield = 力墙场 ability.repairfield = 修复场 ability.statusfield = 状态场 ability.unitspawn = {0} 工厂 ability.shieldregenfield = 护盾再生场 +ability.movelightning = 闪电移动 bar.drilltierreq = 需要更好的钻头 bar.noresources = 缺失资源 @@ -676,12 +723,14 @@ units.processorcontrol = [lightgray]由处理器控制 bullet.damage = [stat]{0}[lightgray] 伤害 bullet.splashdamage = [stat]{0}[lightgray] 范围伤害 ~[stat] {1}[lightgray] 格 bullet.incendiary = [stat] 燃烧 +bullet.sapping = [stat]sapping bullet.homing = [stat] 追踪 bullet.shock = [stat] 电击 bullet.frag = [stat] 分裂 bullet.knockback = [stat]{0}[lightgray] 击退 bullet.pierce = [stat]{0}[lightgray]x 穿透 bullet.infinitepierce = [stat]pierce +bullet.healpercent = [stat]{0}[lightgray]% 修复 bullet.freezing = [stat] 冰冻 bullet.tarred = [stat] 减速 bullet.multiplier = [stat]{0}[lightgray]x 装弹数量 @@ -706,6 +755,7 @@ unit.items = 物品 unit.thousands = K unit.millions = M unit.billions = B +category.purpose = 介绍 category.general = 普通 category.power = 能量 category.liquids = 液体 @@ -719,6 +769,7 @@ setting.blockreplace.name = 自动推荐合适的建筑 setting.linear.name = 抗锯齿 setting.hints.name = 提示 setting.flow.name = 显示资源传送速度[scarlet] (实验性） +setting.backgroundpause.name = 在背景中暂停 setting.buildautopause.name = 自动暂停建造 setting.animatedwater.name = 流动的水 setting.animatedshields.name = 动态画面 @@ -747,7 +798,6 @@ setting.conveyorpathfinding.name = 传送带自动寻路 setting.sensitivity.name = 控制器灵敏度 setting.saveinterval.name = 自动保存间隔 setting.seconds = {0} 秒 -setting.blockselecttimeout.name = 建筑选择超时 setting.milliseconds = {0} 毫秒 setting.fullscreen.name = 全屏 setting.borderlesswindow.name = 无边界窗口[lightgray]（可能需要重启） @@ -836,6 +886,8 @@ keybind.menu.name = 菜单 keybind.pause.name = 暂停 keybind.pause_building.name = 暂停/继续建造 keybind.minimap.name = 小地图 +keybind.planet_map.name = 行星地图 +keybind.research.name = 研究 keybind.chat.name = 聊天 keybind.player_list.name = 玩家列表 keybind.console.name = 控制台 @@ -899,6 +951,7 @@ content.item.name = 物品 content.liquid.name = 液体 content.unit.name = 部队 content.block.name = 块 +content.sector.name = 区域 item.copper.name = 铜 item.lead.name = 铅 @@ -959,6 +1012,7 @@ block.resupply-point.name = 补给点 block.parallax.name = 差扰光束 block.cliff.name = 悬崖 block.sand-boulder.name = 砂岩 +block.basalt-boulder.name = 玄武岩巨石 block.grass.name = 草地 block.slag.name = 矿渣 block.space.name = 太空 @@ -1056,7 +1110,6 @@ block.conveyor.name = 传送带 block.titanium-conveyor.name = 钛传送带 block.plastanium-conveyor.name = 塑钢传送带 block.armored-conveyor.name = 装甲传送带 -block.armored-conveyor.description = 运送物品，与钛传送带一样的速度，但有更强的装甲。除其他传送带，不接受任何边上的输入。 block.junction.name = 连接器 block.router.name = 路由器 block.distributor.name = 分配器 @@ -1064,7 +1117,6 @@ block.sorter.name = 分类器 block.inverted-sorter.name = 反向分类器 block.message.name = 信息板 block.illuminator.name = 照明器 -block.illuminator.description = 小型、紧凑、可配置的光源。需要能量运行。 block.overflow-gate.name = 溢流门 block.underflow-gate.name = 反向溢流门 block.silicon-smelter.name = 硅冶炼厂 @@ -1160,6 +1212,11 @@ block.payload-router.name = 载荷路由器 block.disassembler.name = 解离机 block.silicon-crucible.name = 热能坩埚 block.overdrive-dome.name = 超速穹顶投射器 +#experimental, may be removed +block.block-forge.name = 方块熔炉 +block.block-loader.name = 方块装载机 +block.block-unloader.name = 方块卸载机 +block.interplanetary-accelerator.name = 行星际加速器 block.switch.name = 开关 block.micro-processor.name = 微型处理器 @@ -1178,30 +1235,45 @@ team.derelict.name = 灰 team.green.name = 绿 team.purple.name = 紫 -tutorial.next = [lightgray]<点击以继续> -tutorial.intro = 您已进入[scarlet] Mindustry 教程[]。[]\n使用[accent][[WASD][]键移动机甲和视角。\n[accent]按住[[Ctrl]并转动鼠标滚轮[]缩放视野。\n让我们从[accent]采集铜矿[]开始。先移动到铜矿旁边，然后点按矿脉附近散落的矿物。\n\n[accent]{0}/{1} 铜 -tutorial.intro.mobile = 您已进入[scarlet] Mindustry 教程[]。\n在屏幕上滑动来继续。\n[accent]双指捏合[] 来缩小和放大。\n让我们从[accent]采集铜矿[]开始。先移动到铜矿旁边，然后点按矿脉附近散落的矿物。\n\n[accent]铜 {0}/{1} -tutorial.drill = 手动采矿效率不高。\n[accent]钻头[]可以自动采矿。\n让我们在在铜矿上放一个。\n点击右下角的钻头菜单。\n选择[accent]机械钻头[]。\n单击将其放置在铜矿上。\n[accent]右键单击[]来停止。 -tutorial.drill.mobile = 手动采矿效率不高。\n[accent]钻头[]可以自动采矿。\n点右下角的钻头菜单。\n选择[accent]机械钻头[]。\n点一下将其放在铜矿上，点[accent]对号[]来确定。\n点[accent]叉号[]来取消。 -tutorial.blockinfo = 每种钻头都有其独特的数据。每个钻头只能开采部分矿石。\n若要查看建筑的详细信息，[accent]在菜单中点击问号。[]\n\n[accent]现在查看机械钻头的数据吧。[] -tutorial.conveyor = [accent]传送带[]可以把物资传送到核心。\n请在钻头到核心间建造一条传送带。 -tutorial.conveyor.mobile = [accent]传送带[]可以把物资传送到核心。\n请在钻头到核心间建造一条传送带。\n[accent]长按数秒[]并向一个方向拖动来直线放置。\n\n[accent]{0}/{1} 条传送带\n[accent]0/1 物品 -tutorial.turret = 必须建造防御建筑来击退[lightgray]敌人[]。\n请在核心附近造一个双管炮。 -tutorial.drillturret = 双管炮需要[accent]铜[]作弹药来射击。\n可以放一个钻头在炮塔附近供应铜。 -tutorial.pause = 在战斗中，您可以[accent]暂停游戏[]。\n暂停时您可以规划建筑物。\n\n按[accent]空格[]暂停。 -tutorial.pause.mobile = 在战斗中，您可以[accent]暂停游戏[]。\n暂停时您可以规划建筑物。\n\n[accent]点击左上角的按钮以暂停。 -tutorial.unpause = 现在再次按空格以继续。 -tutorial.unpause.mobile = 现在再次点按以继续。 -tutorial.breaking = 建筑经常需要拆除。\n[accent]按住鼠标右键[]来拆除选中的建筑。[]\n\n[accent]使用范围拆除来拆除核心左侧的废墙。 -tutorial.breaking.mobile = 建筑经常需要拆除。\n[accent]选择拆除模式[]，点击建筑以拆除。\n[accent]长按几秒[]并拖动来范围拆除。\n点击对号来确定。\n\n[accent]使用范围拆除来拆除核心左侧的废墙。 -tutorial.withdraw = 有时，从建筑中取出物品是必要的。\n[accent]点击包含物品的建筑[]，然后[accent]点击在方框中的物品[]。\n可以通过[accent]点击或长按[]来取出物品。\n\n[accent]从核心中取出一些铜[]。 -tutorial.deposit = 将物品从机甲拖向建筑来放下物品。\n\n[accent]将铜放回核心[]。 -tutorial.waves = [lightgray]敌人[]来了。\n\n保护核心，防御两波攻击。造更多的炮塔。[accent]点击[]以射击。\n建造更多的炮塔和钻头，并采更多的矿。 -tutorial.waves.mobile = [lightgray]敌人[]来了。\n\n保护核心，防御两波攻击。造更多的炮塔。你的机甲将对敌人自动开火。\n建造更多的炮塔和钻头，并采更多的矿。 -tutorial.launch = 进入特定波次后，你可以[accent]发射核心（起飞）[]，[accent]带走核心中的所有资源[]并抛下所有的建筑。\n装运的资源可用于研究科技。\n\n[accent]点击发射按钮。 +hint.skip = 跳过 +hint.desktopMove = 使用[accent][[WASD][]来移动. +hint.zoom = [accent]滚动[]放大或缩小. +hint.mine = 移动到\uf8c4铜矿附近并点按[accent]tap[]进行手动开采 +hint.desktopShoot = [accent][[Left-click][]射击. +hint.depositItems = 要转移物品，请将其从飞船上拖到核心。 +hint.respawn = 要重生飞船，请按[accent][[V][]. +hint.respawn.mobile = 您已切换控制单元/结构. 如果要重生飞船请[accent]点击左上方的图标(那个和你长得一样的).[] +hint.desktopPause = 按[accent][[Space][]暂停和取消暂停游戏. +hint.placeDrill = 选择\ue85e[accent]钻头[]右下角菜单中的标签，然后选择一个\uf870 [accent]钻头[]然后单击铜矿将其放置. +hint.placeDrill.mobile = 选择\ue85e[accent]钻头[]右下角菜单中的标签，然后选择一个\uf870 [accent]钻头[]然后点击铜矿将其放置.\n\n按下\ue800 [accent]复选标记[]在右下角按钮确认. +hint.placeConveyor = 传送带将物品从钻头移到其他块中。选择一个\uf896 [accent]传送带[]从\ue814 [accent]布局[]标签.\n\n单击并拖动以放置多个传送带.\n[accent]滚动[]旋转. +hint.placeConveyor.mobile = 传送带将物品从钻头移到其他块中。选择一个\uf896 [accent]传送带[]从\ue814 [accent]布局[]标签.\n\n按住手指一秒钟，然后拖动以放置多个传送带. +hint.placeTurret = 放置\uf861 [accent]炮塔[]保卫你的基地从敌人手中.\n\n炮塔需要弹药-在这种情况下e, \uf838copper.\n使用传送带和钻头为它们供弹。 +hint.breaking = [accent]右击[]并拖动以拆除方块. +hint.breaking.mobile = 激活\ue817 [accent]锤子[]在右下角点击以拆除方块.\n\n按住手指一秒钟，然后拖动以选择. +hint.research = 使用\ue875 [accent]科技树[]按钮研究新技术. +hint.research.mobile = 使用\ue875 [accent]科技树[]按钮在\ue88c [accent]菜单[]去研究新技术. +hint.unitControl = 按住[accent][[L-ctrl][]和[accent]点击[]控制友军单位或炮塔。 +hint.unitControl.mobile = [accent][双击[]控制友军单位或炮塔(双击)。 +hint.launch = 一旦收集到足够的资源，您就可以[accent]发射[]通过选择附近的区域从\ue827 [accent]地图[]在右下角. +hint.launch.mobile = 一旦收集到足够的资源，您就可以[accent]发射[]通过选择附近的区域从\ue827 [accent]地图[]在\ue88c [accent]菜单[]. +hint.schematicSelect = 按住[accent][[F][]并拖动以选择要复制和粘贴的块.\n\n[accent][[Middle Click][]复制单个块类型. +hint.conveyorPathfind = 按住[accent][[L-Ctrl][]拖动，传送带会自动生成路径. +hint.conveyorPathfind.mobile = 启用\ue844 [accent]对角线模式[]并拖动，传送带会自动生成路径. +hint.boost = 按住[accent][[L-Shift][]用当前单位飞越障碍物.\n\n只有少数地面单位有助推器.(首先排除爬虫家族) +hint.command = 按accent][[G][]指挥附近的单位编队. +hint.command.mobile = [accent][双击][]您的部队指挥附近的部队编队.(双击) +hint.payloadPickup = 按[accent][[[]捡起小方块或单位. +hint.payloadPickup.mobile = [accent]点住]一个小方块或一个单位来捡起来. +hint.payloadDrop = 按[accent]][]放下有效载荷. +hint.payloadDrop.mobile = [accent]点住[]一个空的位置将有效载荷丢到那里.(不是很精准) +hint.waveFire = [accent]进攻波[]炮塔加水弹药会自动扑灭附近的大火.(浪涌和海啸) +hint.generator = \uf879 [accent]燃烧发电机[]燃烧煤炭并将电力传输到相邻方块.\n\n电力传输范围可以扩展，用\uf87f [accent]能量节点[]. item.copper.description = 一种最基本的的建筑材料。在各种类型的建筑中被广泛使用。 +item.copper.details = 铜. 在Serpulo上的金属异常丰富。 除非加固，否则结构较弱。 item.lead.description = 一种基本的电力材料。广泛用于电子设备和液体输送模块。 +item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here. item.metaglass.description = 一种致密坚硬的复合玻璃。广泛用于液体输送和存储。 item.graphite.description = 一种高密度的碳材料，用于弹药和电器元件。 item.sand.description = 一种常见的材料，广泛用于冶炼，包括制作合金和助熔剂。 From ea653bf5c35bbf5d86a2d7e38fcc99974cb117ad Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Tue, 24 Nov 2020 20:48:40 +0200 Subject: [PATCH 030/123] Finished (for now) --- core/assets/bundles/bundle_ro.properties | 55 +++++++++++------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index c05ddca290..913a45a34d 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -22,7 +22,6 @@ gameover.pvp = Echipa [accent] {0}[] este câștigătoare! gameover.waiting = [accent]Se așteaptă următoarea hartă... highscore = [accent]Scor maxim nou! copied = Copiat. -indev.popup = [accent]v6[] este momentan în [accent]beta[].\n[lightgray]Asta înseamnă că:[]\n[scarlet]- Campania este neterminată[]\n- Tot ce vedeți se poate schimba sau poate fi eliminat.\n\nPentru a raporta buguri și crashuri intrați pe [accent]Github[]. indev.notready = Această secțiune a jocului nu este gata încă. indev.campaign = [accent]Ai ajuns la finalul campaniei![]\n\nAi mers cât de departe se poate momentan. Călătoria interplanetară va fi adăugată într-un update viitor. @@ -147,8 +146,9 @@ planetmap = Harta Planetei launchcore = Lansează Nucleu filename = Nume Fișier: unlocked = Nou conținut deblocat! +available = Poți cerceta noi tehnologii! completed = [accent]Finalizat -techtree = Tehnologie +techtree = Cercetează research.list = [lightgray]Cercetare: research = Cercetează researched = [lightgray]{0} cercetat. @@ -501,7 +501,6 @@ map.multiplayer = Doar gazda poate vedea harta sectoarelor. uncover = Descoperă configure = Configurează Încărcarea -#Spațiu Necesar loadout = Încărcare resources = Resurse bannedblocks = Blocuri Interzise @@ -509,12 +508,6 @@ addall = Adaugă-le pe toate launch.from = Lansează Din: [accent]{0} launch.destination = Destinație: {0} configure.invalid = Cantitatea trebuie să fie un număr între 0 și {0}. -zone.unlocked = [lightgray]{0} deblocat(ă). -zone.requirement.complete = Cerințele pt {0} finalizate:[lightgray]\n{1} -zone.resources = [lightgray]Resurse Detectate: -zone.objective = [lightgray]Obiectiv: [accent]{0} -zone.objective.survival = Supraviețuiește -zone.objective.attack = Distruge Nucleul Inamic add = Adaugă... boss.health = Viața Gardianului @@ -693,7 +686,7 @@ stat.minetier = Minabile stat.payloadcapacity = Capacitate Încărcătură stat.commandlimit = Nr Unități Comandate stat.abilities = Abilități -stat.canboost = Poate Îmbunătăți +stat.canboost = Are Propulsor stat.flying = Zboară ability.forcefield = Câmp de Forță @@ -813,7 +806,7 @@ setting.smoothcamera.name = Cameră Graduală setting.vsync.name = VSync setting.pixelate.name = Pixelează setting.minimap.name = Vezi Miniharta -setting.coreitems.name = Vezi Materialele din Nucleu (neterminat) +setting.coreitems.name = Vezi Materialele din Nucleu setting.position.name = Vezi Poziția Jucătorului setting.musicvol.name = Volumul Muzicii setting.atmosphere.name = Vezi Atmosfera Planetelor @@ -894,6 +887,7 @@ keybind.pause.name = Pauză keybind.pause_building.name = Pauză/Reia Construit keybind.minimap.name = Minihartă keybind.planet_map.name = Harta Planetei +keybind.research.name = Cercetare keybind.chat.name = Chat keybind.player_list.name = Listă Jucători keybind.console.name = Consolă @@ -1019,6 +1013,7 @@ block.parallax.name = Parallax block.cliff.name = Deal block.sand-boulder.name = Bolovan de Nisip block.grass.name = Iarbă +block.basalt-boulder.name = Bolovan de Bazalt block.slag.name = Zgură block.space.name = Cosmos block.salt.name = Sare @@ -1243,16 +1238,16 @@ team.purple.name = mov hint.skip = Treci peste hint.desktopMove = Folosește [accent][[WASD][] ca să te miști. hint.zoom = [accent]Cu rotița de la mouse[] poți ajusta zoomul. -hint.mine = Du-te lângă \uf8c4 minereul de cupru și [accent]fă click[] pe el pt a mina manual. +hint.mine = Du-te lângă \uf8c4 minereul de cupru și [accent]dă click[] pe el pt a mina manual. hint.desktopShoot = [accent][[Click-stânga][] pt a trage cu armele navei. hint.depositItems = Pt a transfera materiale, trage-le din nava ta către nucleu. hint.respawn = Pt a te regenera ca navă în nucleu, apasă [accent][[V][]. hint.respawn.mobile = Acum controlezi o unitate/structură. Pt a te regenera ca navă în nucleu, [accent]dă click pe avatarul din colțul din stânga-sus.[] -hint.desktopPause = Apasă [accent][[Space][] pt a da pauză jocului. Apasă din nou pt a ieși din modul pauză. +hint.desktopPause = Apasă pe [accent][[Space][] pt a da pauză jocului. Apasă din nou pt a ieși din modul pauză. hint.placeDrill = Selectează tabul \ue85e [accent]Burghie[] din meniul din dreapta-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina. -hint.placeDrill.mobile = Selectează tabul \ue85e[accent]Burghie[] din meniul din stânga-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click pe un minereu de cupru pt a mina.\n\nApasă pe \ue800 [accent]bifa[] din dreapta-jos pt confirmare. -hint.placeConveyor = Benzile transportă materiale din burghie în alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\nFă click pe ecran și trage pt a desena o linie de bandă.\n[accent]Folosește rotița mouseului[] pt rotire. -hint.placeConveyor.mobile = Benzile transportă materiale din burghie în alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\nȚine apăsat cu degetul pt o secundă și trage pt a desena o linie de bandă. +hint.placeDrill.mobile = Selectează tabul \ue85e[accent]Burghie[] din meniul din dreapta-jos, apoi selectează un \uf870 [accent]Burghiu[] și dă click un minereu de cupru pt a mina.\n\nApasă pe \ue800 [accent]bifa[] din dreapta-jos pt confirmare. +hint.placeConveyor = Benzile transportă materiale din burghie către alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\nDă click pe ecran și trage pt a desena o linie de bandă.\nFolosește [accent]rotița mouseului[] pt rotire. +hint.placeConveyor.mobile = Benzile transportă materiale din burghie către alte blocuri. Selectează o \uf896 [accent]Bandă[] din tabul \ue814 [accent]Distribție[].\n\nȚine apăsat cu degetul pt o secundă și trage pt a desena o linie de bandă. hint.placeTurret = Construiește \uf861 [accent]Arme[] pt a-ți apăra baza de inamici.\n\nArmele necesită muniție. Putem folosi \uf838cupru.\nAlimentează arma folosind benzi și burghie. hint.breaking = Ține apăsat [accent]click-dreapta[] și trage pe ecran pt a distruge blocuri. hint.breaking.mobile = Activează \ue817 [accent]ciocanul[] din dreapta-jos și dă click pt a distruge blocuri.\n\nȚine apăsat cu degetul pt o secundă și trage pt a distruge mai multe blocuri deodată. @@ -1260,19 +1255,21 @@ hint.research = Folosește butonul \ue875 [accent]Cercetează[] pt a cerceta noi hint.research.mobile = Folosește butonul \ue875 [accent]Cercetează[] din \ue88c [accent]Meniu[] pt a cerceta noi tehnologii. hint.unitControl = Ține apăsat [accent][[Ctrl][] și [accent]dă click[] pt a controla unități aliate sau arme. hint.unitControl.mobile = [accent][Dă dublu click[] pt a controla unități aliate sau arme. -hint.launch = Odată ce s-au strâns suficiente resurse, poți [accent]Lansa[] către un altă zonă selectând sectoarele învecinate folosind \ue827 [accent]Harta[] din dreapta-jos. -hint.launch.mobile = Odată ce s-au strâns suficiente resurse, poți [accent]Lansa[] către un altă zonă selectând sectoarele învecinate folosind \ue827 [accent]Harta[] din \ue88c [accent]Meniu[]. -hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. -hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path. -hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path. -hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters. -hint.command = Press [accent][[G][] to command nearby units into formation. -hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation. -hint.payloadPickup = Press [accent][[[] to pick up small blocks or units. -hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up. -hint.payloadDrop = Press [accent]][] to drop a payload. -hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there. -hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. +hint.launch = Odată ce s-au strâns suficiente resurse, poți [accent]Lansa[] către o altă zonă selectând sectoarele învecinate folosind \ue827 [accent]Harta[] din dreapta-jos. +hint.launch.mobile = Odată ce s-au strâns suficiente resurse, poți [accent]Lansa[] către o altă zonă selectând sectoarele învecinate folosind \ue827 [accent]Harta[] din \ue88c [accent]Meniu[]. +hint.schematicSelect = Ține apăsat [accent][[F][] și trage pt a selecta blocuri pt copiere.\n\n[accent][[Click pe rotiță][] pt a copia un singur tip de bloc. +hint.conveyorPathfind = Ține apăsat [accent][[Ctrl][] în timp ce plasezi benzi pt a genera automat o cale între 2 puncte. +hint.conveyorPathfind.mobile = Activează \ue844 [accent]modul diagonal[] și plasează benzi pt a genera automat o cale între 2 puncte. +hint.boost = Ține apăsat [accent][[Shift][] pt a zbura peste obstacole cu unitatea ta.\n\nDoar câteva unități de artilerie au propulsoare. +hint.command = Apasă [accent][[G][] pt a comanda unitățile [accent]similare[] din apropiere în formație.\n\nPt a comanda unități de artilerie, trebuie întâi să controlezi o unitate de artilerie. +hint.command.mobile = [accent][[Dublu-click][] pe unitatea ta pt a comanda unitățile [accent]similare[] din apropiere în formație. +hint.payloadPickup = Apasă [accent][[[] pt a ridica blocuri mici sau unități. +hint.payloadPickup.mobile = [accent]Ține apăsat[] pe un bloc mic/o unitate pt a o ridica. +hint.payloadDrop = Apasă [accent]][] pt a descărca încărcătura. +hint.payloadDrop.mobile = [accent]Ține apăsat[] pe o locație goală pt a descărca încărcătura acolo. +hint.waveFire = Armele [accent]Wave[] încărcate cu apă vor stinge incendiile automat. +hint.generator = \uf879 [accent]Generatoarele pe Combustie[] ard cărbunele și transmit electricitatea blocurilor învecinate.\n\nElectricitatea poate fi transmisă pe distanțe lungi folosind \uf87f [accent]Noduri Electrice[]. +hint.guardian = Unitățile [accent]Gardian[] au armuri puternice. Munițiile slabe precum [accent]Cuprul[] și [accent]Plumbul[] [scarlet]nu sunt eficiente[].\n\nFolosește arme mai bune sau muniție de \uf835 [accent]Grafit[] pt \uf861Duo/\uf859Salvo pt a nimici Gardianul. item.copper.description = Folosit în tot felul de construcții și muniție. item.copper.details = Cupru. Metal anormal de abundent pe Serpulo. Structural slab dacă nu este consolidat. From b2851658182bcd74b7c6d11e58dd6a84ea721f79 Mon Sep 17 00:00:00 2001 From: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> Date: Wed, 25 Nov 2020 06:31:16 +0700 Subject: [PATCH 031/123] New Sector description Translation --- core/assets/bundles/bundle_in_ID.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index e83f85d4f3..301d321e9a 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -593,6 +593,11 @@ sector.tarFields.description = Terletak di pinggiran zona produksi minyak, diant sector.desolateRift.description = Zona yang sangat berbahaya. Banyak sumber daya, tetapi terdapat sedikit ruang. Sangat beresiko tinggi untuk dihancurkan. Keluar secepat yang kamu bisa. Jangan terlena karena waktu antara gelombang yang lama. sector.nuclearComplex.description = Sebuah fasilitas untuk memproduksi dan memproses thorium, telah hancur.\n[lightgray]Pelajari thorium dan cara penggunaanya.\n\nMusuh disini menyerang dalam jumlah besar, yang siap untuk menghadapi siapapun. sector.fungalPass.description = Area ini terdapat diantara pegunungan yang lebih tinggi dengan yang lebih rendah, juga daerah yang dipenuhi spora. Musuh membangun basis kecil disini.\nHancurkan itu.\nGunakan unit Dagger dan Crawler. Hancurkan dua inti mereka. +sector.biomassFacility.description = Asal dari semua spora di planet ini. Tempat ini adalah fasilitas dimana spora dipelajari dan diproduksi.\nPelajari teknologi yang terkait dengannya. Budi dayakan spora untuk memproduksi bahan bakar dan plastik.\n\n[lightgray]Setelah fasilitas ini hancur, spora menyebar. Tidak ada di ekosistem lokal yang dapat bersaing dengan organisme invasif seperti itu. +sector.windsweptIslands.description = Jauh dari pantai terdapat sekumpulan pulau. Catatan yang ada mengatakan bahwa mereka memiliki struktur untuk memproduksi [accent]Plastanium[].\n\nKalahkan unit laut musuh. Bangun basis di kepulauan ini. Pelajari pabriknya. +sector.extractionOutpost.description = Sebuah pos jarak jauh, dibangun musuh untuk meluncurkan sumber daya ke sektor yang lain.\n\nTeknologi tarnsportasi antar sektor dapat memudahkan untuk menaklukan lebih banyak sektor. Hancurkan basis itu. Pelajari Alas Peluncur mereka. +sector.impact0078.description = Di sini terletak sisa-sisa pesawat antarbintang yang pertama kali memasuki sistem ini.\n\nSelamatkan apapun yang ada dari sisa-sisa pesawat. Pelajari teknologi apa pun yang utuh. +sector.planetaryTerminal.description = Target terakhir.\n\nBasis pantai ini memiliki struktur yang dapat meluncurkan inti ke planet disekitarnya. Memiliki pertahanan yang sangat bagus.\n\nProduksi unit laut. Hancurkan musuh secepat mungkin. Pelajari struktur peluncuran mereka. settings.language = Bahasa settings.data = Data Game From fac1bccda18089a6d1f07c4bf7a869f53244b2ac Mon Sep 17 00:00:00 2001 From: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Date: Wed, 25 Nov 2020 14:16:00 +0700 Subject: [PATCH 032/123] various fixes --- core/assets/bundles/bundle_in_ID.properties | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 301d321e9a..abc2909083 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -22,7 +22,6 @@ gameover.pvp = Tim[accent] {0}[] menang! gameover.waiting = [accent]Menunggu peta selanjutnya... highscore = [accent]Rekor Baru! copied = Tersalin. -indevpopup = [accent]v6[] saat ini dalam versi [accent]alpha[].\n[lightgray]Artinya:[]\n[scarlet]- Kampanye belum sepenuhnya selesai[]\n- Beberapa konten tidak tersedia\n - Beberapa [scarlet]Unit AI[] tidak sepenuhnya bekerja\n- Beberapa unit belum sepenuhnya selesai\n- Semua yang kamu lihat dapat berubah atau dihapus sewaktu-waktu.\n\nLaporkan bug atau crash di [accent]Github[]. indev.notready = Bagian tersebut saat ini belum siap indev.campaign = [accent]Kamu telah mencapai batas dari kampanye![]\n\nHanya sejauh ini yang kamu bisa. Perjalanan antarplanet akan ditambahkan di masa mendatang. @@ -147,6 +146,7 @@ planetmap = Peta Planet launchcore = Luncurkan Inti filename = Nama File: unlocked = Konten baru terbuka! +available = Penelitian baru tersedia! completed = [accent]Terselesaikan techtree = Cabang Teknologi research.list = [lightgray]Penelitian: @@ -1240,15 +1240,15 @@ team.derelict.name = abu-abu team.green.name = hijau team.purple.name = ungu -hint.skip = Skip +hint.skip = Lewati hint.desktopMove = Tekan [accent][[WASD][] untuk bergerak. hint.zoom = [accent]Skrol[] untuk membesarkan atau mengecilkan layar. hint.mine = Dekati \uf8c4 bijih tembaga dan [accent]tekan[] untuk menambangnya secara manual. -hint.desktopShoot = [accent][[Klik kanan][] untuk menembak. -hint.depositItems = Untuk mentransfer item, tekan item dari inti. -hint.respawn = untuk muncul kembali seperti awal, tekan [accent][[V][]. +hint.desktopShoot = [accent][[Klik][] untuk menembak. +hint.depositItems = Untuk mentransfer item, tarik item dari pesawatmu ke inti. +hint.respawn = Untuk muncul kembali seperti awal, tekan [accent][[V][]. hint.respawn.mobile = Kamu telah mengambil alih kontrol dari sebuah unit/struktur. Untuk muncul kembali, [accent]tekan avatar di kiri atas.[] -hint.desktopPause = Tekan [accent][[Spasi][] untuk menjeda dan menghentikan jeda. +hint.desktopPause = Tekan [accent][[Spasi][] untuk menjeda dan menghentikan jeda permainan. hint.placeDrill = Pilih \ue85e [accent]Bor[] menu di kanan bawah, lalu pilih \uf870 [accent]Bor[] dan klik diatas bijih tembaga untuk menaruhnya. hint.placeDrill.mobile = Pilih \ue85e[accent]Bor[] tab di menu di kanan bawah, lalu pilih \uf870 [accent]Bor[] dan klik diatas bijih tembaga untuk menaruhnya.\n\nTekan \ue800 [accent]checkmark[] di bawah kanan untuk menkonfirmasi pembangunan. hint.placeConveyor = Pengantar dapat memindahkan item dari bor ke blok yang lain. Pilih \uf896 [accent]Pengantar[] dari menu \ue814 [accent]Distribusi[].\n\nKlik dan tarik untuk menaruh beberapa pengantar.\n[accent]Skrol[] untuk memutarnya. @@ -1274,6 +1274,7 @@ hint.payloadDrop = Tekan [accent]][] untuk menurunkan muatan. hint.payloadDrop.mobile = [accent]Tekan dan tahan[] di lokasi yang kosong untuk menurunkan muatan. hint.waveFire = [accent]Wave[] yang terisi dengan air akan memadamkan air dalam jangkauannya. hint.generator = \uf879 [accent]Generator Pembakar[] membakar batu bara dan menghasilkan energik ke blok yang berdekatan.\n\nTransmisi energi dapat diperluas menggunakan \uf87f [accent]Tiang Listrik[]. +hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down. item.copper.description = Bahan struktur yang berguna. Digunakan di semua tipe blok. item.copper.details = Tembaga. Logam yang sangat melimpah di Serpulo. Lemah secara struktural kecuali jika diperkuat. From 87da58df69130b64909bee5a74597d43a534c103 Mon Sep 17 00:00:00 2001 From: Nikolass1000 <68129216+Nikolass1000@users.noreply.github.com> Date: Wed, 25 Nov 2020 09:19:35 +0100 Subject: [PATCH 033/123] Update bundle_pl.properties --- core/assets/bundles/bundle_pl.properties | 35 ++++++++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index fb874f5e08..483d3f37aa 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -22,6 +22,7 @@ highscore = [accent]Nowy rekord! copied = Skopiowano. indev.popup = [accent]Wersja v6[] jest obecnie w [accent]alphie[].\n[lightgray]Oznacza to, że:[]\n[scarlet]- Kampania nie jest skończona[]\n- Brakuje zawartości\n - Większość [scarlet]SI jednostek[] nie działa poprawnie\n- Wiele jednostek jest niedokończonych\n- Wszystko to, co widzisz, może ulec zmianie lub usunięciu.\n\nZgłaszaj błędy i awarie na [accent]Githubie[]. indev.notready = Ta część gry nie jest jeszcze ukończona +indev.campaign = [accent]Udało ci się zakończyć kampanie![]\n\nZawartość kończy się na tym. Podróż międzyplanetarna zostanie dodana w przyszłych aktualizacjach. load.sound = Dźwięki load.map = Mapy @@ -189,6 +190,10 @@ servers.local = Serwery Lokalne servers.remote = Serwery Zdalne servers.global = Serwery Publiczne +servers.showhidden = Pokaż Ukryte Serwery +server.shown = Pokazane +server.hidden = Ukryte + trace = Zlokalizuj Gracza trace.playername = Nazwa gracza: [accent]{0} trace.ip = IP: [accent]{0} @@ -495,7 +500,7 @@ zone.objective = [lightgray]Cel: [accent]{0} zone.objective.survival = Przeżyj zone.objective.attack = Zniszcz Rdzeń Wroga add = Dodaj... -boss.health = Zdrowie Bossa +boss.health = Zdrowie Strażnika connectfail = [crimson]Nie można połączyć się z serwerem:\n\n[accent]{0} error.unreachable = Serwer niedostępny.\nCzy adres jest wpisany poprawnie? @@ -523,10 +528,12 @@ sectors.launch = Wystrzel sectors.select = Wybierz sectors.nonelaunch = [lightgray]żaden (słońce) sectors.rename = Zmień Nazwę Sektora -sector.missingresources = [scarlet]Insufficient Core Resources +sector.missingresources = [scarlet]Niewystarczające Zasoby Rdzenia +sector.attacked = Sektor [accent]{0}[white] jest atakowany! +sector.lost = Sektor [accent]{0}[white] został stracony! planet.serpulo.name = Serpulo -planet.sun.name = Sun +planet.sun.name = Słońce sector.groundZero.name = Punkt Zerowy sector.craters.name = Kratery @@ -539,6 +546,10 @@ sector.overgrowth.name = Przerośnięty Las sector.tarFields.name = Pola Smołowe sector.saltFlats.name = Solne Równiny sector.fungalPass.name = Grzybowa Przełęcz +sector.biomassFacility.name = Obiekt Syntezy Biomasy +sector.windsweptIslands.name = Wyspy Wiatru +sector.extractionOutpost.name = Placówka Ekstrakcji +sector.planetaryTerminal.name = Planetarny Terminal Startowy sector.groundZero.description = Optymalna lokalizacja, aby rozpocząć jeszcze raz. Niskie zagrożenie. Niewiele zasobów.\nZbierz jak najwięcej miedzi i ołowiu, tyle ile jest możliwe.\nPrzejdź do następnej strefy jak najszybciej. sector.frozenForest.description = Nawet tutaj, bliżej gór, zarodniki rozprzestrzeniły się. Niskie temperatury nie mogą ich zatrzymać na zawsze.\n\nRozpocznij przedsięwzięcie od prądu. Buduj generatory spalinowe. Naucz się korzystać z naprawiaczy. @@ -551,6 +562,11 @@ sector.tarFields.description = Obrzeża strefy produkcji ropy, między górami a sector.desolateRift.description = Strefa wyjątkowo niebezpieczna. Obfita w zasoby ale mało miejsca. Wysokie ryzyko zniszczenia. Opuść tę strefe jak najszybciej. Nie daj się zwieść długiemu odstępowi między atakami wroga. sector.nuclearComplex.description = Dawny zakład produkcji i przetwarzania toru, zredukowny do ruin.\n[lightgray]Zbadaj tor i jego zastosowania.\n\nWróg jest tutaj obecny w dużej ilości, nieustannie poszukuje napastników. sector.fungalPass.description = Przejściowy obszar pomiędzy wysokimi górami a nisko znajdującymi się, ogarniętymi przez zarodniki równinami. Znajduje się tu mała postawiona przez wrogów baza zwiadowcza.\nZniszcz ją.\nUżyj jednostek Nóż i Pełzak. Zniszcz oba rdzenie. +sector.biomassFacility.description = Miejsce powstania zarodników. Tutał były badane i początkowo produkowane.\nZbadaj zawartą w nim technologię. Hoduj zarodniki dla paliwa i tworzyw sztucznych.\n\n[lightgray]Po upadku tej placówki zarodniki zostały uwolnione. Nic w lokalnym ekosystemie nie mogło konkurować z tak inwazyjnym organizmem. +sector.windsweptIslands.description = Dalej za linią brzegową znajduje się ten odległy łańcuch wysp. Zapisy wyakzują ze były tu struktury produkujące [accent]Plastan[].\n\nOdeprzyj morskie jednostki wroga. Załóż bazę na wyspach. Odkryj te fabryki. +sector.extractionOutpost.description = Odległa placówka zbudowana przez wroga w celu wystrzeliwania zasobów do innych sektorów.\n\nDo dalszych podbojów niezbędna jest międzysektorowa technologia transportu. Zniszcz bazę. Zbadaj ich Wyrzutnie. +sector.impact0078.description = Tutaj leżą pozostałości międzygwiezdnego statku transportowego, który jako pierwszy wszedł do tego układu.\n\nWydobądź jak najwięcej z wraku. Zbadaj każdą nienaruszoną technologię. +sector.planetaryTerminal.description = Ostatni cel.\n\nTa baza przybrzeżna zawiera strukturę zdolną do wyrzucania rdzeni na lokalne planety. Jest wyjątkowo dobrze strzeżona.\n\nProdukuj jednostki morskie. Jak najszybciej wyeliminuj wroga. Zbadaj tą strukturę. settings.language = Język settings.data = Dane Gry @@ -573,14 +589,14 @@ settings.clearcampaignsaves.confirm = Jesteś pewny że chcesz usunąć wszystki paused = [accent]< Wstrzymano > clear = Wyczyść banned = [scarlet]Zbanowano -unplaceable.sectorcaptured = [scarlet]Requires captured sector + unplaceable.sectorcaptured = [scarlet]Wymaga podbitego sektora. yes = Tak no = Nie info.title = Informacje error.title = [crimson]Wystąpił błąd error.crashtitle = Wystąpił błąd unit.nobuild = [scarlet]Jednostka nie może budować -lastaccessed = [lightgray]Last Accessed: {0} +lastaccessed = [lightgray]Osatino wpłynął: {0} block.unknown = [lightgray]??? stat.input = Wejście @@ -650,6 +666,7 @@ ability.repairfield = Pole Naprawy ability.statusfield = Pole Statusu ability.unitspawn = Fabryka jednostek {0} ability.shieldregenfield = Strefa Tarczy Regenerującej +ability.movelightning = Pioruny Poruszania bar.drilltierreq = Wymagane Lepsze Wiertło bar.noresources = Brak Zasobów @@ -1162,6 +1179,10 @@ block.payload-router.name = Rozdzielacz Ładunku block.disassembler.name = Rozkładacz block.silicon-crucible.name = Tygiel Krzemu block.overdrive-dome.name = Kopuła Pola Overdrive +block.block-forge.name = Piec Bloków +block.block-loader.name = Ładownik Bloków +block.block-unloader.name = Opróżniacz Bloków +block.interplanetary-accelerator.name = Przspieszacz Międzyplanetarny block.switch.name = Przełącznik block.micro-processor.name = Micro Procesor @@ -1213,6 +1234,8 @@ hint.payloadPickup.mobile = [accent]Kliknij i przytrzymaj[] mały blok by go pod hint.payloadDrop = Kliknij [accent]][] by opuścić podniesoiny towar. hint.payloadDrop.mobile = [accent]Kliknij i przytrzymaj[] w puste miejsce by opuścić podniesoiny towar. hint.waveFire = [accent]Strumień[] wypełniony wodą będzie gasić pobiskie pożary. +hint.generator = \uf879 [accent]Generatory Spalinowe[] spalają węgiel i przekuzują moc do pobliskich bloków.\n\nMożesz powiększyć odległość transmitowanej mocy używająć \uf87f [accent]Węzeły Prądu[]. +hint.guardian = Jednostki [accent]Strażnicze[] są uzbrojone. Słaba amunicja - taka jak [accent]Miedź[] oraz [accent]Ołów[] [scarlet]nie jest efektywna[].\n\nUżyj lepszych działek takich jak \uf835 [accent]Naładowane Grafitem[] \uf861Duo/\uf859Salwa by pozbyć się strażników. item.copper.description = Przydatny materiał budowlany. Szeroko używany w prawie każdej konstrukcji. item.lead.description = Podstawowy materiał. Używany w przesyle przemiotów i płynów. Nie jest on przypadkiem szkodliwy? @@ -1370,7 +1393,7 @@ block.memory-cell.description = Przechowuje informacje dla procesora. block.memory-bank.description = Przechowuje informacje dla procesora. Duża pojemność. block.logic-display.description = Wyświetla obraz z procesora. block.large-logic-display.description = Wyświetla obraz z procesora. -block.interplanetary-accelerator.description = Masywna elektromagnetyczna wierza. Przyspiesza rdzeń do prędkości ucieczki by wylądować na innych planetach. +block.interplanetary-accelerator.description = Masywna elektromagnetyczna wieża. Przyspiesza rdzeń do prędkości ucieczki by wylądować na innych planetach. unit.dagger.description = Strzela standardowymi pociskami w najbliższych wrogów. From 43fea03996badc25225f048b448fc727010f147d Mon Sep 17 00:00:00 2001 From: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com> Date: Wed, 25 Nov 2020 15:24:35 +0700 Subject: [PATCH 034/123] New hint translate and other --- core/assets/bundles/bundle_in_ID.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index abc2909083..e67700b398 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -629,7 +629,7 @@ unit.nobuild = [scarlet]Unit tidak dapat membangun lastaccessed = [lightgray]Terakhir Diakses: {0} block.unknown = [lightgray]??? -stat.description = Purpose +stat.description = Kegunaan stat.input = Masukan stat.output = Pengeluaran stat.booster = Pendorong @@ -1274,7 +1274,7 @@ hint.payloadDrop = Tekan [accent]][] untuk menurunkan muatan. hint.payloadDrop.mobile = [accent]Tekan dan tahan[] di lokasi yang kosong untuk menurunkan muatan. hint.waveFire = [accent]Wave[] yang terisi dengan air akan memadamkan air dalam jangkauannya. hint.generator = \uf879 [accent]Generator Pembakar[] membakar batu bara dan menghasilkan energik ke blok yang berdekatan.\n\nTransmisi energi dapat diperluas menggunakan \uf87f [accent]Tiang Listrik[]. -hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down. +lhint.guardian = Unit [accent]Penjaga[] adalah unit yang diperkuat. Amunisi lemah seperti [accent]Tembaga[] dan [accent]Timah[] [scarlet]tidak berefek pada mereka[].\n\nGunakan turret yang lebih bagus atau gunakan amunisi yang lebih kuat seperti \uf835 [accent]Grafit[] \uf861Duo/\uf859Salvo untuk menghancurkan Penjaga. item.copper.description = Bahan struktur yang berguna. Digunakan di semua tipe blok. item.copper.details = Tembaga. Logam yang sangat melimpah di Serpulo. Lemah secara struktural kecuali jika diperkuat. From e0f2c2f46feab0f4ada9b19af95094eec94a13c9 Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Wed, 25 Nov 2020 10:40:02 +0200 Subject: [PATCH 035/123] Sector descriptions: additions and revisions Romanian is gonna hit stable soon. --- core/assets/bundles/bundle_ro.properties | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 913a45a34d..92efbac76a 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -584,15 +584,20 @@ sector.planetaryTerminal.name = Terminalul de Lansare Planetară sector.groundZero.description = Locația optimă pt a începe încă odată. Risc de inamici scăzut. Puține resurse.\nAdună cât de mult plumb și cupru se poate.\nMergi mai departe. sector.frozenForest.description = Chiar și aici, aproape de munți, sporii s-au împrăștiat. Temperaturile reci nu-i pot reține la infinit.\n\nÎncepe călătoria către electricitate. Construiește generatoare de combustie. Învață să folosești reparatoare. -sector.saltFlats.description = La periferia deșertului stau Podișurile Saline. Puține resurse pot fi găsite în această locație.\n\nInamicul a ridicat un complex-depozit aici. Distruge-le nucleul. Nu lăsa nimic în urmă. +sector.saltFlats.description = La periferia deșertului stau Podișurile Saline. Puține resurse pot fi găsite în această locație.\n\nInamicul a ridicat un complex de depozitare aici. Distruge-le nucleul. Nu lăsa nimic în urmă. sector.craters.description = Apa s-a acumulat în acest crater, rămășiță a vechilor războaie. Cucerește din nou zona. Adună nisip. Toarnă-l în metasticlă. Pompează apă pt a răci armele și burghiele. -sector.ruinousShores.description = După deșerturi vine țărmul. Odată, locația aceasta a avut un sistem de apărare de coastă. N-a rămas mult din el. Doar structurile de apărare cele mai de bază rămas în picioare, restul fiind redus la fier vechi.\nContinuă expansiunea în afară. Redescoperă tehnologia. -sector.stainedMountains.description = Mai înspre continent sunt munții, încă neatinși de spori.\nExtrage abundentele resurse de titan din zonă. Învață cum să-l folosești.\n\nPrezența inamicului e mai mare aici. Nu le da timp să-și trimită cele mai puternice unități. -sector.overgrowth.description = Această zonă este plină de buruieni, mai aproape de sursa sporilor.\nInamicul și-a stabilit un adăpost aici. Construiește unități Mace. Distruge-o. Cucerește din nou ce s-a pierdut. -sector.tarFields.description = O zonă aflată la periferia unei zone de producție petrolieră, între munți și deșert. Una din puținele zone cu resurse utilizabile de țiței.\nDeși abandonată, zona aceasta are niște forțe inamice periculoase înapropiere. Nu le subestima.\n\n[lightgray]Cercetează tehnologia de procesare a petrolului dacă se poate. -sector.desolateRift.description = O zonă extrem de periculoasă. Multe resurse, dar puțin spațiu. Mare risc de distrugere. Pleacă cât mai curând. Nu te lăsa păcălit de timpul mare dintre atacurile inamice. -sector.nuclearComplex.description = O fostă facilitate pt producerea și procesarea de toriu, redusă la ruine.\n[lightgray]Cercetează toriul și multele sale utilizări.\n\nInamicul e prezent aici în mari numere, căutând constând atacatori. +sector.ruinousShores.description = După deșerturi vine țărmul. Odată, locația aceasta a avut un sistem de apărare de coastă. N-a rămas mult din el. Doar structurile de apărare cele mai simple au rămas în picioare, restul fiind redus la fier vechi.\nContinuă expansiunea înspre exterior. Redescoperă tehnologia. +sector.stainedMountains.description = Mai spre mijlocul continentului sunt munții, încă neatinși de spori.\nExtrage abundentele resurse de titan din zonă. Învață cum să-l folosești.\n\nPrezența inamicului e mai mare aici. Nu le da timp să-și trimită cele mai puternice unități. +sector.overgrowth.description = Această zonă este plină de buruieni, mai aproape de sursa sporilor.\nInamicul și-a stabilit un avanpost aici. Construiește unități Mace. Distruge-l. +sector.tarFields.description = O zonă aflată la periferia unui complex de producție petrolieră, între munți și deșert. Una din puținele zone cu resurse utilizabile de țiței.\nDeși abandonată, în apropierea zonei se află de forțe inamice periculoase. Nu le subestima.\n\n[lightgray]Cercetează tehnologie de procesare a petrolului pe cât posibil. +sector.desolateRift.description = O zonă extrem de periculoasă. Multe resurse, dar puțin spațiu. Mare risc de distrugere. Pleacă curând, cât mai curând. Nu te lăsa păcălit de pauzele mari dintre atacurile inamice. +sector.nuclearComplex.description = O fostă facilitate pt producerea și procesarea de toriu, redusă la ruine.\n[lightgray]Cercetează toriul și multele sale utilizări.\n\nInamicul e prezent aici în mari numere, căutând constant atacatori. sector.fungalPass.description = O zonă de tranziție dintre munții înalți și zonele joase, pline cu spori. O mică bază de recunoaștere a inamicului este localizată aici.\nDistruge-o.\nFolosește unități Dagger și Crawler. Distruge cele 2 nuclee. +sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism. +sector.windsweptIslands.description = Acest arhipelag izolat se află mai departe, după țărm. Datele arată că odată aveau structuri care produceau [accent]Plastaniu[].\n\nApără-te de unitățile navale ale inamicului. Construiește o bază pe insule. Cercetează fabricile necesare. +sector.extractionOutpost.description = Un avanpost izolat, construit de inamic cu scopul de a lansa resurse către alte sectoare.\n\nTehnologia de transport intersectorial este esențială pt cuceririle ce urmează. Distruge baza. Cercetează platformele lor de lansare. +sector.impact0078.description = Aici se află rămășițele primei nave de transport interstelar care a intrat în acest sistem stelar.\n\nSalvează cât mai mult posibil din epavă. Cercetează orice tehnologie intactă. +sector.planetaryTerminal.description = Ținta finală.\n\nAceastă bază de coastă conține o structură capabilă să lanseze nuclee către alte planete locale. Este extrem de bine păzită.\n\nProdu unități navale. Elimină inamicul cât de rapid se poate. Cercetează structura de lansare. settings.language = Limbă settings.data = Datele Jocului From 69063e9dc57d33b2a70d39bebbe5692bc941488e Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Wed, 25 Nov 2020 10:23:07 +0100 Subject: [PATCH 036/123] Update contributors --- core/assets/contributors | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/contributors b/core/assets/contributors index 6283f50c03..6c659086b0 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -101,4 +101,5 @@ jalastram (freesound.org) newlocknew (freesound.org) dsmolenaers (freesound.org) Headphaze (freesound.org) +VolasYouKnow Angel-24 From 2a618a660008a0038f3de95ff81c8f92a4fe4812 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Wed, 25 Nov 2020 10:36:48 +0100 Subject: [PATCH 037/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 515e044a72..5ef1516b76 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -593,6 +593,12 @@ sector.tarFields.description = Las afueras de una zona de producción de petról sector.desolateRift.description = Una zona extremadamente peligrosa. Recursos abundantes, pero poco espacio. Alto riesgo de destrucción. Vete lo antes posible. No se deje engañar por el gran intervalo entre los ataques enemigos. sector.nuclearComplex.description = Antigua instalación de producción y procesamiento de torio, reducida a ruinas.\n[lightgray] Investiga el torio y sus múltiples usos.\n\nEl enemigo está presente aquí en gran número, constantemente en busca de atacantes. sector.fungalPass.description = Un área de transición entre montañas altas y tierras bajas plagadas de esporas. Aquí se encuentra una pequeña base de reconocimiento enemiga.\nDestroy it.\nUsa unidades Dagger y Crawler. Saca los dos núcleos de funcionamiento! +sector.biomassFacility.description = El origen de las esporas. Este es el centro en el que se investigaron, y donde fueron incialmente producidas.\nDescubre la tecnología restante que contiene. Cultiva esporas para producir combustible y plásticos.\n\n[lightgray]Nada en el ecosistema local pudo combatir semejante organismo tan invasivo, originado en este lugar. +sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories. +####################################### +sector.extractionOutpost.description = Una base remota, construida por el enemigo con el objetivo de lanzar recursos a otros sectores.\n\nLa tecnología de transporte de recursos entre sectores es esencial para conquistar a gran escala. Destruye la base. Investiga sus Plataformas de Lanzamiento. +sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology. +sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure. settings.language = Idioma settings.data = Datos del Juego From 8ca833f7532a4666e472d93d81211981c0dd427d Mon Sep 17 00:00:00 2001 From: lapis256 Date: Wed, 25 Nov 2020 18:50:44 +0900 Subject: [PATCH 038/123] update bundle_ja.properties --- core/assets/bundles/bundle_ja.properties | 560 ++++++++++++++--------- 1 file changed, 354 insertions(+), 206 deletions(-) diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 16c05bc37a..44fe8fc1c1 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -17,11 +17,13 @@ linkfail = リンクを開けませんでした!\nURLをクリップボードに screenshot = スクリーンショットを {0} に保存しました。 screenshot.invalid = マップが広すぎます。スクリーンショットに必要なメモリが足りない可能性があります。 gameover = ゲームオーバー +gameover.disconnect = Disconnect gameover.pvp = [accent] {0}[] チームの勝利! +gameover.waiting = [accent]Waiting for next map... highscore = [accent]ハイスコアを更新! copied = コピーしました。 -indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. indev.notready = This part of the game isn't ready yet +indev.campaign = [accent]You've reached the end of the campaign![]\n\nThis is as far as the content goes. Interplanetary travel will be added in future updates. load.sound = サウンド load.map = マップ @@ -55,8 +57,9 @@ schematic.saved = 設計図を保存しました。 schematic.delete.confirm = この設計図は完全に削除されます。よろしいですか schematic.rename = 設計図の名前を変更する。 schematic.info = {1}x{0}, {2} ブロック -schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server. +schematic.disabled = [scarlet]設計図使用不可[]\nこの[accent]マップ[]、[accent]サーバー[]では設計図の使用は許可されていません。 +stats = Stats stat.wave = 防衛したウェーブ:[accent] {0} stat.enemiesDestroyed = 敵に破壊された数:[accent] {0} stat.built = 建設した建造物数:[accent] {0} @@ -66,7 +69,7 @@ stat.delivered = 獲得した資源: stat.playtime = プレイ時間:[accent] {0} stat.rank = 最終ランク: [accent]{0} -globalitems = [accent]Global Items +globalitems = [accent]グローバルアイテム map.delete = マップ "[accent]{0}[]" を削除してもよろしいですか? level.highscore = ハイスコア: [accent]{0} level.select = レベル選択 @@ -100,14 +103,14 @@ committingchanges = 変更を適応中 done = 完了 feature.unsupported = あなたのデバイスはこの機能をサポートしていません。 -mods.alphainfo = Mods機能は実験的なものです。[scarlet] エラーが含まれている可能性があります[]。\n 問題を発見した場合は Mindustry GitHubに報告してください。 +mods.alphainfo = Mod機能は実験的なものです。[scarlet] エラーが含まれている可能性があります[]。\n 問題を発見した場合は Mindustry GitHubに報告してください。 mods = Mods mods.none = [lightgray]Modが見つかりませんでした! mods.guide = Mod作成ガイド mods.report = バグを報告する mods.openfolder = MODのフォルダを開く mods.reload = 再読み込み -mods.reloadexit = The game will now exit, to reload mods. +mods.reloadexit = Modを読み込む為にゲームを再起動します。 mod.display = [gray]Mod:[orange] {0} mod.enabled = [lightgray]有効 mod.disabled = [scarlet]無効 @@ -115,7 +118,7 @@ mod.disable = 無効化 mod.content = コンテンツ: mod.delete.error = MODを削除することができませんでした。 mod.requiresversion = [scarlet]Modが要求する最低バージョン: [accent]{0} -mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105) +mod.outdated = [scarlet]V6 との互換性がありません (no minGameVersion: 105) mod.missingdependencies = [scarlet]依存関係がありません。: {0} mod.erroredcontent = [scarlet]コンテンツエラー mod.errors = コンテンツの読み込み中にエラーが発生しました。 @@ -139,16 +142,17 @@ mod.scripts.disable = お使いのデバイスはScriptを使用したModをサ about.button = 情報 name = 名前: noname = [accent]プレイヤー名[]を入力してください。 -planetmap = Planet Map -launchcore = Launch Core +planetmap = 惑星地図 +launchcore = コアを打ち上げる filename = ファイル名: unlocked = 新しい要素をアンロック! +available = 新しい研究が利用可能です! completed = [accent]完了 techtree = テックツリー research.list = [lightgray]研究: research = 研究 researched = [lightgray]{0} の研究が完了しました -research.progress = {0}% complete +research.progress = {0}% 完了 players = {0} 人がオンライン players.single = {0} 人がオンライン players.search = 検索 @@ -189,6 +193,10 @@ servers.local = ローカルサーバー servers.remote = リモートサーバー servers.global = コミュニティサーバー +servers.showhidden = Show Hidden Servers +server.shown = Shown +server.hidden = Hidden + trace = プレイヤーの記録 trace.playername = プレイヤー名: [accent]{0} trace.ip = IP: [accent]{0} @@ -267,6 +275,9 @@ cancel = キャンセル openlink = リンクを開く copylink = リンクをコピー back = 戻る +crash.export = クラッシュログを出力 +crash.none = クラッシュログが見つかりません。 +crash.exported = クラッシュログを出力しました。 data.export = エクスポート data.import = インポート data.openfolder = データフォルダーを開く @@ -283,6 +294,7 @@ cancelbuilding = [accent][[{0}][] 選択を解除する selectschematic = [accent][[{0}][] 選択し、コピーする pausebuilding = [accent][[{0}][] 建築を一時的に中断する resumebuilding = [scarlet][[{0}][] 建築を再開する +showui = UI hidden.\nPress [accent][[{0}][] to show UI. wave = [accent]ウェーブ {0} wave.cap = [accent]Wave {0}/{1} wave.waiting = [lightgray]次のウェーブまで {0} 秒 @@ -290,9 +302,11 @@ wave.waveInProgress = [lightgray]ウェーブ進行中 waiting = [lightgray]待機中... waiting.players = プレイヤーを待っています... wave.enemies = [lightgray]敵は残り {0} 体 +wave.enemycores = [accent]{0}[lightgray] Enemy Cores +wave.enemycore = [accent]{0}[lightgray] Enemy Core wave.enemy = [lightgray]敵は残り {0} 体 -wave.guardianwarn = Guardian approaching in [accent]{0}[] waves. -wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave. +wave.guardianwarn = [red][[警告][]ガーディアンがあと [accent]{0}[] ウェーブで来ます。 +wave.guardianwarn.one = [red][[警告][]ガーディアンがあと [accent]{0}[] ウェーブで来ます。 loadimage = 画像を読み込む saveimage = 画像を保存 unknown = 不明 @@ -350,9 +364,10 @@ waves.invalid = クリップボードのウェーブは無効なウェーブで waves.copied = ウェーブをコピーしました。 waves.none = 敵が定義されていません。\n空のウェーブレイアウトはデフォルトのレイアウトに自動的に置き換えられます。 -wavemode.counts = counts -wavemode.totals = totals -wavemode.health = health +#these are intentionally in lower case +wavemode.counts = 数 +wavemode.totals = 総数 +wavemode.health = 総体力 editor.default = [lightgray]<デフォルト> details = 詳細... @@ -462,6 +477,8 @@ load = 読み込む save = 保存 fps = FPS: {0} ping = Ping: {0}ms +memory = Mem: {0}mb +memory2 = Mem:\n {0}mb +\n {1}mb language.restart = ゲームを再起動後、言語設定が有効になります。 settings = 設定 tutorial = チュートリアル @@ -475,25 +492,22 @@ locked = ロック complete = [lightgray]達成済み: requirement.wave = {1} でウェーブ {0} に到達 requirement.core = {0} の敵のコアを破壊 -requirement.research = Research {0} -requirement.capture = Capture {0} -bestwave = [lightgray]最高ウェーブ: {0} -launch.text = Launch -research.multiplayer = Only the host can research items. +requirement.research = 研究 {0} +requirement.produce = 獲得 {0} +requirement.capture = 制圧 {0} +launch.text = 発射 +research.multiplayer = 研究できるのはホストのみです。 +map.multiplayer = ホストのみがセクターを表示できます。 uncover = 開放 configure = 積み荷の設定 -loadout = Loadout -resources = Resources + +loadout = ロードアウト +resources = 資源 bannedblocks = 禁止ブロック addall = すべて追加 +launch.from = [accent]{0}[] からの発射 launch.destination = Destination: {0} configure.invalid = 値は 0 から {0} の間でなければなりません。 -zone.unlocked = [lightgray]{0} がアンロックされました. -zone.requirement.complete = ウェーブ {0} を達成:\n{1} の開放条件を達成しました。 -zone.resources = 発見した資源: -zone.objective = [lightgray]目標: [accent]{0} -zone.objective.survival = 敵からコアを守り切る -zone.objective.attack = 敵のコアを破壊する add = 追加... boss.health = ボスのHP @@ -508,37 +522,65 @@ error.io = ネットワークエラーです。 error.any = 不明なネットワークエラーです。 error.bloom = ブルームの初期化に失敗しました。\n恐らくあなたのデバイスではブルームがサポートされていません。 -weather.rain.name = Rain -weather.snow.name = Snow -weather.sandstorm.name = Sandstorm -weather.sporestorm.name = Sporestorm -weather.fog.name = Fog +weather.rain.name = 雨 +weather.snow.name = 雪 +weather.sandstorm.name = 砂嵐 +weather.sporestorm.name = 胞子嵐 +weather.fog.name = 霧 -sectors.unexplored = [lightgray]Unexplored -sectors.resources = Resources: -sectors.production = Production: -sectors.stored = Stored: -sectors.resume = Resume -sectors.launch = Launch -sectors.select = Select +sectors.unexplored = [lightgray]未踏査 +sectors.resources = 資源: +sectors.production = 生産: +sectors.export = 搬出: +sectors.time = 時間: +sectors.threat = 難易度: +sectors.wave = ウェーブ: +sectors.stored = 保存済み: +sectors.resume = 再開 +sectors.launch = 打ち上げ +sectors.select = 選択 sectors.nonelaunch = [lightgray]none (sun) -sectors.rename = Rename Sector -sector.missingresources = [scarlet]Insufficient Core Resources +sectors.rename = セクター名を変更 +sectors.enemybase = [scarlet]敵基地 +sectors.vulnerable = [scarlet]Vulnerable +sectors.underattack = [scarlet]攻撃を受けます! [accent]{0}% 破損 +sectors.survives = [accent]{0} ウェーブ生存 +sectors.go = Go +sector.curcapture = 制圧したセクター +sector.curlost = 失われたセクター +sector.missingresources = [scarlet]資源が足りません +sector.attacked = セクター [accent]{0}[white] が攻撃を受けています! +sector.lost = セクター [accent]{0}[white] 喪失! +#note: the missing space in the line below is intentional +sector.captured = セクター [accent]{0}[white]制圧! -planet.serpulo.name = Serpulo -planet.sun.name = Sun +threat.low = 低 +threat.medium = 中 +threat.high = 高 +threat.extreme = Extreme +threat.eradication = Eradication -sector.groundZero.name = Ground Zero -sector.craters.name = The Craters -sector.frozenForest.name = Frozen Forest -sector.ruinousShores.name = Ruinous Shores -sector.stainedMountains.name = Stained Mountains -sector.desolateRift.name = Desolate Rift -sector.nuclearComplex.name = Nuclear Production Complex -sector.overgrowth.name = Overgrowth -sector.tarFields.name = Tar Fields -sector.saltFlats.name = Salt Flats -sector.fungalPass.name = Fungal Pass +planets = 惑星 + +planet.serpulo.name = セルプロ +planet.sun.name = 太陽 + +sector.impact0078.name = インパクト 0078 +sector.groundZero.name = グラウンド · ゼロ +sector.craters.name = ザ · クレーター +sector.frozenForest.name = フローズン · フォレスト +sector.ruinousShores.name = ルーイナス · ショアーズ +sector.stainedMountains.name = ステインド · マウンテン +sector.desolateRift.name = ディサレット · リフト +sector.nuclearComplex.name = ニュークリア · プロダクション · コンプレックス +sector.overgrowth.name = オーバーグロウス +sector.tarFields.name = ター · フィールズ +sector.saltFlats.name = ソルト · フラッツ +sector.fungalPass.name = ファングル · パス +sector.biomassFacility.name = Biomass Synthesis Facility +sector.windsweptIslands.name = Windswept Islands +sector.extractionOutpost.name = Extraction Outpost +sector.planetaryTerminal.name = Planetary Launch Terminal sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on. sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders. @@ -551,6 +593,11 @@ sector.tarFields.description = The outskirts of an oil production zone, between sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks. sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers. sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores. +sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism. +sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories. +sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads. +sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology. +sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure. settings.language = 言語 settings.data = ゲームデータ @@ -564,25 +611,25 @@ settings.graphics = グラフィック settings.cleardata = データを削除... settings.clear.confirm = データを削除してもよろしいですか?\nこれを元に戻すことはできません! settings.clearall.confirm = [scarlet]警告![]\nこれはすべてのデータが削除されます。これにはセーブデータ、マップ、アンロック、キーバインドが含まれます。\n「ok」 を押すと、すべてのデータが削除され、自動的に終了します。 -settings.clearsaves.confirm = Are you sure you want to clear all your saves? -settings.clearsaves = Clear Saves -settings.clearresearch = Clear Research -settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research? -settings.clearcampaignsaves = Clear Campaign Saves -settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves? +settings.clearsaves.confirm = カスタムプレイのセーブデータをすべて削除してもよろしいですか？ +settings.clearsaves = セーブデータを削除 +settings.clearresearch = 研究リセット +settings.clearresearch.confirm = キャンペーンの研究をすべて削除してもよろしいですか？ +settings.clearcampaignsaves = キャンペーンのリセット +settings.clearcampaignsaves.confirm = キャンペーンのセーブデータをすべて削除してもよろしいですか？ paused = [accent]< ポーズ > clear = 消去 banned = [scarlet]使用禁止 -unplaceable.sectorcaptured = [scarlet]Requires captured sector yes = はい no = いいえ info.title = 情報 error.title = [crimson]エラーが発生しました error.crashtitle = エラーが発生しました -unit.nobuild = [scarlet]ユニットを構築できません -lastaccessed = [lightgray]Last Accessed: {0} +unit.nobuild = [scarlet]構築不可 +lastaccessed = [lightgray]最終アクセス {0} block.unknown = [lightgray]??? +stat.description = 説明 stat.input = 搬入 stat.output = 搬出 stat.booster = ブースト @@ -597,19 +644,21 @@ stat.itemsmoved = 輸送速度 stat.launchtime = 発射の待機時間 stat.shootrange = 範囲 stat.size = 大きさ -stat.displaysize = Display Size +stat.displaysize = 画面サイズ stat.liquidcapacity = 液体容量 stat.powerrange = 電力範囲 -stat.linkrange = Link Range +stat.linkrange = 接続範囲 stat.instructions = Instructions stat.powerconnections = 最大接続数 stat.poweruse = 電力使用量 stat.powerdamage = 電力/ダメージ stat.itemcapacity = アイテム容量 -stat.memorycapacity = Memory Capacity +stat.memorycapacity = メモリー容量 stat.basepowergeneration = 基本発電量 stat.productiontime = 製造速度 stat.repairtime = ブロックの完全修復速度 +stat.weapons = 武器 +stat.bullet = 弾丸 stat.speedincrease = 速度向上 stat.range = 範囲 stat.drilltier = ドリル @@ -624,30 +673,33 @@ stat.inaccuracy = 誤差 stat.shots = ショット stat.reload = リロード速度 stat.ammo = 弾薬 -stat.shieldhealth = Shield Health -stat.cooldowntime = Cooldown Time -stat.explosiveness = Explosiveness -stat.basedeflectchance = Base Deflect Chance -stat.lightningchance = Lightning Chance -stat.lightningdamage = Lightning Damage -stat.flammability = Flammability -stat.radioactivity = Radioactivity -stat.heatcapacity = HeatCapacity -stat.viscosity = Viscosity -stat.temperature = Temperature -stat.speed = Speed -stat.buildspeed = Build Speed -stat.minespeed = Mine Speed -stat.minetier = Mine Tier -stat.payloadcapacity = Payload Capacity -stat.commandlimit = Command Limit -stat.abilities = Abilities +stat.shieldhealth = シールド +stat.cooldowntime = クールタイム +stat.explosiveness = 爆発性 +stat.basedeflectchance = 反射確率 +stat.lightningchance = 電撃確率 +stat.lightningdamage = 電撃ダメージ +stat.flammability = 可燃性 +stat.radioactivity = 放射能 +stat.heatcapacity = 熱容量 +stat.viscosity = 粘度 +stat.temperature = 温度 +stat.speed = 速度 +stat.buildspeed = 建築速度 +stat.minespeed = 採掘速度 +stat.minetier = 採掘 +stat.payloadcapacity = 積載容量 +stat.commandlimit = 指揮上限 +stat.abilities = 能力 +stat.canboost = ブースト可能 +stat.flying = 飛行 -ability.forcefield = Force Field -ability.repairfield = Repair Field -ability.statusfield = Status Field -ability.unitspawn = {0} Factory -ability.shieldregenfield = Shield Regen Field +ability.forcefield = フォースフィールド +ability.repairfield = リペアフィールド +ability.statusfield = ステータスフィールド +ability.unitspawn = {0} 生産 +ability.shieldregenfield = シールドリペアフィールド +ability.movelightning = ムーブメントライトニング bar.drilltierreq = より高性能なドリルを使用してください bar.noresources = Missing Resources @@ -659,7 +711,7 @@ bar.powerbalance = 電力均衡: {0}/秒 bar.powerstored = 総蓄電量: {0}/{1} bar.poweramount = 蓄電量: {0} bar.poweroutput = 発電量: {0} -bar.powerlines = Connections: {0}/{1} +bar.powerlines = 接続数: {0}/{1} bar.items = アイテム: {0} bar.capacity = 容量: {0} bar.unitcap = {0} {1}/{2} @@ -671,24 +723,26 @@ bar.progress = 建設状況 bar.input = 入力 bar.output = 出力 -units.processorcontrol = [lightgray]Processor Controlled +units.processorcontrol = [lightgray]プロセッサーの制御下 bullet.damage = [stat]{0}[lightgray] ダメージ bullet.splashdamage = [stat]{0}[lightgray] 範囲ダメージ 約[stat] {1}[lightgray] タイル bullet.incendiary = [stat]焼夷弾 +bullet.sapping = [stat]sapping bullet.homing = [stat]追尾弾 bullet.shock = [stat]電撃 bullet.frag = [stat]爆発弾 bullet.knockback = [stat]{0}[lightgray] ノックバック -bullet.pierce = [stat]{0}[lightgray]x pierce -bullet.infinitepierce = [stat]pierce +bullet.pierce = [stat]{0}[lightgray]x レーザー弾 +bullet.infinitepierce = [stat]レーザー弾 +bullet.healpercent = [stat]{0}[lightgray]% 回復 bullet.freezing = [stat]凍結 bullet.tarred = [stat]タール弾 bullet.multiplier = [stat]弾薬 {0}[lightgray]倍 bullet.reload = [stat]リロード速度 {0}[lightgray]倍 unit.blocks = ブロック -unit.blockssquared = blocks² +unit.blockssquared = ブロック² unit.powersecond = 電力/秒 unit.liquidsecond = 液体/秒 unit.itemssecond = アイテム/秒 @@ -696,22 +750,23 @@ unit.liquidunits = 液体 unit.powerunits = 電力 unit.degrees = 度 unit.seconds = 秒 -unit.minutes = mins +unit.minutes = 分 unit.persecond = /秒 -unit.perminute = /min +unit.perminute = /分 unit.timesspeed = 倍の速度 unit.percent = % -unit.shieldhealth = shield health +unit.shieldhealth = シールド unit.items = アイテム unit.thousands = k unit.millions = mil unit.billions = b +category.purpose = 説明 category.general = 一般 category.power = 電力 category.liquids = 液体 category.items = アイテム category.crafting = 搬入/搬出 -category.function = Function +category.function = 役割 category.optional = 強化オプション setting.landscape.name = 横画面で固定 setting.shadows.name = 影 @@ -719,6 +774,7 @@ setting.blockreplace.name = 自動ブロック提案 setting.linear.name = リニアフィルター setting.hints.name = ヒント setting.flow.name = 資源流通量の表示 +setting.backgroundpause.name = バックグラウンドで一時停止中 setting.buildautopause.name = オートポーズビルディング setting.animatedwater.name = 流体のアニメーション setting.animatedshields.name = シールドのアニメーション @@ -747,16 +803,15 @@ setting.conveyorpathfinding.name = コンベアー配置経路探索 setting.sensitivity.name = 操作感度 setting.saveinterval.name = 自動保存間隔 setting.seconds = {0} 秒 -setting.blockselecttimeout.name = ブロック選択タイムアウト setting.milliseconds = {0} milliseconds setting.fullscreen.name = フルスクリーン setting.borderlesswindow.name = 境界の無いウィンドウ[lightgray] (再起動が必要になる場合があります) setting.fps.name = FPSを表示 -setting.smoothcamera.name = Smooth Camera +setting.smoothcamera.name = スムーズなカメラ setting.vsync.name = 垂直同期 setting.pixelate.name = ピクセル化[lightgray] (アニメーションが無効化されます) setting.minimap.name = ミニマップを表示 -setting.coreitems.name = Display Core Items (WIP) +setting.coreitems.name = コアの資源を表示 (WIP) setting.position.name = プレイヤーの位置表示 setting.musicvol.name = 音楽 音量 setting.atmosphere.name = 惑星の大気を表示 @@ -786,7 +841,7 @@ category.blocks.name = Block Select command.attack = 攻撃 command.rally = 結集 command.retreat = 後退 -command.idle = Idle +command.idle = 待機 placement.blockselectkeys = \n[lightgray]キー: [{0}, keybind.respawn.name = リスポーン keybind.control.name = ユニットをコントロール @@ -827,15 +882,17 @@ keybind.diagonal_placement.name = 斜め設置 keybind.pick.name = ブロックの選択 keybind.break_block.name = ブロックの破壊 keybind.deselect.name = 選択解除 -keybind.pickupCargo.name = Pickup Cargo -keybind.dropCargo.name = Drop Cargo -keybind.command.name = Command +keybind.pickupCargo.name = 貨物を拾う +keybind.dropCargo.name = 貨物を降ろす +keybind.command.name = 指揮 keybind.shoot.name = ショット keybind.zoom.name = ズーム keybind.menu.name = メニュー keybind.pause.name = ポーズ keybind.pause_building.name = 建築のポーズ/レジューム keybind.minimap.name = ミニマップ +keybind.planet_map.name = Planet Map +keybind.research.name = Research keybind.chat.name = チャット keybind.player_list.name = プレイヤーリスト keybind.console.name = コンソール @@ -861,14 +918,14 @@ mode.custom = カスタムルール rules.infiniteresources = 資源の無限化 rules.reactorexplosions = リアクターの爆発 -rules.schematic = Schematics Allowed +rules.schematic = 設計図を許可 rules.wavetimer = ウェーブの自動進行 rules.waves = ウェーブ rules.attack = アタックモード -rules.buildai = AI Building +rules.buildai = AI 建築 rules.enemyCheat = 敵(赤チーム)の資源の無限化 rules.blockhealthmultiplier = ブロックの体力倍率 -rules.blockdamagemultiplier = Block Damage Multiplier +rules.blockdamagemultiplier = ブロックのダメージ倍率 rules.unitbuildspeedmultiplier = ユニットの製造速度倍率 rules.unithealthmultiplier = ユニットの体力倍率 rules.unitdamagemultiplier = ユニットのダメージ倍率 @@ -879,17 +936,17 @@ rules.buildspeedmultiplier = 建設速度の倍率 rules.deconstructrefundmultiplier = ブロック破壊時の還元倍率 rules.waitForWaveToEnd = 敵が倒されるまでウェーブの進行を中断 rules.dropzoneradius = 出現範囲の半径:[lightgray] (タイル) -rules.unitammo = Units Require Ammo +rules.unitammo = ユニットは弾丸が必要 rules.title.waves = ウェーブ rules.title.resourcesbuilding = 資源 & 建設 rules.title.enemy = 敵 rules.title.unit = ユニット rules.title.experimental = 実験的なゲームプレイ -rules.title.environment = Environment +rules.title.environment = 環境 rules.lighting = 霧 rules.enemyLights = Enemy Lights rules.fire = Fire -rules.explosions = Block/Unit Explosion Damage +rules.explosions = 爆発ダメージ rules.ambientlight = 霧の色 rules.weather = Weather rules.weather.frequency = Frequency: @@ -899,6 +956,7 @@ content.item.name = アイテム content.liquid.name = 液体 content.unit.name = ユニット content.block.name = ブロック +content.sector.name = セクター item.copper.name = 銅 item.lead.name = 鉛 @@ -922,62 +980,63 @@ liquid.oil.name = 石油 liquid.cryofluid.name = 冷却水 unit.dagger.name = ダガー -unit.mace.name = Mace +unit.mace.name = メイス unit.fortress.name = フォートレス -unit.nova.name = Nova -unit.pulsar.name = Pulsar -unit.quasar.name = Quasar +unit.nova.name = ノヴァ +unit.pulsar.name = パルサー +unit.quasar.name = クエーサー unit.crawler.name = クローラー -unit.atrax.name = Atrax -unit.spiroct.name = Spiroct -unit.arkyid.name = Arkyid -unit.toxopid.name = Toxopid -unit.flare.name = Flare -unit.horizon.name = Horizon -unit.zenith.name = Zenith -unit.antumbra.name = Antumbra -unit.eclipse.name = Eclipse -unit.mono.name = Mono -unit.poly.name = Poly -unit.mega.name = Mega -unit.quad.name = Quad -unit.oct.name = Oct -unit.risso.name = Risso -unit.minke.name = Minke -unit.bryde.name = Bryde -unit.sei.name = Sei -unit.omura.name = Omura -unit.alpha.name = Alpha -unit.beta.name = Beta -unit.gamma.name = Gamma -unit.scepter.name = Scepter -unit.reign.name = Reign -unit.vela.name = Vela -unit.corvus.name = Corvus +unit.atrax.name = アトラックス +unit.spiroct.name = スパイロクト +unit.arkyid.name = アーキッド +unit.toxopid.name = トキソピッド +unit.flare.name = フレア +unit.horizon.name = ホライゾン +unit.zenith.name = ゼニス +unit.antumbra.name = アンタンブラ +unit.eclipse.name = エクリプス +unit.mono.name = モノ +unit.poly.name = ポリ +unit.mega.name = メガ +unit.quad.name = クアッド +unit.oct.name = オクト +unit.risso.name = リッソ +unit.minke.name = ミンク +unit.bryde.name = ブライド +unit.sei.name = セイ +unit.omura.name = オムラ +unit.alpha.name = アルファ +unit.beta.name = ベータ +unit.gamma.name = ガンマ +unit.scepter.name = セプター +unit.reign.name = レイン +unit.vela.name = ヴェラ +unit.corvus.name = コーバス -block.resupply-point.name = Resupply Point -block.parallax.name = Parallax +block.resupply-point.name = 補給ポイント +block.parallax.name = パララックス block.cliff.name = 崖 block.sand-boulder.name = 巨大な礫 +block.basalt-boulder.name = 玄武岩の礫 block.grass.name = 草 block.slag.name = スラグ block.space.name = Space block.salt.name = 岩塩氷河 -block.salt-wall.name = Salt Wall +block.salt-wall.name = 塩の壁 block.pebbles.name = 小石 block.tendrils.name = つる -block.sand-wall.name = Sand Wall +block.sand-wall.name = 砂の壁 block.spore-pine.name = 胞子の松の木 -block.spore-wall.name = Spore Wall -block.boulder.name = Boulder -block.snow-boulder.name = Snow Boulder +block.spore-wall.name = 胞子の壁 +block.boulder.name = 礫 +block.snow-boulder.name = 雪の礫 block.snow-pine.name = 松の木 block.shale.name = 泥板岩 -block.shale-boulder.name = 泥板岩の丸石 +block.shale-boulder.name = 泥板岩の礫 block.moss.name = コケ block.shrubs.name = 低木 block.spore-moss.name = 胞子のコケ -block.shale-wall.name = Shale Wall +block.shale-wall.name = 泥板岩 block.scrap-wall.name = スクラップの壁 block.scrap-wall-large.name = 大きなスクラップの壁 block.scrap-wall-huge.name = とても大きなスクラップの壁 @@ -1005,18 +1064,18 @@ block.craters.name = クレーター block.sand-water.name = 濁った水 block.darksand-water.name = 黒い砂で濁った水 block.char.name = 焦げ跡 -block.dacite.name = Dacite -block.dacite-wall.name = Dacite Wall -block.dacite-boulder.name = Dacite Boulder +block.dacite.name = デイサイト +block.dacite-wall.name = デイサイトの壁 +block.dacite-boulder.name = デイサイトの礫 block.ice-snow.name = 雪氷 -block.stone-wall.name = Stone Wall -block.ice-wall.name = Ice Wall -block.snow-wall.name = Snow Wall -block.dune-wall.name = Dune Wall +block.stone-wall.name = 石の壁 +block.ice-wall.name = 氷の壁 +block.snow-wall.name = 雪の壁 +block.dune-wall.name = 砂丘の壁 block.pine.name = 松の木 -block.dirt.name = Dirt -block.dirt-wall.name = Dirt Wall -block.mud.name = Mud +block.dirt.name = 泥 +block.dirt-wall.name = 泥の壁 +block.mud.name = 汚泥 block.white-tree-dead.name = 白い枯れた樹木 block.white-tree.name = 白い樹木 block.spore-cluster.name = 胞子の房 @@ -1032,7 +1091,7 @@ block.dark-panel-4.name = ダークパネル 4 block.dark-panel-5.name = ダークパネル 5 block.dark-panel-6.name = ダークパネル 6 block.dark-metal.name = ダークメタル -block.basalt.name = Basalt +block.basalt.name = 玄武岩 block.hotrock.name = ホットロック block.magmarock.name = マグマの岩 block.copper-wall.name = 銅の壁 @@ -1056,7 +1115,6 @@ block.conveyor.name = コンベアー block.titanium-conveyor.name = チタンコンベアー block.plastanium-conveyor.name = プラスタニウムコンベアー block.armored-conveyor.name = 装甲コンベアー -block.armored-conveyor.description = チタンコンベアーと同じ速度でアイテムを輸送することができ、耐久性に優れています。\nまた、コンベアー以外による側面への入力を受け入れません。 block.junction.name = ジャンクション block.router.name = ルーター block.distributor.name = ディストリビューター @@ -1064,7 +1122,6 @@ block.sorter.name = ソーター block.inverted-sorter.name = 反転ソーター block.message.name = メッセージブロック block.illuminator.name = イルミネーター -block.illuminator.description = コンパクトな光源です。電力が必要です。 block.overflow-gate.name = オーバーフローゲート block.underflow-gate.name = アンダーフローゲート block.silicon-smelter.name = シリコン溶鉱炉 @@ -1102,7 +1159,7 @@ block.power-source.name = 無限電源 block.unloader.name = 搬出機 block.vault.name = ボールト block.wave.name = ウェーブ -block.tsunami.name = Tsunami +block.tsunami.name = 津波 block.swarmer.name = スウォーマー block.salvo.name = サルボー block.ripple.name = リップル @@ -1142,33 +1199,38 @@ block.arc.name = アーク block.rtg-generator.name = RTG発電機 block.spectre.name = スペクター block.meltdown.name = メルトダウン -block.foreshadow.name = Foreshadow +block.foreshadow.name = フォーシャドウ block.container.name = コンテナー block.launch-pad.name = 発射台 block.launch-pad-large.name = 大型発射台 -block.segment.name = Segment -block.command-center.name = Command Center -block.ground-factory.name = Ground Factory -block.air-factory.name = Air Factory -block.naval-factory.name = Naval Factory +block.segment.name = セグメント +block.command-center.name = 司令塔 +block.ground-factory.name = 陸軍工場 +block.air-factory.name = 空軍工場 +block.naval-factory.name = 海軍工場 block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.payload-conveyor.name = Mass Conveyor -block.payload-router.name = Payload Router -block.disassembler.name = Disassembler -block.silicon-crucible.name = Silicon Crucible -block.overdrive-dome.name = Overdrive Dome +block.payload-conveyor.name = マスコンベアー +block.payload-router.name = ペイロードルーター +block.disassembler.name = ディスアセンブラー +block.silicon-crucible.name = シリコンクルーシブル +block.overdrive-dome.name = 加速ドーム +#experimental, may be removed +block.block-forge.name = Block Forge +block.block-loader.name = Block Loader +block.block-unloader.name = Block Unloader +block.interplanetary-accelerator.name = Interplanetary Accelerator -block.switch.name = Switch -block.micro-processor.name = Micro Processor -block.logic-processor.name = Logic Processor -block.hyper-processor.name = Hyper Processor -block.logic-display.name = Logic Display -block.large-logic-display.name = Large Logic Display -block.memory-cell.name = Memory Cell -block.memory-bank.name = Memory Bank +block.switch.name = スイッチ +block.micro-processor.name = マイクロプロセッサー +block.logic-processor.name = ロジックプロセッサー +block.hyper-processor.name = ハイパープロセッサー +block.logic-display.name = ロジックディスプレイ +block.large-logic-display.name = 大型ロジックディスプレイ +block.memory-cell.name = メモリーセル +block.memory-bank.name = メモリーバンク team.blue.name = ブルー team.crux.name = レッド @@ -1178,49 +1240,72 @@ team.derelict.name = 廃墟 team.green.name = グリーン team.purple.name = パープル -tutorial.next = [lightgray]<タップして続ける> -tutorial.intro = [scarlet]Mindustry チュートリアル[]へようこそ。\nまずは、コアの近くにある銅鉱石をタップして、[accent]銅を採掘[]してみましょう。\n\n[accent]銅: {0}/{1} -tutorial.intro.mobile = [scarlet]Mindustry チュートリアル[]へようこそ。\n画面をスワイプで移動します。\n2本の指でつまんで拡大 · 縮小します。\nまずは、コアの近くにある銅鉱石をタップして、[accent]銅を採掘[]してみましょう。\n\n[accent]銅: {0}/{1} -tutorial.drill = 手動で採掘するのは非効率的です。\n[accent]ドリル[]を使えば自動で採掘できます。\n右下にあるドリルのタブをクリックして、\n[accent]機械ドリル[]を選択して、銅鉱脈に設置してみましょう。\n[accent]右クリック[]で建設を止めることができ、[accent]Ctrlキーを押しながらスクロール[]することで、ズームができます。 -tutorial.drill.mobile = 手動で採掘するのは非効率的です。\n[accent]ドリル[]を使えば自動で採掘できます。\n右下にあるドリルのタブをタップして、\n[accent]機械ドリル[]を選択しましょう。\nタップでドリルを銅鉱脈に配置したら、下にある[accent]チェックマーク[]を押すことで、建設が開始されます。\n[accent]X ボタン[]で建設をキャンセルできます。 -tutorial.blockinfo = それぞれのブロックには異なる性質があります。特定のドリルでしか採掘できない鉱石もあります。\nブロックの情報や性質を知りたかったら、[accent]ビルドメニューにある "?" ボタンを押してください。[]\n\n[accent]機械ドリルの性質を見てみましょう。[] -tutorial.conveyor = [accent]コンベアー[]はアイテムをコアに輸送することができます。\nドリルからコアまでコンベアー作りましょう。\n[accent]マウスをクリックしながら動かすことで、線を引くことができます。[]\n[accent]Ctrlキー[]を押しながら線を引くと、斜めに線が引けます。\n\n[accent]ラインツールで2つのコンベアーを設置し、コアまでアイテムを輸送してみましょう。 -tutorial.conveyor.mobile = [accent]コンベアー[]はアイテムをコアに輸送することができます。\nドリルからコアまでコンベアー作りましょう。\n[accent]指を数秒間押したまま[]ドラッグすることで、一直線に配置できます。\n\n[accent]ラインツールで2つのコンベアーを設置し、コアまでアイテムを輸送してみましょう。 -tutorial.turret = コアに搬入されたアイテムは、建物の建設に利用することができます。\n全てのアイテムが建設に利用できるわけではないことに注意してください。\n[accent]石炭[]や[accent]スクラップ[]のような建設に利用できないアイテムは、コアに搬入することはできません。\n[lightgray]敵[]を撃退するためには、防衛体制を整えなければなりません。\nあなたの拠点の近くに[accent]デュオ[]を設置してみましょう。 -tutorial.drillturret = デュオには弾として[accent]銅の弾薬[]が必要です。\nデュオの近くにドリルを設置し、採掘した銅をコンベアーで供給してみましょう。\n\n[accent]弾薬: 0/1 -tutorial.pause = バトル中、[accent]ゲームを一時停止[]することができます。\n一時停止中、建物の建設はキューに追加されます。\n\n[accent]スペースキーで一時停止してみましょう。 -tutorial.pause.mobile = バトル中、[accent]ゲームを一時停止[]することができます。\n一時停止中、建物の建設はキューに追加されます。\n\n[accent]左上のボタンを押して、一時停止をしてみましょう。 -tutorial.unpause = もう一度スペースキーを押して、ゲームを再開しましょう。 -tutorial.unpause.mobile = もう一度ボタンを押して、ゲームを再開しましょう。 -tutorial.breaking = ブロックを破壊したい時があるかもしれません。\n[accent]右クリックを押したまま[]範囲を選択することで、範囲内のすべてのブロックが破壊されます。\n\n[accent]コアの近くにあるスクラップブロックを、右クリックで選択して破壊してみましょう。 -tutorial.breaking.mobile = ブロックを破壊したい時があるかもしれません。\n[accent]破壊モードを選択[]して、破壊したいブロックをタップで選択します。\n[accent]指を数秒間押したまま[]ドラッグすることで、破壊する範囲を選択できます。\nチェックマークのボタンを押して、破壊します。\n\n[accent]コアの左側にあるスクラップブロックを選択して、破壊してみましょう。 -tutorial.withdraw = 状況によっては、ブロックから直接アイテムを取り出す必要があります。\nブロックからアイテムを取り出すには、取り出したいアイテムが入っている[accent]ブロックをタップ[]して、インベントリの中にある[accent]アイテムをタップ[]します。\n[accent]長押しする[]ことで、複数個のアイテムを引き出すことができます。\n\n[accent]コアからいくつかの銅を取り出してみましょう。[] -tutorial.deposit = 機体にあるアイテムをドラッグアンドドロップで、ブロックへ移動させることができます。\n\n[accent]コアから取り出した銅をコアに戻してみましょう。[] -tutorial.waves = [lightgray]敵[]がやってきます。\n\n2ウェーブの間コアを守ってみましょう。[accent]クリック[]で弾を発射することができます。\nさらにドリルやデュオを設置しましょう。さらに銅を採掘しましょう。 -tutorial.waves.mobile = [lightgray]敵[]がやってきます。\n\n2ウェーブの間コアを守ってみましょう。あなたの機体は自動で敵を攻撃してくれます。\nさらにドリルやデュオを設置しましょう。さらに銅を採掘しましょう。 -tutorial.launch = 発射可能なウェーブに達すると、[accent]コアにある全ての資源を持って[]、マップから[accent]離脱する[]ことができます。\nこれらの資源は、新しい技術の研究に使用することができます。\n\n[accent]発射ボタンを押しましょう。 +hint.skip = Skip +hint.desktopMove = Use [accent][[WASD][] to move. +hint.zoom = [accent]Scroll[] to zoom in or out. +hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually. +hint.desktopShoot = [accent][[Left-click][] to shoot. +hint.depositItems = To transfer items, drag from your ship to the core. +hint.respawn = To respawn as a ship, press [accent][[V][]. +hint.respawn.mobile = You have switched control a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[] +hint.desktopPause = Press [accent][[Space][] to pause and unpause the game. +hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it. +hint.placeDrill.mobile = Select the \ue85e[accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm. +hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. +hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. +hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. +hint.breaking = [accent]Right-click[] and drag to break blocks. +hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. +hint.research = Use the \ue875 [accent]Research[] button to research new technology. +hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology. +hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets. +hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets. +hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right. +hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[]. +hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. +hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path. +hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path. +hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters. +hint.command = Press [accent][[G][] to command nearby units of [accent]similar type[] into formation.\n\nTo command ground units, you must first control another ground unit. +hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation. +hint.payloadPickup = Press [accent][[[] to pick up small blocks or units. +hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up. +hint.payloadDrop = Press [accent]][] to drop a payload. +hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there. +hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. +hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[]. +hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down. item.copper.description = 便利な鉱石です。様々なブロックの材料として幅広く使われています。 +item.copper.details = セルプロに豊富な金属。補強しない限り構造的に弱い。 item.lead.description = 一般的で手軽な鉱石です。機械や液体輸送ブロックなどに使われます。 +item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here. item.metaglass.description = とても頑丈な強化ガラスです。液体の輸送やタンクとして幅広く使われています。 item.graphite.description = 弾薬や絶縁体として利用されています。 item.sand.description = 合金や融剤など広く使用されている一般的な材料です。 item.coal.description = 一般的で有用な燃料です。 +item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event. item.titanium.description = 希少で非常に軽量な金属です。液体輸送やドリル、航空機などで使われます。 item.thorium.description = 放射性を持つ高密度な金属です。建造物の支えや核燃料として使われます。 item.scrap.description = 昔の建造物やユニットの残骸です。様々な種類の金属が微量に含まれています。 +item.scrap.details = Leftover remnants of old structures and units. item.silicon.description = 非常に有用な半導体でソーラーパネルや多くの複雑な機械に応用できます。 item.plastanium.description = 軽量で伸縮性のある材料です。高度な航空機や分散型の弾薬として使用されます。 item.phase-fabric.description = 極めて軽量な素材です。高度な機械や自己修復技術に使用されます。 item.surge-alloy.description = 電気的特性を持った高度な合金です。 item.spore-pod.description = 石油や爆薬、燃料への転換として使用されます。 +item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions. item.blast-compound.description = 爆弾や爆発物に使われる不安定な化合物です。胞子と揮発性物質から合成されます。燃料として燃やすこともできますが、お勧めしません。 item.pyratite.description = 焼夷兵器などに使われる非常に燃えやすい物質です。 + liquid.water.description = 機械の冷却や廃棄物の処理など幅広く使われている液体です。 liquid.slag.description = 様々な種類の鉱石が混ざり合っています。それぞれの鉱石に分類するか、噴射する武器として使用されます。 liquid.oil.description = 高度な材料生産で使用される液体です。 燃料として石炭に変換したり、武器として噴霧して発火させることができます。 liquid.cryofluid.description = 水とチタニウムから作られる不活性で非腐食性の液体です。 非常に高い熱容量を持っているため、冷却に使用されます。 +block.resupply-point.description = 近くのユニットに銅の弾薬を補給します。エネルギーを必要とするユニットとは互換性がありません。 +block.armored-conveyor.description = チタンコンベアーと同じ速度でアイテムを輸送することができ、耐久性に優れています。\nまた、コンベアー以外による側面への入力を受け入れません。 +block.illuminator.description = 電力が必要な光源です。 block.message.description = メッセージを保存し、仲間間の通信に使用します。 block.graphite-press.description = 石炭を圧縮し、黒鉛を生成します。 block.multi-press.description = 黒鉛圧縮機のアップグレード版です。水と電力を使用して、より効率的に石炭を圧縮します。 @@ -1272,6 +1357,7 @@ block.phase-conveyor.description = 改良されたアイテム転送ブロック block.sorter.description = アイテムを分別して搬出します。設定したアイテムは通過させます。他のアイテムが搬入されると側面にアイテムを搬出します。 block.inverted-sorter.description = アイテムを分別して搬出します。設定したアイテムは側面に搬出されます。他のアイテムが搬入されるとアイテムを通過させます。通常のルーターと反対の動作をします。 block.router.description = 搬入したアイテムをほかの3方向に均等に搬出します。一つの資源から複数に分ける際などに使われます。 +block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output. block.distributor.description = 高度なルーターです。搬入したアイテムをほかの7方向に均等に分けて搬出します。 block.overflow-gate.description = 搬出先にアイテムを搬入する空きがない場合に左右にアイテムを搬出します。 block.underflow-gate.description = オーバーフローゲートの反対の機能を持ちます。 左右に出力できない場合、前面に出力します。 @@ -1308,15 +1394,18 @@ block.laser-drill.description = 電力を使用したレーザー技術でより block.blast-drill.description = 上位のドリルです。大量の電力が必要になります。 block.water-extractor.description = 地面から水を汲み上げます。近くに湖がない場合に有用です。 block.cultivator.description = 胞子の小さな集まりを工業用ポッドに培養します。 +block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo. block.oil-extractor.description = 大量の電力を使用して、砂から石油を回収します。近くに油田がない場合に有用です。 block.core-shard.description = 基本的なコアです。一度破壊されると、その地域との接続が途絶えます。破壊されないようにしましょう。 +block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel. block.core-foundation.description = バージョンアップしたコアです。より堅く、より多くの資源を格納できます。 +block.core-foundation.details = The second iteration. block.core-nucleus.description = さらにバージョンアップしたコアです。優れた耐久性と大量の資源を格納できます。 +block.core-nucleus.details = The third and final iteration. block.vault.description = 各種類のアイテムを大量に保管します。隣接するコンテナーやボール卜、コアは一つのストレージユニットとして扱われます。[lightgray]搬出機[]を使って、ボールトからアイテムを搬出できます。 block.container.description = 各種類のアイテムを少量ずつ保管します。隣接するコンテナーやボール卜、コアは一つのストレージユニットとして扱われます。 [lightgray]搬出機[]を使って、コンテナーからアイテムを搬出できます。 block.unloader.description = コンテナやボールト、コアからアイテムをコンベアーか隣接するブロックに搬出します。搬出機をタップして搬出するアイテムを変更することができます。 block.launch-pad.description = 離脱することなく、アイテムを回収することができます。 -block.launch-pad-large.description = 発射台の改良版です。より多くのアイテムを、より頻繁に回収します。 block.duo.description = 小さく安価なターレットです。 block.scatter.description = 中規模の対空型ターレットです。敵に鉛やスクラップの塊、メタガラスを分散するように発射します。。 block.scorch.description = 近くの地上の敵を燃やします。近距離だと非常に効果的です。 @@ -1331,5 +1420,64 @@ block.ripple.description = 同時に複数ショットを発射する大型タ block.cyclone.description = 大型の連射型ターレットです。 block.spectre.description = 一度に2発の強力な弾を放つ大型のターレットです。 block.meltdown.description = 強力な長距離攻撃が可能な大型のターレットです。 +block.foreshadow.description = 一つのターゲットを狙う高火力、長射程のタレットです。 block.repair-point.description = 近くの負傷したユニットを修復します。 -block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. +block.segment.description = 射程内に入ってきた弾丸を破壊します。レーザー弾は破壊できません。 +block.parallax.description = 航空ユニットを引き込むビームを発射し、その過程でターゲットにダメージを与えます。 +block.tsunami.description = 敵に強力な流体を発射します。水が供給されると自動的に火を消します。 +block.silicon-crucible.description = 追加の熱源としてピラタイトを使用し、砂と石炭からシリコンを効率的に精製します。また、熱源の上でより効率的に精製します。 +block.disassembler.description = スラグを低効率で貴重な鉱物成分に分離します。トリウムなどが生産可能です。 +block.overdrive-dome.description = 近くの建造物の速度を上げます。電気の他に、フェーズファイバーとシリコンが必要です。 +block.payload-conveyor.description = 工場で生産されたユニットなど、大きな物を輸送します。 +block.payload-router.description = 搬入した物を3方向に均等に搬出します。 +block.command-center.description = いくつかのコマンドでユニットの動作を制御します。 +block.ground-factory.description = 陸軍ユニットを生産します。生産されたユニットは直接使用するだけでなく、アップグレードのために移動させることもできます。 +block.air-factory.description = 空軍ユニットを生産します。生産されたユニットは直接使用するだけでなく、アップグレードのために移動させることもできます。 +block.naval-factory.description = 海軍ユニットを生産します。生産されたユニットは直接使用するだけでなく、アップグレードのために移動させることもできます。 +block.additive-reconstructor.description = 搬入したユニットを第2段階にアップグレードします。 +block.multiplicative-reconstructor.description = 搬入したユニットを第3段階にアップグレードします。 +block.exponential-reconstructor.description = 搬入したユニットを第4段階にアップグレードします。 +block.tetrative-reconstructor.description = 搬入したユニットを第5段階にアップグレードします。 +block.switch.description = トグル可能なスイッチです。プロセッサを使用して読み取りや制御ができます。 +block.micro-processor.description = 一連の命令をループで実行します。 ユニットや建物の制御に使用できます。 +block.logic-processor.description = 一連の命令をループで実行します。 ユニットや建物の制御に使用できます。マイクロプロセッサーより高速に命令を実行可能です。 +block.hyper-processor.description = 一連の命令をループで実行します。 ユニットや建物の制御に使用できます。ロジックプロセッサーより高速に命令を実行可能です。 +block.memory-cell.description = 情報を格納します。 +block.memory-bank.description = より多くの情報を格納します。 +block.logic-display.description = プロセッサからの任意のグラフィックを表示します。 +block.large-logic-display.description = プロセッサからの任意のグラフィックを表示します。 +block.interplanetary-accelerator.description = 巨大な電磁レールガンタワーです。別惑星への展開のためにコアを重力圏脱出可能速度まで加速します。 + +unit.dagger.description = Fires standard bullets at all nearby enemies. +unit.mace.description = Fires streams of flame at all nearby enemies. +unit.fortress.description = Fires long-range artillery at ground targets. +unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies. +unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies. +unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight. +unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight. +unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded. +unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repair allied structures. Capable of flight. +unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain. +unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion. +unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain. +unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. +unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. +unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain. +unit.flare.description = Fires standard bullets at nearby ground targets. +unit.horizon.description = Drops clusters of bombs on ground targets. +unit.zenith.description = Fires salvos of missiles at all nearby enemies. +unit.antumbra.description = Fires a barrage of bullets at all nearby enemies. +unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies. +unit.mono.description = Automatically mines copper and lead, depositing it into the core. +unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction. +unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units. +unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units. +unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units. +unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies. +unit.minke.description = Fires incendiary shells and standard bullets at nearby ground targets. +unit.bryde.description = Fires long-range artillery shells and missiles at enemies. +unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies. +unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units. +unit.alpha.description = Defends the Shard core from enemies. Builds structures. +unit.beta.description = Defends the Foundation core from enemies. Builds structures. +unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. From 1467a3a7fd3bfac94aec5239a40d5fa1bcaabf1b Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Wed, 25 Nov 2020 14:59:07 +0100 Subject: [PATCH 039/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 127 +++++++++++------------ 1 file changed, 62 insertions(+), 65 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 5ef1516b76..1010be4d40 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -582,23 +582,22 @@ sector.windsweptIslands.name = Islas Windswept sector.extractionOutpost.name = Puesto de avanzada de Extracción sector.planetaryTerminal.name = Terminal de Lanzamiento Interplanetario -sector.groundZero.description = La ubicación óptima para empezar una vez más. Baja amenaza enemiga. Pocos recursos.\nReúna la mayor cantidad de plomo y cobre posible.\nSiga adelante. -sector.frozenForest.description = Incluso aquí, más cerca de las montañas, las esporas se han extendido. Las gélidas temperaturas no pueden contenerlos para siempre.\n\nComienza la aventura hacia el poder. Construye generadores de combustión. Aprenda a usar reparadores. -sector.saltFlats.description = En las afueras del desierto se encuentran las Salinas. Se pueden encontrar pocos recursos en esta ubicación.\n\nEl enemigo ha erigido un complejo de almacenamiento de recursos aquí. Erradicar su núcleo. No dejes nada en pie. -sector.craters.description = El agua se ha acumulado en este cráter, reliquia de las viejas guerras. Recupere el área. Recoge arena. Fundir metavidrio. Bombee agua para enfriar torretas y taladros. -sector.ruinousShores.description = Más allá de los páramos, está la costa. Una vez, esta ubicación albergó una serie de defensa costera. No queda mucho. Solo las estructuras de defensa más básicas han quedado ilesas, todo lo demás reducido a chatarra.\nContinúe la expansión hacia afuera. Redescubra la tecnología. -sector.stainedMountains.description = Más tierra adentro se encuentran las montañas, pero no contaminadas por esporas.\nExtraiga el abundante titanio de esta zona. Aprenda como usarlo.\n\nLa presencia enemiga es mayor aquí. No les des tiempo para enviar sus unidades más fuertes. -sector.overgrowth.description = Esta área está cubierta de maleza, más cerca de la fuente de las esporas.\nEl enemigo ha establecido un puesto de avanzada aquí. Construye unidades Titán. Destruyelo. Recupera lo que se perdió. -sector.tarFields.description = Las afueras de una zona de producción de petróleo, entre la montaña y el desierto. Una de las pocas áreas con reservas de alquitrán utilizables.\nAunque está abandonada, esta zona tiene algunas fuerzas enemigas peligrosas cerca. No los subestimes.\n\n[lightgray]Investigue la tecnología de procesamiento de aceite si es posible. -sector.desolateRift.description = Una zona extremadamente peligrosa. Recursos abundantes, pero poco espacio. Alto riesgo de destrucción. Vete lo antes posible. No se deje engañar por el gran intervalo entre los ataques enemigos. -sector.nuclearComplex.description = Antigua instalación de producción y procesamiento de torio, reducida a ruinas.\n[lightgray] Investiga el torio y sus múltiples usos.\n\nEl enemigo está presente aquí en gran número, constantemente en busca de atacantes. -sector.fungalPass.description = Un área de transición entre montañas altas y tierras bajas plagadas de esporas. Aquí se encuentra una pequeña base de reconocimiento enemiga.\nDestroy it.\nUsa unidades Dagger y Crawler. Saca los dos núcleos de funcionamiento! +sector.groundZero.description = La ubicación adecuada para empezar una vez más. Baja amenaza enemiga. Pocos recursos.\nReúna la mayor cantidad de plomo y cobre posible y sigue adelante. +sector.frozenForest.description = Incluso aquí, más cerca de las montañas, las esporas se han extendido. Las gélidas temperaturas no las contendrán para siempre.\n\nAprende a usar la energía. Construye generadores de combustión. Aprende a usar reparadores. +sector.saltFlats.description = En las afueras del desierto se encuentran las Salinas. No hay muchos recursos en esta ubicación.\n\nEl enemigo ha creado un complejo de almacenamiento de recursos aquí. Erradica su núcleo. No dejes nada en pie. +sector.craters.description = El agua se ha acumulado en este cráter, reliquia de las viejas guerras. Recupera la zona. Recoge arena. Funde Metacristal. Bombea agua para enfriar torretas y taladros. +sector.ruinousShores.description = Más allá de los páramos, se encuentra la costa. Una vez, esta ubicación albergó una serie de defensa costera. No queda mucho. Solo las estructuras de defensa más básicas han quedado ilesas, todo lo demás está reducido a chatarra.\nContinúa la expansión. Redescubre la tecnología. +sector.stainedMountains.description = Más adentro se encuentran las montañas, aún intactas por las esporas.\nExtrae el abundante titanio de esta zona. Aprende a usarlo.\n\nLa presencia enemiga es mayor aquí. No les des tiempo para enviar sus unidades más fuertes. +sector.overgrowth.description = El área está cubierta de maleza, más cerca de la fuente de las esporas.\nEl enemigo ha establecido un puesto de avanzada aquí. Construye unidades Titán. Destruyelo. Recupera lo que se perdió. +sector.tarFields.description = Las afueras de una zona de producción de petróleo, entre la montaña y el desierto. Una de las pocas áreas con reservas de alquitrán utilizables.\nAunque está abandonada, esta zona tiene algunas fuerzas enemigas peligrosas cerca. No los subestimes.\n\n[lightgray]Investiga la tecnología de procesamiento de petróleo si es posible. +sector.desolateRift.description = Una zona extremadamente peligrosa. Recursos abundantes, pero poco espacio. Alto riesgo de destrucción. Abandona el lugar lo antes posible. No te dejes engañar por el intervalo entre los ataques enemigos. +sector.nuclearComplex.description = Antigua instalación de producción y procesamiento de torio, reducida a ruinas.\n[lightgray] Investiga el torio y sus múltiples usos.\n\nEl enemigo está presente aquí,superando en número a sus atacantes. +sector.fungalPass.description = Un área de transición entre montañas y las tierras bajas, plagadas de esporas. Aquí se encuentra una pequeña base de reconocimiento enemiga.\nDestrúyela.\nUsa unidades Dagger y Crawler. Acaba con los dos núcleos. sector.biomassFacility.description = El origen de las esporas. Este es el centro en el que se investigaron, y donde fueron incialmente producidas.\nDescubre la tecnología restante que contiene. Cultiva esporas para producir combustible y plásticos.\n\n[lightgray]Nada en el ecosistema local pudo combatir semejante organismo tan invasivo, originado en este lugar. -sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories. -####################################### +sector.windsweptIslands.description = Tras la costa, se encuentra esta remota cadena de islas. Las grabaciones muestran que aquí existieron estructuras relacionadas con la producción de [accent]Plastanio[].\n\nDefiéndete de las unidades navales enemigas. Establece una base en las islas. Investiga estas fábricas. sector.extractionOutpost.description = Una base remota, construida por el enemigo con el objetivo de lanzar recursos a otros sectores.\n\nLa tecnología de transporte de recursos entre sectores es esencial para conquistar a gran escala. Destruye la base. Investiga sus Plataformas de Lanzamiento. -sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology. -sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure. +sector.impact0078.description = Aquí yacen las ruinas de la primera estación de transporte interestelar en estar operativa del sistema.\n\nRecupera todo lo posible de los escombros. Investiga cualquier tecnología intacta. +sector.planetaryTerminal.description = El objetivo final.\n\nÉsta base costera alberga una estructura capaz de lanzar Núcleos a planeteas locales. Está extremadamente bien protegida.\n\nProduce unidades navales. Acaba con el enemigo lo antes posible. Analiza la estructura de lanzamiento. settings.language = Idioma settings.data = Datos del Juego @@ -692,7 +691,7 @@ stat.minetier = Nivel de taladro stat.payloadcapacity = Capacidad de carga stat.commandlimit = Límite de comando stat.abilities = Habilidades -stat.canboost = Puede Acelerar +stat.canboost = Tiene Propulsores stat.flying = Aéreo skill.forcefield = Zona de Escudo @@ -979,21 +978,21 @@ liquid.water.name = Agua liquid.slag.name = Fundido liquid.oil.name = Petróleo liquid.cryofluid.name = Líquido criogénico - -unit.dagger.name = Daga -unit.mace.name = Mazo -unit.fortress.name = Fortaleza +#Names of Units and Turrets look better untranslated, since they are propper/own names +unit.dagger.name = Dagger +unit.mace.name = Mace +unit.fortress.name = Fortress unit.nova.name = Nova unit.pulsar.name = Pulsar unit.quasar.name = Quasar -unit.crawler.name = Oruga +unit.crawler.name = Crawler unit.atrax.name = Atrax unit.spiroct.name = Spiroct unit.arkyid.name = Arkyid -unit.toxopid.name = Toxopodo -unit.flare.name = Bengala -unit.horizon.name = Horizonte -unit.zenith.name = Cenit +unit.toxopid.name = Toxopid +unit.flare.name = Flare +unit.horizon.name = Horizon +unit.zenith.name = Zenith unit.antumbra.name = Antumbra unit.eclipse.name = Eclipse unit.mono.name = Mono @@ -1009,14 +1008,14 @@ unit.omura.name = Omura unit.alpha.name = Alpha unit.beta.name = Beta unit.gamma.name = Gamma -unit.scepter.name = Cetro +unit.scepter.name = Scepter unit.reign.name = Reign unit.vela.name = Vela -unit.corvus.name = Corvo +unit.corvus.name = Corvus block.resupply-point.name = Punto de reabastecimiento block.parallax.name = Parallax -block.cliff.name = Acantilado +block.cliff.name = Cliff block.sand-boulder.name = Roca de arena block.basalt-boulder.name = Roca de basalto block.grass.name = Hierba @@ -1108,10 +1107,10 @@ block.thorium-wall-large.name = Muro de Torio grande block.door.name = Puerta block.door-large.name = Puerta Grande block.duo.name = Duo -block.scorch.name = Quemador -block.scatter.name = Dispersor -block.hail.name = Granizo -block.lancer.name = Lancero +block.scorch.name = Scorch +block.scatter.name = Scatter +block.hail.name = Hail +block.lancer.name = Lancer block.conveyor.name = Cinta Transportadora block.titanium-conveyor.name = Cinta Transportadora de Titanio block.plastanium-conveyor.name = Cinta Transportadora de Plastanio @@ -1161,9 +1160,9 @@ block.unloader.name = Descargador block.vault.name = Almacén block.wave.name = Wave block.tsunami.name = Tsunami -block.swarmer.name = Enjambre -block.salvo.name = Salva -block.ripple.name = Onda +block.swarmer.name = Swarmer +block.salvo.name = Salvo +block.ripple.name = Ripple block.phase-conveyor.name = Cinta Transportadora de Fase block.bridge-conveyor.name = Puente de Cinta Transportadora block.plastanium-compressor.name = Compresor de Plastanio @@ -1174,7 +1173,7 @@ block.solar-panel-large.name = Panel Solar Grande block.oil-extractor.name = Extractor de Petróleo block.repair-point.name = Punto de Reparación de Unidades block.pulse-conduit.name = Conducto de Pulso -block.plated-conduit.name = Conducto Chapado +block.plated-conduit.name = Conducto Acorazado block.phase-conduit.name = Conducto de Fase block.liquid-router.name = Enrutador de Líquidos block.liquid-tank.name = Tanque de Líquidos @@ -1191,20 +1190,20 @@ block.mender.name = Reparador block.mend-projector.name = Proyector de Reparación block.surge-wall.name = Muro de Sobretensión block.surge-wall-large.name = Muro de Sobretensión grande -block.cyclone.name = Ciclón -block.fuse.name = Fusible +block.cyclone.name = Cyclone +block.fuse.name = Fuse block.shock-mine.name = Mina electrizante block.overdrive-projector.name = Proyector de Aceleración block.force-projector.name = Proyector de Escudo -block.arc.name = Arco +block.arc.name = Arc block.rtg-generator.name = Generador RTG -block.spectre.name = Espectro -block.meltdown.name = Fusión +block.spectre.name = Spectre +block.meltdown.name = Meltdown block.foreshadow.name = Foreshadow block.container.name = Contenedor block.launch-pad.name = Pad de Lanzamiento block.launch-pad-large.name = Pad de Lanzamiento Grande -block.segment.name = Segmento +block.segment.name = Segment block.command-center.name = Centro de comando block.ground-factory.name = Fábrica terrestre block.air-factory.name = Fábrica aérea @@ -1254,30 +1253,28 @@ hint.placeDrill = Selecciona la pestaña de \ue85e [accent]Taladros[] en el men hint.placeDrill.mobile = Selecciona la pestaña de \ue85e [accent]Taladros[] en el menú abajo a la derecha, luego escoge un \uf870 [accent]Taladro[] y toca sobre una veta de cobre para colocarlo.\n\nPulsa el botón con la \ue800 [accent]"V"[] abajo a la derecha para confirmar. hint.placeConveyor = Las cintas transportadoras pueden sacar objetos de los taladros, y moverlos hasta otros bloques. Selecciona un \uf896 [accent]Transportador[] de la pestaña \ue814 [accent]Distribución[].\n\nHaz clic y arrastra para crear una cadena con múltiples transportadores.\nUsa la [accent]Rueda del ratón[] para rotarlo. hint.placeConveyor.mobile = Las cintas transportadoras pueden mover objetos de los taladros hasta otros bloques. Selecciona un \uf896 [accent]Transportador[] de la pestaña \ue814 [accent]Distribución[].\n\nMantén el dedo un segundo y arrastra para crear múltiples cintas transportadoras. -hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. +hint.placeTurret = Construye \uf861 [accent]Torretas[] para defender tu base de los enemigos.\n\nLas torretas necesitan munición - en este caso, \uf838cobre.\nUsa cintas transportadoras y taladros para abastecerlas con cobre. hint.breaking = Pulsa [accent]Clic-derecho[] y arrastra para destruir bloques. - -############## -hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. -hint.research = Use the \ue875 [accent]Research[] button to research new technology. -hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology. -hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets. -hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets. -hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right. -hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[]. -hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. -hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path. -hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path. -hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters. -hint.command = Press [accent][[G][] to command nearby units into formation. -hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation. -hint.payloadPickup = Press [accent][[[] to pick up small blocks or units. -hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick it up. -hint.payloadDrop = Press [accent]][] to drop a payload. -hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there. -hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. -hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[]. -####### +hint.breaking.mobile = Activa el botón con el \ue817 [accent]martillo[] situado abajo a la derecha y selecciona bloque para eliminarlos.\n\nMantén el dedo un segundo y arrastra para eliminar bloques directamente en esa selección. +hint.research = Usa el botón \ue875 [accent]Investigación[] para acceder al menú de descubrimientos tecnológicos. +hint.research.mobile = Usa el botón \ue875 [accent]Investigación[] para acceder al menú de descubrimientos tecnológicos. +hint.unitControl = Mantén [accent][[L-ctrl][] y [accent]haz clic[] sobre unidades o torretas aliadas para controlarlas manualmente. +hint.unitControl.mobile = [accent][Toca dos veces rápidamente[] una unidad o torreta aliada para controlarla manualmente. +hint.launch = Cuando tengas sufientes recursos, puedes [accent]Lanzar el Núcleo[] escogiendo como objetivo sectores cercanos en el \ue827 [accent]Mapa[] abajo a la derecha. +hint.launch.mobile = Cuando tengas sufientes recursos, puedes [accent]Lanzar el Núcleo[] escogiendo como objetivo sectores cercanos en el \ue827 [accent]Mapa[], disponible desde el \ue88c [accent]Menú de pausa[]. +hint.schematicSelect = Mantén [accent][[F][] y arrastra para crear una selección de bloques que puedes copiar y pegar.\n\nUsa [accent][[Clic central][] para seleccionar un tipo de bloque. +hint.conveyorPathfind = Mantener [accent][[L-Ctrl][] mientras arrastras cintas transportadoras generará automáticamente una ruta. +hint.conveyorPathfind.mobile = Activa el\ue844 [accent]modo diagonal[] y arrastra cintas transportadoras para generar una ruta inteligente. +hint.boost = Mantén [accent][[L-Shift][] para sobrevolar obstáculos con tu unidad actual.\n\nSólo algunas unidades terrestres disponen de estos propulsores. +hint.command = Pulsa [accent][[G][] para comandar unidades aliadas cercanas. +hint.command.mobile = [accent][[Toca dos veces][] tu unidad para comandar unidades aliadas cercanas. +hint.payloadPickup = Pulsa [accent][[[] para recoger bloques pequeños o unidades. +hint.payloadPickup.mobile = [accent]Mantén[] sobre un bloque pequeño o unidad para recogerlo. +hint.payloadDrop = Pulsa [accent]][] para soltar la carga. +hint.payloadDrop.mobile = [accent]Mantén[] sobre un lugar vacío para soltar la carga. +hint.waveFire = Cuando las torretas [accent]Wave[] usan agua como munición, apagarán fuego e incendios cercanos automáticamente. +hint.generator = Los \uf879[accent]Generadores de combustión[] querman carbón para transmitir energía a bloques adyacentes.\n\nEl alcance de transmisión de energía se puede extender usando \uf87f[accent]Nodos de energía[]. +hint.guardian = Los [accent]Guardianes[] poseen una robusta armadura. Municiones débiles como el [accent]Cobre[] o el [accent]Plomo[] no son [scarlet]effectivas[] contra él.\n\nUsa torretas de mayor categoría o por ejemplo, munición de \uf835[accent]Grafito[] \uf861Duo/\uf859 en torretas Salvo para derribar a los Guardianes. item.copper.description = Un útil material de estructura. Usado extensivamente en todo tipo de bloques. item.lead.description = Un material básico. Usado en electrónicos y bloques de transferencia de líquidos. From fd80cbcae5b1c2946a8036fe333c8ed5cd39ce4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ga=C5=A1par=C3=ADk?= Date: Wed, 25 Nov 2020 18:42:20 +0100 Subject: [PATCH 040/123] Update up to b002d8b --- core/assets/bundles/bundle_cs.properties | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index c3ff3a3946..c4edd7f14e 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -20,7 +20,6 @@ gameover = Konec hry gameover.pvp = Vyhrál tým [accent]{0}[]! highscore = [accent]Nový rekord! copied = Zkopírováno. -indev.popup = Mindustry [accent]v6[] je aktuálně ve verzi [accent]beta[].\n[lightgray]To znamená:[]\n[scarlet]- Kampaň je nedokončená[]\n- Cokoli, co vidíte, se může změnit nebo být odstraněno.\n\nHlaste prosím chyby na [accent]Github[]. indev.notready = Tato část hry ještě není připravena indev.campaign = [accent]Završil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích. @@ -145,6 +144,7 @@ planetmap = Planetární mapa launchcore = Vyslat jádro filename = Název souboru: unlocked = Byl odemmknut nový blok! +available = Je zpřístupněn nový výzkum! completed = [accent]Dokončeno[] techtree = Technologie research.list = [lightgray]Výzkum:[] @@ -228,6 +228,7 @@ disconnect.timeout = Vypršel čas pro připojení. disconnect.data = Chyba načtení dat ze serveru! cantconnect = Není možno se připojit ke hře ([accent]{0}[]). connecting = [accent]Připojuji se...[] +reconnecting = [accent]Znovu se připojuji... connecting.data = [accent]Načítám data ze serveru...[] server.port = Port: server.addressinuse = Adresu již někdo používá! @@ -591,6 +592,11 @@ sector.tarFields.description = Rozhraní produkční naftové oblasti mezi horam sector.desolateRift.description = Extrémně nebezpečná mapa. Na úkor prostoru se zde nachází přehršel surovin. Vysoká pravděpodobnost zničení. Opusť tuto oblast co nejdříve to půjde. Nenech se zmást dlouhými prodlevami mezi vlnami nepřátel. sector.nuclearComplex.description = Bývalá továrna na zpracování thoria, dnes v troskách.\n[lightgray]Objev thorium a jeho široké využití.[]\n\nNepřátelské jednotky se zde nacházejí v hojném počtu, a neustále prohledávají oblast. sector.fungalPass.description = Přechodová oblast mezi vysokými horami a spórami nasycenou zemí. Nachází se zde malá průzkumná základna Tvého nepřítele.\nZnič ji.\nPoužij mechy Dýka a Slídil. Znič obě nepřátelské jádra. +sector.biomassFacility.description = Prapůvod všech spór. Toto je zařízení, be kterém byly spóry vynalezeny a zpočátku u vyráběny.\nVynalezni technologii, která se skrýbá uvnitř. Kultivuj spóry k výrobě paliva a plastů.\n\n[lightgray]Po vypnutí tohoto zařízení byly spóry vypuštěny. V okolním ekosystému však tomuto invazivnímu druhu nebylo nic schopné konkurovat. +sector.windsweptIslands.description = Vzdálen od pevniny je tento řetízek ostrovů. Záznamy ukazují, že zde kdysi byly zařízení na výrobu [accent]Plastany[].\n\nPoraž nepřátelské námořní jednotky. Vybuduj základnu na ostrově. Vynalezni továrny. +sector.extractionOutpost.description = Vzdálená pevnost, postavená nepřítelem za účelem vysílání zdrojů do okolních sektorů.\n\nDoprava položek napříč sektory je nezbytná pro lapení dalších sektorů. Znič základnu. Vyzkoumej jejich Vysílací plošiny. +sector.impact0078.description = Zde leží zbytky mezihvězdné lodi, která vstoupila d otohoto systému.\n\nZachraň z vraku vše, co se dá. Vyzkoumej nepoškozenou technologii. +sector.planetaryTerminal.description = Konečný cíl.\n\nTato pobřežní základna obsahuje konstrukce schopné vyslat jádra na okolní planety. Je mimořádně dobře opevněna.\n\nVyrob námořní jednotky. Odstraň nepřítele tak rychle, jak umíš. Vyzkoumej vysílací konstrukci. settings.language = Jazyk settings.data = Data hry @@ -1260,7 +1266,7 @@ hint.schematicSelect = Podrž [accent][[F][] a potáhni pro výběr bloků, kter hint.conveyorPathfind = Podrž [accent][[levý Ctrl][], když táhneš dopravníky, pro automatické vygenerování cesty. hint.conveyorPathfind.mobile = Povol \ue844 [accent]úhlopříčný režim[] a potáhni dopravníky pro automatické generování cesty. hint.boost = Podrž [accent][[levý Shift][], abys přeletěl přes překážky se svou současnou jednotkou.\n\nPouze některé jednotky však mají takový posilovač. -hint.command = Zmáčkni [accent][[G][] pro vytvoření formace z blízkých jednotek. +hint.command = Zmáčkni [accent][[G][] pro vytvoření formace z blízkých jednotek [accent]podobného typu[].\n\nAbys mohl velet pozemní jednotce, musíš nejprve ovládat jinou pozemní jednotku. hint.command.mobile = [accent][[Dvojťupni][] na Tvoji jednotku pro vytvoření formace z blízkých jednotek. hint.payloadPickup = Zmáčkni [accent][[[] pro sebrání malých bloků nebo jednotek. hint.payloadPickup.mobile = [accent]Ťupni a podrž[] na malém bloku nebo jednotce pro sebrání. @@ -1268,6 +1274,7 @@ hint.payloadDrop = Zmáčkni [accent]][] pro položení nákladu. hint.payloadDrop.mobile = [accent]Ťupni a drž[] na prázdném místě pro položení nákladu. hint.waveFire = [accent]Naplň[] věže vodou místo munice pro automatické hašení okolních požárů. hint.generator = \uf879 [accent]Spalovací generátory[] pálí uhlí a přenášení energii do sousedících bloků.\n\nPřenos energie na delší vzdálenost se provádí pomocí \uf87f [accent]Energetických uzlů[]. +hint.guardian = Jednotky [accent]Strážce[] jsou obrněné. Měkká munice, jako je například [accent]měď[] a [accent]olovo[] je [scarlet]neefektivní[].\n\nPoužij vylepšené věže nebo \uf835 [accent]grafitovou[] munici pro \uf861Střílnu Duo/\uf859Salvu, abys Strážce sejmul. item.copper.description = Používá se ve všech typech bloků a munice. item.copper.details = Měď. Nezvykle nadpočetný kov na Serpulu. Konstrukčně slabý, pokud není rafinovaná. From a69328986797387623eabc79bb0b730f80202d2b Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Wed, 25 Nov 2020 20:57:32 +0100 Subject: [PATCH 041/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 126 ++++++++++++++++++----- 1 file changed, 99 insertions(+), 27 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 1010be4d40..e923fd30a9 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -226,10 +226,11 @@ joingame.ip = IP: disconnect = Desconectado. disconnect.error = Error en la conexión. disconnect.closed = Conexión cerrada. -disconnect.timeout = Desconectado. +disconnect.timeout = Tiempo de espera agotado. disconnect.data = ¡Hubo un fallo con la carga de datos! cantconnect = No es posible unirse a la partida ([accent]{0}[]). connecting = [accent]Conectando... +reconnecting = [accent]Reconectando... connecting.data = [accent]Cargando datos del mundo... server.port = Puerto: server.addressinuse = ¡La dirección ya está en uso! @@ -251,7 +252,7 @@ save.newslot = Nombre del Punto de Guardado: save.rename = Renombrar save.rename.text = Nuevo nombre: selectslot = Selecciona un Punto de Guardado. -slot = [accent]Casilla {0} +slot = [accent]Hueco {0} editmessage = Editar mensaje save.corrupted = [accent]¡El punto de guardado está corrupto o es inválido!\nSi acabas de actualizar el juego, probablemente se deba a un cambio en el formato de guardado y[scarlet] no[] un a error. empty = @@ -284,7 +285,7 @@ data.openfolder = Abrir Carpeta de Datos data.exported = Datos exportados. data.invalid = Esta data del juego no es valida. data.import.confirm = Importando los datos externos borrará[scarlet] todo[] tu progreso.\n[accent]Esto no se puede rehacer![]\n\nUna vez que los datos hayan sido importados, el juego saldrá automaticamente. -quit.confirm = ¿Estás seguro de querer salir de la partida? +quit.confirm = ¿Quieres salir de la partida? quit.confirm.tutorial = ¿Estás seguro de que sabes qué estas haciendo?\nSe puede hacer el tutorial de nuevo en[accent] Ajustes->Juego->Volver a hacer tutorial.[] loading = [accent]Cargando... reloading = [accent]Recargando mods... @@ -1276,28 +1277,36 @@ hint.waveFire = Cuando las torretas [accent]Wave[] usan agua como munición, apa hint.generator = Los \uf879[accent]Generadores de combustión[] querman carbón para transmitir energía a bloques adyacentes.\n\nEl alcance de transmisión de energía se puede extender usando \uf87f[accent]Nodos de energía[]. hint.guardian = Los [accent]Guardianes[] poseen una robusta armadura. Municiones débiles como el [accent]Cobre[] o el [accent]Plomo[] no son [scarlet]effectivas[] contra él.\n\nUsa torretas de mayor categoría o por ejemplo, munición de \uf835[accent]Grafito[] \uf861Duo/\uf859 en torretas Salvo para derribar a los Guardianes. -item.copper.description = Un útil material de estructura. Usado extensivamente en todo tipo de bloques. -item.lead.description = Un material básico. Usado en electrónicos y bloques de transferencia de líquidos. -item.metaglass.description = Un compuesto muy duro de cristal. Usado extensivamente para almacenamiento y distribución de líquidos. -item.graphite.description = Carbón mineralizado, usado para munición y aislamiento eléctrico. -item.sand.description = Un material común que es usado sobre todo en la fundición, o para aleaciones. -item.coal.description = Un combustible común y preparado para ser quemado. -item.titanium.description = Un metal raro usado extensivamente en transporte de liquidos, taladros y aeronaves. -item.thorium.description = Un metal radioactivo, muy denso y usado en soporte de estructuras y combustible nuclear. -item.scrap.description = Restos de estructuras y unidades antiguas. Contiene pequeñas cantidades de muchos metales diferentes. -item.silicon.description = Un semiconductor muy útil, se usa para paneles solares y muchos electrónicos complejos. -item.plastanium.description = Un material dúctil y ligero usado en aeronaves y proyectiles de fragmentación. -item.phase-fabric.description = Una sustancia muy ligera usada en electrónica avanzada y en tecnología autoreparadora. -item.surge-alloy.description = Una aleación avanzada con propiedades eléctricas únicas. -item.spore-pod.description = Utilizado para ser convertido en petróleo, explosivos y combustible. -item.blast-compound.description = Un compuesto volátil usado en bombas y explosivos. Se puede quemar como combustible, pero no es recomendable. -item.pyratite.description = Un compuesto extremadamente inflamable usada en armas incendiarias. +item.copper.description = Un útil material de estructura. Usado en todo tipo de bloques. +item.copper.details = Cobre. Metal anormalmente abundante en Serpulo. Estructuralmente débil a menos que sea reforzado. +item.lead.description = Un material básico. Usado en electrónicos y transferencia de líquidos. +item.lead.details = Denso. Inerte. Extensamente usado en baterías.\nNota: Suele ser tóxico para la mayoría de formas de vida biológicas. Aunque ya no quedan muchas de esas por aquí. +item.metaglass.description = Usado en almacenamiento y distribución de líquidos. +item.graphite.description = Carbón mineralizado, usado como munición y en componentes eléctricos. +item.sand.description = Es usada sobre todo para producir otros minerales refinados. +item.coal.description = Se usa como combustible y también en la producción de materiales refinados. +item.coal.details = Parece ser materia vegetal fosilizada, formada hace mucho tiempo. +item.titanium.description = Usado en transporte de liquidos, taladros y aeronaves. +item.thorium.description = Usado en estructuras robustas y como combustible nuclear. +item.scrap.description = Usado en fundidores y pulverizadores para refinarlo en otros materiales. +item.scrap.details = Restos de antiguas estructuras y unidades caídas. +item.silicon.description = Usado en paneles solares, electrónicos complejos y munición inteligente. +item.plastanium.description = Usado en unidades avanzadas, aislamiento y munición de fragmentación. +item.phase-fabric.description = Usado en electrónicos avanzados y estructuras autoreparadoras. +item.surge-alloy.description = Usado en armamento avanzado y estructuras de defensa reactiva. +item.spore-pod.description = Se puede usar como combustible, o para obtener petróleo y explosivos. +item.spore-pod.details = Esporas. Es algo parecido a una forma de vida sintética. Emiten gases tóxicos para el resto de vida biológica. Extremadamente invasivo. Altamente inflamable bajo determinadas condiciones. +item.blast-compound.description = Usado en bombas y munición explosiva. +item.pyratite.description = Usado en armas incendiarias y generadores de combustión. liquid.water.description = Usada comúnmente para enfriar máquinas y para procesar residuos. liquid.slag.description = Diferentes tipos de metales fundidos mezclados. Puede ser separado en sus minerales constituyentes, o expulsado a unidades enemigas como arma. liquid.oil.description = Puede ser quemado, explotado o usado como un enfriador. liquid.cryofluid.description = El líquido más eficiente para enfriar cosas. +block.resupply-point.description = Reabastece unidades cercanas con munición de cobre. No es compatible con unidades que requieren energía. +block.armored-conveyor.description = Mueve objetos. No acepta objetos si entran por los lados. +block.illuminator.description = Emite luz. block.message.description = Almacena un mensaje. Puedes usarlo para comunicarte con aliados o dejar recordatorios. block.graphite-press.description = Comprime carbón en piezas de grafito puro. block.multi-press.description = Una versión mejorada de la prensa de grafito. Utiliza agua y energía para procesar carbón rápida y eficientemente. @@ -1349,6 +1358,7 @@ block.phase-conveyor.description = Bloque de transporte avanzado. Usa energía p block.sorter.description = Clasifica objetos. Si un objeto es igual al seleccionado, pasará al frente. Si no, el objeto saldrá por la izquierda y la derecha. block.inverted-sorter.description = Procesa elementos como un clasificador estándar, pero en su lugar pasa elementos seleccionados a los lados. block.router.description = Acepta objetos de una dirección luego los deja equitativamente en hasta 3 direcciones diferentes. Útil para dividir los materiales de una fuente de recursos a múltiples objetivos. \n\n[scarlet]Nunca usar como entrada de producción porque puede tapar con los objetos de salida.[] +block.router.details = Un mal necesario... No se recomienda usarlo junto a estructuras de producción ya que puede atascar una cadena de transporte. block.distributor.description = Un enrutador avanzado que distribuye objetos equitativamente en hasta otras 7 direcciones. block.overflow-gate.description = Un enrutador que solo saca por la izquierda y la derecha si la cinta del frente está llena. block.underflow-gate.description = El opuesto de la compuerda de desborde. Solo dispensa hacia el frente si los lados están bloqueados. @@ -1385,15 +1395,18 @@ block.laser-drill.description = Su tecnología láser le permite obtener mineral block.blast-drill.description = El mejor taladro. Requiere grandes cantidades de energía y refrigeración. block.water-extractor.description = Extrae agua de la tierra. Úsalo cuando no haya lagos cercanos. block.cultivator.description = Cultiva concentraciones de esporas en la atmosfera a vainas. +block.cultivator.details = Tecnología recuperada. Usada para producir cantidades masivas de biomasa. Parecido al primer incubador de esporas, que ahora cubren Serpulo. block.oil-extractor.description = Usa grandes cantidades de energía, arena y agua para obtener petróleo. Úsalo cuando no hay fuentes directas de petróleo cerca. -block.core-shard.description = La primera iteración de la cápsula del núcleo. Una vez destruido, todo el contacto con la región es perdido. No permitas que esto ocurra. -block.core-foundation.description = La segunda versión del núcleo. Mejor blindado. Almacena más recursos. -block.core-nucleus.description = La tercera y última iteración de la cápsula del núcleo. Muy bien blindado. Almacena cantidades masivas de recursos. +block.core-shard.description = El núcleo de la base. Compacto. Puede auto-replicarse. Equipado con propulsores de uso único. +block.core-shard.details = La primera iteración. Si es destruido, todo contacto con el sector está perdido. No designado para viajes interplanetarios. +block.core-foundation.description = El núcleo de la base. Mejor blindado. Almacena más recursos que el modelo Fragmento. +block.core-foundation.details = La segunda iteración. +block.core-nucleus.description = El núcleo de la base. Extremadamente bien armado. Almacena cantidades masivas de recursos. +block.core-nucleus.details = La tercera y última iteración. block.vault.description = Almacena una gran cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [lightgray] descargador[] puede usarse para obtener los objetos almacenados. block.container.description = Almacena una pequeña cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [lightgray] descargador[] puede usarse para obtener objetos del contenedor. block.unloader.description = Descarga objetos de un contenedor, almacén o el núcleo a un transportador o directamente a un bloque adyacente. El tipo de objeto descargado puede ser cambiado tocando el descagador. -block.launch-pad.description = Lanza paquetes de recursos sin necesitar lanzar con el núcleo. -block.launch-pad-large.description = Una versión mejorada del pad de lanzamiento. Almacena más recursos y los lanza con mayor frecuencia. +block.launch-pad.description = Lanza paquetes de recursos a los sectores seleccionados. block.duo.description = Una torre pequeña y barata. Útil contra enemigos terrestres no demasiado fuertes. block.scatter.description = Una torreta antiaérea de tamaño medio. Dispara proyectiles de plomo o chatarra a las unidades enemigas. block.scorch.description = Quema a cualquier enemigo terrestre cercano a él. Altamente efectivo a corto alcance. @@ -1407,6 +1420,65 @@ block.fuse.description = Una torre grande de energía de corto alcance. Dispara block.ripple.description = Una torre extramadamente poderosa. Dispara conjuntos de balas a los enemigos desde grandes distancias. block.cyclone.description = Una torre grande anti-aérea y anti-terrestre. Dispara conjuntos fragmentados explosivos a enemigos cercanos. block.spectre.description = Un cañon masivo de dos barriles. Dispara balas perforantes a objetivos de aire y tierra. -block.meltdown.description = Un cañon láser masivo. Carga y dispara un rayo láser constante a enemigos cercanos. Requiere enfriamiento para operar. -block.repair-point.description = Repara la unidad dañada más cercana a su alrededor. -block.segment.description = Daña y destruye proyectiles enemigos. No apunta a láseres. +block.meltdown.description = Un cañon láser masivo. Carga y dispara un rayo láser continuo a enemigos cercanos. Requiere enfriamiento para operar. +block.foreshadow.description = Dispara un rayo de un solo objetivo a grandes distancias. +block.repair-point.description = Repara constantemente la unidad dañada más cercana dentro de su área. +block.segment.description = Daña y destruye proyectiles que se acerquen. No afecta a los láseres. +block.parallax.description = Dispara un rayo tractor que atrae enemigos aéreos, dañándolos en el proceso. +block.tsunami.description = Dispara poderosos torrentes de líquido a los enemigos. También apaga fuegos automáticamente si se lo abastece con agua. +block.silicon-crucible.description = Refina silicio a partir de arena y carbón, usando pirotita como una fuente de calor adicional. Es más eficiente en lugares cálidos. +block.disassembler.description = Separa magma cantidades moderadas de componentes minerales exóticos con baja eficiencia. Puede producir Torio. +block.overdrive-dome.description = Incrementa la velocidad de estructuras cercanas. Requiere Tejido de Fase, y Silicio para operar. +block.payload-conveyor.description = Mueve tanto grandes cargas, como unidades recién ensambladas de sus fábricas. +block.payload-router.description = Divide las cargas entrantes en 3 direcciones de salida. +block.command-center.description = Controla el comportamiento de las unidades con diferentes órdenes. +block.ground-factory.description = Produce unidades terrestres. Las unidades resultantes se pueden usar directamente, o se pueden llevar a reconstructores para mejorarlas. +block.air-factory.description = Produce unidades aéreas. Las unidades resultantes se pueden usar directamente, o se pueden llevar a reconstructores para mejorarlas. +block.naval-factory.description = Produce unidades navales. Las unidades resultantes se pueden usar directamente, o se pueden llevar a reconstructores para mejorarlas. +block.additive-reconstructor.description = Mejora unidades a segunda categoría. +block.multiplicative-reconstructor.description = Mejora unidades a tercera categoría. +block.exponential-reconstructor.description = Mejora unidades a cuarta categoría. +block.tetrative-reconstructor.description = Mejora unidades a la quinta y última categoría. +block.switch.description = Un interruptor alternable. Su estado puede ser detectado y controlado por procesadores lógicos. +block.micro-processor.description = Ejecuta una secuencia de instrucciones lógicas en bucle. Se puede usar para controlar unidades y estructuras. +block.logic-processor.description = Ejecuta una secuencia de instrucciones lógicas en bucle. Se puede usar para controlar unidades y estructuras. Es más rápido que el microprocesador. +block.hyper-processor.description = Ejecuta una secuencia de instrucciones lógicas en bucle. Se puede usar para controlar unidades y estructuras. Es más rápido que el procesador lógico. +block.memory-cell.description = Almacena información para los procesadores lógicos. +block.memory-bank.description = Almacena información para los procesadores lógicos. Alta capacidad. +block.logic-display.description = Muestra gráficos arbitrarios desde un procesador lógico. +block.large-logic-display.description = También muestra gráficos arbitrarios desde un procesador lógico. +block.interplanetary-accelerator.description = Una torre de proyección electromagnética masiva. Puede acelerar los núcleos hasta la velocidad necesaria para su desplegación interplanetaria. + +unit.dagger.description = Dispara proyectiles básicos a enemigos cercanos. +unit.mace.description = Lanza torrentes de llamas a enemigos cercanos. +unit.fortress.description = Utiliza artillería de largo alcance contra enemigos terrestres. +unit.scepter.description = Bombardea enemigos cercanos con proyectiles cargados. +unit.reign.description = Bombardea enemigos con proyectiles penetrantes. +unit.nova.description = Dispara rayos láser que dañan enemigos y reparan estructuras aliadas. Puede volar. +unit.pulsar.description = Dispara arcos eléctricos que dañan enemigos y reparan estructuras aliadas. Puede volar. +unit.quasar.description = Dispara rayos láser perforantes que dañan enemigos, pueden provocar incendios y reparan estructuras aliadas. Puede volar. Posee escudo. +unit.vela.description = Dispara un rayo láser continuo que daña enemigos, provoca incendios y reparan estructuras aliadas. Puede volar. +unit.corvus.description = Dispara poderosos láseres que dañan enemigos, y reparan estructuras aliadas. Puede pisar sobre la mayoría de terreno. +unit.crawler.description = Corre hacia enemigos y se autodestruye, provocando una gran explosión. +unit.atrax.description = Dispara orbes de magma debilitantes a enemigos terrestres. Puede pisar sobre la mayoría de terreno. +unit.spiroct.description = Dispara láseres que debilitan al enemigo, reparándose en el proceso. Puede pisar sobre la mayoría de terreno. +unit.arkyid.description = Dispara grandes rayos láser que debilitan al enemigo, repairing itself in the process. Puede pisar sobre la mayoría de terreno. +unit.toxopid.description = Dispara grandes fragmentos electrizados y láseres perforantes. Puede pisar sobre la mayoría de terreno. +unit.flare.description = Dispara proyectiles básicos a enemigos cercanos. +unit.horizon.description = Suelta fragmentos explosivos sobre objetivos terrestres. +unit.zenith.description = Dispara ráfagas de misiles a enemigos cercanos. +unit.antumbra.description = Dispara un enjambre de balas a cualquer enemigo cercano. +unit.eclipse.description = Dispara dos láseres perforantes y un enjambre de balas de fragmentación. +unit.mono.description = Extrae cobre y plomo, y los deposita en el núcleo. +unit.poly.description = Recosntruye automáticamente estructuras dañadas y asiste a otros unidades en la construcción. +unit.mega.description = Repara automáticamente estructuras dañadas. Puede llevar estructuras y unidades terrestres pequeñas. +unit.quad.description = Suelta grandes bombas sobre objetivos terrestres, repara estructuras aliadas y daña enemigos. Puede cargar con unidades terrestres de tamaño medio. +unit.oct.description = Protege aliados con su escudo. Puede cargar con la mayoría de unidades terrestres. +unit.risso.description = Dispara un enjambre de misiles y proyectiles a enemigos cercanos. +unit.minke.description = Dispara proyectiles variados a enemigos terrestres. +unit.bryde.description = Dispara misiles de largo alcance a enemigos. +unit.sei.description = Dispara un enjambre de misiles y proyectiles perforantes a enemigos. +########unit.omura.description = . Constructs flare units. +unit.alpha.description = Defends the Shard core from enemies. Builds structures. +unit.beta.description = Defends the Foundation core from enemies. Builds structures. +unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. From 1cc73a4077c326d1bab3681fe0fb72458bc268ce Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:26:24 +0100 Subject: [PATCH 042/123] Finished Spanish Translation, for now... --- core/assets/bundles/bundle_es.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index e923fd30a9..5835dcc3fb 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1478,7 +1478,7 @@ unit.risso.description = Dispara un enjambre de misiles y proyectiles a enemigos unit.minke.description = Dispara proyectiles variados a enemigos terrestres. unit.bryde.description = Dispara misiles de largo alcance a enemigos. unit.sei.description = Dispara un enjambre de misiles y proyectiles perforantes a enemigos. -########unit.omura.description = . Constructs flare units. -unit.alpha.description = Defends the Shard core from enemies. Builds structures. -unit.beta.description = Defends the Foundation core from enemies. Builds structures. -unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. +unit.omura.description = Dispara rayos contínuos perforantes. Construye unidades Flare. +unit.alpha.description = Defiende el núcleo Fragmento de los enemigos. Construye estructuras. +unit.beta.description = Defiende el núcleo Foundation de los enemigos. Construye estructuras. +unit.gamma.description = Defiende el núcleo Nucleus de los enemigos. Construye estructuras. From 91b05e47891738820c1996dd88b4badc4309591f Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:29:32 +0200 Subject: [PATCH 043/123] Reconnecting --- core/assets/bundles/bundle_ro.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 92efbac76a..8b3932269a 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -230,6 +230,7 @@ disconnect.timeout = Întârzie să răspundă. disconnect.data = Nu s-au putut încărca datele lumii! cantconnect = Nu te-ai putut alătura jocului ([accent]{0}[]). connecting = [accent]Conectare... +reconnecting = [accent]Reconectare... connecting.data = [accent]Se încarcă datele hărții... server.port = Port: server.addressinuse = Adresa este deja în uz! From 245e5d515a236c538a46e612f57562cfe7d68766 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Wed, 25 Nov 2020 23:22:17 +0100 Subject: [PATCH 044/123] Update contributors --- core/assets/contributors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index 52af1f0445..3af0a9eee0 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -102,4 +102,4 @@ newlocknew (freesound.org) dsmolenaers (freesound.org) Headphaze (freesound.org) VolasYouKnow -Angel-24 \ No newline at end of file +Ángel Rodríguez Aguilera From 7f214f1343a69310197a08433ebdf8de2e7ee6a8 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Thu, 26 Nov 2020 08:47:11 +0100 Subject: [PATCH 045/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 9a0255191b..e4d23efd0f 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -9,7 +9,7 @@ link.changelog.description = Lista de actualizaciones link.dev-builds.description = Versiones en desarrollo inestables link.trello.description = Tablón de Trello oficial para las características planificadas link.itch.io.description = Página de itch.io, donde puedes descargar las versiones para PC -link.google-play.description = Ficha en la Google Play Store +link.google-play.description = Ver en Google Play Store link.f-droid.description = Página de F-Droid del juego link.wiki.description = Wiki oficial de Mindustry link.suggestions.description = Sugerir nuevas funciones From 0d4add667faec9acfa1430abc0861448d69fe26c Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Thu, 26 Nov 2020 08:49:44 +0100 Subject: [PATCH 046/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 5835dcc3fb..6cef02c4e8 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -9,7 +9,7 @@ link.changelog.description = Lista de actualizaciones link.dev-builds.description = Versiones en desarrollo inestables link.trello.description = Tablero de Trello oficial para las características planificadas link.itch.io.description = itch.io es la página donde puedes descargar las versiones para PC y Servidor -link.google-play.description = Ficha en la Google Play Store +link.google-play.description = Ver en Google Play Store link.f-droid.description = Página de F-Droid del juego link.wiki.description = Wiki oficial de Mindustry link.suggestions.description = Sugerir nuevas funciones From fa3a19d766ac9da4c2787c07ec2e4a0b6e7cd0c8 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Thu, 26 Nov 2020 08:52:46 +0100 Subject: [PATCH 047/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 6cef02c4e8..d53922f86b 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -230,7 +230,6 @@ disconnect.timeout = Tiempo de espera agotado. disconnect.data = ¡Hubo un fallo con la carga de datos! cantconnect = No es posible unirse a la partida ([accent]{0}[]). connecting = [accent]Conectando... -reconnecting = [accent]Reconectando... connecting.data = [accent]Cargando datos del mundo... server.port = Puerto: server.addressinuse = ¡La dirección ya está en uso! From 35da950986a9bdb57148ca68ca49402315f941be Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Thu, 26 Nov 2020 16:41:46 +0100 Subject: [PATCH 048/123] german translation --- core/assets/bundles/bundle_de.properties | 88 ++++++++++++++++++------ 1 file changed, 67 insertions(+), 21 deletions(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 256bdc0ad3..a2462d9a88 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -17,11 +17,13 @@ linkfail = Fehler beim Öffnen des Links!\nDie URL wurde in die Zwischenablage k screenshot = Screenshot gespeichert unter {0} screenshot.invalid = Karte zu groß! Eventuell nicht ausreichend Arbeitsspeicher für Screenshot. gameover = Der Kern wurde zerstört. +gameover.disconnect = Verbindung trennen gameover.pvp = Das[accent] {0}[] Team ist siegreich! +gameover.waiting = [accent]Warte auf neue Karte... highscore = [accent]Neuer Highscore! copied = Kopiert. -indev.popup = [accent]v6[] ist gerade in der [accent]Beta-Phase[].\n[lightgray]Das bedeutet:[]\n[scarlet]- Die Kampagne ist unfertig[]\n- Musik/SFX sind unfertig\n- Alles kann jederzeit verändert oder entfernt werden\n\nMelde Bugs und Abstürze auf [accent]Github[]. indev.notready = Dieser Teil vom Spiel ist noch unfertig. +indev.campaign = [accent]Du hast das Ende der Kampagne erreicht![]\n\nMehr gibt es noch nicht. In einem zukünfttigen Update wird interplanetarisches Reisen möglich werden. load.sound = Audio load.map = Karten @@ -57,6 +59,7 @@ schematic.rename = Entwurf umbenennen schematic.info = {0}x{1}, {2} Blöcke schematic.disabled = [scarlet]Entwürfe deaktiviert[]\nAuf dieser [accent]Karte[] oder [accent]Server[] dürfen keine Entwürfe verwendet werden. +stats = Statistiken stat.wave = Wellen besiegt:[accent] {0} stat.enemiesDestroyed = Gegner zerstört:[accent] {0} stat.built = Gebäude gebaut:[accent] {0} @@ -143,6 +146,7 @@ planetmap = Planetenkarte launchcore = Kern starten filename = Dateiname: unlocked = Neuer Inhalt freigeschaltet! +available = Neue Forschung möchlich! completed = [accent]Abgeschlossen techtree = Forschung research.list = [lightgray]Forschung: @@ -189,6 +193,10 @@ servers.local = Lokale Server servers.remote = Andere Server servers.global = Community-Server +servers.showhidden = Versteckte Server anzeigen +server.shown = Angeziegt +server.hidden = Versteckt + trace = Spieler verfolgen trace.playername = Spielername: [accent]{0} trace.ip = IP: [accent]{0} @@ -222,6 +230,7 @@ disconnect.timeout = Zeitüberschreitung. disconnect.data = Fehler beim Laden der Welt! cantconnect = Nicht möglich beizutreten ([accent]{0}[]). connecting = [accent] Verbinde... +reconnecting = [accent]Verbindung wird wiederhergestellt... connecting.data = [accent] Welt wird geladen... server.port = Port: server.addressinuse = Adresse bereits in Verwendung! @@ -267,6 +276,9 @@ cancel = Abbruch openlink = Link öffnen copylink = Link kopieren back = Zurück +crash.export = Crash-Logs exportieren +crash.none = Jeine Crash-Logs gefunden. +crash.exported = Crash-Logs wurden erfolgreich exportiert. data.export = Daten exportieren data.import = Daten importieren data.openfolder = Datenordner öffnen @@ -283,6 +295,7 @@ cancelbuilding = [accent][[{0}][] um den Plan zu leeren selectschematic = [accent][[{0}][] zum Auswählen+Kopieren pausebuilding = [accent][[{0}][] um das Bauen zu pausieren resumebuilding = [scarlet][[{0}][] um das Bauen fortzusetzen +showui = Bedienflächen versteckt.\nDrücke [accent][[{0}][] um sie wieder anzuzeigen. wave = [accent]Welle {0} wave.cap = [accent]Welle {0}/{1} wave.waiting = Welle in {0} @@ -290,6 +303,8 @@ wave.waveInProgress = [lightgray]Welle im Gange waiting = Warten... waiting.players = Warte auf Spieler... wave.enemies = [lightgray]{0} Gegner verbleiben +wave.enemycores = [accent]{0}[lightgray] Gegnerische Kerne +wave.enemycore = [accent]{0}[lightgray] Gegnerischer Kern wave.enemy = [lightgray]{0} Gegner verbleiben wave.guardianwarn = Boss erscheint in [accent]{0}[] Wellen. wave.guardianwarn.one = Boss erscheint in [accent]{0}[] Welle. @@ -350,6 +365,7 @@ waves.invalid = Ungültige Wellen in der Zwischenablage. waves.copied = Wellen kopiert. waves.none = Keine Gegner definiert.\nInfo: Leere Wellenentwürfe werden automatisch mit dem Standard-Entwurf ersetzt. + wavemode.counts = Menge wavemode.totals = Gesamtmenge wavemode.health = Lebenspunkte @@ -462,7 +478,9 @@ load = Laden save = Speichern fps = FPS: {0} ping = Ping: {0}ms -language.restart = Bitte Starte dein Spiel neu, damit die Sprach-Einstellung aktiv wird. +memory = Arbeitsspeicher: {0}mb +memory2 = Arbeitsspeicher:\n {0}mb +\n {1}mb +language.restart = Starte dein Spiel neu, um die Spracheinstellungen zu übernehmen. settings = Einstellungen tutorial = Tutorial tutorial.retake = Tutorial wiederholen @@ -476,24 +494,20 @@ complete = [lightgray]Abschließen: requirement.wave = Erreiche Welle {0} in {1} requirement.core = Zerstöre den feindlichen Kern in {0} requirement.research = Erforsche {0} +requirement.produce = Produziere {0} requirement.capture = Erobere {0} -bestwave = [lightgray]Beste Welle: {0} launch.text = Start research.multiplayer = Nur der Host kann forschen. +map.multiplayer = Nur der Host kann Sektoren ansehen. uncover = Freischalten configure = Startitems festlegen loadout = Startitems resources = Ressourcen bannedblocks = Gesperrte Blöcke addall = Alle hinzufügen +launch.from = Items werden von [accent]{0} []gestartet launch.destination = Ziel: {0} configure.invalid = Anzahl muss eine Zahl zwischen 0 und {0} sein. -zone.unlocked = [lightgray]{0} freigeschaltet. -zone.requirement.complete = Welle {0} erreicht:\n{1} Anforderungen der Zone erfüllt. -zone.resources = Ressourcen entdeckt: -zone.objective = [lightgray]Ziel: [accent]{0} -zone.objective.survival = Überlebe -zone.objective.attack = Zerstöre den feindlichen Kern add = Hinzufügen... boss.health = Boss-Lebenspunkte @@ -517,17 +531,41 @@ weather.fog.name = Nebel sectors.unexplored = [lightgray]Unentdeckt sectors.resources = Ressourcen: sectors.production = Produktion: +sectors.export = Export: +sectors.time = Zeit: +sectors.threat = Gefahr: +sectors.wave = Welle: sectors.stored = Gelagert: sectors.resume = Weiterspielen sectors.launch = Start sectors.select = Select sectors.nonelaunch = [lightgray]none (sun) sectors.rename = Sektor umbenennen +sectors.enemybase = [scarlet]Gegnerische Basis +sectors.vulnerable = [scarlet]Angriffsgefährdet +sectors.underattack = [scarlet]Wird angegriffen! [accent]{0}% damaged +sectors.survives = [accent]Kann {0} Wellen überleben +sectors.go = Hingehen +sector.curcapture = Sektor erfolgreich erobert +sector.curlost = Sektor verloren sector.missingresources = [scarlet]Fehlende Kernressourcen +sector.attacked = Sektor [accent]{0}[white] wird angegriffen! +sector.lost = Sektor [accent]{0}[white] verloren! +#note: the missing space in the line below is intentional +sector.captured = Sektor [accent]{0}[white]erobert! + +threat.low = Niedrig +threat.medium = Mittel +threat.high = Hoch +threat.extreme = Extrem +threat.eradication = Zerstörung + +planets = Planeten planet.serpulo.name = Serpulo planet.sun.name = Sonne +sector.impact0078.name = Impact 0078 sector.groundZero.name = Ground Zero sector.craters.name = The Craters sector.frozenForest.name = Frozen Forest @@ -539,19 +577,27 @@ sector.overgrowth.name = Overgrowth sector.tarFields.name = Tar Fields sector.saltFlats.name = Salt Flats sector.fungalPass.name = Fungal Pass +sector.biomassFacility.name = Biomass Synthesis Facility +sector.windsweptIslands.name = Windswept Islands +sector.extractionOutpost.name = Extraction Outpost +sector.planetaryTerminal.name = Planetary Launch Terminal -sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on. -sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders. -sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing. -sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills. -sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology. -sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units. -sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost. -sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible. -sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks. -sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers. -sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores. - +sector.groundZero.description = Der optimale Ort um anzufangen. Schwache Gegner und weniger Ressourcen.\nSammele so viel Kupfer und Blei wie möglich.\nZieh weiter. +sector.frozenForest.description = Auch hier, näher an den Bergen, sind die Sporen. Sogar die niedrigen Temperaturen können sie nicht zurückhalten.\n\nLerne, Strom zu verwenden. Baue Verbrennungsgeneratoren und Reparateure. +sector.saltFlats.description = Du befindest dich in der Nähe der Wüste. Hier gibt es nur wenige Ressourcen.\n\nDer Gegner hat hier ein Lager aufgestellt. Zerstöre es. Lasse nichts stehen. +sector.craters.description = Wasser hat sich hier, in diesem Überbleibsel aus dem alten Krieg, versammelt. Sammele Sand. Stelle Metaglas her. Benutze Wasser, um Bohrer und Geschütze zu kühlen. +sector.ruinousShores.description = Hinter der Wüste ist das Ufer. Es gab hier vor langer Zeit ein Uferabwehrsystem. Heute sind nur noch die einfachsten Abwehrgeschützen vorhanden, der Rest wurde verschrottet.\nBreite dich weiter aus. Finde die verlorenen Technologien wieder. +sector.stainedMountains.description = Im Landesinneren sind die Berge, noch unversehrt von den Sporen.\nNutze das reichliche vorhandene Titan. Lerne, es zu benutzen.\n\nDie Gegner hier sind stärker. Gib den Gegnern keine Zeit, um ihre stärksten Einheiten zu schicken. +sector.overgrowth.description = Dieser Bereich ist überwuchert, näher an die Quelle der Sporen.\nDer Gegner hat hier einen Außenposten errichtet. Baue Mace-Einheiten. Zerstöre es. +sector.tarFields.description = Der Rand einer Ölproduktionszone, swischen den Bergen und der Wüste. Einer der wenigen Orte mit brauchbaren Ölquellen.\nObwohl er vergessen wurde, hat dieser Ort mächtige Gegnerische Lager in der Nähe. Unterschätze sie nicht.\n\n[lightgray]Erforsche, falls mögloch, die Ölverarbeitung. +sector.desolateRift.description = Eine besonders gefährliche Zone. Viele Ressourcen aber wenig Platz. Hohe Wahrscheinlichkeit, vernichtet zu werden. Verlasse diesen Ort so bald wie möglich. Lass dich nicht durch die langen Abstände zwischen gegnerische Angriffe täuschen. +sector.nuclearComplex.description = Diese Ruine war vor langer Zeit eine Anlage zur Verarbeitung von Thorium.\n[lightgray]Erforsche Thorium und dessen Anwendungen.\n\nDer Gegner ist hier stark vertreten, auf der Suche nach Angreifern. +sector.fungalPass.description = Eine Übergangszone zwischen den Bergen und den niedrigeren, Sporen-Infestierten Gebieten. Hier ist eine kleine gegnerische Basis.\nZerstöre sie.\nBenutze Dagger- und Crawler-Einheiten. Vernichte die beiden Kerne. +sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism. +sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories. +sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads. +sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology. +sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure. settings.language = Sprache settings.data = Spieldaten settings.reset = Auf Standard zurücksetzen From ef63c5073a51f363ae7e07e6dfa9ac8b72595345 Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Thu, 26 Nov 2020 21:11:55 +0200 Subject: [PATCH 049/123] Legacy prompts --- core/assets/bundles/bundle_ro.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 8b3932269a..1d4a4815ac 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -23,7 +23,7 @@ gameover.waiting = [accent]Se așteaptă următoarea hartă... highscore = [accent]Scor maxim nou! copied = Copiat. indev.notready = Această secțiune a jocului nu este gata încă. -indev.campaign = [accent]Ai ajuns la finalul campaniei![]\n\nAi mers cât de departe se poate momentan. Călătoria interplanetară va fi adăugată într-un update viitor. +indev.campaign = [accent]Felicitări! Ai ajuns la finalul campaniei![]\n\nAi mers cât de departe se poate momentan. Călătoria interplanetară va fi adăugată într-un update viitor. load.sound = Sunete load.map = Hărți @@ -149,6 +149,9 @@ unlocked = Nou conținut deblocat! available = Poți cerceta noi tehnologii! completed = [accent]Finalizat techtree = Cercetează +research.legacy = Au fost găsite date de cercetare din versiunea [accent]5.0[].\n Dorești să [accent]păstrezi aceste date[], sau [accent]să renunți la ele[] și să reîncepi cercetarea în noua campanie (recomandat)? +research.load = Păstrează Datele +research.discard = Renunță research.list = [lightgray]Cercetare: research = Cercetează researched = [lightgray]{0} cercetat. From 18d7f8ddfb60d769eeae02b8923aa3dbc1ce379a Mon Sep 17 00:00:00 2001 From: L0615T1C5-216AC-9437 <60281819+L0615T1C5-216AC-9437@users.noreply.github.com> Date: Thu, 26 Nov 2020 14:21:52 -0500 Subject: [PATCH 050/123] Add CN pvp Server to Community Server List --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index c627e00001..f94c023011 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -13,7 +13,7 @@ }, { "name": "Chaotic Neutral", - "address": ["Chaotic-Neutral.ddns.net:5555", "Chaotic-Neutral.ddns.net:6666"] + "address": ["Chaotic-Neutral.ddns.net:5555", "Chaotic-Neutral.ddns.net:6666", "Chaotic-Neutral.ddns.net:7777"] }, { "address": "cheginde.ddns.net" From ed89a70cbc63a5e03ff5eb0e5ec72c9d7cbfe828 Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Thu, 26 Nov 2020 21:39:14 +0100 Subject: [PATCH 051/123] hints + sector descriptions in german --- core/assets/bundles/bundle_de.properties | 119 +++++++++++++++++------ 1 file changed, 87 insertions(+), 32 deletions(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index a2462d9a88..6927699698 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -150,7 +150,7 @@ available = Neue Forschung möchlich! completed = [accent]Abgeschlossen techtree = Forschung research.list = [lightgray]Forschung: -research = Erforschen +research = Forschen researched = [lightgray]{0} erforscht. research.progress = Fortschritt: {0}% players = {0} Spieler online @@ -593,11 +593,11 @@ sector.tarFields.description = Der Rand einer Ölproduktionszone, swischen den B sector.desolateRift.description = Eine besonders gefährliche Zone. Viele Ressourcen aber wenig Platz. Hohe Wahrscheinlichkeit, vernichtet zu werden. Verlasse diesen Ort so bald wie möglich. Lass dich nicht durch die langen Abstände zwischen gegnerische Angriffe täuschen. sector.nuclearComplex.description = Diese Ruine war vor langer Zeit eine Anlage zur Verarbeitung von Thorium.\n[lightgray]Erforsche Thorium und dessen Anwendungen.\n\nDer Gegner ist hier stark vertreten, auf der Suche nach Angreifern. sector.fungalPass.description = Eine Übergangszone zwischen den Bergen und den niedrigeren, Sporen-Infestierten Gebieten. Hier ist eine kleine gegnerische Basis.\nZerstöre sie.\nBenutze Dagger- und Crawler-Einheiten. Vernichte die beiden Kerne. -sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism. -sector.windsweptIslands.description = Further past the shoreline is this remote chain of islands. Records show they once had [accent]Plastanium[]-producing structures.\n\nFend off the enemy's naval units. Establish a base on the islands. Research these factories. -sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads. -sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology. -sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure. +sector.biomassFacility.description = Die Sporenquelle. Dies ist der Ort, wo sie erforscht und hergestellt wurden.\nErforsche die Technologie, die sich hier versteckt. Stellen Sporen her, um Plastanium und Öl herzustellen.\n\n[lightgray]Als diese Anlage zerstört wurde, wurden die Sporen freigesetzt. Nichts im lokalen Ökosystem konnte so ein eindringliches Lebenwesen bekämpfen. +sector.windsweptIslands.description = Diese Inseln befinden sich in der Nähe vom Ufer. Manche Aufzeichnungen behaupten, hier seinen Fabriken, die [accent]Plastanium[] herstellen können.\n\nWehre dich gegen die gegnerischen Wassereinheiten. Stelle eine Basis auf den Inseln auf. Erforsche diese Fabriken. +sector.extractionOutpost.description = Ein Außenposten, vom Gegner erstellt, um Ressourcen in andere Sektoren zu transportieren.\n\nTrans-Sektorischer Transport ist nötig, um weiter voranzuschreiten. Zerstöre den Posten. Erforsche deren Launchpads. +sector.impact0078.description = Here liegen Reste der interplanetarischen Transporteinheit die dieses Sonnensystem zuerst betreten hat.\n\nRette so viel wie möglich von den Ruinen. Erforsche jede intakte Technologie. +sector.planetaryTerminal.description = Das Endziel.\n\nDiese Uferbasis besitzt ein Gerät, mit dem es möglich ist, Kerne auf andere Planeten zu schicken. Es ist [accent]sehr[] gut beschützt.\n\nStelle Wassereinheiten her. Eliminiere den Gegner so schnell wie möglich. Erforsche das Launchgerät. settings.language = Sprache settings.data = Spieldaten settings.reset = Auf Standard zurücksetzen @@ -629,6 +629,7 @@ unit.nobuild = [scarlet]Einheit kann nicht bauen! lastaccessed = [lightgray]Zuletzt konfiguriert: {0} block.unknown = [lightgray]??? +stat.description = Beschreibung stat.input = Eingang stat.output = Ausgang stat.booster = Verstärkung @@ -646,6 +647,8 @@ stat.size = Größe stat.displaysize = Bildschirmgröße stat.liquidcapacity = Flüssigkeitskapazität stat.powerrange = Stromreichweite +stat.weapons = Waffen +stat.bullet = Geschoss stat.linkrange = Verbindungsradius stat.instructions = Befehle stat.powerconnections = Maximale Stromverbindungen @@ -688,12 +691,15 @@ stat.minetier = Abbau-Kraft stat.payloadcapacity = Payload Capacity stat.commandlimit = Kommandier-Limit stat.abilities = Fähigkeiten +stat.canboost = Kann boosten +stat.flying = Flug ability.forcefield = Kraftfeld ability.repairfield = Heilungsfeld ability.statusfield = Statusfeld ability.unitspawn = {0} Fabrik ability.shieldregenfield = Schild-regenerations-Feld +ability.movelightning = Bewegungsblitze bar.drilltierreq = Besserer Bohrer Benötigt bar.noresources = Fehlende Ressourcen @@ -723,12 +729,14 @@ bullet.damage = [stat]{0}[lightgray] Schaden bullet.splashdamage = [stat]{0}[lightgray] Flächenschaden ~[stat] {1}[lightgray] Kacheln bullet.incendiary = [stat]entzündend bullet.homing = [stat]zielsuchend +bullet.sapping = [stat]entzieht Lebenspunkte bullet.shock = [stat]schockend bullet.frag = [stat]explosiv bullet.knockback = [stat]{0}[lightgray] zurückstoßend bullet.pierce = [stat]{0}[lightgray]x Durchstechkraft bullet.infinitepierce = [stat]Durchstechkraft bullet.freezing = [stat]frierend +bullet.healpercent = [stat]{0}[lightgray]% Heilung bullet.tarred = [stat]teerend bullet.multiplier = [stat]{0}[lightgray]x Munition Multiplikator bullet.reload = [stat]{0}[lightgray]x Feuerrate @@ -752,6 +760,7 @@ unit.items = Materialeinheiten unit.thousands = k unit.millions = Mio unit.billions = Mrd +category.purpose = Beschreibung category.general = Allgemeines category.power = Strom category.liquids = Flüssigkeiten @@ -765,6 +774,7 @@ setting.blockreplace.name = Automatische Blockvorschläge setting.linear.name = Lineare Filterung setting.hints.name = Tipps setting.flow.name = Ressourcen-Fluss anzeigen [scarlet] (experimentell) +setting.backgroundpause.name = Im Hintergrund pausieren setting.buildautopause.name = Bauen automatisch pausieren setting.animatedwater.name = Animiertes Wasser setting.animatedshields.name = Animierte Schilde @@ -793,7 +803,6 @@ setting.conveyorpathfinding.name = Automatische Wegfindung beim Bau von Förderb setting.sensitivity.name = Controller-Empfindlichkeit setting.saveinterval.name = Autosave-Häufigkeit setting.seconds = {0} Sekunden -setting.blockselecttimeout.name = Block-Auswahl Timeout setting.milliseconds = {0} Millisekunden setting.fullscreen.name = Vollbild setting.borderlesswindow.name = Randloses Fenster [lightgray](Neustart vielleicht erforderlich) @@ -802,7 +811,7 @@ setting.smoothcamera.name = Sanfte Kamerabewegungen setting.vsync.name = VSync setting.pixelate.name = Verpixeln [lightgray](Könnte die Leistung beeinträchtigen) setting.minimap.name = Zeige die Minimap -setting.coreitems.name = Kern-Items anzeigen (WIP) +setting.coreitems.name = Kern-Items anzeigen setting.position.name = Spieler-Position anzeigen setting.musicvol.name = Musiklautstärke setting.atmosphere.name = Planetatmosphäre zeigen @@ -882,6 +891,8 @@ keybind.menu.name = Menü keybind.pause.name = Pause keybind.pause_building.name = Pausieren/Fortsetzen des Bauens keybind.minimap.name = Minimap +keybind.planet_map.name = Planetenkarte +keybind.research.name = Forschen keybind.chat.name = Chat keybind.player_list.name = Spielerliste keybind.console.name = Konsole @@ -945,6 +956,8 @@ content.item.name = Materialien content.liquid.name = Flüssigkeiten content.unit.name = Einheiten content.block.name = Blöcke +content.sector.name = Sektoren + item.copper.name = Kupfer item.lead.name = Blei item.coal.name = Kohle @@ -1004,6 +1017,7 @@ block.resupply-point.name = Nachlade-Punkt block.parallax.name = Parallax block.cliff.name = Klippe block.sand-boulder.name = Sandbrocken +block.basalt-boulder.name = Basaltbrocken block.grass.name = Gras block.slag.name = Schlacke block.space.name = Weltall @@ -1101,7 +1115,6 @@ block.conveyor.name = Förderband block.titanium-conveyor.name = Titan-Förderband block.plastanium-conveyor.name = Plastanium-Förderband block.armored-conveyor.name = Gepanzertes Förderband -block.armored-conveyor.description = Bewegt Gegenstände genauso schnell wie das Titan-Förderband, ist aber besser gepanzert. Akzeptiert nur Verbindungen mit anderen Förderbändern. block.junction.name = Kreuzung block.router.name = Verteiler block.distributor.name = Großer Verteiler @@ -1109,7 +1122,6 @@ block.sorter.name = Sortierer block.inverted-sorter.name = Invertierter Sortierer block.message.name = Nachricht block.illuminator.name = Illuminierer -block.illuminator.description = Eine kleine, kompakte, konfigurierbare Lichtquelle. Benötigt Strom. block.overflow-gate.name = Überlauftor block.underflow-gate.name = Unterlauftor block.silicon-smelter.name = Silizium-Schmelzer @@ -1205,6 +1217,11 @@ block.payload-router.name = Einheitverteiler block.disassembler.name = Großer Trenner block.silicon-crucible.name = Silizium Schmelztiegel block.overdrive-dome.name = Beschleunigungs-Maschine +#experimental, may be removed +block.block-forge.name = Blockfabrik +block.block-loader.name = Blocklader +block.block-unloader.name = Blockentlader +block.interplanetary-accelerator.name = Interplanetarischer Beschleuniger block.switch.name = Schalter block.micro-processor.name = Mikroprozessor @@ -1223,28 +1240,66 @@ team.derelict.name = Derelikt team.green.name = Grün team.purple.name = Lila -tutorial.next = [lightgray] -tutorial.intro = Du befindest dich im[scarlet] Mindustry-Tutorial.[]\nBeginne, indem du[accent] Kupfer abbaust[]. Tippe dazu auf ein Kupfervorkommen in der Nähe deiner Basis.\n\n[accent]{0}/{1} Kupfer -tutorial.intro.mobile = Du befindest dich im [scarlet]Mindustry Tutorial.[]\nWische über den Bildschirm, um dich zu bewegen.\n[accent]Benutze zwei Finger[] um heran- und hinauszuzoomen.\nBeginne, indem du [accent]Kupfer abbaust[]. Bewege dich zu einem Kupfervorkommen und tippe anschließend darauf.\n\n[accent]{0}/{1} Kupfer -tutorial.drill = Manuelles Abbauen ist ineffizient.\n[accent]Bohrer []können automatisch abbauen.\nTippe auf den Bohrer-Tab unten rechts.\nWähle den[accent] Mechanischen Bohrer[].\nPlatziere ihn durch Klicken auf ein Kupfervorkommen.\nMit einem [accent]Rechtsklick[] brichst du den Bau ab. -tutorial.drill.mobile = Manuelles Abbauen ist ineffizient.\n[accent]Bohrer []können automatisch abbauen.\nTippe auf den Bohrer Tab unten rechts.\nWähle den[accent] Mechanischen Bohrer[].\nPlatziere ihn durch Tippen auf ein Kupfervorkommen, dann klicke auf das[accent] Häkchen[] unten um deine Auswahl zu bestätigen.\nKlicke auf den[accent] X-Button[], um den Bau abzubrechen. -tutorial.blockinfo = Jeder Block hat unterschiedliche Eigenschaften. Jeder Bohrer kann immer nur ein bestimmtes Material abbauen.\nFür Infos und Stats eines Blocks wähle einen Block im Baumenü aus und [accent] klicke auf den "?"-Button.[]\n\n[accent]Schaue dir jetzt die Stats des Mechanischen Bohrers an.[] -tutorial.conveyor = Mit [accent]Förderbändern[] werden Materialien zum Kern transportiert.\nReihe mehrere Förderbänder aneinander bis zum Kern. -tutorial.conveyor.mobile = Mit [accent]Förderbändern[] werden Materialien zum Kern transportiert.\nReihe mehrere Förderbänder aneinander bis zum Kern.\n[accent] Zum Bau in einer Reihe lasse deinen Finger für einige Sekunden gedrückt[] und ziehe ihn in eine beliebige Richtung.\n\n[accent]Platziere 2 Förderbänder, dann transportiere ein Erz zum Kern. -tutorial.turret = Verteidigungsgebäude müssen gebaut werden um[lightgray] Gegner[] abzuwehren.\nBaue ein Doppelgeschütz in die Nähe deiner Basis. -tutorial.drillturret = Doppelgeschütz benötigen[accent] Kupfermunition, []um schießen zu können.\nPlatziere neben das Geschütz einen Bohrer, um ihn mit Kupfer zu versorgen. -tutorial.pause = Du kannst das Spiel jederzeit [accent]pausieren.[]\nIn einer Pause kannst du den Bau weiterer Gebäude in Auftrag geben.\n\n[accent]Drücke die Leertaste um zu pausieren. -tutorial.pause.mobile = Du kannst das Spiel jederzeit [accent]pausieren.[]\nIn einer Pause kannst du den Bau weiterer Gebäude in Auftrag geben.\n\n[accent]Drücke diesen Button oben links um zu pausieren. -tutorial.unpause = Drücke die Leertaste erneut, um das Spiel fortzusetzen. -tutorial.unpause.mobile = Drücke ihn erneut, um das Spiel fortzusetzen. -tutorial.breaking = Oft kommt es vor, dass Blöcke zerstört werden müssen.\n[accent]Halte die rechte Maustaste gedrückt[] und wähle eine Fläche aus. Dadurch werden alle Blöcke darin zerstört.[]\n\n[accent]Zerstöre alle Schrott-Blöcke links neben deinem Kern mithilfe der Flächenauswahl. -tutorial.breaking.mobile = Oft kommt es vor, dass Blöcke zerstört werden müssen.\n[accent]Wähle den Abbau-Modus[], dann wähle einen Block um ihn zu zerstören.\nZerstöre eine Fläche, indem du deinen Finger einige Sekunden gedrückt hältst[] und in eine beliebige Richtung ziehst.\nTippe auf das Häkchen um den Rückbau zu bestätigen.\n\n[accent]Zerstöre all Schrott-Blöcke links des Kerns mithilfe der Flächenauswahl. -tutorial.withdraw = Einige Situationen erfordern, dass Materialien direkt aus den Blöcken aufgenommen werden.\nUm dies zu tun, [accent]tippe auf einen Block[] mit Materialien dann [accent]tippe auf das Material[] in diesem Block.\nUm mehrere Materialien zu entnehmen [accent]tippe darauf und halte die Maustaste gedrückt[].\n\n[accent]Entnimm etwas Kupfer vom Kern.[] -tutorial.deposit = Materialien können in Blöcke abgelegt werden, indem du die linke Maustaste drückst und von deinem Schiff dorthin ziehst.\n\n[accent]Lege das Kupfer zurück in den Kern.[] -tutorial.waves = Der [lightgray]Gegner[] greift an.\n\nVerteidige deinen Kern 2 Wellen lang. Baue mehr Geschütze. -tutorial.waves.mobile = Der[lightgray] Gegner[] greift an.\n\nVerteidige deinen Kern 2 Wellen lang. Dein Schiff feuert automatisch auf Gegner.\nBaue mehr Geschütze und Bohrer. Baue mehr Kupfer ab. -tutorial.launch = Sobald du eine bestimmte Welle erreicht hast, kannst du die [accent]Mission abschließen[]. Dadurch lässt du deine Basis zurück[accent] und überträgst alle Ressourcen in deinen Kern.[]\nDiese Ressourcen können zur Erforschung neuer Technologien eingesetzt werden.\n\n[accent]Drücke nun den Abschluss-Button. - +hint.skip = Überspringen +hint.desktopMove = Drücke [accent][[WASD][] um dich zu bewegen. +hint.zoom = [accent]Scrolle[] um rein oder raus zu zoomen. +hint.mine = Bewege dich zum \uf8c4 Kupfererz und [accent]tippe darauf[], um es manuell abzubauen. +hint.desktopShoot = Benutze [accent][[Links-Click][] um zu schießen. +hint.depositItems = Um Materialien in den Kern zu tun, ziehe sie von dir zum Kern. +hint.respawn = Um im Kern zu respawnen, drücke [accent][[V][]. +hint.respawn.mobile = Du steuerst nun eine Einheit oder einen Block. Um wieder zur normalen Einheit zu werden, [accent]drücke die Abbildung von dir oben links.[] +hint.desktopPause = Benutze [accent][[Leertaste][] um das Spiel zu pausieren oder entpausieren. +hint.placeDrill = Wähle die \ue85e [accent]Bohrer[]-Kategorie im Menü unten rechts aus, drücke dann auf den \uf870 [accent]Bohrer[] und clicke auf ein Feld mit Kupfererz, um ihn zu platzieren. +hint.placeDrill.mobile = Wähle die \ue85e[accent]Bohrer[]-Kategorie im Menü unten rechts aus, drücke dann auf den \uf870 [accent]Bohrer[] und clicke auf ein Feld mit Kupfererz, um ihn zu platzieren.\n\nGehe zuletzt auf das \ue800 [accent]Häkchen[] unten rechts, um dies zu bestätigen. +hint.placeConveyor = Förderbänder bewegen Materialen zwischen verschiedene Blöcke. Wähle ein \uf896 [accent]Förderband[] aus der \ue814 [accent]Verteilung[]-Kategorie aus.\n\nClicke und bewege deine Maus, um mehrere Förderbänder zu setzen.\n[accent]Scrolle[] um sie zu drehen. +hint.placeConveyor.mobile = Förderbänder bewegen Materialen zwischen verschiedene Blöcke. Wähle ein \uf896 [accent]Förderband[] aus der \ue814 [accent]Verteilung[]-Kategorie aus.\n\nHalte deinen Finger eine Sekunde auf dem Bildschirmund bewege ihn dann, um mehrere Förderbänder zu setzen. +hint.placeTurret = Platziere \uf861 [accent]Geschütze[] um deine Basis vor Gegnern zu beschützen.\n\nGeschütze benötigen Munition - in diesem Fall \uf838Kupfer.\nBenutze Bohrer und Förderbänder, um dies zu besorgen. +hint.breaking = Benutze [accent]Rechts-Click[] und bewege deine Maus, um zu zerstören. +hint.breaking.mobile = Aktiviere den \ue817 [accent]Hammer[] unten rechts and tippe, um Blöcke zu zerstören.\n\nHalte deinen Finger auf dem Bildschirm um eine Fläche auszuwählen. +hint.research = Nehme den \ue875 [accent]Forschen[]-Knopf um neue Technologien zu erforschen. +hint.research.mobile = Nehme den \ue875 [accent]Forschen[]-Knopf im \ue88c [accent]Menü[] um neue Technologien zu erforschen. +hint.unitControl = Halte [accent][[L-STRG][] und [accent]clicke[] um alliierte Einheiten oder Geschütze zu steuern. +hint.unitControl.mobile = [accent][Doppel-Clicke[], um alliierte Einheiten oder Geschütze zu steuern. +hint.launch = Sobald du genug Ressourcen gesammelt hast, kannst du [accent]Starten[], indem du andere Sektoren auf der \ue827 [accent]Karte[] unten rechts auswählst. +hint.launch.mobile = Sobald du genug Ressourcen gesammelt hast, kannst du [accent]Starten[], indem du andere Sektoren auf der \ue827 [accent]Karte[] im \ue88c [accent]Menu[] auswählst. +hint.schematicSelect = Halte [accent][[F][] gedrückt und bewege deine Maus, um Blöcke zu kopieren.\n\nMit [accent][[Mittel-Click][] kannst du einen einzelnen Block kopieren. +hint.conveyorPathfind = Halte [accent][[L-STRG][] während du Förderbänder baust, um automatisch einen Weg zu finden. +hint.conveyorPathfind.mobile = Aktiviere den \ue844 [accent]Diagonal-Modus[] unten rechts und platziere Förderbänder, um automatisch einen Weg zu generieren. +hint.boost = Halte [accent][[L-Shift][] gedrückt um über Hindernisse zu boosten.\n\nNur manche Bodeneinheiten können das. +hint.command = Drücke [accent][[G][] um [accent]ähnliche[] Einheiten in Formation zu steuern.\n\nUm Bodeneinheiten zu steuern musst du zuerst eine Bodeneinheite werden. +hint.command.mobile = [accent][[Doppel-Clicke][] deine Einheit um [accent]ähnliche[] Einheiten in Formation zu steuern. +hint.payloadPickup = Du kannst [accent][[[] drücken, um kleine Einheiten oder Blöcke hochzuheben. +hint.payloadPickup.mobile = [accent]Halte deinen Finger[] auf eine kleine Einheit oder einen kleinen Block, um ihn aufzuheben. +hint.payloadDrop = Drücke [accent]][] um etwas fallen zu lassen. +hint.payloadDrop.mobile = [accent]Halte deinen Finger[] auf einen Freien Ort um eine Einheit oder einen Block da fallen zu lassen. +hint.waveFire = [accent]Wellen[]-Geschütze mit Wassermunition löschen automatisch Feuer. +hint.generator = \uf879 [accent]Verbrennungsgeneratoren[] verbrennen Kohle und übertragen diesen Strom in angrenzende Blöcke.\n\nDie Reichweite der Stromübertragung kann mit \uf87f [accent]Stromknoten[] erweitert werden. +hint.guardian = [accent]Boss[]-Einheiten sind gepanzert. Schwache Munition wie [accent]Kupfer[] und [accent]Blei[] sind [scarlet]nicht ausreichend[].\n\nBenutze bessere Geschütze oder \uf835 [accent]Graphit[] als \uf861Duo-/\uf859Salvenmunition um einen Boss zu besiegen. +item.copper.description = Wird als Baumaterial oder Munition verwendet. +item.copper.details = Kupfer. Auf Serpulo reichlich vorhanden. Strukturell schwach, solange es nicht verstärkt wird. +item.lead.description = Wird in elektrischen Blöcken oder beim Flüssigkeitstransport verwendet. +item.lead.details = Dicht. Träge. Wird sehr oft in Batterienverwendet.\nInfo: Wahrscheinlich giftig für biologische Lebenwesen, obwohl es sowieso nicht mehr viele von denen gibt. +item.metaglass.description = Wird beim Flüssigkeitstransport und -lagerung verwendet. +item.graphite.description = Wird als Munition oder elektrischer Leiter eingesetzt. +item.sand.description = Nützlich für die Herstellung vieler anderer Materialen. +item.coal.description = Used for fuel and refined material production. +item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event. +item.titanium.description = Used in liquid transportation structures, drills and aircraft. +item.thorium.description = Used in durable structures and as nuclear fuel. +item.scrap.description = Used in Melters and Pulverizers for refining into other materials. +item.scrap.details = Leftover remnants of old structures and units. +item.silicon.description = Used in solar panels, complex electronics and homing turret ammunition. +item.plastanium.description = Used in advanced units, insulation and fragmentation ammunition. +item.phase-fabric.description = Used in advanced electronics and self-repairing structures. +item.surge-alloy.description = Used in advanced weaponry and reactive defense structures. +item.spore-pod.description = Used for conversion into oil, explosives and fuel. +item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions. +item.blast-compound.description = Used in bombs and explosive ammunition. +item.pyratite.description = Used in incendiary weapons and combustion-fueled generators. +liquid.water.description = Used for cooling machines and waste processing. +liquid.slag.description = Refined in separators into constituent metals, or sprayed at enemies as a weapon. +liquid.oil.description = Used in advanced material production and as incendiary ammunition. +liquid.cryofluid.description = Used as coolant in reactors, turrets and factories. item.copper.description = Ein nützliches Material. Wird in allen Arten von Blöcken verwendet. item.lead.description = Ein grundlegendes Material. Häufig in Elektronik und Flüssigkeits-Transport-Blöcken verwendet. item.metaglass.description = Eine extrem harte Glasmischung. Wird zur Verteilung und Lagerung von Flüssigkeiten benutzt. From ca29909bec32418f264eb1febedf348ac6a7b30d Mon Sep 17 00:00:00 2001 From: AydenRennaker Date: Thu, 26 Nov 2020 18:32:31 -0800 Subject: [PATCH 052/123] Update servers_v6.json Add Atanner Gaming server back to list. Updates are looking good :) --- servers_v6.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index c627e00001..3bdbd9bb9e 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -2,6 +2,10 @@ { "name": "mindustry.pl", "address": ["mindustry.pl:6000", "mindustry.pl:6666"] + }, + { + "name": "Atanner", + "address": ["atannergaming.com:13000"] }, { "name": "C.A.M.S.", From 0d4c28daf24909e06d25bc74405b774a6b8f52ba Mon Sep 17 00:00:00 2001 From: Lapis <45414333+Lapis256@users.noreply.github.com> Date: Fri, 27 Nov 2020 13:27:09 +0900 Subject: [PATCH 053/123] Update bundle_ja.properties --- core/assets/bundles/bundle_ja.properties | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 44fe8fc1c1..6983736df4 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -23,7 +23,7 @@ gameover.waiting = [accent]Waiting for next map... highscore = [accent]ハイスコアを更新! copied = コピーしました。 indev.notready = This part of the game isn't ready yet -indev.campaign = [accent]You've reached the end of the campaign![]\n\nThis is as far as the content goes. Interplanetary travel will be added in future updates. +indev.campaign = [accent]Congratulations! You've reached the end of the campaign![]\n\nThis is as far as the content goes right now. Interplanetary travel will be added in future updates. load.sound = サウンド load.map = マップ @@ -118,7 +118,7 @@ mod.disable = 無効化 mod.content = コンテンツ: mod.delete.error = MODを削除することができませんでした。 mod.requiresversion = [scarlet]Modが要求する最低バージョン: [accent]{0} -mod.outdated = [scarlet]V6 との互換性がありません (no minGameVersion: 105) +mod.outdated = [scarlet]V6 との互換性がありません (minGameVersion が 105 未満) mod.missingdependencies = [scarlet]依存関係がありません。: {0} mod.erroredcontent = [scarlet]コンテンツエラー mod.errors = コンテンツの読み込み中にエラーが発生しました。 @@ -130,7 +130,7 @@ mod.reloadrequired = [scarlet]Modを有効にするには、この画面を開 mod.import = Modをインポート mod.import.file = ファイルをインポート mod.import.github = GitHubからModをインポート -mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source! +mod.jarwarn = [scarlet]JAR mods は本質的に安全ではありません。[]\n信頼できる場所からインポートしているか確認してください! mod.item.remove = これは以下のModの一部です。[accent] '{0}'[] 削除するにはそのModを削除してください。 mod.remove.confirm = このModを削除します。 mod.author = [lightgray]著者:[] {0} @@ -149,6 +149,9 @@ unlocked = 新しい要素をアンロック! available = 新しい研究が利用可能です! completed = [accent]完了 techtree = テックツリー +research.legacy = [accent]5.0[] の研究データが見つかりました。\n[accent]このデータを読み込みますか?[] それとも、[accent]破棄して新しいキャンペーンで研究をやり直しますか?[](推奨) +research.load = ロード +research.discard = 破棄 research.list = [lightgray]研究: research = 研究 researched = [lightgray]{0} の研究が完了しました @@ -230,6 +233,7 @@ disconnect.timeout = タイムアウトしました。 disconnect.data = ワールドデータの読み込みに失敗しました! cantconnect = ゲームに参加できませんでした。 ([accent]{0}[]) connecting = [accent]接続中... +reconnecting = [accent]再接続中... connecting.data = [accent]ワールドデータを読み込み中... server.port = ポート: server.addressinuse = アドレスがすでに使用されています! From cf16983b348135db40b993868e9f6db4a1dd7e7d Mon Sep 17 00:00:00 2001 From: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Date: Fri, 27 Nov 2020 11:34:53 +0700 Subject: [PATCH 054/123] another new lines and fixes legacy research, Guardian = Penjaga, Purpose = Kegunaan, reconnecting, etc. --- core/assets/bundles/bundle_in_ID.properties | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index e67700b398..e28ebd7108 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -23,7 +23,7 @@ gameover.waiting = [accent]Menunggu peta selanjutnya... highscore = [accent]Rekor Baru! copied = Tersalin. indev.notready = Bagian tersebut saat ini belum siap -indev.campaign = [accent]Kamu telah mencapai batas dari kampanye![]\n\nHanya sejauh ini yang kamu bisa. Perjalanan antarplanet akan ditambahkan di masa mendatang. +indev.campaign = [accent]Selamat! Kamu telah mencapai batas dari kampanye![]\n\nHanya sejauh ini yang kamu bisa. Perjalanan antarplanet akan ditambahkan di masa mendatang. load.sound = Suara load.map = Peta @@ -149,6 +149,9 @@ unlocked = Konten baru terbuka! available = Penelitian baru tersedia! completed = [accent]Terselesaikan techtree = Cabang Teknologi +research.legacy = Data penelitian [accent]5.0[] ditemukan.\nApakah Anda ingin [accent]memuat data ini[], atau [accent]discard it[] dan memulai ulang penelitian di kampanye terbaru (disarankan)? +research.load = Muat +research.discard = Buang research.list = [lightgray]Penelitian: research = Penelitian researched = [lightgray]{0} telah diteliti. @@ -229,7 +232,8 @@ disconnect.closed = Koneksi ditutup. disconnect.timeout = Waktu habis. disconnect.data = Gagal memuat data server! cantconnect = Gagal menyambung! ([accent]{0}[]). -connecting = [accent]Memasuki... +connecting = [accent]Menghubungkan... +reconnecting = [accent]Menghubungkan kembali... connecting.data = [accent]Memuat data server... server.port = Port: server.addressinuse = Alamat sudah ada! @@ -305,8 +309,8 @@ wave.enemies = [lightgray]{0} Musuh Tersisa wave.enemycores = [accent]{0}[lightgray] Inti Musuh wave.enemycore = [accent]{0}[lightgray] Inti Musuh wave.enemy = [lightgray]{0} Musuh Tersisa -wave.guardianwarn = Guardian akan tiba dalam [accent]{0}[] gelombang. -wave.guardianwarn.one = Guardian akan tiba dalam [accent]{0}[] gelombang. +wave.guardianwarn = Penjaga akan tiba dalam [accent]{0}[] gelombang. +wave.guardianwarn.one = Penjaga akan tiba dalam [accent]{0}[] gelombang. loadimage = Memuat Gambar saveimage = Simpan Gambar unknown = Tak diketahui @@ -355,7 +359,7 @@ waves.waves = gelombang waves.perspawn = per muncul waves.shields = perisai/gelombang waves.to = sampai -waves.guardian = Guardian +waves.guardian = Penjaga waves.preview = Pratinjau waves.edit = Sunting... waves.copy = Salin ke Papan klip @@ -509,7 +513,7 @@ launch.from = Meluncurkan Dari: [accent]{0} launch.destination = Destinasi: {0} configure.invalid = Jumlah harus berupa angka diantara 0 dan {0}. add = Menambahkan... -boss.health = Darah Guardian +boss.health = Darah Penjaga connectfail = [scarlet]Gagal menyambung ke server:\n\n[accent]{0} error.unreachable = Server tak terjangkau.\nApakah alamatnya benar? @@ -760,7 +764,7 @@ unit.items = item unit.thousands = rb unit.millions = jt unit.billions = m -category.purpose = Purpose +category.purpose = Kegunaan category.general = Umum category.power = Tenaga category.liquids = Zat Cair From c545e03852fceb3ea10fc492f896883efdc4d8af Mon Sep 17 00:00:00 2001 From: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Date: Fri, 27 Nov 2020 11:47:05 +0700 Subject: [PATCH 055/123] legacy research discard fix --- core/assets/bundles/bundle_in_ID.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index e28ebd7108..73b6a2505c 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -149,9 +149,9 @@ unlocked = Konten baru terbuka! available = Penelitian baru tersedia! completed = [accent]Terselesaikan techtree = Cabang Teknologi -research.legacy = Data penelitian [accent]5.0[] ditemukan.\nApakah Anda ingin [accent]memuat data ini[], atau [accent]discard it[] dan memulai ulang penelitian di kampanye terbaru (disarankan)? +research.legacy = Data penelitian [accent]5.0[] ditemukan.\nApakah kamu ingin [accent]memuat data ini[], atau [accent]mengabaikannya[] dan memulai ulang penelitian di kampanye terbaru (disarankan)? research.load = Muat -research.discard = Buang +research.discard = Abaikan research.list = [lightgray]Penelitian: research = Penelitian researched = [lightgray]{0} telah diteliti. From 40dd3d567757d39f54bfd700d961126e215a631e Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Fri, 27 Nov 2020 10:07:38 +0100 Subject: [PATCH 056/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 32 +++++++++++++----------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index f40342a6e4..00177653b6 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -149,12 +149,15 @@ unlocked = ¡Nuevo contenido en la Base de Datos! available = ¡Nueva investigación disponible! completed = [accent]Completado techtree = Tecnologías -research.list = [lightgray]Investigación: -research = Investigación +research.legacy = Se han encontrado datos guardados de investigaciones tecnológicas realizadas en la versión [accent]5.0[].\n¿Quieres [accent]cargar estos datos[], o [accent]descartarlos[] para reiniciar los descubrimientos tecnológicos del nuevo modo Campaña? (Recomendado) +research.load = Cargar +research.discard = Descartar +research.list = [lightgray]Investigaciones: +research = Investigaciones researched = [lightgray]{0} investigado. research.progress = {0}% completado -players = {0} jugadores online -players.single = {0} jugador online +players = {0} jugadores +players.single = {0} jugador players.search = Buscar players.notfound = [gray]No se encontraron jugadores server.closing = [accent]Cerrando servidor... @@ -179,7 +182,7 @@ host.info = El botón [accent]host[] crea un servidor en el puerto [scarlet]6567 join.info = Aquí, puedes escribir la [accent]IP de un servidor[] para conectarte, o descubrir servidores en tu [accent]red local[] para conectarte.\nTambién se puede jugar multijugador en redes LAN y WAN.\n\n[lightgray]Nota: No hay una lista automática global de servidores; si quieres conectarte por IP, tendrás que preguntarle al anfitrión por la IP. hostserver = Crear Servidor invitefriends = Invitar Amigos -hostserver.mobile = Crear\nJuego +hostserver.mobile = Crear\nPartida host = Servidor hosting = [accent]Abriendo servidor... hosts.refresh = Actualizar @@ -203,11 +206,11 @@ trace.ip = IP: [accent]{0} trace.id = ID Única: [accent]{0} trace.mobile = Cliente de móvil: [accent]{0} trace.modclient = Cliente Personalizado: [accent]{0} -invalidid = ¡ID de cliente inválida! Envía un informe del error. +invalidid = ¡ID de cliente inválida! Por favor, envía un informe del error. server.bans = Expulsiones -server.bans.none = No se ha expulsado a ningún usuario aún +server.bans.none = No se ha baneado a ningún usuario aún server.admins = Administradores -server.admins.none = No se ha encontrado ningún administrador +server.admins.none = ¡No hay ningún administrador! server.add = Agregar Servidor server.delete = ¿Estás seguro de querer borrar este servidor? server.edit = Editar Servidor @@ -230,6 +233,7 @@ disconnect.timeout = Tiempo de espera agotado. disconnect.data = ¡Hubo un fallo con la carga de datos! cantconnect = No es posible unirse a la partida ([accent]{0}[]). connecting = [accent]Conectando... +reconnecting = [accent]Reconectado... connecting.data = [accent]Cargando datos del mundo... server.port = Puerto: server.addressinuse = ¡La dirección ya está en uso! @@ -694,11 +698,11 @@ stat.abilities = Habilidades stat.canboost = Tiene Propulsores stat.flying = Aéreo -skill.forcefield = Zona de Escudo -skill.repairfield = Zona de Reparación -skill.statusfield = Zona de Estado -skill.unitspawn = {0} Fábrica de Drones -skill.shieldregenfield = Zona de Regeneración de Escudos +ability.forcefield = Zona de Escudo +ability.repairfield = Zona de Reparación +ability.statusfield = Zona de Estado +ability.unitspawn = {0} Fábrica de Drones +ability.shieldregenfield = Zona de Regeneración de Escudos ability.movelightning = Movimiento Relámpago bar.drilltierreq = Se requiere un taladro mejor. @@ -842,7 +846,7 @@ command.attack = Atacar command.rally = Patrullar command.retreat = Retirarse command.idle = Esperar -placement.blockselectkeys = \n[lightgray]Claves: [{0}, +placement.blockselectkeys = \n[lightgray]Códigos: [{0}, keybind.respawn.name = Reaparecer keybind.control.name = Controlar unidad keybind.clear_building.name = Eliminar construcción From 7e5c69a1072af89e30975d85893891e94347cc74 Mon Sep 17 00:00:00 2001 From: Angel_24 <57916262+Angel-24@users.noreply.github.com> Date: Fri, 27 Nov 2020 13:07:38 +0100 Subject: [PATCH 057/123] Update bundle_es.properties --- core/assets/bundles/bundle_es.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 00177653b6..4c0ded36a7 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1303,9 +1303,9 @@ item.blast-compound.description = Usado en bombas y munición explosiva. item.pyratite.description = Usado en armas incendiarias y generadores de combustión. liquid.water.description = Usada comúnmente para enfriar máquinas y para procesar residuos. -liquid.slag.description = Diferentes tipos de metales fundidos mezclados. Puede ser separado en sus minerales constituyentes, o expulsado a unidades enemigas como arma. -liquid.oil.description = Puede ser quemado, explotado o usado como un enfriador. -liquid.cryofluid.description = El líquido más eficiente para enfriar cosas. +liquid.slag.description = Diferentes tipos de metales fundidos mezclados. Puede ser separado en sus minerales constituyentes, o disparado a unidades enemigas como arma. +liquid.oil.description = Se utiliza en producción de materiales avanzados, y en munición incendiaria. +liquid.cryofluid.description = Usado como refrigerante para reactores, torretas, y fábricas. block.resupply-point.description = Reabastece unidades cercanas con munición de cobre. No es compatible con unidades que requieren energía. block.armored-conveyor.description = Mueve objetos. No acepta objetos si entran por los lados. From 4fbfb503807a2348f7f04f2651b9230cbbe797d9 Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Fri, 27 Nov 2020 21:43:58 +0100 Subject: [PATCH 058/123] more translations --- core/assets/bundles/bundle_de.properties | 309 +++++++++++++---------- 1 file changed, 180 insertions(+), 129 deletions(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 6927699698..10c4cdd183 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -149,6 +149,9 @@ unlocked = Neuer Inhalt freigeschaltet! available = Neue Forschung möchlich! completed = [accent]Abgeschlossen techtree = Forschung +research.legacy = [accent]5.0[] Forschungsdaten gefunden.\nMöchtest du [accent]diese Daten behalten[] oder [accent]sie löschen[] und neu anfangen (empfohlen)? +research.load = Behalten +research.discard = Löschen research.list = [lightgray]Forschung: research = Forschen researched = [lightgray]{0} erforscht. @@ -1175,9 +1178,9 @@ block.repair-point.name = Reparaturpunkt block.pulse-conduit.name = Impulskanal block.plated-conduit.name = Gepanzerter Kanal block.phase-conduit.name = Phasenkanal -block.liquid-router.name = Flüssigkeits-Verteiler +block.liquid-router.name = Flüssigkeitsverteiler block.liquid-tank.name = Flüssigkeitstank -block.liquid-junction.name = Flüssigkeits-Kreuzung +block.liquid-junction.name = Flüssigkeitskreuzung block.bridge-conduit.name = Kanalbrücke block.rotary-pump.name = Rotierende Pumpe block.thorium-reactor.name = Thorium-Reaktor @@ -1275,67 +1278,52 @@ hint.payloadDrop.mobile = [accent]Halte deinen Finger[] auf einen Freien Ort um hint.waveFire = [accent]Wellen[]-Geschütze mit Wassermunition löschen automatisch Feuer. hint.generator = \uf879 [accent]Verbrennungsgeneratoren[] verbrennen Kohle und übertragen diesen Strom in angrenzende Blöcke.\n\nDie Reichweite der Stromübertragung kann mit \uf87f [accent]Stromknoten[] erweitert werden. hint.guardian = [accent]Boss[]-Einheiten sind gepanzert. Schwache Munition wie [accent]Kupfer[] und [accent]Blei[] sind [scarlet]nicht ausreichend[].\n\nBenutze bessere Geschütze oder \uf835 [accent]Graphit[] als \uf861Duo-/\uf859Salvenmunition um einen Boss zu besiegen. + item.copper.description = Wird als Baumaterial oder Munition verwendet. item.copper.details = Kupfer. Auf Serpulo reichlich vorhanden. Strukturell schwach, solange es nicht verstärkt wird. item.lead.description = Wird in elektrischen Blöcken oder beim Flüssigkeitstransport verwendet. -item.lead.details = Dicht. Träge. Wird sehr oft in Batterienverwendet.\nInfo: Wahrscheinlich giftig für biologische Lebenwesen, obwohl es sowieso nicht mehr viele von denen gibt. +item.lead.details = Dicht. Träge. Wird sehr oft in Batterien verwendet.\nInfo: Wahrscheinlich giftig für biologische Lebenwesen, obwohl es sowieso nicht mehr viele von denen gibt. item.metaglass.description = Wird beim Flüssigkeitstransport und -lagerung verwendet. item.graphite.description = Wird als Munition oder elektrischer Leiter eingesetzt. item.sand.description = Nützlich für die Herstellung vieler anderer Materialen. -item.coal.description = Used for fuel and refined material production. -item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event. -item.titanium.description = Used in liquid transportation structures, drills and aircraft. -item.thorium.description = Used in durable structures and as nuclear fuel. -item.scrap.description = Used in Melters and Pulverizers for refining into other materials. -item.scrap.details = Leftover remnants of old structures and units. -item.silicon.description = Used in solar panels, complex electronics and homing turret ammunition. -item.plastanium.description = Used in advanced units, insulation and fragmentation ammunition. -item.phase-fabric.description = Used in advanced electronics and self-repairing structures. -item.surge-alloy.description = Used in advanced weaponry and reactive defense structures. -item.spore-pod.description = Used for conversion into oil, explosives and fuel. -item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions. -item.blast-compound.description = Used in bombs and explosive ammunition. -item.pyratite.description = Used in incendiary weapons and combustion-fueled generators. -liquid.water.description = Used for cooling machines and waste processing. -liquid.slag.description = Refined in separators into constituent metals, or sprayed at enemies as a weapon. -liquid.oil.description = Used in advanced material production and as incendiary ammunition. -liquid.cryofluid.description = Used as coolant in reactors, turrets and factories. -item.copper.description = Ein nützliches Material. Wird in allen Arten von Blöcken verwendet. -item.lead.description = Ein grundlegendes Material. Häufig in Elektronik und Flüssigkeits-Transport-Blöcken verwendet. -item.metaglass.description = Eine extrem harte Glasmischung. Wird zur Verteilung und Lagerung von Flüssigkeiten benutzt. -item.graphite.description = Mineralisierter Kohlenstoff. Wird für Munition und elektrische Isolierung verwendet. -item.sand.description = Ein gängiges Material, welches häufig in geschmolzener Form, flüssig oder als Legierung verwendet wird. -item.coal.description = Ein sehr häufig vorkommender Kraftstoff. Fossilierte Pflanzenmasse, geformt lange bevor dem Sporen-Ereignis. -item.titanium.description = Ein seltenes, sehr leichtes Metall. Häufig in Flüssigkeits-Transport-Blöcken, Abbauanlagen und Luftschiffen verwendet. -item.thorium.description = Ein dichtes radioaktives Metall, welches als strukturelle Unterstützung und nuklearer Kraftstoff verwendet wird. -item.scrap.description = Überreste alter Gebäude und Einheiten. Enthält Spuren verschiedener Metalle. -item.silicon.description = Ein sehr nützlicher Halbleiter. Findet Anwendung in Solaranlagen, komplexer Elektronik und zielsuchender Munition. -item.plastanium.description = Ein leichtes, dehnbares Material, welches in Flugzeugen und Splittermunition verwendet wird. -item.phase-fabric.description = Eine nahezu gewichtslose Substanz, die in fortgeschrittener Elektronik und in selbstreparierender Technologie verwendet wird. -item.surge-alloy.description = Eine fortgeschrittene Legierung mit einzigartigen elektrischen Eigenschaften. +item.coal.description = Kann als Brennstoff oder zur Herstellung anderer Materialen verwendet werden. +item.coal.details = Scheint versteinerte Pflanzenmasse zu sein, die sich schon lange vor dem Seeding gebildet hat. +item.titanium.description = Wird im Flüssigkeitsbereich, im Bohrerbereich und für Flugzeuge vielfältig eingesetzt. +item.thorium.description = Wird als festes Baumaterial oder radioaktiver Kraftstoff verwendet. +item.scrap.description = Wird in Pulverisierer und Schmelzer zu anderen Materialen bearbeitet. +item.scrap.details = Übriggebliebene Reste alter Gebäude oder Einheiten. +item.silicon.description = Wird in Solarzellen, komplizierte Elektronik und als zielsuchende Munition verwendet. +item.plastanium.description = Wird für fortgeschrittene Einheiten, Isolation und Munition eingesetzt. +item.phase-fabric.description = Kann in Elektronik und selbstreparierende Blöcke verwendet werden. +item.surge-alloy.description = Wird in sehr fortgeschrittenen Waffen und Abwehrsystemen benutzt. item.spore-pod.description = Wird zur Umwandlung in Öl, Sprengstoff und Kraftstoff verwendet. -item.blast-compound.description = Eine flüchtige Mischung, die in Bomben und Sprengstoffen Verwendung findet. Es besteht die Möglichkeit, es als Treibstoff zu verwenden. Dies ist aber nicht empfehlenswert. -item.pyratite.description = Eine extrem leicht entflammbare Substanz. Findet Verwendung in Brandwaffen. -liquid.water.description = Wird üblicherweise zum Kühlen von Maschinen und zur Müllverarbeitung verwendet. -liquid.slag.description = Ein Gemisch aus verschiedenen Arten von Metall, welche miteinander vermischt wurden. Kann in seine Bestandteile getrennt oder als Waffe auf feindliche Einheiten gesprüht werden. -liquid.oil.description = Kann verbrannt, zum Explodieren gebracht, oder zur Kühlung verwendet werden. -liquid.cryofluid.description = Die Flüssigkeit, die Dinge am effizientesten herunterkühlen kann. +item.spore-pod.details = Sporen. Wahrscheinlich ein künstlich erschaffenes Lebenwesen. Geben giftige Gase für andere Lebenwesen ab. Sehr invasiv. Unter bestimmten Bedingungen sehr brennbar. +item.blast-compound.description = Wird in Bomben oder als explosive Munition verwendet. +item.pyratite.description = Kann in Verbrennungsgeneratoren oder als brennende Munition verbrannt werden. -block.message.description = Speichert eine Nachricht. Wird genutzt, um mit Verbündeten zu kommunizieren. -block.graphite-press.description = Komprimiert Kohlestücke zu reinen Graphitplatten. -block.multi-press.description = Eine aktualisierte Version der Graphitpresse. Setzt Wasser und Strom ein, um Kohle schnell und effizient zu verarbeiten. -block.silicon-smelter.description = Reduziert Sand mit hochreinem Kohlenstoff, um Silizium zu produzieren. -block.kiln.description = Schmelzt Sand und Blei zu Metaglass. Erfordert kleine Mengen Energie. +liquid.water.description = Wird üblicherweise zum Kühlen von Maschinen und zur Müllverarbeitung verwendet. +liquid.slag.description = Kann in Trennern verfeinert oder als Waffe gegen Gegner verwendet werden. +liquid.oil.description = Used in advanced material production and as incendiary ammunition. +liquid.cryofluid.description = Used as coolant in reactors, turrets and factories. Wird als Kühlung in Geschütze, Fabriken oder Reaktoren verwendet. + +block.resupply-point.description = Füllt Einheiten in der Nähe mit Kupfermunition wieder auf. Nicht mit Einheiten kompatibel, die Strom benötigen. +block.armored-conveyor.description = Bewegt Materialen foran. Materialen können von der Seite nicht auf das Förderband. +block.illuminator.description = Eine Lichtquelle. +block.message.description = Speichert eine Nachricht, die genutzt wird, um mit Verbündeten zu kommunizieren. +block.graphite-press.description = Komprimiert Kohle zu Graphit. +block.multi-press.description = Komprimiert Kohle zu Graphit. Braucht für die Kühlung Wasser. +block.silicon-smelter.description = Stellt aus Sand und Kohle Silizium her. +block.kiln.description = Schmelzt Sand und Blei zu Metaglass. block.plastanium-compressor.description = Produziert Plastanium aus Öl und Titan. -block.phase-weaver.description = Produziert Phasengewebe aus radioaktivem Thorium und großen Mengen an Sand. -block.alloy-smelter.description = Verarbeitet Titan, Blei, Silizium und Kupfer zu einer Stromstoßlegierung. +block.phase-weaver.description = Produziert Phasengewebe aus Thorium und Sand. +block.alloy-smelter.description = Verschmilzt Titan, Blei, Silizium und Kupfer zu einer Stromstoßlegierung. block.cryofluid-mixer.description = Verarbeitet Wasser mit Titan zu einer Kryoflüssigkeit, die viel effizienter kühlt. -block.blast-mixer.description = Verwendet Sporen, um Pyratit in eine weniger enzündliche aber explosive Mischung umzuwandeln. +block.blast-mixer.description = Stellt aus Sporen und Pyratit eine explosive Mischung her. block.pyratite-mixer.description = Vermischt Kohle, Blei und Sand zu hochentzündlichem Pyratit. -block.melter.description = Erhitzt Schrott auf extrem hohe Temperaturen, um Lava zu erhalten. -block.separator.description = Setzt Lava Wasserdruck aus, um verschiedene Mineralien freizulegen. -block.spore-press.description = Komprimiert Sporenhülsen zu Öl. -block.pulverizer.description = Zertrümmert Schrott zu Sand. Nützlich, wenn kein natürlicher Sand verfügbar ist. +block.melter.description = Erhitzt Schrott um Schlacke zu erhalten. +block.separator.description = Trennt Schlacke in seine Bestandteile. +block.spore-press.description = Komprimiert Sporen zu Öl. +block.pulverizer.description = Zertrümmert Schrott zu Sand. block.coal-centrifuge.description = Verfestigt Öl zu Kohlenstücken. block.incinerator.description = Vernichtet beliebige überschüssige Materialien oder Flüssigkeiten. block.power-void.description = Verschlingt den kompletten übrigen Strom. Nur im Sandkasten-Modus verfügbar. @@ -1344,92 +1332,155 @@ block.item-source.description = Produziert unendlich viele Gegenstände. Nur im block.item-void.description = Zerstört Materialien, die hereingegeben werden, ohne Strom zu verbrauchen. Nur im Sandkasten-Modus verfügbar. block.liquid-source.description = Produziert unendlich Flüssigkeiten. Nur im Sandkasten-Modus verfügbar. block.liquid-void.description = Entfernt jegliche Flüssigkeiten. Nur im Sandkasten-Modus verfügbar. -block.copper-wall.description = Ein günstiger Verteidigungsblock.\nNützlich, um die Basis und Türme in den ersten Wellen zu beschützen. -block.copper-wall-large.description = Ein günstiger Verteidigungsblock.\nNützlich, um die Basis und Türme in den ersten Wellen zu beschützen.\nBenötigt mehrere Kacheln. -block.titanium-wall.description = Ein mittelstarker Verteidigungsblock.\nBietet mäßigen Schutz vor Feinden. -block.titanium-wall-large.description = Ein mittelstarker Verteidigungsblock.\nBietet mäßigen Schutz vor Feinden.\nBenötigt mehrere Kacheln. -block.plastanium-wall.description = Eine spezielle Wand, die elektrische Funken absorbiert und automatische Stromknoten-Verbindung blockiert. -block.plastanium-wall-large.description = Eine spezielle Wand, die elektrische Funken absorbiert und automatische Stromknoten-Verbindung blockiert.\nBenötigt mehrere Kacheln. -block.thorium-wall.description = Ein starker Verteidigungsblock.\nBietet guten Schutz vor Feinden. -block.thorium-wall-large.description = Ein starker Verteidigungsblock.\nBietet guten Schutz vor Feinden.\nBenötigt mehrere Kacheln. -block.phase-wall.description = Nicht so stark wie eine Thorium-Mauer, aber reflektiert Schüsse bis zu einer gewissen Stärke. -block.phase-wall-large.description = Nicht so stark wie eine Thorium-Mauer, aber reflektiert Schüsse bis zu einer gewissen Stärke.\nBenötigt mehrere Kacheln. -block.surge-wall.description = Der stärkste Verteidigungsblock.\nHat eine kleine Chance, bei einem Schuss einen Lichtbogen in Richtung Angreifer auszulösen. -block.surge-wall-large.description = Der stärkste Verteidigungsblock.\nHat eine kleine Chance, bei einem Schuss einen Lichtbogen in Richtung Angreifer auszulösen.\nBenötigt mehrere Kacheln. -block.door.description = Eine kleine Tür, die durch Tippen geöffnet und geschlossen werden kann.\nGegner können durch geöffnete Türen schießen und laufen. -block.door-large.description = Eine kleine Tür, die durch Tippen geöffnet und geschlossen werden kann.\nGegner können durch geöffnete Türen schießen und laufen.\nBenötigt mehrere Kacheln. -block.mender.description = Repariert regelmäßig Blöcke in seiner Umgebung. Hält die Abwehrkräfte zwischen den Wellen instand.\nVerwendet optional Silizium, um Reichweite und Effizienz zu steigern. -block.mend-projector.description = Eine verbesserte Version des Reparateurs. Repariert regelmäßig Blöcke in seiner Umgebung.\nVerwendet optional Phasengewebe, um Reichweite und Effizienz zu steigern. -block.overdrive-projector.description = Erhöht die Geschwindigkeit von nahegelegenen Blöcken, wie Bohrer und Förderbänder. -block.force-projector.description = Erzeugt ein sechseckiges Kraftfeld um sich herum, das Blöcke und Einheiten vor Schaden schützt. -block.shock-mine.description = Beschädigt Gegner, die auf die Mine laufen. Für Gegener schwer zu sehen. -block.conveyor.description = Basis-Transportblock. Bewegt Materialien vorwärts und lädt sie automatisch in Geschütztürme oder Verarbeitungsanlagen. Rotierbar. -block.titanium-conveyor.description = Verbesserter Transportblock. Bewegt Materialien schneller als Standard-Förderbänder. -block.plastanium-conveyor.description = Bewegt Materialen in Gruppen.\nNimmt hinten Materialien an und gibt sie vorne in drei Richtungen aus. -block.junction.description = Fungiert als Brücke zwischen zwei kreuzenden Förderbändern. Nützlich, wenn zwei verschiedene Förderbänder sich kreuzen, aber unterschiedliche Materialien verwenden. -block.bridge-conveyor.description = Verbesserter Transportblock. Erlaubt es, Materialien über bis zu 3 Kacheln beliebigen Terrains oder Inhalts zu transportieren. -block.phase-conveyor.description = Verbesserter Transportblock. Verwendet Strom, um Materialien zu einem verbundenen Phasen-Förderband über mehrere Kacheln zu teleportieren. -block.sorter.description = Sortiert Materialien. Wenn ein Gegenstand der Auswahl entspricht, darf er vorbei. Andernfalls wird er links oder rechts ausgegeben. -block.inverted-sorter.description = Funktioniert wie ein normaler Sortierer, aber gibt das ausgewählte Material seitwärts aus. -block.router.description = Akzeptiert Materialien aus einer Richtung und leitet sie gleichmäßig in bis zu drei andere Richtungen weiter. Nützlich, wenn die Materialien aus einer Richtung an mehrere Empfänger verteilt werden sollen. -block.distributor.description = Ein weiterentwickelter Verteiler, der Materialien in bis zu sieben Richtungen gleichmäßig verteilt. -block.overflow-gate.description = Ein Verteiler, der nur Materialien nach links oder rechts ausgibt, falls der Weg gerade aus blockiert ist. -block.underflow-gate.description = Das Gegenteil eines Überlauftors. Gibt Materialen nur nach vorne aus, wenn der Weg rechts und links blockiert ist. -block.mass-driver.description = Ultimativer Transportblock. Sammelt mehrere Materialien und schießt sie zu einem verbundenen Massenbeschleuniger über eine große Reichweite. -block.mechanical-pump.description = Eine günstige, langsame Pumpe, die keinen Strom benötigt. -block.rotary-pump.description = Eine fortgeschrittene Pumpe, die mithilfe von Strom doppelt so schnell pumpt. -block.thermal-pump.description = Die ultimative Pumpe, dreimal so schnell wie eine mechanische Pumpe und die einzige Pumpe, die Lava fördern kann. -block.conduit.description = Standard Flüssigkeits-Transportblock. Funktioniert wie ein Förderband, nur für Flüssigkeiten. Wird am Besten mit Extraktoren, Pumpen oder anderen Kanälen benutzt. -block.pulse-conduit.description = Verbesserter Flüssigkeits-Transportblock. Transportiert Flüssigkeiten schneller und speichert mehr als Standard Kanäle. -block.plated-conduit.description = Bewegt Flüssigkeiten genauso schnell wie ein Impulskanal, ist aber besser gepanzert. Akzeptiert nur Verbindungen mit anderen Kanälen.\nVerliert weniger Flüssigkeit. -block.liquid-router.description = Akzeptiert Flüssigkeiten aus einer Richtung und verteilt sie an bis zu drei andere Richtungen weiter. Nützlich, um Flüssigkeiten aus einer Quelle an mehrere Empfänger zu verteilen. -block.liquid-tank.description = Speichert eine große Menge an Flüssigkeiten. Verwende es als Puffer, wenn Angebot und Nachfrage an einer Flüssigkeit schwanken. -block.liquid-junction.description = Fungiert als Brücke über zwei kreuzende Kanäle. Nützlich in Situationen, in denen sich zwei Kanäle mit verschiedenen Flüssigkeiten kreuzen. -block.bridge-conduit.description = Verbesserter Flüssigkeits-Transportblock. Erlaubt es, Flüssigkeiten über bis zu 3 Kacheln beliebigen Terrains oder Inhalts zu transportieren. -block.phase-conduit.description = Verbesserter Flüssigkeits-Transportblock. Verwendet Strom, um Flüssigkeiten zu einem verbundenen Phasenkanal zu teleportieren. -block.power-node.description = Überträgt Strom zu verbundenen Knoten. Bis zu zwanzig Stromquellen, -verbraucher oder -knoten können verbunden werden. Der Knoten erhält Strom von benachbarten Knoten und gibt Strom an benachbarte Blöcke weiter. -block.power-node-large.description = Hat einen größeren Radius als der normale Stromknoten und verbindet bis zu dreißig Stromquellen, -verbraucher oder -knoten. +block.copper-wall.description = Beschützt Blöcke vor Gegnern. +block.copper-wall-large.description = Beschützt Blöcke vor Gegnern. +block.titanium-wall.description = Beschützt Blöcke vor Gegnern. +block.titanium-wall-large.description = Beschützt Blöcke vor Gegnern. +block.plastanium-wall.description = Beschützt Blöcke vor Gegnern. Absorbiert Laser und Lichtbogen. Blockiert außerdem automatische Stromverbindungen. +block.plastanium-wall-large.description = Beschützt Blöcke vor Gegnern. Absorbiert Laser und Lichtbogen. Blockiert außerdem automatische Stromverbindungen. +block.thorium-wall.description = Beschützt Blöcke vor Gegnern. +block.thorium-wall-large.description = Beschützt Blöcke vor Gegnern. +block.phase-wall.description = Beschützt Blöcke vor Gegnern, indem sie die meisten Schüsse reflektiert. +block.phase-wall-large.description = Beschützt Blöcke vor Gegnern, indem sie die meisten Schüsse reflektiert. +block.surge-wall.description = Beschützt Blöcke vor Gegnern und greift Gegner mit Lichtbögen an. +block.surge-wall-large.description = Beschützt Blöcke vor Gegnern und greift Gegner mit Lichtbögen an. +block.door.description = Eine Wand, die geöffnet und geschlossen werden kann. +block.door-large.description = Eine Wand, die geöffnet und geschlossen werden kann. +block.mender.description = Repariert regelmäßig Blöcke in seiner Umgebung.\nVerwendet optional Silizium, um Reichweite und Effizienz zu steigern. +block.mend-projector.description = Repariert regelmäßig Blöcke in seiner Umgebung.\nVerwendet optional Phasengewebe, um Reichweite und Effizienz zu steigern. +block.overdrive-projector.description = Erhöht die Geschwindigkeit von nahegelegenen Blöcken. \nVerwendet optional Phasengewebe, um Reichweite und Effizienz zu steigern. +block.force-projector.description = Erzeugt ein sechseckiges Kraftfeld um sich herum, das Blöcke und Einheiten vor Schaden schützt.\nKann überhitzen, wenn es zu viele Schaden aufnimmt. Dies kann durch Kühlung verhindert werden. Phasengewebe vergrößert das Schild. +block.shock-mine.description = Greift Gegner mit Lichtbögen an, wenn sie über sie laufen. +block.conveyor.description = Bewegt Materialien vorwärts. +block.titanium-conveyor.description = Bewegt Materialien vorwärts, aber schneller als ein normales Förderband. +block.plastanium-conveyor.description = Bewegt Materialen in Gruppen.\nNimmt hinten Materialien an und gibt sie vorne in drei Richtungen aus. Erfordert für maximale Effizienz mehrere Ein- und Ausgänge. +block.junction.description = Fungiert als Brücke zwischen zwei kreuzenden Förderbändern. +block.bridge-conveyor.description = Transportiert Materialien über Terrain oder über Blöcke. +block.phase-conveyor.description = Transportiert Materialien sofort über Terrain oder über Blöcke. Höhere Reichweite als Brückenförderbänder, braucht aber Strom. +block.sorter.description = Sortiert Materialien. Wenn ein Gegenstand der Auswahl entspricht, wird er vorne herausgegeben. Andernfalls wird er links oder rechts ausgegeben. +block.inverted-sorter.description = Wie ein normaler Sortierer, aber gibt das ausgewählte Material seitwärts aus. +block.router.description = Verteilt Materialen auf bis zu drei Richtungen. +block.router.details = Ein nötiges Übel. Es is nicht empfehlenswert, ihn neben Fabriken zu setzen, da er sich dort verstopfen kann. +block.distributor.description = Verteilt Materialen auf bis zu sieben Richtungen. +block.overflow-gate.description = Gibt Materialen nur zu den Seiten heraus, wenn der fordere Ausgang blockiert ist. Kann nicht neben anderen Überlauf- oder Unterlauftoren verwendet werden. +block.underflow-gate.description = Das Gegenteil eines Überlauftors. Gibt Materialen nur nach vorne heraus, wenn die Seiten blockiert sind. Kann nicht neben anderen Überlauf- oder Unterlauftoren verwendet werden. +block.mass-driver.description = Ein Transportblock mit sehr hoher Reichweite. Sammelt mehrere Materialien und schießt sie zu einem verbundenen Massenbeschleuniger. +block.mechanical-pump.description = Eine Pumpe, die keinen Strom benötigt. +block.rotary-pump.description = Eine Pumpe, die Strom verbraucht. +block.thermal-pump.description = Eine Pumpe. +block.conduit.description = Transportiert Flüssigkeiten. Wird mit Extraktoren, Pumpen oder anderen Kanälen benutzt. +block.pulse-conduit.description = Transportiert Flüssigkeiten. Transportiert Flüssigkeiten schneller und speichert mehr als ein Leitungsrohr. +block.plated-conduit.description = Transportiert Flüssigkeiten. Nimmt keine Flüssigkeiten von der Seite an.\nHat keine Leks. +block.liquid-router.description = Verteilt Flüssigkeiten auf bis zu drei Richtungen. Speicher außerdem eine kleine Menge an Flüssigkeit. +block.liquid-tank.description = Speichert eine große Menge an Flüssigkeiten. Ähnlich wie ein Flüssigkeitsverteiler. +block.liquid-junction.description = Fungiert als Brücke über zwei kreuzende Kanäle. +block.bridge-conduit.description = Transportiert Flüssigkeiten über Terrain oder über Blöcke. +block.phase-conduit.description = Transportiert Flüssigkeiten sofort über Terrain oder über Blöcke. Höhere Reichweite als Brückenförderbänder, braucht aber Strom. +block.power-node.description = Überträgt Strom zu verbundenen Knoten. Der Knoten erhält Strom von benachbarten Blöcken und gibt ihn auch an diese weiter. +block.power-node-large.description = Ein verbesserter Stromknoten mit einer höheren Reichweite. block.surge-tower.description = Ein extrem weitreichender Netzknoten mit weniger verfügbaren Verbindungen. -block.diode.description = Batteriestrom kann nur in eine Richtung durch diesen Block fließen, aber nur wenn die andere Seite weniger Strom in Batterien hat. +block.diode.description = Batteriestrom bewegt sich in eine Richtung durch diesen Block, aber nur wenn die andere Seite weniger Strom in Batterien hat. block.battery.description = Speichert Strom, solange ein Überschuss besteht, und gibt ihn bei Knappheit ab, solange Kapazität vorhanden ist. -block.battery-large.description = Speichert sehr viel mehr Strom als eine normale Batterie. -block.combustion-generator.description = Generiert Strom, indem Öl oder entzündliche Materialien verbrannt werden. -block.thermal-generator.description = Erzeugt große Mengen Strom aus Lava. -block.steam-generator.description = Effizienter als ein Verbrennungsgenerator, benötigt jedoch zusätzlich Wasser. +block.battery-large.description = Speichert Strom, solange ein Überschuss besteht, und gibt ihn bei Knappheit ab, solange Kapazität vorhanden ist. Speichert mehr Strom als eine normale Batterie. +block.combustion-generator.description = Generiert Strom, indem Kohle oder andere entzündliche Materialien verbrannt werden. +block.thermal-generator.description = Erzeugt an heißen Orten große Mengen Strom. +block.steam-generator.description = Wandelt mit endzündlichen Materialen Wasser zu Wasserdampf um und benutzt diesen dann, um Strom zu generieren. block.differential-generator.description = Erzeugt große Mengen an Energie. Nutzt den Temperaturunterschied zwischen Kryofluid und brennendem Pyratit. -block.rtg-generator.description = Ein Radioisotopengenerator, der keine Kühlung benötigt, aber weniger Strom als ein Thorium-Reaktor liefert. +block.rtg-generator.description = Ein Radioisotopengenerator, der aus radioaktivem Zerfall Energie herstellt. block.solar-panel.description = Erzeugt kleine Mengen an Strom aus Sonnenenergie. -block.solar-panel-large.description = Erzeugt viel mehr Strom als ein normales Solar Panel, ist aber auch sehr viel teurer in der Anschaffung. -block.thorium-reactor.description = Erzeugt riesige Mengen Strom aus radioaktivem Thorium. Benötigt konstante Kühlung. Explodiert verheerend, wenn unzureichende Mengen an Kühlung vorhanden sind. -block.impact-reactor.description = Ein fortschrittlicher Generator, der in der Lage ist, bei höchster Effizienz enorme Mengen an Leistung zu erzeugen. Erfordert eine erhebliche Leistungsaufnahme, um den Prozess zu starten. -block.mechanical-drill.description = Ein günstiger Bohrer. Wenn er auf passende Kacheln gesetzt wird, baut er unbegrenzt Erze des entsprechenden Typs mit geringer Geschwindigkeit ab. +block.solar-panel-large.description = Erzeugt kleine Mengen an Strom aus Sonnenenergie. Effizienter als eine normale Solarzelle. +block.thorium-reactor.description = Erzeugt riesige Mengen Strom aus Thorium. Benötigt konstante Kühlung. Explodiert gewaltsam, wenn unzureichende Kühlung vorhanden ist. +block.impact-reactor.description = Ein Generator, der bei höchster Effizienz enorme Mengen an Leistung erzeugen kann. Erfordert eine erhebliche Leistungsaufnahme, um den Prozess zu starten. +block.mechanical-drill.description = Ein günstiger Bohrer. Wenn er auf Erz gesetzt wird, baut er unbegrenzt das Erz mit geringer Geschwindigkeit ab. Kann nur einfach Ressourcen abbauen. block.pneumatic-drill.description = Ein verbesserter Bohrer, der schneller ist und in der Lage ist, härtere Erze abzubauen, indem er von Luftdruck gebrauch macht. block.laser-drill.description = Erlaubt es, durch Lasertechnologie noch schneller zu bohren, benötigt aber Strom. Erlaubt zusätzlich das Abbauen von radioaktivem Thorium. block.blast-drill.description = Der ultimative Bohrer. Benötigt große Mengen an Strom. block.water-extractor.description = Extrahiert Wasser aus dem Boden. Verwende ihn, wenn es keinen See in der Nähe gibt. -block.cultivator.description = Kultiviert den Boden mit Wasser, um Biomasse zu erzeugen. -block.oil-extractor.description = Verwendet große Mengen an Strom, um Öl aus Sand zu extrahieren. Verwende ihn, wenn es keine direkte Ölquelle gibt. -block.core-shard.description = Die erste Version der Kernkapsel. Einmal zerstört, ist jeglicher Kontakt zur Region verloren. Lass das nicht zu. -block.core-foundation.description = Die zweite Version des Kerns. Besser gepanzert. Speichert mehr Ressourcen. -block.core-nucleus.description = Die dritte und letzte Version der Kernkapsel. Sehr gut gepanzert. Speichert enorme Mengen an Ressourcen. -block.vault.description = Speichert eine große Menge an Materialien pro Typ. Ein[lightgray] Entlader[] kann verwendet werden, um Materialien auszuladen. +block.cultivator.description = Kultiviert winzige Mengen atmosphärischer Mikrosporen in Sporen. +block.cultivator.details = Zurückgewonnene Technologie. Wird benutzt, um große Mengen Biomasse so effizient wie möglich herzustellen. Wahrscheinlich der ehemaliger Inkbator der Sporen, die Serpulo heute bedecken. +block.oil-extractor.description = Verwendet große Mengen an Strom, Sand und Wasser um Öl zu extrahieren. +block.core-shard.description = Kern der Basis. Einmal zerstört, ist jeglicher Kontakt zum Sektor verloren. +block.core-shard.details = The erste Version. Kompakt. Selbstduplizierend. Mit Einwmalraketen ausgestattet. Nicht für Interplanetarische Reisen geeignet. +block.core-foundation.description = Kern der Basis. Besser gepanzert. Speichert mehr Ressourcen. +block.core-foundation.details = Die zeite Version. +block.core-nucleus.description = Kern der Basis. Sehr gut gepanzert. Speichert enorme Mengen an Ressourcen. +block.core-nucleus.details = Die dritte und letzte Version. +block.vault.description = Speichert eine große Menge an Materialien pro Typ. Ein[lightgray] Entlader[] kann verwendet werden, um Materialien auszuladen. block.container.description = Speichert eine kleine Menge an Materialien pro Typ. Ein[lightgray] Entlader[] kann verwendet werden, um Materialien auszuladen. -block.unloader.description = Entlädt Materialien aus einem Container, Tresor oder einer Basis auf ein Förderband oder direkt in einen benachbarten Block. Der Typ des auszuladenden Materials kann durch darauf tippen verändert werden. -block.launch-pad.description = Startet Stapel von Items, ohne dass ein Kernstart erforderlich ist. Unvollendet. -block.launch-pad-large.description = Eine verbesserte Version des Launchpads. Speichert weitere Items. Wird häufiger gestartet. -block.duo.description = Ein kleiner, günstiger Geschützturm. -block.scatter.description = Ein mittelgroßer Anti-Luft-Turm. Sprüht Blei- oder Schrottklumpen auf feindliche Einheiten. +block.unloader.description = Entlädt Materialien aus einem Block. +block.launch-pad.description = Startet Materialen in andere Sektoren. +block.duo.description = Schießt auf Gegner. +block.scatter.description = Ein mittelgroßer Anti-Luft-Turm. Sprüht Blei- oder Schrottklumpen auf feindliche Lufteinheiten. block.scorch.description = Verbrennt alle Bodenfeinde in der Nähe. Hochwirksam im Nahbereich. -block.hail.description = Ein kleiner Artillerie-Geschützturm. -block.wave.description = Ein mittelgroßer Geschützturm, der flüssige Kugeln verschießt. -block.lancer.description = Ein mittelgroßer Geschützturm, der sich auflädt und Elektrizitätsstrahlen verschießt. -block.arc.description = Ein kleiner Geschützturm, der Lichtbögen in Richtung des Gegners schießt. -block.swarmer.description = Ein mittelgroßer Geschützturm, der Raketenschwärme abfeuert. -block.salvo.description = Ein mittelgroßer Geschützturm, der Schüsse in Salven abfeuert. -block.fuse.description = Ein großer Geschützturm, der starke Strahlen mit kurzer Reichweite abfeuert. -block.ripple.description = Ein großer Artillerie-Geschützturm, der mehrere Schüsse gleichzeitig abfeuert. -block.cyclone.description = Ein großer Schnellfeuer-Geschützturm. -block.spectre.description = Ein großer Geschützturm, der zwei starke Schüsse gleichzeitig abfeuert. -block.meltdown.description = Ein großer Geschützturm, der starke Strahlen mit großer Reichweite abfeuert. +block.hail.description = Schießt kleine Geschosse auf weit entfernte Gegner. +block.wave.description = Schießt Flüssigkeiten auf Gegner. Löscht Feuer automatisch, wenn Wasser aks Munition verwendet wird. +block.lancer.description = Läd sich auf und schießt kräftige Laserstrahlen auf Feinde. +block.arc.description = Schießt Lichtbögen in Richtung des Gegners. +block.swarmer.description = Schießt zielsuchende Raketenschwärme ab. +block.salvo.description = Schießt Schüsse in Salven ab. +block.fuse.description = Schießt drei starke Strahlen mit kurzer Reichweite ab. +block.ripple.description = Schießt mehrere Schüsse gleichzeitig auf weit entfernte Gegner. +block.cyclone.description = Schießt explodierende Geschosse auf Gegner. +block.spectre.description = Schießt große, panzerbrechende Kugeln auf Luft- und Bodenziele. +block.meltdown.description = Läd sich auf und schießt einen starken, durchgängigen Laser auf Gegner. Braucht Kühlung. +block.foreshadow.description = Schießt einen eingizen Schuss mit einem einzigen Ziel über eine erstaunlich große Distanz. block.repair-point.description = Heilt durchgehend die nächste befreundete, beschädigte Einheit in der Umgebung. block.segment.description = Beschädigt und zerstört gegnerische Projektile. Laser werden nicht anvisiert. +block.parallax.description = Benutzt einen Traktorstrahl, um Gegner heranzuziehen und sie dabei anzugreifen. +block.tsunami.description = Schießt mit einem kräftgem Strahl aus Flüssigkeit auf Gegner. Löscht Feuer automatisch, wenn Wasser aks Munition verwendet wird. +block.silicon-crucible.description = Benutzt Pyratit als Hitzequelle, um aus Sand und Kohle Silizium herzustellen. Die Effizienz wird an heißen Orten erhöht. +block.disassembler.description = Trennt Schlacke in winzige Mengen exotischer Mineralien, verliert dafür aber an Effizienz. Kann Thorium herstellen. +block.overdrive-dome.description = Erhöht die Geschwindigkeit von nahegelegenen Blöcken. \nBenötigt Phasengewebe und Silizium. +block.payload-conveyor.description = Bewegt größere Objeke, zum Beispiel Einheiten. +block.payload-router.description = Verteilt Einheiten auf bis zu drei Richtungen. +block.command-center.description = Steuert Einheiten mit verschiedenen Befehlen. +block.ground-factory.description = Stellt Bodeneinheiten her. Einheiten können einfach so verwendet oder in einem Rekonstrukteur verbessert werden. +block.air-factory.description = Stellt Lufteinheiten her. Einheiten können einfach so verwendet oder in einem Rekonstrukteur verbessert werden. +block.naval-factory.description = Stellt Wassereinheiten her. Einheiten können einfach so verwendet oder in einem Rekonstrukteur verbessert werden. +block.additive-reconstructor.description = Verbessert Einheiten auf die zweite Stufe. +block.multiplicative-reconstructor.description = Verbessert Einheiten auf die dritte Stufe. +block.exponential-reconstructor.description = Verbessert Einheiten auf die vierte Stufe. +block.tetrative-reconstructor.description = Verbessert Einheiten auf die fünfte und letzte Stufe. +block.switch.description = Ein einfacher Schalter. Sein Status kann mit einem Prozessor abgelesen und verändert werden. +block.micro-processor.description = Führt eine Reihe von Logikbefehlen in einer Schleife aus. Kann Einheiten und Blöcke steuern. +block.logic-processor.description = Führt eine Reihe von Logikbefehlen in einer Schleife aus. Kann Einheiten und Blöcke steuern. Schneller als der Mikroprozessor. +block.hyper-processor.description = Führt eine Reihe von Logikbefehlen in einer Schleife aus. Kann Einheiten und Blöcke steuern. Schneller als der Logikprozessor. +block.memory-cell.description = Speichert Informationen für einen Prozessor. +block.memory-bank.description = Speichert Informationen für einen Prozessor. Hohe Kapazität. +block.logic-display.description = Zeigt mithilfe eines Prozessors Beliebiges an. +block.large-logic-display.description = Zeigt mithilfe eines Prozessors Beliebiges an. +block.interplanetary-accelerator.description = Ein riesen Railgun-Turm, der mithilfe des Elektromagnetismuses Kerne auf die nötige Geschwindigkeit bringt, um interplanetarisches Reisen zu ermöglichen. + +unit.dagger.description = Fires standard bullets at all nearby enemies. +unit.mace.description = Fires streams of flame at all nearby enemies. +unit.fortress.description = Fires long-range artillery at ground targets. +unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies. +unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies. +unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight. +unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight. +unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded. +unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repair allied structures. Capable of flight. +unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain. +unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion. +unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain. +unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. +unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. +unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain. +unit.flare.description = Fires standard bullets at nearby ground targets. +unit.horizon.description = Drops clusters of bombs on ground targets. +unit.zenith.description = Fires salvos of missiles at all nearby enemies. +unit.antumbra.description = Fires a barrage of bullets at all nearby enemies. +unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies. +unit.mono.description = Automatically mines copper and lead, depositing it into the core. +unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction. +unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units. +unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units. +unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units. +unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies. +unit.minke.description = Fires shells and standard bullets at nearby ground targets. +unit.bryde.description = Fires long-range artillery shells and missiles at enemies. +unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies. +unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units. +unit.alpha.description = Defends the Shard core from enemies. Builds structures. +unit.beta.description = Defends the Foundation core from enemies. Builds structures. +unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. \ No newline at end of file From 525643cb17d6e654d61bb909c5c3f6b16ccd14c1 Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Fri, 27 Nov 2020 23:10:58 +0100 Subject: [PATCH 059/123] unit descriptions --- core/assets/bundles/bundle_de.properties | 66 ++++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 10c4cdd183..9c318fda37 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1451,36 +1451,36 @@ block.logic-display.description = Zeigt mithilfe eines Prozessors Beliebiges an. block.large-logic-display.description = Zeigt mithilfe eines Prozessors Beliebiges an. block.interplanetary-accelerator.description = Ein riesen Railgun-Turm, der mithilfe des Elektromagnetismuses Kerne auf die nötige Geschwindigkeit bringt, um interplanetarisches Reisen zu ermöglichen. -unit.dagger.description = Fires standard bullets at all nearby enemies. -unit.mace.description = Fires streams of flame at all nearby enemies. -unit.fortress.description = Fires long-range artillery at ground targets. -unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies. -unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies. -unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight. -unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight. -unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded. -unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repair allied structures. Capable of flight. -unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain. -unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion. -unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain. -unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. -unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. -unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain. -unit.flare.description = Fires standard bullets at nearby ground targets. -unit.horizon.description = Drops clusters of bombs on ground targets. -unit.zenith.description = Fires salvos of missiles at all nearby enemies. -unit.antumbra.description = Fires a barrage of bullets at all nearby enemies. -unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies. -unit.mono.description = Automatically mines copper and lead, depositing it into the core. -unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction. -unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units. -unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units. -unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units. -unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies. -unit.minke.description = Fires shells and standard bullets at nearby ground targets. -unit.bryde.description = Fires long-range artillery shells and missiles at enemies. -unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies. -unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units. -unit.alpha.description = Defends the Shard core from enemies. Builds structures. -unit.beta.description = Defends the Foundation core from enemies. Builds structures. -unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. \ No newline at end of file +unit.dagger.description = Schießt normale Kugeln auf alle Feinde in der Nähe. +unit.mace.description = Schießt Feuer auf alle Gegner in der Nähe. +unit.fortress.description = Fires long-range artillery at ground targets. Schießt Langstreckengeschosse auf Ziele am Boden. +unit.scepter.description = Feuert ein Sperrfeuer geladener Kugeln auf Feinde in der Nähe ab. +unit.reign.description = Feuert ein Sperrfeuer riesiger Geschosse mit sehr hoher Durchstechkraft auf alle Feinde in der Nähe. +unit.nova.description = Schießt kleine Laser, die Gegnern schaden und eigene Blöcke heilen. Kann boosten. +unit.pulsar.description = Schießt Lichtbögen, die Gegnern schaden und eigene Blöcke heilen. Kann boosten. +unit.quasar.description = Schießt durchdringende Laserstrahlen, die Gegnern schaden und eigene Blöcke heilen. Kann boosten. Hat ein Schutzschild. +unit.vela.description = Schießt einen riesigen, konstanten Laserstrahl, der Gegnern schadet, Feuer verursacht und eigene Blöcke heilt. Kann boosten. +unit.corvus.description = Schießt einen riesigen, konstanten Laserstrahl, der Gegnern schadet und eigene Blöcke heilt. Kann über Vieles drüberlaufen. +unit.crawler.description = Rennt auf Gegner zu und zerstört sich dann selbst, um eine Explosion zu verursachen. +unit.atrax.description = Schießt lähmende Schlackekugeln auf Gegner auf dem Boden. Kann über Vieles drüberlaufen. +unit.spiroct.description = Schießt die Gegner mit Lasern ab, die dem Gegner schaden und den Spirokt heilen. Kann über Vieles drüberlaufen. +unit.arkyid.description = Schießt die Gegner mit Lasern ab, die dem Gegner schaden und den Arkyid heilen. Kann über Vieles drüberlaufen. +unit.toxopid.description = Schießt große energiegeladene Cluster-Geschosse und durchdringende Laser auf Feinde. Kann über Vieles drüberlaufen. +unit.flare.description = Schießt normale Kugeln auf Ziele am Boden. +unit.horizon.description = Wirft Bomben auf Ziele am Boden. +unit.zenith.description = Schießt alle Gegner in der Nähe mit Salven von Raketen ab. +unit.antumbra.description = Schießt ein Sperrfeuer auf Gegner in der Nähe. +unit.eclipse.description = Feuert zwei durchdringende Laser und einen Flaksperrfeuer auf alle Feinde in der Nähe. +unit.mono.description = Baut Automatisch Blei und Kupfer ab. Dieses wird in den Kern gebracht. +unit.poly.description = Baut zerstörte Blöcke wieder auf und hilft anderen Einheiten beim Bauen. +unit.mega.description = Heilt automatisch beschädigte Blöcke. Kann kleine Blöcke oder Bodeneinheiten tragen. +unit.quad.description = Wirft große Bomben auf Bodenziele ab, welche Gegnern schaden und eingene Blöcke heilen. Kann Bodeneinheiten tragen. +unit.oct.description = Schützt mithilfe eines regenerierenden Schildes andere Einheiten. Kann die meisten Bodeneinheiten tragen. +unit.risso.description = Schießt ein Sperrfeuer aus Raketen und Kugeln auf alle Gegner in der Nähe. +unit.minke.description = Schießt Geschosse und Kugeln auf Feinde. +unit.bryde.description = Schießt Artilleriegeschosse und Raketen mit großer Reichweite auf alle Gegner in der Nähe. +unit.sei.description = Schießt ein Sperrfeuer aus Raketen und durchdringende Geschosse auf Gegner. +unit.omura.description = Schießt eine Railgun mit hoher Reichweite, um Gegner zu zerstören. Stellt Flare-Einheiten her. +unit.alpha.description = Beschützt den Scherbenkern vor Feinden. Baut Blöcke. +unit.beta.description = Beschützt den Fundamentkern vor Feinden. Baut Blöcke. +unit.gamma.description = Beschützt den Nukleuskern vor Feinden. Baut Blöcke. \ No newline at end of file From 6634e6f8a58db786f8ccdfa81a0f550cbe77a48a Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Fri, 27 Nov 2020 23:19:56 +0100 Subject: [PATCH 060/123] ... I think that it would be fair to add me into the list of translators and contributors as I've somehow editied over 800 lines of the german translation. If you don't think I should be added to the list, say that in a comment. --- core/assets/contributors | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/contributors b/core/assets/contributors index cb64660dae..880776a1ec 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -102,3 +102,4 @@ newlocknew (freesound.org) dsmolenaers (freesound.org) Headphaze (freesound.org) VolasYouKnow +Catchears From 2c0884ed46850520a10a870837dc07150bad20d2 Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Sat, 28 Nov 2020 11:21:46 +0200 Subject: [PATCH 061/123] Fixes --- core/assets/bundles/bundle_ro.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 1d4a4815ac..918bd52ada 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -597,7 +597,7 @@ sector.tarFields.description = O zonă aflată la periferia unui complex de prod sector.desolateRift.description = O zonă extrem de periculoasă. Multe resurse, dar puțin spațiu. Mare risc de distrugere. Pleacă curând, cât mai curând. Nu te lăsa păcălit de pauzele mari dintre atacurile inamice. sector.nuclearComplex.description = O fostă facilitate pt producerea și procesarea de toriu, redusă la ruine.\n[lightgray]Cercetează toriul și multele sale utilizări.\n\nInamicul e prezent aici în mari numere, căutând constant atacatori. sector.fungalPass.description = O zonă de tranziție dintre munții înalți și zonele joase, pline cu spori. O mică bază de recunoaștere a inamicului este localizată aici.\nDistruge-o.\nFolosește unități Dagger și Crawler. Distruge cele 2 nuclee. -sector.biomassFacility.description = The origin of spores. This is the facility in which they were researched and initially produced.\nResearch the technology contained within. Cultivate spores for the production of fuel and plastics.\n\n[lightgray]Upon this facility's demise, the spores were released. Nothing in the local ecosystem could compete with such an invasive organism. +sector.biomassFacility.description = Originea sporilor. Aceasta este facilitatea în care au fost cercetați și produși inițial.\nCercetează tehnologia ce poate fi găsită aici. Cultivă spori pt producția de combustibil și mase plastice.\n\n[lightgray]Când facilitatea a decăzut, sporii au fost eliberați. Nimic din din ecosistemul local nu a putut concura cu un organism atât de invaziv. sector.windsweptIslands.description = Acest arhipelag izolat se află mai departe, după țărm. Datele arată că odată aveau structuri care produceau [accent]Plastaniu[].\n\nApără-te de unitățile navale ale inamicului. Construiește o bază pe insule. Cercetează fabricile necesare. sector.extractionOutpost.description = Un avanpost izolat, construit de inamic cu scopul de a lansa resurse către alte sectoare.\n\nTehnologia de transport intersectorial este esențială pt cuceririle ce urmează. Distruge baza. Cercetează platformele lor de lansare. sector.impact0078.description = Aici se află rămășițele primei nave de transport interstelar care a intrat în acest sistem stelar.\n\nSalvează cât mai mult posibil din epavă. Cercetează orice tehnologie intactă. @@ -1292,15 +1292,15 @@ item.coal.details = Pare să fie materie vegetală fosilizată, formată cu mult item.titanium.description = Folosit pt structuri transportatoare de lichid, burghie și aeronautică. item.thorium.description = Folosit în structuri durabile și combustibil nuclear. item.scrap.description = Folosit in topitoare și pulverizatoare pt a fi rafinat în alte materiale. -item.scrap.details = Rămășițe ale structurilor și unităților vechi.. +item.scrap.details = Rămășițe ale structurilor și unităților vechi. item.silicon.description = Folosit în producerea energiei solare, electronice complexe și muniție cu radar pt armament. item.plastanium.description = Folosit pt unitățile militare avansate, ca izolator electric și muniție fragilă. item.phase-fabric.description = Folosită în electronica avansată și tehnologia de autoreparare. -item.surge-alloy.description = Folosit în electronica avansată și structuri defensive reactive. +item.surge-alloy.description = Folosit în electronica avansată și structurile defensive reactive. item.spore-pod.description = Folosită pt a fi convertită în petrol, explozibili și combustibil. item.spore-pod.details = Spori. Probabil o formă de viață sintetică. Emite gaze toxice altor forme de viață biologică. Nu că ar mai fi rămas prea multe aici. item.blast-compound.description = Folosit în bombe și muniție explozibilă. -item.pyratite.description = Folosită în armele incendiare și generatoare pe bază de procese de combustie. +item.pyratite.description = Folosită în armele incendiare și generatoarele pe bază de procese de combustie. liquid.water.description = Folosită pt răcirea mașinăriilor și procesarea deșeurilor. liquid.slag.description = Rafinată în separatoare înapoi în materialele constituente, sau pulverizată înspre unitățile inamice ca armă. From 1d8fbf7aa9d3b02e93a0bd3bca2f5c5da706dd2a Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Sat, 28 Nov 2020 10:50:35 +0100 Subject: [PATCH 062/123] final changes --- core/assets/bundles/bundle_de.properties | 31 ++++++++++++------------ 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 9c318fda37..7669a16dda 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -491,7 +491,7 @@ editor = Editor mapeditor = Karteneditor abandon = Aufgeben -abandon.text = Diese Zone sowie alle Ressourcen werden dem Gegner überlassen. +abandon.text = Dieser Sektor sowie alle Ressourcen werden dem Gegner überlassen. locked = Gesperrt complete = [lightgray]Abschließen: requirement.wave = Erreiche Welle {0} in {1} @@ -503,8 +503,9 @@ launch.text = Start research.multiplayer = Nur der Host kann forschen. map.multiplayer = Nur der Host kann Sektoren ansehen. uncover = Freischalten -configure = Startitems festlegen -loadout = Startitems +configure = Anfangsressourcen festlegen + +loadout = Anfangsressourcen resources = Ressourcen bannedblocks = Gesperrte Blöcke addall = Alle hinzufügen @@ -585,21 +586,21 @@ sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost sector.planetaryTerminal.name = Planetary Launch Terminal -sector.groundZero.description = Der optimale Ort um anzufangen. Schwache Gegner und weniger Ressourcen.\nSammele so viel Kupfer und Blei wie möglich.\nZieh weiter. +sector.groundZero.description = Der optimale Ort um anzufangen. Schwache Gegner und weniger Ressourcen.\nSammele so viel Kupfer und Blei wie möglich.\nGeh weiter. sector.frozenForest.description = Auch hier, näher an den Bergen, sind die Sporen. Sogar die niedrigen Temperaturen können sie nicht zurückhalten.\n\nLerne, Strom zu verwenden. Baue Verbrennungsgeneratoren und Reparateure. sector.saltFlats.description = Du befindest dich in der Nähe der Wüste. Hier gibt es nur wenige Ressourcen.\n\nDer Gegner hat hier ein Lager aufgestellt. Zerstöre es. Lasse nichts stehen. sector.craters.description = Wasser hat sich hier, in diesem Überbleibsel aus dem alten Krieg, versammelt. Sammele Sand. Stelle Metaglas her. Benutze Wasser, um Bohrer und Geschütze zu kühlen. -sector.ruinousShores.description = Hinter der Wüste ist das Ufer. Es gab hier vor langer Zeit ein Uferabwehrsystem. Heute sind nur noch die einfachsten Abwehrgeschützen vorhanden, der Rest wurde verschrottet.\nBreite dich weiter aus. Finde die verlorenen Technologien wieder. -sector.stainedMountains.description = Im Landesinneren sind die Berge, noch unversehrt von den Sporen.\nNutze das reichliche vorhandene Titan. Lerne, es zu benutzen.\n\nDie Gegner hier sind stärker. Gib den Gegnern keine Zeit, um ihre stärksten Einheiten zu schicken. -sector.overgrowth.description = Dieser Bereich ist überwuchert, näher an die Quelle der Sporen.\nDer Gegner hat hier einen Außenposten errichtet. Baue Mace-Einheiten. Zerstöre es. +sector.ruinousShores.description = Hinter der Wüste ist das Ufer. Es gab hier vor langer Zeit ein Uferabwehrsystem. Heute sind nur noch die einfachsten Abwehrgeschütze vorhanden, der Rest wurde verschrottet.\nBreite dich weiter aus. Finde die verlorenen Technologien wieder. +sector.stainedMountains.description = Im Landesinneren sind die Berge, noch unversehrt von den Sporen.\nNutze das reichliche vorhandene Titan und lerne, es zu benutzen.\n\nDie Gegner hier sind stärker. Gib ihnen keine Zeit, um ihre stärksten Einheiten zu schicken. +sector.overgrowth.description = Dieser Bereich ist überwuchert, näher an die Quelle der Sporen.\nDer Gegner hat hier einen Außenposten errichtet. Baue Mace-Einheiten. Zerstöre ihn. sector.tarFields.description = Der Rand einer Ölproduktionszone, swischen den Bergen und der Wüste. Einer der wenigen Orte mit brauchbaren Ölquellen.\nObwohl er vergessen wurde, hat dieser Ort mächtige Gegnerische Lager in der Nähe. Unterschätze sie nicht.\n\n[lightgray]Erforsche, falls mögloch, die Ölverarbeitung. -sector.desolateRift.description = Eine besonders gefährliche Zone. Viele Ressourcen aber wenig Platz. Hohe Wahrscheinlichkeit, vernichtet zu werden. Verlasse diesen Ort so bald wie möglich. Lass dich nicht durch die langen Abstände zwischen gegnerische Angriffe täuschen. +sector.desolateRift.description = Eine besonders gefährliche Zone. Viele Ressourcen aber wenig Platz. Hohe Wahrscheinlichkeit, vernichtet zu werden. Verlasse diesen Ort so bald wie möglich. Lass dich nicht durch die langen Abstände zwischen gegnerischen Angriffen täuschen. sector.nuclearComplex.description = Diese Ruine war vor langer Zeit eine Anlage zur Verarbeitung von Thorium.\n[lightgray]Erforsche Thorium und dessen Anwendungen.\n\nDer Gegner ist hier stark vertreten, auf der Suche nach Angreifern. sector.fungalPass.description = Eine Übergangszone zwischen den Bergen und den niedrigeren, Sporen-Infestierten Gebieten. Hier ist eine kleine gegnerische Basis.\nZerstöre sie.\nBenutze Dagger- und Crawler-Einheiten. Vernichte die beiden Kerne. sector.biomassFacility.description = Die Sporenquelle. Dies ist der Ort, wo sie erforscht und hergestellt wurden.\nErforsche die Technologie, die sich hier versteckt. Stellen Sporen her, um Plastanium und Öl herzustellen.\n\n[lightgray]Als diese Anlage zerstört wurde, wurden die Sporen freigesetzt. Nichts im lokalen Ökosystem konnte so ein eindringliches Lebenwesen bekämpfen. -sector.windsweptIslands.description = Diese Inseln befinden sich in der Nähe vom Ufer. Manche Aufzeichnungen behaupten, hier seinen Fabriken, die [accent]Plastanium[] herstellen können.\n\nWehre dich gegen die gegnerischen Wassereinheiten. Stelle eine Basis auf den Inseln auf. Erforsche diese Fabriken. -sector.extractionOutpost.description = Ein Außenposten, vom Gegner erstellt, um Ressourcen in andere Sektoren zu transportieren.\n\nTrans-Sektorischer Transport ist nötig, um weiter voranzuschreiten. Zerstöre den Posten. Erforsche deren Launchpads. -sector.impact0078.description = Here liegen Reste der interplanetarischen Transporteinheit die dieses Sonnensystem zuerst betreten hat.\n\nRette so viel wie möglich von den Ruinen. Erforsche jede intakte Technologie. +sector.windsweptIslands.description = Diese Inseln befinden sich in der Nähe vom Ufer. Manche Aufzeichnungen behaupten, hier seien Fabriken, die [accent]Plastanium[] herstellen können.\n\nWehre dich gegen die gegnerischen Wassereinheiten. Stelle eine Basis auf den Inseln auf. Erforsche diese Fabriken. +sector.extractionOutpost.description = Ein Außenposten, der vom Gegner erstellt wurde, um Ressourcen in andere Sektoren zu transportieren.\n\nTrans-Sektorischer Transport ist nötig, um weiter voranzuschreiten. Zerstöre den Posten. Erforsche deren Launchpads. +sector.impact0078.description = Here liegen Reste der interplanetarischen Transporteinheit, die dieses Sonnensystem zuerst betreten hat.\n\nRette so viel wie möglich von den Ruinen. Erforsche jede intakte Technologie. sector.planetaryTerminal.description = Das Endziel.\n\nDiese Uferbasis besitzt ein Gerät, mit dem es möglich ist, Kerne auf andere Planeten zu schicken. Es ist [accent]sehr[] gut beschützt.\n\nStelle Wassereinheiten her. Eliminiere den Gegner so schnell wie möglich. Erforsche das Launchgerät. settings.language = Sprache settings.data = Spieldaten @@ -1322,7 +1323,7 @@ block.blast-mixer.description = Stellt aus Sporen und Pyratit eine explosive Mis block.pyratite-mixer.description = Vermischt Kohle, Blei und Sand zu hochentzündlichem Pyratit. block.melter.description = Erhitzt Schrott um Schlacke zu erhalten. block.separator.description = Trennt Schlacke in seine Bestandteile. -block.spore-press.description = Komprimiert Sporen zu Öl. +block.spore-press.description = Komprimiert Sporen-Pods zu Öl. block.pulverizer.description = Zertrümmert Schrott zu Sand. block.coal-centrifuge.description = Verfestigt Öl zu Kohlenstücken. block.incinerator.description = Vernichtet beliebige überschüssige Materialien oder Flüssigkeiten. @@ -1396,7 +1397,7 @@ block.pneumatic-drill.description = Ein verbesserter Bohrer, der schneller ist u block.laser-drill.description = Erlaubt es, durch Lasertechnologie noch schneller zu bohren, benötigt aber Strom. Erlaubt zusätzlich das Abbauen von radioaktivem Thorium. block.blast-drill.description = Der ultimative Bohrer. Benötigt große Mengen an Strom. block.water-extractor.description = Extrahiert Wasser aus dem Boden. Verwende ihn, wenn es keinen See in der Nähe gibt. -block.cultivator.description = Kultiviert winzige Mengen atmosphärischer Mikrosporen in Sporen. +block.cultivator.description = Kultiviert winzige Mengen atmosphärischer Mikrosporen in Sporen-Pods. block.cultivator.details = Zurückgewonnene Technologie. Wird benutzt, um große Mengen Biomasse so effizient wie möglich herzustellen. Wahrscheinlich der ehemaliger Inkbator der Sporen, die Serpulo heute bedecken. block.oil-extractor.description = Verwendet große Mengen an Strom, Sand und Wasser um Öl zu extrahieren. block.core-shard.description = Kern der Basis. Einmal zerstört, ist jeglicher Kontakt zum Sektor verloren. @@ -1453,7 +1454,7 @@ block.interplanetary-accelerator.description = Ein riesen Railgun-Turm, der mith unit.dagger.description = Schießt normale Kugeln auf alle Feinde in der Nähe. unit.mace.description = Schießt Feuer auf alle Gegner in der Nähe. -unit.fortress.description = Fires long-range artillery at ground targets. Schießt Langstreckengeschosse auf Ziele am Boden. +unit.fortress.description = Schießt Langstreckengeschosse auf Ziele am Boden. unit.scepter.description = Feuert ein Sperrfeuer geladener Kugeln auf Feinde in der Nähe ab. unit.reign.description = Feuert ein Sperrfeuer riesiger Geschosse mit sehr hoher Durchstechkraft auf alle Feinde in der Nähe. unit.nova.description = Schießt kleine Laser, die Gegnern schaden und eigene Blöcke heilen. Kann boosten. @@ -1483,4 +1484,4 @@ unit.sei.description = Schießt ein Sperrfeuer aus Raketen und durchdringende Ge unit.omura.description = Schießt eine Railgun mit hoher Reichweite, um Gegner zu zerstören. Stellt Flare-Einheiten her. unit.alpha.description = Beschützt den Scherbenkern vor Feinden. Baut Blöcke. unit.beta.description = Beschützt den Fundamentkern vor Feinden. Baut Blöcke. -unit.gamma.description = Beschützt den Nukleuskern vor Feinden. Baut Blöcke. \ No newline at end of file +unit.gamma.description = Beschützt den Nukleuskern vor Feinden. Baut Blöcke. From 2d66790aab400aef23118bcc4f2ba2c7311fb051 Mon Sep 17 00:00:00 2001 From: Nikolass1000 <68129216+Nikolass1000@users.noreply.github.com> Date: Sat, 28 Nov 2020 12:18:13 +0100 Subject: [PATCH 063/123] Complete --- core/assets/bundles/bundle_pl.properties | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 483d3f37aa..65f26e9b78 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -691,6 +691,7 @@ bar.input = Wejście bar.output = Wyjście units.processorcontrol = [lightgray]Kontrolowany Procesorem + bullet.damage = [stat]{0}[lightgray] Obrażenia bullet.splashdamage = [stat]{0}[lightgray] Obrażenia obszarowe ~[stat] {1}[lightgray] kratki bullet.incendiary = [stat]zapalający @@ -982,21 +983,21 @@ block.grass.name = Trawa block.slag.name = Żużel block.space.name = Space block.salt.name = Sól -block.salt-wall.name = Salt Wall +block.salt-wall.name = Solna Ściana block.pebbles.name = Kamyki block.tendrils.name = Wić -block.sand-wall.name = Sand Wall +block.sand-wall.name = Piaskowa Ściana block.spore-pine.name = Sosna Zarodnikowa -block.spore-wall.name = Spore Wall -block.boulder.name = Boulder -block.snow-boulder.name = Snow Boulder +block.spore-wall.name = Zarodinkowa Ściana +block.boulder.name = Głaz +block.snow-boulder.name = Śnieżny Głaz block.snow-pine.name = Sosna śniegowa block.shale.name = Łupek block.shale-boulder.name = Głaz Łupkowy block.moss.name = Mech block.shrubs.name = Krzewy block.spore-moss.name = Mech Zarodnikowy -block.shale-wall.name = Shale Wall +block.shale-wall.name = Ściana Z Łupku block.scrap-wall.name = Ściana ze Złomu block.scrap-wall-large.name = Duża Ściana ze Złomu block.scrap-wall-huge.name = Ogromna Ściana ze Złomu From 47922834f98481fefa437a8483956dae3722c0a1 Mon Sep 17 00:00:00 2001 From: Leonid Skorospelov Date: Sat, 28 Nov 2020 14:16:30 +0200 Subject: [PATCH 064/123] Update servers_v6.json Ranked 1v1 gradually moving to v6 --- servers_v6.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index c627e00001..88d00336cd 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -15,6 +15,10 @@ "name": "Chaotic Neutral", "address": ["Chaotic-Neutral.ddns.net:5555", "Chaotic-Neutral.ddns.net:6666"] }, + { + "name": "Ranked", + "address": ["mindustryranked.ddns.net:16567"] + }, { "address": "cheginde.ddns.net" } From 7a81fde64e84c8d42c9352c5c73f32bad57912bd Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Sat, 28 Nov 2020 14:36:55 +0100 Subject: [PATCH 065/123] changes from Shawak --- core/assets/bundles/bundle_de.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 7669a16dda..39607de879 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -280,7 +280,7 @@ openlink = Link öffnen copylink = Link kopieren back = Zurück crash.export = Crash-Logs exportieren -crash.none = Jeine Crash-Logs gefunden. +crash.none = Keine Crash-Logs gefunden. crash.exported = Crash-Logs wurden erfolgreich exportiert. data.export = Daten exportieren data.import = Daten importieren @@ -1179,9 +1179,9 @@ block.repair-point.name = Reparaturpunkt block.pulse-conduit.name = Impulskanal block.plated-conduit.name = Gepanzerter Kanal block.phase-conduit.name = Phasenkanal -block.liquid-router.name = Flüssigkeitsverteiler +block.liquid-router.name = Flüssigkeits-Verteiler block.liquid-tank.name = Flüssigkeitstank -block.liquid-junction.name = Flüssigkeitskreuzung +block.liquid-junction.name = Flüssigkeits-Kreuzung block.bridge-conduit.name = Kanalbrücke block.rotary-pump.name = Rotierende Pumpe block.thorium-reactor.name = Thorium-Reaktor @@ -1222,9 +1222,9 @@ block.disassembler.name = Großer Trenner block.silicon-crucible.name = Silizium Schmelztiegel block.overdrive-dome.name = Beschleunigungs-Maschine #experimental, may be removed -block.block-forge.name = Blockfabrik -block.block-loader.name = Blocklader -block.block-unloader.name = Blockentlader +block.block-forge.name = Block-Fabrik +block.block-loader.name = Block-Lader +block.block-unloader.name = Block-Entlader block.interplanetary-accelerator.name = Interplanetarischer Beschleuniger block.switch.name = Schalter From 8a424111f04a969add0f9750384d60a5cd07ac29 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 09:43:35 -0500 Subject: [PATCH 066/123] Fixed #3633 --- .github/workflows/deployment.yml | 16 +++++++++------- core/src/mindustry/core/Logic.java | 2 +- core/src/mindustry/entities/comp/MinerComp.java | 2 ++ core/src/mindustry/input/InputHandler.java | 2 +- .../metadata/android/en-US/changelogs/29730.txt | 10 ++++++++++ 5 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29730.txt diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index bc993bae07..e98615e268 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -15,9 +15,11 @@ jobs: uses: actions/setup-java@v1 with: java-version: 14 + - name: Set env + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - name: Create artifacts run: | - ./gradlew desktop:dist server:dist core:javadoc -Pbuildversion=${GITHUB_REF:1} + ./gradlew desktop:dist server:dist core:javadoc -Pbuildversion=${RELEASE_VERSION:1} - name: Update docs run: | cd ../ @@ -27,24 +29,24 @@ jobs: cp -a Mindustry/core/build/docs/javadoc/. docs/ cd docs git add . - git commit -m "Update ${GITHUB_REF:1}" + git commit -m "Update ${RELEASE_VERSION:1}" git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs cd ../Mindustry - name: Add Arc release run: | git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc cd ../Arc - git tag ${GITHUB_REF} - git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${GITHUB_REF}; + git tag ${RELEASE_VERSION} + git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${RELEASE_VERSION}; cd ../Mindustry - name: Update F-Droid build string run: | git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds cd ../MindustryBuilds - echo "Updating version to ${GITHUB_REF:1}" - echo versionName=6-fdroid-${GITHUB_REF:1}$'\n'versionCode=${GITHUB_REF:1} > version_fdroid.txt + echo "Updating version to ${RELEASE_VERSION:1}" + echo versionName=6-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${RELEASE_VERSION:1} > version_fdroid.txt git add . - git commit -m "Updating to build ${GITHUB_REF:1}" + git commit -m "Updating to build ${RELEASE_VERSION:1}" cd ../Mindustry - name: Upload client artifacts uses: svenstaro/upload-release-action@v2 diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index abcdfc85a0..a13e37cbac 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -135,8 +135,8 @@ public class Logic implements ApplicationListener{ //convert all blocks to neutral, randomly killing them if(tile.isCenter() && tile.build != null && tile.build.team == state.rules.waveTeam){ Building b = tile.build; + Call.setTeam(b, Team.derelict); Time.run(Mathf.random(0f, 60f * 6f), () -> { - Call.setTeam(b, Team.derelict); if(Mathf.chance(0.25)){ b.kill(); } diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java index f10a217105..81aa812f61 100644 --- a/core/src/mindustry/entities/comp/MinerComp.java +++ b/core/src/mindustry/entities/comp/MinerComp.java @@ -77,6 +77,8 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{ mineTimer = 0; if(core != null && within(core, mineTransferRange) && core.acceptStack(item, 1, this) == 1 && offloadImmediately()){ + //add item to inventory before it is transferred + if(item() == item) addItem(item); Call.transferItemTo(self(), item, 1, mineTile.worldx() + Mathf.range(tilesize / 2f), mineTile.worldy() + Mathf.range(tilesize / 2f), core); diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 551fd5e82d..c7ca5cd022 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -105,7 +105,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ public static void transferItemTo(@Nullable Unit unit, Item item, int amount, float x, float y, Building build){ if(build == null || build.items == null) return; - if(unit != null) unit.stack.amount = Math.max(unit.stack.amount - amount, 0); + if(unit != null && unit.item() == item) unit.stack.amount = Math.max(unit.stack.amount - amount, 0); for(int i = 0; i < Mathf.clamp(amount / 3, 1, 8); i++){ Time.run(i * 3, () -> createItemTransfer(item, amount, x, y, build, () -> {})); diff --git a/fastlane/metadata/android/en-US/changelogs/29730.txt b/fastlane/metadata/android/en-US/changelogs/29730.txt new file mode 100644 index 0000000000..c98275f647 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29730.txt @@ -0,0 +1,10 @@ +This should be one of the last beta builds. In a couple of days, I will make a final release with the most recent translation bundles & bugfixes. + +- Fixed infinitely looping Vela laser sound +- Fixed fire not burning on tar +- Disabled fire for items with flammability <= 1 (this means coal bombing no longer causes fire) +- Disabled unit explosion team damage +- Disabled core unit crash damage +- Disabled automatic linking of adjacent bridges + +Campaign: From 815a483d2c9513b25c98b0c55d8b16969fbabd40 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Thu, 26 Nov 2020 19:38:25 +0300 Subject: [PATCH 067/123] typo in Fires: /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */ --- core/src/mindustry/entities/Fires.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java index 754a8766b9..2ae2253356 100644 --- a/core/src/mindustry/entities/Fires.java +++ b/core/src/mindustry/entities/Fires.java @@ -15,7 +15,7 @@ public class Fires{ private static final float baseLifetime = 1000f; private static final IntMap map = new IntMap<>(); - /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */ + /** Start a fire on the tile. If there already is a fire there, refreshes its lifetime. */ public static void create(Tile tile){ if(net.client() || tile == null || !state.rules.fire) return; //not clientside. From e6c99e0c6d4dc08d088a678f39aa02b556de4167 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 10:42:50 -0500 Subject: [PATCH 068/123] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 882d0b15ae..5a87b04c42 100644 --- a/README.md +++ b/README.md @@ -61,5 +61,5 @@ Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Su ## Downloads -| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) | -|--- |--- |--- |--- | +| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) | [![](https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-US?size=250x83&releaseDate=1528416000&h=43142217e0fc99956f864865b9d8bc56)](https://apps.apple.com/us/app/mindustry/id1385258906?itsct=apps_box&itscg=30200) +|--- |--- |--- |--- |--- | From 1f1701f1d67409d6fefe37b610f1d29e14dd40fb Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 10:44:14 -0500 Subject: [PATCH 069/123] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5a87b04c42..97aece9742 100644 --- a/README.md +++ b/README.md @@ -61,5 +61,5 @@ Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Su ## Downloads -| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) | [![](https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-US?size=250x83&releaseDate=1528416000&h=43142217e0fc99956f864865b9d8bc56)](https://apps.apple.com/us/app/mindustry/id1385258906?itsct=apps_box&itscg=30200) -|--- |--- |--- |--- |--- | +| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry) | [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry) | [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry) | [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry) +|--- |--- |--- |--- | From 4deb8fd626b8cb0f49d287970b034142039f79f9 Mon Sep 17 00:00:00 2001 From: Wiki Updater <57631841+Catchears@users.noreply.github.com> Date: Sat, 28 Nov 2020 16:49:24 +0100 Subject: [PATCH 070/123] resolve merge conflict --- core/assets/contributors | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/contributors b/core/assets/contributors index 880776a1ec..1390999515 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -102,4 +102,5 @@ newlocknew (freesound.org) dsmolenaers (freesound.org) Headphaze (freesound.org) VolasYouKnow +Ángel Rodríguez Aguilera Catchears From 8b5acefdfe89f0e1d1fc150aac0cff65d2e784a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Sun, 29 Nov 2020 00:05:24 +0800 Subject: [PATCH 071/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 86 ++++++++++----------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 428de78f53..5d737e05e3 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -19,12 +19,12 @@ screenshot.invalid = 地图太大，可能没有足够的内存用于截图。 gameover = 游戏结束 gameover.disconnect = 断开连接 gameover.pvp = [accent] {0}[]队获胜！ -gameover.waiting = [accent]正在等待下一张地图... +gameover.waiting = [accent]正在更换下一张地图... highscore = [accent]新纪录！ copied = 已复制 -indev.popup = [accent]6.0[]仍在[accent]测试版[].\n[lightgray]这意味着:[]\n[scarlet]- 战役玩法完全没有完成[]\n- 很多内容还没有做完\n - 大多[scarlet]单位AI[]无法正确地运行\n- 单位系统完全没有完成\n- 一切您所看到的内容都可能会移除或调整。\n\n在[accent]Github[]提交错误报告。\n[#66ccff]来自译者WinterUnderTheSnow的忠告：不建议新玩家游玩还在测试阶段的6.0！建议您先从[orange]v104.6[#66ccff]或[orange]v104.10[#66ccff]开始游玩！ +indev.popup = [accent]6.0[]仍在[accent]测试版[].\n[lightgray]这意味着:[]\n[scarlet]- 战役玩法完全没有完成[]\n- 很多内容还没有做完\n- 大多[scarlet]单位AI[]无法正确地运行\n- 单位系统完全没有完成\n- 一切您所看到的内容都可能会移除或调整。\n\n在[accent]Github[]提交错误报告。\n[#66ccff]来自译者WinterUnderTheSnow的忠告：不建议新玩家游玩还在测试阶段的6.0！建议您先从[orange]v104.6[#66ccff]或[orange]v104.10[#66ccff]开始游玩！ indev.notready = 这部分玩法还未开发完成。 -indev.campaign = [accent]您已经到达战役模式的结尾！[]\n\n这是内容所能做到的。 未来的更新中将添加行星际旅行。 +indev.campaign = [accent]您已经到达战役模式的结尾！[]\n\n这是目前内容的全部。 未来的更新中将添加行星际旅行。 load.sound = 音乐加载中 load.map = 地图加载中 @@ -296,13 +296,13 @@ pausebuilding = [accent][[{0}][]来暂停建造 resumebuilding = [scarlet][[{0}][]来恢复建造 showui = UI已隐藏\n按[accent][[{0}][]显示UI wave = [accent]第{0}波 -wave.cap = [accent]Wave {0}/{1} +wave.cap = [accent]波次 {0}/{1} wave.waiting = [lightgray]下一波倒计时：{0}秒 wave.waveInProgress = [lightgray]波次袭来 waiting = [lightgray]等待中… waiting.players = 等待玩家中… wave.enemies = [lightgray]剩余 {0} 个敌人 -wave.enemycores = [accent]{0}[lightgray] 敌人核心(多个) +wave.enemycores = [accent]{0}[lightgray] 敌人核心 wave.enemycore = [accent]{0}[lightgray] 敌人核心 wave.enemy = [lightgray]剩余 {0} 个敌人 wave.guardianwarn = Boss 将在[accent]{0}[]波后到来。 @@ -543,7 +543,7 @@ sectors.nonelaunch = [lightgray]无 (太阳) sectors.rename = 重命名区块 sectors.enemybase = [scarlet]敌人基地 sectors.vulnerable = [scarlet]脆弱的 -sectors.underattack = [scarlet]遭到攻击！[accent]{0}% 被摧毁 +sectors.underattack = [scarlet]遭到攻击！[accent]{0}% 损毁度 sectors.survives = [accent]存活{0}波 sectors.go = 进入 sector.curcapture = 区域已占领 @@ -554,18 +554,18 @@ sector.lost = 区域[accent]{0}[white]已丢失! #note: the missing space in the line below is intentional sector.captured = 区域[accent]{0}[white]已占领! -threat.low = 低 -threat.medium = 中 -threat.high = 高 +threat.low = 低度 +threat.medium = 中度 +threat.high = 高度 threat.extreme = 极高 -threat.eradication = 根除 +threat.eradication = 扫荡 planets = 行星 planet.serpulo.name = 塞普罗 planet.sun.name = 太阳 -sector.impact0078.name = 影响0078 +sector.impact0078.name = 冲击区0078 sector.groundZero.name = 零号地区 sector.craters.name = 陨石带 sector.frozenForest.name = 冰冻森林 @@ -574,10 +574,10 @@ sector.stainedMountains.name = 绵延群山 sector.desolateRift.name = 荒芜裂谷 sector.nuclearComplex.name = 核裂阵 sector.overgrowth.name = 增生区 -sector.tarFields.name = 油田 +sector.tarFields.name = 焦油田 sector.saltFlats.name = 盐碱荒滩 sector.fungalPass.name = 真菌通道 -sector.biomassFacility.name = 生物质合成设施 +sector.biomassFacility.name = 生物质合成区 sector.windsweptIslands.name = 风吹群岛 sector.extractionOutpost.name = 萃取前哨 sector.planetaryTerminal.name = 行星发射终端 @@ -686,8 +686,8 @@ stat.minetier = 采矿等级 stat.payloadcapacity = 载货容量 stat.commandlimit = 指挥上限 stat.abilities = 能力 -stat.canboost = 助推器 -stat.flying = 飞行 +stat.canboost = 可助推 +stat.flying = 可飞行 ability.forcefield = 力墙场 ability.repairfield = 修复场 @@ -710,7 +710,7 @@ bar.powerlines = 链接: {0}/{1} bar.items = 物品：{0} bar.capacity = 容量：{0} bar.unitcap = {0} {1}/{2} -bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[单位上限] +bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[已达单位上限] bar.liquid = 液体 bar.heat = 热量 bar.power = 电力 @@ -991,8 +991,8 @@ unit.zenith.name = 苍穹 unit.antumbra.name = 月影 unit.eclipse.name = 日蚀 unit.mono.name = 独影 -unit.poly.name = 聚幻 -unit.mega.name = 巨灵 +unit.poly.name = 幻型 +unit.mega.name = 巨像 unit.quad.name = 雷霆 unit.oct.name = 要塞 unit.risso.name = 梭鱼 @@ -1236,35 +1236,35 @@ team.green.name = 绿 team.purple.name = 紫 hint.skip = 跳过 -hint.desktopMove = 使用[accent][[WASD][]来移动. -hint.zoom = [accent]滚动[]放大或缩小. -hint.mine = 移动到\uf8c4铜矿附近并点按[accent]tap[]进行手动开采 -hint.desktopShoot = [accent][[Left-click][]射击. +hint.desktopMove = 使用[accent][WASD][]来移动. +hint.zoom = [accent]滚动[]鼠标滚轮放大或缩小. +hint.mine = 移动到\uf8c4 铜矿附近并[accent]点按[]进行手动开采. +hint.desktopShoot = [accent][鼠标左键][]射击. hint.depositItems = 要转移物品，请将其从飞船上拖到核心。 -hint.respawn = 要重生飞船，请按[accent][[V][]. -hint.respawn.mobile = 您已切换控制单元/结构. 如果要重生飞船请[accent]点击左上方的图标(那个和你长得一样的).[] -hint.desktopPause = 按[accent][[Space][]暂停和取消暂停游戏. -hint.placeDrill = 选择\ue85e[accent]钻头[]右下角菜单中的标签，然后选择一个\uf870 [accent]钻头[]然后单击铜矿将其放置. -hint.placeDrill.mobile = 选择\ue85e[accent]钻头[]右下角菜单中的标签，然后选择一个\uf870 [accent]钻头[]然后点击铜矿将其放置.\n\n按下\ue800 [accent]复选标记[]在右下角按钮确认. -hint.placeConveyor = 传送带将物品从钻头移到其他块中。选择一个\uf896 [accent]传送带[]从\ue814 [accent]布局[]标签.\n\n单击并拖动以放置多个传送带.\n[accent]滚动[]旋转. -hint.placeConveyor.mobile = 传送带将物品从钻头移到其他块中。选择一个\uf896 [accent]传送带[]从\ue814 [accent]布局[]标签.\n\n按住手指一秒钟，然后拖动以放置多个传送带. -hint.placeTurret = 放置\uf861 [accent]炮塔[]保卫你的基地从敌人手中.\n\n炮塔需要弹药-在这种情况下e, \uf838copper.\n使用传送带和钻头为它们供弹。 +hint.respawn = 要于核心中重生，请按[accent][V][]. +hint.respawn.mobile = 您已切换控制单元/结构. 如果要重生飞船请[accent]点击左上方的图标(您的单元/结构图标).[] +hint.desktopPause = 按[accent][Space][]暂停和取消暂停游戏. +hint.placeDrill = 选择右下角菜单中的\ue85e [accent]钻头[]标签，然后选择一个\uf870 [accent]钻头[]然后单击铜矿将其放置. +hint.placeDrill.mobile = 选择右下角菜单中的\ue85e [accent]钻头[]标签，然后选择一个\uf870 [accent]钻头[]然后点击铜矿将其放置.\n\n点击右下角\ue800 [accent]复选标记[]以确认. +hint.placeConveyor = 传送带将物品从钻头移到其他方块中。从\ue814 [accent]布局[]标签选择\uf896 [accent]传送带[].\n\n单击并拖动以放置多个传送带.\n[accent]滚动[]以旋转. +hint.placeConveyor.mobile = 传送带将物品从钻头移到其他块中。从\ue814 [accent]布局[]标签选择\uf896 [accent]传送带[].\n\n长按一秒钟，然后拖动以放置多个传送带. +hint.placeTurret = 放置\uf861 [accent]炮塔[]以抵御敌人，保卫你的核心.\n\n炮塔需要弹药-\uf838 铜.\n使用传送带和钻头为它们供弹。 hint.breaking = [accent]右击[]并拖动以拆除方块. -hint.breaking.mobile = 激活\ue817 [accent]锤子[]在右下角点击以拆除方块.\n\n按住手指一秒钟，然后拖动以选择. -hint.research = 使用\ue875 [accent]科技树[]按钮研究新技术. -hint.research.mobile = 使用\ue875 [accent]科技树[]按钮在\ue88c [accent]菜单[]去研究新技术. -hint.unitControl = 按住[accent][[L-ctrl][]和[accent]点击[]控制友军单位或炮塔。 -hint.unitControl.mobile = [accent][双击[]控制友军单位或炮塔(双击)。 -hint.launch = 一旦收集到足够的资源，您就可以[accent]发射[]通过选择附近的区域从\ue827 [accent]地图[]在右下角. -hint.launch.mobile = 一旦收集到足够的资源，您就可以[accent]发射[]通过选择附近的区域从\ue827 [accent]地图[]在\ue88c [accent]菜单[]. -hint.schematicSelect = 按住[accent][[F][]并拖动以选择要复制和粘贴的块.\n\n[accent][[Middle Click][]复制单个块类型. -hint.conveyorPathfind = 按住[accent][[L-Ctrl][]拖动，传送带会自动生成路径. +hint.breaking.mobile = 点击\ue817 [accent]锤子[]在右下角点击以拆除方块.\n\n按住手指一秒钟，然后拖动以选择. +hint.research = 点击\ue875 [accent]科技树[]按钮研究新技术. +hint.research.mobile = 点击在\ue88c [accent]菜单[]中的\ue875 [accent]科技树[]按钮以研究新技术. +hint.unitControl = 按住[accent][L-ctrl][]并[accent]点击[]友军单位或炮塔来进行控制。 +hint.unitControl.mobile = [accent][双击][]友军单位或炮塔来进行控制。 +hint.launch = 一旦收集到足够的资源，您就可以通过从右下角的\ue827 [accent]地图[]选择附近的区域[accent]发射[]核心. +hint.launch.mobile = 一旦收集到足够的资源，您就可以通过在\ue88c [accent]菜单[]的\ue827 [accent]地图[]选择附近的区域[accent]发射[]核心. +hint.schematicSelect = 按住[accent][F][]并拖动以选择要复制和粘贴的块.\n\n[accent][鼠标中键][]复制单个块类型. +hint.conveyorPathfind = 按住[accent][L-Ctrl][]拖动传送带并使其自动寻路. hint.conveyorPathfind.mobile = 启用\ue844 [accent]对角线模式[]并拖动，传送带会自动生成路径. -hint.boost = 按住[accent][[L-Shift][]用当前单位飞越障碍物.\n\n只有少数地面单位有助推器.(首先排除爬虫家族) -hint.command = 按accent][[G][]指挥附近的单位编队. -hint.command.mobile = [accent][双击][]您的部队指挥附近的部队编队.(双击) +hint.boost = 按住[accent][L-Shift][]用当前单位飞越障碍物.\n\n只有少数地面单位有助推器. +hint.command = 按住[accent][G][]指挥附近的单位编队. +hint.command.mobile = [accent][双击][]您的部队指挥附近的部队编队. hint.payloadPickup = 按[accent][[[]捡起小方块或单位. -hint.payloadPickup.mobile = [accent]点住]一个小方块或一个单位来捡起来. +hint.payloadPickup.mobile = [accent]长按一个小方块或一个单位来捡起来. hint.payloadDrop = 按[accent]][]放下有效载荷. hint.payloadDrop.mobile = [accent]点住[]一个空的位置将有效载荷丢到那里.(不是很精准) hint.waveFire = [accent]进攻波[]炮塔加水弹药会自动扑灭附近的大火.(浪涌和海啸) From 6e62859d0edc90df66e049077750288f84f3f570 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 11:31:07 -0500 Subject: [PATCH 072/123] Fixed #3644 --- core/src/mindustry/logic/LAssembler.java | 2 +- core/src/mindustry/ui/Bar.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index e06927cca2..560ac986ec 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -14,7 +14,7 @@ import mindustry.world.*; /** "Compiles" a sequence of statements into instructions. */ public class LAssembler{ public static ObjectMap> customParsers = new ObjectMap<>(); - public static final int maxTokenLength = 40; + public static final int maxTokenLength = 36; private int lastVar; /** Maps names to variable IDs. */ diff --git a/core/src/mindustry/ui/Bar.java b/core/src/mindustry/ui/Bar.java index 8051b67678..dbb7e9cc6f 100644 --- a/core/src/mindustry/ui/Bar.java +++ b/core/src/mindustry/ui/Bar.java @@ -29,7 +29,11 @@ public class Bar extends Element{ public Bar(Prov name, Prov color, Floatp fraction){ this.fraction = fraction; - lastValue = value = Mathf.clamp(fraction.get()); + try{ + lastValue = value = Mathf.clamp(fraction.get()); + }catch(Exception e){ //getting the fraction may involve referring to invalid data + lastValue = value = 0f; + } update(() -> { try{ this.name = name.get(); From 3712a90f90bdefd9a88bb65f9a5ae7da7e19d8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Sun, 29 Nov 2020 00:35:50 +0800 Subject: [PATCH 073/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 233 ++++++++++++++++++-- 1 file changed, 210 insertions(+), 23 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 5d737e05e3..03084bde9b 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1236,14 +1236,14 @@ team.green.name = 绿 team.purple.name = 紫 hint.skip = 跳过 -hint.desktopMove = 使用[accent][WASD][]来移动. +hint.desktopMove = 使用[accent][[WASD][]来移动. hint.zoom = [accent]滚动[]鼠标滚轮放大或缩小. hint.mine = 移动到\uf8c4 铜矿附近并[accent]点按[]进行手动开采. -hint.desktopShoot = [accent][鼠标左键][]射击. +hint.desktopShoot = [accent][[鼠标左键][]射击. hint.depositItems = 要转移物品，请将其从飞船上拖到核心。 -hint.respawn = 要于核心中重生，请按[accent][V][]. +hint.respawn = 要于核心中重生，请按[accent][[V][]. hint.respawn.mobile = 您已切换控制单元/结构. 如果要重生飞船请[accent]点击左上方的图标(您的单元/结构图标).[] -hint.desktopPause = 按[accent][Space][]暂停和取消暂停游戏. +hint.desktopPause = 按[accent][[Space][]暂停和取消暂停游戏. hint.placeDrill = 选择右下角菜单中的\ue85e [accent]钻头[]标签，然后选择一个\uf870 [accent]钻头[]然后单击铜矿将其放置. hint.placeDrill.mobile = 选择右下角菜单中的\ue85e [accent]钻头[]标签，然后选择一个\uf870 [accent]钻头[]然后点击铜矿将其放置.\n\n点击右下角\ue800 [accent]复选标记[]以确认. hint.placeConveyor = 传送带将物品从钻头移到其他方块中。从\ue814 [accent]布局[]标签选择\uf896 [accent]传送带[].\n\n单击并拖动以放置多个传送带.\n[accent]滚动[]以旋转. @@ -1253,31 +1253,33 @@ hint.breaking = [accent]右击[]并拖动以拆除方块. hint.breaking.mobile = 点击\ue817 [accent]锤子[]在右下角点击以拆除方块.\n\n按住手指一秒钟，然后拖动以选择. hint.research = 点击\ue875 [accent]科技树[]按钮研究新技术. hint.research.mobile = 点击在\ue88c [accent]菜单[]中的\ue875 [accent]科技树[]按钮以研究新技术. -hint.unitControl = 按住[accent][L-ctrl][]并[accent]点击[]友军单位或炮塔来进行控制。 +hint.unitControl = 按住[accent][[L-ctrl][]并[accent]点击[]友军单位或炮塔来进行控制。 hint.unitControl.mobile = [accent][双击][]友军单位或炮塔来进行控制。 hint.launch = 一旦收集到足够的资源，您就可以通过从右下角的\ue827 [accent]地图[]选择附近的区域[accent]发射[]核心. hint.launch.mobile = 一旦收集到足够的资源，您就可以通过在\ue88c [accent]菜单[]的\ue827 [accent]地图[]选择附近的区域[accent]发射[]核心. -hint.schematicSelect = 按住[accent][F][]并拖动以选择要复制和粘贴的块.\n\n[accent][鼠标中键][]复制单个块类型. -hint.conveyorPathfind = 按住[accent][L-Ctrl][]拖动传送带并使其自动寻路. -hint.conveyorPathfind.mobile = 启用\ue844 [accent]对角线模式[]并拖动，传送带会自动生成路径. -hint.boost = 按住[accent][L-Shift][]用当前单位飞越障碍物.\n\n只有少数地面单位有助推器. -hint.command = 按住[accent][G][]指挥附近的单位编队. -hint.command.mobile = [accent][双击][]您的部队指挥附近的部队编队. +hint.schematicSelect = 按住[accent][[F][]并拖动以选择要复制和粘贴的块.\n\n[accent][鼠标中键][]复制单个块类型. +hint.conveyorPathfind = 按住[accent][[L-Ctrl][]拖动传送带并使其自动寻路. +hint.conveyorPathfind.mobile = 启用\ue844 [accent]传送带自动寻路[]并拖动，传送带会自动生成路径. +hint.boost = 按住[accent][[L-Shift][]用当前单位飞越障碍物.\n\n但只有少数地面单位有助推器. +hint.command = 按住[accent][[G][]指挥附近的单位编队. +hint.command.mobile = [accent][[双击][]您的部队指挥附近的部队编队. hint.payloadPickup = 按[accent][[[]捡起小方块或单位. hint.payloadPickup.mobile = [accent]长按一个小方块或一个单位来捡起来. hint.payloadDrop = 按[accent]][]放下有效载荷. -hint.payloadDrop.mobile = [accent]点住[]一个空的位置将有效载荷丢到那里.(不是很精准) -hint.waveFire = [accent]进攻波[]炮塔加水弹药会自动扑灭附近的大火.(浪涌和海啸) -hint.generator = \uf879 [accent]燃烧发电机[]燃烧煤炭并将电力传输到相邻方块.\n\n电力传输范围可以扩展，用\uf87f [accent]能量节点[]. +hint.payloadDrop.mobile = [accent]点住[]一个空的位置将有效载荷丢到那里. +hint.waveFire = [accent]波浪[]炮塔加水弹药会自动扑灭附近的火. +hint.generator = \uf879 [accent]燃烧发电机[]燃烧煤炭并将电力传输到相邻方块.\n\n用\uf87f [accent]能量节点[]可以扩展电力传输范围. +hint.guardian = [accent]Boss[] 单位装甲厚重. [accent]铜[] 和 [accent]铅[] 这类较弱的子弹对其 [scarlet]作用不佳[].\n\n使用高级别炮塔或使用 \uf835 [accent]石墨[] 作为\uf861 双管炮/及\uf859齐射炮的弹药来消灭 Boss. item.copper.description = 一种最基本的的建筑材料。在各种类型的建筑中被广泛使用。 -item.copper.details = 铜. 在Serpulo上的金属异常丰富。 除非加固，否则结构较弱。 +item.copper.details = 铜. 在塞普罗上的异常丰富的金属。 除非加固，否则结构较弱。 item.lead.description = 一种基本的电力材料。广泛用于电子设备和液体输送模块。 -item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here. +item.lead.details = 致密且呈惰性。广泛用于电池中。\n注意：可能对生物生命体有毒。不是说这里还有很多。 item.metaglass.description = 一种致密坚硬的复合玻璃。广泛用于液体输送和存储。 item.graphite.description = 一种高密度的碳材料，用于弹药和电器元件。 item.sand.description = 一种常见的材料，广泛用于冶炼，包括制作合金和助熔剂。 item.coal.description = 在农耕文明前就形成的植物化石，常见且容易获得，常用作燃料或其他资源的生产。 +item.coal.details = 似乎是植物的化石，在孢子荚出现前很久就形成了。 item.titanium.description = 一种罕见的超轻金属，被广泛运用于液体运输、钻头和飞机。 item.thorium.description = 一种致密的放射性金属，用作结构支撑和核燃料。 item.scrap.description = 一种废弃的建筑物及废弃单位的残骸，富含多种金属元素。 @@ -1286,6 +1288,7 @@ item.plastanium.description = 一种轻质、可延展的材料，用于高级 item.phase-fabric.description = 一种近乎无重量的物质，用于先进的电子技术和自我修复技术。 item.surge-alloy.description = 一种先进的合金，具有独特的电气性能。 item.spore-pod.description = 一种用于制造石油、炸药及燃料的生物质。 +item.spore-pod.details = 孢子。可能是人工合成的生命形式。释放对其他生物有毒的气体。极具生物侵略性。在某些条件下高度易燃。 item.blast-compound.description = 一种用于炸弹和炸药的挥发性混合物。虽然它可以作为燃料，但不建议这样做。 item.pyratite.description = 一种在燃烧武器中使用的极易燃物质。 liquid.water.description = 最有用的液体。常用于冷却机器和废物处理。 @@ -1380,20 +1383,24 @@ block.laser-drill.description = 通过激光技术更快地开采，但需要能 block.blast-drill.description = 终极钻头，需要大量能量。 block.water-extractor.description = 从地下提取水。当附近没有水源时使用它。 block.cultivator.description = 将微小的孢子培养成工业用的孢子荚。 +block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo. block.oil-extractor.description = 使用大量能量、沙子和水提炼石油。 -block.core-shard.description = 小型核心。一旦被摧毁，与该地区的所有连接都将断开。不要让它被摧毁。 -block.core-foundation.description = 中型核心。血量更高。可以存储更多资源。 -block.core-nucleus.description = 大型核心，也是最强大的，血量非常高。能存储大量资源。 -block.vault.description = 存储大量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。[lightgray]卸载器[]可从仓库中提取物品。 -block.container.description = 存储少量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。[lightgray]卸载器[]可从容器中提取物品。 +block.core-shard.description = Core of the base. Once destroyed, the sector is lost. +block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel. +block.core-foundation.description = Core of the base. Well armored. Stores more resources than a Shard. +block.core-foundation.details = The second iteration. +block.core-nucleus.description = Core of the base. Extremely well armored. Stores massive amounts of resources. +block.core-nucleus.details = The third and final iteration. +block.vault.description = 存储大量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。卸载器可从仓库中提取物品。 +block.container.description = 存储少量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。卸载器可从容器中提取物品。 block.unloader.description = 将物品从容器、仓库或你的核心中提取到传送带或直接提取到相邻的方块。点击卸载器本身更改所要卸载的物品类型。 -block.launch-pad.description = 定期发射一批物品，而无需发射核心（离开地图）。 +block.launch-pad.description = 定期发射一批物品，而无需发射核心 block.launch-pad-large.description = 发射台的改进版，可以存储更多物品，同时启动频率更高。 block.duo.description = 小而便宜的炮塔，对地很有效。 block.scatter.description = 基本型防空炮塔。向空中敌人喷出一团铅，钢化玻璃或废料。 block.scorch.description = 小型炮塔，点燃任何靠近它的地面敌人。近距离非常有效。 block.hail.description = 小型远程炮台。 -block.wave.description = 中型快速炮塔，射出液体泡泡。使用水或者冷却液时能够自动灭火。 +block.wave.description = 中型快速炮塔，射出液体。使用水或者冷却液时能够自动灭火。 block.lancer.description = 中型对地炮塔。会充能并发射强力的的能量束。 block.arc.description = 小型炮塔，发射电弧。电弧无法穿过塑钢墙。 block.swarmer.description = 中型炮塔，对空对地，发射跟踪爆炸导弹。 @@ -1405,3 +1412,183 @@ block.spectre.description = 超大型炮塔，对空对地，一次射出两颗 block.meltdown.description = 超大型激光炮塔，充能之后持续发射光束，需要冷却剂。 block.repair-point.description = 持续治疗其附近受损最严重的单位。 block.segment.description = 摧毁袭来的除激光以外的子弹或导弹. + +block.resupply-point.description = Resupplies nearby units with copper ammunition. Not compatible with units that require battery power. +block.armored-conveyor.description = Moves items forward. Does not accept inputs from the sides. +block.illuminator.description = Emits light. +block.message.description = Stores a message for communication between allies. +block.graphite-press.description = Compresses coal into graphite. +block.multi-press.description = Compresses coal into graphite. Requires water as coolant. +block.silicon-smelter.description = Refines silicon from sand and coal. +block.kiln.description = Smelts sand and lead into metaglass. +block.plastanium-compressor.description = Produces plastanium from oil and titanium. +block.phase-weaver.description = Synthesizes phase fabric from thorium and sand. +block.alloy-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy. +block.cryofluid-mixer.description = Mixes water and fine titanium powder to produce cryofluid. +block.blast-mixer.description = Produces blast compound from pyratite and spore pods. +block.pyratite-mixer.description = Mixes coal, lead and sand into pyratite. +block.melter.description = Melts down scrap into slag. +block.separator.description = Separates slag into its mineral components. +block.spore-press.description = Compresses spore pods into oil. +block.pulverizer.description = Crushes scrap into fine sand. +block.coal-centrifuge.description = Transforms oil into coal. +block.incinerator.description = Vaporizes any item or liquid it receives. +block.power-void.description = Voids all power inputted. Sandbox only. +block.power-source.description = Infinitely outputs power. Sandbox only. +block.item-source.description = Infinitely outputs items. Sandbox only. +block.item-void.description = Destroys any items. Sandbox only. +block.liquid-source.description = Infinitely outputs liquids. Sandbox only. +block.liquid-void.description = Removes any liquids. Sandbox only. +block.copper-wall.description = Protects structures from enemy projectiles. +block.copper-wall-large.description = Protects structures from enemy projectiles. +block.titanium-wall.description = Protects structures from enemy projectiles. +block.titanium-wall-large.description = Protects structures from enemy projectiles. +block.plastanium-wall.description = Protects structures from enemy projectiles. Absorbs lasers and electric arcs. Blocks automatic power connections. +block.plastanium-wall-large.description = Protects structures from enemy projectiles. Absorbs lasers and electric arcs. Blocks automatic power connections. +block.thorium-wall.description = Protects structures from enemy projectiles. +block.thorium-wall-large.description = Protects structures from enemy projectiles. +block.phase-wall.description = Protects structures from enemy projectiles, reflecting most bullets upon impact. +block.phase-wall-large.description = Protects structures from enemy projectiles, reflecting most bullets upon impact. +block.surge-wall.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact. +block.surge-wall-large.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact. +block.door.description = A wall that can be opened and closed. +block.door-large.description = A wall that can be opened and closed. +block.mender.description = Periodically repairs blocks in its vicinity.\nOptionally uses silicon to boost range and efficiency. +block.mend-projector.description = Repairs blocks in its vicinity.\nOptionally uses phase fabric to boost range and efficiency. +block.overdrive-projector.description = Increases the speed of nearby buildings.\nOptionally uses phase fabric to boost range and efficiency. +block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage.\nOverheats if too much damage is sustained. Optionally uses coolant to prevent overheating. Phase fabric increases shield size. +block.shock-mine.description = Releases electric arcs upon enemy unit contact. +block.conveyor.description = Transports items forward. +block.titanium-conveyor.description = Transports items forward. Faster than a standard conveyor. +block.plastanium-conveyor.description = Transports items forward in batches. Accepts items at the back, and unloads them in three directions at the front. Requires multiple loading and unloading points for peak throughput. +block.junction.description = Acts as a bridge for two crossing conveyor belts. +block.bridge-conveyor.description = Transports items over terrain or buildings. +block.phase-conveyor.description = Instantly transports items over terrain or buildings. Longer range than the item bridge, but requires power. +block.sorter.description = If an input item matches the selection, it passes forward. Otherwise, the item is outputted to the left and right. +block.inverted-sorter.description = Similar to a standard sorter, but outputs selected items to the sides instead. +block.router.description = Distributes input items to 3 output directions equally. +block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output. +block.distributor.description = Distributes input items to 7 output directions equally. +block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates. +block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates. +block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers. +block.mechanical-pump.description = Pumps and outputs liquids. Does not require power. +block.rotary-pump.description = Pumps and outputs liquids. Requires power. +block.thermal-pump.description = Pumps and outputs liquids. +block.conduit.description = Moves liquids forward. Used in conjunction with pumps and other conduits. +block.pulse-conduit.description = Moves liquids forward. Transports faster and stores more than standard conduits. +block.plated-conduit.description = Moves liquids forward. Does not accept input from the sides. Does not leak. +block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. +block.liquid-tank.description = Stores a large amount of liquid. Outputs to all sides, similarly to a liquid router. +block.liquid-junction.description = Acts as a bridge for two crossing conduits. +block.bridge-conduit.description = Transports liquids over terrain or buildings. +block.phase-conduit.description = Transports liquids over terrain or buildings. Longer range than the bridge conduit, but requires power. +block.power-node.description = Transmits power to connected nodes. The node will receive power from or supply power to any adjacent blocks. +block.power-node-large.description = An advanced power node with greater range. +block.surge-tower.description = A long-range power node with fewer available connections. +block.diode.description = Moves battery power in one direction, but only if the other side has less power stored. +block.battery.description = Stores power in times of surplus energy. Outputs power in times of deficit. +block.battery-large.description = Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity than a regular battery. +block.combustion-generator.description = Generates power by burning flammable materials, such as coal. +block.thermal-generator.description = Generates power when placed in hot locations. +block.steam-generator.description = Generates power by burning flammable materials and converting water to steam. +block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite. +block.rtg-generator.description = Uses the heat of decaying radioactive compounds to produce energy at a slow rate. +block.solar-panel.description = Provides a small amount of power from the sun. +block.solar-panel-large.description = Provides a small amount of power from the sun. More efficient than the standard solar panel. +block.thorium-reactor.description = Generates significant amounts of power from thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. +block.impact-reactor.description = Creates massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process. +block.mechanical-drill.description = When placed on ore, outputs items at a slow pace indefinitely. Only capable of mining basic resources. +block.pneumatic-drill.description = An improved drill, capable of mining titanium. Mines at a faster pace than a mechanical drill. +block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Capable of mining thorium. +block.blast-drill.description = The ultimate drill. Requires large amounts of power. +block.water-extractor.description = Extracts groundwater. Used in locations with no surface water available. +block.cultivator.description = Cultivates tiny concentrations of atmospheric spores into spore pods. +block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo. +block.oil-extractor.description = Uses large amounts of power, sand and water to drill for oil. +block.core-shard.description = Core of the base. Once destroyed, the sector is lost. +block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel. +block.core-foundation.description = Core of the base. Well armored. Stores more resources than a Shard. +block.core-foundation.details = The second iteration. +block.core-nucleus.description = Core of the base. Extremely well armored. Stores massive amounts of resources. +block.core-nucleus.details = The third and final iteration. +block.vault.description = Stores a large amount of items of each type. Contents can be retrieved with an unloader. +block.container.description = Stores a small amount of items of each type. Contents can be retrieved with an unloader. +block.unloader.description = Unloads the selected item from nearby blocks. +block.launch-pad.description = Launches batches of items to selected sectors. +block.duo.description = Fires alternating bullets at enemies. +block.scatter.description = Fires clumps of lead, scrap or metaglass flak at enemy aircraft. +block.scorch.description = Burns any ground enemies close to it. Highly effective at close range. +block.hail.description = Fires small shells at ground enemies over long distances. +block.wave.description = Fires streams of liquid at enemies. Automatically extinguishes fires when supplied with water. +block.lancer.description = Charges and fires powerful beams of energy at ground targets. +block.arc.description = Fires arcs of electricity at ground targets. +block.swarmer.description = Fires homing missiles at enemies. +block.salvo.description = Fires quick salvos of bullets at enemies. +block.fuse.description = Fires three close-range piercing blasts at nearby enemies. +block.ripple.description = Shoots clusters of shells at ground enemies over long distances. +block.cyclone.description = Fires explosive clumps of flak at nearby enemies. +block.spectre.description = Fires large armor-piercing bullets at air and ground targets. +block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate. +block.foreshadow.description = Fires a large single-target bolt over long distances. +block.repair-point.description = Continuously repairs the closest damaged unit in its vicinity. +block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. +block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process. +block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water. +block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations. +block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium. +block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate. +block.payload-conveyor.description = Moves large payloads, such as units from factories. +block.payload-router.description = Splits input payloads into 3 output directions. +block.command-center.description = Controls unit behavior with several different commands. +block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading. +block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading. +block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading. +block.additive-reconstructor.description = Upgrades inputted units to the second tier. +block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier. +block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier. +block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier. +block.switch.description = A toggleable switch. State can be read and controlled with logic processors. +block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. +block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor. +block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor. +block.memory-cell.description = Stores information for a logic processor. +block.memory-bank.description = Stores information for a logic processor. High capacity. +block.logic-display.description = Displays arbitrary graphics from a logic processor. +block.large-logic-display.description = Displays arbitrary graphics from a logic processor. +block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment. + + +unit.dagger.description = Fires standard bullets at all nearby enemies. +unit.mace.description = Fires streams of flame at all nearby enemies. +unit.fortress.description = Fires long-range artillery at ground targets. +unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies. +unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies. +unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight. +unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight. +unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded. +unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight. +unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain. +unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion. +unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain. +unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. +unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. +unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain. +unit.flare.description = Fires standard bullets at nearby ground targets. +unit.horizon.description = Drops clusters of bombs on ground targets. +unit.zenith.description = Fires salvos of missiles at all nearby enemies. +unit.antumbra.description = Fires a barrage of bullets at all nearby enemies. +unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies. +unit.mono.description = Automatically mines copper and lead, depositing it into the core. +unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction. +unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units. +unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units. +unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units. +unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies. +unit.minke.description = Fires shells and standard bullets at nearby ground targets. +unit.bryde.description = Fires long-range artillery shells and missiles at enemies. +unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies. +unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units. +unit.alpha.description = Defends the Shard core from enemies. Builds structures. +unit.beta.description = Defends the Foundation core from enemies. Builds structures. +unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. From 19e03e665e9cf3b0cf9cf1bab8251893681ee0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Sun, 29 Nov 2020 00:59:15 +0800 Subject: [PATCH 074/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 24 ++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 03084bde9b..872d768d38 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -24,7 +24,7 @@ highscore = [accent]新纪录！ copied = 已复制 indev.popup = [accent]6.0[]仍在[accent]测试版[].\n[lightgray]这意味着:[]\n[scarlet]- 战役玩法完全没有完成[]\n- 很多内容还没有做完\n- 大多[scarlet]单位AI[]无法正确地运行\n- 单位系统完全没有完成\n- 一切您所看到的内容都可能会移除或调整。\n\n在[accent]Github[]提交错误报告。\n[#66ccff]来自译者WinterUnderTheSnow的忠告：不建议新玩家游玩还在测试阶段的6.0！建议您先从[orange]v104.6[#66ccff]或[orange]v104.10[#66ccff]开始游玩！ indev.notready = 这部分玩法还未开发完成。 -indev.campaign = [accent]您已经到达战役模式的结尾！[]\n\n这是目前内容的全部。 未来的更新中将添加行星际旅行。 +indev.campaign = [accent]恭喜！您已经到达战役模式的结尾！[]\n\n这是目前内容的全部。 未来的更新中将添加行星际旅行。 load.sound = 音乐加载中 load.map = 地图加载中 @@ -1296,6 +1296,28 @@ liquid.slag.description = 各种不同类型的熔融金属混合在一起的液 liquid.oil.description = 用于先进材料生产的液体。可以转换成煤作为燃料，或作为武器喷射和放火。 liquid.cryofluid.description = 一种由水和钛制成的惰性、无腐蚀性的液体。具有极高的热容量。广泛用作冷却剂。 +item.copper.description = Used in all types of construction and ammunition. +item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced. +item.lead.description = Used in liquid transportation and electrical structures. +item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here. +item.metaglass.description = Used in liquid distribution/storage structures. +item.graphite.description = Used in electrical components and turret ammunition. +item.sand.description = Used for production of other refined materials. +item.coal.description = Used for fuel and refined material production. +item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event. +item.titanium.description = Used in liquid transportation structures, drills and aircraft. +item.thorium.description = Used in durable structures and as nuclear fuel. +item.scrap.description = Used in Melters and Pulverizers for refining into other materials. +item.scrap.details = Leftover remnants of old structures and units. +item.silicon.description = Used in solar panels, complex electronics and homing turret ammunition. +item.plastanium.description = Used in advanced units, insulation and fragmentation ammunition. +item.phase-fabric.description = Used in advanced electronics and self-repairing structures. +item.surge-alloy.description = Used in advanced weaponry and reactive defense structures. +item.spore-pod.description = Used for conversion into oil, explosives and fuel. +item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions. +item.blast-compound.description = Used in bombs and explosive ammunition. +item.pyratite.description = Used in incendiary weapons and combustion-fueled generators. + block.message.description = 保存一条文字信息。用于队友之间进行交流。 block.graphite-press.description = 将煤块压缩成纯石墨片材料。 block.multi-press.description = 石墨压缩机的升级版。利用水和电力快速高效地处理煤炭。 From 724a0018b82e740abd8dd1d61178465b9e1e4cdb Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 20:39:09 +0300 Subject: [PATCH 075/123] unit payload improvements --- .../world/blocks/distribution/PayloadConveyor.java | 12 ++++++++++++ .../world/blocks/production/PayloadAcceptor.java | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index c2c014d969..edb9f87d47 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -234,6 +234,18 @@ public class PayloadConveyor extends Block{ updatePayload(); } + @Override + public void onDestroyed() { + super.onDestroyed(); + if (item != null) item.dump(); + } + + @Override + public void onRemoved() { + super.onRemoved(); + if (item != null) item.dump(); + } + @Override public void write(Writes write){ super.write(write); diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index 512eeebdad..697f44ab85 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -82,6 +82,18 @@ public class PayloadAcceptor extends Block{ return t; } + @Override + public void onDestroyed() { + super.onDestroyed(); + if (payload != null) payload.dump(); + } + + @Override + public void onRemoved() { + super.onRemoved(); + if (payload != null) payload.dump(); + } + public boolean blends(int direction){ return PayloadAcceptor.blends(this, direction); } @@ -126,6 +138,7 @@ public class PayloadAcceptor extends Block{ } } + public void dumpPayload(){ if(payload.dump()){ payload = null; From 6dc2486ce0660b498fe6603928480218daaf7782 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:06:20 +0300 Subject: [PATCH 076/123] oopsie --- core/src/mindustry/world/blocks/production/PayloadAcceptor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index 697f44ab85..9e6a644ea5 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -138,7 +138,6 @@ public class PayloadAcceptor extends Block{ } } - public void dumpPayload(){ if(payload.dump()){ payload = null; From ee3348d160d6d55df98618bd4b37a3861578a9fb Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:10:12 +0300 Subject: [PATCH 077/123] oopsie x2 --- .../mindustry/world/blocks/distribution/PayloadConveyor.java | 4 ++-- .../mindustry/world/blocks/production/PayloadAcceptor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index edb9f87d47..8de59475ff 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -235,13 +235,13 @@ public class PayloadConveyor extends Block{ } @Override - public void onDestroyed() { + public void onDestroyed(){ super.onDestroyed(); if (item != null) item.dump(); } @Override - public void onRemoved() { + public void onRemoved(){ super.onRemoved(); if (item != null) item.dump(); } diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index 9e6a644ea5..d0f7cbf164 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -83,13 +83,13 @@ public class PayloadAcceptor extends Block{ } @Override - public void onDestroyed() { + public void onDestroyed(){ super.onDestroyed(); if (payload != null) payload.dump(); } @Override - public void onRemoved() { + public void onRemoved(){ super.onRemoved(); if (payload != null) payload.dump(); } From 699750762f0dc91dbbafdae6a0626a0661167d27 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:38:50 +0300 Subject: [PATCH 078/123] removing unnecessary stuff --- .../world/blocks/distribution/PayloadConveyor.java | 6 ------ .../mindustry/world/blocks/production/PayloadAcceptor.java | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 8de59475ff..241cc27476 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -234,12 +234,6 @@ public class PayloadConveyor extends Block{ updatePayload(); } - @Override - public void onDestroyed(){ - super.onDestroyed(); - if (item != null) item.dump(); - } - @Override public void onRemoved(){ super.onRemoved(); diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index d0f7cbf164..205437928e 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -11,6 +11,7 @@ import mindustry.graphics.*; import mindustry.world.*; import mindustry.world.blocks.payloads.*; +import static arc.util.Timer.post; import static mindustry.Vars.*; public class PayloadAcceptor extends Block{ @@ -82,12 +83,6 @@ public class PayloadAcceptor extends Block{ return t; } - @Override - public void onDestroyed(){ - super.onDestroyed(); - if (payload != null) payload.dump(); - } - @Override public void onRemoved(){ super.onRemoved(); From b0477394e6ac5c12896245712999d507f888f051 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:45:42 +0300 Subject: [PATCH 079/123] oopsie x3 --- core/src/mindustry/world/blocks/production/PayloadAcceptor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index 205437928e..a590c0caf6 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -11,7 +11,6 @@ import mindustry.graphics.*; import mindustry.world.*; import mindustry.world.blocks.payloads.*; -import static arc.util.Timer.post; import static mindustry.Vars.*; public class PayloadAcceptor extends Block{ From 340efc32986f7cc48e601b93bf9a844e76f534dc Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Sat, 28 Nov 2020 20:49:33 +0200 Subject: [PATCH 080/123] Typo --- core/assets/bundles/bundle_ro.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 918bd52ada..0aa8ab03f0 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -276,7 +276,7 @@ ok = OK open = Deschide customize = Personalizează Regulile cancel = Anulare -openlink = Deschidr Linkul +openlink = Deschide Linkul copylink = Copiază Linkul back = Înapoi crash.export = Exportă Crash Logs From e6078bd4f6f0d949c8956bb9cbb882cd47bbc103 Mon Sep 17 00:00:00 2001 From: slava0135 Date: Sat, 28 Nov 2020 21:49:59 +0300 Subject: [PATCH 081/123] oopsie x4 --- .../mindustry/world/blocks/distribution/PayloadConveyor.java | 2 +- core/src/mindustry/world/blocks/production/PayloadAcceptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 241cc27476..99139638c3 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -237,7 +237,7 @@ public class PayloadConveyor extends Block{ @Override public void onRemoved(){ super.onRemoved(); - if (item != null) item.dump(); + if(item != null) item.dump(); } @Override diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index a590c0caf6..2852d00a13 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -85,7 +85,7 @@ public class PayloadAcceptor extends Block{ @Override public void onRemoved(){ super.onRemoved(); - if (payload != null) payload.dump(); + if(payload != null) payload.dump(); } public boolean blends(int direction){ From e6544b73db7be595a6dae19a9c893a704be7ec4d Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 13:57:19 -0500 Subject: [PATCH 082/123] Switching modifier from beta to release --- build.gradle | 2 +- core/src/mindustry/mod/Mods.java | 2 +- core/src/mindustry/type/Weapon.java | 2 +- core/src/mindustry/world/meta/values/WeaponListValue.java | 4 ++-- gradle.properties | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 5adc73c9ee..79290c6ac8 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects{ ext{ versionNumber = '6' - if(!project.hasProperty("versionModifier")) versionModifier = 'beta' + if(!project.hasProperty("versionModifier")) versionModifier = 'release' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256' diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index f505358a40..a2706a0723 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -247,7 +247,7 @@ public class Mods implements Loadable{ mods.add(mod); }catch(Throwable e){ if(e instanceof ClassNotFoundException && e.getMessage().contains("mindustry.plugin.Plugin")){ - Log.info("Plugin @ is outdated and needs to be ported to 6.0! Update its main class to inherit from 'mindustry.mod.Plugin'."); + Log.info("Plugin @ is outdated and needs to be ported to 6.0! Update its main class to inherit from 'mindustry.mod.Plugin'. See https://mindustrygame.github.io/wiki/modding/6-migrationv6/"); }else{ Log.err("Failed to load mod file @. Skipping.", file); Log.err(e); diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 348e70b7b2..ec0c00da14 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -13,7 +13,7 @@ import mindustry.io.*; public class Weapon{ /** displayed weapon region */ - public String name; + public String name = ""; /** bullet shot */ public BulletType bullet; /** shell ejection effect */ diff --git a/core/src/mindustry/world/meta/values/WeaponListValue.java b/core/src/mindustry/world/meta/values/WeaponListValue.java index 419e689e98..706077b967 100644 --- a/core/src/mindustry/world/meta/values/WeaponListValue.java +++ b/core/src/mindustry/world/meta/values/WeaponListValue.java @@ -21,7 +21,7 @@ public class WeaponListValue implements StatValue{ @Override public void display(Table table){ table.row(); - for(int i = 0;i < weapons.size;i ++){ + for(int i = 0; i < weapons.size;i ++){ Weapon weapon = weapons.get(i); if(weapon.flipSprite){ @@ -29,7 +29,7 @@ public class WeaponListValue implements StatValue{ continue; } - TextureRegion region = weapon.outlineRegion.found() ? weapon.outlineRegion : unit.icon(Cicon.full); + TextureRegion region = !weapon.name.equals("") && weapon.outlineRegion.found() ? weapon.outlineRegion : unit.icon(Cicon.full); table.image(region).size(60).scaling(Scaling.bounded).right().top(); diff --git a/gradle.properties b/gradle.properties index c95e0534b6..12ed98ae75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=2d451f0c342755ef84e609c951a8fca654ef41b5 +archash=f99aa02b0def1951452b67263439977d1d485ae7 From f4c6870ee995a10c402805e0bcbc6d888018bbfa Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Sat, 28 Nov 2020 21:18:00 +0200 Subject: [PATCH 083/123] And so ability.unitspawn works thanks new wiki --- core/assets/bundles/bundle_ro.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 0aa8ab03f0..dfdc4583ee 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -701,7 +701,7 @@ stat.flying = Zboară ability.forcefield = Câmp de Forță ability.repairfield = Câmp de Reparare ability.statusfield = Câmp Suprasolicitare Unități -ability.unitspawn = {0} Fabrici +ability.unitspawn = Fabrică de {0} ability.shieldregenfield = Câmp de Regenerare a Scutului ability.movelightning = Mișcare Fulger From b8cb17c0c5af1fcf3819e044bf87d0ed72d65b61 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 15:08:53 -0500 Subject: [PATCH 084/123] Campaign production fixes --- .../mindustry/entities/comp/BuildingComp.java | 12 +++- .../mindustry/entities/comp/MinerComp.java | 2 + core/src/mindustry/game/SectorInfo.java | 64 ++++++++++++------- 3 files changed, 54 insertions(+), 24 deletions(-) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 7499fcd9c2..7bdc5d174a 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -14,6 +14,7 @@ import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; import arc.util.io.*; +import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.audio.*; import mindustry.content.*; @@ -29,8 +30,8 @@ import mindustry.logic.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; -import mindustry.world.blocks.*; import mindustry.world.blocks.ConstructBlock.*; +import mindustry.world.blocks.*; import mindustry.world.blocks.environment.*; import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.power.*; @@ -621,6 +622,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, * containers, it gets added to the block's inventory. */ public void offload(Item item){ + produced(item, 1); int dump = this.cdump; if(!net.client() && state.isCampaign() && team == state.rules.defaultTeam) item.unlock(); @@ -654,6 +656,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return false; } + public void produced(Item item){ + produced(item, 1); + } + + public void produced(Item item, int amount){ + if(Vars.state.rules.sector != null && team == state.rules.defaultTeam) Vars.state.rules.sector.info.handleProduction(item, amount); + } + /** Try dumping any item near the */ public boolean dump(){ return dump(null); diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java index 81aa812f61..b993815a36 100644 --- a/core/src/mindustry/entities/comp/MinerComp.java +++ b/core/src/mindustry/entities/comp/MinerComp.java @@ -76,6 +76,8 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{ if(mineTimer >= 50f + item.hardness*15f){ mineTimer = 0; + if(state.rules.sector != null && team() == state.rules.defaultTeam) state.rules.sector.info.handleProduction(item, 1); + if(core != null && within(core, mineTransferRange) && core.acceptStack(item, 1, this) == 1 && offloadImmediately()){ //add item to inventory before it is transferred if(item() == item) addItem(item); diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index 2701fc1dcb..ed9c79b612 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -23,6 +23,8 @@ public class SectorInfo{ /** Core input statistics. */ public ObjectMap production = new ObjectMap<>(); + /** Raw item production statistics. */ + public ObjectMap rawProduction = new ObjectMap<>(); /** Export statistics. */ public ObjectMap export = new ObjectMap<>(); /** Items stored in all cores. */ @@ -77,15 +79,21 @@ public class SectorInfo{ /** Counter refresh state. */ private transient Interval time = new Interval(); - /** Core item storage to prevent spoofing. */ - private transient int[] coreItemCounts; + /** Core item storage input/output deltas. */ + private @Nullable transient int[] coreDeltas; + /** Core item storage input/output deltas. */ + private @Nullable transient int[] productionDeltas; /** Handles core item changes. */ public void handleCoreItem(Item item, int amount){ - if(coreItemCounts == null){ - coreItemCounts = new int[content.items().size]; - } - coreItemCounts[item.id] += amount; + if(coreDeltas == null) coreDeltas = new int[content.items().size]; + coreDeltas[item.id] += amount; + } + + /** Handles raw production stats. */ + public void handleProduction(Item item, int amount){ + if(productionDeltas == null) productionDeltas = new int[content.items().size]; + productionDeltas[item.id] += amount; } /** @return the real location items go when launched on this sector */ @@ -176,6 +184,11 @@ public class SectorInfo{ damage = 0; hasSpawns = spawner.countSpawns() > 0; + //cap production at raw production. + production.each((item, stat) -> { + stat.mean = Math.min(stat.mean, rawProduction.get(item, ExportStat::new).mean); + }); + if(state.rules.sector != null){ state.rules.sector.saveInfo(); } @@ -189,8 +202,6 @@ public class SectorInfo{ //updating in multiplayer as a client doesn't make sense if(net.client()) return; - CoreBuild ent = state.rules.defaultTeam.core(); - //refresh throughput if(time.get(refreshPeriod)){ @@ -208,30 +219,37 @@ public class SectorInfo{ stat.mean = stat.means.rawMean(); }); - if(coreItemCounts == null){ - coreItemCounts = new int[content.items().size]; - } + if(coreDeltas == null) coreDeltas = new int[content.items().size]; + if(productionDeltas == null) productionDeltas = new int[content.items().size]; //refresh core items for(Item item : content.items()){ - ExportStat stat = production.get(item, ExportStat::new); - if(!stat.loaded){ - stat.means.fill(stat.mean); - stat.loaded = true; - } + updateDelta(item, production, coreDeltas); + updateDelta(item, rawProduction, productionDeltas); - //get item delta - int delta = coreItemCounts[item.id]; - - //store means - stat.means.add(delta); - stat.mean = stat.means.rawMean(); + production.get(item).mean = Math.min(production.get(item).mean, rawProduction.get(item).mean); } - Arrays.fill(coreItemCounts, 0); + Arrays.fill(coreDeltas, 0); + Arrays.fill(productionDeltas, 0); } } + void updateDelta(Item item, ObjectMap map, int[] deltas){ + ExportStat stat = map.get(item, ExportStat::new); + if(!stat.loaded){ + stat.means.fill(stat.mean); + stat.loaded = true; + } + + //get item delta + int delta = deltas[item.id]; + + //store means + stat.means.add(delta); + stat.mean = stat.means.rawMean(); + } + public ObjectFloatMap exportRates(){ ObjectFloatMap map = new ObjectFloatMap<>(); export.each((item, value) -> map.put(item, value.mean)); From bb16d1c613fda9d49e905e37943832be5812bdd1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 19:12:27 -0500 Subject: [PATCH 085/123] Removed Abstract block classes for better code inspection --- core/src/mindustry/ClientLauncher.java | 4 ++-- .../mindustry/world/blocks/defense/turrets/BaseTurret.java | 2 +- .../mindustry/world/blocks/defense/turrets/ReloadTurret.java | 2 +- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- core/src/mindustry/world/blocks/power/PowerBlock.java | 2 +- core/src/mindustry/world/blocks/production/Drill.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index 3777da85c7..978361898a 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -112,8 +112,8 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform super.add(module); //autoload modules when necessary - if(module instanceof Loadable){ - assets.load((Loadable)module); + if(module instanceof Loadable l){ + assets.load(l); } } diff --git a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java index e10b1612e9..44d4f63f93 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java @@ -11,7 +11,7 @@ import mindustry.world.meta.*; import static mindustry.Vars.*; -public abstract class BaseTurret extends Block{ +public class BaseTurret extends Block{ public float range = 80f; public float rotateSpeed = 5; diff --git a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java index 33538771a1..bc172e9c46 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java @@ -9,7 +9,7 @@ import mindustry.world.meta.values.*; import static mindustry.Vars.*; -public abstract class ReloadTurret extends BaseTurret{ +public class ReloadTurret extends BaseTurret{ public float reloadTime = 10f; public ReloadTurret(String name){ diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 4572852eb2..4409fa6533 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -27,7 +27,7 @@ import mindustry.world.meta.*; import static mindustry.Vars.*; -public abstract class Turret extends ReloadTurret{ +public class Turret extends ReloadTurret{ //after being logic-controlled and this amount of time passes, the turret will resume normal AI public final static float logicControlCooldown = 60 * 2; diff --git a/core/src/mindustry/world/blocks/power/PowerBlock.java b/core/src/mindustry/world/blocks/power/PowerBlock.java index e71c17aba7..4aad16ec6e 100644 --- a/core/src/mindustry/world/blocks/power/PowerBlock.java +++ b/core/src/mindustry/world/blocks/power/PowerBlock.java @@ -3,7 +3,7 @@ package mindustry.world.blocks.power; import mindustry.world.*; import mindustry.world.meta.*; -public abstract class PowerBlock extends Block{ +public class PowerBlock extends Block{ public PowerBlock(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index cc0c14b278..49c5576a29 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -259,7 +259,7 @@ public class Drill extends Block{ progress += delta() * dominantItems * speed * warmup; if(Mathf.chanceDelta(updateEffectChance * warmup)) - updateEffect.at(getX() + Mathf.range(size * 2f), getY() + Mathf.range(size * 2f)); + updateEffect.at(x + Mathf.range(size * 2f), y + Mathf.range(size * 2f)); }else{ lastDrillSpeed = 0f; warmup = Mathf.lerpDelta(warmup, 0f, warmupSpeed); @@ -274,7 +274,7 @@ public class Drill extends Block{ index ++; progress %= delay; - drillEffect.at(getX() + Mathf.range(size), getY() + Mathf.range(size), dominantItem.color); + drillEffect.at(x + Mathf.range(size), y + Mathf.range(size), dominantItem.color); } } From 810238d0f960e9323925fc20df7ec8cd72648ecc Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 20:30:43 -0500 Subject: [PATCH 086/123] Cleanup --- core/src/mindustry/game/SectorInfo.java | 5 +---- core/src/mindustry/world/blocks/ConstructBlock.java | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index ed9c79b612..045d9aa2e9 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -242,11 +242,8 @@ public class SectorInfo{ stat.loaded = true; } - //get item delta - int delta = deltas[item.id]; - //store means - stat.means.add(delta); + stat.means.add(deltas[item.id]); stat.mean = stat.means.rawMean(); } diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index 871e43a898..e895018273 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -276,7 +276,8 @@ public class ConstructBlock extends Block{ if(clampedAmount > 0 && accumulated > 0){ //if it's positive, add it to the core if(core != null && requirements[i].item.unlockedNow()){ //only accept items that are unlocked int accepting = core.acceptStack(requirements[i].item, accumulated, builder); - core.handleStack(requirements[i].item, accepting, builder); + //transfer items directly, as this is not production. + core.items.add(requirements[i].item, accepting); accumulator[i] -= accepting; }else{ accumulator[i] -= accumulated; From 25015a61ae35044af45cc62e7fca30e6336f7c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Sun, 29 Nov 2020 10:36:28 +0800 Subject: [PATCH 087/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 133 +++++++++----------- 1 file changed, 57 insertions(+), 76 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 872d768d38..d9283d462b 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -546,13 +546,13 @@ sectors.vulnerable = [scarlet]脆弱的 sectors.underattack = [scarlet]遭到攻击！[accent]{0}% 损毁度 sectors.survives = [accent]存活{0}波 sectors.go = 进入 -sector.curcapture = 区域已占领 -sector.curlost = 区域丢失 +sector.curcapture = 区块已占领 +sector.curlost = 区块已丢失 sector.missingresources = [scarlet]核心资源不足 -sector.attacked = 区域[accent]{0}[white]受到攻击! -sector.lost = 区域[accent]{0}[white]已丢失! +sector.attacked = 区块[accent]{0}[white]受到攻击! +sector.lost = 区块[accent]{0}[white]已丢失! #note: the missing space in the line below is intentional -sector.captured = 区域[accent]{0}[white]已占领! +sector.captured = 区块[accent]{0}[white]已占领! threat.low = 低度 threat.medium = 中度 @@ -692,11 +692,11 @@ stat.flying = 可飞行 ability.forcefield = 力墙场 ability.repairfield = 修复场 ability.statusfield = 状态场 -ability.unitspawn = {0} 工厂 +ability.unitspawn = {0} 单位工厂 ability.shieldregenfield = 护盾再生场 -ability.movelightning = 闪电移动 +ability.movelightning = 闪电助推器 -bar.drilltierreq = 需要更好的钻头 +bar.drilltierreq = 需要更高级的钻头 bar.noresources = 缺失资源 bar.corereq = 缺失核心基座 bar.drillspeed = 挖掘速度：{0}/秒 @@ -723,13 +723,13 @@ units.processorcontrol = [lightgray]由处理器控制 bullet.damage = [stat]{0}[lightgray] 伤害 bullet.splashdamage = [stat]{0}[lightgray] 范围伤害 ~[stat] {1}[lightgray] 格 bullet.incendiary = [stat] 燃烧 -bullet.sapping = [stat]sapping +bullet.sapping = [stat] 削弱 bullet.homing = [stat] 追踪 bullet.shock = [stat] 电击 bullet.frag = [stat] 分裂 bullet.knockback = [stat]{0}[lightgray] 击退 bullet.pierce = [stat]{0}[lightgray]x 穿透 -bullet.infinitepierce = [stat]pierce +bullet.infinitepierce = [stat] 穿透 bullet.healpercent = [stat]{0}[lightgray]% 修复 bullet.freezing = [stat] 冰冻 bullet.tarred = [stat] 减速 @@ -804,16 +804,16 @@ setting.borderlesswindow.name = 无边界窗口[lightgray]（可能需要重启 setting.fps.name = 显示 FPS 和网络延迟 setting.smoothcamera.name = 镜头平滑 setting.vsync.name = 垂直同步 -setting.pixelate.name = 像素画面 [lightgray]（禁用动画） +setting.pixelate.name = 像素画面 [lightgray] setting.minimap.name = 显示小地图 -setting.coreitems.name = 显示核心 (开发中) +setting.coreitems.name = 显示核心物资 setting.position.name = 显示玩家坐标 setting.musicvol.name = 音乐音量 setting.atmosphere.name = 显示行星大气层 setting.ambientvol.name = 环境音量 -setting.mutemusic.name = 无音乐 +setting.mutemusic.name = 禁用音乐 setting.sfxvol.name = 音效音量 -setting.mutesound.name = 无音效 +setting.mutesound.name = 禁用音效 setting.crashreport.name = 发送匿名的崩溃报告 setting.savecreate.name = 自动创建存档 setting.publichost.name = 游戏公开可见 @@ -955,7 +955,7 @@ content.sector.name = 区域 item.copper.name = 铜 item.lead.name = 铅 -item.coal.name = 煤 +item.coal.name = 煤炭 item.graphite.name = 石墨 item.titanium.name = 钛 item.thorium.name = 钍 @@ -969,6 +969,7 @@ item.blast-compound.name = 爆炸混合物 item.pyratite.name = 硫 item.metaglass.name = 钢化玻璃 item.scrap.name = 废料 + liquid.water.name = 水 liquid.slag.name = 矿渣 liquid.oil.name = 石油 @@ -1237,20 +1238,20 @@ team.purple.name = 紫 hint.skip = 跳过 hint.desktopMove = 使用[accent][[WASD][]来移动. -hint.zoom = [accent]滚动[]鼠标滚轮放大或缩小. +hint.zoom = 滚动[accent]鼠标滚轮[]放大或缩小. hint.mine = 移动到\uf8c4 铜矿附近并[accent]点按[]进行手动开采. hint.desktopShoot = [accent][[鼠标左键][]射击. hint.depositItems = 要转移物品，请将其从飞船上拖到核心。 hint.respawn = 要于核心中重生，请按[accent][[V][]. -hint.respawn.mobile = 您已切换控制单元/结构. 如果要重生飞船请[accent]点击左上方的图标(您的单元/结构图标).[] +hint.respawn.mobile = 您已切换控制单元/结构. 如果要重生飞船，请[accent]点击左上方的图标(您的单元/结构图标).[] hint.desktopPause = 按[accent][[Space][]暂停和取消暂停游戏. -hint.placeDrill = 选择右下角菜单中的\ue85e [accent]钻头[]标签，然后选择一个\uf870 [accent]钻头[]然后单击铜矿将其放置. -hint.placeDrill.mobile = 选择右下角菜单中的\ue85e [accent]钻头[]标签，然后选择一个\uf870 [accent]钻头[]然后点击铜矿将其放置.\n\n点击右下角\ue800 [accent]复选标记[]以确认. -hint.placeConveyor = 传送带将物品从钻头移到其他方块中。从\ue814 [accent]布局[]标签选择\uf896 [accent]传送带[].\n\n单击并拖动以放置多个传送带.\n[accent]滚动[]以旋转. -hint.placeConveyor.mobile = 传送带将物品从钻头移到其他块中。从\ue814 [accent]布局[]标签选择\uf896 [accent]传送带[].\n\n长按一秒钟，然后拖动以放置多个传送带. +hint.placeDrill = 选择右下角菜单中的\ue85e [accent]钻头[]分类，然后选择一个\uf870 [accent]钻头[]然后单击铜矿将其放置. +hint.placeDrill.mobile = 选择右下角菜单中的\ue85e [accent]钻头[]分类，然后选择一个\uf870 [accent]钻头[]，然后点击铜矿将其放置.\n\n点击右下角\ue800 [accent]复选标记[]以确认. +hint.placeConveyor = 传送带将物品从钻头移到其他方块中。从\ue814 [accent]布局[]分类选择\uf896 [accent]传送带[].\n\n单击并拖动以放置多个传送带.\n[accent]滚动[]以旋转. +hint.placeConveyor.mobile = 传送带将物品从钻头移到其他块中。从\ue814 [accent]布局[]分类选择\uf896 [accent]传送带[].\n\n长按一秒钟，然后拖动以放置多个传送带. hint.placeTurret = 放置\uf861 [accent]炮塔[]以抵御敌人，保卫你的核心.\n\n炮塔需要弹药-\uf838 铜.\n使用传送带和钻头为它们供弹。 hint.breaking = [accent]右击[]并拖动以拆除方块. -hint.breaking.mobile = 点击\ue817 [accent]锤子[]在右下角点击以拆除方块.\n\n按住手指一秒钟，然后拖动以选择. +hint.breaking.mobile = 点击在右下角的\ue817 [accent]锤子[]点击以拆除方块.\n\n按住手指一秒钟，然后拖动并选择. hint.research = 点击\ue875 [accent]科技树[]按钮研究新技术. hint.research.mobile = 点击在\ue88c [accent]菜单[]中的\ue875 [accent]科技树[]按钮以研究新技术. hint.unitControl = 按住[accent][[L-ctrl][]并[accent]点击[]友军单位或炮塔来进行控制。 @@ -1269,54 +1270,34 @@ hint.payloadDrop = 按[accent]][]放下有效载荷. hint.payloadDrop.mobile = [accent]点住[]一个空的位置将有效载荷丢到那里. hint.waveFire = [accent]波浪[]炮塔加水弹药会自动扑灭附近的火. hint.generator = \uf879 [accent]燃烧发电机[]燃烧煤炭并将电力传输到相邻方块.\n\n用\uf87f [accent]能量节点[]可以扩展电力传输范围. -hint.guardian = [accent]Boss[] 单位装甲厚重. [accent]铜[] 和 [accent]铅[] 这类较弱的子弹对其 [scarlet]作用不佳[].\n\n使用高级别炮塔或使用 \uf835 [accent]石墨[] 作为\uf861 双管炮/及\uf859齐射炮的弹药来消灭 Boss. +hint.guardian = [accent]Boss[]单位装甲厚重.[accent]铜[]和[accent]铅[]这类较弱的子弹对其[scarlet]作用不佳[].\n\n使用高级别炮塔或使用\uf835 [accent]石墨[]作为\uf861 双管炮及\uf859 齐射炮的弹药来消灭Boss. -item.copper.description = 一种最基本的的建筑材料。在各种类型的建筑中被广泛使用。 -item.copper.details = 铜. 在塞普罗上的异常丰富的金属。 除非加固，否则结构较弱。 -item.lead.description = 一种基本的电力材料。广泛用于电子设备和液体输送模块。 -item.lead.details = 致密且呈惰性。广泛用于电池中。\n注意：可能对生物生命体有毒。不是说这里还有很多。 -item.metaglass.description = 一种致密坚硬的复合玻璃。广泛用于液体输送和存储。 -item.graphite.description = 一种高密度的碳材料，用于弹药和电器元件。 -item.sand.description = 一种常见的材料，广泛用于冶炼，包括制作合金和助熔剂。 -item.coal.description = 在农耕文明前就形成的植物化石，常见且容易获得，常用作燃料或其他资源的生产。 +item.copper.description = 用于所有类型的建筑和弹药。 +item.copper.details = 铜。在塞普罗上的异常丰富的金属。不经加固，结构会较脆弱。 +item.lead.description = 用于液体输送和电气结构。 +item.lead.details = 致密且呈惰性。广泛用于电池中。\n注意：可能对生物生命体有毒。虽说这里还有很多。 +item.metaglass.description = 用于液体传输/储存结构。 +item.graphite.description = 用于电子元件和炮塔弹药。 +item.sand.description = 用于生产其他精炼材料。 +item.coal.description = 用于燃料和精炼材料生产。 item.coal.details = 似乎是植物的化石，在孢子荚出现前很久就形成了。 -item.titanium.description = 一种罕见的超轻金属，被广泛运用于液体运输、钻头和飞机。 -item.thorium.description = 一种致密的放射性金属，用作结构支撑和核燃料。 -item.scrap.description = 一种废弃的建筑物及废弃单位的残骸，富含多种金属元素。 -item.silicon.description = 一种非常有用的半导体，被用于太阳能电池板和很多复杂的电子设备。 -item.plastanium.description = 一种轻质、可延展的材料，用于高级的飞机和碎片弹药。 -item.phase-fabric.description = 一种近乎无重量的物质，用于先进的电子技术和自我修复技术。 -item.surge-alloy.description = 一种先进的合金，具有独特的电气性能。 -item.spore-pod.description = 一种用于制造石油、炸药及燃料的生物质。 -item.spore-pod.details = 孢子。可能是人工合成的生命形式。释放对其他生物有毒的气体。极具生物侵略性。在某些条件下高度易燃。 -item.blast-compound.description = 一种用于炸弹和炸药的挥发性混合物。虽然它可以作为燃料，但不建议这样做。 -item.pyratite.description = 一种在燃烧武器中使用的极易燃物质。 -liquid.water.description = 最有用的液体。常用于冷却机器和废物处理。 -liquid.slag.description = 各种不同类型的熔融金属混合在一起的液体。可以被分解成其矿物成分，或作为武器喷向敌方单位。 -liquid.oil.description = 用于先进材料生产的液体。可以转换成煤作为燃料，或作为武器喷射和放火。 -liquid.cryofluid.description = 一种由水和钛制成的惰性、无腐蚀性的液体。具有极高的热容量。广泛用作冷却剂。 +item.titanium.description = 用于液体运输结构、钻头和飞行器。 +item.thorium.description = 用于耐用结构和核燃料。 +item.scrap.description = 用于熔炉和粉碎机来精炼成其他材料。 +item.scrap.details = 旧结构和单位的残余物。 +item.silicon.description = 用于太阳能板，复杂的电气元件和追踪性弹药。 +item.plastanium.description = 用于先进单位、绝缘和分裂性弹药。 +item.phase-fabric.description = 用于高级电子设备和自修复结构。 +item.surge-alloy.description = 用于先进武器和反应防御结构。 +item.spore-pod.description = 用于转化成石油、爆炸物和燃料。 +item.spore-pod.details = 孢子。可能是人工合成的生命形式。释放对其他生物有毒的气体。极具侵略性。在某些条件下高度易燃。 +item.blast-compound.description = 用于炸弹和爆炸性弹药。 +item.pyratite.description = 用于燃烧武器和燃烧燃料发电机。 -item.copper.description = Used in all types of construction and ammunition. -item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced. -item.lead.description = Used in liquid transportation and electrical structures. -item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here. -item.metaglass.description = Used in liquid distribution/storage structures. -item.graphite.description = Used in electrical components and turret ammunition. -item.sand.description = Used for production of other refined materials. -item.coal.description = Used for fuel and refined material production. -item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event. -item.titanium.description = Used in liquid transportation structures, drills and aircraft. -item.thorium.description = Used in durable structures and as nuclear fuel. -item.scrap.description = Used in Melters and Pulverizers for refining into other materials. -item.scrap.details = Leftover remnants of old structures and units. -item.silicon.description = Used in solar panels, complex electronics and homing turret ammunition. -item.plastanium.description = Used in advanced units, insulation and fragmentation ammunition. -item.phase-fabric.description = Used in advanced electronics and self-repairing structures. -item.surge-alloy.description = Used in advanced weaponry and reactive defense structures. -item.spore-pod.description = Used for conversion into oil, explosives and fuel. -item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions. -item.blast-compound.description = Used in bombs and explosive ammunition. -item.pyratite.description = Used in incendiary weapons and combustion-fueled generators. +liquid.water.description = 用于冷却机器和废物处理。 +liquid.slag.description = 在分离器中提炼成金属成分，或作为武器弹药喷向敌人。 +liquid.oil.description = 用于先进材料生产和燃烧弹药。 +liquid.cryofluid.description = 用作反应堆、炮塔和工厂的冷却剂。 block.message.description = 保存一条文字信息。用于队友之间进行交流。 block.graphite-press.description = 将煤块压缩成纯石墨片材料。 @@ -1435,15 +1416,15 @@ block.meltdown.description = 超大型激光炮塔，充能之后持续发射光 block.repair-point.description = 持续治疗其附近受损最严重的单位。 block.segment.description = 摧毁袭来的除激光以外的子弹或导弹. -block.resupply-point.description = Resupplies nearby units with copper ammunition. Not compatible with units that require battery power. -block.armored-conveyor.description = Moves items forward. Does not accept inputs from the sides. -block.illuminator.description = Emits light. -block.message.description = Stores a message for communication between allies. -block.graphite-press.description = Compresses coal into graphite. -block.multi-press.description = Compresses coal into graphite. Requires water as coolant. -block.silicon-smelter.description = Refines silicon from sand and coal. -block.kiln.description = Smelts sand and lead into metaglass. -block.plastanium-compressor.description = Produces plastanium from oil and titanium. +block.resupply-point.description = 为附近的部队提供铜弹药。与需要电池供电的设备不兼容。 +block.armored-conveyor.description = 向前方移动物品。不接受边上的输入。 +block.illuminator.description = 释放光源。 +block.message.description = 保存一条文字信息。用于队友之间进行交流。 +block.graphite-press.description = 将煤炭压缩为石墨。 +block.multi-press.description = 将煤炭压缩为石墨。需要水进行冷却。 +block.silicon-smelter.description = 将沙和煤炭精炼为硅。 +block.kiln.description = 将沙和铅熔炼为钢化玻璃。 +block.plastanium-compressor.description = 用石油和钛生产塑钢。 block.phase-weaver.description = Synthesizes phase fabric from thorium and sand. block.alloy-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy. block.cryofluid-mixer.description = Mixes water and fine titanium powder to produce cryofluid. From b63501b1c7cea96146b6664ba66b3f748bb71ddd Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 21:51:26 -0500 Subject: [PATCH 088/123] Core overfill bugfix --- core/src/mindustry/world/blocks/ConstructBlock.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index e895018273..c99f36f36b 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -19,6 +19,7 @@ import mindustry.graphics.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; +import mindustry.world.blocks.storage.CoreBlock.*; import mindustry.world.modules.*; import static mindustry.Vars.*; @@ -275,7 +276,7 @@ public class ConstructBlock extends Block{ if(clampedAmount > 0 && accumulated > 0){ //if it's positive, add it to the core if(core != null && requirements[i].item.unlockedNow()){ //only accept items that are unlocked - int accepting = core.acceptStack(requirements[i].item, accumulated, builder); + int accepting = Math.min(accumulated, ((CoreBuild)core).storageCapacity - core.items.get(requirements[i].item)); //transfer items directly, as this is not production. core.items.add(requirements[i].item, accepting); accumulator[i] -= accepting; From d6c5eb121c4190db506d024c215e3a23e796afe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Sun, 29 Nov 2020 11:03:36 +0800 Subject: [PATCH 089/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 78 ++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index d9283d462b..3d5b929a9b 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -961,7 +961,7 @@ item.titanium.name = 钛 item.thorium.name = 钍 item.silicon.name = 硅 item.plastanium.name = 塑钢 -item.phase-fabric.name = 相织物 +item.phase-fabric.name = 相位物 item.surge-alloy.name = 巨浪合金 item.spore-pod.name = 孢子荚 item.sand.name = 沙 @@ -1096,8 +1096,8 @@ block.titanium-wall.name = 钛墙 block.titanium-wall-large.name = 大型钛墙 block.plastanium-wall.name = 塑钢墙 block.plastanium-wall-large.name = 大型塑钢墙 -block.phase-wall.name = 相织物墙 -block.phase-wall-large.name = 大型相织物墙 +block.phase-wall.name = 相位物墙 +block.phase-wall-large.name = 大型相位物墙 block.thorium-wall.name = 钍墙 block.thorium-wall-large.name = 大型钍墙 block.door.name = 门 @@ -1121,7 +1121,7 @@ block.illuminator.name = 照明器 block.overflow-gate.name = 溢流门 block.underflow-gate.name = 反向溢流门 block.silicon-smelter.name = 硅冶炼厂 -block.phase-weaver.name = 相织物编织器 +block.phase-weaver.name = 相位物编织器 block.pulverizer.name = 粉碎机 block.cryofluid-mixer.name = 冷冻液混合器 block.melter.name = 熔炉 @@ -1159,7 +1159,7 @@ block.tsunami.name = 海啸 block.swarmer.name = 蜂群 block.salvo.name = 齐射炮 block.ripple.name = 浪涌 -block.phase-conveyor.name = 相织物传送带桥 +block.phase-conveyor.name = 相位物传送带桥 block.bridge-conveyor.name = 传送带桥 block.plastanium-compressor.name = 塑钢压缩机 block.pyratite-mixer.name = 硫化物混合器 @@ -1170,7 +1170,7 @@ block.oil-extractor.name = 石油钻井 block.repair-point.name = 维修点 block.pulse-conduit.name = 脉冲导管 block.plated-conduit.name = 电镀导管 -block.phase-conduit.name = 相织物导管桥 +block.phase-conduit.name = 相位物导管桥 block.liquid-router.name = 液体路由器 block.liquid-tank.name = 储液罐 block.liquid-junction.name = 液体交叉器 @@ -1425,39 +1425,39 @@ block.multi-press.description = 将煤炭压缩为石墨。需要水进行冷却 block.silicon-smelter.description = 将沙和煤炭精炼为硅。 block.kiln.description = 将沙和铅熔炼为钢化玻璃。 block.plastanium-compressor.description = 用石油和钛生产塑钢。 -block.phase-weaver.description = Synthesizes phase fabric from thorium and sand. -block.alloy-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy. -block.cryofluid-mixer.description = Mixes water and fine titanium powder to produce cryofluid. -block.blast-mixer.description = Produces blast compound from pyratite and spore pods. -block.pyratite-mixer.description = Mixes coal, lead and sand into pyratite. -block.melter.description = Melts down scrap into slag. -block.separator.description = Separates slag into its mineral components. -block.spore-press.description = Compresses spore pods into oil. -block.pulverizer.description = Crushes scrap into fine sand. -block.coal-centrifuge.description = Transforms oil into coal. -block.incinerator.description = Vaporizes any item or liquid it receives. -block.power-void.description = Voids all power inputted. Sandbox only. -block.power-source.description = Infinitely outputs power. Sandbox only. -block.item-source.description = Infinitely outputs items. Sandbox only. -block.item-void.description = Destroys any items. Sandbox only. -block.liquid-source.description = Infinitely outputs liquids. Sandbox only. -block.liquid-void.description = Removes any liquids. Sandbox only. -block.copper-wall.description = Protects structures from enemy projectiles. -block.copper-wall-large.description = Protects structures from enemy projectiles. -block.titanium-wall.description = Protects structures from enemy projectiles. -block.titanium-wall-large.description = Protects structures from enemy projectiles. -block.plastanium-wall.description = Protects structures from enemy projectiles. Absorbs lasers and electric arcs. Blocks automatic power connections. -block.plastanium-wall-large.description = Protects structures from enemy projectiles. Absorbs lasers and electric arcs. Blocks automatic power connections. -block.thorium-wall.description = Protects structures from enemy projectiles. -block.thorium-wall-large.description = Protects structures from enemy projectiles. -block.phase-wall.description = Protects structures from enemy projectiles, reflecting most bullets upon impact. -block.phase-wall-large.description = Protects structures from enemy projectiles, reflecting most bullets upon impact. -block.surge-wall.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact. -block.surge-wall-large.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact. -block.door.description = A wall that can be opened and closed. -block.door-large.description = A wall that can be opened and closed. -block.mender.description = Periodically repairs blocks in its vicinity.\nOptionally uses silicon to boost range and efficiency. -block.mend-projector.description = Repairs blocks in its vicinity.\nOptionally uses phase fabric to boost range and efficiency. +block.phase-weaver.description = 从钍和沙合成相位物。 +block.alloy-smelter.description = 将钛、铅、硅和铜熔合成巨浪合金。 +block.cryofluid-mixer.description = 将水和细钛粉混合制成冷冻液。 +block.blast-mixer.description = 从硫化物和孢子荚中产生爆炸化合物。 +block.pyratite-mixer.description = 把煤、铅和沙子混和为硫化物。 +block.melter.description = 将废料熔化成矿渣。 +block.separator.description = 将矿渣分离成矿物成分。 +block.spore-press.description = 将孢子荚压缩成石油。 +block.pulverizer.description = 将废料粉碎成细沙。 +block.coal-centrifuge.description = 把石油变成煤。 +block.incinerator.description = 熔融并蒸发它接收到的任何物品或液体。 +block.power-void.description = 消耗输入的所有能量。仅限沙盒。 +block.power-source.description = 无限输出能量。仅限沙盒。 +block.item-source.description = 无限输出物品。仅限沙盒。 +block.item-void.description = 销毁输入的所有物品。仅限沙盒。 +block.liquid-source.description = 无限输出液体。仅限沙盒。 +block.liquid-void.description = 移除输入的所有液体。仅限沙盒。 +block.copper-wall.description = 保护己方结构，挡下敌方炮弹。 +block.copper-wall-large.description = 保护己方结构，挡下敌方炮弹。 +block.titanium-wall.description = 保护己方结构，挡下敌方炮弹。 +block.titanium-wall-large.description = 保护己方结构，挡下敌方炮弹。 +block.plastanium-wall.description = 保护己方结构，挡下敌方炮弹。吸收激光和电弧。阻止电力节点自动连接。 +block.plastanium-wall-large.description = 保护己方结构，挡下敌方炮弹。吸收激光和电弧。阻止电力节点自动连接。 +block.thorium-wall.description = 保护己方结构，挡下敌方炮弹。 +block.thorium-wall-large.description = 保护己方结构，挡下敌方炮弹。 +block.phase-wall.description = 保护己方结构，挡下敌方炮弹。在受攻击时反射大多数子弹。 +block.phase-wall-large.description = 保护己方结构，挡下敌方炮弹。在受攻击时反射大多数子弹。 +block.surge-wall.description = 保护己方结构，挡下敌方炮弹。受攻击时定期释放电弧。 +block.surge-wall-large.description = 保护己方结构，挡下敌方炮弹。受攻击时定期释放电弧。 +block.door.description = 可以开关的墙。 +block.door-large.description = 可以开关的墙。 +block.mender.description = 定期修复附近的区块。\n可使用硅来提高范围和效率。 +block.mend-projector.description = 修复其附近的区块。\n可使用相位物来提高射程和效率。 block.overdrive-projector.description = Increases the speed of nearby buildings.\nOptionally uses phase fabric to boost range and efficiency. block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage.\nOverheats if too much damage is sustained. Optionally uses coolant to prevent overheating. Phase fabric increases shield size. block.shock-mine.description = Releases electric arcs upon enemy unit contact. From 3c51d82a1a0506904bbbbd57cb84f6469628f26b Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 22:45:36 -0500 Subject: [PATCH 090/123] Fixed #3648 --- core/src/mindustry/entities/bullet/BulletType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 7d94602844..4d93321367 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -273,7 +273,8 @@ public abstract class BulletType extends Content{ } if(weaveMag > 0){ - b.vel.rotate(Mathf.sin(Mathf.randomSeed(b.id, 10f) + b.time, weaveScale, weaveMag) * Time.delta); + float scl = Mathf.randomSeed(id, 0.9f, 1.1f); + b.vel.rotate(Mathf.sin(b.time + Mathf.PI * weaveScale/2f * scl, weaveScale * scl, weaveMag) * Time.delta); } if(trailChance > 0){ From 3d6fd8a351599931a4247fb16fd2d0c5c92d7ed4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 23:23:39 -0500 Subject: [PATCH 091/123] De-abstracted weather --- core/src/mindustry/type/Weather.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java index bb6b444746..8c9bdb0b60 100644 --- a/core/src/mindustry/type/Weather.java +++ b/core/src/mindustry/type/Weather.java @@ -19,7 +19,7 @@ import mindustry.world.blocks.*; import static mindustry.Vars.*; -public abstract class Weather extends UnlockableContent{ +public class Weather extends UnlockableContent{ /** Default duration of this weather event in ticks. */ public float duration = 10f * Time.toMinutes; public float opacityMultiplier = 1f; From 23fc86fac1d1435c1fcef01675159c54a67e3994 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Nov 2020 23:59:56 -0500 Subject: [PATCH 092/123] Updated wiki links --- core/src/mindustry/Vars.java | 2 +- core/src/mindustry/mod/ContentParser.java | 4 ++++ .../world/blocks/environment/OverlayFloor.java | 2 +- .../world/blocks/units/ControlCenter.java | 16 ---------------- 4 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 core/src/mindustry/world/blocks/units/ControlCenter.java diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index d0995ca3a8..8269c05b06 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -56,7 +56,7 @@ public class Vars implements Loadable{ /** URL for sending crash reports to */ public static final String crashReportURL = "http://192.99.169.18/report"; /** URL the links to the wiki's modding guide.*/ - public static final String modGuideURL = "https://mindustrygame.github.io/wiki/modding/"; + public static final String modGuideURL = "https://mindustrygame.github.io/wiki/modding/1-modding/"; /** URL to the JSON file containing all the global, public servers. Not queried in BE. */ public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers.json"; /** URL to the JSON file containing all the BE servers. Only queried in BE. */ diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 4cd9d704f5..e95639ed2e 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -309,6 +309,10 @@ public class ContentParser{ } + if(value.has("controller")){ + unit.defaultController = make(resolve(value.getString("controller"), "mindustry.ai.type")); + } + //read extra default waves if(value.has("waves")){ JsonValue waves = value.remove("waves"); diff --git a/core/src/mindustry/world/blocks/environment/OverlayFloor.java b/core/src/mindustry/world/blocks/environment/OverlayFloor.java index 4c57943aed..c20eccceaf 100644 --- a/core/src/mindustry/world/blocks/environment/OverlayFloor.java +++ b/core/src/mindustry/world/blocks/environment/OverlayFloor.java @@ -4,7 +4,7 @@ import arc.graphics.g2d.*; import arc.math.*; import mindustry.world.*; -/**A type of floor that is overlaid on top of over floors.*/ +/**A type of floor that is overlaid on top of other floors.*/ public class OverlayFloor extends Floor{ public OverlayFloor(String name){ diff --git a/core/src/mindustry/world/blocks/units/ControlCenter.java b/core/src/mindustry/world/blocks/units/ControlCenter.java deleted file mode 100644 index ab99470b93..0000000000 --- a/core/src/mindustry/world/blocks/units/ControlCenter.java +++ /dev/null @@ -1,16 +0,0 @@ -package mindustry.world.blocks.units; - -import mindustry.gen.*; -import mindustry.world.*; - -public class ControlCenter extends Block{ - - public ControlCenter(String name){ - super(name); - update = true; - } - - public class ControlCenterBuild extends Building{ - - } -} From b488cd8dff75cc0bf9a8119dfb2144782ed631c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Sun, 29 Nov 2020 22:48:14 +0800 Subject: [PATCH 093/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 45 +++++++++++---------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 3d5b929a9b..e43c50db19 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -22,7 +22,7 @@ gameover.pvp = [accent] {0}[]队获胜！ gameover.waiting = [accent]正在更换下一张地图... highscore = [accent]新纪录！ copied = 已复制 -indev.popup = [accent]6.0[]仍在[accent]测试版[].\n[lightgray]这意味着:[]\n[scarlet]- 战役玩法完全没有完成[]\n- 很多内容还没有做完\n- 大多[scarlet]单位AI[]无法正确地运行\n- 单位系统完全没有完成\n- 一切您所看到的内容都可能会移除或调整。\n\n在[accent]Github[]提交错误报告。\n[#66ccff]来自译者WinterUnderTheSnow的忠告：不建议新玩家游玩还在测试阶段的6.0！建议您先从[orange]v104.6[#66ccff]或[orange]v104.10[#66ccff]开始游玩！ +indev.popup = [accent]6.0[]仍在[accent]测试版[].\n[lightgray]这意味着:[]\n[scarlet]- 战役玩法完全没有完成[]\n- 很多内容还没有做完\n- 大多[scarlet]单位AI[]无法正确地运行\n- 单位系统完全没有完成\n- 一切您所看到的内容都可能会移除或调整。\n\n在[accent]Github[]提交错误报告。 indev.notready = 这部分玩法还未开发完成。 indev.campaign = [accent]恭喜！您已经到达战役模式的结尾！[]\n\n这是目前内容的全部。 未来的更新中将添加行星际旅行。 @@ -768,7 +768,7 @@ setting.shadows.name = 影子 setting.blockreplace.name = 自动推荐合适的建筑 setting.linear.name = 抗锯齿 setting.hints.name = 提示 -setting.flow.name = 显示资源传送速度[scarlet] (实验性） +setting.flow.name = 显示资源传送速度[scarlet] setting.backgroundpause.name = 在背景中暂停 setting.buildautopause.name = 自动暂停建造 setting.animatedwater.name = 流动的水 @@ -1458,26 +1458,27 @@ block.door.description = 可以开关的墙。 block.door-large.description = 可以开关的墙。 block.mender.description = 定期修复附近的区块。\n可使用硅来提高范围和效率。 block.mend-projector.description = 修复其附近的区块。\n可使用相位物来提高射程和效率。 -block.overdrive-projector.description = Increases the speed of nearby buildings.\nOptionally uses phase fabric to boost range and efficiency. -block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage.\nOverheats if too much damage is sustained. Optionally uses coolant to prevent overheating. Phase fabric increases shield size. -block.shock-mine.description = Releases electric arcs upon enemy unit contact. -block.conveyor.description = Transports items forward. -block.titanium-conveyor.description = Transports items forward. Faster than a standard conveyor. -block.plastanium-conveyor.description = Transports items forward in batches. Accepts items at the back, and unloads them in three directions at the front. Requires multiple loading and unloading points for peak throughput. -block.junction.description = Acts as a bridge for two crossing conveyor belts. -block.bridge-conveyor.description = Transports items over terrain or buildings. -block.phase-conveyor.description = Instantly transports items over terrain or buildings. Longer range than the item bridge, but requires power. -block.sorter.description = If an input item matches the selection, it passes forward. Otherwise, the item is outputted to the left and right. -block.inverted-sorter.description = Similar to a standard sorter, but outputs selected items to the sides instead. -block.router.description = Distributes input items to 3 output directions equally. -block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output. -block.distributor.description = Distributes input items to 7 output directions equally. -block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates. -block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates. -block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers. -block.mechanical-pump.description = Pumps and outputs liquids. Does not require power. -block.rotary-pump.description = Pumps and outputs liquids. Requires power. -block.thermal-pump.description = Pumps and outputs liquids. +block.overdrive-projector.description = 提高附近建筑物的速度。\n可使用相位物来提高射程和效率。 +block.force-projector.description = 在自身周围创建一个六角形力场，使里面的建筑物和单位免受伤害。\n持续承受高伤害会导致过热，可以使用冷却液降温。相织物可用于增加护盾大小。 +block.shock-mine.description = 对踩到它的敌人释放电弧进行攻击。 +block.thermal-pump.description = 终级液泵。 +block.conveyor.description = 将物品向前输送。 +block.titanium-conveyor.description = 将物品向前输送。快于初级传送带。 +block.plastanium-conveyor.description = 打包物品进行运输。\n在后方输入物品，在前方三个方向输出物品。需要多个装载和卸载点才能达到峰值载量。 +block.junction.description = 两条交叉传送带的桥梁。 +block.bridge-conveyor.description = 跨越任意地形或建筑物运输物品。 +block.phase-conveyor.description = 跨越任意地形或建筑物即时运输物品。比传送带桥范围更大，但需要电力。 +block.sorter.description = 如果物品与所选种类相同，则允许其通过。否则，物品将从左边和右边输出。 +block.inverted-sorter.description = 像分类器一样处理物品，但却是向两侧输出选定的物品。 +block.router.description = 将物品平均分配到其他3个方向。 +block.router.details = 这是个好东西，也可以带来麻烦。不建议在工厂旁边使用，因为它们会被产出堵塞。 +block.distributor.description = 将物品平均分配到其他7个方向。 +block.overflow-gate.description = 当前方被阻塞时才会向左和右输出，用于处理多余的物品。 +block.underflow-gate.description = 与溢流门相反。 当左右均堵塞时才向前方运输。 +block.mass-driver.description = 长距离物品传输结构，收集若干物品后将其射到远处的另一个质量驱动器。 +block.mechanical-pump.description = 泵送液体，不需要能量。 +block.rotary-pump.description = 泵送液体，需要能量。 +block.thermal-pump.description = 泵送液体。 block.conduit.description = Moves liquids forward. Used in conjunction with pumps and other conduits. block.pulse-conduit.description = Moves liquids forward. Transports faster and stores more than standard conduits. block.plated-conduit.description = Moves liquids forward. Does not accept input from the sides. Does not leak. From 9a3b21d77a832de7f1efe5261e84bdf10668f790 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 09:54:52 -0500 Subject: [PATCH 094/123] Fixed #3650 --- .../mindustry/entities/comp/BoundedComp.java | 12 +++++++----- .../mindustry/entities/comp/BuilderComp.java | 18 ++++++++++-------- core/src/mindustry/entities/comp/UnitComp.java | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/core/src/mindustry/entities/comp/BoundedComp.java b/core/src/mindustry/entities/comp/BoundedComp.java index c266ae3e51..c02d34a760 100644 --- a/core/src/mindustry/entities/comp/BoundedComp.java +++ b/core/src/mindustry/entities/comp/BoundedComp.java @@ -16,11 +16,13 @@ abstract class BoundedComp implements Velc, Posc, Healthc, Flyingc{ @Override public void update(){ - //repel unit out of bounds - if(x < 0) vel.x += (-x/warpDst); - if(y < 0) vel.y += (-y/warpDst); - if(x > world.unitWidth()) vel.x -= (x - world.unitWidth())/warpDst; - if(y > world.unitHeight()) vel.y -= (y - world.unitHeight())/warpDst; + if(!net.client() || isLocal()){ + //repel unit out of bounds + if(x < 0) vel.x += (-x/warpDst); + if(y < 0) vel.y += (-y/warpDst); + if(x > world.unitWidth()) vel.x -= (x - world.unitWidth())/warpDst; + if(y > world.unitHeight()) vel.y -= (y - world.unitHeight())/warpDst; + } //clamp position if not flying if(isGrounded()){ diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java index a1e218c05a..a546637544 100644 --- a/core/src/mindustry/entities/comp/BuilderComp.java +++ b/core/src/mindustry/entities/comp/BuilderComp.java @@ -11,6 +11,7 @@ import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.units.*; import mindustry.game.EventType.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; @@ -28,6 +29,7 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{ @Import float x, y, rotation; @Import UnitType type; + @Import Team team; @SyncLocal Queue plans = new Queue<>(1); @SyncLocal transient boolean updateBuilding = true; @@ -75,27 +77,27 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{ Tile tile = world.tile(current.x, current.y); if(!(tile.block() instanceof ConstructBlock)){ - if(!current.initialized && !current.breaking && Build.validPlace(current.block, team(), current.x, current.y, current.rotation)){ + if(!current.initialized && !current.breaking && Build.validPlace(current.block, team, current.x, current.y, current.rotation)){ boolean hasAll = infinite || !Structs.contains(current.block.requirements, i -> core != null && !core.items.has(i.item)); if(hasAll){ - Call.beginPlace(current.block, team(), current.x, current.y, current.rotation); + Call.beginPlace(current.block, team, current.x, current.y, current.rotation); }else{ current.stuck = true; } - }else if(!current.initialized && current.breaking && Build.validBreak(team(), current.x, current.y)){ - Call.beginBreak(team(), current.x, current.y); + }else if(!current.initialized && current.breaking && Build.validBreak(team, current.x, current.y)){ + Call.beginBreak(team, current.x, current.y); }else{ plans.removeFirst(); return; } - }else if(tile.team() != team()){ + }else if(tile.team() != team){ plans.removeFirst(); return; } if(tile.build instanceof ConstructBuild && !current.initialized){ - Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, team(), (Builderc)this, current.breaking))); + Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, team, (Builderc)this, current.breaking))); current.initialized = true; } @@ -128,7 +130,7 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{ control.input.drawBreaking(request); }else{ request.block.drawRequest(request, control.input.allRequests(), - Build.validPlace(request.block, team(), request.x, request.y, request.rotation) || control.input.requestMatches(request)); + Build.validPlace(request.block, team, request.x, request.y, request.rotation) || control.input.requestMatches(request)); } } @@ -138,7 +140,7 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{ /** @return whether this request should be skipped, in favor of the next one. */ boolean shouldSkip(BuildPlan request, @Nullable Building core){ //requests that you have at least *started* are considered - if(state.rules.infiniteResources || team().rules().infiniteResources || request.breaking || core == null) return false; + if(state.rules.infiniteResources || team.rules().infiniteResources || request.breaking || core == null) return false; return (request.stuck && !core.items.has(request.block.requirements)) || (Structs.contains(request.block.requirements, i -> !core.items.has(i.item) && Mathf.round(i.amount * state.rules.buildCostMultiplier) > 0) && !request.initialized); } diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 3854876873..0859605240 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -310,7 +310,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I drag = type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f); //apply knockback based on spawns - if(team != state.rules.waveTeam && state.hasSpawns()){ + if(team != state.rules.waveTeam && state.hasSpawns() && (!net.client() || isLocal())){ float relativeSize = state.rules.dropZoneRadius + hitSize/2f + 1f; for(Tile spawn : spawner.getSpawns()){ if(within(spawn.worldx(), spawn.worldy(), relativeSize)){ From 532aa88dca2e62e3b46e6ba215d49e6d398ce911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Sun, 29 Nov 2020 23:00:45 +0800 Subject: [PATCH 095/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 47 ++++++++++++++++----- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index e43c50db19..fb92ead32e 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1479,17 +1479,42 @@ block.mass-driver.description = 长距离物品传输结构，收集若干物品 block.mechanical-pump.description = 泵送液体，不需要能量。 block.rotary-pump.description = 泵送液体，需要能量。 block.thermal-pump.description = 泵送液体。 -block.conduit.description = Moves liquids forward. Used in conjunction with pumps and other conduits. -block.pulse-conduit.description = Moves liquids forward. Transports faster and stores more than standard conduits. -block.plated-conduit.description = Moves liquids forward. Does not accept input from the sides. Does not leak. -block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. -block.liquid-tank.description = Stores a large amount of liquid. Outputs to all sides, similarly to a liquid router. -block.liquid-junction.description = Acts as a bridge for two crossing conduits. -block.bridge-conduit.description = Transports liquids over terrain or buildings. -block.phase-conduit.description = Transports liquids over terrain or buildings. Longer range than the bridge conduit, but requires power. -block.power-node.description = Transmits power to connected nodes. The node will receive power from or supply power to any adjacent blocks. -block.power-node-large.description = An advanced power node with greater range. -block.surge-tower.description = A long-range power node with fewer available connections. + +block.conduit.description = 基本液体传输管道。像传送带一样工作，但仅适用于液体。用于从泵或其他导管中提取液体。 +block.pulse-conduit.description = 高级液体传输管道。比普通导管更快地输送液体且能储存更多液体。 +block.plated-conduit.description = 转移液体的速度与脉冲导管相同，但护甲更强。两侧只接受通过导管传入液体。\n发生泄漏时泄漏较少。 +block.liquid-router.description = 接受一个方向的液体并将它们平均输出到其他3个方向。同时可以储存一定量的液体。用于将液体从一个源分往多个目标。 +block.liquid-tank.description = 接受一个方向的液体并将它们平均输出到其他3个方向。同时可以储存一定量的液体。用于将液体从一个源分往多个目标。，可在材料需求不恒定时作为缓冲区，或作为供给冷却液体的保障设施。 +block.liquid-junction.description = 两条交叉管道的桥梁。适用连接两条不同方向的导管线路。 +block.bridge-conduit.description = 先进的液体传输建筑。可以跨越任何地形或建筑物，最多跨越3格来传输液体。 +block.phase-conduit.description = 先进的液体传输建筑。使用电力将液体传送到多个方块上的连接管道。 +block.power-node.description = 将电源传输到连接的节点上。节点将接收来自任何方块的能量或向任何方块供给能量。 +block.power-node-large.description = 更大范围、更多连接点的高级能量节点。 +block.surge-tower.description = 连接数低但范围很远的能量节点。 +block.diode.description = 此方块上的电能只能单向流动，仅当另一侧的电池储能更低时输送电力。 +block.battery.description = 存储能量作为缓冲，在发电量不足时提供保障。 +block.battery-large.description = 比普通电池容量更大。 +block.combustion-generator.description = 燃烧煤等材料发电。 +block.thermal-generator.description = 放置在炽热的地形上能够发电。 +block.steam-generator.description = 先进的火力发电机，效率更高，但需要水来产生蒸汽。 +block.differential-generator.description = 利用低温流体与燃烧的硫之间的温差产生大量能量。 +block.rtg-generator.description = 一种简单可靠的发电机。利用放射性化合物的衰变产生的热量，以缓慢的速度产生能量。 +block.solar-panel.description = 普通太阳能板，提供少量电力。 +block.solar-panel-large.description = 高级太阳能板，提供更多电力，但成本更高。 +block.thorium-reactor.description = 用高放射性的钍产生大量电力。需要冷却液冷却。如果供应的冷却液不足，会导致爆炸。 +block.impact-reactor.description = 一种先进的发电机，能够以最高效率产生大量的电力。但需要大量的能量输入来启动。 + +block.conduit.description = 向前传输液体。用于从泵或其他导管中提取液体。 +block.pulse-conduit.description = 向前传输液体。比普通导管更快地输送液体且能储存更多液体。 +block.plated-conduit.description = 向前传输液体。不接受侧边输入。不会发生泄露。 +block.liquid-router.description = 接受一个方向的液体并将它们平均输出到其他3个方向。同时可以储存一定量的液体。 +block.liquid-tank.description = 储存大量液体。像液体路由器向各个方向输出液体。 +block.liquid-junction.description = 两条交叉道管的桥梁。 +block.bridge-conduit.description = 跨越任意地形或建筑物运输液体。 +block.phase-conduit.description = 跨越任意地形或建筑物运输液体。比导管桥范围更大，但需要电力。 +block.power-node.description = 向连接的节点传输电力。该节点将从任何相邻的块接收电力或向其供电。 +block.power-node-large.description = 具有更大范围的高级电源节点。 +block.surge-tower.description = 可用连接较少的远程电源节点。 block.diode.description = Moves battery power in one direction, but only if the other side has less power stored. block.battery.description = Stores power in times of surplus energy. Outputs power in times of deficit. block.battery-large.description = Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity than a regular battery. From 8f186a16b313d83fe69e6aae991700c946b7d964 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 10:12:24 -0500 Subject: [PATCH 096/123] Build beginPlace+Break access tracking / Instant rotation --- .../src/mindustry/entities/comp/BuilderComp.java | 4 ++-- core/src/mindustry/world/Build.java | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java index a546637544..5b7afb3c9b 100644 --- a/core/src/mindustry/entities/comp/BuilderComp.java +++ b/core/src/mindustry/entities/comp/BuilderComp.java @@ -81,12 +81,12 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{ boolean hasAll = infinite || !Structs.contains(current.block.requirements, i -> core != null && !core.items.has(i.item)); if(hasAll){ - Call.beginPlace(current.block, team, current.x, current.y, current.rotation); + Call.beginPlace(self(), current.block, team, current.x, current.y, current.rotation); }else{ current.stuck = true; } }else if(!current.initialized && current.breaking && Build.validBreak(team, current.x, current.y)){ - Call.beginBreak(team, current.x, current.y); + Call.beginBreak(self(), team, current.x, current.y); }else{ plans.removeFirst(); return; diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index 70e6bb653b..2ea4478655 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -20,7 +20,7 @@ public class Build{ private static final IntSet tmp = new IntSet(); @Remote(called = Loc.server) - public static void beginBreak(Team team, int x, int y){ + public static void beginBreak(@Nullable Unit unit, Team team, int x, int y){ if(!validBreak(team, x, y)){ return; } @@ -40,14 +40,14 @@ public class Build{ tile.setBlock(sub, team, rotation); tile.bc().setDeconstruct(previous); tile.build.health = tile.build.maxHealth * prevPercent; - + if(unit != null && unit.isPlayer()) tile.build.lastAccessed = unit.getPlayer().name; Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, true))); } /** Places a ConstructBlock at this location. */ @Remote(called = Loc.server) - public static void beginPlace(Block result, Team team, int x, int y, int rotation){ + public static void beginPlace(@Nullable Unit unit, Block result, Team team, int x, int y, int rotation){ if(!validPlace(result, team, x, y, rotation)){ return; } @@ -57,6 +57,15 @@ public class Build{ //just in case if(tile == null) return; + //auto-rotate the block to the correct orientation and bail out + if(tile.team() == team && tile.block == result && tile.build != null){ + if(unit != null && unit.isPlayer()) tile.build.lastAccessed = unit.getPlayer().name; + tile.build.rotation = Mathf.mod(rotation, 4); + tile.build.updateProximity(); + tile.build.noSleep(); + return; + } + Block previous = tile.block(); Block sub = ConstructBlock.get(result.size); Seq prevBuild = new Seq<>(9); @@ -76,6 +85,7 @@ public class Build{ build.setConstruct(previous.size == sub.size ? previous : Blocks.air, result); build.prevBuild = prevBuild; + if(unit != null && unit.isPlayer()) build.lastAccessed = unit.getPlayer().name; result.placeBegan(tile, previous); From 9e53b3b7e66ab9dbfbbc57af3758a3afc81878ef Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 10:33:51 -0500 Subject: [PATCH 097/123] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 4c8606ea07..a948e0b3bb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -17,7 +17,9 @@ assignees: '' **Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.* -**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.* +**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.* + +If you remove the line above without reading it properly and understanding what it means, I will reap your soul. Even if you're playing on someone's server, you can still save the game to a slot. **Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.* From e3f2966db3d18f4f27ffa35bf9b8d7942eca6e1c Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 10:37:07 -0500 Subject: [PATCH 098/123] Nevermind, reverting to beta for last pre-release --- build.gradle | 2 +- core/src/mindustry/entities/Lightning.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 79290c6ac8..5adc73c9ee 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects{ ext{ versionNumber = '6' - if(!project.hasProperty("versionModifier")) versionModifier = 'release' + if(!project.hasProperty("versionModifier")) versionModifier = 'beta' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256' diff --git a/core/src/mindustry/entities/Lightning.java b/core/src/mindustry/entities/Lightning.java index 61f42f2e72..ce5a3f97da 100644 --- a/core/src/mindustry/entities/Lightning.java +++ b/core/src/mindustry/entities/Lightning.java @@ -53,7 +53,7 @@ public class Lightning{ world.raycastEach(World.toTile(from.getX()), World.toTile(from.getY()), World.toTile(to.getX()), World.toTile(to.getY()), (wx, wy) -> { Tile tile = world.tile(wx, wy); - if(tile != null && tile.block().insulated){ + if(tile != null && tile.block().insulated && tile.team() != team){ bhit = true; //snap it instead of removing lines.get(lines.size -1).set(wx * tilesize, wy * tilesize); From d322de8686ac7ffc6dee20f4af4009ba08045094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Sun, 29 Nov 2020 23:55:37 +0800 Subject: [PATCH 099/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 243 ++++---------------- 1 file changed, 50 insertions(+), 193 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index fb92ead32e..faaeca09d9 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1043,9 +1043,9 @@ block.graphite-press.name = 石墨压缩机 block.multi-press.name = 多重压缩机 block.constructing = {0}\n[lightgray](建造中) block.spawn.name = 敌人出生点 -block.core-shard.name = 小型核心 -block.core-foundation.name = 中型核心 -block.core-nucleus.name = 大型核心 +block.core-shard.name = 初代核心 +block.core-foundation.name = 次代核心 +block.core-nucleus.name = 终代核心 block.deepwater.name = 深水 block.water.name = 水 block.tainted-water.name = 污水 @@ -1299,123 +1299,6 @@ liquid.slag.description = 在分离器中提炼成金属成分，或作为武器 liquid.oil.description = 用于先进材料生产和燃烧弹药。 liquid.cryofluid.description = 用作反应堆、炮塔和工厂的冷却剂。 -block.message.description = 保存一条文字信息。用于队友之间进行交流。 -block.graphite-press.description = 将煤块压缩成纯石墨片材料。 -block.multi-press.description = 石墨压缩机的升级版。利用水和电力快速高效地处理煤炭。 -block.silicon-smelter.description = 用高纯度的焦炭来加工沙子以生产硅。 -block.kiln.description = 将铅和沙子熔炼成钢化玻璃，需要少量电力。 -block.plastanium-compressor.description = 用石油和钛生产塑钢。 -block.phase-weaver.description = 用放射性钍和大量沙子生产相织物。 -block.alloy-smelter.description = 用钛、铅、硅和铜生产巨浪合金。 -block.cryofluid-mixer.description = 将水和细的钛粉混成冷却液。钍反应堆的必备之物。 -block.blast-mixer.description = 用油料将硫转化为不易燃但更具爆炸性的爆炸化合物。 -block.pyratite-mixer.description = 将煤、铅和沙子混合成高度易燃的硫。 -block.melter.description = 将废料熔化成矿渣，以便进一步加工或用于炮塔弹药。 -block.separator.description = 从矿渣中提取有用的矿物。 -block.spore-press.description = 以极高压力压缩孢子荚合成油料。 -block.pulverizer.description = 将废料碾成沙。 -block.coal-centrifuge.description = 使石油凝固成煤块。 -block.incinerator.description = 用来接收并除掉多余的物品或液体。 -block.power-void.description = 消耗输入的所有能量。仅限沙盒。 -block.power-source.description = 无限输出能量。仅限沙盒。 -block.item-source.description = 无限输出物品。仅限沙盒。 -block.item-void.description = 销毁输入的所有物品。仅限沙盒。 -block.liquid-source.description = 无限输出液体。仅限沙盒。 -block.liquid-void.description = 销毁输入的所有液体。仅限沙盒。 -block.copper-wall.description = 廉价的防御建筑。\n适合在前几个波次中保护核心和炮塔。 -block.copper-wall-large.description = 廉价的防御建筑。\n适合在前几个波次中保护核心和炮塔。\n占多个方格。 -block.titanium-wall.description = 中等强度的防御建筑。\n提供中等强度的防御以抵御敌人。 -block.titanium-wall-large.description = 中等强度的防御建筑。\n提供中等强度的防御以防敌人攻击。\n占多个方格。 -block.plastanium-wall.description = 一种特殊的防御建筑，能吸收电弧、自动阻挡能量节点连接。 -block.plastanium-wall-large.description = 一种特殊的防御建筑，能吸收电弧、自动阻挡能量节点连接。\n占多个方格。 -block.thorium-wall.description = 强大的防御建筑。\n可以很好的防御敌人。 -block.thorium-wall-large.description = 强大的防御建筑。\n很好地防御敌人。\n占多个方格。 -block.phase-wall.description = 没有钍墙那样坚固，但是它可以使不太强的弹药发生偏转。 -block.phase-wall-large.description = 没有钍墙那样坚固，但是它可以使不太强的弹药发生偏转。\n占多个方格。 -block.surge-wall.description = 强大的防御建筑。\n被攻击时有很小的机会向攻击者发射闪电。 -block.surge-wall-large.description = 强大的防御建筑。\n被攻击时有很小的机会向攻击者发射闪电。\n占多个方格。 -block.door.description = 一扇门。点按切换它的打开/关闭状态。 -block.door-large.description = 一扇大型门。点按切换它的打开/关闭状态。\n占多个方格。 -block.mender.description = 定期修理附近的建筑，使防御系统在波次之间得到修复。\n可选使用硅来提高修复范围和修复效率。 -block.mend-projector.description = 修理者的升级版，定期修复附近的建筑物。 -block.overdrive-projector.description = 提高附近建筑物的速度，如钻头和传送带。 -block.force-projector.description = 在自身周围创建一个六角形力场，使里面的建筑物和单位免受伤害。\n持续承受高伤害会导致过热，可以使用冷却液降温。相织物可用于增加屏障大小。 -block.shock-mine.description = 对踩到它的敌人造成伤害。敌人几乎看不到它。 -block.conveyor.description = 初级物品传送带。将物品向前输送并在可能时运入建筑。可旋转方向。 -block.titanium-conveyor.description = 高级物品传送带。运送物品的速度快于初级传送带。 -block.plastanium-conveyor.description = 打包物品进行运输。\n在后方输入物品，在前方三个方向输出物品。 -block.junction.description = 两条交叉传送带的桥梁。用于连接两条不同的传输线路使其互不影响。 -block.bridge-conveyor.description = 先进的物品运输方块。允许跨越任意地形或建筑物运输物品，最多跨越3格。 -block.phase-conveyor.description = 先进的传送带，使用电力将物品传送到距离几个方块的相位传送带上。 -block.sorter.description = 对物品进行分类，如果物品与所选种类相同，则允许其通过。否则，物品将从左边和右边输出。 -block.inverted-sorter.description = 像分类器一样处理物品，但却是向两侧输出选定的物品。 -block.router.description = 从一个方向接受物品，并将它们平均输出到其他3个方向。可以将材料分成多份\n\n[scarlet]永远不要把它与生产建筑相连，因为它会被产出的产品阻塞[]。 -block.distributor.description = 大型路由器，可将物品输出到周围的最多7个其他方向。 -block.overflow-gate.description = 当前方被阻塞时才会向左和右输出，用于处理多余的物品。 -block.underflow-gate.description = 与溢流门相反。 当左右均堵塞时才向前方运输。 -block.mass-driver.description = 终极物品传输器，收集若干物品后将其射到远处的另一个质量驱动器。 -block.mechanical-pump.description = 一种廉价液体泵，输出速度慢，但无需能量。 -block.rotary-pump.description = 先进液泵。泵送更多液体，但需要能量。 -block.thermal-pump.description = 终级液泵。 -block.conduit.description = 基本液体传输管道。像传送带一样工作，但仅适用于液体。用于从泵或其他导管中提取液体。 -block.pulse-conduit.description = 高级液体传输管道。比普通导管更快地输送液体且能储存更多液体。 -block.plated-conduit.description = 转移液体的速度与脉冲导管相同，但护甲更强。两侧只接受通过导管传入液体。\n发生泄漏时泄漏较少。 -block.liquid-router.description = 接受一个方向的液体并将它们平均输出到其他3个方向。同时可以储存一定量的液体。用于将液体从一个源分往多个目标。 -block.liquid-tank.description = 存储大量液体，可在材料需求不恒定时作为缓冲区，或作为供给冷却液体的保障设施。 -block.liquid-junction.description = 两条交叉管道的桥梁。适用连接两条不同方向的导管线路。 -block.bridge-conduit.description = 先进的液体传输建筑。可以跨越任何地形或建筑物，最多跨越3格来传输液体。 -block.phase-conduit.description = 先进的液体传输建筑。使用电力将液体传送到多个方块上的连接管道。 -block.power-node.description = 将电源传输到连接的节点上。节点将接收来自任何方块的能量或向任何方块供给能量。 -block.power-node-large.description = 更大范围、更多连接点的高级能量节点。 -block.surge-tower.description = 连接数低但范围很远的能量节点。 -block.diode.description = 此方块上的电能只能单向流动，仅当另一侧的电池储能更低时输送电力。 -block.battery.description = 存储能量作为缓冲，在发电量不足时提供保障。 -block.battery-large.description = 比普通电池容量更大。 -block.combustion-generator.description = 燃烧煤等材料发电。 -block.thermal-generator.description = 放置在炽热的地形上能够发电。 -block.steam-generator.description = 先进的火力发电机，效率更高，但需要水来产生蒸汽。 -block.differential-generator.description = 利用低温流体与燃烧的硫之间的温差产生大量能量。 -block.rtg-generator.description = 一种简单可靠的发电机。利用放射性化合物的衰变产生的热量，以缓慢的速度产生能量。 -block.solar-panel.description = 普通太阳能板，提供少量电力。 -block.solar-panel-large.description = 高级太阳能板，提供更多电力，但成本更高。 -block.thorium-reactor.description = 用高放射性的钍产生大量电力。需要冷却液冷却。如果供应的冷却液不足，会导致爆炸。 -block.impact-reactor.description = 一种先进的发电机，能够以最高效率产生大量的电力。但需要大量的能量输入来启动。 -block.mechanical-drill.description = 一种便宜的钻头。放置在合适的方块上时，以缓慢的速度无限期地输出物品。只能开采基本资源。 -block.pneumatic-drill.description = 一种改进的钻头，能开采钛。采矿速度比机械钻头快。 -block.laser-drill.description = 通过激光技术更快地开采，但需要能量。这种钻头可以开采放射性的钍。 -block.blast-drill.description = 终极钻头，需要大量能量。 -block.water-extractor.description = 从地下提取水。当附近没有水源时使用它。 -block.cultivator.description = 将微小的孢子培养成工业用的孢子荚。 -block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo. -block.oil-extractor.description = 使用大量能量、沙子和水提炼石油。 -block.core-shard.description = Core of the base. Once destroyed, the sector is lost. -block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel. -block.core-foundation.description = Core of the base. Well armored. Stores more resources than a Shard. -block.core-foundation.details = The second iteration. -block.core-nucleus.description = Core of the base. Extremely well armored. Stores massive amounts of resources. -block.core-nucleus.details = The third and final iteration. -block.vault.description = 存储大量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。卸载器可从仓库中提取物品。 -block.container.description = 存储少量物品。当存在非恒定的材料需求时，使用它来创建缓冲区。卸载器可从容器中提取物品。 -block.unloader.description = 将物品从容器、仓库或你的核心中提取到传送带或直接提取到相邻的方块。点击卸载器本身更改所要卸载的物品类型。 -block.launch-pad.description = 定期发射一批物品，而无需发射核心 -block.launch-pad-large.description = 发射台的改进版，可以存储更多物品，同时启动频率更高。 -block.duo.description = 小而便宜的炮塔，对地很有效。 -block.scatter.description = 基本型防空炮塔。向空中敌人喷出一团铅，钢化玻璃或废料。 -block.scorch.description = 小型炮塔，点燃任何靠近它的地面敌人。近距离非常有效。 -block.hail.description = 小型远程炮台。 -block.wave.description = 中型快速炮塔，射出液体。使用水或者冷却液时能够自动灭火。 -block.lancer.description = 中型对地炮塔。会充能并发射强力的的能量束。 -block.arc.description = 小型炮塔，发射电弧。电弧无法穿过塑钢墙。 -block.swarmer.description = 中型炮塔，对空对地，发射跟踪爆炸导弹。 -block.salvo.description = 双管炮的升级版。中型，快速射出一串子弹。 -block.fuse.description = 大型近程炮塔，发射三道刺穿敌人的短程光束。 -block.ripple.description = 大型远程炮台，非常强力，向远处的敌人投射一簇弹药。 -block.cyclone.description = 大型炮塔，对空对地，发射在敌人周围引爆的爆炸物。 -block.spectre.description = 超大型炮塔，对空对地，一次射出两颗强大的破甲弹。 -block.meltdown.description = 超大型激光炮塔，充能之后持续发射光束，需要冷却剂。 -block.repair-point.description = 持续治疗其附近受损最严重的单位。 -block.segment.description = 摧毁袭来的除激光以外的子弹或导弹. - block.resupply-point.description = 为附近的部队提供铜弹药。与需要电池供电的设备不兼容。 block.armored-conveyor.description = 向前方移动物品。不接受边上的输入。 block.illuminator.description = 释放光源。 @@ -1479,31 +1362,6 @@ block.mass-driver.description = 长距离物品传输结构，收集若干物品 block.mechanical-pump.description = 泵送液体，不需要能量。 block.rotary-pump.description = 泵送液体，需要能量。 block.thermal-pump.description = 泵送液体。 - -block.conduit.description = 基本液体传输管道。像传送带一样工作，但仅适用于液体。用于从泵或其他导管中提取液体。 -block.pulse-conduit.description = 高级液体传输管道。比普通导管更快地输送液体且能储存更多液体。 -block.plated-conduit.description = 转移液体的速度与脉冲导管相同，但护甲更强。两侧只接受通过导管传入液体。\n发生泄漏时泄漏较少。 -block.liquid-router.description = 接受一个方向的液体并将它们平均输出到其他3个方向。同时可以储存一定量的液体。用于将液体从一个源分往多个目标。 -block.liquid-tank.description = 接受一个方向的液体并将它们平均输出到其他3个方向。同时可以储存一定量的液体。用于将液体从一个源分往多个目标。，可在材料需求不恒定时作为缓冲区，或作为供给冷却液体的保障设施。 -block.liquid-junction.description = 两条交叉管道的桥梁。适用连接两条不同方向的导管线路。 -block.bridge-conduit.description = 先进的液体传输建筑。可以跨越任何地形或建筑物，最多跨越3格来传输液体。 -block.phase-conduit.description = 先进的液体传输建筑。使用电力将液体传送到多个方块上的连接管道。 -block.power-node.description = 将电源传输到连接的节点上。节点将接收来自任何方块的能量或向任何方块供给能量。 -block.power-node-large.description = 更大范围、更多连接点的高级能量节点。 -block.surge-tower.description = 连接数低但范围很远的能量节点。 -block.diode.description = 此方块上的电能只能单向流动，仅当另一侧的电池储能更低时输送电力。 -block.battery.description = 存储能量作为缓冲，在发电量不足时提供保障。 -block.battery-large.description = 比普通电池容量更大。 -block.combustion-generator.description = 燃烧煤等材料发电。 -block.thermal-generator.description = 放置在炽热的地形上能够发电。 -block.steam-generator.description = 先进的火力发电机，效率更高，但需要水来产生蒸汽。 -block.differential-generator.description = 利用低温流体与燃烧的硫之间的温差产生大量能量。 -block.rtg-generator.description = 一种简单可靠的发电机。利用放射性化合物的衰变产生的热量，以缓慢的速度产生能量。 -block.solar-panel.description = 普通太阳能板，提供少量电力。 -block.solar-panel-large.description = 高级太阳能板，提供更多电力，但成本更高。 -block.thorium-reactor.description = 用高放射性的钍产生大量电力。需要冷却液冷却。如果供应的冷却液不足，会导致爆炸。 -block.impact-reactor.description = 一种先进的发电机，能够以最高效率产生大量的电力。但需要大量的能量输入来启动。 - block.conduit.description = 向前传输液体。用于从泵或其他导管中提取液体。 block.pulse-conduit.description = 向前传输液体。比普通导管更快地输送液体且能储存更多液体。 block.plated-conduit.description = 向前传输液体。不接受侧边输入。不会发生泄露。 @@ -1515,53 +1373,53 @@ block.phase-conduit.description = 跨越任意地形或建筑物运输液体。 block.power-node.description = 向连接的节点传输电力。该节点将从任何相邻的块接收电力或向其供电。 block.power-node-large.description = 具有更大范围的高级电源节点。 block.surge-tower.description = 可用连接较少的远程电源节点。 -block.diode.description = Moves battery power in one direction, but only if the other side has less power stored. -block.battery.description = Stores power in times of surplus energy. Outputs power in times of deficit. -block.battery-large.description = Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity than a regular battery. -block.combustion-generator.description = Generates power by burning flammable materials, such as coal. -block.thermal-generator.description = Generates power when placed in hot locations. -block.steam-generator.description = Generates power by burning flammable materials and converting water to steam. -block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite. -block.rtg-generator.description = Uses the heat of decaying radioactive compounds to produce energy at a slow rate. -block.solar-panel.description = Provides a small amount of power from the sun. -block.solar-panel-large.description = Provides a small amount of power from the sun. More efficient than the standard solar panel. -block.thorium-reactor.description = Generates significant amounts of power from thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. -block.impact-reactor.description = Creates massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process. -block.mechanical-drill.description = When placed on ore, outputs items at a slow pace indefinitely. Only capable of mining basic resources. -block.pneumatic-drill.description = An improved drill, capable of mining titanium. Mines at a faster pace than a mechanical drill. -block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Capable of mining thorium. -block.blast-drill.description = The ultimate drill. Requires large amounts of power. -block.water-extractor.description = Extracts groundwater. Used in locations with no surface water available. -block.cultivator.description = Cultivates tiny concentrations of atmospheric spores into spore pods. -block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo. -block.oil-extractor.description = Uses large amounts of power, sand and water to drill for oil. -block.core-shard.description = Core of the base. Once destroyed, the sector is lost. -block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel. -block.core-foundation.description = Core of the base. Well armored. Stores more resources than a Shard. -block.core-foundation.details = The second iteration. -block.core-nucleus.description = Core of the base. Extremely well armored. Stores massive amounts of resources. -block.core-nucleus.details = The third and final iteration. -block.vault.description = Stores a large amount of items of each type. Contents can be retrieved with an unloader. -block.container.description = Stores a small amount of items of each type. Contents can be retrieved with an unloader. -block.unloader.description = Unloads the selected item from nearby blocks. -block.launch-pad.description = Launches batches of items to selected sectors. -block.duo.description = Fires alternating bullets at enemies. -block.scatter.description = Fires clumps of lead, scrap or metaglass flak at enemy aircraft. -block.scorch.description = Burns any ground enemies close to it. Highly effective at close range. -block.hail.description = Fires small shells at ground enemies over long distances. -block.wave.description = Fires streams of liquid at enemies. Automatically extinguishes fires when supplied with water. -block.lancer.description = Charges and fires powerful beams of energy at ground targets. -block.arc.description = Fires arcs of electricity at ground targets. -block.swarmer.description = Fires homing missiles at enemies. -block.salvo.description = Fires quick salvos of bullets at enemies. -block.fuse.description = Fires three close-range piercing blasts at nearby enemies. -block.ripple.description = Shoots clusters of shells at ground enemies over long distances. -block.cyclone.description = Fires explosive clumps of flak at nearby enemies. -block.spectre.description = Fires large armor-piercing bullets at air and ground targets. -block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate. -block.foreshadow.description = Fires a large single-target bolt over long distances. -block.repair-point.description = Continuously repairs the closest damaged unit in its vicinity. -block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. +block.diode.description = 仅当一侧存储的电量较少时向另一侧传输电池电量。 +block.battery.description = 储存电网多余电力，并在电网供电不足时放电。 +block.battery-large.description = 储存电网多余电力，并在电网供电不足时放电。比普通电池容量更高。 +block.combustion-generator.description = 燃烧煤等可燃材料发电。 +block.thermal-generator.description = 放置在炽热的地形上能够发电。 +block.steam-generator.description = 通过燃烧易燃材料并将水转化为蒸汽来发电。 +block.differential-generator.description = 利用低温流体与燃烧的硫之间的温差产生大量能量。 +block.rtg-generator.description = 利用放射物的衰变产生的热量以缓慢的速度产生能量。 +block.solar-panel.description = 提供少量太阳能。 +block.solar-panel-large.description = 提供少量太阳能。比标准太阳能电池板更高效。 +block.thorium-reactor.description = 从放射性的钍中产生大量的能量。需要持续冷却。如果冷却液供应不足，会剧烈爆炸。 +block.impact-reactor.description = 以最高效率产生大量的电力。但需要大量的能量输入来启动。 +block.mechanical-drill.description = 放置在矿物上时，以缓慢的速度无限输出物品。只能开采基本资源。 +block.pneumatic-drill.description = 一种改进的钻头，能开采钛。采矿速度比机械钻头快。 +block.laser-drill.description = 通过激光技术更快地开采，但需要能量。这种钻头可以开采放射性的钍。 +block.blast-drill.description = 终极钻头，需要大量能量。 +block.water-extractor.description = 从地下提取水。用于当附近没有地表水时。 +block.cultivator.description = 将微小浓度的大气中的孢子培养成孢子荚。 +block.cultivator.details = 恢复的技术。用于尽可能高效地生产大量的生物质。很可能是现在覆盖了塞普罗的最初的孢子培养器。 +block.oil-extractor.description = 使用大量能量、沙子和水钻取石油。 +block.core-shard.description = 基地的核心。一旦被摧毁，此区块就会丢失。 +block.core-shard.details = 初代核心。坚固且可自我复制。不具备星际旅行的能力。 +block.core-foundation.description = 基地的核心。装甲优良。比初代核心容量更大。 +block.core-foundation.details = 次代核心。 +block.core-nucleus.description = 基地的核心。装甲极佳。容量极大。 +block.core-nucleus.details = 三代也是终代核心。 +block.vault.description = 存储每种类型的大量物品。可使用卸载器卸载物品。 +block.container.description = 存储每种类型的少量物品。可使用卸载器卸载物品。 +block.unloader.description = 从周围方块卸载指定物品。 +block.launch-pad.description = 将货物发射至指定区块。 +block.duo.description = 交替向敌人发射子弹。 +block.scatter.description = 向敌机发射铅、废料或钢化玻璃高射炮弹。 +block.scorch.description = 焚烧任何靠近它的地面敌人。近距离高效 +block.hail.description = 向远距离地面敌人发射小型炮弹。 +block.wave.description = 射出液体。使用水作弹药时能够自动灭火。 +block.lancer.description = 充能并向地面单位发射强力的的波束。 +block.arc.description = 向地面单位发射电弧。 +block.swarmer.description = 向敌人发射追踪导弹。 +block.salvo.description = 向敌人快速射击子弹。 +block.fuse.description = 向附近的敌人发射三次近距离穿透性爆炸子弹。 +block.ripple.description = 向远距离地面敌人发射密集的炮弹。 +block.cyclone.description = 向附近的敌人发射密集的高射炮弹。 +block.spectre.description = 向空中和地面目标发射大型穿甲子弹。 +block.meltdown.description = 向附近的敌人发射持续的激光束。需要供冷。 +block.foreshadow.description = 向远距离单目标射击。 +block.repair-point.description = 持续修复其附近受损最严重的单位。 +block.segment.description = 摧毁袭来的除激光以外的子弹或导弹。 block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process. block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water. block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations. @@ -1587,7 +1445,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce block.large-logic-display.description = Displays arbitrary graphics from a logic processor. block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment. - unit.dagger.description = Fires standard bullets at all nearby enemies. unit.mace.description = Fires streams of flame at all nearby enemies. unit.fortress.description = Fires long-range artillery at ground targets. From 29be8176c19f321d8eb5eaed8d020ed6e6cd4fa0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 11:08:12 -0500 Subject: [PATCH 100/123] Fixed some crashes --- core/src/mindustry/input/MobileInput.java | 2 +- core/src/mindustry/ui/dialogs/PlanetDialog.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 8baf077073..b3b519609d 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -769,7 +769,7 @@ public class MobileInput extends InputHandler implements GestureListener{ @Override public boolean pan(float x, float y, float deltaX, float deltaY){ - if(Core.scene.hasDialog() || Core.settings.getBool("keyboard")) return false; + if(Core.scene == null || Core.scene.hasDialog() || Core.settings.getBool("keyboard")) return false; float scale = Core.camera.width / Core.graphics.getWidth(); deltaX *= scale; diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 121fb41d57..94d525bce0 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -711,6 +711,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ stable.table(t -> { t.add("@sectors.resources").padRight(4); for(UnlockableContent c : sector.info.resources){ + if(c == null) continue; //apparently this is possible. t.image(c.icon(Cicon.small)).padRight(3).size(Cicon.small.size); } }).padLeft(10f).fillX().row(); From bc114dfefcab60d5f1c63538468fc4a039b34c52 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 11:37:02 -0500 Subject: [PATCH 101/123] Version is "release" for real now --- build.gradle | 2 +- fastlane/metadata/android/en-US/changelogs/29733.txt | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29733.txt diff --git a/build.gradle b/build.gradle index 5adc73c9ee..79290c6ac8 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects{ ext{ versionNumber = '6' - if(!project.hasProperty("versionModifier")) versionModifier = 'beta' + if(!project.hasProperty("versionModifier")) versionModifier = 'release' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256' diff --git a/fastlane/metadata/android/en-US/changelogs/29733.txt b/fastlane/metadata/android/en-US/changelogs/29733.txt new file mode 100644 index 0000000000..da6bfa3221 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29733.txt @@ -0,0 +1,11 @@ +The final beta build. + +- Updated link to wiki modding guide, now points to new wiki +- Fixed weaving missiles consistently moving off to one direction +- Fixed units shooting fast bullets on servers in certain conditions +- Fixed some crashes +- Made construction of rotated blocks free/instant (i.e. equivalent to manually rotating it) + +Campaign: +- Better production calculation system +- Fixed deconstruction counting as production From 4fb97b60a982a664e2961adb1ed24db493c07402 Mon Sep 17 00:00:00 2001 From: lapis256 Date: Mon, 30 Nov 2020 01:54:43 +0900 Subject: [PATCH 102/123] update bundle_ja.properties --- core/assets/bundles/bundle_ja.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 6983736df4..d4b5d8573f 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -17,9 +17,9 @@ linkfail = リンクを開けませんでした!\nURLをクリップボードに screenshot = スクリーンショットを {0} に保存しました。 screenshot.invalid = マップが広すぎます。スクリーンショットに必要なメモリが足りない可能性があります。 gameover = ゲームオーバー -gameover.disconnect = Disconnect +gameover.disconnect = 切断 gameover.pvp = [accent] {0}[] チームの勝利! -gameover.waiting = [accent]Waiting for next map... +gameover.waiting = [accent]次のマップを待っています... highscore = [accent]ハイスコアを更新! copied = コピーしました。 indev.notready = This part of the game isn't ready yet @@ -196,9 +196,9 @@ servers.local = ローカルサーバー servers.remote = リモートサーバー servers.global = コミュニティサーバー -servers.showhidden = Show Hidden Servers -server.shown = Shown -server.hidden = Hidden +servers.showhidden = 非表示のサーバーを表示する +server.shown = 表示 +server.hidden = 非表示 trace = プレイヤーの記録 trace.playername = プレイヤー名: [accent]{0} @@ -537,7 +537,7 @@ sectors.resources = 資源: sectors.production = 生産: sectors.export = 搬出: sectors.time = 時間: -sectors.threat = 難易度: +sectors.threat = 脅威: sectors.wave = ウェーブ: sectors.stored = 保存済み: sectors.resume = 再開 @@ -561,8 +561,8 @@ sector.captured = セクター [accent]{0}[white]制圧! threat.low = 低 threat.medium = 中 threat.high = 高 -threat.extreme = Extreme -threat.eradication = Eradication +threat.extreme = 過激 +threat.eradication = 根絶 planets = 惑星 From 979e39f5880492495e7d3066da0d1b57c4043bd7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 12:14:46 -0500 Subject: [PATCH 103/123] Added unit to BlockBuildBeginEvent --- core/src/mindustry/game/EventType.java | 8 +++++--- core/src/mindustry/world/Build.java | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index f0aa3278b2..3fd2826cb5 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -278,11 +278,13 @@ public class EventType{ public static class BlockBuildBeginEvent{ public final Tile tile; public final Team team; + public final @Nullable Unit unit; public final boolean breaking; - public BlockBuildBeginEvent(Tile tile, Team team, boolean breaking){ + public BlockBuildBeginEvent(Tile tile, Team team, Unit unit, boolean breaking){ this.tile = tile; this.team = team; + this.unit = unit; this.breaking = breaking; } } @@ -310,10 +312,10 @@ public class EventType{ public static class BuildSelectEvent{ public final Tile tile; public final Team team; - public final Builderc builder; + public final Unit builder; public final boolean breaking; - public BuildSelectEvent(Tile tile, Team team, Builderc builder, boolean breaking){ + public BuildSelectEvent(Tile tile, Team team, Unit builder, boolean breaking){ this.tile = tile; this.team = team; this.builder = builder; diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index 2ea4478655..2355dd8118 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -42,7 +42,7 @@ public class Build{ tile.build.health = tile.build.maxHealth * prevPercent; if(unit != null && unit.isPlayer()) tile.build.lastAccessed = unit.getPlayer().name; - Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, true))); + Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, unit, true))); } /** Places a ConstructBlock at this location. */ @@ -89,7 +89,7 @@ public class Build{ result.placeBegan(tile, previous); - Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, false))); + Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, unit, false))); } /** Returns whether a tile can be placed at this location by this team. */ From da97d1e1eb4b5d0bfb344e1f7da672393a998062 Mon Sep 17 00:00:00 2001 From: lapis256 Date: Mon, 30 Nov 2020 02:14:53 +0900 Subject: [PATCH 104/123] update bundle_ja.properties --- core/assets/bundles/bundle_ja.properties | 40 ++++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index d4b5d8573f..89f2cd49b1 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -17,9 +17,9 @@ linkfail = リンクを開けませんでした!\nURLをクリップボードに screenshot = スクリーンショットを {0} に保存しました。 screenshot.invalid = マップが広すぎます。スクリーンショットに必要なメモリが足りない可能性があります。 gameover = ゲームオーバー -gameover.disconnect = 切断 +gameover.disconnect = Disconnect gameover.pvp = [accent] {0}[] チームの勝利! -gameover.waiting = [accent]次のマップを待っています... +gameover.waiting = [accent]Waiting for next map... highscore = [accent]ハイスコアを更新! copied = コピーしました。 indev.notready = This part of the game isn't ready yet @@ -196,9 +196,9 @@ servers.local = ローカルサーバー servers.remote = リモートサーバー servers.global = コミュニティサーバー -servers.showhidden = 非表示のサーバーを表示する -server.shown = 表示 -server.hidden = 非表示 +servers.showhidden = Show Hidden Servers +server.shown = Shown +server.hidden = Hidden trace = プレイヤーの記録 trace.playername = プレイヤー名: [accent]{0} @@ -537,7 +537,7 @@ sectors.resources = 資源: sectors.production = 生産: sectors.export = 搬出: sectors.time = 時間: -sectors.threat = 脅威: +sectors.threat = 難易度: sectors.wave = ウェーブ: sectors.stored = 保存済み: sectors.resume = 再開 @@ -561,8 +561,8 @@ sector.captured = セクター [accent]{0}[white]制圧! threat.low = 低 threat.medium = 中 threat.high = 高 -threat.extreme = 過激 -threat.eradication = 根絶 +threat.extreme = Extreme +threat.eradication = Eradication planets = 惑星 @@ -652,7 +652,7 @@ stat.displaysize = 画面サイズ stat.liquidcapacity = 液体容量 stat.powerrange = 電力範囲 stat.linkrange = 接続範囲 -stat.instructions = Instructions +stat.instructions = 命令数 stat.powerconnections = 最大接続数 stat.poweruse = 電力使用量 stat.powerdamage = 電力/ダメージ @@ -841,7 +841,7 @@ keybinds.mobile = [scarlet]モバイルでは多くのキーバインドが機 category.general.name = 一般 category.view.name = 表示 category.multiplayer.name = マルチプレイ -category.blocks.name = Block Select +category.blocks.name = ブロックセレクト command.attack = 攻撃 command.rally = 結集 command.retreat = 後退 @@ -858,7 +858,7 @@ keybind.toggle_block_status.name = ブロックの状態表示の切り替え keybind.move_x.name = 左右移動 keybind.move_y.name = 上下移動 keybind.mouse_move.name = マウスを追う -keybind.pan.name = Pan View +keybind.pan.name = パン keybind.boost.name = ブースト keybind.schematic_select.name = 地域の選択 keybind.schematic_menu.name = 設計図メニュー @@ -895,8 +895,8 @@ keybind.menu.name = メニュー keybind.pause.name = ポーズ keybind.pause_building.name = 建築のポーズ/レジューム keybind.minimap.name = ミニマップ -keybind.planet_map.name = Planet Map -keybind.research.name = Research +keybind.planet_map.name = 惑星地図 +keybind.research.name = 研究 keybind.chat.name = チャット keybind.player_list.name = プレイヤーリスト keybind.console.name = コンソール @@ -952,9 +952,9 @@ rules.enemyLights = Enemy Lights rules.fire = Fire rules.explosions = 爆発ダメージ rules.ambientlight = 霧の色 -rules.weather = Weather -rules.weather.frequency = Frequency: -rules.weather.duration = Duration: +rules.weather = 気象 +rules.weather.frequency = 頻度: +rules.weather.duration = 継続時間: content.item.name = アイテム content.liquid.name = 液体 @@ -1222,10 +1222,10 @@ block.disassembler.name = ディスアセンブラー block.silicon-crucible.name = シリコンクルーシブル block.overdrive-dome.name = 加速ドーム #experimental, may be removed -block.block-forge.name = Block Forge -block.block-loader.name = Block Loader -block.block-unloader.name = Block Unloader -block.interplanetary-accelerator.name = Interplanetary Accelerator +block.block-forge.name = ブロックフォージ +block.block-loader.name = ブロック積載機 +block.block-unloader.name = ブロック搬出機 +block.interplanetary-accelerator.name = 惑星間加速器 block.switch.name = スイッチ block.micro-processor.name = マイクロプロセッサー From 682c1692dfb7030fc0825d20b9b8199637370cd1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 12:15:22 -0500 Subject: [PATCH 105/123] Compilation fix --- core/src/mindustry/entities/comp/BuilderComp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java index 5b7afb3c9b..b39ed5baef 100644 --- a/core/src/mindustry/entities/comp/BuilderComp.java +++ b/core/src/mindustry/entities/comp/BuilderComp.java @@ -97,7 +97,7 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{ } if(tile.build instanceof ConstructBuild && !current.initialized){ - Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, team, (Builderc)this, current.breaking))); + Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, team, self(), current.breaking))); current.initialized = true; } From 80f027471c595a9833963ac6b60a4e0aa884ed3f Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Sun, 29 Nov 2020 19:35:49 +0100 Subject: [PATCH 106/123] Update RepairFieldAbility.java --- core/src/mindustry/entities/abilities/RepairFieldAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/abilities/RepairFieldAbility.java b/core/src/mindustry/entities/abilities/RepairFieldAbility.java index 8df0a96e2c..9e2890589a 100644 --- a/core/src/mindustry/entities/abilities/RepairFieldAbility.java +++ b/core/src/mindustry/entities/abilities/RepairFieldAbility.java @@ -30,7 +30,7 @@ public class RepairFieldAbility extends Ability{ Units.nearby(unit.team, unit.x, unit.y, range, other -> { if(other.damaged()){ - healEffect.at(unit); + healEffect.at(other); wasHealed = true; } other.heal(amount); From 2a9f362e15748f42bac06091b523bf9c0aa50a1e Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 13:59:09 -0500 Subject: [PATCH 107/123] Fixed #3654 --- core/src/mindustry/Vars.java | 2 ++ core/src/mindustry/ai/Pathfinder.java | 5 +++-- core/src/mindustry/core/UI.java | 2 +- core/src/mindustry/ui/dialogs/ModsDialog.java | 10 +++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 8269c05b06..d5b9778f67 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -47,6 +47,8 @@ public class Vars implements Loadable{ public static final int bufferSize = 8192; /** global charset, since Android doesn't support the Charsets class */ public static final Charset charset = Charset.forName("UTF-8"); + /** mods suggested for import */ + public static final String[] suggestedMods = {""}; /** main application name, capitalized */ public static final String appName = "Mindustry"; /** URL for itch.io donations. */ diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index 392481b3ac..c5b03f40bd 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -13,6 +13,7 @@ import mindustry.game.EventType.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.world.*; +import mindustry.world.blocks.storage.*; import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -115,7 +116,7 @@ public class Pathfinder implements Runnable{ } return PathTile.get( - tile.build == null || !tile.solid() ? 0 : Math.min((int)(tile.build.health / 40), 80), + tile.build == null || !tile.solid() || tile.block() instanceof CoreBlock ? 0 : Math.min((int)(tile.build.health / 40), 80), tile.getTeamID(), tile.solid(), tile.floor().isLiquid, @@ -458,7 +459,7 @@ public class Pathfinder implements Runnable{ /** costs of getting to a specific tile */ public int[][] weights; /** search IDs of each position - the highest, most recent search is prioritized and overwritten */ - int[][] searches; + public int[][] searches; /** search frontier, these are Pos objects */ IntQueue frontier = new IntQueue(); /** all target positions; these positions have a cost of 0, and must be synchronized on! */ diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 4437bb4d48..3b7504be6d 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -258,11 +258,11 @@ public class UI implements ApplicationListener, Loadable{ TextField field = cont.field(def, t -> {}).size(330f, 50f).get(); field.setFilter((f, c) -> field.getText().length() < textLength && filter.acceptChar(f, c)); buttons.defaults().size(120, 54).pad(4); + buttons.button("@cancel", this::hide); buttons.button("@ok", () -> { confirmed.get(field.getText()); hide(); }).disabled(b -> field.getText().isEmpty()); - buttons.button("@cancel", this::hide); keyDown(KeyCode.enter, () -> { String text = field.getText(); if(!text.isEmpty()){ diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 866c3460e4..63b94b277b 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -102,12 +102,16 @@ public class ModsDialog extends BaseDialog{ t.button("@mod.import.github", Icon.github, bstyle, () -> { dialog.hide(); + var modString = Core.settings.getString("lastmod", ""); + var suggested = Structs.random(suggestedMods); - ui.showTextInput("@mod.import.github", "", 64, Core.settings.getString("lastmod", "Anuken/ExampleMod"), text -> { - Core.settings.put("lastmod", text); + ui.showTextInput("@mod.import.github", "", 64, modString.isEmpty() ? suggested : modString, text -> { + if(!modString.isEmpty() || !Structs.eq(suggested, text)){ + Core.settings.put("lastmod", text); + } ui.loadfrag.show(); - //Try to download the 6.0 branch first, but if it doesn't exist try master. + //Try to download the 6.0 branch first, but if it doesn't exist, try master. githubImport("6.0", text, e1 -> { githubImport("master", text, e2 -> { githubImport("main", text, e3 -> { From a7c18fc598b3cc6de2a06fc2da106df6e62c91d0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 16:34:31 -0500 Subject: [PATCH 108/123] Fixed #3656 --- core/assets/maps/planetaryTerminal.msav | Bin 29224 -> 29230 bytes core/src/mindustry/content/UnitTypes.java | 1 + core/src/mindustry/core/Control.java | 2 +- core/src/mindustry/game/Universe.java | 2 ++ 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/assets/maps/planetaryTerminal.msav b/core/assets/maps/planetaryTerminal.msav index f5a7df9a003aa9e5463b3b71aaecd76f6391960a..7c45ebfca2aec25bb9718eb08405a4349e3c7ac9 100644 GIT binary patch delta 25264 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≪x7@ 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 ZKnOViQSJiQ&)V;tX^!stf+p? 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 delta 25279 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 F1pr{R3VHwl diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index ca74a26868..e053a8ee65 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1657,6 +1657,7 @@ public class UnitTypes implements ContentList{ recoil = 3f; occlusion = 12f; ejectEffect = Fx.casing3; + shootSound = Sounds.shootBig; shots = 3; shotDelay = 4f; diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 4f4f45bd64..c67572d559 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -340,7 +340,7 @@ public class Control implements ApplicationListener, Loadable{ state.rules.waves = true; //reset win wave?? - state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null ? sector.preset.captureWave : 40; + state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 40; //if there's still an enemy base left, fix it if(state.rules.attackMode){ diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java index 0aa1407879..3d12e5ec5f 100644 --- a/core/src/mindustry/game/Universe.java +++ b/core/src/mindustry/game/Universe.java @@ -225,9 +225,11 @@ public class Universe{ if(sector.isBeingPlayed()){ state.rules.winWave = waveMax; state.rules.waves = true; + state.rules.attackMode = false; }else{ sector.info.winWave = waveMax; sector.info.waves = true; + sector.info.attack = false; sector.saveInfo(); } From c41dfa46aa99a59748a31ad6752497f2cd6ba5a0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Nov 2020 19:41:10 -0500 Subject: [PATCH 109/123] Fixed #3657 --- core/src/mindustry/entities/comp/UnitComp.java | 4 ++-- core/src/mindustry/graphics/g3d/PlanetRenderer.java | 3 ++- core/src/mindustry/input/DesktopInput.java | 4 ++-- core/src/mindustry/input/MobileInput.java | 6 +++--- core/src/mindustry/ui/dialogs/PlanetDialog.java | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 0859605240..b2f81d5526 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -90,8 +90,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I public float prefRotation(){ if(activelyBuilding()){ return angleTo(buildPlan()); - }else if(mineTile() != null){ - return angleTo(mineTile()); + }else if(mineTile != null){ + return angleTo(mineTile); }else if(moving()){ return vel().angle(); } diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 46fcef4edf..95a2abd9e7 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -37,6 +37,7 @@ public class PlanetRenderer implements Disposable{ public final VertexBatch3D batch = new VertexBatch3D(20000, false, true, 0); public float zoom = 1f; + public float orbitAlpha = 1f; private final Mesh[] outlines = new Mesh[10]; public final PlaneBatch3D projector = new PlaneBatch3D(); @@ -168,7 +169,7 @@ public class PlanetRenderer implements Disposable{ Vec3 center = planet.parent.position; float radius = planet.orbitRadius; int points = (int)(radius * 10); - Angles.circleVectors(points, radius, (cx, cy) -> batch.vertex(Tmp.v32.set(center).add(cx, 0, cy), Pal.gray)); + Angles.circleVectors(points, radius, (cx, cy) -> batch.vertex(Tmp.v32.set(center).add(cx, 0, cy), Pal.gray.write(Tmp.c1).a(orbitAlpha))); batch.flush(Gl.lineLoop); } diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index ddc84131ba..ad0e6b32f9 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -629,8 +629,8 @@ public class DesktopInput extends InputHandler{ unit.moveAt(movement); }else{ unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len())); - if(!movement.isZero() && ground){ - unit.vel.rotateTo(movement.angle(), unit.type.rotateSpeed); + if(!movement.isZero()){ + unit.vel.rotateTo(movement.angle(), unit.type.rotateSpeed * Math.max(Time.delta, 1)); } } diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index b3b519609d..5d0284abf7 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -836,7 +836,7 @@ public class MobileInput extends InputHandler implements GestureListener{ if(type == null) return; boolean omni = unit.type.omniMovement; - boolean legs = unit.isGrounded(); + boolean ground = unit.isGrounded(); boolean allowHealing = type.canHeal; boolean validHealTarget = allowHealing && target instanceof Building && ((Building)target).isValid() && target.team() == unit.team && ((Building)target).damaged() && target.within(unit, type.range); @@ -908,8 +908,8 @@ public class MobileInput extends InputHandler implements GestureListener{ unit.moveAt(movement); }else{ unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len())); - if(!movement.isZero() && legs){ - unit.vel.rotateTo(movement.angle(), type.rotateSpeed); + if(!movement.isZero()){ + unit.vel.rotateTo(movement.angle(), unit.type.rotateSpeed * Math.max(Time.delta, 1)); } } diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 94d525bce0..3db6350619 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -409,6 +409,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ @Override public void draw(){ + planets.orbitAlpha = selectAlpha; planets.render(PlanetDialog.this); if(Core.scene.getDialog() == PlanetDialog.this){ Core.scene.setScrollFocus(PlanetDialog.this); From 4f3e353b752e28e99271c40c521432e7ec354baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E6=BB=91=E7=A8=BD?= <48855802+laohuaji233@users.noreply.github.com> Date: Mon, 30 Nov 2020 12:45:27 +0800 Subject: [PATCH 110/123] Update bundle_zh_CN.properties --- core/assets/bundles/bundle_zh_CN.properties | 116 ++++++++++---------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index faaeca09d9..4e5074ae4c 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1407,7 +1407,7 @@ block.duo.description = 交替向敌人发射子弹。 block.scatter.description = 向敌机发射铅、废料或钢化玻璃高射炮弹。 block.scorch.description = 焚烧任何靠近它的地面敌人。近距离高效 block.hail.description = 向远距离地面敌人发射小型炮弹。 -block.wave.description = 射出液体。使用水作弹药时能够自动灭火。 +block.wave.description = 向敌人射出液体流。使用水作弹药时能够自动灭火。 block.lancer.description = 充能并向地面单位发射强力的的波束。 block.arc.description = 向地面单位发射电弧。 block.swarmer.description = 向敌人发射追踪导弹。 @@ -1420,61 +1420,61 @@ block.meltdown.description = 向附近的敌人发射持续的激光束。需要 block.foreshadow.description = 向远距离单目标射击。 block.repair-point.description = 持续修复其附近受损最严重的单位。 block.segment.description = 摧毁袭来的除激光以外的子弹或导弹。 -block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process. -block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water. -block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations. -block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium. -block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate. -block.payload-conveyor.description = Moves large payloads, such as units from factories. -block.payload-router.description = Splits input payloads into 3 output directions. -block.command-center.description = Controls unit behavior with several different commands. -block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading. -block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading. -block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading. -block.additive-reconstructor.description = Upgrades inputted units to the second tier. -block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier. -block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier. -block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier. -block.switch.description = A toggleable switch. State can be read and controlled with logic processors. -block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. -block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor. -block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor. -block.memory-cell.description = Stores information for a logic processor. -block.memory-bank.description = Stores information for a logic processor. High capacity. -block.logic-display.description = Displays arbitrary graphics from a logic processor. -block.large-logic-display.description = Displays arbitrary graphics from a logic processor. -block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment. +block.parallax.description = 通过牵引光束牵引空中目标，并在这个过程中对其造成伤害。 +block.tsunami.description = 向敌人射出强力的液体流。使用水作弹药时能够自动灭火。 +block.silicon-crucible.description = 从沙子和煤中提炼硅，用硫化物作为附加热源。在炙热地型上更高效。 +block.disassembler.description = 以低效率将矿渣分离成微量的外来矿物成分。能产生钍。 +block.overdrive-dome.description = 提高附近建筑物的速度。需要相位物和硅来工作。 +block.payload-conveyor.description = 移动大型有效载荷，例如从工厂生产的单位。 +block.payload-router.description = 将输入的有效载荷向3个方向输出。 +block.command-center.description = 使用多个不同的命令控制单位。 +block.ground-factory.description = 产生陆军单位。输出的单位可以直接使用，也可以移入重构厂进行升级。 +block.air-factory.description = 产生空军单位。输出的单位可以直接使用，也可以移入重构厂进行升级。 +block.naval-factory.description = 产生海军单位。输出的单位可以直接使用，也可以移入重构厂进行升级。 +block.additive-reconstructor.description = 将输入的单位升级到第二级。 +block.multiplicative-reconstructor.description = 将输入的单位升级到第三级。 +block.exponential-reconstructor.description = 将输入的单位升级到第四级。 +block.tetrative-reconstructor.description = 将输入的单位升级到第五级，也是最终极。 +block.switch.description = 可切换开关。状态可以用逻辑处理器读取和控制。 +block.micro-processor.description = 在循环中运行一系列逻辑指令。可用于控制单元和建筑物。 +block.logic-processor.description = 在循环中运行一系列逻辑指令。可用于控制单元和建筑物。比微型处理器快。 +block.hyper-processor.description = 在循环中运行一系列逻辑指令。可用于控制单元和建筑物。可用于控制单元和建筑物。比逻辑处理器快。 +block.memory-cell.description = 存储处理器的信息。 +block.memory-bank.description = 存储处理器的信息。内存量更大。 +block.logic-display.description = 显示处理器中的任意图形。 +block.large-logic-display.description = 显示处理器中的任意图形。 +block.interplanetary-accelerator.description = 一个巨大的电磁轨道加速器。加速核心逃逸速度以进行星际部署。 -unit.dagger.description = Fires standard bullets at all nearby enemies. -unit.mace.description = Fires streams of flame at all nearby enemies. -unit.fortress.description = Fires long-range artillery at ground targets. -unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies. -unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies. -unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight. -unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight. -unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded. -unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repairs allied structures. Capable of flight. -unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain. -unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion. -unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain. -unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. -unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain. -unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain. -unit.flare.description = Fires standard bullets at nearby ground targets. -unit.horizon.description = Drops clusters of bombs on ground targets. -unit.zenith.description = Fires salvos of missiles at all nearby enemies. -unit.antumbra.description = Fires a barrage of bullets at all nearby enemies. -unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies. -unit.mono.description = Automatically mines copper and lead, depositing it into the core. -unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction. -unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units. -unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units. -unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units. -unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies. -unit.minke.description = Fires shells and standard bullets at nearby ground targets. -unit.bryde.description = Fires long-range artillery shells and missiles at enemies. -unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies. -unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units. -unit.alpha.description = Defends the Shard core from enemies. Builds structures. -unit.beta.description = Defends the Foundation core from enemies. Builds structures. -unit.gamma.description = Defends the Nucleus core from enemies. Builds structures. +unit.dagger.description = 攻击附近所有敌人。发射标准子弹。 +unit.mace.description = 攻击附近所有敌人。发射火焰。 +unit.fortress.description = 攻击地面敌人。发射远程火炮。 +unit.scepter.description = 攻击附近所有敌人。发射充能弹。 +unit.reign.description = 攻击附近所有敌人。发射穿透性子弹。 +unit.nova.description = 发射激光弹来攻击敌人并修复盟军建筑。能够飞行。 +unit.pulsar.description = 发射电弧来攻击敌人并修复盟军建筑。能够飞行。 +unit.quasar.description = 发射穿透性激光束来攻击敌人并修复盟军建筑。能够飞行。拥有护盾。 +unit.vela.description = 发射巨大的持续激光束攻击敌人，引起火灾并修复盟军建筑。能够飞行。 +unit.corvus.description = 发射巨大的激光爆破束，摧毁敌人并修复盟军建筑。可以跨越大多数地形。 +unit.crawler.description = 冲向敌人并自毁，造成大爆炸。 +unit.atrax.description = 向地面目标发射削弱性的矿渣球体。可以跨越大多数地形。 +unit.spiroct.description = 向敌人发射激光束，并在此过程中自我修复。可以跨越大多数地形。 +unit.arkyid.description = 向敌人发射大量激光束，并在此过程中自我修复。可以跨越大多数地形。 +unit.toxopid.description = 向敌人发射大型电能集束炮弹和穿透激光。可以跨越大多数地形。 +unit.flare.description = 攻击地面敌人。发射标准子弹。 +unit.horizon.description = 攻击地面敌人。投下炸弹。 +unit.zenith.description = 攻击附近所有敌人。发射导弹群。 +unit.antumbra.description = 攻击附近所有敌人。发射密集的子弹。 +unit.eclipse.description = 攻击附近所有敌人。发射穿透性激光和分裂弹。 +unit.mono.description = 自动开采铜和铅，并将其放入核心中。 +unit.poly.description = 自动重建受损结构，协助其他单位建造。 +unit.mega.description = 自动修复受损结构。能够携带方块和小型地面部队。 +unit.quad.description = 向地面目标投掷大型炸弹，修复盟军建筑并摧毁敌人。能够携带中型地面部队。 +unit.oct.description = 用它的再生护盾保护附近的盟友。能够携带大多数地面部队。 +unit.risso.description = 攻击附近所有敌人。发射一连串的导弹和子弹。 +unit.minke.description = 攻击附近所有敌人。发射炮弹和标准子弹。 +unit.bryde.description = 攻击附近所有敌人。发射发射远程炮弹和导弹。 +unit.sei.description = 攻击附近所有敌人。发射一连串的导弹和穿甲弹。 +unit.omura.description = 攻击附近所有敌人。发射远程穿透轨道炮。可构造星耀单元。 +unit.alpha.description = 保护初代核心。可构建结构。 +unit.beta.description = 保护次代核心。可构建结构。 +unit.gamma.description = 保护终代核心。可构建结构。 From fb580326b2f5a3a63f7ef4ff1e675795a5a7f7d6 Mon Sep 17 00:00:00 2001 From: YellOw139 <70975516+YellOw139@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:53:52 +0200 Subject: [PATCH 111/123] Easier reading for the monolingual --- core/assets/bundles/bundle_ro.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index dfdc4583ee..fb010855ee 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -1012,7 +1012,7 @@ unit.omura.name = Omura unit.alpha.name = Alpha unit.beta.name = Beta unit.gamma.name = Gamma -unit.scepter.name = Scepter +unit.scepter.name = Septer unit.reign.name = Reign unit.vela.name = Vela unit.corvus.name = Corvus From 5ba99ecb42bd25e2f70bc4fe71c41f41ee1225a7 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Mon, 30 Nov 2020 14:21:18 +0100 Subject: [PATCH 112/123] Fixed #3661 --- core/src/mindustry/world/Build.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index 2355dd8118..86cca0d3d7 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -58,7 +58,7 @@ public class Build{ if(tile == null) return; //auto-rotate the block to the correct orientation and bail out - if(tile.team() == team && tile.block == result && tile.build != null){ + if(tile.team() == team && tile.block == result && tile.build != null && tile.block.quickRotate){ if(unit != null && unit.isPlayer()) tile.build.lastAccessed = unit.getPlayer().name; tile.build.rotation = Mathf.mod(rotation, 4); tile.build.updateProximity(); From 371a14af873b772fc527cbbdeb3bf8b4fbd98798 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Nov 2020 10:15:22 -0500 Subject: [PATCH 113/123] Inlined Time.time --- core/src/mindustry/entities/Puddles.java | 8 ++++---- .../entities/bullet/ContinuousLaserBulletType.java | 4 ++-- core/src/mindustry/entities/comp/BuilderComp.java | 4 ++-- core/src/mindustry/entities/comp/FlyingComp.java | 4 ++-- core/src/mindustry/entities/comp/MinerComp.java | 10 +++++----- core/src/mindustry/entities/comp/PlayerComp.java | 2 +- core/src/mindustry/entities/comp/PuddleComp.java | 6 +++--- core/src/mindustry/game/Universe.java | 2 +- core/src/mindustry/graphics/BlockRenderer.java | 2 +- core/src/mindustry/graphics/MenuRenderer.java | 4 ++-- core/src/mindustry/graphics/OverlayRenderer.java | 12 ++++++------ core/src/mindustry/graphics/Shaders.java | 10 +++++----- .../src/mindustry/graphics/g3d/PlanetRenderer.java | 4 ++-- core/src/mindustry/input/InputHandler.java | 2 +- core/src/mindustry/input/MobileInput.java | 4 ++-- core/src/mindustry/logic/LExecutor.java | 2 ++ core/src/mindustry/type/UnitType.java | 14 +++++++------- core/src/mindustry/type/Weather.java | 14 +++++++------- core/src/mindustry/ui/dialogs/JoinDialog.java | 4 ++-- core/src/mindustry/ui/dialogs/PlanetDialog.java | 3 ++- core/src/mindustry/ui/fragments/HudFragment.java | 4 ++-- core/src/mindustry/world/Block.java | 2 +- .../src/mindustry/world/DirectionalItemBuffer.java | 4 ++-- core/src/mindustry/world/ItemBuffer.java | 4 ++-- .../world/blocks/campaign/Accelerator.java | 8 ++++---- .../world/blocks/defense/MendProjector.java | 4 ++-- .../world/blocks/defense/OverdriveProjector.java | 4 ++-- .../world/blocks/distribution/Conveyor.java | 2 +- .../world/blocks/distribution/ItemBridge.java | 6 +++--- .../world/blocks/distribution/Junction.java | 2 +- .../world/blocks/distribution/MassDriver.java | 4 ++-- .../world/blocks/distribution/PayloadConveyor.java | 2 +- .../world/blocks/environment/TreeBlock.java | 6 +++--- .../world/blocks/power/ImpactReactor.java | 6 +++--- .../world/blocks/power/ItemLiquidGenerator.java | 2 +- .../mindustry/world/blocks/power/PowerNode.java | 2 +- .../world/blocks/production/Cultivator.java | 2 +- .../mindustry/world/blocks/production/Drill.java | 2 +- .../world/blocks/production/GenericSmelter.java | 6 +++--- .../world/blocks/production/Incinerator.java | 2 +- desktop/src/mindustry/desktop/steam/SStat.java | 1 - gradle.properties | 2 +- 42 files changed, 97 insertions(+), 95 deletions(-) diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java index 0abdae4928..a57f689884 100644 --- a/core/src/mindustry/entities/Puddles.java +++ b/core/src/mindustry/entities/Puddles.java @@ -38,9 +38,9 @@ public class Puddles{ Puddle p = map.get(tile.pos()); - if(generation == 0 && p != null && p.lastRipple() <= Time.time() - 40f){ + if(generation == 0 && p != null && p.lastRipple() <= Time.time - 40f){ Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, tile.floor().liquidDrop.color); - p.lastRipple(Time.time()); + p.lastRipple(Time.time); } return; } @@ -62,9 +62,9 @@ public class Puddles{ }else if(p.liquid() == liquid){ p.accepting(Math.max(amount, p.accepting())); - if(generation == 0 && p.lastRipple() <= Time.time() - 40f && p.amount() >= maxLiquid / 2f){ + if(generation == 0 && p.lastRipple() <= Time.time - 40f && p.amount() >= maxLiquid / 2f){ Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, p.liquid().color); - p.lastRipple(Time.time()); + p.lastRipple(Time.time); } }else{ p.amount(p.amount() + reactPuddle(p.liquid(), liquid, amount, p.tile(), (p.x() + source.worldx())/2f, (p.y() + source.worldy())/2f)); diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java index 3e570c6309..07ae245719 100644 --- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java +++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java @@ -85,10 +85,10 @@ public class ContinuousLaserBulletType extends BulletType{ Lines.lineAngle(b.x, b.y, b.rotation(), baseLen); for(int s = 0; s < colors.length; s++){ - Draw.color(Tmp.c1.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f))); + Draw.color(Tmp.c1.set(colors[s]).mul(1f + Mathf.absin(Time.time, 1f, 0.1f))); for(int i = 0; i < tscales.length; i++){ Tmp.v1.trns(b.rotation() + 180f, (lenscales[i] - 1f) * spaceMag); - Lines.stroke((width + Mathf.absin(Time.time(), oscScl, oscMag)) * fout * strokes[s] * tscales[i]); + Lines.stroke((width + Mathf.absin(Time.time, oscScl, oscMag)) * fout * strokes[s] * tscales[i]); Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rotation(), baseLen * lenscales[i], false); } } diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java index b39ed5baef..b00b43774f 100644 --- a/core/src/mindustry/entities/comp/BuilderComp.java +++ b/core/src/mindustry/entities/comp/BuilderComp.java @@ -224,7 +224,7 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{ float tx = plan.drawx(), ty = plan.drawy(); Lines.stroke(1f, Pal.accent); - float focusLen = 3.8f + Mathf.absin(Time.time(), 1.1f, 0.6f); + float focusLen = 3.8f + Mathf.absin(Time.time, 1.1f, 0.6f); float px = x + Angles.trnsx(rotation, focusLen); float py = y + Angles.trnsy(rotation, focusLen); @@ -246,7 +246,7 @@ abstract class BuilderComp implements Posc, Teamc, Rotc{ Lines.line(px, py, x1, y1); Lines.line(px, py, x3, y3); - Fill.circle(px, py, 1.6f + Mathf.absin(Time.time(), 0.8f, 1.5f)); + Fill.circle(px, py, 1.6f + Mathf.absin(Time.time, 0.8f, 1.5f)); Draw.color(); } diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java index d37a6da899..43955b75a1 100644 --- a/core/src/mindustry/entities/comp/FlyingComp.java +++ b/core/src/mindustry/entities/comp/FlyingComp.java @@ -46,8 +46,8 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ } void wobble(){ - x += Mathf.sin(Time.time() + (id() % 10) * 12, 25f, 0.05f) * Time.delta * elevation; - y += Mathf.cos(Time.time() + (id() % 10) * 12, 25f, 0.05f) * Time.delta * elevation; + x += Mathf.sin(Time.time + (id() % 10) * 12, 25f, 0.05f) * Time.delta * elevation; + y += Mathf.cos(Time.time + (id() % 10) * 12, 25f, 0.05f) * Time.delta * elevation; } void moveAt(Vec2 vector, float acceleration){ diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java index b993815a36..8eff7d58ce 100644 --- a/core/src/mindustry/entities/comp/MinerComp.java +++ b/core/src/mindustry/entities/comp/MinerComp.java @@ -105,25 +105,25 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{ @Override public void draw(){ if(!mining()) return; - float focusLen = hitSize / 2f + Mathf.absin(Time.time(), 1.1f, 0.5f); + float focusLen = hitSize / 2f + Mathf.absin(Time.time, 1.1f, 0.5f); float swingScl = 12f, swingMag = tilesize / 8f; float flashScl = 0.3f; float px = x + Angles.trnsx(rotation, focusLen); float py = y + Angles.trnsy(rotation, focusLen); - float ex = mineTile.worldx() + Mathf.sin(Time.time() + 48, swingScl, swingMag); - float ey = mineTile.worldy() + Mathf.sin(Time.time() + 48, swingScl + 2f, swingMag); + float ex = mineTile.worldx() + Mathf.sin(Time.time + 48, swingScl, swingMag); + float ey = mineTile.worldy() + Mathf.sin(Time.time + 48, swingScl + 2f, swingMag); Draw.z(Layer.flyingUnit + 0.1f); - Draw.color(Color.lightGray, Color.white, 1f - flashScl + Mathf.absin(Time.time(), 0.5f, flashScl)); + Draw.color(Color.lightGray, Color.white, 1f - flashScl + Mathf.absin(Time.time, 0.5f, flashScl)); Drawf.laser(team(), Core.atlas.find("minelaser"), Core.atlas.find("minelaser-end"), px, py, ex, ey, 0.75f); if(isLocal()){ Lines.stroke(1f, Pal.accent); - Lines.poly(mineTile.worldx(), mineTile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time()); + Lines.poly(mineTile.worldx(), mineTile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time); } Draw.color(); diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java index 0f8236377c..5e6c214cc6 100644 --- a/core/src/mindustry/entities/comp/PlayerComp.java +++ b/core/src/mindustry/entities/comp/PlayerComp.java @@ -243,7 +243,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra } if(Core.settings.getBool("playerchat") && ((textFadeTime > 0 && lastText != null) || typing)){ - String text = textFadeTime <= 0 || lastText == null ? "[lightgray]" + Strings.animated(Time.time(), 4, 15f, ".") : lastText; + String text = textFadeTime <= 0 || lastText == null ? "[lightgray]" + Strings.animated(Time.time, 4, 15f, ".") : lastText; float width = 100f; float visualFadeTime = 1f - Mathf.curve(1f - textFadeTime, 0.9f); font.setColor(1f, 1f, 1f, textFadeTime <= 0 || lastText == null ? 1f : visualFadeTime); diff --git a/core/src/mindustry/entities/comp/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java index a447bd633a..720aee2f93 100644 --- a/core/src/mindustry/entities/comp/PuddleComp.java +++ b/core/src/mindustry/entities/comp/PuddleComp.java @@ -101,10 +101,10 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{ float sscl = 25f; Draw.color(tmp.set(liquid.color).shiftValue(-0.05f)); - Fill.circle(x + Mathf.sin(Time.time() + seeds * 532, sscl, smag), y + Mathf.sin(Time.time() + seeds * 53, sscl, smag), f * 8f); + Fill.circle(x + Mathf.sin(Time.time + seeds * 532, sscl, smag), y + Mathf.sin(Time.time + seeds * 53, sscl, smag), f * 8f); Angles.randLenVectors(id(), 3, f * 6f, (ex, ey) -> { - Fill.circle(x + ex + Mathf.sin(Time.time() + seeds * 532, sscl, smag), - y + ey + Mathf.sin(Time.time() + seeds * 53, sscl, smag), f * 5f); + Fill.circle(x + ex + Mathf.sin(Time.time + seeds * 532, sscl, smag), + y + ey + Mathf.sin(Time.time + seeds * 53, sscl, smag), f * 5f); seeds++; }); Draw.color(); diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java index 3d12e5ec5f..50f1f006d7 100644 --- a/core/src/mindustry/game/Universe.java +++ b/core/src/mindustry/game/Universe.java @@ -201,7 +201,7 @@ public class Universe{ } sector.info.export.each((item, amount) -> { - if(sector.info.items.get(item) <= 0 && sector.info.production.get(item, ExportStat::new).mean <= 0){ + if(sector.info.items.get(item) <= 0 && sector.info.production.get(item, ExportStat::new).mean < 0){ //disable export when production is negative. sector.info.export.get(item).mean = 0f; } diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index a5a78811f5..651e1d01d7 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -129,7 +129,7 @@ public class BlockRenderer implements Disposable{ if(!camera.bounds(Tmp.r1).grow(tilesize * 2f).overlaps(Tmp.r2.setSize(b.size * tilesize).setCenter(block.x * tilesize + b.offset, block.y * tilesize + b.offset))) continue; Draw.alpha(0.33f * brokenFade); - Draw.mixcol(Color.white, 0.2f + Mathf.absin(Time.globalTime(), 6f, 0.2f)); + Draw.mixcol(Color.white, 0.2f + Mathf.absin(Time.globalTime, 6f, 0.2f)); Draw.rect(b.icon(Cicon.full), block.x * tilesize + b.offset, block.y * tilesize + b.offset, b.rotate ? block.rotation * 90 : 0f); } Draw.reset(); diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index 87ab169670..efa42cfc89 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -257,11 +257,11 @@ public class MenuRenderer implements Disposable{ Draw.color(Pal.engine); Fill.circle(x + Angles.trnsx(rotation + 180, engineOffset), y + Angles.trnsy(rotation + 180, engineOffset), - engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)); + engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)); Draw.color(Color.white); Fill.circle(x + Angles.trnsx(rotation + 180, engineOffset - 1f), y + Angles.trnsy(rotation + 180, engineOffset - 1f), - (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f); + (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) / 2f); Draw.color(); Draw.rect(icon, x, y, flyerRot - 90); diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index 6cc1a1a851..40de5e0d63 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -89,7 +89,7 @@ public class OverlayRenderer{ } Lines.stroke(unitFade); - Lines.square(select.x, select.y, select.hitSize() * 1.5f, Time.time() * 2f); + Lines.square(select.x, select.y, select.hitSize() * 1.5f, Time.time * 2f); Draw.reset(); } @@ -112,14 +112,14 @@ public class OverlayRenderer{ if(dst < state.rules.enemyCoreBuildRadius * 2.2f){ Draw.color(Color.darkGray); Lines.circle(core.x, core.y - 2, state.rules.enemyCoreBuildRadius); - Draw.color(Pal.accent, core.team.color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f)); + Draw.color(Pal.accent, core.team.color, 0.5f + Mathf.absin(Time.time, 10f, 0.5f)); Lines.circle(core.x, core.y, state.rules.enemyCoreBuildRadius); } }); } Lines.stroke(2f); - Draw.color(Color.gray, Color.lightGray, Mathf.absin(Time.time(), 8f, 1f)); + Draw.color(Color.gray, Color.lightGray, Mathf.absin(Time.time, 8f, 1f)); if(state.hasSpawns()){ for(Tile tile : spawner.getSpawns()){ @@ -167,15 +167,15 @@ public class OverlayRenderer{ float size = 8; Draw.rect(player.unit().item().icon(Cicon.medium), v.x, v.y, size, size); Draw.color(Pal.accent); - Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time(), 5f, 1f)); + Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time, 5f, 1f)); Draw.reset(); Building tile = world.buildWorld(v.x, v.y); if(input.canDropItem() && tile != null && tile.interactable(player.team()) && tile.acceptStack(player.unit().item(), player.unit().stack.amount, player.unit()) > 0 && player.within(tile, itemTransferRange)){ Lines.stroke(3f, Pal.gray); - Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 3 + Mathf.absin(Time.time(), 5f, 1f)); + Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 3 + Mathf.absin(Time.time, 5f, 1f)); Lines.stroke(1f, Pal.place); - Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 2 + Mathf.absin(Time.time(), 5f, 1f)); + Lines.square(tile.x, tile.y, tile.block.size * tilesize / 2f + 2 + Mathf.absin(Time.time, 5f, 1f)); Draw.reset(); } diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index fbe0404b9f..ac3aef896c 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -66,7 +66,7 @@ public class Shaders{ public void apply(){ setUniformf("u_resolution", Core.graphics.getWidth(), Core.graphics.getHeight()); - setUniformf("u_time", Time.globalTime() / 10f); + setUniformf("u_time", Time.globalTime / 10f); setUniformf("u_campos", camera.position); setUniformf("u_rcampos", Tmp.v31.set(camera.position).sub(planet.position)); setUniformf("u_light", planet.getLightNormal()); @@ -174,7 +174,7 @@ public class Shaders{ setUniformf("u_color", color); setUniformf("u_uv", region.u, region.v); setUniformf("u_uv2", region.u2, region.v2); - setUniformf("u_time", Time.time()); + setUniformf("u_time", Time.time); setUniformf("u_texsize", region.texture.width, region.texture.height); } } @@ -188,7 +188,7 @@ public class Shaders{ @Override public void apply(){ setUniformf("u_dp", Scl.scl(1f)); - setUniformf("u_time", Time.time() / Scl.scl(1f)); + setUniformf("u_time", Time.time / Scl.scl(1f)); setUniformf("u_offset", Core.camera.position.x - Core.camera.width / 2, Core.camera.position.y - Core.camera.height / 2); @@ -216,7 +216,7 @@ public class Shaders{ setUniformf("u_campos", Core.camera.position.x, Core.camera.position.y); setUniformf("u_ccampos", Core.camera.position); setUniformf("u_resolution", Core.graphics.getWidth(), Core.graphics.getHeight()); - setUniformf("u_time", Time.time()); + setUniformf("u_time", Time.time); texture.bind(1); renderer.effectBuffer.getTexture().bind(0); @@ -240,7 +240,7 @@ public class Shaders{ public void apply(){ setUniformf("u_campos", Core.camera.position.x - Core.camera.width / 2, Core.camera.position.y - Core.camera.height / 2); setUniformf("u_resolution", Core.camera.width, Core.camera.height); - setUniformf("u_time", Time.time()); + setUniformf("u_time", Time.time); if(hasUniform("u_noise")){ Core.assets.get("sprites/noise.png", Texture.class).bind(1); diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 95a2abd9e7..9e70ced734 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -209,7 +209,7 @@ public class PlanetRenderer implements Disposable{ for(int i = 0; i < pointCount + 1; i++){ float f = i / (float)pointCount; - Tmp.c1.set(from).lerp(to, (f+Time.globalTime()/timeScale)%1f); + Tmp.c1.set(from).lerp(to, (f+ Time.globalTime /timeScale)%1f); batch.color(Tmp.c1); batch.vertex(Tmp.bz3.valueAt(Tmp.v32, f)); @@ -218,7 +218,7 @@ public class PlanetRenderer implements Disposable{ } public void drawBorders(Sector sector, Color base){ - Color color = Tmp.c1.set(base).a(base.a + 0.3f + Mathf.absin(Time.globalTime(), 5f, 0.3f)); + Color color = Tmp.c1.set(base).a(base.a + 0.3f + Mathf.absin(Time.globalTime, 5f, 0.3f)); float r1 = 1f; float r2 = outlineRad + 0.001f; diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index c7ca5cd022..bf6607b2fe 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -749,7 +749,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ boolean valid = validPlace(request.x, request.y, request.block, request.rotation); Draw.reset(); - Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime(), 6f, 0.28f)); + Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f)); Draw.alpha(1f); request.block.drawRequestConfigTop(request, selectRequests); Draw.reset(); diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 5d0284abf7..3c3fd8be76 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -376,8 +376,8 @@ public class MobileInput extends InputHandler implements GestureListener{ float radius = Interp.swingIn.apply(crosshairScale); - Lines.poly(target.getX(), target.getY(), 4, 7f * radius, Time.time() * 1.5f); - Lines.spikes(target.getX(), target.getY(), 3f * radius, 6f * radius, 4, Time.time() * 1.5f); + Lines.poly(target.getX(), target.getY(), 4, 7f * radius, Time.time * 1.5f); + Lines.spikes(target.getX(), target.getY(), 3f * radius, 6f * radius, 4, Time.time * 1.5f); } Draw.reset(); diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index 244746ef81..e2498fd431 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -285,6 +285,8 @@ public class LExecutor{ exec.setnum(outX, cache.x); exec.setnum(outY, cache.y); } + }else{ + exec.setbool(outFound, false); } } diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index f5a40de645..57a5aba215 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -502,9 +502,9 @@ public class UnitType extends UnlockableContent{ //draw back items if(unit.item() != null && unit.itemTime > 0.01f){ - float size = (itemSize + Mathf.absin(Time.time(), 5f, 1f)) * unit.itemTime; + float size = (itemSize + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime; - Draw.mixcol(Pal.accent, Mathf.absin(Time.time(), 5f, 0.5f)); + Draw.mixcol(Pal.accent, Mathf.absin(Time.time, 5f, 0.5f)); Draw.rect(unit.item().icon(Cicon.medium), unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY), unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY), @@ -516,7 +516,7 @@ public class UnitType extends UnlockableContent{ Lines.circle( unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY), unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY), - (3f + Mathf.absin(Time.time(), 5f, 1f)) * unit.itemTime); + (3f + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime); if(unit.isLocal() && !renderer.pixelator.enabled()){ Fonts.outline.draw(unit.stack.amount + "", @@ -538,20 +538,20 @@ public class UnitType extends UnlockableContent{ if(unit instanceof Trailc){ Trail trail = ((Trailc)unit).trail(); - trail.draw(unit.team.color, (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f) * scale) * trailScl); + trail.draw(unit.team.color, (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f) * scale) * trailScl); } Draw.color(unit.team.color); Fill.circle( unit.x + Angles.trnsx(unit.rotation + 180, offset), unit.y + Angles.trnsy(unit.rotation + 180, offset), - (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) * scale + (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) * scale ); Draw.color(Color.white); Fill.circle( unit.x + Angles.trnsx(unit.rotation + 180, offset - 1f), unit.y + Angles.trnsy(unit.rotation + 180, offset - 1f), - (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f * scale + (engineSize + Mathf.absin(Time.time, 2f, engineSize / 4f)) / 2f * scale ); Draw.color(); } @@ -632,7 +632,7 @@ public class UnitType extends UnlockableContent{ } public Color cellColor(Unit unit){ - return Tmp.c1.set(Color.black).lerp(unit.team.color, unit.healthf() + Mathf.absin(Time.time(), Math.max(unit.healthf() * 5f, 1f), 1f - unit.healthf())); + return Tmp.c1.set(Color.black).lerp(unit.team.color, unit.healthf() + Mathf.absin(Time.time, Math.max(unit.healthf() * 5f, 1f), 1f - unit.healthf())); } public void drawLight(Unit unit){ diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java index 8c9bdb0b60..3f815f03e8 100644 --- a/core/src/mindustry/type/Weather.java +++ b/core/src/mindustry/type/Weather.java @@ -90,7 +90,7 @@ public class Weather extends UnlockableContent{ } if(!headless && sound != Sounds.none){ - float noise = soundVolOscMag > 0 ? (float)Math.abs(Noise.rawNoise(Time.time() / soundVolOscScl)) * soundVolOscMag : 0; + float noise = soundVolOscMag > 0 ? (float)Math.abs(Noise.rawNoise(Time.time / soundVolOscScl)) * soundVolOscMag : 0; control.sound.loop(sound, Math.max((soundVol + noise) * state.opacity, soundVolMin)); } } @@ -120,8 +120,8 @@ public class Weather extends UnlockableContent{ float scl = rand.random(0.5f, 1f); float scl2 = rand.random(0.5f, 1f); float size = rand.random(sizeMin, sizeMax); - float x = (rand.random(0f, world.unitWidth()) + Time.time() * windx * scl2); - float y = (rand.random(0f, world.unitHeight()) + Time.time() * windy * scl); + float x = (rand.random(0f, world.unitWidth()) + Time.time * windx * scl2); + float y = (rand.random(0f, world.unitHeight()) + Time.time * windy * scl); float alpha = rand.random(minAlpha, maxAlpha); x += Mathf.sin(y, rand.random(sinSclMin, sinSclMax), rand.random(sinMagMin, sinMagMax)); @@ -155,8 +155,8 @@ public class Weather extends UnlockableContent{ float scl = rand.random(0.5f, 1f); float scl2 = rand.random(0.5f, 1f); float size = rand.random(sizeMin, sizeMax); - float x = (rand.random(0f, world.unitWidth()) + Time.time() * xspeed * scl2); - float y = (rand.random(0f, world.unitHeight()) - Time.time() * yspeed * scl); + float x = (rand.random(0f, world.unitWidth()) + Time.time * xspeed * scl2); + float y = (rand.random(0f, world.unitHeight()) - Time.time * yspeed * scl); float tint = rand.random(1f) * alpha; x -= Tmp.r1.x; @@ -180,7 +180,7 @@ public class Weather extends UnlockableContent{ int total = (int)(Tmp.r1.area() / density * intensity) / 2; Lines.stroke(stroke); - float t = Time.time() / timeScale; + float t = Time.time / timeScale; for(int i = 0; i < total; i++){ float offset = rand.random(0f, 1f); @@ -227,7 +227,7 @@ public class Weather extends UnlockableContent{ float windx = vwindx * speed, windy = vwindy * speed; float scale = 1f / noisescl; - float scroll = Time.time() * scale + offset; + float scroll = Time.time * scale + offset; Tmp.tr1.texture = noise; Core.camera.bounds(Tmp.r1); Tmp.tr1.set(Tmp.r1.x*scale, Tmp.r1.y*scale, (Tmp.r1.x + Tmp.r1.width)*scale, (Tmp.r1.y + Tmp.r1.height)*scale); diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index fe5ea1bdaf..a0987c5a49 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -199,7 +199,7 @@ public class JoinDialog extends BaseDialog{ void refreshServer(Server server){ server.content.clear(); - server.content.label(() -> Core.bundle.get("server.refreshing") + Strings.animated(Time.time(), 4, 11, ".")); + server.content.label(() -> Core.bundle.get("server.refreshing") + Strings.animated(Time.time, 4, 11, ".")); net.pingHost(server.ip, server.port, host -> setupServer(server, host), e -> { server.content.clear(); @@ -340,7 +340,7 @@ public class JoinDialog extends BaseDialog{ local.clear(); local.background(null); - local.table(Tex.button, t -> t.label(() -> "[accent]" + Core.bundle.get("hosts.discovering.any") + Strings.animated(Time.time(), 4, 10f, ".")).pad(10f)).growX(); + local.table(Tex.button, t -> t.label(() -> "[accent]" + Core.bundle.get("hosts.discovering.any") + Strings.animated(Time.time, 4, 10f, ".")).pad(10f)).growX(); net.discoverServers(this::addLocalHost, this::finishLocalHosts); } diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 3db6350619..710fc29895 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -287,7 +287,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ Color color = sec.hasBase() ? Tmp.c2.set(Team.sharded.color).lerp(Team.crux.color, sec.hasEnemyBase() ? 0.5f : 0f) : - sec.preset != null ? Tmp.c2.set(Team.derelict.color).lerp(Color.white, Mathf.absin(Time.time(), 10f, 1f)) : + sec.preset != null ? Tmp.c2.set(Team.derelict.color).lerp(Color.white, Mathf.absin(Time.time, 10f, 1f)) : sec.hasEnemyBase() ? Team.crux.color : null; @@ -627,6 +627,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ Table stable = sectorTop; if(sector == null){ + stable.clear(); return; } diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 685cdd6e88..dc9620fb42 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -275,7 +275,7 @@ public class HudFragment extends Fragment{ t.name = "nearpoint"; t.touchable = Touchable.disabled; t.table(Styles.black, c -> c.add("@nearpoint") - .update(l -> l.setColor(Tmp.c1.set(Color.white).lerp(Color.scarlet, Mathf.absin(Time.time(), 10f, 1f)))) + .update(l -> l.setColor(Tmp.c1.set(Color.white).lerp(Color.scarlet, Mathf.absin(Time.time, 10f, 1f)))) .get().setAlignment(Align.center, Align.center)) .margin(6).update(u -> u.color.a = Mathf.lerpDelta(u.color.a, Mathf.num(spawner.playerNear()), 0.1f)).get().color.a = 0f; }); @@ -317,7 +317,7 @@ public class HudFragment extends Fragment{ return coreAttackOpacity[0] > 0; }); t.table(Tex.button, top -> top.add("@coreattack").pad(2) - .update(label -> label.color.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time(), 2f, 1f)))).touchable(Touchable.disabled); + .update(label -> label.color.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f)))).touchable(Touchable.disabled); }); //'saving' indicator diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 6eec5c2b20..5e38bfa8a8 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -392,7 +392,7 @@ public class Block extends UnlockableContent{ public void drawRequest(BuildPlan req, Eachable list, boolean valid){ Draw.reset(); - Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime(), 6f, 0.28f)); + Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f)); Draw.alpha(1f); float prevScale = Draw.scl; Draw.scl *= req.animScale; diff --git a/core/src/mindustry/world/DirectionalItemBuffer.java b/core/src/mindustry/world/DirectionalItemBuffer.java index 4b7a7bca2f..48cbdc84c0 100644 --- a/core/src/mindustry/world/DirectionalItemBuffer.java +++ b/core/src/mindustry/world/DirectionalItemBuffer.java @@ -23,7 +23,7 @@ public class DirectionalItemBuffer{ public void accept(int buffer, Item item){ if(!accepts(buffer)) return; - buffers[buffer][indexes[buffer]++] = BufferItem.get((byte)item.id, Time.time()); + buffers[buffer][indexes[buffer]++] = BufferItem.get((byte)item.id, Time.time); } public Item poll(int buffer, float speed){ @@ -31,7 +31,7 @@ public class DirectionalItemBuffer{ long l = buffers[buffer][0]; float time = BufferItem.time(l); - if(Time.time() >= time + speed || Time.time() < time){ + if(Time.time >= time + speed || Time.time < time){ return content.item(BufferItem.item(l)); } } diff --git a/core/src/mindustry/world/ItemBuffer.java b/core/src/mindustry/world/ItemBuffer.java index 6ab014bd2f..e9001ac534 100644 --- a/core/src/mindustry/world/ItemBuffer.java +++ b/core/src/mindustry/world/ItemBuffer.java @@ -20,7 +20,7 @@ public class ItemBuffer{ public void accept(Item item, short data){ //if(!accepts()) return; - buffer[index++] = Pack.longInt(Float.floatToIntBits(Time.time()), Pack.shortInt(item.id, data)); + buffer[index++] = Pack.longInt(Float.floatToIntBits(Time.time), Pack.shortInt(item.id, data)); } public void accept(Item item){ @@ -32,7 +32,7 @@ public class ItemBuffer{ long l = buffer[0]; float time = Float.intBitsToFloat(Pack.leftInt(l)); - if(Time.time() >= time + speed || Time.time() < time){ + if(Time.time >= time + speed || Time.time < time){ return content.item(Pack.leftShort(Pack.rightInt(l))); } } diff --git a/core/src/mindustry/world/blocks/campaign/Accelerator.java b/core/src/mindustry/world/blocks/campaign/Accelerator.java index 7c8359a6bf..9fc423509e 100644 --- a/core/src/mindustry/world/blocks/campaign/Accelerator.java +++ b/core/src/mindustry/world/blocks/campaign/Accelerator.java @@ -51,7 +51,7 @@ public class Accelerator extends Block{ for(int l = 0; l < 4; l++){ float length = 7f + l * 5f; - Draw.color(team.color, Pal.darkMetal, Mathf.absin(Time.time() + l*50f, 10f, 1f)); + Draw.color(team.color, Pal.darkMetal, Mathf.absin(Time.time + l*50f, 10f, 1f)); for(int i = 0; i < 4; i++){ float rot = i*90f + 45f; @@ -67,13 +67,13 @@ public class Accelerator extends Block{ Lines.square(x, y, rad * 1.22f, 45f); Lines.stroke(3f, Pal.accent); - Lines.square(x, y, rad, Time.time() / scl); - Lines.square(x, y, rad, -Time.time() / scl); + Lines.square(x, y, rad, Time.time / scl); + Lines.square(x, y, rad, -Time.time / scl); Draw.color(team.color); for(int i = 0; i < 4; i++){ - float rot = i*90f + 45f + (-Time.time()/3f)%360f; + float rot = i*90f + 45f + (-Time.time /3f)%360f; float length = 26f; Draw.rect(arrowRegion, x + Angles.trnsx(rot, length), y + Angles.trnsy(rot, length), rot + 180f); } diff --git a/core/src/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java index 1c0231f434..25a4c64544 100644 --- a/core/src/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/mindustry/world/blocks/defense/MendProjector.java @@ -104,10 +104,10 @@ public class MendProjector extends Block{ public void draw(){ super.draw(); - float f = 1f - (Time.time() / 100f) % 1f; + float f = 1f - (Time.time / 100f) % 1f; Draw.color(baseColor, phaseColor, phaseHeat); - Draw.alpha(heat * Mathf.absin(Time.time(), 10f, 1f) * 0.5f); + Draw.alpha(heat * Mathf.absin(Time.time, 10f, 1f) * 0.5f); Draw.rect(topRegion, x, y); Draw.alpha(1f); Lines.stroke((2f * f + 0.2f) * heat); diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java index cc2c60288e..ad845991c7 100644 --- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java @@ -114,10 +114,10 @@ public class OverdriveProjector extends Block{ public void draw(){ super.draw(); - float f = 1f - (Time.time() / 100f) % 1f; + float f = 1f - (Time.time / 100f) % 1f; Draw.color(baseColor, phaseColor, phaseHeat); - Draw.alpha(heat * Mathf.absin(Time.time(), 10f, 1f) * 0.5f); + Draw.alpha(heat * Mathf.absin(Time.time, 10f, 1f) * 0.5f); Draw.rect(topRegion, x, y); Draw.alpha(1f); Lines.stroke((2f * f + 0.1f) * heat); diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 0b6181c80d..23fa7a2a46 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -114,7 +114,7 @@ public class Conveyor extends Block implements Autotiler{ @Override public void draw(){ - int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time() * speed * 8f * timeScale())) % 4) : 0; + int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time * speed * 8f * timeScale())) % 4) : 0; //draw extra conveyors facing this one for non-square tiling purposes Draw.z(Layer.blockUnder); diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index efaeaec5ba..1cad3c94be 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -170,7 +170,7 @@ public class ItemBridge extends Block{ Tmp.v2.trns(tile.angleTo(other), 2f); float tx = tile.drawx(), ty = tile.drawy(); float ox = other.drawx(), oy = other.drawy(); - float alpha = Math.abs((linked ? 100 : 0)-(Time.time() * 2f) % 100f) / 100f; + float alpha = Math.abs((linked ? 100 : 0)-(Time.time * 2f) % 100f) / 100f; float x = Mathf.lerp(ox, tx, alpha); float y = Mathf.lerp(oy, ty, alpha); @@ -207,7 +207,7 @@ public class ItemBridge extends Block{ boolean linked = other.pos() == link; Drawf.select(other.drawx(), other.drawy(), - other.block().size * tilesize / 2f + 2f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f)), linked ? Pal.place : Pal.breakInvalid); + other.block().size * tilesize / 2f + 2f + (linked ? 0f : Mathf.absin(Time.time, 4f, 1f)), linked ? Pal.place : Pal.breakInvalid); } } } @@ -298,7 +298,7 @@ public class ItemBridge extends Block{ int i = relativeTo(other.x, other.y); - Draw.color(Color.white, Color.black, Mathf.absin(Time.time(), 6f, 0.07f)); + Draw.color(Color.white, Color.black, Mathf.absin(Time.time, 6f, 0.07f)); Draw.alpha(Math.max(uptime, 0.25f) * opacity); Draw.rect(endRegion, x, y, i * 90 + 90); diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java index 4f8b3a9869..a60e13fb2b 100644 --- a/core/src/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/mindustry/world/blocks/distribution/Junction.java @@ -44,7 +44,7 @@ public class Junction extends Block{ long l = buffer.buffers[i][0]; float time = BufferItem.time(l); - if(Time.time() >= time + speed / timeScale || Time.time() < time){ + if(Time.time >= time + speed / timeScale || Time.time < time){ Item item = content.item(BufferItem.item(l)); Building dest = nearby(i); diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index 9191e7dfe1..c1824c7414 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -65,7 +65,7 @@ public class MassDriver extends Block{ if(selected == null || !(selected.block instanceof MassDriver) || !(selected.within(x * tilesize, y * tilesize, range))) return; //if so, draw a dotted line towards it while it is in range - float sin = Mathf.absin(Time.time(), 6f, 1f); + float sin = Mathf.absin(Time.time, 6f, 1f); Tmp.v1.set(x * tilesize + offset, y * tilesize + offset).sub(selected.x, selected.y).limit((size / 2f + 1) * tilesize + sin + 0.5f); float x2 = x * tilesize - Tmp.v1.x, y2 = y * tilesize - Tmp.v1.y, x1 = selected.x + Tmp.v1.x, y1 = selected.y + Tmp.v1.y; @@ -202,7 +202,7 @@ public class MassDriver extends Block{ @Override public void drawConfigure(){ - float sin = Mathf.absin(Time.time(), 6f, 1f); + float sin = Mathf.absin(Time.time, 6f, 1f); Draw.color(Pal.accent); Lines.stroke(1f); diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 99139638c3..122278238a 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -204,7 +204,7 @@ public class PayloadConveyor extends Block{ } public float time(){ - return Time.time(); + return Time.time; } @Override diff --git a/core/src/mindustry/world/blocks/environment/TreeBlock.java b/core/src/mindustry/world/blocks/environment/TreeBlock.java index cd199d8d25..d0354c2811 100644 --- a/core/src/mindustry/world/blocks/environment/TreeBlock.java +++ b/core/src/mindustry/world/blocks/environment/TreeBlock.java @@ -22,7 +22,7 @@ public class TreeBlock extends Block{ public void drawBase(Tile tile){ float x = tile.worldx(), y = tile.worldy(); - float rot = Mathf.randomSeed(tile.pos(), 0, 4) * 90 + Mathf.sin(Time.time() + x, 50f, 0.5f) + Mathf.sin(Time.time() - y, 65f, 0.9f) + Mathf.sin(Time.time() + y - x, 85f, 0.9f); + float rot = Mathf.randomSeed(tile.pos(), 0, 4) * 90 + Mathf.sin(Time.time + x, 50f, 0.5f) + Mathf.sin(Time.time - y, 65f, 0.9f) + Mathf.sin(Time.time + y - x, 85f, 0.9f); float w = region.width * Draw.scl, h = region.height * Draw.scl; float scl = 30f, mag = 0.2f; @@ -34,8 +34,8 @@ public class TreeBlock extends Block{ Draw.z(Layer.power + 1); Draw.rectv(region, x, y, w, h, rot, vec -> { vec.add( - Mathf.sin(vec.y*3 + Time.time(), scl, mag) + Mathf.sin(vec.x*3 - Time.time(), 70, 0.8f), - Mathf.cos(vec.x*3 + Time.time() + 8, scl + 6f, mag * 1.1f) + Mathf.sin(vec.y*3 - Time.time(), 50, 0.2f) + Mathf.sin(vec.y*3 + Time.time, scl, mag) + Mathf.sin(vec.x*3 - Time.time, 70, 0.8f), + Mathf.cos(vec.x*3 + Time.time + 8, scl + 6f, mag * 1.1f) + Mathf.sin(vec.y*3 - Time.time, 50, 0.2f) ); }); } diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java index dec8e52702..156e5c13ce 100644 --- a/core/src/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java @@ -101,12 +101,12 @@ public class ImpactReactor extends PowerGenerator{ Draw.rect(bottomRegion, x, y); for(int i = 0; i < plasmaRegions.length; i++){ - float r = size * tilesize - 3f + Mathf.absin(Time.time(), 2f + i * 1f, 5f - i * 0.5f); + float r = size * tilesize - 3f + Mathf.absin(Time.time, 2f + i * 1f, 5f - i * 0.5f); Draw.color(plasma1, plasma2, (float)i / plasmaRegions.length); - Draw.alpha((0.3f + Mathf.absin(Time.time(), 2f + i * 2f, 0.3f + i * 0.05f)) * warmup); + Draw.alpha((0.3f + Mathf.absin(Time.time, 2f + i * 2f, 0.3f + i * 0.05f)) * warmup); Draw.blend(Blending.additive); - Draw.rect(plasmaRegions[i], x, y, r, r, Time.time() * (12 + i * 6f) * warmup); + Draw.rect(plasmaRegions[i], x, y, r, r, Time.time * (12 + i * 6f) * warmup); Draw.blend(); } diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java index 2a0982a069..16cd34fb7b 100644 --- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -164,7 +164,7 @@ public class ItemLiquidGenerator extends PowerGenerator{ if(hasItems){ Draw.color(heatColor); - Draw.alpha(heat * 0.4f + Mathf.absin(Time.time(), 8f, 0.6f) * heat); + Draw.alpha(heat * 0.4f + Mathf.absin(Time.time, 8f, 0.6f) * heat); Draw.rect(topRegion, x, y); Draw.reset(); } diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index 4883206e25..f744dbe0b5 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -362,7 +362,7 @@ public class PowerNode extends PowerBlock{ @Override public void drawConfigure(){ - Drawf.circles(x, y, tile.block().size * tilesize / 2f + 1f + Mathf.absin(Time.time(), 4f, 1f)); + Drawf.circles(x, y, tile.block().size * tilesize / 2f + 1f + Mathf.absin(Time.time, 4f, 1f)); Drawf.circles(x, y, laserRange * tilesize); for(int x = (int)(tile.x - laserRange - 2); x <= tile.x + laserRange + 2; x++){ diff --git a/core/src/mindustry/world/blocks/production/Cultivator.java b/core/src/mindustry/world/blocks/production/Cultivator.java index a5aede4e25..5949d7b947 100644 --- a/core/src/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/mindustry/world/blocks/production/Cultivator.java @@ -78,7 +78,7 @@ public class Cultivator extends GenericCrafter{ for(int i = 0; i < 12; i++){ float offset = random.nextFloat() * 999999f; float x = random.range(4f), y = random.range(4f); - float life = 1f - (((Time.time() + offset) / 50f) % recurrence); + float life = 1f - (((Time.time + offset) / 50f) % recurrence); if(life > 0){ Lines.stroke(warmup * (life * 1f + 0.2f)); diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index 49c5576a29..d2ffceb033 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -291,7 +291,7 @@ public class Drill extends Block{ if(drawRim){ Draw.color(heatColor); - Draw.alpha(warmup * ts * (1f - s + Mathf.absin(Time.time(), 3f, s))); + Draw.alpha(warmup * ts * (1f - s + Mathf.absin(Time.time, 3f, s))); Draw.blend(Blending.additive); Draw.rect(rimRegion, x, y); Draw.blend(); diff --git a/core/src/mindustry/world/blocks/production/GenericSmelter.java b/core/src/mindustry/world/blocks/production/GenericSmelter.java index c96e1018dc..57108317ed 100644 --- a/core/src/mindustry/world/blocks/production/GenericSmelter.java +++ b/core/src/mindustry/world/blocks/production/GenericSmelter.java @@ -30,13 +30,13 @@ public class GenericSmelter extends GenericCrafter{ float r = 0.06f; float cr = Mathf.random(0.1f); - Draw.alpha(((1f - g) + Mathf.absin(Time.time(), 8f, g) + Mathf.random(r) - r) * warmup); + Draw.alpha(((1f - g) + Mathf.absin(Time.time, 8f, g) + Mathf.random(r) - r) * warmup); Draw.tint(flameColor); - Fill.circle(x, y, 3f + Mathf.absin(Time.time(), 5f, 2f) + cr); + Fill.circle(x, y, 3f + Mathf.absin(Time.time, 5f, 2f) + cr); Draw.color(1f, 1f, 1f, warmup); Draw.rect(topRegion, x, y); - Fill.circle(x, y, 1.9f + Mathf.absin(Time.time(), 5f, 1f) + cr); + Fill.circle(x, y, 1.9f + Mathf.absin(Time.time, 5f, 1f) + cr); Draw.color(); } diff --git a/core/src/mindustry/world/blocks/production/Incinerator.java b/core/src/mindustry/world/blocks/production/Incinerator.java index d51caf06c2..35765f6961 100644 --- a/core/src/mindustry/world/blocks/production/Incinerator.java +++ b/core/src/mindustry/world/blocks/production/Incinerator.java @@ -42,7 +42,7 @@ public class Incinerator extends Block{ float g = 0.3f; float r = 0.06f; - Draw.alpha(((1f - g) + Mathf.absin(Time.time(), 8f, g) + Mathf.random(r) - r) * heat); + Draw.alpha(((1f - g) + Mathf.absin(Time.time, 8f, g) + Mathf.random(r) - r) * heat); Draw.tint(flameColor); Fill.circle(x, y, 2f); diff --git a/desktop/src/mindustry/desktop/steam/SStat.java b/desktop/src/mindustry/desktop/steam/SStat.java index be67714d4d..7b6ad442b4 100644 --- a/desktop/src/mindustry/desktop/steam/SStat.java +++ b/desktop/src/mindustry/desktop/steam/SStat.java @@ -5,7 +5,6 @@ public enum SStat{ attacksWon, pvpsWon, timesLaunched, - zoneMechsUsed, //TODO blocksDestroyed, itemsLaunched, reactorsOverheated, diff --git a/gradle.properties b/gradle.properties index 12ed98ae75..77c3a0a37b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=f99aa02b0def1951452b67263439977d1d485ae7 +archash=1d931850b9bf4a02ddda134fbac041c2dab64d6d From 9df4eac2f8cd8f1822adad7c1b071b561d06f0da Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Mon, 30 Nov 2020 16:36:10 +0100 Subject: [PATCH 114/123] Update BuildingComp.java --- core/src/mindustry/entities/comp/BuildingComp.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 7bdc5d174a..37f9b59ec9 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -929,6 +929,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, //null is of type void.class; anonymous classes use their superclass. Class type = value == null ? void.class : value.getClass().isAnonymousClass() || value.getClass().getSimpleName().startsWith("adapter") ? value.getClass().getSuperclass() : value.getClass(); + if(value instanceof Block) type = Block.class; + if(builder != null && builder.isPlayer()){ lastAccessed = builder.getPlayer().name; } From 639702ae1acca6cf6a1a801ba47535c9e449f32e Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Nov 2020 11:12:09 -0500 Subject: [PATCH 115/123] Fixed unit tests --- core/assets/maps/fungalPass.msav | Bin 10918 -> 10916 bytes core/src/mindustry/content/UnitTypes.java | 14 +++++++------- gradle.properties | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index 40b5ff376e0e874a64dcb3f961277599997d67b7..bc86d8c69c544c9a1f15a1c59465109a630d429e 100644 GIT binary patch literal 10916 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 literal 10918 zcmb=J^R_0sC&s<(#?IRO{qmpRRemsZ=8JbeJK?j!Ny?pnUedR)h}$?;8Do{{GW+n&h(7VG)hPfq`w$kHKvps?v~ zX`(~9>;oDbRwa>@LM&GYUEKL?}a${{Q zy1n<9-_n0+OD{Kmc^vg)$<;Rw9}iva{p!8?boT6yeJn5CidWy{vz~Bg-4$!aC0cvm zEl!iR^eEdkHIH5BeLcg=yI$UbGWBbtUYp(K&KC+!TppeM#vya{%@^Bdf31qxyZbs< z;k&rKd^_iE*ciLI{IJ=iAFpmtsJXHF>gov*kq;To_Hb^`pewyt{9i3>V~Z=eDd|L&z_pK`MT?M2mQNy_g&4|8W6vxq4#R2%2Kvh ziA$v}@0Bjowl3`nH{Oo4dAb?bWrW(h~bDy<`$+ zGj+IKo+}`_>2AnJ9_9K;j1sL=p7Ap!v2QZ6PC1hzP@>hV#S(qiOV;Ra)b>j&zLqKa zS~f{}&e?Ry>DAUM-p>uQwjOq9y|&m(J?7>*o1E+06z;#=T7GD%*WP<~nsb)7F5G@8 zD{SGH2?k-?X6@D$S>45%zdrV0rxX7_^&eBCq@OP+Xnqp5ciUcG&8Z&Oe(XGVp0_UU z;q%bCxW~^w|GD$zIroHXC1JkFXHBm8CLcCgH{)37GqGv^^-h zm%N%PtNJC(!&5?*`_hWksb0-%-8m*z zMZ64o73*Q2mGtax6}xZv&6{giEHjHZ7SOgJDmyvs?%Pns(4z|+W~*J?mGQ*kB8OG) zGvN=}7LjcKBLml;Jh#|OR$Rc;+Q^+VcDB#f%`U;_pJy$r3uG~2nP_-mZ`+rw$kNT{ zRD$NZzrA;u@0`PAx3ui50TsU9rp#a8pAarOJ2lUmCw$eDotC#5U3+(izAyDy`m+6O z+}^I<~fvL15VTVz)$lyu0MdzFvU7PoD;s?WZyS|1jB zbM0PlH{;5d`=71OznCtPoNAr8x+%eBZ`A9Ake1yi*qt{2*F09dHcoc=n!U@PIf|~y zX^r@FWm~ni;*)G%pEV2BCS8}hVrTPg&zdXRGyWR5Z@6W0#O2AR&mCWk9+tehQl{0b zr^hr?uWeVC_ZA1|qhhv!=g-C;44u-nymOY@^coqfxvIA#bCV>kHr>t1-^nn;%HaFL zLPP763ybC2t8ZAVy_&kNvm?9kdB)Pc-PhLLns;XX7pdqhMcIQ#SML(OwQy3{l0C~W zm`-KBwqdbvh{@9x|=yu`iCIfh@#bWK56)ZV*dPj36hIDPxVZRK&}o~d)@lAyO&cLliQUt?Nv zT_|hG>eTCpzuvm8*~RnyPnT6SyW0=fEy0^^CEjwgd}Vq)%kCgUMuKDCC6C#$ZQ4zG zU!6BaDX;kAyyoHIZ*n3#4{n$|gI#XX^9M_`cWi!8AZ;vkYu!Y?P#Zt@on4{MH;y%| zb!F&&`>yZvtoJ5`YIAiH&r}-z%YC$3Hf)RkwX(w2cc*@@NaprhS<3Uo?Z)k+GFy(y zR(`P!Vch?s=E#Dqzww;+kFJWb{vxJ&?)a?BX=~*qgFGc)H)y3Q=i~=J3<+e@T+!#2 zzgq5Ff&cd%O(_cA)?2t#HBWqzdg2h09a8PP=JvKJvo3ZE7QPl_>DSt7b$!aps-+uU zCrmYS(|dZdYVRk#M>Yp56emAi^kYUwi?zg&h~5%w+dHb)6mGn`=qHqYF>G$u^u24X zL=AW5-pa5$#PpL>X{$leZHcv0IyWwN{C(nXY*d@(&Y-j#nUiB8>?hr*o^U)WAg-(T zRC1KT&#f^lA03e0}HI-fx>=_*U}b!k2kBa*sb0xwRun zL3yp3SZRP$W0l5Jx&7i>CYR5$J>!4uue^D7XpGv1Hgo34uZw>9?)ccjX?|?w_39ay zw)fBiIh1GlHns@2s?T6S4+ zdX{SKco4pER>)Ci#z)ayTid$1uLY$EUOub)h|j1hzxy#`u7{yPhU($#TTb!cIPi7N z-D7tmd=F-7J$$)`!8_oVY)ZhJby|T26An+i)wAXBEx%@#%9uuxrB%1|YxagOOm~=_ za_j3>`Q$Q>&t-CxUKunbZE6d9>BOad)b`8%lI=h9Hn;XZF{;ge3xPt7XcWYV$`?nS@?kug^ystg?izP?FCoL^$PW9WSCYG<(UaMf=uE>A8 zdd8=}ei6+n#oOCcCQY?kr?7&n#PrUx5CcU82~90t&wHy_a(z;(v>R_v{-!7XXxH0( z^YTqQHlNMBUZ&gA@b;P^t*>`PspVit{z13~= z^`EDdOU=xFEoqx<>&W}xri#yOBSR49)?ci*x{_BjC(l`E$X&nkdamijebxV_DNj}o z_7BL7{L*p#Oua+9+HJ@;JN*UMU9TO)o)?Z)1bH~lwoUv{(Prdj*p;IMw73>GvT^ow8L@l27>U5yC_u88pcPg{i@-=^6 zDeCf2=!#Z=w)@(d8h2c?_NpvyOi)?DDkW}cleKhZerJ^a={;P^qOGR`?zd{h1Xbv{ zJ#<_7G%&juh1!J3_p3r(Aq|C49-XU1tI(T&v-Uk^8@M z{hP9|XJ=3D;STI+N>E`@7Pz~5pYbBo*1$`jqCyS)oPIYSS9bpOT$rw` zpgPM&af%rt4=QG%;X^NzJgQT>$&e}cCOgI z^u5W~Uf$Qzg8KhhPcBkV?VI!?)2Tps(eLR=23=9vsd<_^vUi21mCh4*u*NSX_1V)^ z&yEU&I{9p_OIrow);!)LBs)UB^h z`K(frTej!rq6I%6&ES;$dNk_65_acR3QMM#&+VV&)p63Tb&5XAsYUx8_82cV&AgGo z%X>*$xN24Y9Jl2%Pj9f^5tu7@d`sgD@oQ@wMP*Jrd7LDvni`hA(rBTi^vzqxCq0T; z^uVWcvKW)_EnTGyPS2&>QfF_}xE!8pX{gmNA=uNiq(DIbTxXeZlbO=GIg?^+^a~>e zwxnkDT6TA2p7oA+%JRcfw`ZYDMy&3kSpQ9X<|;2YjeGV;PxIt%MY= z(z~yLGkdzM^!Fvc)OA}~;dE5E^Hh@gg^4+~$4``5y|V1;y41bt>7;@L!#8{OU0Zo@ zLB;NT-h{2yeij=-^n{|Ep7%PMsJ^->vE_50r1)2<0(-@EIh)T*9^88KtFtL~*|jO((t}&q zySuw91YOnMk#dD$x~kZTRpr4(R!X1zn3g}>{c^^|DMtjoGgqu}f0!dSp|<~7s`I0> z@3f5l{Ps9|ibjXCqf4t=gWn^LCkUzB_><7}T6 z@871$vS(iu8|;|2SMi$HshsnUD*wM8yt!G7`?=?9-kI0iie>JwZd`hI>g}uVx14#% zdpLCQWu@8rcWz%jziwgJJqxXGBJDg2x+d>dm@+wO=7EQ&0_4Q!Mc(sxa`Wc2l9J;2 z^A0~Vn5~?Xm@K?qcl)Gc&!QwcCh0S!KiFMs^E+@}u95ux=|xUgLb?>A1WZ&9E!mNr zFlkGiiKyo8t5Tvt*YYesCaL;Fdi*^0`km(GPihuU2iEDOFV0x3)PA@9($7Y{t5Xio z6}A*o%l&peoNKMlHLX_~#?w4!biTW}SSYk+9Zyrna=YcuH3cD41y((YnHpHFu=141 zD*h6wZF$zJRh}KMSLVL^%rt$%KFz!7({x&A3vI2w6xF%xlI2GIm453l2TzKcbg{tC zrLf=KxudryBxu8nd4UmHJ6GiFTVboZ<7CF9jowa9%V)br=7^N|NtMT96{(I)42g_XFay_0kc_+`)J(KgUXf9fqqb)Z(Q$%!k zm%58D>%yFsPmcba9QaN&d>hk;MeCBbzb*=^vKL&M9z2V8wO!SopJugX%inR=vp#P5 z9%QvuBIx{S7hyi9&!oj08Qvvsy?13vYn+gU>!D=@3s$f^ zim44Ta#B^*nmFn6yx47PcmCE`zW9rXeoAX~T}Y{ymq3-i=MoLAO?&Qt?a7%nPa`b* zMBcQitM}-Hc)Zx{nH&|nB~r_CVbWr2?W%o>U))^7=WQ`+4mlvs^es+9(QeB1jafG~ zEZOwP@|(?}Yhsq3m&(507C67`OlkPF#k)Npdst%~a>A#!X2h@^nt!(nzpZbd#styTZ?k$?pe#Tyu1pt`@pn<>_|3H8^@hjL0d=#@PbrBSm+pZY&9V z5GR~FXS&_W?ytYHmGzhZtrK{+t0E%omstDZnTuCX;kgmr+GH__b(59Ipdemm$vC!+<&nBhC2(^lvUYQgl@$usP zgEOw|kyv-`MCcUxy;EjgijmwA?4+;x{JVlstT3NnhU<)*JKT)eSBJCY`RUDm6|I;sc7uu|BKKZ7sD6mTZ)Zd<{vMZY3))f42_?7XsTA@1l??e`k z#@`ohJRScW$Yc9)=lF%q2lnvCE_st-V!6^Z^G&sX(d0YQ76;1CpPahIakn+kS-Gb- zUa9GaJMAwqn5F-7r$$D;+r>?bwBu)NNoQEx^i9=p?OuV91CCqzJtc4M(~vxOZDSeV z?x){W6FyIR`gS|pw@XPTUI(maG-UN!X0%;iQZVas!Ba+_e=3J)3|Ggb~W!~_TLw!uWDW@I9g>G@@D3=UXkkly(-&eCOhaj zKbdt$TywJ1`Mokme|gn zG}&9|^0zJO+G{Uw($mniy;v(_YkJ$V@M4h3)LS`b>KU4f_RQsXqA%DjN^d>cv~2r{ z)@65Dm(A@uBqZT&HLx9@KC zF&(q-Z)P@$&s7#Rc2}}$pPJ0`#*+Cu`}dlS?ruqmek*SD&V6d~&P0_tX8)bd%R3}H z1D2*&Tjc9MeQUa)pg#PZqs*zug)$xzEJ{0LKeq*iEthJ%SiHY%?G#6q)iw$FM#W1~ z`hp+Te-qN<{FakBF?`v91{;o+DW(m3BTq_Pdw1%|ImvrDJS%5PFmYa-|2JbxfkER> z4aT3pf~Q*qPZU`hY9w9C-Mw0-Z&lh{kv$rXmxYXwt;pi;&MSb26p17VjUlL}it8h|cf}r57pu+y!J!WAkg{8}5O0wA4m9-_Z zyvxo!JfNW?c{CtNm;2b9gd3&`9c;Vz=4xh3>welE_$|j+(AB%s>kaGoDPL~tKh{|% ze>8Mg)a5n2k8UM}X)&;euRIr*?VnNh{zDh3bQn9>AyJNne_e3jo=EY2VbfPwQs`IOPYVQwvZg-sJ$r6qklTQST z7awO$sf(Y`vP8Oi-?A$!jUI9`MvDAR{k_tq59-I0D#H~Yrs#>{%*#4pu+^CN4{Sv`LKai^5=yT`@_$Ao|AJTPuQFPZ*F z$u9oUzlMiGKUmtnf0%jfxsY9a+Ao&rMaPVP?0L|mK6CyeW4kVY{`tZ`YFOt>)-0RR zFLXGyvTpwU;y)^TnyT1Y_xHWee0KV%{XzfvKNWt6oSvU#$76H0xaYnwpUuU+J?}lA z9dA|N+qb$d;8#@I4x4`I9hTFkKbZ7k+Vh21wu>{^eLC>>^Rz0}W78rM)n^_ktPvA! z+~0OWx!^UIayHZa(C2GPs!o{yTirJK!$ScXAqVb>f%{W0+|v3`yw88emP5a7RYFR( zI>s8TnaylY3c-D9;4g_8UL*hd?Ew-yx1;$d3(RMW71W(n-ZF8Wo>)AI;Kt8 zp0UV%^5N$9TJ}3yo$m)p?Q4{@J*FmDr*>nt&la}dA1>=JvF~}IBCKn1q|frmpYwMQ zR{6i5a=0y@;g538eDUZP4|VL~4|PU-UjOIj{`;Tv>R4EKKJc6JbFW$dI$STm`tX#9 zXMfy&K5|+k)c;Cx-=l*c3>9lCW`r--)!%%myIsRAA->qOdGmdVLuVJ%*RU5J7qNUh z@x!V4`@hL=nc%!+o@T{>J=59KJ^JePd%wiF^aEb) zbuhTM>CxU*dp1jj9t`MmmtElU*GBzCrF-(q#T>t$*MIo_)nMtfOwJuFYE{_B+s2CO#1 zllesr{g!F!nc7Y~8aiKEI=tQU>-_t6>z3X+s(2@_Cj92D!{HsTtCnp_lRe$JX8-e} zk7N#BGG5hS>!B>qclCt)|NO;*9e;W!-u-9!%Hf*f%YejO)#Xc#L*+d=Pxbe|IQ;+V zdrkRsw$_$xpVIBWnE$VT$1*jjC)01G?EOIBPjAh0tL9DrA`@WS;(EvCP7CYQe>44_ z8E>B(SKbq_JaWa8eHX7tXx;l>Jiq_=#ful!p6%4Q?z}yz?cBn$WchkSkD33DT@fzaB$Jo0sQ>Gs z4PQS7?9RW%|C-f!0k0JA{8!T7LUm;iynlRK=ilD|?w?!#E~{AO_t#zfY%}-0x9{IB zPJezrebFQBnzXW}&>XIxQ&!17Q`&l%zy5>aR37#Gx*sR|V-_s^MDrQS)9{K~02H<~xB-u{og*Sj^&j)Cu$e@s~{f3&CR){Dz~ z&)rh|@%y5-)}wQVFD4~#dt@-B{!^Rd%!B}^$SJq#1)l1gE#r8q)8u35+)@-4dxOXE zXZYk6C-&=?Yfimfq#`?|U*hThxazar#s}^9rE1Ll{8cFU%!i9Rmi;IlqhD?0F;>D^Am()-r4vil=@%28R7w(g^ zKKs<}!$ZG`iCjMK=X_%2er|l8B|Pn(`pk0vGj|m@`t2U~Zhm=2cGmft^BWfHY&tLb z%lMC+!C#ff7aPxVygv3^_OZlg$H&4oC56+Di$Ce>{jeoQxF>&IlUsy&>a%>Oj|($r zG&?hIUQ==L$FqnXN0QI4ysfayaa-~d=Uv~UnQAwe&dZ$l#PHGcJ)1VleNK(Mn4B)U zZ)$mC|3c6I%cts^&TlMM@%d)kdEW5bttrJnJnIU5WS?cuo&AID!uREpZ3~6}Y<#ktQ6tN1N0{y2Ao z^-XNTKBkY+)_(i!&Oi1%$K3qb>|aBw?9-hZasHcXvis)_&f%b;rH~U?mT3_6Fc}~7pZL($R_7^uePEQEkw=lW$m)l&!N2#1&4rbfSef*&G zed>Xl>kjsZHq?4&1zsuJd2-9yhb2vaA9nlwPklbOWIxlF+s!YkXa2nT=JoubIwyJa z*L9a3s$LLZvY0_jz30Q8>6N+i&;L!Aod2lz(_wEL{=ZBwly2lR=^4h%{9SBwK6T#m zHD8v#ou7K|*YPvvB8`WSZ}}m5qFnf;ghc;alcR=@4ynt^_N}rJZZ*CiKjXcv-ezC% znfCrC7rmT0XI|NZGq)V=4D}3oyu>COYv}nK|84mDQeyw>*}2PCc`9(OI`%BY^xN8& zsDmN7&R1tFclvg@@io5#&*EpN?&{=y%k$Hp7noKWzu+71pM&m)rabYi-o?hwxWsj9 zl7E5RN z*K#G;v(9>wdh~Av3S7SXqvPp366Zs-2C zvztxbBc?w;5EGNXVyVgV19}A>I>vWdmb=XV>Y-TKb~t@0zuM9tmoy*foGw_&uXa{* zR>GN}vYQ)EvRqb-(MtbQ$8LLRb)1~u=CdB=BKL|n#?1=Zyixeu#h>X`9sf-8tl646 zbZiXX?lIQwwBw$=ChPGu`PGjst!&F`Z7g=iwbzF2h~$1|;r={{)l<^Z?%953lYT?p z&u`rhEv%g*dp-T|^VZk?tHsN&%}ExL_nGRySvDnPasTrJb^YmCnV((R)|x)s?a(i) ztID_RVZ+>c3D*x^`)|qT!?3wsQR44EA#a8RJ^PY--z*fuBj)QDU6^IF?t0scHuE?u z;W+&bC23P7A3txX+t(lQOyBk8^6nW&8U-God0-m0I8x95sIl98&pSWA_D?B)bzWs! zr_UE-&i51U{11LwSYGF6U47-T(FeA^<3D}{FY4Vmrz9n~C~U{&-;xSxpPIi&u6WsA zWS64RaR1|zW-DEhL#y+5_SrFfTKk;sM!sLM%>VBBmzK^8`v1=%>vB=^Uo#^&aCH8*Z;fy{`2(B2Ni`T zh0gwYs8aaMOM$hT->mOEcxj{ie#y;=Gc=z)D1RHdL-F_SdDUXwVL|9g>h|At@F z-M7nTc0S+Pb2)2?)Kv+_ltB-deUU}`pkr&TX)>o%;0RizUc+KMpf_G zrhE6FS-NrQ9OazoBwosBFD&C9Ic?s9>od%w!u=cXettURo5pnqOSA4qMXO4KXi?tp zb2fjwTobZHzv1t(eFyxVug?h#yjVHurQkiD7mxnQT%H|Z^wN0tq~JC3)1Bn6SYBbB zcCuzxu9m#i@~jEpep<@$AIMwWQ5Pxtpz6+z3v>R99Gv%XLUrHwgR?&$QJP`9^rpp2 z+mET+Cf;1#XA$altTCE(Z=u2OsN!!{2W|SatnELio{%a2q4Q3|-|}2=+|Bw^i_=Pr zv(o38+})x4knytZ+Lko`++}C1bY`qv&(sk-JNAXdjA)MHt1I|5i)`H7tT>;&4%n;n zq_R)saqq^!Oq_mUT8i|jI)(exrc zjdiNPmxcdLH_TtvU-X~nMc1@n&l8%3``((z_h0g>mwNNko3kXz+^(AEOXK>RDxwGK zlBcrQO5|%jvwU~jsE7YslG5SFta9cy&m*4c^iRKWJ??3b!>99`^o;M=vsqm{zlrbU zIsK2tb6(E)C*5Oy(q>-5&NJITGCX5))aQ719><@WW#33{1k z59Mw!@ALdtyKBy_*I)cM#(DPdXSry+?V_`Y@2%gRi_L#;aQ}6Xf5pc$J0*4J$1_#? z7_@}F@nk%q8O8bK+03FV;+A@ol&=4KdVA5TC433y2PglqIqAA#d+d>xe^+H?m(RSE zqj8>d+fv1;%o8fS3|=}+w7O*WH6W?Nrd;R?W6QopTbGx<`?HiWut9f8rT-zd=T!mi z)=TaFFlx)S)xW*PKG9$6Q=6^8b56bkGZ}ZQq*>gZddEMAC%)Fcd#g7cfBxLUR?Q(?-fhL=75`=j=F0v3>Tp$fdHUR2kC&`UJUR1skHrsW^&gqr zFGOBwSN=T5=8NmWfSXq{zr`PNTz)f<^{)!ctZ98Ug%efd7=G`!Q3zzyYqpQip8tZ` z`-8otK)3v)O97{&W#>GbbjbJe{R=ZUGJIRDSSunJzH(`fh^&?uU-2o)?Cs5B^F)rn z)ikI+Y1jGa9sAtdWwjGTdiz{EzdG*8IPRL>7nL-PSSR>cU+9vL8gMqu zcNCKj++^vq-2b8Uul=!(1^@oBl|5g3rtE=aw2GVk`6+XLHklmO^r}Dj?TX=Mt2b^Z z|8rhzy7zzf`Fkr=WHiLs*6cDXP=4`G-%GEaO^JW!n%_QOKkVA|VD41zxIXFk&#v2N z-g#5Ae4$?Qf3;Sprk9oTYlONN&)oa-Q~clln#S1y`&+GE-;sUIuf}P?UR(dGPD>;_ z(`C=u$HmKZ=Ce)G+5Y%arO))8$=i}@Q;rx-KR<7>XzbPt_MRfPFaI6!lz%aGj?saF z%m4R_ePF9OwKsL&0?(VTZZy4kWzl(cTNq|m z?yyXg-FoDYMa~Taqc6ER|4Yr6|I_-j@|SDKqA$1l>z@C2`fyTx{okYV_d?Fg|M|B5 z;^zB-^KQy#Kgj2m_;Eby=#h8ZW6SKXys7#i_h)6h&i@Dbnqj}^&6hlV$M^YIlI{?*BquB?;%^z)zOu8NlyhW4=wW<6;V z-m&qZq0Xm}0<|{((geN*v2Q=0Im$7k|G2qm73Udt5yLx!2Yw}xNw|K|$;9DD3ELpmE;msGyHYw``v=3hpHW7NO)gAWe^WG&LRX-&8 z6(1Vhjh9oBJtFk}_x*D_9AZtAhC=82m7QsbVjFtM+`+5R|v(OdrcjoX;_?bWsXv-}2A>VisE&L|4e5rwx=3x z9XI}9>^rzXNk(aL z1!_{yIfD}HkIxKiEWILql)>zW_**MSsjM%T=Q{Pc`BwB4e=@OuY`DdU@81+=Yvyn1 zPN%YJd~5}ot=~pyp0;2y=6t4ZTXoLl@Qe#{*nW4nbF!CRS~xlB*O$Wc9PyKSn*L^_ zP15&$Cb8^<`%FEaT9uS~*X7(3lX+#&b)V>cmB_!i+?uN_Wsu2lpD36|8t7C-uZaD%zxXtEwp~u o|0({h^v^l8h$-p+oqustrevMFKl5YV+i$m@PyWxpp^B3i04gAqHUIzs diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index e053a8ee65..8866bd2578 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1006,7 +1006,7 @@ public class UnitTypes implements ContentList{ homingRange = 60f; keepVelocity = false; splashDamageRadius = 25f; - splashDamage = 14f; + splashDamage = 16f; lifetime = 60f; trailColor = Pal.unitBack; backColor = Pal.unitBack; @@ -1750,13 +1750,13 @@ public class UnitTypes implements ContentList{ top = false; ejectEffect = Fx.casing1; - bullet = new BasicBulletType(2.5f, 10){{ + bullet = new BasicBulletType(2.5f, 11){{ width = 7f; height = 9f; lifetime = 60f; shootEffect = Fx.shootSmall; smokeEffect = Fx.shootSmallSmoke; - tileDamageMultiplier = 0.02f; + tileDamageMultiplier = 0.01f; }}; }}); }}; @@ -1792,13 +1792,13 @@ public class UnitTypes implements ContentList{ spacing = 0f; ejectEffect = Fx.casing1; - bullet = new BasicBulletType(3f, 10){{ + bullet = new BasicBulletType(3f, 11){{ width = 7f; height = 9f; lifetime = 60f; shootEffect = Fx.shootSmall; smokeEffect = Fx.shootSmallSmoke; - tileDamageMultiplier = 0.02f; + tileDamageMultiplier = 0.01f; }}; }}); }}; @@ -1832,13 +1832,13 @@ public class UnitTypes implements ContentList{ shotDelay = 3f; ejectEffect = Fx.casing1; - bullet = new BasicBulletType(3.5f, 10){{ + bullet = new BasicBulletType(3.5f, 11){{ width = 6.5f; height = 11f; lifetime = 70f; shootEffect = Fx.shootSmall; smokeEffect = Fx.shootSmallSmoke; - tileDamageMultiplier = 0.02f; + tileDamageMultiplier = 0.01f; homingPower = 0.04f; }}; }}); diff --git a/gradle.properties b/gradle.properties index 77c3a0a37b..190a2e6b2e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=1d931850b9bf4a02ddda134fbac041c2dab64d6d +archash=e13f9a192be0bad00766ff15a6bf7d2897ba00d1 From 5c89fa2d2bdb750bdcb40810c3a7a0e130520dc9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Nov 2020 12:52:10 -0500 Subject: [PATCH 116/123] Achievement cleanup --- core/src/mindustry/ui/dialogs/ResearchDialog.java | 13 ------------- .../src/mindustry/desktop/steam/SAchievement.java | 6 +++--- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index bb609cb167..49701dbe76 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -257,18 +257,6 @@ public class ResearchDialog extends BaseDialog{ return node.content.unlocked() || !node.objectives.contains(i -> !i.complete()); } - public void showToast(String info){ - Table table = new Table(); - table.actions(Actions.fadeOut(0.5f, Interp.fade), Actions.remove()); - table.top().add(info); - table.name = "toast"; - table.update(() -> { - table.toFront(); - table.setPosition(Core.graphics.getWidth() / 2f, Core.graphics.getHeight() - 21, Align.top); - }); - Core.scene.add(table); - } - boolean locked(TechNode node){ return node.content.locked(); } @@ -451,7 +439,6 @@ public class ResearchDialog extends BaseDialog{ void unlock(TechNode node){ node.content.unlock(); - showToast(Core.bundle.format("researched", node.content.localizedName)); checkNodes(root); hoverNode = null; treeLayout(); diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index 71e04a2c3c..ffa429c868 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -5,8 +5,8 @@ public enum SAchievement{ kill100kEnemies(SStat.unitsDestroyed, 100_000), launch100kItems(SStat.itemsLaunched, 100_000), - produce1kMin(SStat.maxProduction, 1000), - produce20kMin(SStat.maxProduction, 20_000), + produce5kMin(SStat.maxProduction, 5000), + produce50kMin(SStat.maxProduction, 50_000), win10Attack(SStat.attacksWon, 10), win10PvP(SStat.pvpsWon, 10), defeatAttack5Waves, @@ -25,7 +25,7 @@ public enum SAchievement{ publishMap(SStat.mapsPublished, 1), defeatBoss(SStat.bossesDefeated, 1), captureAllSectors, - control10Sectors, + control10Sectors(SStat.sectorsControlled, 10), drop10kitems, powerupImpactReactor, obtainThorium, From f23e63decf5c401a7fbd339fba78254e3c01745f Mon Sep 17 00:00:00 2001 From: Nikolass1000 <68129216+Nikolass1000@users.noreply.github.com> Date: Mon, 30 Nov 2020 19:44:51 +0100 Subject: [PATCH 117/123] Polish complete translation. --- core/assets/bundles/bundle_pl.properties | 95 +++++++++++++++++++----- 1 file changed, 75 insertions(+), 20 deletions(-) diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 65f26e9b78..b188a98aec 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -17,10 +17,11 @@ linkfail = Nie udało się otworzyć linku!\nURL został skopiowany. screenshot = Zapisano zrzut ekranu w {0} screenshot.invalid = Zrzut ekranu jest zbyt duży. Najprawdopodobniej brakuje miejsca w pamięci urządzenia. gameover = Koniec Gry +gameover.disconnect = Odłącz gameover.pvp = Zwyciężyła drużyna [accent]{0}[]! +gameover.waiting =[accent]Czekanie na następną mapę... highscore = [accent]Nowy rekord! copied = Skopiowano. -indev.popup = [accent]Wersja v6[] jest obecnie w [accent]alphie[].\n[lightgray]Oznacza to, że:[]\n[scarlet]- Kampania nie jest skończona[]\n- Brakuje zawartości\n - Większość [scarlet]SI jednostek[] nie działa poprawnie\n- Wiele jednostek jest niedokończonych\n- Wszystko to, co widzisz, może ulec zmianie lub usunięciu.\n\nZgłaszaj błędy i awarie na [accent]Githubie[]. indev.notready = Ta część gry nie jest jeszcze ukończona indev.campaign = [accent]Udało ci się zakończyć kampanie![]\n\nZawartość kończy się na tym. Podróż międzyplanetarna zostanie dodana w przyszłych aktualizacjach. @@ -58,6 +59,7 @@ schematic.rename = Zmień nazwę schematu schematic.info = {0}x{1}, {2} bloków schematic.disabled = [scarlet]Schematy są wyłączone[]\nNie możesz używać schematów na tej [accent]mapie[] lub [accent]serwerze. +stats = Statystyki stat.wave = Fale powstrzymane:[accent] {0} stat.enemiesDestroyed = Przeciwnicy zniszczeni:[accent] {0} stat.built = Budynki zbudowane:[accent] {0} @@ -144,8 +146,12 @@ planetmap = Mapa Planety launchcore = Wystrzel Rdzeń filename = Nazwa Pliku: unlocked = Odblokowano nową zawartość! +available =Nowe Odkrycie dostępne completed = [accent]Ukończony techtree = Drzewo Technologiczne +research.legacy = Znaleziono badania z wersji [accent]5.0[].\nCzy chcesz [accent]załadować je[], albo [accent]usunąć[] dane z drzewa technologiczno (rekomendowane)? +research.load = Załaduj +research.discard = Odrzuć research.list = [lightgray]Badania: research = Badaj researched = [lightgray]{0} zbadane. @@ -227,6 +233,7 @@ disconnect.timeout = Przekroczono limit czasu. disconnect.data = Nie udało się załadować mapy! cantconnect = Nie można dołączyć do gry ([accent]{0}[]). connecting = [accent]Łączenie... +reconnecting = [accent]Ponowne łączenie... connecting.data = [accent]Ładowanie danych świata... server.port = Port: server.addressinuse = Adres jest już w użyciu! @@ -272,6 +279,9 @@ cancel = Anuluj openlink = Otwórz Link copylink = Kopiuj Link back = Wróć +crash.export = Eksportuj logi błędów. +crash.none = Nie znaleziono logów błędów. +crash.exported = Logi zostały przeniesione. data.export = Eksportuj Dane data.import = Importuj Dane data.openfolder = Otwórz folder danych @@ -288,6 +298,7 @@ cancelbuilding = [accent][[{0}][] by wyczyścić plan selectschematic = [accent][[{0}][] by wybrać+skopiować pausebuilding = [accent][[{0}][] by wstrzymać budowę resumebuilding = [scarlet][[{0}][] by kontynuować budowę +showui = Interfejs ukryty.\nNaciśnij [accent][[{0}][] by go pokazać. wave = [accent]Fala {0} wave.cap = [accent]Fala {0}/{1} wave.waiting = [lightgray]Fala za {0} @@ -295,6 +306,8 @@ wave.waveInProgress = [lightgray]Fala w trakcie waiting = [lightgray]Oczekiwanie... waiting.players = Oczekiwanie na graczy... wave.enemies = Pozostało [lightgray]{0} wrogów +wave.enemycores = [accent]{0}[lightgray] Rdzeni Wroga +wave.enemycore = [accent]{0}[lightgray] Rdzeń Wroga wave.enemy = Pozostał [lightgray]{0} wróg wave.guardianwarn = Strażnik nadejdzie za [accent]{0}[] fale. wave.guardianwarn.one = Strażnik nadejdzie za [accent]{0}[] fale. @@ -355,6 +368,7 @@ waves.invalid = Nieprawidłowe fale w schowku. waves.copied = Fale zostały skopiowane. waves.none = Brak zdefiniowanych wrogów.\nPamiętaj, że puste układy fal zostaną automatycznie zastąpione układem domyślnym. +#these are intentionally in lower case wavemode.counts = liczba wavemode.totals = sumy wavemode.health = życie @@ -467,6 +481,8 @@ load = Wczytaj save = Zapisz fps = FPS: {0} ping = Ping: {0}ms +memory = Pam: {0}mb +memory2 = Pam:\n {0}mb +\n {1}mb language.restart = Uruchom grę ponownie, aby nowo ustawiony język zaczął funkcjonować. settings = Ustawienia tutorial = Poradnik @@ -481,24 +497,21 @@ complete = [lightgray]Ukończone: requirement.wave = Osiągnij falę {0} w {1} requirement.core = Zniszcz Rdzeń wroga w {0} requirement.research = Zbadaj {0} +requirement.produce = Produkcja {0} requirement.capture = Zdobądź {0} -bestwave = [lightgray]Najwyższa fala: {0} launch.text = Wystrzel research.multiplayer = Tylko host może odkrywać przedmoty. +map.multiplayer = Tylko host może widzieć sektory uncover = Odkryj configure = Skonfiguruj Ładunek + loadout = Loadout resources = Zasoby bannedblocks = Zabronione bloki addall = Dodaj wszystkie +launch.from = Wstrzelony Z: [accent]{0} launch.destination = Cell: {0} configure.invalid = Ilość musi być liczbą pomiędzy 0 a {0}. -zone.unlocked = [lightgray]Strefa {0} odblokowana. -zone.requirement.complete = Fala {0} osiągnięta:\n{1} Wymagania strefy zostały spełnione. -zone.resources = [lightgray]Wykryte Zasoby: -zone.objective = [lightgray]Cel: [accent]{0} -zone.objective.survival = Przeżyj -zone.objective.attack = Zniszcz Rdzeń Wroga add = Dodaj... boss.health = Zdrowie Strażnika @@ -522,19 +535,41 @@ weather.fog.name = Mgła sectors.unexplored = [lightgray]Niezbadane sectors.resources = Zasoby: sectors.production = Produkcja: +sectors.export = Eksport: +sectors.time = Czas: +sectors.threat = Zagrożenie: +sectors.wave = Fala: sectors.stored = Zmagazynowane: sectors.resume = Kontynuuj sectors.launch = Wystrzel sectors.select = Wybierz sectors.nonelaunch = [lightgray]żaden (słońce) sectors.rename = Zmień Nazwę Sektora +sectors.enemybase = [scarlet]Baza Wroga +sectors.vulnerable = [scarlet]Wrażliwy +sectors.underattack = [scarlet] Jest Atakowany! [accent]{0}% uszkodzono +sectors.survives = [accent]Przeżywa {0} fal +sectors.go = Idź +sector.curcapture = Sektor Podbity +sector.curlost = Sektor Stracony sector.missingresources = [scarlet]Niewystarczające Zasoby Rdzenia sector.attacked = Sektor [accent]{0}[white] jest atakowany! sector.lost = Sektor [accent]{0}[white] został stracony! +#note: the missing space in the line below is intentional +sector.captured = Sektor [accent]{0}[white]został podbity! + +threat.low = Niski +threat.medium = Średni +threat.high = Wysoki +threat.extreme = Ekstremalny +threat.eradication = Czystka + +planets = Planety planet.serpulo.name = Serpulo planet.sun.name = Słońce +sector.impact0078.name = Uderzenie 0078 sector.groundZero.name = Punkt Zerowy sector.craters.name = Kratery sector.frozenForest.name = Zamrożony Las @@ -589,7 +624,6 @@ settings.clearcampaignsaves.confirm = Jesteś pewny że chcesz usunąć wszystki paused = [accent]< Wstrzymano > clear = Wyczyść banned = [scarlet]Zbanowano - unplaceable.sectorcaptured = [scarlet]Wymaga podbitego sektora. yes = Tak no = Nie info.title = Informacje @@ -599,6 +633,7 @@ unit.nobuild = [scarlet]Jednostka nie może budować lastaccessed = [lightgray]Osatino wpłynął: {0} block.unknown = [lightgray]??? +stat.description = Opis stat.input = Wejście stat.output = Wyjście stat.booster = Wzmacniacz @@ -607,8 +642,8 @@ stat.affinities = Uwydajnienie stat.powercapacity = Pojemność mocy stat.powershot = moc/strzał stat.damage = Obrażenia -stat.targetsair = Namierzanie wrogów powietrznych -stat.targetsground = Namierzanie wrogów lądowych +stat.targetsair = Namierza wrogów powietrznych +stat.targetsground = Namierza wrogów lądowych stat.itemsmoved = Prędkość poruszania się stat.launchtime = Czas pomiędzy wystrzeleniami stat.shootrange = Zasięg @@ -626,6 +661,8 @@ stat.memorycapacity = Pojemość Pamięci stat.basepowergeneration = Podstawowa generacja mocy stat.productiontime = Czas produkcji stat.repairtime = Czas pełnej naprawy bloku +stat.weapons = Bronie +stat.bullet = Pocisk stat.speedincrease = Zwiększenie prędkości stat.range = Zasięg stat.drilltier = Co może wykopać @@ -664,7 +701,7 @@ stat.flying = Latanie ability.forcefield = Pole Mocy ability.repairfield = Pole Naprawy ability.statusfield = Pole Statusu -ability.unitspawn = Fabryka jednostek {0} +ability.unitspawn = Fabryka Jednostek {0} ability.shieldregenfield = Strefa Tarczy Regenerującej ability.movelightning = Pioruny Poruszania @@ -695,12 +732,14 @@ units.processorcontrol = [lightgray]Kontrolowany Procesorem bullet.damage = [stat]{0}[lightgray] Obrażenia bullet.splashdamage = [stat]{0}[lightgray] Obrażenia obszarowe ~[stat] {1}[lightgray] kratki bullet.incendiary = [stat]zapalający +bullet.sapping = [stat]wyczerpujący bullet.homing = [stat]naprowadzający bullet.shock = [stat]piorunowy bullet.frag = [stat]fragmentacyjny bullet.knockback = [stat]{0}[lightgray] odrzut bullet.pierce = [stat]{0}[lightgray]x przebicia bullet.infinitepierce = [stat]przebijający +bullet.healpercent = [stat]{0}[lightgray]% leczenia bullet.freezing = [stat]zamrażający bullet.tarred = [stat]smolny bullet.multiplier = [stat]{0}[lightgray]x mnożnik amunicji @@ -725,6 +764,7 @@ unit.items = przedmioty unit.thousands = tys. unit.millions = mln unit.billions = b +category.purpose = Opis category.general = Główne category.power = Prąd category.liquids = Płyny @@ -738,6 +778,7 @@ setting.blockreplace.name = Automatyczne sugestie bloków setting.linear.name = Filtrowanie Liniowe setting.hints.name = Podpowiedzi setting.flow.name = Wyświetl szybkość przepływu zasobów[scarlet] (eksperymentalne) +setting.backgroundpause.name = Wstrzymaj w tle setting.buildautopause.name = Automatycznie zatrzymaj budowanie setting.animatedwater.name = Animowana woda setting.animatedshields.name = Animowana tarcza @@ -766,7 +807,6 @@ setting.conveyorpathfinding.name = Ustalanie ścieżki przenośników setting.sensitivity.name = Czułość kontrolera setting.saveinterval.name = Interwał automatycznego zapisywania setting.seconds = {0} sekund -setting.blockselecttimeout.name = Czas Wyboru Klocka setting.milliseconds = {0} milisekund setting.fullscreen.name = Pełny ekran setting.borderlesswindow.name = Bezramkowe okno[lightgray] (może wymagać restartu) @@ -855,6 +895,8 @@ keybind.menu.name = Menu keybind.pause.name = Pauza keybind.pause_building.name = Wstrzymaj/kontynuuj budowę keybind.minimap.name = Minimapa +keybind.planet_map.name = Mapa Planety +keybind.research.name = Odkryj keybind.chat.name = Czat keybind.player_list.name = Lista graczy keybind.console.name = Konsola @@ -979,6 +1021,7 @@ block.resupply-point.name = Punkt Uzupełnienia block.parallax.name = Parallax block.cliff.name = Klif block.sand-boulder.name = Piaskowy Głaz +block.basalt-boulder.name = Bazaltowy Głaz block.grass.name = Trawa block.slag.name = Żużel block.space.name = Space @@ -1076,7 +1119,6 @@ block.conveyor.name = Przenośnik block.titanium-conveyor.name = Przenośnik Tytanowy block.plastanium-conveyor.name = Przenośnik Plastanowy block.armored-conveyor.name = Przenośnik Opancerzony -block.armored-conveyor.description = Przesyła przedmioty z taką samą szybkością jak Przenośnik Tytanowy, ale jest bardziej odporny. Wejściami bocznymi mogą być tylko inne przenośniki. block.junction.name = Węzeł block.router.name = Rozdzielacz block.distributor.name = Dystrybutor @@ -1084,7 +1126,6 @@ block.sorter.name = Sortownik block.inverted-sorter.name = Odwrotny Sortownik block.message.name = Wiadomość block.illuminator.name = Illuminator -block.illuminator.description = Małe, kompaktowe i konfigurowane źródło światła. Wymaga energii do funkcjonowania. block.overflow-gate.name = Brama Przepełnieniowa block.underflow-gate.name = Brama Niedomiaru block.silicon-smelter.name = Huta Krzemu @@ -1180,6 +1221,7 @@ block.payload-router.name = Rozdzielacz Ładunku block.disassembler.name = Rozkładacz block.silicon-crucible.name = Tygiel Krzemu block.overdrive-dome.name = Kopuła Pola Overdrive +#experimental, may be removed block.block-forge.name = Piec Bloków block.block-loader.name = Ładownik Bloków block.block-unloader.name = Opróżniacz Bloków @@ -1239,26 +1281,35 @@ hint.generator = \uf879 [accent]Generatory Spalinowe[] spalają węgiel i przeku hint.guardian = Jednostki [accent]Strażnicze[] są uzbrojone. Słaba amunicja - taka jak [accent]Miedź[] oraz [accent]Ołów[] [scarlet]nie jest efektywna[].\n\nUżyj lepszych działek takich jak \uf835 [accent]Naładowane Grafitem[] \uf861Duo/\uf859Salwa by pozbyć się strażników. item.copper.description = Przydatny materiał budowlany. Szeroko używany w prawie każdej konstrukcji. +item.copper.details = Miedź. Nienormalnie obfity metal na Serpulo. Strukturalnie słaba, chyba że zostanie wzmocniona. item.lead.description = Podstawowy materiał. Używany w przesyle przemiotów i płynów. Nie jest on przypadkiem szkodliwy? +item.lead.details = Gęsty. Obojętny. Intensywnie używany w bateriach. \nUwaga: prawdopodobnie toksyczny dla biologicznych form życia. Nie żeby zostało tu wiele. item.metaglass.description = Wyjątkowo wytrzymały stop szkła. Szeroko używany w transporcie i przechowywaniu płynów. item.graphite.description = Zmineralizowany węgiel, wykorzystywany do amunicji i izolacji elektrycznej. item.sand.description = Zwykły materiał używany pospolicie w przepalaniu, stopach i jako topnik. Dostanie piaskiem po oczach nie jest przyjemne. item.coal.description = Zwykły i łatwo dostępny materiał energetyczny. Używany powszechnie jako paliwo oraz w produkcji surowców. +item.coal.details = Wygląda na skamieniałą materię roślinną, uformowaną na długo przed siewem. item.titanium.description = Rzadki i bardzo lekki materiał. Używany w bardzo zaawansowanym przewodnictwie, wiertłach i samolotach. Poczuj się jak Tytan! item.thorium.description = Zwarty i radioaktywny materiał używany w strukturach i paliwie nuklearnym. Nie trzymaj go w rękach! item.scrap.description = Pozostałości starych budynków i jednostek. Składa się z małej ilości wszystkiego. -item.silicon.description = Niesamowicie przydatny półprzewodnk. Używany w panelach słonecznych, skomplikowanej elektronice i pociskach samonaprowadzających. -item.plastanium.description = Lekki i plastyczny materiał używany w amunicji odłamkowej i samolotach. Używany też w klockach LEGO (dlatego są niezniszczalne)! +item.scrap.details = Pozostałości po jednostkach oraz strukturach. +item.silicon.description = Niesamowicie przydatny półprzewodnik. Używany w panelach słonecznych, skomplikowanej elektronice i pociskach samonaprowadzających. +item.plastanium.description = Lekki i plastyczny materiał używany w amunicji odłamkowej i samolotach. item.phase-fabric.description = Niewiarygodnie lekkie włókno używane w zaawansowanej elektronice i technologii samo-naprawiającej item.surge-alloy.description = Zaawansowany materiał z niesłychanymi wartościami energetycznymi. item.spore-pod.description = Syntetyczne zarodniki, które mogą być przekształcone na olej, materiały wybuchowe i paliwo. +item.spore-pod.details = Zarodniki. Prawdopodobnie syntetyczna forma życia. Emitują gazy toksyczne dla innych organizmów biologicznych. Wyjątkowo inwazyjne. W pewnych warunkach wysoce łatwopalny. item.blast-compound.description = Niestabilny związek używany w materiałach wybuchowych. Powstaje podczas syntezy z zarodników i innych lotnych substancji. Używanie go jako materiał energetyczny jest niewskazane. item.pyratite.description = Niesamowicie palny związek używany w zbrojeniu. Nielegalny w 9 państwach. + liquid.water.description = Powszechnie używana do schładzania budowli i przetwarzania odpadów. liquid.slag.description = Wiele różnych metali stopionych i zmieszanych razem. Może zostać rozdzielony na jego metale składowe, albo wystrzelony w wrogie jednostki i użyty jako broń. liquid.oil.description = Używany w do produkcji złożonych materiałów. Może zostać przetworzony na węgiel, lub wystrzelony w wrogów przez wieżyczke. liquid.cryofluid.description = Obojętna, niekorozyjna ciecz utworzona z wody i tytanu. +block.resupply-point.description = Wypełnia pobliskie jednostki amunicją z miedzi. Nie jest kompatybilny z jednostkami, które wykorzystują energię z baterii. +block.armored-conveyor.description = Przesyła przedmioty z taką samą szybkością jak Przenośnik Tytanowy, ale jest bardziej odporny. Wejściami bocznymi mogą być tylko inne przenośniki. +block.illuminator.description = Małe, kompaktowe i konfigurowane źródło światła. Wymaga energii do funkcjonowania. block.message.description = Przechowuje wiadomość. Wykorzystywane do komunikacji pomiędzy sojusznikami. block.graphite-press.description = Kompresuje kawałki węgla w czyste blaszki grafitu. block.multi-press.description = Ulepszona wersja prasy grafitowej. Używa wody i prądu do kompresowania węgla szybko i efektywnie. @@ -1310,6 +1361,7 @@ block.phase-conveyor.description = Zaawansowany blok transportowy dla przedmiot block.sorter.description = Sortuje przedmioty. Jeśli przedmiot pasuje to przechodzi dalej, jeśli nie - to przechodzi na boki. block.inverted-sorter.description = Sortuje przedmioty jak zwykły sortownik, ale odpowiednie surowce wyciągane są na boki. block.router.description = Akceptuje przedmioty z jednego miejsca i rozdziela je do trzech innych kierunków. Przydatne w rozdzielaniu materiałów z jednego źródła do wielu celów.\n\n[scarlet]Nigdy nie używaj przy punkcje wejścia materiałów produkcyjnych, ponieważ zostaną one zatkane przez materiały wyjściowe.[] +block.router.details = Konieczne zło. Nie zaleca się stosowania obok nakładów produkcyjnych, ponieważ zostaną one zatkane. block.distributor.description = Zaawansowany rozdzielacz, rozdzielający przedmioty do 7 innych kierunków. block.overflow-gate.description = Rozdzielacz, który przerzuca przedmioty, kiedy główna droga jest przepełniona. block.underflow-gate.description = Odwrotność bramy przepełnieniowej, który przepuszcza przedmioty główną drogą, gdy boczne drogi są przepełnione. @@ -1346,15 +1398,18 @@ block.laser-drill.description = Pozwala kopać jeszcze szybciej poprzez technolo block.blast-drill.description = Najlepsze wiertło. Wymaga dużych ilości energii. block.water-extractor.description = Wydobywa wodę z ziemi. Użyj go, gdy w pobliżu brakuje wody. block.cultivator.description = Uprawia małe skupiska zarodników i umieszcza je w gotowych do dalszego przetwarzania kapsułach. +block.cultivator.details = Odzyskana technologia. Służy do jak najbardziej wydajnej produkcji ogromnych ilości biomasy. Prawdopodobnie początkowy inkubator zarodników pokrywający teraz Serpulo. block.oil-extractor.description = Używa bardzo dużych ilości energii do ekstrakcji ropy z piasku. Używaj go w sytuacji kiedy nie ma bezpośredniego źródła ropy w okolicy. block.core-shard.description = Pierwsza wersja rdzenia. Gdy zostaje zniszczony, wszelki kontakt do regionu zostaje utracony. Nie pozwól na to. +block.core-shard.details = Pierwsza generacja. Kompaktowy. Samoreplikuje się. Wyposażony w jednorazowe silniki startowe. Nie jest przeznaczony do podróży międzyplanetarnych. block.core-foundation.description = Druga wersja rdzenia. Lepiej opancerzony. Przechowuje więcej surowców. -block.core-nucleus.description = Trzecia i ostatnia wersja rdzenia. Bardzo dobrze opanczerzony. Przechowuje ogromne ilości surowców. +block.core-foundation.details = Druga generacja. +block.core-nucleus.description = Trzecia i ostatnia wersja rdzenia. Bardzo dobrze opancerzony. Przechowuje ogromne ilości surowców. +block.core-nucleus.details = Trzecia i ostatnia generacja. block.vault.description = Przechowuje duże ilości przedmiotów każdego rodzaju. Użyj ekstraktora, aby rozładować magazyn. block.container.description = Przechowuje małe ilości przedmiotów każdego rodzaju. Użyj ekstraktora, aby rozładować kontener. block.unloader.description = Wyciąga przedmioty z przyległych bloków. Typ przedmiotu jaki zostanie wyciągniety może zostać zmieniony poprzez kliknięcie. block.launch-pad.description = Wysyła pakiety przedmiotów bez potrzeby wystrzeliwania rdżenia. -block.launch-pad-large.description = Ulepszona wersja wyrzutni. Magazynuje więcej przedmiotów. Wysyła częściej. block.duo.description = Mała, tania wieża. Przydatna przeciwko jednostkom naziemnym. block.scatter.description = Średniej wielkości wieża przeciwlotnicza. Rozsiewa śruty z ołowiu, złomu lub metaszkła na jednostki wroga. block.scorch.description = Spala wszystkich wrogów naziemnych w pobliżu. Bardzo skuteczny z bliskiej odległości. @@ -1369,6 +1424,7 @@ block.ripple.description = Duża wieża artyleryjska, która strzela jednocześn block.cyclone.description = Duża szybkostrzelna wieża. block.spectre.description = Duże działo dwulufowe, które strzela potężnymi pociskami przebijającymi pancerz w jednostki naziemne i powietrzne. block.meltdown.description = Duże działo laserowe, które strzela potężnymi wiązkami dalekiego zasięgu. Wymaga chłodzenia. +block.foreshadow.description = Fires a large single-target bolt over long distances. block.repair-point.description = Bez przerw naprawia najbliższą uszkodzoną jednostkę w jego zasięgu. block.segment.description = Uszkadza i niszczy wrogie pociskiski poza laserami. block.parallax.description = Wykorzystuje laser, który przyciąga do siebie wrogów, zadając im obrażenia. @@ -1396,7 +1452,6 @@ block.logic-display.description = Wyświetla obraz z procesora. block.large-logic-display.description = Wyświetla obraz z procesora. block.interplanetary-accelerator.description = Masywna elektromagnetyczna wieża. Przyspiesza rdzeń do prędkości ucieczki by wylądować na innych planetach. - unit.dagger.description = Strzela standardowymi pociskami w najbliższych wrogów. unit.mace.description = Strzela strumieniami ognia w najbliższych wrogów. unit.fortress.description = Strzela artylerią dalekiego zasięgu we wrogie jednostki na ziemi. From 082a43da35dcb31bb2a416a126dd9fdbb602408d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ga=C5=A1par=C3=ADk?= Date: Mon, 30 Nov 2020 21:35:14 +0100 Subject: [PATCH 118/123] Czech translation up to date with final beta --- core/assets/bundles/bundle_cs.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index c4edd7f14e..3664e28aa4 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -21,7 +21,7 @@ gameover.pvp = Vyhrál tým [accent]{0}[]! highscore = [accent]Nový rekord! copied = Zkopírováno. indev.notready = Tato část hry ještě není připravena -indev.campaign = [accent]Završil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích. +indev.campaign = [accent]Blahopřejeme! Završil jsi kampaň![]\n\nTohle je vše, co Ti hra může po obsahové stránce nabídnout. Meziplanetární lety budou přidány až v budoucích aktualizacích. load.sound = Zvuky load.map = Mapy @@ -147,6 +147,9 @@ unlocked = Byl odemmknut nový blok! available = Je zpřístupněn nový výzkum! completed = [accent]Dokončeno[] techtree = Technologie +research.legacy = Nalezena výzkumná data z verze [accent]5.0[].\nChceš [accent]tato data načíst[], nebo [accent]je zahodit[] a začít výzkum v nové kampani (což doporučujeme)? +research.load = Načíst +research.discard = Zahodit research.list = [lightgray]Výzkum:[] research = Výzkum researched = Dokončen výzkum technologie: [lightgray]{0}[]. From a87e58db934950ce10927693a8db4fc6313c870b Mon Sep 17 00:00:00 2001 From: GioIacca9 <39232448+GioIacca9@users.noreply.github.com> Date: Mon, 30 Nov 2020 22:16:13 +0100 Subject: [PATCH 119/123] v6 Italian bundle --- core/assets/bundles/bundle_it.properties | 924 +++++++++++++---------- 1 file changed, 538 insertions(+), 386 deletions(-) diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index a072e060c4..99ca091572 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -16,19 +16,21 @@ link.suggestions.description = Suggerisci nuove funzionalità linkfail = Impossibile aprire il link! L'URL è stato copiato negli appunti. screenshot = Screenshot salvato a {0} screenshot.invalid = Mappa troppo pesante, probabilmente non c'è abbastanza spazio sul disco. -gameover = Il Nucleo è stato distrutto. +gameover = Hai Perso. +gameover.disconnect = Disconnetti gameover.pvp = La squadra[accent] {0}[] ha vinto! +gameover.waiting = [accent]Attendendo la prossima mappa... highscore = [accent]Nuovo record! copied = Copiato. -indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. -indev.notready = This part of the game isn't ready yet +indev.notready = Questa parte del gioco non è ancora completa +indev.campaign = [accent]Congratulazioni! Hai raggiunto la fine della modalità campagna![]\n\nI contenuti per ora si fermano qui. In qualche aggiornamento futuro scoprirai i viaggi interplanetari. load.sound = Suoni load.map = Mappe load.image = Immagini load.content = Contenuti load.system = Sistema -load.mod = Mods +load.mod = Mod load.scripts = Scripts be.update = Una nuova build Bleeding Edge è disponibile: @@ -55,8 +57,9 @@ schematic.saved = Schematica salvata. schematic.delete.confirm = Questa schematica sarà cancellata definitivamente. schematic.rename = Rinomina Schematica schematic.info = {0}x{1}, {2} blocchi -schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server. +schematic.disabled = [scarlet]Schematiche disabilitate[]\nNon puoi usare le schematiche su questa [accent]mappa[] o su questo [accent]server. +stats = Statistiche stat.wave = Ondate Sconfitte:[accent] {0} stat.enemiesDestroyed = Nemici Distrutti:[accent] {0} stat.built = Costruzioni Erette:[accent] {0} @@ -66,7 +69,7 @@ stat.delivered = Risorse Lanciate: stat.playtime = Tempo Di Gioco:[accent] {0} stat.rank = Livello Finale: [accent]{0} -globalitems = [accent]Global Items +globalitems = [accent]Item Globali map.delete = Sei sicuro di voler eliminare la mappa '[accent]{0}[]'? level.highscore = Miglior Punteggio: [accent]{0} level.select = Selezione del Livello @@ -96,18 +99,18 @@ preparingconfig = Preparo la Configurazione preparingcontent = Preparo il Contenuto uploadingcontent = Carico il Contenuto uploadingpreviewfile = Carico File di Anteprima -committingchanges = Applico le Modifiche +committingchanges = Applicando le Modifiche done = Fatto feature.unsupported = Il tuo dispositivo non supporta questa funzione. -mods.alphainfo = Tieni a mente che queste mods sono in alpha e[scarlet] possono contenere molti bug[]. Segnala tutti i problemi che trovi sulla pagina GitHub o sul server Discord di Mindustry. -mods = Mods +mods.alphainfo = Tieni a mente che queste mod sono in alpha e[scarlet] possono contenere molti bug[]. Segnala tutti i problemi che trovi sulla pagina GitHub di Mindustry. +mods = Mod mods.none = [lightgray]Nessuna mod trovata! mods.guide = Guida per il modding mods.report = Segnala un Bug mods.openfolder = Apri Cartella mods.reload = Ricarica -mods.reloadexit = The game will now exit, to reload mods. +mods.reloadexit = Il gioco si chiuderà per ricaricare le mod. mod.display = [gray]Mod:[orange] {0} mod.enabled = [lightgray]Abilitato mod.disabled = [scarlet]Disabilitato @@ -115,40 +118,44 @@ mod.disable = Disabilita mod.content = Contenuto: mod.delete.error = Impossibile eliminare questa mod. Il file potrebbe essere in uso. mod.requiresversion = [scarlet]Versione minima richiesta: [accent]{0} -mod.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105) +mod.outdated = [scarlet]Questa mod non è compatibile con la v6 (versione minima: 105) mod.missingdependencies = [scarlet]Dipendenze mancanti: {0} mod.erroredcontent = [scarlet]Errori di Contenuto mod.errors = Si sono verificati degli errori durante il caricamento del contenuto. mod.noerrorplay = [scarlet]Sono presenti delle mod con errori.[] Puoi disabilitare le mod affette oppure sistemarle prima di giocare. -mod.nowdisabled = [scarlet]Alla mod '{0}' mancano delle dipendenze:[accent] {1}\n[lightgray]Queste mods devono essere scaricate prima.\nQuesta mod verrà disabilitata automaticamente. +mod.nowdisabled = [scarlet]Alla mod '{0}' mancano delle dipendenze:[accent] {1}\n[lightgray]Queste mod devono essere scaricate prima.\nQuesta mod verrà disabilitata automaticamente. mod.enable = Abilita mod.requiresrestart = Il gioco verrà chiuso per applicare i cambiamenti. mod.reloadrequired = [scarlet]Riavvio necessario mod.import = Importa Mod mod.import.file = Importa File mod.import.github = Importa Mod da GitHub -mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source! +mod.jarwarn = [scarlet]Le mod JAR non sono sicure[]\nAssicurati di importare queste mod solo da fonti affidabili! mod.item.remove = Questo item fa parte della mod[accent] '{0}'[]. Per rimuoverlo, disinstalla questa mod. mod.remove.confirm = Questa mod verrà eliminata. mod.author = [lightgray]Autore:[] {0} -mod.missing = Questo salvataggio contiene delle mods che hai recentemente aggiornato o non hai più installate. Il salvataggio potrebbe corrompersi. Sei sicuro di volerlo caricare?\n[lightgray]Mods:\n{0} -mod.preview.missing = Prima di pubblicare questa mod nel Workshop, devi aggiungere un immagine di copertina.\nMetti un immagine con nome[accent] preview.png[] nella cartella della mods e riprova. -mod.folder.missing = Solo le mods in una cartella possono essere pubblicate nel Workshop.\nPer convertire una mod in una cartella, decomprimi i suoi file in una cartella ed elimina il vecchio zip, quindi riavvia il gioco o ricarica le tue mods. +mod.missing = Questo salvataggio contiene delle mod che hai recentemente aggiornato o non hai più installate. Il salvataggio potrebbe corrompersi. Sei sicuro di volerlo caricare?\n[lightgray]Mod:\n{0} +mod.preview.missing = Prima di pubblicare questa mod nel Workshop, devi aggiungere un immagine di copertina.\nMetti un immagine con nome[accent] preview.png[] nella cartella della mod e riprova. +mod.folder.missing = Solo le mod in una cartella possono essere pubblicate nel Workshop.\nPer convertire una mod in una cartella, decomprimi i suoi file in una cartella ed elimina il vecchio zip, quindi riavvia il gioco o ricarica le tue mod. mod.scripts.disable = Il tuo dispositivo non supporta le mod con gli script. Devi disabilitare queste mod per poter giocare. about.button = Info name = Nome: noname = Scegli un[accent] nome[] prima di unirti. -planetmap = Planet Map -launchcore = Launch Core +planetmap = Mappa Pianeta +launchcore = Lancia Nucleo filename = Nome File: unlocked = Nuovo contenuto sbloccato! +available = Nuova scoperta disponibile! completed = [accent]Completato -techtree = Albero Scoperta +techtree = Albero Scoperte +research.legacy = Sono stati trovati dati dell'albero delle scoperte della [accent]v5.0[]\nVuoi [accent]caricare questi dati[], o [accent]scartarli[] e ricominciare le scoperte nella nuova campagna (consigliato)? +research.load = Carica +research.discard = Scarta research.list = [lightgray]Ricerca: -research = Ricerca +research = Albero Scoperte researched = [lightgray]{0} cercati. -research.progress = {0}% complete +research.progress = {0}% completato players = {0} giocatori online players.single = {0} giocatore online players.search = Cerca @@ -189,6 +196,10 @@ servers.local = Server Locali servers.remote = Server Remoti servers.global = Server Community +servers.showhidden = Mostra Server Nascosti +server.shown = Visibili +server.hidden = Nascosti + trace = Traccia Giocatore trace.playername = Nome del Giocatore: [accent]{0} trace.ip = IP: [accent]{0} @@ -203,8 +214,8 @@ server.admins.none = Nessun amministratore trovato! server.add = Aggiungi Server server.delete = Sei sicuro di voler eliminare questo server? server.edit = Modifica Server -server.outdated = [crimson]Server Obsoleto![] -server.outdated.client = [crimson]Client Obsoleto![] +server.outdated = [scarlet]Server Obsoleto![] +server.outdated.client = [scarlet]Client Obsoleto![] server.version = [gray]v{0} {1} server.custombuild = [accent]Build Personalizzata confirmban = Sei sicuro di voler bandire "{0}[white]"? @@ -222,11 +233,12 @@ disconnect.timeout = Connessione scaduta. disconnect.data = Errore durante il caricamento del mondo! cantconnect = Impossibile unirsi alla partita ([accent]{0}[]). connecting = [accent]Connessione in corso... +reconnecting = [accent]Riconnettendo... connecting.data = [accent]Caricamento del mondo... server.port = Porta: server.addressinuse = Indirizzo già in uso! server.invalidport = Numero porta non valido! -server.error = [crimson]Errore nell'hosting del server. +server.error = [scarlet]Errore nell'hosting del server. save.new = Nuovo Salvataggio save.overwrite = Sei sicuro di voler sovrascrivere questo salvataggio? overwrite = Sovrascrivi @@ -236,8 +248,8 @@ save.delete.confirm = Sei sicuro di voler eliminare questo salvataggio? save.delete = Elimina save.export = Esporta Salvataggio save.import.invalid = [accent]Questo salvataggio non è valido! -save.import.fail = [crimson]Impossibile importare il salvataggio: [accent]{0} -save.export.fail = [crimson]Impossibile esportare il salvataggio: [accent]{0} +save.import.fail = [scarlet]Impossibile importare il salvataggio: [accent]{0} +save.export.fail = [scarlet]Impossibile esportare il salvataggio: [accent]{0} save.import = Importa Salvataggio save.newslot = Nome: save.rename = Rinomina @@ -267,6 +279,9 @@ cancel = Annulla openlink = Apri Link copylink = Copia link back = Indietro +crash.export = Esporta Log di Crash +crash.none = Nessun log di crash trovato. +crash.exported = Log di crash esportato. data.export = Esporta Salvataggio data.import = Importa Salvataggio data.openfolder = Apri Cartella\nSalvataggi @@ -276,23 +291,26 @@ data.import.confirm = Importare dati di gioco esterni sovrascriverà[scarlet] tu quit.confirm = Sei sicuro di voler uscire? quit.confirm.tutorial = Sei sicuro di sapere cosa stai facendo? Il tutorial può essere ripetuto in[accent]\nImpostazioni -> Gioco -> Ripeti il Tutorial.[] loading = [accent]Caricamento in Corso... -reloading = [accent]Ricaricamento delle mods... +reloading = [accent]Ricaricamento delle mod... saving = [accent]Salvataggio in corso... -respawn = [accent][[{0}][] to respawn in core +respawn = [accent][[{0}][] per rigenerarti nel nucleo cancelbuilding = [accent][[{0}][] per pulire la selezione selectschematic = [accent][[{0}][] per selezionare+copiare pausebuilding = [accent][[{0}][] per smettere di costruire resumebuilding = [scarlet][[{0}][] per riprendere a costruire +showui = Controlli nascosti.\nPremi [accent][[{0}][] per mostrarli. wave = [accent]Ondata {0} -wave.cap = [accent]Wave {0}/{1} +wave.cap = [accent]Ondata {0}/{1} wave.waiting = [lightgray]Ondata tra {0} wave.waveInProgress = [lightgray]Ondata in corso waiting = In attesa... waiting.players = Attendendo giocatori... wave.enemies = [lightgray]{0} Nemici Rimasti +wave.enemycores = [accent]{0}[lightgray] Nuclei Nemici +wave.enemycore = [accent]{0}[lightgray] Nucleo Nemico wave.enemy = [lightgray]{0} Nemico Rimasto -wave.guardianwarn = Guardian approaching in [accent]{0}[] waves. -wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave. +wave.guardianwarn = Guardiano in arrivo tra [accent]{0}[] ondate. +wave.guardianwarn.one = Guardiano in arrivo tra [accent]{0}[] ondata. loadimage = Carica immagine saveimage = Salva Immagine unknown = Sconosciuto @@ -331,7 +349,7 @@ editor.generation = Generazione: editor.ingame = Modifica in Gioco editor.publish.workshop = Pubblica nel Workshop editor.newmap = Nuova Mappa -editor.center = Center +editor.center = Centro workshop = Workshop waves.title = Ondate waves.remove = Rimuovi @@ -339,9 +357,9 @@ waves.never = waves.every = sempre waves.waves = ondata/e waves.perspawn = per spawn -waves.shields = shields/wave +waves.shields = scudi/ondata waves.to = a -waves.guardian = Guardian +waves.guardian = Guardiano waves.preview = Anteprima waves.edit = Modifica... waves.copy = Copia negli Appunti @@ -350,9 +368,10 @@ waves.invalid = Ondate dagli appunti non valide. waves.copied = Ondate copiate. waves.none = Nessun nemico impostato.\nNota che le disposizioni di ondate vuote verranno automaticamente rimpiazzate con la disposizione predefinita. -wavemode.counts = counts -wavemode.totals = totals -wavemode.health = health +#these are intentionally in lower case +wavemode.counts = n° +wavemode.totals = totali +wavemode.health = salute editor.default = [lightgray] details = Dettagli... @@ -393,7 +412,7 @@ editor.exportimage = Esporta Immagine Terreno editor.exportimage.description = Esporta un file immagine contenente solo il terreno editor.loadimage = Importa\nTerreno editor.saveimage = Esporta\nTerreno -editor.unsaved = [scarlet]Alcune modifiche non sono state salvate![]\nSei sicuro di voler uscire? +editor.unsaved = Sei sicuro di voler uscire?\n[scarlet]Tutte le modifiche andranno perse. editor.resizemap = Ridimensiona la mappa editor.mapname = Nome Mappa: editor.overwrite = [accent]Attenzione!\nQuesto sovrascrive una mappa esistente. @@ -420,7 +439,7 @@ filters.empty = [lightgray]Nessun filtro! Aggiungine uno cliccando il tasto sott filter.distort = Modifica filter.noise = Rumore filter.enemyspawn = Seleziona Spawn Nemico -filter.spawnpath = Path To Spawn +filter.spawnpath = Percorso per lo Spawn filter.corespawn = Seleziona Nucleo filter.median = Mediana filter.oremedian = Mediana Minerali @@ -445,7 +464,7 @@ filter.option.amount = Quantità filter.option.block = Blocco filter.option.floor = Terreno filter.option.flooronto = Terreno Mirato -filter.option.target = Target +filter.option.target = Obbiettivo filter.option.wall = Muro filter.option.ore = Minerale filter.option.floor2 = Terreno Secondario @@ -462,7 +481,9 @@ load = Carica save = Salva fps = FPS: {0} ping = Ping: {0}ms -language.restart = Riavvia il gioco affinché il cambiamento della lingua abbia effetto. +memory = Memoria: {0}MB +memory2 = Memoria:\n {0}MB +\n {1}MB +language.restart = Riavvia il gioco affinché le impostazioni della lingua abbiano effetto. settings = Impostazioni tutorial = Tutorial tutorial.retake = Ripeti il Tutorial @@ -472,32 +493,29 @@ mapeditor = Editor Mappe abandon = Abbandona abandon.text = Questa zona e tutte le tue risorse saranno perdute e passeranno al nemico. locked = Bloccato -complete = [lightgray]Completato: +complete = [lightgray]Completa: requirement.wave = Raggiungi l'ondata {0} in {1} requirement.core = Distruggi il Nucleo Nemico in {0} -requirement.research = Research {0} -requirement.capture = Capture {0} -bestwave = [lightgray]Ondata Migliore: {0} -launch.text = Launch -research.multiplayer = Only the host can research items. +requirement.research = Scopri {0} +requirement.produce = Produci {0} +requirement.capture = Cattura {0} +launch.text = Lancia +research.multiplayer = Solo l'host può scoprire gli oggetti. +map.multiplayer = Only the host can view sectors. uncover = Scopri configure = Configura Equipaggiamento -loadout = Loadout -resources = Resources + +loadout = Equipaggiamento +resources = Risorse bannedblocks = Blocchi Banditi addall = Aggiungi Tutti -launch.destination = Destination: {0} +launch.from = Partenza da: [accent]{0} +launch.destination = Destinazione: {0} configure.invalid = Il valore dev'essere un numero compresto tra 0 e {0}. -zone.unlocked = [lightgray]{0} sbloccata. -zone.requirement.complete = Ondata {0} raggiunta:\n[lightgray]{1}[] requisiti di zona soddisfatti. -zone.resources = [lightgray]Risorse Trovate: -zone.objective = [lightgray]Obiettivo: [accent]{0} -zone.objective.survival = Sopravvivere -zone.objective.attack = Distruggere il Nucleo Nemico add = Aggiungi -boss.health = Vita del Boss +boss.health = Vita del Guardiano -connectfail = [crimson]Impossibile connettersi al server:\n\n[accent] {0} +connectfail = [scarlet]Impossibile connettersi al server:\n\n[accent] {0} error.unreachable = Server irraggiungibile. L'indirizzo è scritto correttamente? error.invalidaddress = Indirizzo non valido. error.timedout = Timeout!\nAssicurati che l'host abbia il port forwarding impostato e che l'indirizzo sia corretto! @@ -508,49 +526,82 @@ error.io = Errore I/O di rete. error.any = Errore di rete sconosciuto. error.bloom = Errore dell'avvio delle shaders.\nIl tuo dispositivo potrebbe non supportarle. -weather.rain.name = Rain -weather.snow.name = Snow -weather.sandstorm.name = Sandstorm -weather.sporestorm.name = Sporestorm -weather.fog.name = Fog +weather.rain.name = Pioggia +weather.snow.name = Neve +weather.sandstorm.name = Tempesta di sabbia +weather.sporestorm.name = Tempesta di spore +weather.fog.name = Nebbia -sectors.unexplored = [lightgray]Unexplored -sectors.resources = Resources: -sectors.production = Production: -sectors.stored = Stored: -sectors.resume = Resume -sectors.launch = Launch -sectors.select = Select -sectors.nonelaunch = [lightgray]none (sun) -sectors.rename = Rename Sector -sector.missingresources = [scarlet]Insufficient Core Resources +sectors.unexplored = [lightgray]Inesplorato +sectors.resources = Risorse: +sectors.production = Produzione: +sectors.export = Esportazione: +sectors.time = Tempo di Gioco: +sectors.threat = Minaccia: +sectors.wave = Ondata: +sectors.stored = Immagazzinate: +sectors.resume = Riprendi +sectors.launch = Lancia +sectors.select = Seleziona +sectors.nonelaunch = [lightgray]nessuno (sole) +sectors.rename = Rinomina Settore +sectors.enemybase = [scarlet]Base Nemica +sectors.vulnerable = [scarlet]Vulnerabile +sectors.underattack = [scarlet]Sotto attacco! [accent]{0}% danneggiato +sectors.survives = [accent]Sopravissuto a {0} ondate +sectors.go = Lancia +sector.curcapture = Settore Catturato +sector.curlost = Settore Perso +sector.missingresources = [scarlet]Risorse del Nucleo insufficienti +sector.attacked = Settore [accent]{0}[white] sotto attacco! +sector.lost = Settore [accent]{0}[white] perso! +#note: the missing space in the line below is intentional +sector.captured = Settore [accent]{0}[white]catturato! + +threat.low = Bassa +threat.medium = Media +threat.high = Alta +threat.extreme = Estrema +threat.eradication = Catrastofica + +planets = Pianeti planet.serpulo.name = Serpulo -planet.sun.name = Sun +planet.sun.name = Sole -sector.groundZero.name = Ground Zero -sector.craters.name = The Craters -sector.frozenForest.name = Frozen Forest -sector.ruinousShores.name = Ruinous Shores -sector.stainedMountains.name = Stained Mountains -sector.desolateRift.name = Desolate Rift -sector.nuclearComplex.name = Nuclear Production Complex -sector.overgrowth.name = Overgrowth -sector.tarFields.name = Tar Fields -sector.saltFlats.name = Salt Flats -sector.fungalPass.name = Fungal Pass +sector.impact0078.name = Impatto 0078 +sector.groundZero.name = Terreno Zero +sector.craters.name = Crateri +sector.frozenForest.name = Foresta Ghiacciata +sector.ruinousShores.name = Rive in Rovina +sector.stainedMountains.name = Montagne Colorate +sector.desolateRift.name = Canyon Desolato +sector.nuclearComplex.name = Complesso Nucleare +sector.overgrowth.name = Supercrescita +sector.tarFields.name = Distese di Catrame +sector.saltFlats.name = Saline +sector.fungalPass.name = Passaggio Fungino +sector.biomassFacility.name = Centrale a Biomasse +sector.windsweptIslands.name = Isole Ventilate +sector.extractionOutpost.name = Avamposto di Estrazione +sector.planetaryTerminal.name = Base di Lancio Planetario -sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on. -sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders. -sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing. -sector.craters.description = Water has accumulated in this crater, relic of the old wars. Reclaim the area. Collect sand. Smelt metaglass. Pump water to cool turrets and drills. -sector.ruinousShores.description = Past the wastes, is the shoreline. Once, this location housed a coastal defense array. Not much of it remains. Only the most basic defense structures have remained unscathed, everything else reduced to scrap.\nContinue the expansion outwards. Rediscover the technology. -sector.stainedMountains.description = Further inland lie the mountains, yet untainted by spores.\nExtract the abundant titanium in this area. Learn how to use it.\n\nThe enemy presence is greater here. Do not give them time to send their strongest units. -sector.overgrowth.description = This area is overgrown, closer to the source of the spores.\nThe enemy has established an outpost here. Build Titan units. Destroy it. Reclaim that which was lost. -sector.tarFields.description = The outskirts of an oil production zone, between the mountains and desert. One of the few areas with usable tar reserves.\nAlthough abandoned, this area has some dangerous enemy forces nearby. Do not underestimate them.\n\n[lightgray]Research oil processing technology if possible. -sector.desolateRift.description = An extremely dangerous zone. Plentiful resources, but little space. High risk of destruction. Leave as soon as possible. Do not be fooled by the long spacing between enemy attacks. -sector.nuclearComplex.description = A former facility for the production and processing of thorium, reduced to ruins.\n[lightgray]Research the thorium and its many uses.\n\nThe enemy is present here in great numbers, constantly scouting for attackers. -sector.fungalPass.description = A transition area between high mountains and lower, spore-ridden lands. A small enemy reconnaissance base is located here.\nDestroy it.\nUse Dagger and Crawler units. Take out the two cores. +sector.groundZero.description = Il posto perfetto per ricominciare. Minaccia nemica bassa. Poche risorse.\nRaccogli più rame e più piombo che puoi.\nContinua. +sector.frozenForest.description = Qnche qui, vicino alle montagne, le spore si sono diffuse. Le gelide temperature non possono trattenerle per eterno.\n\nEntra nel mondo dell'energia. Costruisci i generatori a combustibile. Impara ad usare i riparatori. +sector.saltFlats.description = Ai confini del deserto si trovano le Saline. Poche risorse sono presenti su questi suoli.\n\nI nemici hanno eretto un complesso di immagazzinamento delle risorse qui. Distruggi il loro nucleo. Non lasciare niente in piedi. +sector.craters.description = L'acqua si è accumulata nel cratere, reliquia delle antiche guerre. Riconquista quest'area. Raccogli la sabbia. Fondi il vetro metallico. Pompa l'acqua per raffreddare trivelle e torrette. +sector.ruinousShores.description = Oltre le distese c'è il litorale. Una volta questo posto ospitava una distesa di difese costiere. Non è rimasto molto. Solo le più semplici strutture difensive sono rimaste illese, tutto il resto è stato ridotto in rottami.\nContinua l'espansione verso l'esterno. Riscopri la tecnologia. +sector.stainedMountains.description = Nell'entroterra si trovano le montagne non ancora contaminate dalle spore.\nEstrai l'abbondante titanio di quest'area. Impara ad usarlo.\n\nLa presenza nemica è maggiore qui. Non dare tempo al nemico di mandare le sue unità più forti. +sector.overgrowth.description = Quest'area, più vicina alle spore, è invasa dalla vegetazione.\nIl nemico ha costruito un avanposto qui. Fabbrica l'unità Mace. Distruggilo. +sector.tarFields.description = Ai confini di una zona petrolifera, tra le montagne e il deserto. Una delle poche aree con riserve di catrame utilizzabili.\nAnche se abbandonata, quest'area ha alcuni nemici pericolosi nelle vicinanze. Non sottovalutarli.\n\n[lightgray]Scopri la tecnologia per raffinare il petrolio, se riesci. +sector.desolateRift.description = Una zona pericolosissima. Risorse abbondanti ma poco spazio. Alto è il riscio di distruzione. Lascia questa zona il prima possibile. Non lasciarti ingannare dalla lunga pausa tra le ondate nemiche. +sector.nuclearComplex.description = Un ex impianto per la produzione e la lavorazione del torio, ridotto a rudere.\n[lightgray]Scopri il torio e usalo in tutti i modi possibili.\n\nI nemici sono molto presenti in quest'area e costantemente alla ricerca di aggressori. +sector.fungalPass.description = Un'area di transizione tra le montagne alte e quelle più basse invasa dalle spore. È presente una piccola base di ricognizione nemica.\nDistruggila.\nUsa il Dagger e il Crawler. Radi al suolo i due nuclei. +sector.biomassFacility.description = L'origine delle spore. Questa è la centrale dove sono state scoperte e prodotte inizialmente.\nScopri le tecnologie utilizzate in essa. Coltivale per produrre plastiche e carburanti.\n\n[lightgray]Prima di essere dismessa, le spore furono rilasciate. Niente nell'ecosistema locale è riuscito a sopravvivere ad un organismo così invasivo. +sector.windsweptIslands.description = Oltre la costa si trova questo arcipelago. Fonti affermano che in questi luoghi, un tempo, si producesse [accent]Plastanio[] in apposite fabbriche.\n\nRespingi le unità navali nemiche. Costruisci una base sulle isole. Scopri queste fabbriche. +sector.extractionOutpost.description = Un avamposto remoto, costruito dai nemici per lanciare le risorse su altri settori.\n\nI trasporti intersettoriali sono una tecnologia essenziale per le missioni future. Distruggi la base. Scopri i loro Ascensori Spaziali. +sector.impact0078.description = Qui giaciono i resti della prima nave spaziale mai entrata in questo sistema.\n\nRecupera tutto ciò che puoi dai rottami. Scopri qualsiasi tecnologia conservatasi nel tempo. +sector.planetaryTerminal.description = L'obbiettivo finale.\n\nQuesta base costiera contiene una struttura in grado di lanciare i Nuclei su altri pianeti. È estremamente protetta.\n\nFabbrica le unità navali. Sconfiggi i nemici il più velocemente possibile. Scopri la struttura per il lancio. settings.language = Lingua settings.data = Dati di Gioco @@ -564,94 +615,99 @@ settings.graphics = Grafica settings.cleardata = Elimina Dati di Gioco settings.clear.confirm = Sei sicuro di voler cancellare i dati?\nQuesta operazione non può essere annullata! settings.clearall.confirm = [scarlet]ATTENZIONE![]\nQuesto cancellerà tutti i dati, inclusi salvataggi, mappe, oggetti sbloccati ed impostazioni.\nDopo aver premuto su 'ok' il gioco eliminerà i dati e si chiuderà automaticamente. -settings.clearsaves.confirm = Are you sure you want to clear all your saves? -settings.clearsaves = Clear Saves -settings.clearresearch = Clear Research -settings.clearresearch.confirm = Are you sure you want to clear all of your campaign research? -settings.clearcampaignsaves = Clear Campaign Saves -settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your campaign saves? +settings.clearsaves.confirm = Sei sicuro di voler eliminare tutti i tuoi salvataggi? +settings.clearsaves = Elimina Salvataggi +settings.clearresearch = Elimina Scoperte +settings.clearresearch.confirm = Sei sicuro di voler eliminare le scoperte della modalità campagna? +settings.clearcampaignsaves = Elimina Salvataggi Campagna +settings.clearcampaignsaves.confirm = Sei sicuro di voler eliminare tutti i salvataggi della modalità campagna? paused = [accent]< In Pausa > clear = Pulisci banned = [scarlet]Bandito -unplaceable.sectorcaptured = [scarlet]Requires captured sector yes = Si no = No info.title = Info -error.title = [crimson]Si è verificato un errore +error.title = [scarlet]Si è verificato un errore error.crashtitle = Si è verificato un errore unit.nobuild = [scarlet]L'unità non può costruire -lastaccessed = [lightgray]Last Accessed: {0} +lastaccessed = [lightgray]Ultimo Accesso: {0} block.unknown = [lightgray]??? +stat.description = Descrizione stat.input = Ingresso stat.output = Uscita stat.booster = Potenziamenti -stat.tiles = Blocchi Richiesti +stat.tiles = Terreni Richiesti: stat.affinities = Affinità stat.powercapacity = Capacità Energetica -stat.powershot = Danno/Colpo +stat.powershot = Energia/Colpo stat.damage = Danno -stat.targetsair = Attacca Nemici Aerei -stat.targetsground = Attacca Nemici Terreni -stat.itemsmoved = Velocità di Movimento -stat.launchtime = Tempo fra Decolli +stat.targetsair = Nemici Aerei +stat.targetsground = Nemici Terreni +stat.itemsmoved = Velocità +stat.launchtime = Tempo tra Lanci stat.shootrange = Raggio -stat.size = Dimensioni -stat.displaysize = Display Size -stat.liquidcapacity = Capacità del Liquido -stat.powerrange = Raggio Energia -stat.linkrange = Link Range -stat.instructions = Instructions +stat.size = Dimensione +stat.displaysize = Dimensione Schermo +stat.liquidcapacity = Capacità Liquidi +stat.powerrange = Raggio di Connessione +stat.linkrange = Raggio di Collegamento +stat.instructions = Istruzioni stat.powerconnections = Connessioni Massime -stat.poweruse = Utilizzo Energia -stat.powerdamage = Energia/Danno -stat.itemcapacity = Capacità -stat.memorycapacity = Memory Capacity -stat.basepowergeneration = Generazione Energia di Base +stat.poweruse = Consumo Energetico +stat.powerdamage = Consumo Energetico/Danno +stat.itemcapacity = Capacità Oggetti +stat.memorycapacity = Memoria +stat.basepowergeneration = Energia Generata stat.productiontime = Tempo di Produzione stat.repairtime = Tempo di Riparazione Completa -stat.speedincrease = Aumento Velocità +stat.weapons = Armi +stat.bullet = Proiettile +stat.speedincrease = Potenziamento Velocità stat.range = Raggio stat.drilltier = Scavabili -stat.drillspeed = Velocità di Scavo Stabile +stat.drillspeed = Velocità di Scavo stat.boosteffect = Effetto Boost -stat.maxunits = Unità Attive Max +stat.maxunits = Unità Attive Massime stat.health = Salute stat.buildtime = Tempo di Costruzione -stat.maxconsecutive = Max Consecutive +stat.maxconsecutive = Limite Consecutive stat.buildcost = Costo di Costruzione -stat.inaccuracy = Inaccuratezza +stat.inaccuracy = Precisione stat.shots = Colpi -stat.reload = Ricarica +stat.reload = Colpi/Secondo stat.ammo = Munizioni -stat.shieldhealth = Shield Health -stat.cooldowntime = Cooldown Time -stat.explosiveness = Explosiveness -stat.basedeflectchance = Base Deflect Chance -stat.lightningchance = Lightning Chance -stat.lightningdamage = Lightning Damage -stat.flammability = Flammability -stat.radioactivity = Radioactivity -stat.heatcapacity = HeatCapacity -stat.viscosity = Viscosity -stat.temperature = Temperature -stat.speed = Speed -stat.buildspeed = Build Speed -stat.minespeed = Mine Speed -stat.minetier = Mine Tier -stat.payloadcapacity = Payload Capacity -stat.commandlimit = Command Limit -stat.abilities = Abilities +stat.shieldhealth = Salute Scudo +stat.cooldowntime = Tempo di Recupero +stat.explosiveness = Esplosività +stat.basedeflectchance = Probabilità di Deviazione +stat.lightningchance = Probabilità dei Fulmini +stat.lightningdamage = Danno Fulmini +stat.flammability = Infiammabilità +stat.radioactivity = Radioattività +stat.heatcapacity = Capacità Termica +stat.viscosity = Viscosità +stat.temperature = Temperatura +stat.speed = Velocità +stat.buildspeed = Velcità di Costruzione +stat.minespeed = Velocità di Scavaggio +stat.minetier = Livello Trivella +stat.payloadcapacity = Capacità di Carico +stat.commandlimit = Limite di Comando +stat.abilities = Abilità +stat.canboost = Può Potenziarsi +stat.flying = Volo -ability.forcefield = Force Field -ability.repairfield = Repair Field -ability.statusfield = Status Field -ability.unitspawn = {0} Factory -ability.shieldregenfield = Shield Regen Field +ability.forcefield = Campo di Forza +ability.repairfield = Ripara Campo +ability.statusfield = Campo di Stato +ability.unitspawn = {0} Fabbrica +ability.shieldregenfield = Campo di Rigenerazione Scudo +ability.movelightning = Fulmini nel Movimento bar.drilltierreq = Miglior Trivella Richiesta -bar.noresources = Missing Resources -bar.corereq = Core Base Required +bar.noresources = Risorse Mancanti +bar.corereq = Nucleo Richiesto bar.drillspeed = Velocità Scavo: {0}/s bar.pumpspeed = Velocità di Pompaggio: {0}/s bar.efficiency = Efficienza: {0}% @@ -659,11 +715,11 @@ bar.powerbalance = Energia: {0}/s bar.powerstored = Immagazzinata: {0}/{1} bar.poweramount = Energia: {0} bar.poweroutput = Energia in Uscita: {0} -bar.powerlines = Connections: {0}/{1} +bar.powerlines = Connessioni: {0}/{1} bar.items = Oggetti: {0} bar.capacity = Capacità: {0} bar.unitcap = {0} {1}/{2} -bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled] +bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unità disabilitata] bar.liquid = Liquido bar.heat = Calore bar.power = Energia @@ -671,47 +727,50 @@ bar.progress = Progresso Costruzione bar.input = Entrata bar.output = Uscita -units.processorcontrol = [lightgray]Processor Controlled +units.processorcontrol = [lightgray]Controllato dal Processore bullet.damage = [stat]{0}[lightgray] danno bullet.splashdamage = [stat]{0}[lightgray] danno ad area ~[stat] {1}[lightgray] blocchi bullet.incendiary = [stat]incendiario +bullet.sapping = [stat]indebolente bullet.homing = [stat]autoguidato bullet.shock = [stat]stordente bullet.frag = [stat]a frammentazione bullet.knockback = [stat]{0}[lightgray] contraccolpo -bullet.pierce = [stat]{0}[lightgray]x pierce -bullet.infinitepierce = [stat]pierce +bullet.pierce = [stat]{0}[lightgray]x perforazione +bullet.infinitepierce = [stat]perforazione +bullet.healpercent = [stat]{0}[lightgray]% guarigione bullet.freezing = [stat]congelante bullet.tarred = [stat]viscoso bullet.multiplier = [stat]{0}[lightgray]x moltiplicatore munizioni bullet.reload = [stat]{0}[lightgray]x ricarica unit.blocks = blocchi -unit.blockssquared = blocks² -unit.powersecond = unità energia/s +unit.blockssquared = blocchi² +unit.powersecond = unità energetica/s unit.liquidsecond = unità liquide/s unit.itemssecond = oggetti/s unit.liquidunits = unità liquidi -unit.powerunits = unità energia +unit.powerunits = unità energetica unit.degrees = gradi unit.seconds = secondi -unit.minutes = mins +unit.minutes = minuti unit.persecond = /s unit.perminute = /min unit.timesspeed = x velocità unit.percent = % -unit.shieldhealth = shield health +unit.shieldhealth = salute scudo unit.items = oggetti unit.thousands = k unit.millions = mln -unit.billions = b +unit.billions = mld +category.purpose = Scopo category.general = Generali category.power = Energia category.liquids = Liquidi category.items = Oggetti category.crafting = Produzione -category.function = Function +category.function = Funzione category.optional = Miglioramenti Opzionali setting.landscape.name = Visuale Orizontale setting.shadows.name = Ombre @@ -719,8 +778,9 @@ setting.blockreplace.name = Suggerimento Blocchi Automatico setting.linear.name = Filtro Lineare setting.hints.name = Suggerimenti setting.flow.name = Visualizza Portata Nastri/Condotti +setting.backgroundpause.name = Metti in pausa quando in background setting.buildautopause.name = Pausa Automatica nella Costruzione -setting.animatedwater.name = Fluidi Animati +setting.animatedwater.name = Superfici Animate setting.animatedshields.name = Scudi Animati setting.antialias.name = Antialias[lightgray] (richiede riavvio)[] setting.playerindicators.name = Indicatori Giocatori @@ -747,16 +807,15 @@ setting.conveyorpathfinding.name = Posizionamento Nastri Trasportatori Intellige setting.sensitivity.name = Sensibilità del Controller setting.saveinterval.name = Intervallo di Salvataggio Automatico setting.seconds = {0} secondi -setting.blockselecttimeout.name = Tempo di Selezione del Blocco setting.milliseconds = {0} millisecondi setting.fullscreen.name = Schermo Intero setting.borderlesswindow.name = Finestra Senza Bordi[lightgray] (potrebbe richiedere il riavvio) setting.fps.name = Mostra FPS e Ping -setting.smoothcamera.name = Smooth Camera +setting.smoothcamera.name = Inquadratura Fluida setting.vsync.name = VSync setting.pixelate.name = Effetto Pixel[lightgray] (disabilita le animazioni) setting.minimap.name = Mostra Minimappa -setting.coreitems.name = Display Core Items (WIP) +setting.coreitems.name = Visualizza Oggetti nel Nucleo setting.position.name = Mostra Posizione Giocatori setting.musicvol.name = Volume Musica setting.atmosphere.name = Mostra Atmosfera Pianeta @@ -782,14 +841,14 @@ keybinds.mobile = [scarlet]La maggior parte dei controlli qui non sono funzionan category.general.name = Generale category.view.name = Visualizzazione category.multiplayer.name = Multigiocatore -category.blocks.name = Block Select +category.blocks.name = Seleziona Blocco command.attack = Attacca command.rally = Guardia command.retreat = Ritirata -command.idle = Idle +command.idle = Inattivo placement.blockselectkeys = \n[lightgray]Tasto: [{0}, -keybind.respawn.name = Respawn -keybind.control.name = Control Unit +keybind.respawn.name = Rigenerati +keybind.control.name = Controlla Unità keybind.clear_building.name = Pulisci Costruzione keybind.press = Premi un tasto... keybind.press.axis = Premi un'asse o un tasto... @@ -799,7 +858,7 @@ keybind.toggle_block_status.name = Attiva/Disattiva Stato Blocchi keybind.move_x.name = Muovi Orizzontalmente keybind.move_y.name = Muovi Verticalmente keybind.mouse_move.name = Segui il Mouse -keybind.pan.name = Pan View +keybind.pan.name = Vista Panoramica keybind.boost.name = Scatto keybind.schematic_select.name = Seleziona Regione keybind.schematic_menu.name = Menu Schematica @@ -827,15 +886,17 @@ keybind.diagonal_placement.name = Posiziona Diagonalmente keybind.pick.name = Scegli Blocco keybind.break_block.name = Rompi Blocco keybind.deselect.name = Deseleziona -keybind.pickupCargo.name = Pickup Cargo -keybind.dropCargo.name = Drop Cargo -keybind.command.name = Command +keybind.pickupCargo.name = Raccogli Carico +keybind.dropCargo.name = Rilascia Carico +keybind.command.name = Comanda keybind.shoot.name = Spara keybind.zoom.name = Zoom keybind.menu.name = Menu keybind.pause.name = Pausa keybind.pause_building.name = Interrompi/Riprendi Costruzione keybind.minimap.name = Minimappa +keybind.planet_map.name = Mappa Pianeta +keybind.research.name = Albero Scoperte keybind.chat.name = Chat keybind.player_list.name = Lista dei Giocatori keybind.console.name = Console @@ -861,14 +922,14 @@ mode.custom = Regole Personalizzate rules.infiniteresources = Risorse Infinite rules.reactorexplosions = Esplosioni Reattore -rules.schematic = Schematics Allowed +rules.schematic = Schematiche Consentite rules.wavetimer = Timer Ondate rules.waves = Ondate rules.attack = Modalità Attacco -rules.buildai = AI Building +rules.buildai = AI Costruzioni rules.enemyCheat = Risorse AI Infinite rules.blockhealthmultiplier = Moltiplicatore Danno Blocco -rules.blockdamagemultiplier = Block Damage Multiplier +rules.blockdamagemultiplier = Moltiplicatore Danno Blocco rules.unitbuildspeedmultiplier = Moltiplicatore Velocità Costruzione Unità rules.unithealthmultiplier = Moltiplicatore Vita Unità rules.unitdamagemultiplier = Moltiplicatore Danno Unità @@ -879,26 +940,27 @@ rules.buildspeedmultiplier = Moltiplicatore Velocità Costruzione rules.deconstructrefundmultiplier = Moltiplicatore Rimborso di Smantellamento rules.waitForWaveToEnd = Le ondate aspettano fino a quando l'ondata precedente finisce rules.dropzoneradius = Raggio di Generazione:[lightgray] (blocchi) -rules.unitammo = Units Require Ammo +rules.unitammo = Unità Richiedono Munizioni rules.title.waves = Ondate rules.title.resourcesbuilding = Risorse e Costruzioni rules.title.enemy = Nemici rules.title.unit = Unità rules.title.experimental = Sperimentale -rules.title.environment = Environment +rules.title.environment = Ambiente rules.lighting = Illuminazione -rules.enemyLights = Enemy Lights -rules.fire = Fire -rules.explosions = Block/Unit Explosion Damage +rules.enemyLights = Illuminazione Nemica +rules.fire = Fuoco +rules.explosions = Danno da Esplosione Blocchi/Unità rules.ambientlight = Illuminazione\nAmbientale -rules.weather = Weather -rules.weather.frequency = Frequency: -rules.weather.duration = Duration: +rules.weather = Meteo +rules.weather.frequency = Frequenza: +rules.weather.duration = Durata: content.item.name = Oggetti content.liquid.name = Liquidi content.unit.name = Unità content.block.name = Blocchi +content.sector.name = Settori item.copper.name = Rame item.lead.name = Piombo @@ -921,13 +983,13 @@ liquid.slag.name = Scoria liquid.oil.name = Petrolio liquid.cryofluid.name = Criofluido -unit.dagger.name = Drone Pugnalatore +unit.dagger.name = Dagger unit.mace.name = Mace -unit.fortress.name = Fortezza +unit.fortress.name = Fortress unit.nova.name = Nova unit.pulsar.name = Pulsar unit.quasar.name = Quasar -unit.crawler.name = Strisciatore +unit.crawler.name = Crawler unit.atrax.name = Atrax unit.spiroct.name = Spiroct unit.arkyid.name = Arkyid @@ -955,29 +1017,30 @@ unit.reign.name = Reign unit.vela.name = Vela unit.corvus.name = Corvus -block.resupply-point.name = Resupply Point -block.parallax.name = Parallax +block.resupply-point.name = Rifornitore +block.parallax.name = Parallasse block.cliff.name = Scogliera block.sand-boulder.name = Masso di Sabbia +block.basalt-boulder.name = Masso di Basalto block.grass.name = Erba block.slag.name = Scoria -block.space.name = Space +block.space.name = Spazio block.salt.name = Sale -block.salt-wall.name = Salt Wall +block.salt-wall.name = Muro di Sale block.pebbles.name = Ciottoli block.tendrils.name = Viticci -block.sand-wall.name = Sand Wall +block.sand-wall.name = Muro Di Sabbia block.spore-pine.name = Pino di Spore -block.spore-wall.name = Spore Wall -block.boulder.name = Boulder -block.snow-boulder.name = Snow Boulder +block.spore-wall.name = Muro di Spore +block.boulder.name = Masso +block.snow-boulder.name = Masso Innevato block.snow-pine.name = Pino Innevato block.shale.name = Scisto block.shale-boulder.name = Masso di Scisto block.moss.name = Muschio block.shrubs.name = Arbusti block.spore-moss.name = Muschio di Spore -block.shale-wall.name = Shale Wall +block.shale-wall.name = Muro di Scisto block.scrap-wall.name = Muro di Rottami block.scrap-wall-large.name = Muro di Rottami Grande block.scrap-wall-huge.name = Muro di Rottami Enorme @@ -1006,17 +1069,17 @@ block.sand-water.name = Acqua Sabbiosa block.darksand-water.name = Acqua Sabbiosa Scura block.char.name = Carbone block.dacite.name = Dacite -block.dacite-wall.name = Dacite Wall -block.dacite-boulder.name = Dacite Boulder +block.dacite-wall.name = Muro di Dacite +block.dacite-boulder.name = Masso di Dacite block.ice-snow.name = Neve Ghiacciata -block.stone-wall.name = Stone Wall -block.ice-wall.name = Ice Wall -block.snow-wall.name = Snow Wall -block.dune-wall.name = Dune Wall +block.stone-wall.name = Muro di Pietra +block.ice-wall.name = Muro di Ghiaccio +block.snow-wall.name = Muro di Neve +block.dune-wall.name = Duna block.pine.name = Pino -block.dirt.name = Dirt -block.dirt-wall.name = Dirt Wall -block.mud.name = Mud +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.spore-cluster.name = Agglomerato di Spore @@ -1032,7 +1095,7 @@ block.dark-panel-4.name = Pannello Scuro 4 block.dark-panel-5.name = Pannello Scuro 5 block.dark-panel-6.name = Pannello Scuro 6 block.dark-metal.name = Metallo Scuro -block.basalt.name = Basalt +block.basalt.name = Basalto block.hotrock.name = Roccia Bollente block.magmarock.name = Roccia Magmatica block.copper-wall.name = Muro di Rame @@ -1056,7 +1119,6 @@ block.conveyor.name = Nastro Trasportatore block.titanium-conveyor.name = Nastro di Titanio block.plastanium-conveyor.name = Nastro di Plastanio block.armored-conveyor.name = Nastro Corazzato -block.armored-conveyor.description = Trasporta gli oggetti alla stessa velocità del nastro di titanio, ma è più resistente. Accetta input dai lati solo da altri nastri. block.junction.name = Incrocio block.router.name = Distributore block.distributor.name = Distributore Grande @@ -1064,13 +1126,12 @@ block.sorter.name = Filtro block.inverted-sorter.name = Filtro Inverso block.message.name = Messaggio block.illuminator.name = Lanterna -block.illuminator.description = Una piccola, compatta sorgente di luce. Richiede energia per funzionare. block.overflow-gate.name = Separatore per Eccesso block.underflow-gate.name = Separatore per Eccesso Inverso block.silicon-smelter.name = Fonderia block.phase-weaver.name = Tessitore di Fase block.pulverizer.name = Polverizzatore -block.cryofluid-mixer.name = Miscelatore di Liquidi +block.cryofluid-mixer.name = Miscelatore di Criofluido block.melter.name = Fonditore block.incinerator.name = Inceneritore block.spore-press.name = Pressa di Spore @@ -1142,33 +1203,38 @@ block.arc.name = Arco Elettrico block.rtg-generator.name = Generatore RTG block.spectre.name = Spettro block.meltdown.name = Fusione -block.foreshadow.name = Foreshadow +block.foreshadow.name = Ombratore block.container.name = Contenitore block.launch-pad.name = Ascensore Spaziale block.launch-pad-large.name = Ascensore Spaziale Avanzato -block.segment.name = Segment -block.command-center.name = Command Center -block.ground-factory.name = Ground Factory -block.air-factory.name = Air Factory -block.naval-factory.name = Naval Factory -block.additive-reconstructor.name = Additive Reconstructor -block.multiplicative-reconstructor.name = Multiplicative Reconstructor -block.exponential-reconstructor.name = Exponential Reconstructor -block.tetrative-reconstructor.name = Tetrative Reconstructor -block.payload-conveyor.name = Mass Conveyor -block.payload-router.name = Payload Router -block.disassembler.name = Disassembler -block.silicon-crucible.name = Silicon Crucible +block.segment.name = Frazionatore +block.command-center.name = Centro di Controllo +block.ground-factory.name = Fabbrica Terrena +block.air-factory.name = Fabbrica Aerea +block.naval-factory.name = Fabbrica Navale +block.additive-reconstructor.name = Ricostruttore Additivo +block.multiplicative-reconstructor.name = Ricostruttore Moltiplicativo +block.exponential-reconstructor.name = Ricostruttore Esponenziale +block.tetrative-reconstructor.name = Ricostruttore Tetrativo +block.payload-conveyor.name = Trasportatore di Massa +block.payload-router.name = Distributore di Carico +block.disassembler.name = Disassemblatore +block.silicon-crucible.name = Fornace di Silicio block.overdrive-dome.name = Overdrive Dome +#experimental, may be removed +block.block-forge.name = Forgia per Blocchi +block.block-loader.name = Caricatore per Blocchi +block.block-unloader.name = Scaricatore per Blocchi +block.interplanetary-accelerator.name = Acceleratore Interplanetare -block.switch.name = Switch -block.micro-processor.name = Micro Processor -block.logic-processor.name = Logic Processor -block.hyper-processor.name = Hyper Processor -block.logic-display.name = Logic Display -block.large-logic-display.name = Large Logic Display -block.memory-cell.name = Memory Cell -block.memory-bank.name = Memory Bank +block.switch.name = Interruttore +block.micro-processor.name = Micro Processore +block.logic-processor.name = Processore Logico +block.hyper-processor.name = Super Processore +block.logic-display.name = Display Logico +block.large-logic-display.name = Display Logico Grande +block.memory-cell.name = Cella di Memoria +block.memory-bank.name = Banca di Memoria team.blue.name = blu team.crux.name = rosso @@ -1178,158 +1244,244 @@ team.derelict.name = abbandonato team.green.name = verde team.purple.name = viola -tutorial.next = [lightgray] -tutorial.intro = Sei entrato nel[scarlet] Tutorial di Mindustry.[]\nUsa[accent] [[WASD][] per muoverti.\n[accent]Scorri[] per eseguire lo zoom.\nInizia[accent] minando il rame[]. Per farlo, posizionati sulla vena di rame vicina al tuo Nucleo e clicca su di essa.\n\n[accent]{0}/{1} rame -tutorial.intro.mobile = Sei entrato nel[scarlet] Tutorial di Mindustry.[]\nScorri sullo schermo per muoverti.\n[accent]Avvicina due dita[] per eseguire lo zoom in/out.\nInizia [accent] scavando del rame[]. Clicca un minerale di rame vicino al tuo Nucleo per farlo.\n\n[accent]{0}/{1} rame -tutorial.drill = Ora crea una trivella.\n[accent]Le trivelle[] scavano da sole e sono più efficienti. Piazzane una su un minerale di rame. -tutorial.drill.mobile = Ora crea una trivella.\n[accent]Le trivelle[] scavano da sole e sono più efficienti.\nTocca la scheda della trivella in basso a destra.\nSeleziona la [accent]Trivella Meccanica[].\nPiazzala su una vena di rame toccando, quindi premi il [accent]segno di spunta[] in basso per confermare la selezione.\nCon il tasto [accent]X[] puoi annullare il posizionamento. -tutorial.blockinfo = Ogni blocco ha statistiche diverse. Alcuni minerali richiedono trivelle specifiche.\nPer controllare le informazioni e le statistiche di un blocco, [accent] tocca "?" mentre lo selezioni nel database.[]\n\n[accent]Accedi ora alle statistiche della trivella meccanica.[] -tutorial.conveyor = [accent]I nastri trasportatori []sono usati per trasportare oggetti al Nucleo.\nCrea una linea di nastri dalla trivella al Nucleo. -tutorial.conveyor.mobile = [accent]I nastri trasportatori[] sono usati per trasportare oggetti nel Nucleo.\nCrea una linea di nastri trasportatori dalla trivella al Nucleo.\n[accent]Piazzali in linea tenendo premuto per qualche secondo e trascinando il dito in una direzione.\n\n[accent]Piazza 2 nastri trasportatori con lo strumento linea, quindi trasporta un oggetto fino al Nucleo. -tutorial.turret = Costruisci delle torrette per respingere il nemico[lightgray][].\nCostruisci una torretta Duo vicino alla tua base. -tutorial.drillturret = La Torretta Duo richiede[accent] munizioni di rame[] per sparare.\nPosiziona una trivella e collega un nastro alla torretta per rifornirla di munizioni con il rame estratto. -tutorial.pause = Durante la battaglia puoi[accent] mettere in pausa il gioco.[]\nPuoi disporre gli edifici mentre il gioco è in pausa.\n\nPer mettere in pausa, premi [accent]spazio[]. -tutorial.pause.mobile = Durante la battaglia puoi[accent] mettere in pausa il gioco.[]\nPuoi disporre gli edifici mentre il gioco è in pausa.\n\nPer mettere in pausa, premi il bottone in alto a sinistra. -tutorial.unpause = Ora premi di nuovo spazio per annullare la pausa. -tutorial.unpause.mobile = Ora premilo di nuovo per annullare la pausa. -tutorial.breaking = I blocchi spesso devono essere distrutti.\n[accent]Tieni premuto il tasto destro del mouse []per distruggere tutti i blocchi in una selezione.[]\n[accent]Distruggi tutti i blocchi di scarto a sinistra del tuo Nucleo usando la selezione dell'area. -tutorial.breaking.mobile = I blocchi spesso devono essere distrutti.\n[accent]Seleziona la modalità di decostruzione[], quindi tocca un blocco per iniziare a smantellarlo.\nDistruggi un'area tenendo premuto il dito per alcuni secondi[] e trascinando in una direzione.\nPremi il pulsante con il segno di spunta per confermare la rimozione.\n\n[accent]Distruggi tutti i blocchi di scarto a sinistra del tuo Nucleo usando la selezione dell'area. -tutorial.withdraw = In alcune situazioni, è necessario prendere gli oggetti direttamente dai blocchi.\nPer fare ciò, [accent]tocca un blocco []con oggetti al suo interno, quindi[accent] tocca l'oggetto []nell'inventario.\nPuoi prelevare più oggetti insieme[accent]tenendo premuto il tasto sinistro del mouse[].\n[accent]Preleva un po' di rame dal Nucleo.[] -tutorial.deposit = Deposita tutti gli oggetti che trasporti trascinandoli dalla tua nave al blocco di destinazione.\n[accent]Rimetti il rame nel Nucleo. [] -tutorial.waves = [lightgray]Il nemico si avvicina.\nDifendi il tuo Nucleo per 2 ondate. Costruisci più torrette. Puoi sparare tenendo premuto il tasto sinistro del mouse. -tutorial.waves.mobile = [lightgray]Il nemico si avvicina.\n\nDifendi il Nucleo per 2 ondate. La tua nave sparerà automaticamente contro i nemici.\nCostruisci più torrette. -tutorial.launch = Una volta raggiunta un'ondata specifica, sarai in grado di [accent]decollare con il Nucleo[], lasciando la zona e abbandonando le tue difese e le tue strutture\nOtterrai [accent]tutte le risorse nel tuo Nucleo[] e potrai quindi usarle per ricercare nuove tecnologie.\n\n[accent]Decolla e conferma per terminare il tutorial. +hint.skip = Salta +hint.desktopMove = Usa [accent][[WASD][] per muoverti. +hint.zoom = [accent]Scorri[] per ingrandire/rimpicciolire. +hint.mine = Spostati vicino al \uf8c4 rame e [accent]cliccaci[] sopra per scavarlo manualmente. +hint.desktopShoot = [accent][[Tasto sinistro][] per sparare. +hint.depositItems = Per scaricare degli oggetti, trascinali dalla tua navicella al nucleo. +hint.respawn = Per rigenerarti come navicella, premi [accent][[V][]. +hint.respawn.mobile = Sei passato al controllo di un'unità/struttura. Per rigenerarti come navicella, [accent]premi l'avatar in alto a sinistra[]. +hint.desktopPause = Premi [accent][[Spazio][] per mettere in pausa o riprendere la partita. +hint.placeDrill = Accedi alla sezione \ue85e [accent]Trivelle[] dal menu in basso a destra, seleziona la \uf870 [accent]Trivella[] e clicca sulla vena di rame per costruirla. +hint.placeDrill.mobile = Accedi alla sezione \ue85e[accent]Trivelle[] dal menu in basso a destra, seleziona la \uf870 [accent]Trivella[] e fai un tap sulla vena di rame per costruirla.\n\nPremi \ue800 in basso a destra per confermare. +hint.placeConveyor = I nastri trasportatori muovono gli oggetti dalle trivelle ad altri blocchi. Seleziona un \uf896 [accent]Nastro Trasportatore[] dal menu \ue814 [accent]Distribuzione[].\n\nClicca e trascina il cursore per disporre più nastri contemporaneamente.\n[accent]Scorri[] per ruotarli. +hint.placeConveyor.mobile = I nastri trasportatori muovono gli oggetti dalle trivelle ad altri blocchi. Seleziona un \uf896 [accent]Nastro Trasportatore[] dal menu \ue814 [accent]Distribuzione[].\n\nTieni premuto il dito per un secondo e trascinalo per disporre più nastri contemporaneamente. +hint.placeTurret = Posiziona le \uf861 [accent]Torrette[] per difendere la tua base dai nemici.\n\nLe torrette hanno bisogno delle munizioni - in questo caso, \uf838 rame.\nUtilizza i nastri trasportatori e le trivelle per rifornirle. +hint.breaking = [accent]Click Destro[] e trascina il mouse per selezionare i blocchi da distruggere. +hint.breaking.mobile = Attiva il \ue817 [accent]martello[] in basso a destra e tocca i blocchi da distruggere.\n\nTieni premuto il dito per un secondo e trascinalo per creare selezionare più blocchi contemporaneamente. +hint.research = Clicca sul tasto \ue875 [accent]Albero Scoperte[] per scoprire nuove tecnologie. +hint.research.mobile = Clicca sul tasto \ue875 [accent]Albero Scoperte[] nel \ue88c [accent]Menu[] per scoprire nuove tecnologie. +hint.unitControl = Tieni premuto [accent][[L-ctrl][] e [accent]Tasto Sinistro[] per controllare le tue unità o le tue torrette. +hint.unitControl.mobile = [accent][Doppio tap[] per controllare le tue unità o le tue torrette. +hint.launch = Una volta raccolte abbastanza risorse, puoi [accent]Lanciarti[] su un settore vicino a te selezionandolo dalla \ue827 [accent]Mappa[] in basso a destra. +hint.launch.mobile = Una volta raccolte abbastanza risorse, puoi [accent]Lanciarti[] su un settore vicino a te selezionandolo dalla \ue827 [accent]Mappa[] nel \ue88c [accent]Menu[]. +hint.schematicSelect = Tieni premuto [accent][[F][] e trascina il cursore per selezionare i blocchi da copiare e incollare.\n\n[accent][[Tasto Centrale][] per copiare solamente un blocco. +hint.conveyorPathfind = Tieni premuto [accent][[L-Ctrl][] mentre posizioni i nastri trasportatori per fargli seguire il percorso migliore automaticamente. +hint.conveyorPathfind.mobile = Abilita \ue844 [accent]modalità diagonale[] e trascina i nastri trasportatori per fargli seguire il percorso migliore automaticamente. +hint.boost = Tieni premuto [accent][[L-Shift][] per volare sopra gli ostacoli con l'unità che stai controllando.\n\nNon tutte le unità possono volare. +hint.command = Premi [accent][[G][] per formare un gruppo con le unità dello [accent]stesso tipo[] vicine e comandarlo.\n\nPer comandare le unitù di terra devi prima controllare un'altra unità di terra. +hint.command.mobile = [accent][[Doppio tap][] sulla tua unità per formare un gruppo con le unità vicine e comandarlo. +hint.payloadPickup = Premi [accent][[[] per caricare piccoli blocchi o unità. +hint.payloadPickup.mobile = [accent]Tieni premuto[] su un piccolo blocco o un'unità per caricarla. +hint.payloadDrop = Premi [accent]][] per rilasciare il carico. +hint.payloadDrop.mobile = [accent]Tieni premuto[] su un posto libero per rilasciare il carico lì. +hint.waveFire = Le torrette a [accent]Getto[] che utilizzano l'acqua come munizione spegneranno automaticamente gli incendi nelle vicinanze. +hint.generator = Il \uf879 [accent]Generatore a Combustibile[] brucia carbone per produrre energia che trasmette ai blocchi adiacenti.\n\nIl raggio di trasmissione può essere esteso con i \uf87f [accent]Nodi Energetici[]. +hint.guardian = Le unità [accent]Guardian[] sono corazzate. Le munizioni deboli come il [accent]Rame[] e il [accent]Piombo[] sono [scarlet]poco efficaci[].\n\nUsa torrette più potenti o \uf835 [accent]Grafite[] \uf861Torretta Duo/\uf859Cannone Leggero per abbattere i Guardians. -item.copper.description = Un materiale utile, usato dappertutto. -item.lead.description = Un materiale di base, molto usato nei blocchi per il trasporto. -item.metaglass.description = Un durissimo composto di vetro. Ampiamente usato per trasporto di liquidi ed immagazzinamento. -item.graphite.description = Carbone mineralizzato, utilizzato per munizioni e componenti elettrici. -item.sand.description = Un materiale di base che viene usato molto nei processi di fusione, sia come lega che come reagente. -item.coal.description = Un combustibile comune facilmente ottenibile. -item.titanium.description = Un raro metallo incredibilmente leggero usato ampiamente nella costruzione di trasporti, trivelle e navi. -item.thorium.description = Un materiale denso e radioattivo, utilizzato nella costruzione di strutture e come carburante del reattore nucleare. -item.scrap.description = Resti rimanenti di vecchie strutture ed unità. Contiene tracce di molti metalli diversi. -item.silicon.description = Un semiconduttore molto utile che viene utilizzato nei pannelli solari e nei macchinari elettronici. -item.plastanium.description = Un materiale leggero e duttile, utilizzato nelle navi avanzate e come munizione. -item.phase-fabric.description = Una sostanza quasi senza peso utilizzata nell'elettronica avanzata e nella tecnologia autoriparante. -item.surge-alloy.description = Una lega avanzata con proprietà elettriche uniche. +item.copper.description = Usato in molti tipi di costruzioni e munizioni. +item.copper.details = Rame. Abbondante su Serpulo. Strutturalmente debole se non rinforzato. +item.lead.description = Usato nel trasporto di liquidi e strutture elettriche. +item.lead.details = Denso. Inerte. usato molto nelle batterie.\nNota: probabilmente tossico per le forme di vita qui. Non che ne siano rimaste molte. +item.metaglass.description = Usato nelle strutture per il trasporto/immagazzinamento dei liquidi. +item.graphite.description = Usato nei componenti elettrici e come munizione per le torrette. +item.sand.description = Usata per la produzione di altri materiali raffinati. +item.coal.description = Usato per la produzione di combustibili e materiali più raffinati. +item.coal.details = Sembra siano resti organici fossilizzati di piante, formato prima dell'evento di semina. +item.titanium.description = Usato nelle strutture per il trasporto dei liquidi e per le trivelle. +item.thorium.description = Utilizzato per la costruzione delle strutture più robuste e come combustibile nucleare. +item.scrap.description = Utilizzato nel fonditore e nel polverizzatore per essere raffinato in altri materiali. +item.scrap.details = Detriti di vecchie strutture e unità abbandonate. +item.silicon.description = Usato nei pannelli solari, circuiti complessi e come munizione per certe torrette. +item.plastanium.description = Utilizzato per le unità avanzate e come munizione. +item.phase-fabric.description = Usato nei circuiti avanzati e per le strutture autoriparanti. +item.surge-alloy.description = Usato come munizione per torrette avanzate. item.spore-pod.description = Utilizzato per la conversione in petrolio, esplosivi e carburante. -item.blast-compound.description = Un composto altamente volatile, utilizzato nella produzione di bombe ed esplosivi. Può essere utilizzato come combustibile anche se non è consigliabile. -item.pyratite.description = Una sostanza molto infiammabile che viene utilizzata nelle armi da fuoco. -liquid.water.description = Il liquido più utile. Comunemente usato per il raffreddamento di macchinari ed il trattamento dei rifiuti. -liquid.slag.description = Diversi tipi di metalli fusi, mescolati insieme. Può essere separato nei suoi minerali costituenti o spruzzato sulle unità nemiche come un'arma. -liquid.oil.description = Un liquido usato nella produzione avanzata.\nPuò essere convertito in carbone per uso combustibile o spruzzato ed incendiato come arma. -liquid.cryofluid.description = Un liquido inerte e non corrosivo creato da acqua e titanio.\nÈ il liquido più efficiente per il raffreddamento. +item.spore-pod.details = Spore. Probabilmente una forma di vita sintetica. Emettono gas tossici per altre forme di vita. Estremamente invasive. In certe condizioni sono altamente infiammabili. +item.blast-compound.description = Usato per bombe e munizioni esplosive. +item.pyratite.description = Usata per certe munizioni incendiarie e nei generatori a combustibile. -block.message.description = Memorizza un messaggio. Utilizzato per la comunicazione tra alleati. -block.graphite-press.description = Comprime pezzi di carbone in fogli di grafite puri. -block.multi-press.description = Una versione aggiornata della pressa per grafite. Impiega acqua ed energia per elaborare il carbone in modo rapido ed efficiente. -block.silicon-smelter.description = Fonde sabbia e carbone riscaldati per ottenere silicio. -block.kiln.description = Fonde la sabbia ed il piombo in vetro metallico. Richiede piccole quantità di energia. +liquid.water.description = Usata per raffreddare i macchinari e per il trattamento dei rifiuti. +liquid.slag.description = Raffinata nei separatori in diversi metalli o spruzzata sui nemici come munizione. +liquid.oil.description = Usato nella produzione di materiali avanzati e come munizione incendiaria. +liquid.cryofluid.description = Usato come refrigerante in reattori, torrette e macchinari. + +block.resupply-point.description = Rifornisce le unità vicine con le munizioni. Non è compatibile con le unità che richiedono energia. +block.armored-conveyor.description = Trasporta gli oggetti. Non accetta oggetti dai lati. +block.illuminator.description = Emette luce. +block.message.description = Memorizza un messaggio per le comunicazioni tra alleati. +block.graphite-press.description = Comprime il carbone in grafite. +block.multi-press.description = Comprime il carbone in grafite. Necessite di acqua come refrigerante. +block.silicon-smelter.description = Raffina il silicio da sabbia e carbone. +block.kiln.description = Fonde sabbia e piombo in vetro metallico. block.plastanium-compressor.description = Produce plastanio da petrolio e titanio. -block.phase-weaver.description = Produce tessuto di fase da torio radioattivo ed elevate quantità di sabbia. -block.alloy-smelter.description = Produce leghe di sovratensione da titanio, piombo, silicio e rame. -block.cryofluid-mixer.description = Combina acqua e titanio in criofluido che è molto più efficiente per il raffreddamento. -block.blast-mixer.description = Frantuma e mescola le spore con la pirite per produrre composto esplosivo. -block.pyratite-mixer.description = Mescola carbone, piombo e sabbia in pirite altamente infiammabile. -block.melter.description = Riscalda la pietra a temperature molto elevate per ottenere scoria liquida. -block.separator.description = Sottopone le scoria a centrifugazione per ottenere i vari minerali contenuti. -block.spore-press.description = Comprime le spore in petrolio. -block.pulverizer.description = Polverizza la pietra.\nUtile quando manca la sabbia naturale. -block.coal-centrifuge.description = Solidifica il petrolio in pezzi di carbone. -block.incinerator.description = Elimina qualsiasi oggetto o liquido in eccesso. -block.power-void.description = Elimina tutta l'energia che riceve. Esiste solo nella modalità creativa. -block.power-source.description = Produce energia infinita. Esiste solo nella modalità creativa. -block.item-source.description = Produce oggetti infiniti. Esiste solo nella modalità creativa. -block.item-void.description = Elimina gli oggetti che vi entrano senza bisogno di energia. Esiste solo nella modalità creativa. -block.liquid-source.description = Emette continuamente liquidi. Esiste solo nella modalità creativa. -block.liquid-void.description = Elimina i liquidi in entrata. Esiste solo nella modalità creativa. -block.copper-wall.description = Un blocco difensivo economico.\nUtile per proteggere il Nucleo e le torrette nelle prime ondate. -block.copper-wall-large.description = Un blocco difensivo economico.\nUtile per proteggere il Nucleo e le torrette nelle prime ondate.\nOccupa più blocchi. -block.titanium-wall.description = Un blocco difensivo moderatamente forte.\nFornisce una protezione moderata dai nemici. -block.titanium-wall-large.description = Un blocco difensivo moderatamente forte.\nFornisce una protezione moderata dai nemici.\nOccupa più blocchi -block.plastanium-wall.description = Un tipo speciale di muro che assorbe gli archi elettrici e blocca le connessioni automatiche del nodo d'energia. -block.plastanium-wall-large.description = Un tipo speciale di muro che assorbe gli archi elettrici e blocca le connessioni automatiche dei nodi d'energia.\nSi estende su più blocchi. -block.thorium-wall.description = Un forte blocco difensivo.\nBuona protezione dai nemici. -block.thorium-wall-large.description = Un forte blocco difensivo.\nBuona protezione dai nemici.\nOccupa più blocchi. -block.phase-wall.description = Non è forte come un muro di torio, ma devia i proiettili a meno che non siano troppo potenti. -block.phase-wall-large.description = Non è forte come un muro di torio, ma devia i proiettili a meno che non siano troppo potenti.\nOccupa più blocchi. -block.surge-wall.description = Il blocco difensivo più forte.\nHa una piccola possibilità di innescare un fulmine verso l'attaccante. -block.surge-wall-large.description = Il blocco difensivo più forte.\nHa una piccola possibilità di innescare un fulmine verso l'attaccante.\nOccupa più blocchi. -block.door.description = Una piccola porta che può essere aperta e chiusa toccandola.\nSe aperta, i nemici possono sparare ed attraversare. -block.door-large.description = Una grande porta che può essere aperta e chiusa toccandola.\nSe aperta, i nemici possono sparare ed attraversare.\nOccupa più blocchi. -block.mender.description = Ripara periodicamente blocchi nelle vicinanze.\nUtilizza del silicio per aumentarne portata ed efficienza. -block.mend-projector.description = Ripara periodicamente blocchi nelle vicinanze.\nUtilizza del tessuto di fase per aumentarne portata ed efficienza. -block.overdrive-projector.description = Aumenta la velocità di edifici vicini come trivelle e nastri trasportatori. -block.force-projector.description = Crea un campo di forza esagonale attorno a sé, proteggendo gli edifici e le unità all'interno da danni causati da proiettili. -block.shock-mine.description = Danneggia i nemici che la calpestano. Quasi invisibile al nemico. -block.conveyor.description = Nastro di base. Sposta gli oggetti in avanti e li deposita automaticamente in altri blocchi. È rotabile. -block.titanium-conveyor.description = Nastro avanzato. Sposta gli oggetti più velocemente dei nastri standard. -block.plastanium-conveyor.description = Sposta gli oggetti in lotti.\nAccetta gli oggetti dal retro e li scarica in tre direzioni nella parte anteriore. -block.junction.description = Permette di incrociare nastri che trasportano materiali diversi in posizioni diverse. -block.bridge-conveyor.description = Consente il trasporto di oggetti fino a 3 blocchi ad un altro nastro sopraelevato.\nPuò passare sopra ad altri blocchi od edifici. -block.phase-conveyor.description = Nastro avanzato. Consuma energia per teletrasportare gli oggetti su un altro nastro di fase collegato. -block.sorter.description = Divide gli oggetti. Se l'oggetto corrisponde a quello selezionato, Può passare. Altrimenti viene espulso sui lati. -block.inverted-sorter.description = Elabora gli oggetti come uno filtro standard, ma in uscita dà gli elementi selezionati ai lati. -block.router.description = Accetta gli elementi da una direzione e li emette fino a 3 altre direzioni allo stesso modo. Utile per suddividere i materiali da una fonte a più destinazioni. -block.distributor.description = Un distributore avanzato che divide gli oggetti in altre 7 direzioni allo stesso modo. -block.overflow-gate.description = Distribuisce gli oggetti ai lati se il nastro davanti a sé è saturo. -block.underflow-gate.description = L'opposto di un separatore per eccesso. Distribuisce gli oggetti nel nastro davanti a sé se i nastri a destra e a sinistra sono saturi. -block.mass-driver.description = Ultimo blocco di trasporto di oggetti. Raccoglie diversi oggetti e poi li spara su un'altra lancia materiali a lungo raggio. -block.mechanical-pump.description = Una pompa economica a bassa efficienza, ma nessun consumo di energia. -block.rotary-pump.description = Una pompa avanzata che raddoppia la velocità consumando energia. -block.thermal-pump.description = La pompa migliore. Tre volte più veloce di una pompa meccanica e l'unica pompa in grado di recuperare la lava. -block.conduit.description = Condotto di base. Funziona come un nastro trasportatore, ma per i liquidi. Ideale per estrattori, pompe o altri condotti. -block.pulse-conduit.description = Condotto avanzato. Trasporta più liquido e più velocemente dei condotti standard. -block.plated-conduit.description = Trasferisce i liquidi alla stessa velocità del Condotto a Impulsi, ma è più resistente. Non accetta liquidi dai lati da parte di condotti diversi.\nMeno perdite. -block.liquid-router.description = Accetta i liquidi da una direzione e li emette fino a 3 altre direzioni allo stesso modo. Può anche immagazzinare una certa quantità di liquido. Utile per suddividere i liquidi da una fonte verso più destinazioni. -block.liquid-tank.description = Conserva una grande quantità di liquidi. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali o come protezione per il raffreddamento di blocchi vitali. -block.liquid-junction.description = Permette di incrociare condotti che trasportano liquidi diversi in posizioni diverse. -block.bridge-conduit.description = Consente il trasporto di liquidi fino a 3 blocchi da un altro condotto sopraelevato.\nPuò passare sopra ad altri blocchi od edifici. -block.phase-conduit.description = Condotto avanzato. Consuma energia per teletrasportare i liquidi in un altro condotto di fase collegato. -block.power-node.description = Trasmette energia tra i nodi collegati. È possibile creare fino a quattro collegamenti.\nClicca sul nodo per configurare i collegamenti. -block.power-node-large.description = Ha un raggio maggiore rispetto al Nodo Energetico e si possono creare un massimo di sei collegamenti.\nClicca sul nodo per configurare i collegamenti. -block.surge-tower.description = Un nodo di alimentazione a lungo raggio solo due connessioni disponibili.\nClicca sul nodo per configurare i collegamenti. -block.diode.description = L'energia della batteria può attraversare questo blocco in una sola direzione, ma solo se l'altra parte ha meno energia. -block.battery.description = Accumula energia ogni volta che c'è abbondanza e fornisce energia ogni volta che c'è carenza, purché sia carica. -block.battery-large.description = Immagazzina molta più energia di una normale batteria. -block.combustion-generator.description = Genera energia bruciando combustibile. -block.thermal-generator.description = Genera una grande quantità di energia dalla lava. -block.steam-generator.description = Più efficiente di un generatore a combustione, ma richiede l'aggiunta di acqua. -block.differential-generator.description = Genera grandi quantità di energia. Utilizza la differenza di temperatura tra criofluido e pirite in combustione. -block.rtg-generator.description = Un generatore che sfrutta il calore del decadimento di materiale radioattivo per produrre energia.\nNon richiede raffreddamento ma fornisce meno energia di un reattore al torio. -block.solar-panel.description = Fornisce una piccola quantità di energia dal sole. -block.solar-panel-large.description = Fornisce un'alimentazione migliore rispetto a un pannello solare standard, ma è anche molto più costoso da costruire. -block.thorium-reactor.description = Genera enormi quantità di energia dal torio altamente radioattivo. Richiede un raffreddamento costante. Esploderà violentemente se vengono fornite quantità insufficienti di refrigerante. -block.impact-reactor.description = Un generatore avanzato, in grado di creare enormi quantità di energia alla massima efficienza. Richiede un significativo apporto di energia per avviare il processo. -block.mechanical-drill.description = Una trivella economica. Se posizionata su slot appropriati, estrae minerali a un ritmo lento e costante. -block.pneumatic-drill.description = Una trivella migliorata più veloce ed in grado di elaborare materiali più duri sfruttando la pressione dell'aria. -block.laser-drill.description = Consente di perforare ancora più velocemente attraverso la tecnologia laser, ma richiede energia. Inoltre, con questa trivella è possibile recuperare il torio radioattivo. -block.blast-drill.description = La trivella migliore. Richiede grandi quantità di energia. -block.water-extractor.description = Estrae l'acqua dal terreno. Usalo quando non c'è nessun lago nelle vicinanze. -block.cultivator.description = Coltiva il terreno con acqua per ottenere materia organica. -block.oil-extractor.description = Utilizza grandi quantità di energia per estrarre petrolio dalla sabbia. Usalo quando non c'è una fonte diretta di petrolio nelle vicinanze. -block.core-shard.description = La prima iterazione del Nucleo. Una volta distrutto, tutti i contatti con la regione vengono persi. Non lasciare che questo accada. -block.core-foundation.description = La seconda versione del Nucleo. Meglio corazzato. Immagazzina più risorse. -block.core-nucleus.description = La terza ed ultima versione del Nucleo. Estremamente ben corazzato. Immagazzina enormi quantità di risorse. -block.vault.description = Immagazzina una grande quantità di oggetti. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali. Uno [lightgray]scaricatore[] può essere utilizzato per recuperare elementi dal deposito. -block.container.description = Immagazzina una piccola quantità di oggetti. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali. Uno [lightgray]scaricatore[] può essere utilizzato per recuperare elementi dal contenitore. -block.unloader.description = Scarica gli oggetti da un contenitore, deposito o Nucleo su un nastro trasportatore o direttamente in un blocco adiacente. L'oggetto da scaricare può essere scelto toccando lo scaricatore. -block.launch-pad.description = Lancia oggetti nel tuo Nucleo senza necessità di lasciare la zona. -block.launch-pad-large.description = Una versione migliore dell'Ascensore Spaziale, immagazzina più oggetti. Lancia oggetti più frequentemente. -block.duo.description = Una torretta piccola ed economica. -block.scatter.description = Una torretta antiaerea essenziale. Spara schegge di piombo, rottami o vetro metallico alle unità nemiche. -block.scorch.description = Brucia qualsiasi nemico di terra vicino ad esso. Molto efficace a distanza ravvicinata. -block.hail.description = Una piccola torretta di artiglieria. -block.wave.description = Una torretta a fuoco rapido di medie dimensioni che spara liquidi. -block.lancer.description = Una torretta di medie dimensioni che dopo un breve caricamento spara potenti fasci elettrici. -block.arc.description = Una piccola torretta che spara elettricità in un arco casuale verso il nemico. -block.swarmer.description = Una torretta di medie dimensioni che spara missili esplosivi. -block.salvo.description = Una torretta di medie dimensioni che spara colpi in salve. -block.fuse.description = Una grande torretta a corto raggio che spara tre potenti schegge perforanti. -block.ripple.description = Una grande torretta di artiglieria che spara più colpi contemporaneamente. -block.cyclone.description = Una grande torretta a fuoco rapido. -block.spectre.description = Una grande torretta che spara due potenti proiettili contemporaneamente. -block.meltdown.description = Una grande torretta che spara un potente laser a lungo raggio. -block.repair-point.description = Cura continuamente l'unità danneggiata più vicina. -block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. +block.phase-weaver.description = Sintetizza il tessuto di fase da torio e sabbia. +block.alloy-smelter.description = Fonde titanio, piombo, silicio e rame nella lega di sovratensione. +block.cryofluid-mixer.description = Miscela acqua e polvere di titanio per produrre il criofluido. +block.blast-mixer.description = Produce composto esplosivo dalla pirite e dal baccello di spore. +block.pyratite-mixer.description = Miscela carbone, piombo e sabbia in pirite. +block.melter.description = Fonde i rottami in scorie. +block.separator.description = Raffina le scorie nei minerali che le compongono. +block.spore-press.description = Comprime i baccelli di spore in petrolio. +block.pulverizer.description = Polverizza i rottami in sabbia. +block.coal-centrifuge.description = Trasforma il petrolio in carbone. +block.incinerator.description = Distrugge ogni oggetto o liquido che riceve. +block.power-void.description = Distrugge l'energia in entrata. Disponibile solo nella modalità creativa. +block.power-source.description = Genera energia infinita. Disponibile solo nella modalità creativa. +block.item-source.description = Genera oggetti infiniti. Disponibile solo nella modalità creativa. +block.item-void.description = Distrugge tutti gli oggetti che riceve. Disponibile solo nella modalità creativa. +block.liquid-source.description = Genera liquidi infiniti. Disponibile solo nella modalità creativa. +block.liquid-void.description = Distrugge qualsiasi liquido che riceve. Disponibile solo nella modalità creativa. +block.copper-wall.description = Protegge le strutture dai proiettili nemici. +block.copper-wall-large.description = Protegge le strutture dai proiettili nemici. +block.titanium-wall.description = Protegge le strutture dai proiettili nemici. +block.titanium-wall-large.description = Protegge le strutture dai proiettili nemici. +block.plastanium-wall.description = Protegge le strutture dai proiettili nemici. Assorbe i raggi laser e gli archi elettrici. Absorbs lasers and electric arcs. Blocca le connessioni automatiche dei nodi energetici. +block.plastanium-wall-large.description = Protegge le strutture dai proiettili nemici. Assorbe i raggi laser e gli archi elettrici. Absorbs lasers and electric arcs. Blocca le connessioni automatiche dei nodi energetici. +block.thorium-wall.description = Protegge le strutture dai proiettili nemici. +block.thorium-wall-large.description = Protegge le strutture dai proiettili nemici. +block.phase-wall.description = Protegge le strutture dai proiettili nemici riflettendone la maggirparte all'impatto. +block.phase-wall-large.description = Protegge le strutture dai proiettili nemici riflettendone la maggirparte all'impatto. +block.surge-wall.description = Protegge le strutture dai proiettili nemici rilasciando periodicamente archi elettrici al contatto. +block.surge-wall-large.description = Protegge le strutture dai proiettili nemici rilasciando periodicamente archi elettrici al contatto. +block.door.description = Un muro che può essere aperto o chiuso. +block.door-large.description = Un muro che può essere aperto o chiuso. +block.mender.description = Ripara periodicamente i blocchi nelle sue vicinanze.\nAccetta silicio per aumentare la portata e l'efficienza. +block.mend-projector.description = Ripara periodicamente i blocchi nelle sue vicinanze.\nAccetta tessuto di fase per aumentare la portata e l'efficienza. +block.overdrive-projector.description = Aumenta la velocità delle strutture vicine.\nAccetta tessuto di fase per aumentare la portata e l'efficienza. +block.force-projector.description = Crea un campo di forza esagonale attorno a se proteggendo le strutture e le unità dai proiettili nemici.\nSi surriscalda se subisce troppi colpi. Accetta liquidi refrigeranti per prevenire il surriscaldamento. Il tessuto di fase aumenta la portata dello scudo. +block.shock-mine.description = Rilascia archi elettrici al contatto con un nemico. +block.conveyor.description = Trasporta gli oggetti. +block.titanium-conveyor.description = Trasporta gli oggetti. È più veloce di un nastro trasportatore standard. +block.plastanium-conveyor.description = Trasporta gli oggetti in lotti. Accetta gli oggetti dal retro e li scarica in tre direzioni. Necessita di molteplici punti di carico e scarico per aumentare la portata. +block.junction.description = Funge da ponte tra due nastri trasportatori che si incrociano. +block.bridge-conveyor.description = Trasporta gli oggetti sopra blocchi e strutture. +block.phase-conveyor.description = Trasporta gli oggetti sopra blocchi e strutture istantaneamente. Ha un raggio più ampio rispetto al nastro trasportatore sopraelevato, ma ha bisogno di energia per funzionare. +block.sorter.description = Se un oggetto in ingresso corrisponde al filtro selezionato, passa avanti. Altrimenti l'oggetto viene deviato a destra e sinistra. +block.inverted-sorter.description = Simile al filtro comune ma devia a destra e sinistra gli oggetti se corrispondono al filtro selezionato. +block.router.description = Distribuisce equamente gli oggetti in entrata nelle 3 uscite. +block.router.details = Un male necessario. L'uso dei distributori accanto agli input di produzione non è consigliato poiché verrebbero intasati dall'output. +block.distributor.description = Distribuisce equamente gli oggetti in entrata nelle 7 uscite. +block.overflow-gate.description = Devia gli oggetti a destra e a sinistra solo se l'uscita anteriore è bloccata. Non può essere usato insieme ad altri blocchi per la gestione degli oggetti. +block.underflow-gate.description = L'esatto opposto del separatore per eccesso. Devia gli oggetti verso l'uscita anteriore solo se le uscite laterali sono bloccate. Non può essere usato insieme ad altri blocchi per la gestione degli oggetti. +block.mass-driver.description = Struttura per il trasporto di oggetti a lungo raggio. Immagazzina lotti di oggetti e li spara ad un altro trasportatore di massa. +block.mechanical-pump.description = Pompa liquidi. Non richiede energia. +block.rotary-pump.description = Pompa liquidi. Richiede energia. +block.thermal-pump.description = Pompa liquidi. +block.conduit.description = Trasporta i liquidi. Spesso usato insieme a pompe e altri condotti. +block.pulse-conduit.description = Trasporta i liquidi più velocemente. Ha una capacità maggiore rispetto ai condotti tradizionali. +block.plated-conduit.description = Trasporta i liquidi. Non accetta liquidi dai lati. Non spande. +block.liquid-router.description = Accetta liquidi da un lato e li divide equamente nelle 3 uscite. Può anche immagazzinare una piccola quantità di liquido. +block.liquid-tank.description = Immagazzina una grande quantità di liquido. Emette il liquido che contiene da tutti i lati, simile ad un distributore di liquidi. +block.liquid-junction.description = Funge da ponte tra due condotti che si incrociano. +block.bridge-conduit.description = Trasporta i liquidi sopra blocchi e strutture. +block.phase-conduit.description = Trasporta i liquidi sopra blocchi e strutture istantaneamente. Ha un raggio più ampio rispetto al condotto sopraelevato, ma ha bisogno di energia per funzionare. +block.power-node.description = Trasmette l'energia ai nodi connessi. Il nodo riceve e trasmette l'energia a tutti i blocchi adiacenti. +block.power-node-large.description = Un nodo energetico avanzato con un raggio maggiore. +block.surge-tower.description = Un nodo energetico a lungo raggio ma con poche connessioni disponibili. +block.diode.description = Dirige l'energia delle batterie in una direzione solo se dal lato opposto l'energia immagazzinata è minore. +block.battery.description = Immagazzina l'energia quando in eccesso. Emette l'energia nei momenti di deficit. +block.battery-large.description = Immagazzina l'energia quando in eccesso. Emette l'energia nei momenti di deficit. Ha una capacità maggiore rispetto le batterie tradizionali. +block.combustion-generator.description = Genera energia bruciando combustibili come il carbone. +block.thermal-generator.description = Genera energia se posizionato su luoghi caldi. +block.steam-generator.description = Genera energia bruciando combustibili per trasformare l'acqua in vapore. +block.differential-generator.description = Genera grandi quantità di energia sfruttando la differenza di temperatura tra criofluido e pirite ardente. +block.rtg-generator.description = Sfrutta lentamente il calore dei composti radioattivi in decadimento per produrre energia. +block.solar-panel.description = Genera piccole quantità di energia dal sole. +block.solar-panel-large.description = Genera piccole quantità di energia dal sole. Più efficente del pannello solare tradizionale. +block.thorium-reactor.description = Genera grandi quantità di energia dal torio. Ha bisogno di essere costantemente raffreddato. Esplode violentemente quando il liquido refrigerante non è sufficente a raffreddarlo. +block.impact-reactor.description = Quando alla massima efficienza, genera enormi quantità di energia. Ha bisogno di una discreta quantità di energia per avviare il processo. +block.mechanical-drill.description = Quando posizionata su un minerale, estrae minerali ad un ritmo lento ma costante. Può scavare solo i minerali più teneri. +block.pneumatic-drill.description = Una trivella migliorata capace di estrarre il titanio. Lavora più velocemente di una trivella meccanica. +block.laser-drill.description = Grazie alla tecnologia laser, permette di scavare ancora più velocemente ma deve essere alimentata. È in grado di estrarre il torio. +block.blast-drill.description = La trivella migliore. Richiede grandi quantità di energia per funzionare. +block.water-extractor.description = Estrae l'acqua dal terreno. Utilizzato nei luoghi senza una fonte d'acqua superficiale nelle vicinanze. +block.cultivator.description = Coltiva delle piccole concentrazioni di spore presenti nell'atmosfera in baccelli di spore. +block.cultivator.details = Tecnologia recuperata. Usata per la produzione di enormi quantità di materiale organico il più efficientemente possibile. È probabile che sia il primo incubatore delle spore che ora ricoprono Serpulo. +block.oil-extractor.description = Utilizza grandi quantità di energia, sabbia ed acqua per estrarre il petrolio. +block.core-shard.description = Nucleo della base. Una volta distrutto, il settore è perso. +block.core-shard.details = La prima generazione. Compatto. Autoreplicante. Dotato di propulsori di lancio monouso. Non pensato per viaggi interplanetari. +block.core-foundation.description = Nucleo della base. Corazzato. Immagazzina più risorse del Frammento. +block.core-foundation.details = La seconda generazione. +block.core-nucleus.description = Nucleo della base. Estremamente resistente. Immagazzina enormi quantità di risorse. +block.core-nucleus.details = La terza e ultima generazione. +block.vault.description = Immagazzina grandi quantità di oggetti di ogni tipo. Può essere svuotato con uno scaricatore. +block.container.description = Imagazzina piccole quantità di oggetti di ogni tipo. Può essere svuotato con uno scaricatore. +block.unloader.description = Scarica l'oggetto selezionato dai blocchi adiacenti. +block.launch-pad.description = Lancia lotti di oggetti ai settori selezionati. +block.duo.description = Spara proiettili ai nemici. +block.scatter.description = Spara agglomerati di piombo, rottami o vetro metallico ai nemici aerei. +block.scorch.description = Incenerisce qualsiasi unità terrena nelle vicinanze. Altamente efficace a distanza ravvicinata. +block.hail.description = Spara piccole schegge alle unità terrene su lunghe distanze. +block.wave.description = Spara liquidi ai nemici. Quando alimentato ad acqua, estingue automaticamente gli incendi. +block.lancer.description = Carica e spara potenti raggi di energia alle unità terrene. +block.arc.description = Spara archi elettrici alle unità terrene. +block.swarmer.description = Spara missili automiranti ai nemici. +block.salvo.description = Spara raffiche di proiettili ai nemici. +block.fuse.description = Colpisce i nemici vicini con tre scariche penetranti. +block.ripple.description = Spara molteplici proiettili alle unità terrene, anche su lunghe distanze. +block.cyclone.description = Spara raffiche di proiettili ai nemici nelle vicinanze. +block.spectre.description = Spara raffiche di proiettili perforanti alle unità aeree e terrene. +block.meltdown.description = Carica e spara un potentissimo raggio laser ai nemici vicini. Richiede liquido refrigerante per funzionare. +block.foreshadow.description = Spara con precisione un potente raggio, anche su grandi distanze. +block.repair-point.description = Ripara costantemente l'unità più vicina nel suo raggio d'azione. +block.segment.description = Indebolisce e distrugge i proiettili nel suo raggio d'azione. I laser non vengono mirati. +block.parallax.description = Spara un raggio traente che avvicina i bersagli aerei, indebolendoli allo stesso tempo. +block.tsunami.description = Spara potenti getti di liquidi ai nemici. Quando alimentato ad acqua, estingue automaticamente gli incendi. +block.silicon-crucible.description = Produce il silicio da sabbia e carbone usando la pirite come fonte di calore aggiuntiva. Aumenta la sua efficienza su terreni caldi. +block.disassembler.description = Separa le scorie in diversi minerali, tra cui il torio. +block.overdrive-dome.description = Aumenta la velocità delle strutture vicine. Richiede tessuto di fase e silicio per funzionare. +block.payload-conveyor.description = Trasporta carichi pesanti come le unità prodotte nelle fabbriche. +block.payload-router.description = Divide equamente il carico dei trasportatori di massa in 3 direzioni. +block.command-center.description = Permette di controllare il comportamento delle unità con diversi comandi. +block.ground-factory.description = Produce le unità terrene. Le unità prodotte possono essere utilizzate direttamente o trasferite nei ricostruttori per essere potenziate. +block.air-factory.description = Produce le unità aeree. Le unità prodotte possono essere utilizzate direttamente o trasferite nei ricostruttori per essere potenziate. +block.naval-factory.description = Produce le unità navali. Le unità prodotte possono essere utilizzate direttamente o trasferite nei ricostruttori per essere potenziate. +block.additive-reconstructor.description = Migliora le unità in ingresso ad unità di seconda generazione. +block.multiplicative-reconstructor.description = Migliora le unità in ingresso ad unità di terza generazione. +block.exponential-reconstructor.description = Migliora le unità in ingresso ad unità di quarta generazione. +block.tetrative-reconstructor.description = Migliora le unità in ingresso ad unità di quinta generazione. +block.switch.description = Un semplice interruttore. Il suo stato può essere letto e controllato dai processori. +block.micro-processor.description = Esegue costantemente una sequenza di istruzioni. Può essere usato per controllare unità e strutture. +block.logic-processor.description = Esegue costantemente una sequenza di istruzioni. Può essere usato per controllare unità e strutture. Più veloce del micro processore. +block.hyper-processor.description = Esegue costantemente una sequenza di istruzioni. Può essere usato per controllare unità e strutture. Più veloce del processore logico. +block.memory-cell.description = Imagazzina le informazioni elaborate dai processori. +block.memory-bank.description = Imagazzina le informazioni elaborate dai processori. Alta capacità. +block.logic-display.description = Visualizza la grafica arbitraria elaborata dal processore. +block.large-logic-display.description = Visualizza la grafica arbitraria elaborata dal processore. +block.interplanetary-accelerator.description = Un enorme torre di dispersori elettromagnetici. Accelera i nuclei alla velocità di fuga per il lancio interplanetario. + +unit.dagger.description = Spara proiettili standard ai nemici vicini. +unit.mace.description = Spara raffiche infuocate ai nemici vicini. +unit.fortress.description = Spara proiettili con l'artiglieria a lungo raggio alle unità terrene. +unit.scepter.description = Spara una raffica di proiettili Fires a barrage of charged bullets at all nearby enemies. +unit.reign.description = Spara una serie di proiettili perforanti a tutti i nemici nelle vicinanze. +unit.nova.description = Spara raggi laser che danneggiano i nemici e riparano le strutture degli alleati. È in grado di volare. +unit.pulsar.description = Spara archi elettrici che danneggiano i nemici e riparano le strutture degli alleati. È in grado di volare. +unit.quasar.description = Spara raggi laser perforanti che danneggiano i nemici e riparano le strutture degli alleati. È in grado di volare. Corazzato. +unit.vela.description = Spara un enorme e costante raggio laser che danneggia i nemici e ripara le strutture degli alleati. È in grado di volare. +unit.corvus.description = Spara un enorme raggio laser esplosivo che danneggia i nemici e ripara le strutture degli alleati. Può camminare sopra la maggior parte dei terreni. +unit.crawler.description = Corre verso i nemici ed esplode, causando una grande esplosione. Può camminare sopra la maggior parte dei terreni. +unit.atrax.description = Spara sfere debilitanti di scorie alle unità terrene. Può camminare sopra la maggior parte dei terreni. +unit.spiroct.description = Spara raggi laser ai nemici, riparando se stesso. Può camminare sopra la maggior parte dei terreni. +unit.arkyid.description = Spara enormi raggi laser ai nemici, riparando se stesso. Può camminare sopra la maggior parte dei terreni. +unit.toxopid.description = Spara archi elettrici e laser perforanti ai nemici. Può camminare sopra la maggior parte dei terreni. +unit.flare.description = Spara proiettili standard alle unità terrene e alle strutture nemiche. +unit.horizon.description = Rilascia bombe alle unità terrene e alle strutture nemiche. +unit.zenith.description = Spara salve di missili ai nemici vicini. +unit.antumbra.description = Spara una raggica di proiettili ai nemici nelle vicinanze. +unit.eclipse.description = Spara due laser perforanti e schegge ai nemici nelle vicinanze. +unit.mono.description = Estrae rame e piombo automaticamente per poi depositarlo nel nucleo. +unit.poly.description = Ricostruisce automaticamente le strutture danneggiate e assiste altre unità durante la costruzione. +unit.mega.description = Ripara automaticamente le strutture danneggiate. È in grado di trasportare blocchi e piccole unità terrene. +unit.quad.description = Rilascia grandi bombe alle unità terrene, riparando le strutture alleate e danneggiando quelle nemiche. È in grado di trasportare unità terrene di medie dimensioni. +unit.oct.description = Protegge gli alleati nelle vicinanze con lo scudo rigenerante integrato. È in grado di trasportare la maggior parte delle unità terrene. +unit.risso.description = Spara una raffica di missili e proiettili ai nemici nelle vicinanze. +unit.minke.description = Spara proiettili incendiari e standard alle unità terrene. +unit.bryde.description = Spara proiettili e missili a lungo raggio ai nemici. +unit.sei.description = Spara raffiche di missili e proiettili corazzati e perforanti ai nemici. +unit.omura.description = Spara fulmini perforanti a lungo raggio ai nemici. Genera unità flare. +unit.alpha.description = Difende il nucleo Frammento dai nemici. Costruisce strutture. +unit.beta.description = Difende il nucleo Fondamento dai nemici. Costruisce strutture. +unit.gamma.description = Difende il nucleo Kernel dai nemici. Costruisce strutture. From 44204db2bbff0e6a1367c52a0b02c8bc6b6585ee Mon Sep 17 00:00:00 2001 From: Felix Corvus Date: Tue, 1 Dec 2020 00:30:52 +0300 Subject: [PATCH 120/123] typo --- core/assets/bundles/bundle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4854fcd313..87cfd5c8c7 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1254,16 +1254,16 @@ hint.respawn = To respawn as a ship, press [accent][[V][]. hint.respawn.mobile = You have switched control a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[] hint.desktopPause = Press [accent][[Space][] to pause and unpause the game. hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it. -hint.placeDrill.mobile = Select the \ue85e[accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm. +hint.placeDrill.mobile = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm. hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. -hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. +hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838 copper.\nUse conveyors and drills to supply them. hint.breaking = [accent]Right-click[] and drag to break blocks. hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. hint.research = Use the \ue875 [accent]Research[] button to research new technology. hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology. hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets. -hint.unitControl.mobile = [accent][Double-tap[] to control friendly units or turrets. +hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets. hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right. hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[]. hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type. @@ -1278,7 +1278,7 @@ hint.payloadDrop = Press [accent]][] to drop a payload. hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there. hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[]. -hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down. +hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861 Duo/\uf859 Salvo ammunition to take Guardians down. item.copper.description = Used in all types of construction and ammunition. item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced. From 98700984579873f31d6e814b5653db0075d6b23f Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Nov 2020 17:12:29 -0500 Subject: [PATCH 121/123] Updated Steam meta / Fixed #3673 --- core/src/mindustry/game/SectorInfo.java | 4 ++ core/src/mindustry/io/TypeIO.java | 5 +- .../mindustry/ui/fragments/HintsFragment.java | 2 +- .../metadata/steam/english/achievements.vdf | 58 ++++++++++--------- .../metadata/steam/english/description.txt | 34 ++++++----- 5 files changed, 60 insertions(+), 43 deletions(-) diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index 045d9aa2e9..44ab291026 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -227,7 +227,11 @@ public class SectorInfo{ updateDelta(item, production, coreDeltas); updateDelta(item, rawProduction, productionDeltas); + //cap production/export by production production.get(item).mean = Math.min(production.get(item).mean, rawProduction.get(item).mean); + if(export.containsKey(item)){ + export.get(item).mean = Math.min(export.get(item).mean, rawProduction.get(item).mean); + } } Arrays.fill(coreDeltas, 0); diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java index 5eb9467e3c..9449a89b64 100644 --- a/core/src/mindustry/io/TypeIO.java +++ b/core/src/mindustry/io/TypeIO.java @@ -166,10 +166,13 @@ public class TypeIO{ } public static void writeUnit(Writes write, Unit unit){ - write.b(unit.isNull() ? 0 : unit instanceof BlockUnitc ? 1 : 2); + write.b(unit == null || unit.isNull() ? 0 : unit instanceof BlockUnitc ? 1 : 2); + //block units are special if(unit instanceof BlockUnitc){ write.i(((BlockUnitc)unit).tile().pos()); + }else if(unit == null){ + write.i(0); }else{ write.i(unit.id); } diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java index f967518cb4..693e04953a 100644 --- a/core/src/mindustry/ui/fragments/HintsFragment.java +++ b/core/src/mindustry/ui/fragments/HintsFragment.java @@ -38,7 +38,7 @@ public class HintsFragment extends Fragment{ public void build(Group parent){ group.setFillParent(true); group.touchable = Touchable.childrenOnly; - group.visibility = () -> Core.settings.getBool("hints", true); + group.visibility = () -> Core.settings.getBool("hints", true) && ui.hudfrag.shown; group.update(() -> { if(current != null){ //current got completed diff --git a/fastlane/metadata/steam/english/achievements.vdf b/fastlane/metadata/steam/english/achievements.vdf index 93c5730a09..5ab7f51bfa 100644 --- a/fastlane/metadata/steam/english/achievements.vdf +++ b/fastlane/metadata/steam/english/achievements.vdf @@ -3,16 +3,12 @@ "Language" "english" "Tokens" { - "NEW_ACHIEVEMENT_20_0_NAME" "Verified" - "NEW_ACHIEVEMENT_20_0_DESC" "Complete the tutorial." "NEW_ACHIEVEMENT_20_1_NAME" "Scrapper" "NEW_ACHIEVEMENT_20_1_DESC" "Destroy 1000 enemy units." "NEW_ACHIEVEMENT_20_2_NAME" "Purge" "NEW_ACHIEVEMENT_20_2_DESC" "Destroy 100,000 enemy units." - "NEW_ACHIEVEMENT_20_3_NAME" "Atmospheric Transportation" - "NEW_ACHIEVEMENT_20_3_DESC" "Launch 10,000 items total." "NEW_ACHIEVEMENT_20_5_NAME" "Endless Shipments" - "NEW_ACHIEVEMENT_20_5_DESC" "Launch 1,000,000 items total." + "NEW_ACHIEVEMENT_20_5_DESC" "Launch 100,000 items total." "NEW_ACHIEVEMENT_20_6_NAME" "Conqueror" "NEW_ACHIEVEMENT_20_6_DESC" "Win 10 attack-mode matches." "NEW_ACHIEVEMENT_20_7_NAME" "Champion" @@ -20,15 +16,11 @@ "NEW_ACHIEVEMENT_20_8_NAME" "Blitz" "NEW_ACHIEVEMENT_20_8_DESC" "Destroy the enemy core in an attack zone in 5 waves or fewer." "NEW_ACHIEVEMENT_20_9_NAME" "Core Rain" - "NEW_ACHIEVEMENT_20_9_DESC" "Launch your core into a zone 30 times." + "NEW_ACHIEVEMENT_20_9_DESC" "Launch your core 30 times." "NEW_ACHIEVEMENT_20_10_NAME" "Tenacious" "NEW_ACHIEVEMENT_20_10_DESC" "Survive 100 waves." - "NEW_ACHIEVEMENT_20_11_NAME" "Unvanquished" - "NEW_ACHIEVEMENT_20_11_DESC" "Survive 500 waves." "NEW_ACHIEVEMENT_20_12_NAME" "Researcher" "NEW_ACHIEVEMENT_20_12_DESC" "Research everything." - "NEW_ACHIEVEMENT_20_13_NAME" "Shapeshifter" - "NEW_ACHIEVEMENT_20_13_DESC" "Unlock and transform into every mech in the game." "NEW_ACHIEVEMENT_20_14_NAME" "Overload" "NEW_ACHIEVEMENT_20_14_DESC" "Hit a water-covered enemy with electricity." "NEW_ACHIEVEMENT_20_15_NAME" "Deflection" @@ -51,44 +43,36 @@ "NEW_ACHIEVEMENT_20_24_DESC" "Defeat a boss." "NEW_ACHIEVEMENT_20_25_NAME" "Explorer" "NEW_ACHIEVEMENT_20_25_DESC" "Unlock all zones in the campaign." - "NEW_ACHIEVEMENT_20_26_NAME" "Completionist" - "NEW_ACHIEVEMENT_20_26_DESC" "Reach the configuration requirement wave on all zones." "NEW_ACHIEVEMENT_20_29_NAME" "Material II" "NEW_ACHIEVEMENT_20_29_DESC" "Unlock Thorium." "NEW_ACHIEVEMENT_20_31_NAME" "Material I" "NEW_ACHIEVEMENT_20_31_DESC" "Unlock Titanium." "NEW_ACHIEVEMENT_21_0_NAME" "Kamikaze" - "NEW_ACHIEVEMENT_21_0_DESC" "Fill your mech up with explosive materials and die, creating an explosion." + "NEW_ACHIEVEMENT_21_0_DESC" "Fill your mech up with explosive materials and die." "NEW_ACHIEVEMENT_21_1_NAME" "It Begins" - "NEW_ACHIEVEMENT_21_1_DESC" "Build a Dagger factory." + "NEW_ACHIEVEMENT_21_1_DESC" "Build a ground unit factory." "NEW_ACHIEVEMENT_21_2_NAME" "Direct Assault" "NEW_ACHIEVEMENT_21_2_DESC" "Issue the Attack command using the Command Center." "NEW_ACHIEVEMENT_21_3_NAME" "Swarm" "NEW_ACHIEVEMENT_21_3_DESC" "Have 100 units active at once." "NEW_ACHIEVEMENT_21_4_NAME" "Flock" - "NEW_ACHIEVEMENT_21_4_DESC" "Have 10 Phantom drones active at once." - "NEW_ACHIEVEMENT_21_5_NAME" "Volatile Army" - "NEW_ACHIEVEMENT_21_5_DESC" "Have 50 Crawler units active at once." + "NEW_ACHIEVEMENT_21_4_DESC" "Have 10 Phantom Poly drones active at once." + "NEW_ACHIEVEMENT_21_5_NAME" "Roboticist" + "NEW_ACHIEVEMENT_21_5_DESC" "Build every type of unit." "NEW_ACHIEVEMENT_21_6_NAME" "Legions" "NEW_ACHIEVEMENT_21_6_DESC" "Build 1000 units total." - "NEW_ACHIEVEMENT_21_7_NAME" "Super" - "NEW_ACHIEVEMENT_21_7_DESC" "Earn the S rank on any zone." - "NEW_ACHIEVEMENT_21_8_NAME" "Super Super" - "NEW_ACHIEVEMENT_21_8_DESC" "Earn the SS rank on any zone." "NEW_ACHIEVEMENT_21_9_NAME" "You Should've Listened" "NEW_ACHIEVEMENT_21_9_DESC" "Die in the drop point exclusion zone." - "NEW_ACHIEVEMENT_21_10_NAME" "Just Press Shift" - "NEW_ACHIEVEMENT_21_10_DESC" "Drown, somehow." + "NEW_ACHIEVEMENT_21_10_NAME" "There are naval units for that." + "NEW_ACHIEVEMENT_21_10_DESC" "Drown." "NEW_ACHIEVEMENT_21_11_NAME" "Collector" "NEW_ACHIEVEMENT_21_11_DESC" "Fill the core to maximum capacity with every type of material." "NEW_ACHIEVEMENT_21_12_NAME" "Crowd" "NEW_ACHIEVEMENT_21_12_DESC" "Host a server with 10 players on it." "NEW_ACHIEVEMENT_21_13_NAME" "Invulnerable" - "NEW_ACHIEVEMENT_21_13_DESC" "Build the Meltdown and Spectre." + "NEW_ACHIEVEMENT_21_13_DESC" "Build the Meltdown and, Spectre and Foreshadow.." "NEW_ACHIEVEMENT_21_14_NAME" "Liftoff" "NEW_ACHIEVEMENT_21_14_DESC" "Use the Launch Pad." - "NEW_ACHIEVEMENT_21_15_NAME" "Complacence" - "NEW_ACHIEVEMENT_21_15_DESC" "Skip launching twice, then have your core destroyed by the enemy." "NEW_ACHIEVEMENT_21_16_NAME" "Heresy" "NEW_ACHIEVEMENT_21_16_DESC" "Build two routers next to each other." "NEW_ACHIEVEMENT_21_17_NAME" "Lone Guardian" @@ -105,5 +89,27 @@ "NEW_ACHIEVEMENT_21_22_DESC" "Launch into a zone with 10,000 or more items configured." "NEW_ACHIEVEMENT_21_23_NAME" "Ignition" "NEW_ACHIEVEMENT_21_23_DESC" "Power up an Impact Reactor." + "NEW_ACHIEVEMENT_21_24_NAME" "Acceleration" + "NEW_ACHIEVEMENT_21_24_DESC" "Activate the Interplanteary Accelerator." + "NEW_ACHIEVEMENT_21_25_NAME" "The Spiral" + "NEW_ACHIEVEMENT_21_25_DESC" "Round and round it goes..." + "NEW_ACHIEVEMENT_21_26_NAME" "Escalation" + "NEW_ACHIEVEMENT_21_26_DESC" "Construct a Tier 5 unit." + "NEW_ACHIEVEMENT_21_27_NAME" "Architect" + "NEW_ACHIEVEMENT_21_27_DESC" "Create 20 schematics." + "NEW_ACHIEVEMENT_21_28_NAME" "Global Domination" + "NEW_ACHIEVEMENT_21_28_DESC" "Capture every sector on Serpulo." + "NEW_ACHIEVEMENT_21_29_NAME" "Airlift" + "NEW_ACHIEVEMENT_21_29_DESC" "Pick up a T5 unit in an Oct unit carrier." + "NEW_ACHIEVEMENT_21_30_NAME" "The Ultimate Form" + "NEW_ACHIEVEMENT_21_30_DESC" "Join them." + "NEW_ACHIEVEMENT_21_31_NAME" "Production I" + "NEW_ACHIEVEMENT_21_31_DESC" "Reach 5,000 items/min total production in the campaign." + "NEW_ACHIEVEMENT_26_0_NAME" "Production II" + "NEW_ACHIEVEMENT_26_0_DESC" "Reach 50,000 items/min total production in the campaign." + "NEW_ACHIEVEMENT_26_1_NAME" "Assured Victory" + "NEW_ACHIEVEMENT_26_1_DESC" "Capture a sector while playing on a different sector." + "NEW_ACHIEVEMENT_26_2_NAME" "Small Empire" + "NEW_ACHIEVEMENT_26_2_DESC" "Control 10 sectors at once." } } diff --git a/fastlane/metadata/steam/english/description.txt b/fastlane/metadata/steam/english/description.txt index ff9dfca4d7..08947fbfc6 100644 --- a/fastlane/metadata/steam/english/description.txt +++ b/fastlane/metadata/steam/english/description.txt @@ -1,28 +1,30 @@ -Create elaborate supply chains of conveyor belts to feed ammo into your turrets, produce materials to use for building, and defend your structures from waves of enemies. Play with your friends in cross-platform multiplayer co-op games, or challenge them in team-based PvP matches. - [img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img] [h2]Gameplay[/h2] [list] -[*] Create drills and conveyors to move resources into your Core. -[*] Use production blocks to create advanced materials. -[*] Build drones for automatically mining resources, assisting in building and protecting your base. -[*] Distribute liquids and fight outbreaks of fire. -[*] Boost production by supplying optional coolant and lubricant to your defense and production blocks. +[*] Create elaborate supply chains of conveyor belts to feed ammo into your turrets and produce materials to use for building +[*] Use production blocks to create a wide variety of advanced materials +[*] Defend your structures from waves of enemies +[*] Play with your friends in cross-platform multiplayer co-op games, or challenge them in team-based PvP matches +[*] Distribute liquids and fight constant challenges, like outbreaks of fire or enemy flier raids +[*] Get the most out of your production by supplying optional coolant and lubricant +[*] Produce a wide variety of units for automatic management of your base or assault on enemy bases [/list] +[img]{STEAM_APP_IMAGE}/extras/ezgif-1-8679abe089cd.gif[/img] + [h2]Campaign[/h2] [list] -[*] Advance through 12 replayable built-in zones with randomized spawn points -[*] Collect and launch resources +[*] Conquer the planet Serpulo as you advance through 250+ procedurally generated sectors and 16 hand-made maps +[*] Capture territory and set up factories to produce resources while you play other sectors +[*] Defend your sectors from periodic invasions +[*] Coordinate resource distribution between sectors via launch pads [*] Research new blocks to fuel progress -[*] Configure launch loadouts to bring resources to each zone -[*] Variety of mission objectives and goals [*] Invite your friends to complete missions together [*] 120+ technology blocks to master -[*] 19 different types of drones, mechs and ships +[*] 33 different types of drones, mechs and ships [*] 50+ achievements to complete [/list] @@ -30,15 +32,17 @@ Create elaborate supply chains of conveyor belts to feed ammo into your turrets, [list] [*] [b]Survival[/b]: Build turrets to defend from enemies in tower-defense based gameplay. Survive as long as possible, optionally launching your core to use your collected resources for research. Prepare your base for intermittent attacks from airborne bosses. -[*] [b]Attack[/b]: Build factories for units to destroy the enemy cores, while simultaneously defending your base from waves of enemy units. Create a variety of different types of support and offensive unit to assist you in your goals. +[*] [b]Attack[/b]: Build factories for units to destroy the enemy cores, while simultaneously defending your base from waves of enemy units. Create a variety of different types of support and offensive unit to assist you in your goals. Optionally enable an AI that builds defensive structures to an extra challenge. [*] [b]PvP[/b]: Compete with other players on up to 4 different teams to destroy each other's cores. Create units, or attack other bases directly with your mechs. [*] [b]Sandbox[/b]: Play around with infinite resources and no enemy threat. Use sandbox-specific item and liquid source blocks to test out designs, and spawn in enemies on request. [/list] +[img]{STEAM_APP_IMAGE}/extras/2020-11-30_10-46-02.gif[/img] + [h2]Custom Games & Cross-Platform Multiplayer[/h2] [list] -[*] 12 built in maps for custom games, in addition to campaign +[*] 16 built in maps for custom games, in addition to campaign [*] Play Co-op, PvP or sandbox [*] Join a public dedicated server, or invite friends to your own private session [*] Customizable game rules: Change block costs, enemy stats, starting items, wave timing and more @@ -57,5 +61,5 @@ Create elaborate supply chains of conveyor belts to feed ammo into your turrets, [*] Configure enemy wave layouts [*] Share exported maps on the Steam Workshop [*] Customize base map rules -[*] Use 75+ different environmental blocks +[*] Use 80+ different environmental blocks [/list] From 8dae9bababc2d213b7241371e1e73d6f12eb5bcc Mon Sep 17 00:00:00 2001 From: Felix Corvus Date: Tue, 1 Dec 2020 01:27:34 +0300 Subject: [PATCH 122/123] not typo --- core/assets/bundles/bundle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 87cfd5c8c7..4cf9af41f0 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1257,7 +1257,7 @@ hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the botto hint.placeDrill.mobile = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm. hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate. hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors. -hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838 copper.\nUse conveyors and drills to supply them. +hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them. hint.breaking = [accent]Right-click[] and drag to break blocks. hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection. hint.research = Use the \ue875 [accent]Research[] button to research new technology. @@ -1278,7 +1278,7 @@ hint.payloadDrop = Press [accent]][] to drop a payload. hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there. hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[]. -hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861 Duo/\uf859 Salvo ammunition to take Guardians down. +hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down. item.copper.description = Used in all types of construction and ammunition. item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced. From d868ff81bfe29df2116eeead624c692afee6200c Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Nov 2020 17:49:20 -0500 Subject: [PATCH 123/123] Dependency resolution fix --- core/assets/bundles/bundle.properties | 2 +- core/src/mindustry/content/Liquids.java | 1 - .../src/mindustry/ui/dialogs/PlanetDialog.java | 5 +++-- core/src/mindustry/world/Block.java | 18 ++++++++---------- .../mindustry/world/consumers/Consumers.java | 8 ++++++++ 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4854fcd313..37306b5814 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1251,7 +1251,7 @@ hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manuall hint.desktopShoot = [accent][[Left-click][] to shoot. hint.depositItems = To transfer items, drag from your ship to the core. hint.respawn = To respawn as a ship, press [accent][[V][]. -hint.respawn.mobile = You have switched control a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[] +hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[] hint.desktopPause = Press [accent][[Space][] to pause and unpause the game. hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it. hint.placeDrill.mobile = Select the \ue85e[accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm. diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index 91b7186f6b..b087b41a94 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -13,7 +13,6 @@ public class Liquids implements ContentList{ water = new Liquid("water", Color.valueOf("596ab8")){{ heatCapacity = 0.4f; effect = StatusEffects.wet; - alwaysUnlocked = true; }}; slag = new Liquid("slag", Color.valueOf("ffa166")){{ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 710fc29895..4a96776cf6 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -249,9 +249,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ boolean canSelect(Sector sector){ if(mode == select) return sector.hasBase(); + //preset sectors can only be selected once unlocked + if(sector.preset != null) return sector.preset.unlocked() || sector.hasBase(); - return sector.hasBase() || sector.near().contains(Sector::hasBase) //near an occupied sector - || (sector.preset != null && sector.preset.unlocked()); //is an unlocked preset + return sector.hasBase() || sector.near().contains(Sector::hasBase); //near an occupied sector } Sector findLauncher(Sector to){ diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 5e38bfa8a8..1bce0ffb2d 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -632,18 +632,16 @@ public class Block extends UnlockableContent{ cons.get(stack.item); } - if(consumes.any()){ - //also requires inputs - for(Consume c : consumes.all()){ - if(c instanceof ConsumeItems i){ - for(ItemStack stack : i.items){ - cons.get(stack.item); - } - }else if(c instanceof ConsumeLiquid i){ - cons.get(i.liquid); + //also requires inputs + consumes.each(c -> { + if(c instanceof ConsumeItems i){ + for(ItemStack stack : i.items){ + cons.get(stack.item); } + }else if(c instanceof ConsumeLiquid i){ + cons.get(i.liquid); } - } + }); } @Override diff --git a/core/src/mindustry/world/consumers/Consumers.java b/core/src/mindustry/world/consumers/Consumers.java index ee0c76a2a7..73ad0b0b96 100644 --- a/core/src/mindustry/world/consumers/Consumers.java +++ b/core/src/mindustry/world/consumers/Consumers.java @@ -20,6 +20,14 @@ public class Consumers{ return results != null && results.length > 0; } + public void each(Cons c){ + for(var cons : map){ + if(cons != null){ + c.get(cons); + } + } + } + public void init(){ results = Structs.filter(Consume.class, map, m -> m != null); optionalResults = Structs.filter(Consume.class, map, m -> m != null && m.isOptional());