From 9a3a6c31b3401d9e5c86d3e198c40035c879f7e5 Mon Sep 17 00:00:00 2001 From: RTOmega <62565267+RebornTrack970@users.noreply.github.com> Date: Fri, 22 Jul 2022 20:59:32 +0300 Subject: [PATCH] Adding Block: Heat Source (#6855) * Update Blocks.java * , * Update Blocks.java * Add files via upload * Delete 5618F7BA-F0D0-4FFF-AE6A-185BFEA99F16.png * Add files via upload * Add files via upload * Add files via upload * Update Blocks.java * Bundle * 1m to 10k * Update bundle.properties * TR * 10k to 1k Co-authored-by: Anuken --- .../sprites/blocks/sandbox/heat-source-heat.png | Bin 0 -> 838 bytes .../sprites/blocks/sandbox/heat-source-top1.png | Bin 0 -> 139 bytes .../sprites/blocks/sandbox/heat-source-top2.png | Bin 0 -> 140 bytes .../sprites/blocks/sandbox/heat-source.png | Bin 0 -> 517 bytes core/assets/bundles/bundle.properties | 5 ++++- core/assets/bundles/bundle_tr.properties | 1 + core/src/mindustry/content/Blocks.java | 10 +++++++++- 7 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/sandbox/heat-source-heat.png create mode 100644 core/assets-raw/sprites/blocks/sandbox/heat-source-top1.png create mode 100644 core/assets-raw/sprites/blocks/sandbox/heat-source-top2.png create mode 100644 core/assets-raw/sprites/blocks/sandbox/heat-source.png diff --git a/core/assets-raw/sprites/blocks/sandbox/heat-source-heat.png b/core/assets-raw/sprites/blocks/sandbox/heat-source-heat.png new file mode 100644 index 0000000000000000000000000000000000000000..92ae12d42dbabbfa38e6d2e6a92b6c0aa869f10e GIT binary patch literal 838 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U}o@i zaSVxQ-8%hd-fa&7*Ym2HlP2j{#tHVnovCp8|Nr0#2W@=Bj%G>*&46b1DPM#elX3s z@sI1v%REaD^$SrCr#)wW;>q@4n!v5}2l5Gd)zkK`@0egR`Qe=@9~v4De$y>rt=YI& z$>id*bqtp%12%{V6Q+uokVp0W=cJtrJ>v0#c;Vs`5|l~JAgTf#!-_(#Ty6J4FMiJD9oOnTcB zZ&+P>`(=iP-}IMLGZWhx7(-PV)HurK?O@!;IA7?5fT{ASW68EFx)>R@2H*-p3ZEGffNF_DuZJHTTuYeGjfQdZ#u9 z-R-vd$oV1MNya0qaows_tPkgQ1!Y>you^^ueS7(VolCeq(+}MG784X78mhcfaaGdB zAf2+pcyFs|C3(MlBpj|!`lj+VbI!>M&jzh`O1l%M zzhA%jW2MTow%tFX7f$rKl<~VyV}JO8{Vo!DjlVrB4lwH*PI-1~!q)jAwu)AhlXote zE`9nk_jS$-!p-fS-~N0OpWJfe);>l%q0&T!v?KAcXU%q=jy+qH+mQVrf01td$N#5a zY8_ngAmCTYOo7{?mj8uU&FArddF%PSzwE1nZMx3O#yK%CFfe$!`njxgN@xNAhKYGV literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/sandbox/heat-source-top1.png b/core/assets-raw/sprites/blocks/sandbox/heat-source-top1.png new file mode 100644 index 0000000000000000000000000000000000000000..c90316d1df6f8720ce99ce3da633ca81ba465e27 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U~u(x zaSVxQeS7sFFM|RH%fZb>-CGp?NdG8Odt-9on81{VmtoI0SXi%NjC83!AZ_@Xb&d4| rUUr6;&CVvzMZyJZj(?M7C}5mms($uq#Lw*v3=9mOu6{1-oD!M<=DIFN literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/sandbox/heat-source-top2.png b/core/assets-raw/sprites/blocks/sandbox/heat-source-top2.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ae03228c5e66b6e65a1ffc47b9ab5b4f08c2c9 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U~uzv zaSVxQeS7sFFM|RH%fZcYt2em+zG#0?KmCv&a}JLq=Zm}$zT4Sy*$!fXastX#dmBpG qH$7xfs4eLDHRn+{%l(bD>VBGKN z;usRqdUV=CKW0aPw&xt2GrGF64R%-;d!~9;G;&R_Ve%|&a0*ojuu$=>5R7YJQStPB zZO|etI%5%^(Y?p8L2<$k6$_4d8K#ya z-AaoWotP7s{!`*x+-1Ir;y2n-6lw%GU9=fiN^ffo*sYkpo?}sY!#-!;16y5gm5VZ1 zebW2x#H-NAv3Jp=28L~#M-`IRujrhhZ^F={>8Yr4&^L^);eAIG#}^&5$g2#B*3+C8 zZ2einoqbE-oJZRcpNz97uSof_^?p3}jdeNe91iy5Z+m^idcALmGQBkvI3ZXbIPs`j zYwN!>RvXK!)g1TLO(F#i<(2-cI4MiF2>65rGFS&HzjHpKm;WXBj$6#+-|x%*aQnZ$ W(-NC@;}Qb{1B0ilpUXO@geCwic-C_O literal 0 HcmV?d00001 diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index b479a2ad8c..85c5382485 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1515,6 +1515,8 @@ block.payload-loader.name = Payload Loader block.payload-loader.description = Load liquids and items into blocks. block.payload-unloader.name = Payload Unloader block.payload-unloader.description = Unloads liquids and items from blocks. +block.heat-source.name = Heat Source +block.heat-source.description = A 1x1 block that gives virtualy infinite heat. #Erekir block.empty.name = Empty @@ -2125,4 +2127,5 @@ lenum.boost = Start/stop boosting. #Don't translate these yet! onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack. -onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack. \ No newline at end of file +onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack. + diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 32c7cdcc8b..2e8ad1cd8f 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -1653,6 +1653,7 @@ block.diffuse.name = Diffuse block.basic-assembler-module.name = Basit İnşa Modülü block.smite.name = Smite block.malign.name = Malign + #ama tüp ne aga -Anti Dragon block.switch.name = Düğme block.micro-processor.name = Mikro İşlemci diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 93f2a8fd67..116802fc07 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -76,7 +76,7 @@ public class Blocks{ carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor, //sandbox - powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator, + powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator, heatSource, //defense copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, @@ -5508,6 +5508,14 @@ public class Blocks{ size = 5; alwaysUnlocked = true; }}; + heatSource = new HeatProducer("heat-source"){{ + requirements(Category.crafting, BuildVisibility.sandboxOnly, with()); + drawer = new DrawMulti(new DrawDefault(), new DrawHeatOutput()); + rotateDraw = false; + size = 1; + heatOutput = 1000f; + regionRotated1 = 1; + }}; //TODO move illuminator = new LightBlock("illuminator"){{