diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 96759c39d5..db1b464ac9 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -523,6 +523,7 @@ blocks.shootrange = Range blocks.size = Size blocks.liquidcapacity = Liquid Capacity blocks.powerrange = Power Range +blocks.powerconnections = Max Connections blocks.poweruse = Power Use blocks.powerdamage = Power/Damage blocks.itemcapacity = Item Capacity diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index bdbc7a552b..57feb2fa09 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -501,6 +501,7 @@ blocks.shootrange = Dostřel blocks.size = velikost blocks.liquidcapacity = Kapacita tekutin blocks.powerrange = Rozsah energie +blocks.powerconnections = Max Connections blocks.poweruse = Spotřebuje energie blocks.powerdamage = Energie na poškození blocks.itemcapacity = kapacita předmětů diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 85c9b67684..eb6623cc77 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -501,6 +501,7 @@ blocks.shootrange = Reichweite blocks.size = Größe blocks.liquidcapacity = Flüssigkeitskapazität blocks.powerrange = Stromreichweite +blocks.powerconnections = Max Connections blocks.poweruse = Stromverbrauch blocks.powerdamage = Stromverbrauch/Schadenspunkt blocks.itemcapacity = Materialkapazität diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 28e8cc396a..4dcaebff43 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -501,6 +501,7 @@ blocks.shootrange = Rango de Disparo blocks.size = Tamaño blocks.liquidcapacity = Capacidad de Líquidos blocks.powerrange = Rango de Energía +blocks.powerconnections = Max Connections blocks.poweruse = Consumo de Energía blocks.powerdamage = Energía/Daño blocks.itemcapacity = Capacidad de Objetos diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 8bafae658a..f0797699e5 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -501,6 +501,7 @@ blocks.shootrange = Ulatus blocks.size = Suurus blocks.liquidcapacity = Vedelike mahutavus blocks.powerrange = Energia ulatus +blocks.powerconnections = Max Connections blocks.poweruse = Energiatarve blocks.powerdamage = Energiatarve hävituspunkti kohta blocks.itemcapacity = Ressursside mahutavus diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 189574bd6d..113a9a22f2 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -501,6 +501,7 @@ blocks.shootrange = Irismena blocks.size = Neurria blocks.liquidcapacity = Likido-edukiera blocks.powerrange = Energia irismena +blocks.powerconnections = Max Connections blocks.poweruse = Energia-erabilera blocks.powerdamage = Energia/Kaltea blocks.itemcapacity = Elementu-edukiera diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 4341be8753..433a017f58 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -518,6 +518,7 @@ blocks.shootrange = Portée blocks.size = Taille blocks.liquidcapacity = Capacité liquide blocks.powerrange = Portée électrique +blocks.powerconnections = Max Connections blocks.poweruse = Énergie utilisée blocks.powerdamage = Énergie/Dégâts blocks.itemcapacity = Stockage diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index fce9241eda..ae07662c81 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -501,6 +501,7 @@ blocks.shootrange = Portée blocks.size = Taille blocks.liquidcapacity = Capacité en liquide blocks.powerrange = Distance de transmission +blocks.powerconnections = Max Connections blocks.poweruse = Énergie utilisée blocks.powerdamage = Énergie/Dégâts blocks.itemcapacity = Stockage diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index a79ccbb1e7..9dce3d607b 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -501,6 +501,7 @@ blocks.shootrange = Jarak blocks.size = Ukuran blocks.liquidcapacity = Kapasitas Zat Cair blocks.powerrange = Jarak Tenaga +blocks.powerconnections = Max Connections blocks.poweruse = Penggunaan Tenaga blocks.powerdamage = Tenaga/Pukulan blocks.itemcapacity = Kapasitas Item diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index c36291d758..b85dc59a0d 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -502,6 +502,7 @@ blocks.shootrange = Raggio blocks.size = Grandezza blocks.liquidcapacity = Capacità del liquido blocks.powerrange = Raggio Energia +blocks.powerconnections = Max Connections blocks.poweruse = Utilizzo energia blocks.powerdamage = Energia/Danno blocks.itemcapacity = Capacità diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 6239dad8b0..515e81c853 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -501,6 +501,7 @@ blocks.shootrange = 範囲 blocks.size = 大きさ blocks.liquidcapacity = 液体容量 blocks.powerrange = 電力範囲 +blocks.powerconnections = Max Connections blocks.poweruse = 電力使用量 blocks.powerdamage = 電力/ダメージ blocks.itemcapacity = アイテム容量 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index fbc5bcb8c4..8f43b3a9e2 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -521,6 +521,7 @@ blocks.shootrange = 사거리 blocks.size = 크기 blocks.liquidcapacity = 액체 용량 blocks.powerrange = 전력 범위 +blocks.powerconnections = Max Connections blocks.poweruse = 전력 사용 blocks.powerdamage = 전력/데미지 blocks.itemcapacity = 저장 용량 diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 8c63a05598..0c35cfe669 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -501,6 +501,7 @@ blocks.shootrange = Range blocks.size = Size blocks.liquidcapacity = Liquid Capacity blocks.powerrange = Power Range +blocks.powerconnections = Max Connections blocks.poweruse = Power Use blocks.powerdamage = Power/Damage blocks.itemcapacity = Item Capacity diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 9740efd921..1e3e12e77d 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -501,6 +501,7 @@ blocks.shootrange = Range blocks.size = Size blocks.liquidcapacity = Liquid Capacity blocks.powerrange = Power Range +blocks.powerconnections = Max Connections blocks.poweruse = Power Use blocks.powerdamage = Power/Damage blocks.itemcapacity = Item Capacity diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 02056031d3..5015123040 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -501,6 +501,7 @@ blocks.shootrange = Zasięg blocks.size = Rozmiar blocks.liquidcapacity = Pojemność cieczy blocks.powerrange = Zakres mocy +blocks.powerconnections = Max Connections blocks.poweruse = Zużycie prądu blocks.powerdamage = Moc/Zniszczenia blocks.itemcapacity = Pojemność przedmiotów diff --git a/core/assets/bundles/bundle_pt.properties b/core/assets/bundles/bundle_pt.properties index 0c31d54495..fe3a5609ec 100644 --- a/core/assets/bundles/bundle_pt.properties +++ b/core/assets/bundles/bundle_pt.properties @@ -501,6 +501,7 @@ blocks.shootrange = Alcance blocks.size = Tamanho blocks.liquidcapacity = Capacidade de Líquido blocks.powerrange = Alcance da Energia +blocks.powerconnections = Max Connections blocks.poweruse = Uso de energia blocks.powerdamage = Dano/Poder blocks.itemcapacity = Capacidade de Itens diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 169b5c0673..c6b8162354 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -501,6 +501,7 @@ blocks.shootrange = Alcance blocks.size = Tamanho blocks.liquidcapacity = Capacidade de Líquido blocks.powerrange = Alcance da Energia +blocks.powerconnections = Max Connections blocks.poweruse = Uso de energia blocks.powerdamage = Dano/Poder blocks.itemcapacity = Capacidade de Itens diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index b7d907e9fb..b85668c4c6 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -520,6 +520,7 @@ blocks.shootrange = Радиус действия blocks.size = Размер blocks.liquidcapacity = Вместимость жидкости blocks.powerrange = Диапазон передачи энергии +blocks.powerconnections = Max Connections blocks.poweruse = Потребляет энергии blocks.powerdamage = Энергия/урон blocks.itemcapacity = Вместимость предметов diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index e395024fd0..b6d249acff 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -501,6 +501,7 @@ blocks.shootrange = Range blocks.size = Storlek blocks.liquidcapacity = Liquid Capacity blocks.powerrange = Power Range +blocks.powerconnections = Max Connections blocks.poweruse = Power Use blocks.powerdamage = Power/Damage blocks.itemcapacity = Item Capacity diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 557617d16e..75c7a57720 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -501,6 +501,7 @@ blocks.shootrange = Menzil blocks.size = Buyukluk blocks.liquidcapacity = Sivi kapasitesi blocks.powerrange = Menzil +blocks.powerconnections = Max Connections blocks.poweruse = Guc kullanimi blocks.powerdamage = Power/Damage blocks.itemcapacity = Esya kapasitesi diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index e9e1a97614..63a52cc807 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -516,6 +516,7 @@ blocks.shootrange = Menzil blocks.size = Boyut blocks.liquidcapacity = Sıvı Kapasitesi blocks.powerrange = Enerji Menzili +blocks.powerconnections = Max Connections blocks.poweruse = Enerji Kullanımı blocks.powerdamage = Enerji/Hasar blocks.itemcapacity = Eşya Kapasitesi diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 4a005511b5..06dbcdef7e 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -513,6 +513,7 @@ blocks.shootrange = Діапазон дії blocks.size = Розмір blocks.liquidcapacity = Місткість рідини blocks.powerrange = Діапазон передачі енергії +blocks.powerconnections = Max Connections blocks.poweruse = Енергії використовує blocks.powerdamage = Енергія/урон blocks.itemcapacity = Місткість предметів diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 0b14969b5c..4d93ab6b44 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -501,6 +501,7 @@ blocks.shootrange = 范围 blocks.size = 尺寸 blocks.liquidcapacity = 液体容量 blocks.powerrange = 能量范围 +blocks.powerconnections = Max Connections blocks.poweruse = 能量使用 blocks.powerdamage = 功率/损伤 blocks.itemcapacity = 物品容量 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index e4d636ae93..920258cc1e 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -507,6 +507,7 @@ blocks.shootrange = 範圍 blocks.size = 尺寸 blocks.liquidcapacity = 液體容量 blocks.powerrange = 輸出範圍 +blocks.powerconnections = Max Connections blocks.poweruse = 能量使用 blocks.powerdamage = 能量/傷害 blocks.itemcapacity = 物品容量 diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 4ab744a56e..03ed940b3d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -151,6 +151,7 @@ public class PowerNode extends PowerBlock{ super.setStats(); stats.add(BlockStat.powerRange, laserRange, StatUnit.blocks); + stats.add(BlockStat.powerConnections, maxNodes, StatUnit.none); } @Override diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java index b32fb7d192..7cea1a1277 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java @@ -21,6 +21,7 @@ public enum BlockStat{ powerUse(StatCategory.power), powerDamage(StatCategory.power), powerRange(StatCategory.power), + powerConnections(StatCategory.power), basePowerGeneration(StatCategory.power), input(StatCategory.crafting),