diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 2fbea52ab0..1cf83ddd7e 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1165,6 +1165,7 @@ unit.minutes = mins unit.persecond = /sec unit.perminute = /min unit.timesspeed = x speed +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = items @@ -1241,6 +1242,7 @@ setting.mutemusic.name = Mute Music setting.sfxvol.name = SFX Volume setting.mutesound.name = Mute Sound setting.crashreport.name = Send Anonymous Crash Reports +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Auto-Create Saves setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit @@ -1405,6 +1407,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Unit Health Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index 0ecd6514b6..39947d3a81 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -1133,6 +1133,7 @@ unit.minutes = хв. unit.persecond = /сек unit.perminute = /хв unit.timesspeed = x хуткасць +unit.multiplier = x unit.percent = % unit.shieldhealth = моц шчыта unit.items = прадметаў @@ -1209,6 +1210,7 @@ setting.mutemusic.name = Заглушыць музыку setting.sfxvol.name = Гучнасць эфектаў setting.mutesound.name = Заглушыць гук setting.crashreport.name = Адпраўляць ананімныя справаздачы аб вылетах +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Аўтаматычнае стварэнне захаванняў setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Абмежаванне гульцоў @@ -1369,6 +1371,7 @@ rules.unitcostmultiplier = Множыцель Кошту Адзінак rules.unithealthmultiplier = Множнік здароўя баяв. адз. rules.unitdamagemultiplier = Множнік страт баяв. адз. rules.unitcrashdamagemultiplier = Множнік Падрыўнога Пашкоджання Юніта +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Множнік Сонечнай Энергіі rules.unitcapvariable = Ядра Спрыяюць Колькасці Юнітаў rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index 9848be868e..9b50a945c7 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -1144,6 +1144,7 @@ unit.minutes = минути unit.persecond = /сек unit.perminute = /мин unit.timesspeed = x скорост +unit.multiplier = x unit.percent = % unit.shieldhealth = здравина на щита unit.items = предмети @@ -1220,6 +1221,7 @@ setting.mutemusic.name = Заглуши Музиката setting.sfxvol.name = Сила на Звуковите Ефекти setting.mutesound.name = Заглуши Звука setting.crashreport.name = ИЗпращай Анонимни Отчети за Сривове +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Автоматични Записи setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Лимит на Играчи @@ -1380,6 +1382,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Множител на Точките Живот на Единици rules.unitdamagemultiplier = Множител на Щетите на Единици rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Ядрата Увеличават Максималния Брой Единици rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties index 11f4a2afb0..5edfea4674 100644 --- a/core/assets/bundles/bundle_ca.properties +++ b/core/assets/bundles/bundle_ca.properties @@ -1147,6 +1147,7 @@ unit.minutes = min unit.persecond = /s unit.perminute = /min unit.timesspeed = × velocitat +unit.multiplier = x unit.percent = % unit.shieldhealth = salut d’escut unit.items = elements @@ -1223,6 +1224,7 @@ setting.mutemusic.name = Silencia la música setting.sfxvol.name = Volums dels efectes de so setting.mutesound.name = Silencia el so setting.crashreport.name = Envia informes d’error anònims +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Desa automàticament la partida setting.steampublichost.name = Visibilitat de la partida pública setting.playerlimit.name = Límit de jugadors @@ -1383,6 +1385,7 @@ rules.unitcostmultiplier = Multiplicador del cost de les unitats rules.unithealthmultiplier = Multiplicador de la salut de les unitats rules.unitdamagemultiplier = Multiplicador del dany de les unitats rules.unitcrashdamagemultiplier = Multiplicador del dany de xoc de les unitats +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Multiplicador de l’energia solar rules.unitcapvariable = Els nuclis contribueixen al límit d’unitats rules.unitpayloadsexplode = Els blocs carregats exploten juntament amb la unitat diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 6f72df9c9c..0afb11cde3 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -1146,6 +1146,7 @@ unit.minutes = minuty unit.persecond = /s unit.perminute = /min unit.timesspeed = x větší rychlost +unit.multiplier = x unit.percent = % unit.shieldhealth = zdraví štítu unit.items = předměty @@ -1222,6 +1223,7 @@ setting.mutemusic.name = Ztišit hudbu setting.sfxvol.name = Hlasitost efektů setting.mutesound.name = Ztišit zvuk setting.crashreport.name = Poslat anonymní hlášení o spadnutí Mindustry +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Automaticky ukládat hru setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Nejvyšší počet hráčů @@ -1382,6 +1384,7 @@ rules.unitcostmultiplier = Násobek ceny jednotek rules.unithealthmultiplier = Násobek zdraví jednotek rules.unitdamagemultiplier = Násobek poškození jednotkami rules.unitcrashdamagemultiplier = Násobek poškození při nárazu jednotky +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Násobek Solární Energie rules.unitcapvariable = Jádra Zvýšujou Maximum Počtu Jednotek rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index a9c6ea54fd..44198c2d57 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -1135,6 +1135,7 @@ unit.minutes = minutter unit.persecond = /sek unit.perminute = /min unit.timesspeed = x hastighed +unit.multiplier = x unit.percent = % unit.shieldhealth = skjoldhelbred unit.items = genstande @@ -1211,6 +1212,7 @@ setting.mutemusic.name = Forstum musik setting.sfxvol.name = SFX-volumen setting.mutesound.name = Forstum lyde setting.crashreport.name = Send anonyme fejlrapporter +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Gem automatisk setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Spiller-grænse @@ -1371,6 +1373,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Enheds-helbreds-forstærker rules.unitdamagemultiplier = Enheds-skade-forstærker rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 081c3d193f..45bfdc2470 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1157,6 +1157,7 @@ unit.minutes = mins unit.persecond = /sek unit.perminute = /min unit.timesspeed = x Geschwindigkeit +unit.multiplier = x unit.percent = % unit.shieldhealth = Schildlebenspunkte unit.items = Materialeinheiten @@ -1233,6 +1234,7 @@ setting.mutemusic.name = Musik stummschalten setting.sfxvol.name = Audioeffekt-Lautstärke setting.mutesound.name = Audioeffekte stummschalten setting.crashreport.name = Anonyme Absturzberichte senden +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Automatisch speichern setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Spielerbegrenzung @@ -1393,6 +1395,7 @@ rules.unitcostmultiplier = Einheit-Baukosten Multiplikator rules.unithealthmultiplier = Einheit-Lebenspunkte-Multiplikator rules.unitdamagemultiplier = Einheit-Schaden-Multiplikator rules.unitcrashdamagemultiplier = Einheiten-Absturzschaden-Multiplikator +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solarstrom-Multiplikator rules.unitcapvariable = Kerne zählen zum Einheiten-Limit dazu rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index f2626f0a79..bde17ade87 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1153,6 +1153,7 @@ unit.minutes = mins unit.persecond = /seg unit.perminute = /min unit.timesspeed = x velocidad +unit.multiplier = x unit.percent = % unit.shieldhealth = Escudo unit.items = objetos @@ -1229,6 +1230,7 @@ setting.mutemusic.name = Silenciar música setting.sfxvol.name = Volumen del sonido setting.mutesound.name = Silenciar sonido setting.crashreport.name = Enviar registros de errores anónimos +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Guardado automático setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limite de jugadores @@ -1389,6 +1391,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Multiplicador de vida de unidades rules.unitdamagemultiplier = Multiplicador de daño de unidades rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Multiplicador de energía solar rules.unitcapvariable = Las categorías del núcleo alteran el límite máximo de unidades rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 92fdbb6ee0..9d00068faa 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -1135,6 +1135,7 @@ unit.minutes = mins unit.persecond = /s unit.perminute = /min unit.timesspeed = x kiirus +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = ressursiühikut @@ -1211,6 +1212,7 @@ setting.mutemusic.name = Vaigista muusika setting.sfxvol.name = Heliefektide tugevus setting.mutesound.name = Vaigista heli setting.crashreport.name = Saada automaatseid veateateid +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Loo automaatseid salvestisi setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit @@ -1371,6 +1373,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Väeüksuste elude kordaja rules.unitdamagemultiplier = Väeüksuste hävitusvõime kordaja rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 59b4b22259..3d1e427a1b 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -1137,6 +1137,7 @@ unit.minutes = mins unit.persecond = /seg unit.perminute = /min unit.timesspeed = x abiadura +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = elementu @@ -1213,6 +1214,7 @@ setting.mutemusic.name = Isilarazi musika setting.sfxvol.name = Efektuen bolumena setting.mutesound.name = Isilarazi soinua setting.crashreport.name = Bidali kraskatze txosten automatikoak +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Gorde automatikoki setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit @@ -1373,6 +1375,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Unitateen osasun-biderkatzailea rules.unitdamagemultiplier = Unitateen kalte-biderkatzailea rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index 583c8e2e2f..065e745a04 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -1134,6 +1134,7 @@ unit.minutes = minuuttia unit.persecond = /s unit.perminute = /min unit.timesspeed = x nopeus +unit.multiplier = x unit.percent = % unit.shieldhealth = suojan elinpisteet unit.items = esinettä @@ -1210,6 +1211,7 @@ setting.mutemusic.name = Mykistä musiikki setting.sfxvol.name = SFX-voimakkuus setting.mutesound.name = Mykistä äänet setting.crashreport.name = Lähetä anonyymejä kaatumisilmoituksia +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Luo tallenuksia automaattisesti setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Pelaajaraja @@ -1370,6 +1372,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Yksikköjen elämäpistekerroin rules.unitdamagemultiplier = Yksikköjen vahinkokerroin rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Aurinkovoimakerroin rules.unitcapvariable = Ytimet vaikuttavat yksikkörajaan rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index 4b1f6ea9cb..ed42b0de67 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -1134,6 +1134,7 @@ unit.minutes = mins unit.persecond = /sec unit.perminute = /min unit.timesspeed = x speed +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = items @@ -1210,6 +1211,7 @@ setting.mutemusic.name = Mute Music setting.sfxvol.name = SFX Volume setting.mutesound.name = Mute Sound setting.crashreport.name = Mag-send ng Anonymous Crash Reports +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Auto-Create Saves setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit @@ -1370,6 +1372,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Unit Health Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 8fba5b6a65..9ef61069b8 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -1159,6 +1159,7 @@ unit.minutes = min unit.persecond = /sec unit.perminute = /min unit.timesspeed = x vitesse +unit.multiplier = x unit.percent = % unit.shieldhealth = santé du bouclier unit.items = objets @@ -1235,6 +1236,7 @@ setting.mutemusic.name = Couper la Musique setting.sfxvol.name = Volume des Sons et Effets setting.mutesound.name = Couper les Sons et Effets setting.crashreport.name = Envoyer des Rapports de crash anonymes +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Sauvegardes Automatiques setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limite de Joueurs @@ -1397,6 +1399,7 @@ rules.unitcostmultiplier = Multiplicateur du coût de fabrication des Unités rules.unithealthmultiplier = Multiplicateur de Santé des Unités rules.unitdamagemultiplier = Multiplicateur de Dégât des Unités rules.unitcrashdamagemultiplier = Multiplicateur de Dégât de chute des Unités +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Multiplicateur de l'Efficacité des Panneaux Solaires rules.unitcapvariable = Les Noyaux contribuent à la limite d'Unités actives rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index bafa116ee8..b19c6fd4cf 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -1165,6 +1165,7 @@ unit.minutes = perc unit.persecond = /mp unit.perminute = /perc unit.timesspeed = x sebesség +unit.multiplier = x unit.percent = % unit.shieldhealth = erőpajzs életereje unit.items = nyersanyag @@ -1241,6 +1242,7 @@ setting.mutemusic.name = Zene némítása setting.sfxvol.name = Hanghatások hangereje setting.mutesound.name = Hang némítása setting.crashreport.name = Névtelen összeomlási jelentések +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Automatikus mentés setting.steampublichost.name = Nyilvános játék láthatósága setting.playerlimit.name = Játékoskorlát @@ -1404,6 +1406,7 @@ rules.unitcostmultiplier = Egység költségszorzója rules.unithealthmultiplier = Egység életpontszorzója rules.unitdamagemultiplier = Egység sebzésszorzója rules.unitcrashdamagemultiplier = Egység ütközési sebzésszorzója +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Napenergia szorzója rules.unitcapvariable = A támaszpontok befolyásolják a gyártható egységek darabszámát rules.unitpayloadsexplode = A szállított rakományok az egységgel együtt felrobbannak diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties index cfcc41cf04..56db81e1ea 100644 --- a/core/assets/bundles/bundle_id_ID.properties +++ b/core/assets/bundles/bundle_id_ID.properties @@ -1162,6 +1162,7 @@ unit.minutes = menit unit.persecond = /detik unit.perminute = /menit unit.timesspeed = x kecepatan +unit.multiplier = x unit.percent = % unit.shieldhealth = darah perisai unit.items = bahan @@ -1238,6 +1239,7 @@ setting.mutemusic.name = Bisukan Musik setting.sfxvol.name = Volume Suara Efek setting.mutesound.name = Bisukan Suara setting.crashreport.name = Laporkan Masalah Secara Anonim +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Otomatis Menyimpan setting.steampublichost.name = Visibilitas Game Publik setting.playerlimit.name = Batas pemain @@ -1400,6 +1402,7 @@ rules.unitcostmultiplier = Penggandaan Bahan Pembuatan Unit rules.unithealthmultiplier = Penggandaan Darah Unit rules.unitdamagemultiplier = Penggandaan Kekuatan Unit rules.unitcrashdamagemultiplier = Penggandaan Kerusakan Jatuhnya Unit +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Penggandaan Tenaga Surya rules.unitcapvariable = Inti Memengaruhi Batas Unit rules.unitpayloadsexplode = Muatan yang Dibawa Meledak Bersama Unit diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 8eb5058287..a3bf343b1c 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -1140,6 +1140,7 @@ unit.minutes = minuti unit.persecond = /s unit.perminute = /min unit.timesspeed = x velocità +unit.multiplier = x unit.percent = % unit.shieldhealth = salute scudo unit.items = oggetti @@ -1216,6 +1217,7 @@ setting.mutemusic.name = Silenzia Musica setting.sfxvol.name = Volume Effetti setting.mutesound.name = Silenzia Suoni setting.crashreport.name = Invia rapporti anonimi sugli arresti anomali +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Salvataggi Automatici setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limite Giocatori @@ -1376,6 +1378,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Moltiplicatore Vita Unità rules.unitdamagemultiplier = Moltiplicatore Danno Unità rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Moltiplicatore energia solare rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 9f31c83a8a..17dad5f90c 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -1146,6 +1146,7 @@ unit.minutes = 分 unit.persecond = /秒 unit.perminute = /分 unit.timesspeed = 倍の速度 +unit.multiplier = x unit.percent = % unit.shieldhealth = シールド unit.items = アイテム @@ -1222,6 +1223,7 @@ setting.mutemusic.name = 音楽をミュート setting.sfxvol.name = 効果音 音量 setting.mutesound.name = 効果音をミュート setting.crashreport.name = 匿名でクラッシュレポートを送信する +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = 自動保存 setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = プレイヤー数制限 @@ -1382,6 +1384,7 @@ rules.unitcostmultiplier = ユニットの製造コスト倍率 rules.unithealthmultiplier = ユニットの体力倍率 rules.unitdamagemultiplier = ユニットのダメージ倍率 rules.unitcrashdamagemultiplier = ユニットの衝突ダメージ倍率 +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = 太陽光の倍率 rules.unitcapvariable = コア数によってユニット上限を変動 rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index e13fa0799f..453c81528d 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1164,6 +1164,7 @@ unit.minutes = 분 unit.persecond = /초 unit.perminute = /분 unit.timesspeed = x 배 +unit.multiplier = x unit.percent = % unit.shieldhealth = 보호막 체력 unit.items = 자원 @@ -1240,6 +1241,7 @@ setting.mutemusic.name = 음소거 setting.sfxvol.name = 효과음 크기 setting.mutesound.name = 소리 끄기 setting.crashreport.name = 익명으로 오류 보고서 자동 전송 +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = 자동 저장 활성화 setting.steampublichost.name = 공개 게임 가시성 setting.playerlimit.name = 플레이어 제한 @@ -1403,6 +1405,7 @@ rules.unitcostmultiplier = 유닛 비용 배수 rules.unithealthmultiplier = 유닛 체력 배수 rules.unitdamagemultiplier = 유닛 피해량 배수 rules.unitcrashdamagemultiplier = 유닛 파손 피해량 배수 +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = 태양광 전력 배수 rules.unitcapvariable = 코어 유닛 수 제한 추가 rules.unitpayloadsexplode = 들어올린 화물 유닛과 함께 폭발 diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index 513d61f59a..f26b409714 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -1135,6 +1135,7 @@ unit.minutes = mins unit.persecond = /sek. unit.perminute = /min unit.timesspeed = x greičio +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = daiktai @@ -1211,6 +1212,7 @@ setting.mutemusic.name = Nutildyti Muziką setting.sfxvol.name = SFX Garsumas setting.mutesound.name = Nutildyti Garsus setting.crashreport.name = Siųsti Anoniminius Strigties Pranešimus +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Automatiškai Kurti Išsaugojimus setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Žaidėjų Limitas @@ -1371,6 +1373,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Vienetų Gyvybių Daugiklis rules.unitdamagemultiplier = Vienetų Žalos Daugiklis rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 39d61aba22..0876b596a2 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -1147,6 +1147,7 @@ unit.minutes = minuten unit.persecond = /sec unit.perminute = /min unit.timesspeed = x snelheid +unit.multiplier = x unit.percent = % unit.shieldhealth = levenspunten schild unit.items = materialen @@ -1223,6 +1224,7 @@ setting.mutemusic.name = Demp Muziek setting.sfxvol.name = SFX Volume setting.mutesound.name = Demp Geluid setting.crashreport.name = Stuur Anonieme Crashmeldingen +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Bewaar Saves Automatisch setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Spelerslijst @@ -1383,6 +1385,7 @@ rules.unitcostmultiplier = Eenheidskosten Vermenigvuldiger rules.unithealthmultiplier = Eenheid Levenspunten Vermenigvuldiger rules.unitdamagemultiplier = Eenheid Schade Vermenigvuldiger rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Zonne-Energie Vermenigvuldiger rules.unitcapvariable = Cores Dragen Bij Aan Eenheidslimiet rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index dc2204a38b..d65183febe 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -1135,6 +1135,7 @@ unit.minutes = mins unit.persecond = /sec unit.perminute = /min unit.timesspeed = x speed +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = items @@ -1211,6 +1212,7 @@ setting.mutemusic.name = Mute Music setting.sfxvol.name = SFX Volume setting.mutesound.name = Mute Sound setting.crashreport.name = Send Anonymous Crash Reports +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Auto-Create Saves setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit @@ -1371,6 +1373,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Unit Health Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 932d1ce433..ada07add20 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -1144,6 +1144,7 @@ unit.minutes = mins unit.persecond = /sekundę unit.perminute = /min unit.timesspeed = x prędkość +unit.multiplier = x unit.percent = % unit.shieldhealth = życie tarczy unit.items = przedmioty @@ -1220,6 +1221,7 @@ setting.mutemusic.name = Wycisz muzykę setting.sfxvol.name = Głośność dźwięków setting.mutesound.name = Wycisz dźwięki setting.crashreport.name = Wysyłaj anonimowo dane o crashu gry +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Automatyczne tworzenie zapisów setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limit graczy @@ -1380,6 +1382,7 @@ rules.unitcostmultiplier = Mnożnik Kosztu Jednostek rules.unithealthmultiplier = Mnożnik Życia Jednostek rules.unitdamagemultiplier = Mnożnik Obrażeń jednostek rules.unitcrashdamagemultiplier = Obrażenia Zadawane Po Zniszczeniu +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Mnożnik Mocy Paneli Słonecznych rules.unitcapvariable = Rdzenie mają wpływ na limit jednostek rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index a20a704b37..bf02f277ba 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -1154,6 +1154,7 @@ unit.minutes = mins unit.persecond = /segundo unit.perminute = /min unit.timesspeed = x Velocidade +unit.multiplier = x unit.percent = % unit.shieldhealth = Saúde do escudo unit.items = itens @@ -1230,6 +1231,7 @@ setting.mutemusic.name = Desligar Música setting.sfxvol.name = Volume de Efeitos setting.mutesound.name = Desligar Som setting.crashreport.name = Enviar denúncias anônimas de erros +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Criar salvamentos automaticamente setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limites de Player @@ -1390,6 +1392,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Multiplicador de vida de unidade rules.unitdamagemultiplier = Multiplicador de dano de Unidade rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Multiplicador de Energia Solar rules.unitcapvariable = Núcleos contribuem para a capacidade da unidade rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index 3fef2bcb84..ce02a779df 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -1135,6 +1135,7 @@ unit.minutes = mins unit.persecond = por segundo unit.perminute = /min unit.timesspeed = x Velocidade +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = itens @@ -1211,6 +1212,7 @@ setting.mutemusic.name = Desligar Música setting.sfxvol.name = Volume de Efeitos setting.mutesound.name = Desligar Som setting.crashreport.name = Enviar denuncias de crash anonimas +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Criar gravamentos automaticamente setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limite de Jogadores @@ -1371,6 +1373,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Multiplicador de vida de unidade rules.unitdamagemultiplier = Multiplicador de dano de Unidade rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 3e8201dffb..371fb015ab 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -1146,6 +1146,7 @@ unit.minutes = min unit.persecond = /sec unit.perminute = /min unit.timesspeed = x viteză +unit.multiplier = x unit.percent = % unit.shieldhealth = viață scut unit.items = materiale @@ -1222,6 +1223,7 @@ setting.mutemusic.name = Muzica pe Mut setting.sfxvol.name = Volum Efecte Sonore setting.mutesound.name = Sunetul pe Mut setting.crashreport.name = Trimite Rapoarte de Crash anonime +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Auto-Creează Salvări setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limita Jucătorilor @@ -1382,6 +1384,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Multiplicatorul Vieții Unităților rules.unitdamagemultiplier = Multiplicatorul Deteriorării Unităților rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Nucleele Contribuie la Limita Unităților rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index eaab89ae0e..e803850b40 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -257,7 +257,7 @@ trace = Отслеживать игрока trace.playername = Имя игрока: [accent]{0} trace.ip = IP: [accent]{0} trace.id = ID: [accent]{0} -trace.language = Language: [accent]{0} +trace.language = Язык: [accent]{0} trace.mobile = Мобильный клиент: [accent]{0} trace.modclient = Пользовательский клиент: [accent]{0} trace.times.joined = Присоединялся раз: [accent]{0} @@ -1146,6 +1146,7 @@ unit.minutes = мин unit.persecond = /сек unit.perminute = /мин unit.timesspeed = x скорость +unit.multiplier = x unit.percent = % unit.shieldhealth = прочность щита unit.items = предметов @@ -1222,6 +1223,7 @@ setting.mutemusic.name = Заглушить музыку setting.sfxvol.name = Громкость эффектов setting.mutesound.name = Заглушить звук setting.crashreport.name = Отправлять анонимные отчёты о вылетах +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Автоматическое создание сохранений setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Ограничение игроков @@ -1382,6 +1384,7 @@ rules.unitcostmultiplier = Множитель стоимости боев. ед. rules.unithealthmultiplier = Множитель прочности боев. ед. rules.unitdamagemultiplier = Множитель урона боев. ед. rules.unitcrashdamagemultiplier = Множитель урона от падения боев. ед. +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Множитель солнечной энергии rules.unitcapvariable = Ядра увеличивают лимит единиц rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties index c925b9af3a..f342cb801a 100644 --- a/core/assets/bundles/bundle_sr.properties +++ b/core/assets/bundles/bundle_sr.properties @@ -1148,6 +1148,7 @@ unit.minutes = minuti unit.persecond = /sekundi unit.perminute = /minuti unit.timesspeed = x brzina +unit.multiplier = x unit.percent = % unit.shieldhealth = snaga štita unit.items = materijali @@ -1224,6 +1225,7 @@ setting.mutemusic.name = Nema Muzike setting.sfxvol.name = Jačina Zvučnih Efekata setting.mutesound.name = Nema Zvuka setting.crashreport.name = Send Anonymous Crash Reports +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Automatski Snimaj Igru setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Limit Igrača @@ -1384,6 +1386,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Unit Health Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Jezgara Povećavaju Maksimalni Broj Jedinica rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 1afdc82be6..68a8c23fbc 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -1135,6 +1135,7 @@ unit.minutes = mins unit.persecond = /sek unit.perminute = /min unit.timesspeed = x hastighet +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = föremål @@ -1211,6 +1212,7 @@ setting.mutemusic.name = Stäng Av Musik setting.sfxvol.name = Ljudeffektvolym setting.mutesound.name = Stäng Av Ljudeffekter setting.crashreport.name = Skicka Anonyma Krashrapporter +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Auto-Create Saves setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit @@ -1371,6 +1373,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Unit Health Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 3eda7e72e9..ddc0d232ff 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -1149,6 +1149,7 @@ unit.minutes = นาที unit.persecond = /วิ unit.perminute = /นาที unit.timesspeed = x เร็วขึ้น +unit.multiplier = x unit.percent = % unit.shieldhealth = พลังชีวิตโล่ unit.items = ไอเท็ม @@ -1225,6 +1226,7 @@ setting.mutemusic.name = ปิดเสียงเพลง setting.sfxvol.name = ระดับเสียง SFX setting.mutesound.name = ปิดเสียง setting.crashreport.name = ส่งรายงานข้อขัดข้องแบบไม่ระบุตัวตน +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = สร้างเซฟโดยอัตโนมัติ setting.steampublichost.name = การมองเห็นเกมสาธารณะ setting.playerlimit.name = จำกัดผู้เล่น @@ -1385,6 +1387,7 @@ rules.unitcostmultiplier = พหูคุณราคาทรัพยาก rules.unithealthmultiplier = พหุคูณพลังชีวิตของยูนิต rules.unitdamagemultiplier = พหุคูณพลังโจมตีของยูนิต rules.unitcrashdamagemultiplier = พหูคูณดาเมจการตกของยานยูนิต +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = พหูคุณพลังงานแสงอาทิตย์ rules.unitcapvariable = เพิ่มจำนวนยูนิตสูงสุดต่อแกนกลาง rules.unitpayloadsexplode = สิ่งบรรทุกระเบิดไปพร้อมกับยูนิต diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index f03cb0534b..7076eacb11 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -1135,6 +1135,7 @@ unit.minutes = mins unit.persecond = /sec unit.perminute = /min unit.timesspeed = x speed +unit.multiplier = x unit.percent = % unit.shieldhealth = shield health unit.items = esya @@ -1211,6 +1212,7 @@ setting.mutemusic.name = Sesi kapat setting.sfxvol.name = Ses seviyesi setting.mutesound.name = Sesi kapat setting.crashreport.name = Send Anonymous Crash Reports +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Auto-Create Saves setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = Player Limit @@ -1371,6 +1373,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = Unit Health Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Solar Power Multiplier rules.unitcapvariable = Cores Contribute To Unit Cap rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index feed3ded11..5080bf4235 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -1144,6 +1144,7 @@ unit.minutes = dakika unit.persecond = /sn unit.perminute = /dk unit.timesspeed = x hız +unit.multiplier = x unit.percent = % unit.shieldhealth = kalkan canı unit.items = eşya @@ -1220,6 +1221,7 @@ setting.mutemusic.name = Müziği Kapat setting.sfxvol.name = Oyun Sesi setting.mutesound.name = Sesi Kapat setting.crashreport.name = Anonim Çökme Raporları Gönder +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Otomatik Kayıt Oluştur setting.steampublichost.name = Herkese Açık Oyun Görünürlüğü setting.playerlimit.name = Oyuncu Limiti @@ -1380,6 +1382,7 @@ rules.unitcostmultiplier = Birim Fiyat Çarpanı rules.unithealthmultiplier = Birim Can Çarpanı rules.unitdamagemultiplier = Birim Hasar Çapanı rules.unitcrashdamagemultiplier = Birim Çakılma Hasar Çarpanı +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Güneş Paneli Üretim Çarpanı rules.unitcapvariable = Merkezler Birim Sınırını Etkiler rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index c6046c3cee..fab28810eb 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -1155,6 +1155,7 @@ unit.minutes = хв. unit.persecond = за сек. unit.perminute = за хв. unit.timesspeed = x швидкість +unit.multiplier = x unit.percent = % unit.shieldhealth = міцність щита unit.items = предм. @@ -1231,6 +1232,7 @@ setting.mutemusic.name = Заглушити музику setting.sfxvol.name = Гучність звукових ефектів setting.mutesound.name = Заглушити звук setting.crashreport.name = Відсилати анонімні звіти про аварійне завершення гри +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Автоматичне створення збережень setting.steampublichost.name = Загальнодоступність гри setting.playerlimit.name = Обмеження гравців @@ -1391,6 +1393,7 @@ rules.unitcostmultiplier = Множник вартості одиниць rules.unithealthmultiplier = Множник здоров’я бойових одиниць rules.unitdamagemultiplier = Множник шкоди бойових одиниць rules.unitcrashdamagemultiplier = Множник шкоди одиниці при зіткненні одиниць +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Множник сонячної енергії rules.unitcapvariable = Ядра збільшують обмеження на кількість одиниць rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index 97bc940327..ed8d789fd6 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -1165,6 +1165,7 @@ unit.minutes = phút unit.persecond = /giây unit.perminute = /phút unit.timesspeed = x tốc độ +unit.multiplier = x unit.percent = % unit.shieldhealth = độ bền khiên unit.items = vật phẩm @@ -1241,6 +1242,7 @@ setting.mutemusic.name = Tắt nhạc setting.sfxvol.name = Âm lượng hiệu ứng âm thanh (SFX) setting.mutesound.name = Tắt âm setting.crashreport.name = Gửi báo cáo sự cố ẩn danh +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = Tự động tạo bản lưu setting.steampublichost.name = Hiển thị trò chơi công khai setting.playerlimit.name = Giới hạn người chơi @@ -1404,6 +1406,7 @@ rules.unitcostmultiplier = Hệ Số Chi Phí Sản Xuất Đơn Vị rules.unithealthmultiplier = Hệ Số Độ Bền Của Đơn Vị rules.unitdamagemultiplier = Hệ Số Sát Thương Của Đơn Vị rules.unitcrashdamagemultiplier = Hệ Số Sát Thương Của Đơn Vị Khi Bị Bắn Rơi +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = Hệ Số Năng Lượng Mặt Trời rules.unitcapvariable = Lõi Tăng Giới Hạn Đơn Vị rules.unitpayloadsexplode = Khối Hàng Mang Theo Phát Nổ Cùng Đơn Vị diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 2cc46aa133..00bc3d601a 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1157,6 +1157,7 @@ unit.minutes = 分 unit.persecond = /秒 unit.perminute = /分 unit.timesspeed = x速度 +unit.multiplier = x unit.percent = % unit.shieldhealth = 护盾容量 unit.items = 物品 @@ -1233,6 +1234,7 @@ setting.mutemusic.name = 禁用音乐 setting.sfxvol.name = 音效音量 setting.mutesound.name = 禁用音效 setting.crashreport.name = 发送匿名的崩溃报告 +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = 自动创建存档 setting.steampublichost.name = 公共游戏可见性 setting.playerlimit.name = 玩家数量限制 @@ -1393,6 +1395,7 @@ rules.unitcostmultiplier = 单位生产花费倍率 rules.unithealthmultiplier = 单位生命倍率 rules.unitdamagemultiplier = 单位伤害倍率 rules.unitcrashdamagemultiplier = 单位坠毁伤害倍率 +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = 太阳能发电倍率 rules.unitcapvariable = 核心可增加单位上限 rules.unitpayloadsexplode = 单位携带载荷与单位一起爆炸 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 96b922583d..7999cc78a5 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -1152,6 +1152,7 @@ unit.minutes = 分 unit.persecond = /秒 unit.perminute = /分 unit.timesspeed = ×速度 +unit.multiplier = x unit.percent = % unit.shieldhealth = 護盾生命值 unit.items = 物品 @@ -1228,6 +1229,7 @@ setting.mutemusic.name = 靜音 setting.sfxvol.name = 音效音量 setting.mutesound.name = 靜音 setting.crashreport.name = 傳送匿名當機回報 +setting.communityservers.name = Fetch Community Server List setting.savecreate.name = 自動建立存檔 setting.steampublichost.name = Public Game Visibility setting.playerlimit.name = 玩家數限制 @@ -1388,6 +1390,7 @@ rules.unitcostmultiplier = Unit Cost Multiplier rules.unithealthmultiplier = 單位血量加成 rules.unitdamagemultiplier = 單位傷害加成 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier +rules.unitminespeedmultiplier = Unit Mine Speed Multiplier rules.solarmultiplier = 太陽能電加成 rules.unitcapvariable = 核心限制單位上限 rules.unitpayloadsexplode = Carried Payloads Explode With The Unit diff --git a/core/assets/contributors b/core/assets/contributors index 8bcc1913ab..f939b3c30f 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -170,3 +170,4 @@ Mythril hexagon-recursion JasonP01 BlueTheCube +sasha0552 diff --git a/core/assets/music/coreLaunch.ogg b/core/assets/music/coreLaunch.ogg index b4a1b55a68..4dd82b35b8 100644 Binary files a/core/assets/music/coreLaunch.ogg and b/core/assets/music/coreLaunch.ogg differ diff --git a/core/assets/music/land.ogg b/core/assets/music/land.ogg index ef81ccc90a..d9ea5aa88c 100644 Binary files a/core/assets/music/land.ogg and b/core/assets/music/land.ogg differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a3029ec77b..f5770b55e7 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3754,6 +3754,7 @@ public class Blocks{ ammoUseEffect = Fx.casing3Double; ammoPerShot = 2; velocityRnd = 0.2f; + scaleLifetimeOffset = 1f / 9f; recoil = 6f; shake = 2f; range = 290f; diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index f44c617291..def60e56d6 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -92,7 +92,7 @@ public class Planets{ }}; //TODO names - gier = makeAsteroid("gier", erekir, Blocks.ferricStoneWall, Blocks.carbonWall, 0.4f, 7, 1f, gen -> { + gier = makeAsteroid("gier", erekir, Blocks.ferricStoneWall, Blocks.carbonWall, -5, 0.4f, 7, 1f, gen -> { gen.min = 25; gen.max = 35; gen.carbonChance = 0.6f; @@ -100,7 +100,7 @@ public class Planets{ gen.berylChance = 0.1f; }); - notva = makeAsteroid("notva", sun, Blocks.ferricStoneWall, Blocks.beryllicStoneWall, 0.55f, 9, 1.3f, gen -> { + notva = makeAsteroid("notva", sun, Blocks.ferricStoneWall, Blocks.beryllicStoneWall, -4, 0.55f, 9, 1.3f, gen -> { gen.berylChance = 0.8f; gen.iceChance = 0f; gen.carbonChance = 0.01f; @@ -158,7 +158,7 @@ public class Planets{ landCloudColor = Pal.spore.cpy().a(0.5f); }}; - verilus = makeAsteroid("verlius", sun, Blocks.stoneWall, Blocks.iceWall, 0.5f, 12, 2f, gen -> { + verilus = makeAsteroid("verlius", sun, Blocks.stoneWall, Blocks.iceWall, -1, 0.5f, 12, 2f, gen -> { gen.berylChance = 0f; gen.iceChance = 0.6f; gen.carbonChance = 0.1f; @@ -166,7 +166,7 @@ public class Planets{ }); } - private static Planet makeAsteroid(String name, Planet parent, Block base, Block tint, float tintThresh, int pieces, float scale, Cons cgen){ + private static Planet makeAsteroid(String name, Planet parent, Block base, Block tint, int seed, float tintThresh, int pieces, float scale, Cons cgen){ return new Planet(name, parent, 0.12f){{ hasAtmosphere = false; updateLighting = false; @@ -189,13 +189,13 @@ public class Planets{ Rand rand = new Rand(id + 2); meshes.add(new NoiseMesh( - this, 0, 2, radius, 2, 0.55f, 0.45f, 14f, + this, seed, 2, radius, 2, 0.55f, 0.45f, 14f, color, tinted, 3, 0.6f, 0.38f, tintThresh )); for(int j = 0; j < pieces; j++){ meshes.add(new MatMesh( - new NoiseMesh(this, j + 1, 1, 0.022f + rand.random(0.039f) * scale, 2, 0.6f, 0.38f, 20f, + new NoiseMesh(this, seed + j + 1, 1, 0.022f + rand.random(0.039f) * scale, 2, 0.6f, 0.38f, 20f, color, tinted, 3, 0.6f, 0.38f, tintThresh), new Mat3D().setToTranslation(Tmp.v31.setToRandomDirection(rand).setLength(rand.random(0.44f, 1.4f) * scale))) ); diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 1222eae1e6..b882706e83 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -815,7 +815,7 @@ public class NetServer implements ApplicationListener{ } case trace -> { PlayerInfo stats = netServer.admins.getInfo(other.uuid()); - TraceInfo info = new TraceInfo(other.con.address, other.uuid(), other.con.modclient, other.con.mobile, stats.timesJoined, stats.timesKicked, stats.ips.toArray(String.class), stats.names.toArray(String.class)); + TraceInfo info = new TraceInfo(other.con.address, other.uuid(), other.locale, other.con.modclient, other.con.mobile, stats.timesJoined, stats.timesKicked, stats.ips.toArray(String.class), stats.names.toArray(String.class)); if(player.con != null){ Call.traceInfo(player.con, other, info); }else{ diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java index a58a0503c3..4e9c28bc3d 100644 --- a/core/src/mindustry/entities/comp/MinerComp.java +++ b/core/src/mindustry/entities/comp/MinerComp.java @@ -65,7 +65,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{ } public boolean canMine(){ - return type.mineSpeed > 0 && type.mineTier >= 0; + return type.mineSpeed * state.rules.unitMineSpeed(team()) > 0 && type.mineTier >= 0; } @Override @@ -89,7 +89,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{ mineTile = null; mineTimer = 0f; }else if(mining() && item != null){ - mineTimer += Time.delta * type.mineSpeed; + mineTimer += Time.delta * type.mineSpeed * state.rules.unitMineSpeed(team()); if(Mathf.chance(0.06 * Time.delta)){ Fx.pulverizeSmall.at(mineTile.worldx() + Mathf.range(tilesize / 2f), mineTile.worldy() + Mathf.range(tilesize / 2f), 0f, item.color); diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index ef479e2956..bfbb28c18e 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -695,7 +695,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I type.deathExplosionEffect.at(x, y, bounds() / 2f / 8f); } - float shake = hitSize / 3f; + float shake = type.deathShake < 0 ? hitSize / 3f : type.deathShake; if(type.createScorch){ Effect.scorch(x, y, (int)(hitSize / 5)); diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index f2b940154c..1afebb99e9 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -84,6 +84,8 @@ public class Rules{ public float unitHealthMultiplier = 1f; /** How much damage unit crash damage deals. (Compounds with unitDamageMultiplier) */ public float unitCrashDamageMultiplier = 1f; + /** How fast units can mine. */ + public float unitMineSpeedMultiplier = 1f; /** If true, ghost blocks will appear upon destruction, letting builder blocks/units rebuild them. */ public boolean ghostBlocks = true; /** Whether to allow units to build with logic. */ @@ -262,6 +264,10 @@ public class Rules{ return unitDamage(team) * unitCrashDamageMultiplier * teams.get(team).unitCrashDamageMultiplier; } + public float unitMineSpeed(Team team){ + return unitMineSpeedMultiplier * teams.get(team).unitMineSpeedMultiplier; + } + public float blockHealth(Team team){ return blockHealthMultiplier * teams.get(team).blockHealthMultiplier; } @@ -312,6 +318,8 @@ public class Rules{ public float unitDamageMultiplier = 1f; /** How much damage unit crash damage deals. (Compounds with unitDamageMultiplier) */ public float unitCrashDamageMultiplier = 1f; + /** How fast units can mine. */ + public float unitMineSpeedMultiplier = 1f; /** Multiplier of resources that units take to build. */ public float unitCostMultiplier = 1f; /** How much health units start with. */ diff --git a/core/src/mindustry/graphics/g3d/HexSkyMesh.java b/core/src/mindustry/graphics/g3d/HexSkyMesh.java index a3cec1f170..434e22818f 100644 --- a/core/src/mindustry/graphics/g3d/HexSkyMesh.java +++ b/core/src/mindustry/graphics/g3d/HexSkyMesh.java @@ -27,7 +27,7 @@ public class HexSkyMesh extends PlanetMesh{ @Override public boolean skip(Vec3 position){ - return Simplex.noise3d(planet.id + seed, octaves, persistence, scl, position.x, position.y * 3f, position.z) >= thresh; + return Simplex.noise3d(7 + seed, octaves, persistence, scl, position.x, position.y * 3f, position.z) >= thresh; } }, divisions, false, planet.radius, radius), Shaders.clouds); diff --git a/core/src/mindustry/graphics/g3d/NoiseMesh.java b/core/src/mindustry/graphics/g3d/NoiseMesh.java index f6b8b7328e..88709c4021 100644 --- a/core/src/mindustry/graphics/g3d/NoiseMesh.java +++ b/core/src/mindustry/graphics/g3d/NoiseMesh.java @@ -14,7 +14,7 @@ public class NoiseMesh extends HexMesh{ this.mesh = MeshBuilder.buildHex(new HexMesher(){ @Override public float getHeight(Vec3 position){ - return Simplex.noise3d(planet.id + seed, octaves, persistence, scale, 5f + position.x, 5f + position.y, 5f + position.z) * mag; + return Simplex.noise3d(7 + seed, octaves, persistence, scale, 5f + position.x, 5f + position.y, 5f + position.z) * mag; } @Override @@ -31,12 +31,12 @@ public class NoiseMesh extends HexMesh{ this.mesh = MeshBuilder.buildHex(new HexMesher(){ @Override public float getHeight(Vec3 position){ - return Simplex.noise3d(planet.id + seed, octaves, persistence, scale, 5f + position.x, 5f + position.y, 5f + position.z) * mag; + return Simplex.noise3d(7 + seed, octaves, persistence, scale, 5f + position.x, 5f + position.y, 5f + position.z) * mag; } @Override public Color getColor(Vec3 position){ - return Simplex.noise3d(planet.id + seed + 1, coct, cper, cscl, 5f + position.x, 5f + position.y, 5f + position.z) > cthresh ? color2 : color1; + return Simplex.noise3d(8 + seed, coct, cper, cscl, 5f + position.x, 5f + position.y, 5f + position.z) > cthresh ? color2 : color1; } }, divisions, false, radius, 0.2f); } diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java index 5be1d54403..70f28cae9d 100644 --- a/core/src/mindustry/io/TypeIO.java +++ b/core/src/mindustry/io/TypeIO.java @@ -955,6 +955,7 @@ public class TypeIO{ public static void writeTraceInfo(Writes write, TraceInfo trace){ writeString(write, trace.ip); writeString(write, trace.uuid); + writeString(write, trace.locale); write.b(trace.modded ? (byte)1 : 0); write.b(trace.mobile ? (byte)1 : 0); write.i(trace.timesJoined); @@ -965,7 +966,7 @@ public class TypeIO{ } public static TraceInfo readTraceInfo(Reads read){ - return new TraceInfo(readString(read), readString(read), read.b() == 1, read.b() == 1, read.i(), read.i(), readStrings(read), readStrings(read)); + return new TraceInfo(readString(read), readString(read), readString(read), read.b() == 1, read.b() == 1, read.i(), read.i(), readStrings(read), readStrings(read)); } public static void writeStrings(Writes write, String[] strings, int maxLen){ diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index 2333fdc344..d1e0d95b5a 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -1515,7 +1515,7 @@ public class LExecutor{ state.rules.bannedUnits.remove(u); } } - case unitHealth, unitBuildSpeed, unitCost, unitDamage, blockHealth, blockDamage, buildSpeed, rtsMinSquad, rtsMinWeight -> { + case unitHealth, unitBuildSpeed, unitMineSpeed, unitCost, unitDamage, blockHealth, blockDamage, buildSpeed, rtsMinSquad, rtsMinWeight -> { Team team = p1.team(); if(team != null){ float num = value.numf(); @@ -1523,6 +1523,7 @@ public class LExecutor{ case buildSpeed -> team.rules().buildSpeedMultiplier = Mathf.clamp(num, 0.001f, 50f); case unitHealth -> team.rules().unitHealthMultiplier = Math.max(num, 0.001f); case unitBuildSpeed -> team.rules().unitBuildSpeedMultiplier = Mathf.clamp(num, 0f, 50f); + case unitMineSpeed -> team.rules().unitMineSpeedMultiplier = Math.max(num, 0f); case unitCost -> team.rules().unitCostMultiplier = Math.max(num, 0f); case unitDamage -> team.rules().unitDamageMultiplier = Math.max(num, 0f); case blockHealth -> team.rules().blockHealthMultiplier = Math.max(num, 0.001f); diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 11477feb1f..1daafcdb45 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -1493,11 +1493,11 @@ public class LStatements{ table.add("natural "); fields(table, natural, str -> natural = str); - table.add("x ").visible(() -> natural.equals("false")); - fields(table, x, str -> x = str).visible(() -> natural.equals("false")); + table.add("x ").visible(() -> !natural.equals("true")); + fields(table, x, str -> x = str).visible(() -> !natural.equals("true")); - table.add(" y ").visible(() -> natural.equals("false")); - fields(table, y, str -> y = str).visible(() -> natural.equals("false")); + table.add(" y ").visible(() -> !natural.equals("true")); + fields(table, y, str -> y = str).visible(() -> !natural.equals("true")); } @Override @@ -1547,7 +1547,7 @@ public class LStatements{ fields(table, "w", p3, s -> p3 = s); fields(table, "h", p4, s -> p4 = s); } - case buildSpeed, unitHealth, unitBuildSpeed, unitCost, unitDamage, blockHealth, blockDamage, rtsMinSquad, rtsMinWeight -> { + case buildSpeed, unitHealth, unitBuildSpeed, unitMineSpeed, unitCost, unitDamage, blockHealth, blockDamage, rtsMinSquad, rtsMinWeight -> { if(p1.equals("0")){ p1 = "@sharded"; } diff --git a/core/src/mindustry/logic/LogicRule.java b/core/src/mindustry/logic/LogicRule.java index 6ce8de4b35..211064e271 100644 --- a/core/src/mindustry/logic/LogicRule.java +++ b/core/src/mindustry/logic/LogicRule.java @@ -23,6 +23,7 @@ public enum LogicRule{ buildSpeed, unitHealth, unitBuildSpeed, + unitMineSpeed, unitCost, unitDamage, blockHealth, diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index da453afaa5..0f64b9850a 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -628,14 +628,15 @@ public class Administration{ } public static class TraceInfo{ - public String ip, uuid; + public String ip, uuid, locale; public boolean modded, mobile; public int timesJoined, timesKicked; public String[] ips, names; - public TraceInfo(String ip, String uuid, boolean modded, boolean mobile, int timesJoined, int timesKicked, String[] ips, String[] names){ + public TraceInfo(String ip, String uuid, String locale, boolean modded, boolean mobile, int timesJoined, int timesKicked, String[] ips, String[] names){ this.ip = ip; this.uuid = uuid; + this.locale = locale; this.modded = modded; this.mobile = mobile; this.timesJoined = timesJoined; diff --git a/core/src/mindustry/type/StatusEffect.java b/core/src/mindustry/type/StatusEffect.java index e344f652f0..05dc34595d 100644 --- a/core/src/mindustry/type/StatusEffect.java +++ b/core/src/mindustry/type/StatusEffect.java @@ -90,11 +90,11 @@ public class StatusEffect extends UnlockableContent{ @Override public void setStats(){ - if(damageMultiplier != 1) stats.addPercent(Stat.damageMultiplier, damageMultiplier); - if(healthMultiplier != 1) stats.addPercent(Stat.healthMultiplier, healthMultiplier); - if(speedMultiplier != 1) stats.addPercent(Stat.speedMultiplier, speedMultiplier); - if(reloadMultiplier != 1) stats.addPercent(Stat.reloadMultiplier, reloadMultiplier); - if(buildSpeedMultiplier != 1) stats.addPercent(Stat.buildSpeedMultiplier, buildSpeedMultiplier); + if(damageMultiplier != 1) stats.addMultModifier(Stat.damageMultiplier, damageMultiplier); + if(healthMultiplier != 1) stats.addMultModifier(Stat.healthMultiplier, healthMultiplier); + if(speedMultiplier != 1) stats.addMultModifier(Stat.speedMultiplier, speedMultiplier); + if(reloadMultiplier != 1) stats.addMultModifier(Stat.reloadMultiplier, reloadMultiplier); + if(buildSpeedMultiplier != 1) stats.addMultModifier(Stat.buildSpeedMultiplier, buildSpeedMultiplier); if(damage > 0) stats.add(Stat.damage, damage * 60f, StatUnit.perSecond); if(damage < 0) stats.add(Stat.healing, -damage * 60f, StatUnit.perSecond); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index ba68ea5b30..159a0b98e2 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -66,6 +66,8 @@ public class UnitType extends UnlockableContent implements Senseable{ accel = 0.5f, /** size of one side of the hitbox square */ hitSize = 6f, + /** shake on unit death */ + deathShake = -1f, /** shake on each step for leg/mech units */ stepShake = -1f, /** ripple / dust size for legged units */ diff --git a/core/src/mindustry/ui/Links.java b/core/src/mindustry/ui/Links.java index b3c756ba32..e614c24b1c 100644 --- a/core/src/mindustry/ui/Links.java +++ b/core/src/mindustry/ui/Links.java @@ -26,7 +26,7 @@ public class Links{ new LinkEntry("f-droid", "https://f-droid.org/packages/io.anuke.mindustry/", Icon.android, Color.valueOf("026aa7")), new LinkEntry("github", "https://github.com/Anuken/Mindustry/", Icon.github, Color.valueOf("24292e")), new LinkEntry("dev-builds", "https://github.com/Anuken/MindustryBuilds", Icon.githubSquare, Color.valueOf("fafbfc")), - new LinkEntry("bug", report(), Icon.wrench, Color.valueOf("cbd97f")) + new LinkEntry("bug", "https://github.com/Anuken/Mindustry/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml", Icon.wrench, Color.valueOf("cbd97f")) }; } @@ -52,33 +52,4 @@ public class Links{ this.title = Core.bundle.get("link." + name + ".title", Strings.capitalize(name.replace("-", " "))); } } - - private static String report(){ - return "https://github.com/Anuken/Mindustry/issues/new?assignees=&labels=bug&body=" + - Strings.encode(Strings.format( - """ - **Platform**: `@` - - **Build**: `@` - - **Issue**: *Explain your issue in detail.* - - **Steps to reproduce**: *How you happened across the issue, and what exactly you did to make the bug happen.* - - **Link(s) to mod(s) used**: `@` - - **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.* - - **Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.* - - --- - - *Place an X (no spaces) between the brackets to confirm that you have read the line below.* - - [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.** - - [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.** - """, - OS.isAndroid ? "Android " + Core.app.getVersion() : (OS.osName + " x" + OS.osArchBits), - Version.combined(), - Vars.mods.list().any() ? Vars.mods.list().select(LoadedMod::enabled).map(l -> l.meta.author + "/" + l.name + ":" + l.meta.version) : "none")); - } -} \ No newline at end of file +} diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 9c2dd94759..2eb0b17cde 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -265,6 +265,7 @@ public class CustomRulesDialog extends BaseDialog{ numberi("@rules.unitcap", f -> rules.unitCap = f, () -> rules.unitCap, -999, 999); number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier); number("@rules.unitcrashdamagemultiplier", f -> rules.unitCrashDamageMultiplier = f, () -> rules.unitCrashDamageMultiplier); + number("@rules.unitminespeedmultiplier", f -> rules.unitMineSpeedMultiplier = f, () -> rules.unitMineSpeedMultiplier); number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0f, 50f); number("@rules.unitcostmultiplier", f -> rules.unitCostMultiplier = f, () -> rules.unitCostMultiplier); number("@rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier); @@ -383,6 +384,7 @@ public class CustomRulesDialog extends BaseDialog{ number("@rules.unitdamagemultiplier", f -> teams.unitDamageMultiplier = f, () -> teams.unitDamageMultiplier); number("@rules.unitcrashdamagemultiplier", f -> teams.unitCrashDamageMultiplier = f, () -> teams.unitCrashDamageMultiplier); + number("@rules.unitminespeedmultiplier", f -> teams.unitMineSpeedMultiplier = f, () -> teams.unitMineSpeedMultiplier); number("@rules.unitbuildspeedmultiplier", f -> teams.unitBuildSpeedMultiplier = f, () -> teams.unitBuildSpeedMultiplier, 0.001f, 50f); number("@rules.unitcostmultiplier", f -> teams.unitCostMultiplier = f, () -> teams.unitCostMultiplier); number("@rules.unithealthmultiplier", f -> teams.unitHealthMultiplier = f, () -> teams.unitHealthMultiplier); diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index cd9a8ead09..3147a1c196 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -138,7 +138,9 @@ public class JoinDialog extends BaseDialog{ refreshLocal(); refreshRemote(); - refreshCommunity(); + if(Core.settings.getBool("communityservers", true)){ + refreshCommunity(); + } } void setupRemote(){ @@ -317,7 +319,9 @@ public class JoinDialog extends BaseDialog{ section(steam ? "@servers.local.steam" : "@servers.local", local, false); section("@servers.remote", remote, false); - section("@servers.global", global, true); + if(Core.settings.getBool("communityservers", true)){ + section("@servers.global", global, true); + } ScrollPane pane = new ScrollPane(hosts); pane.setFadeScrollBars(false); @@ -631,12 +635,18 @@ public class JoinDialog extends BaseDialog{ Core.settings.remove("server-list"); } - var urls = Version.type.equals("bleeding-edge") || Vars.forceBeServers ? serverJsonBeURLs : serverJsonURLs; - - fetchServers(urls, 0); + fetchServers(); } - private void fetchServers(String[] urls, int index){ + public static void fetchServers(){ + var urls = Version.type.equals("bleeding-edge") || Vars.forceBeServers ? serverJsonBeURLs : serverJsonURLs; + + if(Core.settings.getBool("communityservers", true)){ + fetchServers(urls, 0); + } + } + + private static void fetchServers(String[] urls, int index){ if(index >= urls.length) return; //get servers diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 87e3ad7f61..9b2cc277ed 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -333,6 +333,13 @@ public class SettingsMenuDialog extends BaseDialog{ game.checkPref("crashreport", true); } + game.checkPref("communityservers", true, val -> { + defaultServers.clear(); + if(val){ + JoinDialog.fetchServers(); + } + }); + game.checkPref("savecreate", true); game.checkPref("blockreplace", true); game.checkPref("conveyorpathfinding", true); diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java index a758e22fb3..402df45189 100644 --- a/core/src/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/mindustry/ui/dialogs/TraceDialog.java @@ -34,6 +34,8 @@ public class TraceDialog extends BaseDialog{ c.add(Core.bundle.format("trace.playername", player.name)).row(); c.button(Icon.copySmall, style, () -> copy(info.ip)).size(s).padRight(4f); c.add(Core.bundle.format("trace.ip", info.ip)).row(); + c.button(Icon.copySmall, style, () -> copy(info.locale)).size(s).padRight(4f); + c.add(Core.bundle.format("trace.language", info.locale)).row(); c.button(Icon.copySmall, style, () -> copy(info.uuid)).size(s).padRight(4f); c.add(Core.bundle.format("trace.id", info.uuid)).row(); }).row(); diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java index 3fa4732ebe..3cad24224f 100644 --- a/core/src/mindustry/world/blocks/defense/Door.java +++ b/core/src/mindustry/world/blocks/defense/Door.java @@ -26,6 +26,7 @@ public class Door extends Wall{ public Effect openfx = Fx.dooropen; public Effect closefx = Fx.doorclose; public Sound doorSound = Sounds.door; + public boolean chainEffect = false; public @Load("@-open") TextureRegion openRegion; public Door(String name){ @@ -44,6 +45,7 @@ public class Door extends Wall{ continue; } + if(chainEffect) entity.effect(); entity.open = open; pathfinder.updateTile(entity.tile()); } diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 617a9c3752..e08c0b5420 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -54,6 +54,8 @@ public class Turret extends ReloadTurret{ public float inaccuracy = 0f; /** Fraction of bullet velocity that is random. */ public float velocityRnd = 0f; + /** Fraction of lifetime that is added to bullets with lifeScale. */ + public float scaleLifetimeOffset = 0f; /** Maximum angle difference in degrees at which turret will still try to shoot. */ public float shootCone = 8f; /** Turret shoot point. */ @@ -640,7 +642,7 @@ public class Turret extends ReloadTurret{ bulletY = y + Angles.trnsy(rotation - 90, shootX + xOffset + xSpread, shootY + yOffset), shootAngle = rotation + angleOffset + Mathf.range(inaccuracy + type.inaccuracy); - float lifeScl = type.scaleLife ? Mathf.clamp(Mathf.dst(bulletX, bulletY, targetPos.x, targetPos.y) / type.range, minRange / type.range, range() / type.range) : 1f; + float lifeScl = type.scaleLife ? Mathf.clamp((1 + scaleLifetimeOffset) * Mathf.dst(bulletX, bulletY, targetPos.x, targetPos.y) / type.range, minRange / type.range, range() / type.range) : 1f; //TODO aimX / aimY for multi shot turrets? handleBullet(type.create(this, team, bulletX, bulletY, shootAngle, -1f, (1f - velocityRnd) + Mathf.random(velocityRnd), lifeScl, null, mover, targetPos.x, targetPos.y), xOffset, yOffset, shootAngle - rotation); diff --git a/core/src/mindustry/world/blocks/power/PowerDiode.java b/core/src/mindustry/world/blocks/power/PowerDiode.java index 5fa2e1ba50..1dc0f016c3 100644 --- a/core/src/mindustry/world/blocks/power/PowerDiode.java +++ b/core/src/mindustry/world/blocks/power/PowerDiode.java @@ -62,20 +62,23 @@ public class PowerDiode extends Block{ PowerGraph frontGraph = front().power.graph; if(backGraph == frontGraph) return; - // 0f - 1f of battery capacity in use - float backStored = backGraph.getBatteryStored() / backGraph.getTotalBatteryCapacity(); - float frontStored = frontGraph.getBatteryStored() / frontGraph.getTotalBatteryCapacity(); + float backStored = backGraph.getBatteryStored(); + float backCapacity = backGraph.getTotalBatteryCapacity(); + float frontStored = frontGraph.getBatteryStored(); + float frontCapacity = frontGraph.getTotalBatteryCapacity(); - // try to send if the back side has more % capacity stored than the front side - if(backStored > frontStored){ - // send half of the difference - float amount = backGraph.getBatteryStored() * (backStored - frontStored) / 2; - // prevent sending more than the front can handle - amount = Mathf.clamp(amount, 0, frontGraph.getTotalBatteryCapacity() * (1 - frontStored)); + if(backStored/backCapacity <= frontStored/frontCapacity) return; - backGraph.transferPower(-amount); - frontGraph.transferPower(amount); - } + float targetPercentage = (frontStored + backStored) / (frontCapacity + backCapacity); + + // send half of the difference + float amount = (targetPercentage * frontCapacity - frontStored) / 2; + + // prevent sending more than the front can handle + amount = Mathf.clamp(amount, 0, frontCapacity - frontStored); + + backGraph.transferPower(-amount); + frontGraph.transferPower(amount); } } -} +} \ No newline at end of file diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java index 4362c6ecdd..917b88937d 100644 --- a/core/src/mindustry/world/meta/StatUnit.java +++ b/core/src/mindustry/world/meta/StatUnit.java @@ -29,6 +29,7 @@ public class StatUnit{ perMinute = new StatUnit("perMinute", false), perShot = new StatUnit("perShot", false), timesSpeed = new StatUnit("timesSpeed", false), + multiplier = new StatUnit("multiplier", false), percent = new StatUnit("percent", false), shieldHealth = new StatUnit("shieldHealth"), none = new StatUnit("none"), diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index 8547834614..e896dd5966 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -69,6 +69,48 @@ public class StatValues{ return number(value, unit, false); } + public static StatValue multiplierModifier(float value, StatUnit unit, boolean merge){ + return table -> { + String l1 = (unit.icon == null ? "" : unit.icon + " ") + multStat(value), l2 = (unit.space ? " " : "") + unit.localized(); + + if(merge){ + table.add(l1 + l2).left(); + }else{ + table.add(l1).left(); + table.add(l2).left(); + } + }; + } + + public static StatValue multiplierModifier(float value, StatUnit unit){ + return multiplierModifier(value, unit, true); + } + + public static StatValue multiplierModifier(float value){ + return multiplierModifier(value, StatUnit.multiplier); + } + + public static StatValue percentModifier(float value, StatUnit unit, boolean merge){ + return table -> { + String l1 = (unit.icon == null ? "" : unit.icon + " ") + ammoStat((value - 1) * 100), l2 = (unit.space ? " " : "") + unit.localized(); + + if(merge){ + table.add(l1 + l2).left(); + }else{ + table.add(l1).left(); + table.add(l2).left(); + } + }; + } + + public static StatValue percentModifier(float value, StatUnit unit){ + return percentModifier(value, unit, true); + } + + public static StatValue percentModifier(float value){ + return percentModifier(value, StatUnit.percent); + } + public static StatValue liquid(Liquid liquid, float amount, boolean perSecond){ return table -> table.add(displayLiquid(liquid, amount, perSecond)); } @@ -691,6 +733,10 @@ public class StatValues{ return (val > 0 ? "[stat]+" : "[negstat]") + Strings.autoFixed(val, 1); } + private static String multStat(float val){ + return (val >= 1 ? "[stat]" : "[negstat]") + Strings.autoFixed(val, 2); + } + private static TextureRegion icon(UnlockableContent t){ return t.uiIcon; } diff --git a/core/src/mindustry/world/meta/Stats.java b/core/src/mindustry/world/meta/Stats.java index b776994228..e59bae797c 100644 --- a/core/src/mindustry/world/meta/Stats.java +++ b/core/src/mindustry/world/meta/Stats.java @@ -32,6 +32,16 @@ public class Stats{ add(stat, StatValues.number((int)(value * 100), StatUnit.percent)); } + /** Adds a multiplicative modifier stat value. Value is assumed to be in the 0-1 range. */ + public void addMultModifier(Stat stat, float value){ + add(stat, StatValues.multiplierModifier(value)); + } + + /** Adds an percent modifier stat value. Value is assumed to be in the 0-1 range. */ + public void addPercentModifier(Stat stat, float value){ + add(stat, StatValues.percentModifier(value)); + } + /** Adds a single y/n boolean value. */ public void add(Stat stat, boolean value){ add(stat, StatValues.bool(value)); diff --git a/servers_v7.json b/servers_v7.json index e3d65239f0..5b25ee9cee 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -8,10 +8,16 @@ "121.127.37.17:6570", "121.127.37.17:6571", "121.127.37.17:6572", + "194.164.245.218:6567", + "194.164.245.218:6568", + "194.164.245.218:6569", "194.164.245.218:6570", "194.164.245.218:6571", "194.164.245.218:6572", - "194.164.245.218:6573" + "194.164.245.218:6573", + "194.164.245.218:6574", + "194.164.245.218:6575", + "194.164.245.218:6576" ] }, { @@ -215,7 +221,8 @@ "name": "Realm of Serene Lime", "address": [ "mindustry.icu", - "sx.mindustry.icu" + "sx.mindustry.icu", + "9k38.igla.pics" ] }, { @@ -319,5 +326,14 @@ "address": [ "mindustry.kr" ] + }, + { + "name": "Extra Utilities", + "address": [ + "yuyu.mindustry.ink", + "cn.mindustry.ink", + "203.135.99.51:15142", + "203.135.99.51:15143" + ] } ]