diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png b/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png new file mode 100644 index 0000000000..1500ec39a0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-heat.png b/core/assets-raw/sprites/blocks/production/slag-heater-heat.png new file mode 100644 index 0000000000..e6b68412df Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-heat.png differ diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top1.png b/core/assets-raw/sprites/blocks/production/slag-heater-top1.png new file mode 100644 index 0000000000..25c3155f75 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-top1.png differ diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top2.png b/core/assets-raw/sprites/blocks/production/slag-heater-top2.png new file mode 100644 index 0000000000..a0ba5f8446 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-top2.png differ diff --git a/core/assets-raw/sprites/blocks/production/slag-heater.png b/core/assets-raw/sprites/blocks/production/slag-heater.png new file mode 100644 index 0000000000..1dbf8eb644 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c8840e415b..6c2c48e5ce 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1945,6 +1945,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index 15bf4be6a9..0daa8bd8e4 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index 130d34c08b..de657902dd 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -1930,6 +1930,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 590ff33ab8..fb4ea1a4df 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -1938,6 +1938,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index ecc5eb3858..551750c7b0 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -1899,6 +1899,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 74a06af635..c32a90aaf5 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1937,6 +1937,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidationskammer block.electric-heater.name = Elektrisches Heizelement +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index ccf207a694..d5dc14e9ae 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1939,6 +1939,7 @@ block.electrolyzer.name = Electrolizador block.atmospheric-concentrator.name = Concentrador atmosférico block.oxidation-chamber.name = Cámara de Oxidación block.electric-heater.name = Radiador Eléctrico +block.slag-heater.name = Slag Heater block.phase-heater.name = Radiador de Fase block.heat-redirector.name = Redirector de Calor block.slag-incinerator.name = Incinerador de Chatarra diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 2c1bb428da..3f6025f531 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index b7ac1b7564..405c941b78 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index bebff372c2..f2a643e937 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index 445605fb17..359b6d7db5 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 065e0d61c4..fb1359675c 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -1948,6 +1948,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index fd303c1bfb..415b4df6a7 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -1912,6 +1912,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties index f256e3c820..eb07053f06 100644 --- a/core/assets/bundles/bundle_id_ID.properties +++ b/core/assets/bundles/bundle_id_ID.properties @@ -1938,6 +1938,7 @@ block.electrolyzer.name = Elektroliser block.atmospheric-concentrator.name = Konsentrator Atmosfer block.oxidation-chamber.name = Ruangan Oksidasi block.electric-heater.name = Penghangat Listrik +block.slag-heater.name = Slag Heater block.phase-heater.name = Penghangat Phase block.heat-redirector.name = Pengatur Panas block.slag-incinerator.name = Insinerator Terak diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index b936a93caf..ae6c476fa9 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -1910,6 +1910,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index ae9c7eb4d0..884b108f9a 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -1918,6 +1918,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 01420cdf87..089e5af39f 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1938,6 +1938,7 @@ block.electrolyzer.name = 전해조 block.atmospheric-concentrator.name = 대기 농축기 block.oxidation-chamber.name = 산화실 block.electric-heater.name = 전기 가열기 +block.slag-heater.name = Slag Heater block.phase-heater.name = 메타 가열기 block.heat-redirector.name = 열 전송기 block.slag-incinerator.name = 광재 소각로 diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index 4942359752..1a93734a0b 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 969b8557c9..b554eab883 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index d2e274b745..771dc3ea11 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 31de82e6b9..2c88c0258b 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -1932,6 +1932,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Koncentrator Atmosferyczny block.oxidation-chamber.name = Komora Utleniająca block.electric-heater.name = Elektryczny Podgrzewacz +block.slag-heater.name = Slag Heater block.phase-heater.name = Podgrzewacz Fazowy block.heat-redirector.name = Spalarnia Żużla block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 56cea027f7..aba8d83e0e 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -1910,6 +1910,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index f51ec72eb3..b75d843308 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 22a70069da..47b95dd525 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -1938,6 +1938,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index d87602263e..7a53cad5a2 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -1937,6 +1937,7 @@ block.electrolyzer.name = Электролизер block.atmospheric-concentrator.name = Атмосферный концентратор block.oxidation-chamber.name = Окислительная камера block.electric-heater.name = Электрический нагреватель +block.slag-heater.name = Slag Heater block.phase-heater.name = Фазовый нагреватель block.heat-redirector.name = Тепловой перенаправитель block.slag-incinerator.name = Мусоросжигательная печь diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties index 9ff1cf2d01..d60a72fcae 100644 --- a/core/assets/bundles/bundle_sr.properties +++ b/core/assets/bundles/bundle_sr.properties @@ -1938,6 +1938,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 48dd2cfd07..f20d0034ea 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 6fec7ebb4e..aa2dae0737 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -1938,6 +1938,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 62fdcf9bcf..c4b38fd5dc 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -1901,6 +1901,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index cfc76ed4c6..2202e904a8 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -1939,6 +1939,7 @@ block.electrolyzer.name = Elektrolizör block.atmospheric-concentrator.name = Atmosferik Yoğunlaştırıcı block.oxidation-chamber.name = Oksitleme Odası block.electric-heater.name = Elektrikli Isıtıcı +block.slag-heater.name = Slag Heater block.phase-heater.name = Faz Isıtıcı block.heat-redirector.name = Isı Aktarıcı block.slag-incinerator.name = Cürüf Yakıcı diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 20867c8779..635ab5f6db 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -1894,6 +1894,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index 66121ce0b4..494133c933 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -1938,6 +1938,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 4d4c7232cc..3d3a14a73f 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1937,6 +1937,7 @@ block.electrolyzer.name = 电解器 block.atmospheric-concentrator.name = 氮气浓缩器 block.oxidation-chamber.name = 氧化机 block.electric-heater.name = 电能加热器 +block.slag-heater.name = Slag Heater block.phase-heater.name = 相位物加热器 block.heat-redirector.name = 热重定向器 block.slag-incinerator.name = 矿渣焚化炉 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 3f7615cc49..bfa1aa86e5 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -1938,6 +1938,7 @@ block.electrolyzer.name = 電解槽 block.atmospheric-concentrator.name = 氮氣富集器 block.oxidation-chamber.name = 氧化室 block.electric-heater.name = 電加熱器 +block.slag-heater.name = Slag Heater block.phase-heater.name = 相織布加熱器 block.heat-redirector.name = 熱重定向器 block.slag-incinerator.name = 熔渣焚化爐 diff --git a/core/assets/contributors b/core/assets/contributors index c84d992f91..8775703a21 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -138,4 +138,6 @@ Jerzy Paciorkiewicz YozoZChomutova Qendolin Goobrr +xem8k5小恶魔 +BlueWolf [Error_27] diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index c539d3255b..e0de3ab0ae 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -563,3 +563,4 @@ 63121=tank-refabricator|block-tank-refabricator-ui 63120=mech-refabricator|block-mech-refabricator-ui 63119=ship-refabricator|block-ship-refabricator-ui +63118=slag-heater|block-slag-heater-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index ead7991b9d..3744c30a8d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -71,7 +71,7 @@ public class Blocks{ melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge, //erekir - siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, phaseHeater, heatRedirector, slagIncinerator, + siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, slagHeater, phaseHeater, heatRedirector, slagIncinerator, carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor, //sandbox @@ -1251,6 +1251,20 @@ public class Blocks{ regionRotated1 = 1; consumePower(50f / 60f); }}; + + slagHeater = new HeatProducer("slag-heater"){{ + requirements(Category.crafting, with(Items.tungsten, 50, Items.oxide, 20, Items.beryllium, 20)); + + researchCostMultiplier = 4f; + + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.slag), new DrawDefault(), new DrawHeatOutput()); + size = 3; + liquidCapacity = 40f; + rotateDraw = false; + regionRotated1 = 1; + consumeLiquid(Liquids.slag, 40f / 60f); + heatOutput = 6f; + }}; phaseHeater = new HeatProducer("phase-heater"){{ requirements(Category.crafting, with(Items.oxide, 30, Items.carbide, 30, Items.beryllium, 30)); diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index c3e0c06a9d..0ba1f44c57 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -197,6 +197,10 @@ public class ErekirTechTree{ }); }); + node(slagHeater, () -> { + + }); + node(atmosphericConcentrator, Seq.with(new OnSector(four)), () -> { node(cyanogenSynthesizer, Seq.with(new OnSector(four)), () -> { diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 3b54587928..9260b99e68 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -148,7 +148,7 @@ public class SectorPresets{ new TextMarker("Use [accent]cliff crushers[] to mine sand.", 262f * 8f, 88f * 8f) ), new BuildCountObjective(Blocks.tankFabricator, 1).withMarkers( - new TextMarker("Use [accent]units[] to explore the map, defend buildings, and go on the offensive.\n Research and place a [accent]fabricator[]", 258f * 8f, 116f * 8f) + new TextMarker("Use [accent]units[] to explore the map, defend buildings, and go on the offensive.\n Research and place a [accent]tank fabricator[].", 258f * 8f, 116f * 8f) ), new UnitCountObjective(UnitTypes.stell, 1).withMarkers( new TextMarker("Produce a unit.\nUse the \"?\" button to see selected factory requirements.", 258f * 8f, 116f * 8f) @@ -160,7 +160,7 @@ public class SectorPresets{ new TextMarker("Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\n Place a [accent]Breach[] turret.\nTurrets require [accent]ammo[].", 258f * 8f, 114f * 8f) ), new BuildCountObjective(Blocks.berylliumWall, 6).withMarkers( - new TextMarker("[accent]Walls[] can prevent oncoming damage from reaching buildings\nPlace some [accent]beryllium walls[] around the turret.", 276f * 8f, 133f * 8f) + new TextMarker("[accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some [accent]beryllium walls[] around the turret.", 276f * 8f, 133f * 8f) ), new TimerObjective("@objective.enemiesapproaching",30 * 60).withMarkers( new TextMarker("Enemy incoming, prepare to defend.", 276f * 8f, 133f * 8f) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 77b5da267b..450564d214 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -613,6 +613,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, Fx.unitDrop.at(unit); } + public boolean canWithdraw(){ + return true; + } + public boolean canUnload(){ return block.unloadable; } @@ -1342,11 +1346,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, public ItemModule flowItems(){ return items; } - - public boolean displayable(){ - return true; - } - @Override public void display(Table table){ //display the block stuff diff --git a/core/src/mindustry/ui/Displayable.java b/core/src/mindustry/ui/Displayable.java index 770e490cab..d856b2beab 100644 --- a/core/src/mindustry/ui/Displayable.java +++ b/core/src/mindustry/ui/Displayable.java @@ -4,5 +4,9 @@ import arc.scene.ui.layout.*; /** An interface for things that can be displayed when hovered over. */ public interface Displayable{ + default boolean displayable(){ + return true; + } + void display(Table table); } diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java index 2e92791074..84f5bc221c 100644 --- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java @@ -70,6 +70,8 @@ public class BlockInventoryFragment{ } private void takeItem(int requested){ + if(!build.canWithdraw()) return; + //take everything int amount = Math.min(requested, player.unit().maxAccepted(lastItem)); diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 121137b274..904fbc0d61 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -577,7 +577,7 @@ public class PlacementFragment{ if(Core.scene.hasMouse() || topTable.hit(v.x, v.y, false) != null) return null; //check for a unit - Unit unit = Units.closestOverlap(player.team(), Core.input.mouseWorldX(), Core.input.mouseWorldY(), 5f, u -> !u.isLocal()); + Unit unit = Units.closestOverlap(player.team(), Core.input.mouseWorldX(), Core.input.mouseWorldY(), 5f, u -> !u.isLocal() && u.displayable()); //if cursor has a unit, display it if(unit != null) return unit;