From 335c880af2e70dd5a9b19274842214fd044316de Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 5 Mar 2019 11:36:55 -0500 Subject: [PATCH] Bundle update / Unit factory active stats --- core/assets/bundles/bundle.properties | 2 ++ core/assets/bundles/bundle_cs.properties | 5 +++++ core/assets/bundles/bundle_de.properties | 5 +++++ core/assets/bundles/bundle_es.properties | 5 +++++ core/assets/bundles/bundle_fr.properties | 5 +++++ core/assets/bundles/bundle_fr_BE.properties | 5 +++++ core/assets/bundles/bundle_in_ID.properties | 5 +++++ core/assets/bundles/bundle_it.properties | 5 +++++ core/assets/bundles/bundle_ja.properties | 5 +++++ core/assets/bundles/bundle_ko.properties | 5 +++++ core/assets/bundles/bundle_nl.properties | 5 +++++ core/assets/bundles/bundle_pl.properties | 5 +++++ core/assets/bundles/bundle_pt_BR.properties | 5 +++++ core/assets/bundles/bundle_ru.properties | 5 +++++ core/assets/bundles/bundle_tk.properties | 5 +++++ core/assets/bundles/bundle_tr.properties | 5 +++++ core/assets/bundles/bundle_uk_UA.properties | 5 +++++ core/assets/bundles/bundle_zh_CN.properties | 5 +++++ core/assets/bundles/bundle_zh_TW.properties | 5 +++++ .../io/anuke/mindustry/world/blocks/units/UnitFactory.java | 7 ++++--- core/src/io/anuke/mindustry/world/meta/BlockStat.java | 1 + 21 files changed, 97 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 193849cdbb..4996509f20 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -334,6 +334,7 @@ blocks.inputitems = Input Items blocks.outputitem = Output Item blocks.drilltier = Drillables blocks.drillspeed = Base Drill Speed +blocks.maxunits = Max Active Units blocks.liquidoutput = Liquid Output blocks.liquidoutputspeed = Liquid Output Speed blocks.liquiduse = Liquid Use @@ -348,6 +349,7 @@ blocks.health = Health blocks.heat = Heat blocks.power = Power blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Inaccuracy blocks.shots = Shots diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index f0a5cbd219..ed0252afd5 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -299,6 +299,7 @@ no = Ne info.title = Informace error.title = [crimson]Objevila se chyba error.crashtitle = Objevila se chyba +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Informace o bloku blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Vstupní předměty blocks.outputitem = Výstupní předmět blocks.drilltier = Vrtatelné blocks.drillspeed = Základní rychlost vrtu +blocks.maxunits = Max Active Units blocks.liquidoutput = Výstup tekutin blocks.liquidoutputspeed = Rychlost výstupu tekutin blocks.liquiduse = Spotřebuje tekutin @@ -338,7 +340,10 @@ blocks.liquidfueluse = Spotřeba Paliva-tekutiny blocks.boostitem = Předmět pro zrychlení blocks.boostliquid = Tekutina pro zrychlení blocks.health = Životy +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Nepřesnost/výchylka blocks.shots = Střely diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 8ea99795d4..b765dd1561 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -299,6 +299,7 @@ no = Nein info.title = [accent]Info error.title = [crimson] Ein Fehler ist aufgetreten error.crashtitle = Ein Fehler ist aufgetreten! +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Blockinfo: blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Akzeptierte Materialien blocks.outputitem = Erzeugtes Material blocks.drilltier = Abbaubare Erze blocks.drillspeed = Bohrgeschwindigkeit +blocks.maxunits = Max Active Units blocks.liquidoutput = Erzeugte Flüssigkeit blocks.liquidoutputspeed = Ausgabegeschwindigkeit blocks.liquiduse = Flüssigkeitsverbrauch @@ -338,7 +340,10 @@ blocks.liquidfueluse = Kraftstoffverbrauch blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Lebenspunkte +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Ungenauigkeit blocks.shots = Schüsse diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index eaa840bb75..fbc5cdd237 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -299,6 +299,7 @@ no = No info.title = [accent]Información error.title = [crimson]Un error ha ocurrido. error.crashtitle = Un error ha ocurrido. +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Información del Bloque blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Objetos de Entrada blocks.outputitem = Objeto de Salida blocks.drilltier = Taladrables blocks.drillspeed = Velocidad Base del Taladro +blocks.maxunits = Max Active Units blocks.liquidoutput = Líquido de Salida blocks.liquidoutputspeed = Velocidad de Salida del Líquido blocks.liquiduse = Uso de Líquido @@ -338,7 +340,10 @@ blocks.liquidfueluse = Uso del Combustible Líquido blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Vida +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Imprecisión blocks.shots = Disparos diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 0a171758d7..9cec84464a 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -299,6 +299,7 @@ no = Non info.title = Info error.title = [crimson]Une erreur s'est produite error.crashtitle = Une erreur s'est produite +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Info sur le bloc blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Objets utilisés blocks.outputitem = Objet produit blocks.drilltier = Forable blocks.drillspeed = Vitesse de forage de base +blocks.maxunits = Max Active Units blocks.liquidoutput = Liquide en sortie blocks.liquidoutputspeed = Vitesse de production de liquide blocks.liquiduse = Quantité de liquide utilisée @@ -338,7 +340,10 @@ blocks.liquidfueluse = Quantité de carburant liquide utilisé blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Santé +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Précision blocks.shots = Tir diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index 2aa106afcf..d33c0c4df7 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -299,6 +299,7 @@ no = Non info.title = Info error.title = [crimson]Une erreur s'est produite error.crashtitle = Une erreur s'est produite +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Info sur le bloc blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Objets utilisés blocks.outputitem = Objet produit blocks.drilltier = Forable blocks.drillspeed = Vitesse de forage de base +blocks.maxunits = Max Active Units blocks.liquidoutput = Liquide en sortie blocks.liquidoutputspeed = Vitesse de sortie du liquide blocks.liquiduse = Quantité de liquide utilisé @@ -338,7 +340,10 @@ blocks.liquidfueluse = Quantité de carburant liquide utilisé blocks.boostitem = Objet boostant la production blocks.boostliquid = Liquide boostant la production blocks.health = Santé +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Précision blocks.shots = Tirs diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index bc3acd9d0b..01f7359b97 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -299,6 +299,7 @@ no = No info.title = [accent]Info error.title = [crimson]Telah terjadi kesalahan error.crashtitle = Telah terjadi kesalahan +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Info Blok blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Input Items blocks.outputitem = Output Item blocks.drilltier = Drillables blocks.drillspeed = Base Drill Speed +blocks.maxunits = Max Active Units blocks.liquidoutput = Liquid Output blocks.liquidoutputspeed = Liquid Output Speed blocks.liquiduse = Liquid Use @@ -338,7 +340,10 @@ blocks.liquidfueluse = Liquid Fuel Use blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Darah +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Ketidaktelitian blocks.shots = Tembakan diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 732c5f8284..cd6026aed3 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -299,6 +299,7 @@ no = No info.title = [accent] Info error.title = [crimson]Si è verificato un errore error.crashtitle = Si è verificato un errore +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = info sul blocco blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Oggetti in entrata blocks.outputitem = Oggetti in uscita blocks.drilltier = Scavabili blocks.drillspeed = Velocità scavo stbile +blocks.maxunits = Max Active Units blocks.liquidoutput = Uscita liquidi blocks.liquidoutputspeed = Liquid Output Speed blocks.liquiduse = Uso liquidi @@ -338,7 +340,10 @@ blocks.liquidfueluse = Utilizzo carburante liquido blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Salute +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Inaccuratezza blocks.shots = Colpi diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 7201bd7f0f..684b3b7722 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -299,6 +299,7 @@ no = いいえ info.title = 情報 error.title = [crimson]エラーが発生しました error.crashtitle = エラーが発生しました +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = ブロック情報 blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = 必要なアイテム blocks.outputitem = 搬出アイテム blocks.drilltier = ドリル blocks.drillspeed = 基本採掘速度 +blocks.maxunits = Max Active Units blocks.liquidoutput = 搬出液体 blocks.liquidoutputspeed = 液体搬出速度 blocks.liquiduse = 液体使用量 @@ -338,7 +340,10 @@ blocks.liquidfueluse = 液体燃料使用量 blocks.boostitem = 加速アイテム blocks.boostliquid = 加速液体 blocks.health = 耐久値 +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = 精度のずれ blocks.shots = ショット diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 382ada0a2a..a96c4ef143 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -299,6 +299,7 @@ no = 아니오 info.title = [accent]정보 error.title = [crimson]오류가 발생했습니다. error.crashtitle = 오류가 발생했습니다. +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = 블록 정보 blocks.powerbalance = 전력: {0} @@ -327,6 +328,7 @@ blocks.inputitems = 사용되는 아이템들 blocks.outputitem = 출력 아이템 blocks.drilltier = 드릴 blocks.drillspeed = 기본 드릴 속도 +blocks.maxunits = Max Active Units blocks.liquidoutput = 액체 출력 blocks.liquidoutputspeed = 액체 출력속도 blocks.liquiduse = 액체 사용량 @@ -338,7 +340,10 @@ blocks.liquidfueluse = 액체 연료 사용 blocks.boostitem = 가속 아이템 blocks.boostliquid = 가속 액체 blocks.health = 체력 +blocks.heat = Heat blocks.power = 전력 +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = 전력 만족도 blocks.inaccuracy = 오차각 blocks.shots = 발포 횟수 diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index b52695fe06..0daab7daf2 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -299,6 +299,7 @@ no = No info.title = Info error.title = [crimson]An error has occured error.crashtitle = An error has occured +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Block Info blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Input Items blocks.outputitem = Output Item blocks.drilltier = Drillables blocks.drillspeed = Base Drill Speed +blocks.maxunits = Max Active Units blocks.liquidoutput = Liquid Output blocks.liquidoutputspeed = Liquid Output Speed blocks.liquiduse = Liquid Use @@ -338,7 +340,10 @@ blocks.liquidfueluse = Liquid Fuel Use blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Health +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Inaccuracy blocks.shots = Shots diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 9b46ba7ec5..0de029a1a5 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -299,6 +299,7 @@ no = Nie ma mowy! info.title = [accent]Informacje error.title = [crimson]Wystąpił błąd error.crashtitle = Wystąpił błąd +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Informacje o bloku blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Materiały do produkcji blocks.outputitem = Produkty blocks.drilltier = Co może wykopać blocks.drillspeed = Postawowa szybkość kopania +blocks.maxunits = Max Active Units blocks.liquidoutput = Wyprodukowany płyn blocks.liquidoutputspeed = Prędkość odpływu cieczy blocks.liquiduse = Zużycie płynów @@ -338,7 +340,10 @@ blocks.liquidfueluse = Zużycie paliwa blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Zdrowie +blocks.heat = Heat blocks.power = Prąd +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Zapotrzebowanie Prądu blocks.inaccuracy = Niedokładność blocks.shots = Strzały diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 47c2d2b5cb..e343b6b962 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -299,6 +299,7 @@ no = Não info.title = [accent]Informação error.title = [crimson]Ocorreu um Erro. error.crashtitle = Ocorreu um Erro +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Informação do Bloco blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Itens de entrada blocks.outputitem = Itens de saida blocks.drilltier = Furaveis blocks.drillspeed = Velocidade da furadeira base +blocks.maxunits = Max Active Units blocks.liquidoutput = Saida de liquido blocks.liquidoutputspeed = Velocidade da saida de líquido blocks.liquiduse = Uso de liquido @@ -338,7 +340,10 @@ blocks.liquidfueluse = Uso do liquido de combustivel blocks.boostitem = Acelerar item blocks.boostliquid = Acelerar líquido blocks.health = Saúde +blocks.heat = Heat blocks.power = Poder +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = Imprecisão blocks.shots = Tiros diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index cc8e8b8235..5949726cca 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -299,6 +299,7 @@ no = Нет info.title = Информация error.title = [crimson]Произошла ошибка error.crashtitle = Произошла ошибка +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Информация о блоке blocks.powerbalance = Энергия: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Входящие предметы blocks.outputitem = Выходящий предмет blocks.drilltier = Добывает blocks.drillspeed = Базовая скорость сверления +blocks.maxunits = Max Active Units blocks.liquidoutput = Выходящая жидкость blocks.liquidoutputspeed = Выходная скорость жидкости blocks.liquiduse = Используется жидкости @@ -338,7 +340,10 @@ blocks.liquidfueluse = Жидкого топлива используется blocks.boostitem = Ускоряющий предмет blocks.boostliquid = Ускоряющая жидкость blocks.health = Здоровье +blocks.heat = Heat blocks.power = Энергия +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Энергии хватает blocks.inaccuracy = Разброс blocks.shots = Выстрелы diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index ddbb958236..306c42070c 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -299,6 +299,7 @@ no = Hayir info.title = [accent]Bilgi error.title = [crimson]Bir hata olustu error.crashtitle = Bir hata olustu +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Yapi bilgisi blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Giris esyalari blocks.outputitem = Sonuc blocks.drilltier = Kazilabilirler blocks.drillspeed = Ana kazma hizi +blocks.maxunits = Max Active Units blocks.liquidoutput = Sivi cikisi blocks.liquidoutputspeed = Liquid Output Speed blocks.liquiduse = Sivi kullanimi @@ -338,7 +340,10 @@ blocks.liquidfueluse = Sivi yakit kullanimi blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Can +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = sekme blocks.shots = vuruslar diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 9dc1bba1a2..260b169a09 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -299,6 +299,7 @@ no = No info.title = [Vurgu] Bilgi error.title = [crimson] Bir hata oluştu error.crashtitle = Bir hata oluştu +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Blok Bilgisi blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Input Items blocks.outputitem = Output Item blocks.drilltier = Drillables blocks.drillspeed = Base Drill Speed +blocks.maxunits = Max Active Units blocks.liquidoutput = Liquid Output blocks.liquidoutputspeed = Liquid Output Speed blocks.liquiduse = Liquid Use @@ -338,7 +340,10 @@ blocks.liquidfueluse = Liquid Fuel Use blocks.boostitem = Boost Item blocks.boostliquid = Boost Liquid blocks.health = Can +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = yanlışlık blocks.shots = atışlar diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index abe63f32a0..ae0404a843 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -299,6 +299,7 @@ no = Ні info.title = Інформація error.title = [crimson]Виникла помилка error.crashtitle = Виникла помилка +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = Інформація про блок blocks.powerbalance = Енергія: {0} @@ -327,6 +328,7 @@ blocks.inputitems = Вхідні предмети blocks.outputitem = Вихідний предмет blocks.drilltier = Видобуває blocks.drillspeed = Базова швидкість свердління +blocks.maxunits = Max Active Units blocks.liquidoutput = Вихідна рідина blocks.liquidoutputspeed = Швидкість вихідної рідини blocks.liquiduse = Використовуеться рідин @@ -338,7 +340,10 @@ blocks.liquidfueluse = Рідкого палива використовуеть blocks.boostitem = Прискорюючий предмет blocks.boostliquid = Прискорююча рідина blocks.health = Здоров'я +blocks.heat = Heat blocks.power = Енергія +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Енергії вистачає blocks.inaccuracy = Розкид blocks.shots = Постріли diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 036627526f..06395bf941 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -299,6 +299,7 @@ no = 不 info.title = [accent]详情 error.title = [crimson]发生了一个错误 error.crashtitle = 发生了一个错误 +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]??? blocks.blockinfo = 方块详情 blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = 物品输入 blocks.outputitem = 物品输出 blocks.drilltier = 可钻探矿物 blocks.drillspeed = 基础钻探速度 +blocks.maxunits = Max Active Units blocks.liquidoutput = 液体输出 blocks.liquidoutputspeed = 液体输出速度 blocks.liquiduse = 液体使用速度 @@ -338,7 +340,10 @@ blocks.liquidfueluse = 液体燃料使用速度 blocks.boostitem = 强化物件 blocks.boostliquid = 强化液体 blocks.health = 生命值 +blocks.heat = Heat blocks.power = 电力 +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = 电力见面 blocks.inaccuracy = 误差 blocks.shots = 发射数 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index f29339b24a..6627f22664 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -299,6 +299,7 @@ no = 否 info.title = [accent]資訊 error.title = [crimson]發生錯誤 error.crashtitle = 發生錯誤 +blocks.outputspeed = Drill Speed: {0}/s blocks.unknown = [LIGHT_GRAY]？？？ blocks.blockinfo = 方塊資訊 blocks.powerbalance = Power: {0} @@ -327,6 +328,7 @@ blocks.inputitems = 輸入物品 blocks.outputitem = 輸出物品 blocks.drilltier = 可鑽取礦物 blocks.drillspeed = 基本鑽取速度 +blocks.maxunits = Max Active Units blocks.liquidoutput = 輸出液體 blocks.liquidoutputspeed = 輸出液體速度 blocks.liquiduse = 使用液體速度 @@ -338,7 +340,10 @@ blocks.liquidfueluse = 使用液體燃料速度 blocks.boostitem = 強化物品 blocks.boostliquid = 強化液體 blocks.health = 耐久度 +blocks.heat = Heat blocks.power = Power +blocks.progress = Build Progress +blocks.spawned = Units: {0}/{1} blocks.power.satisfaction = Power Satisfaction blocks.inaccuracy = 誤差 blocks.shots = 射擊數 diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index da0c8cffe6..6e5316b31c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -89,6 +89,7 @@ public class UnitFactory extends Block{ public void setBars(){ super.setBars(); bars.add("progress", entity -> new Bar("blocks.progress", Pal.ammo, () -> ((UnitFactoryEntity)entity).buildTime / produceTime)); + bars.add("spawned", entity -> new Bar(() -> Core.bundle.format("blocks.spawned", ((UnitFactoryEntity)entity).spawned, maxSpawn), () -> Pal.command, () -> (float)((UnitFactoryEntity)entity).spawned / maxSpawn)); } @Override @@ -101,6 +102,7 @@ public class UnitFactory extends Block{ super.setStats(); stats.add(BlockStat.craftSpeed, produceTime / 60f, StatUnit.seconds); + stats.add(BlockStat.maxUnits, maxSpawn, StatUnit.none); } @Override @@ -149,8 +151,6 @@ public class UnitFactory extends Block{ public void update(Tile tile){ UnitFactoryEntity entity = tile.entity(); - entity.time += entity.delta() * entity.speedScl; - if(entity.spawned >= maxSpawn){ return; } @@ -163,7 +163,7 @@ public class UnitFactory extends Block{ //player-made spawners have default behavior if(hasRequirements(entity.items, entity.buildTime / produceTime) && entity.cons.valid()){ - + entity.time += entity.delta() * entity.speedScl; entity.buildTime += entity.delta() * entity.power.satisfaction; entity.speedScl = Mathf.lerpDelta(entity.speedScl, 1f, 0.05f); }else{ @@ -172,6 +172,7 @@ public class UnitFactory extends Block{ //check if grace period had passed }else if(entity.warmup > produceTime*gracePeriodMultiplier){ float speedMultiplier = Math.min(0.1f + (entity.warmup - produceTime * gracePeriodMultiplier) / speedupTime, maxSpeedup); + entity.time += entity.delta() * entity.speedScl; //otherwise, it's an enemy, cheat by not requiring resources entity.buildTime += entity.delta() * speedMultiplier; entity.speedScl = Mathf.lerpDelta(entity.speedScl, 1f, 0.05f); diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java index d34423625c..21fa588ea0 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java @@ -39,6 +39,7 @@ public enum BlockStat{ outputItem(StatCategory.crafting), drillTier(StatCategory.crafting), drillSpeed(StatCategory.crafting), + maxUnits(StatCategory.crafting), shootRange(StatCategory.shooting), inaccuracy(StatCategory.shooting),