From 5cc314672f736af48b461160de4c274ab43ca019 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Wed, 8 Jun 2022 06:17:30 -0700 Subject: [PATCH 1/5] `canWithdraw()` + changes to `displayable()` (#6902) * `shouldDiplay()` + `canWithdraw()` * Better implementation of `displayable()` --- core/src/mindustry/entities/comp/BuildingComp.java | 9 ++++----- core/src/mindustry/ui/Displayable.java | 4 ++++ .../mindustry/ui/fragments/BlockInventoryFragment.java | 2 ++ core/src/mindustry/ui/fragments/PlacementFragment.java | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) 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; From 38b0a664f40444ec953161120e478e42159514e3 Mon Sep 17 00:00:00 2001 From: BlueWolf <61173114+BlueWolf3682@users.noreply.github.com> Date: Wed, 8 Jun 2022 07:20:35 -0600 Subject: [PATCH 2/5] so i made a slag heater (#6925) * Add slag fueled heater * i have no idea why i have to do this but i do Co-authored-by: Blue <415bluewolf@gmail.com> Co-authored-by: Anuken --- .../blocks/production/slag-heater-bottom.png | Bin 0 -> 307 bytes .../blocks/production/slag-heater-heat.png | Bin 0 -> 2175 bytes .../blocks/production/slag-heater-top1.png | Bin 0 -> 635 bytes .../blocks/production/slag-heater-top2.png | Bin 0 -> 640 bytes .../sprites/blocks/production/slag-heater.png | Bin 0 -> 2047 bytes core/assets/bundles/bundle.properties | 1 + core/assets/contributors | 1 + core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 16 +++++++++++++++- core/src/mindustry/content/ErekirTechTree.java | 4 ++++ 10 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-bottom.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-heat.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-top1.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-top2.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater.png 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 0000000000000000000000000000000000000000..1500ec39a00e1e5b9215df7f1eb7f67e5b348010 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&!0^`7 z#WAE}&fANIybOvA2OJ#u-~2HDc4EiFYOYx&?~3;eroC*~pUrTMVGUyh^9HsA-UCt% frVK+=KrVD1Q^2jJtxp*k7#KWV{an^LB{Ts5?c`oK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e6b68412dfda38d1feb48afd4f06b3c2e542d0ff GIT binary patch literal 2175 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 DmF^4H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..25c3155f7511d730fe0cff5deecf9dde4ef058ed GIT binary patch literal 635 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z+~#_ z;uumf=k1--zK0z|S|3jCU}aU9wP4zp$xEldY>&!d3S?N_!YY*_S#7i4+IZXl{O*=D z)kfcJ*6A`bG`xEE{_x`~zm)o3{j;-C>12>9I69qU!LGuOsxR-na{AECAf?Q}z);|$ zb3|*l-Vu%ki!wi|GOb8k_d|#=WMfE8=hO{5&)+WH_(O|>kw47P1+Q($mb+6vlTb+otSca zniGR$#+j^+Ye(8L&gFJ|`_fk7xOm}>N9W&m$UXA8;j}W|F8`Fe*ULo_R`b)WttN(Y z*f4X=ytnMm>`#;a&zK?@aNZey(#k44ofy`glX=O&z+~m= z;uumf=k1--zK0z|S|19#@J=}}NmMn!aY|B?Do_jNvt%46CHY;wQ;P#d6dMIwZ3& zFfe@UY>h~L+$zBsVxqUth2g4?XuMK`*0V1CjY4MMYc0=<#Vaucdmo*?HE=%pMyp?P*bE5m;Hm!7^b% z3J1%C6(Jlf6BfE~uuRZ2XW6z``-5+CB)dd(l(Rs?!U?Q0j1ru&w!#gKGuCp;9qQd6 zd-p=YD=&trz1MkX?_uTTKbG9jq3f%A%gmg~Y1YE3O)D9$h1FyxGp@O~jA@27%ln(l zm?m5kKeS43n|rXa^nIP~bsfht&b>Wg(Bi9ie%gj(U zRQw=d_9V?QnD-E$@__)4$r8#7nC|OzFlarzd{p*9wWI8Y8<*G^7&vFJh8~kPnyc7w vjAMb}JVxFRAK&q9P`$|L#L!Utn~{0rJ(Ud#k9RXLFfe$!`njxgN@xNA(J%vI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1dbf8eb644af094baf94d584582104c3b5ff711d GIT binary patch literal 2047 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z`oPd z#WAE}&f8eS{AhClJ5INWJ*-AI9L#S^irfhP=h(>S8Mwgr`WiR2!zbn(bWT@(k&^NC z&C(UNrvDWt^JaIfUE5$R@#4jTZYvfOjV_zIa+@IkRdxq9=-7Xnc>nn0j~_ku-TQa& zVT!?xC1N*jOE_QW%}+nwylm?U?aLjBV8l~;sZ#2#$ex_9xuMDdf~FWwSz5ew*AH`)KnJ)ueG88w$g)vsaIIel0r zYWu|uooy@=8H7IF{T?J(XR~k4&v$Q=3-vu+T-?9!o%#M>jq+=|rKOX*7|I=kKAB$l zw*T`k_f_vExv_IDP>l}~=$jGYeXh}4Sx_;&JxFj9Q--@u*b{3H7l(CQMHZ^aYCD9V zD0k?X%5jxd@W^6?x4ie))-T+xy-5AMoNbM`@`FEbrlfw@v!-H8{RZQw7y0dc_-)^> z+jn7i>7x5~_FR)!xmjAyuwyTHVtpsJ_V1lT4;K}r7N#oC(%ansZ1X~y37MS{u3jhq z|2e;Z@(q8_c^i!sm8Nh7Z*r6eqf1Wy%E%MFMj_&BSkO%`$5hZ=l|R1k+$pipO;te zYy7mk_hxU~@yUjVoEJJJPJE}Va##Lf>w`a0J|*HhRT~P|Xte;+XGG){Wotej*bb@}~! zepln7OR3*G{8tDD7|F9LJ~{r!tBc|L-+u=c?*!c0I;n8iR@DUtq7F`WN=`q_m7FSk zue%xuJ6!%`DHwF5P-)4(>#2f1H4WQt7f$f0p3c&^>xFO^>yDofpU-@s#2>ixseT8C zMx&V0g3<}cW;m}YWaP;;uxb0eIk=4X(%G-7+D%Ko7IiaDu&g~9Y{8Vb)ciHG$;Jr2 zm<>m}YE*dB6?IRlGtDXB7F=`E{n9a)3|~7z3$9g~Ozw4Aq1$G6^VcUixXxhz>C%*# z;nlLYcViak&!0Cl_1*XV?sZ$RMJeM%{qKrNUnWkvYg?isXMpiASoQ7x9)V@0j zW_@7xcfan|HDS_T4oyK79dgHt9wZ@O|gTyN8}-;Cb#1*)Cq2_0yvIjbn$H{r^JU}dMg=Uhro9(BBR zax628gvc`m;+v{(p8o(W+tEy?;lW_RPMWS>!x>s0L=51fm^`CW*Dk_XN z_HZs}_e<4Xp!Sn5Oj}JQ(_5TH*+HjKbOGy6zH3Suhv%$yjmS3r-8tvfqL+O^*NaZ9 z?OAbAcIk!A)=0$(0ZY|#Io_V)Z1>YSQ{@~ z*^x(0nmZ*nr#TkzOgnwWSN(BTcZ18OBEz(^O$qYXs#(sYJ7;$)a4J7bIy31nr(IUg zg^phhSA^%K97%a8T=d+1Ny0{j8;(wOJ8JI!l+;i=lN&xY$9B^u7Tup7QCk?NOnC2X zEBjWswQIxgKbl*1&J)Q6o1Skgn69fvOnQI#YN*$~=5K4b-!-oH@`+T7Oa6S-sP-=Q|qB*Q%YNxXOw@Bv8 zdK`iW=PtRVDi{+vAvkUg|66S-R!@H2-idO2nZ=@KSS^YY4{XTsm|2v1S?-+|%N}Pp zW>4*j5lljlCbJw-{eErRpBSqbvPPzPZE+LyukjZWvi0Mg+qqX_ZCm7Q97#a;}!Sd!qSQS>?sKej&>6ty?GImQyO`1njmwO zdGGoFTlNgu&CfJ8U(1Mf``UcNsB3|4be5w*(<1eUsX_}|YW{ByX?gUW{mHqXo)2H_ zV?RD)>*<54Kl3#|Js0Df&F{RFb>psmDZ2Yq)~3p;OiM76Oy8Pvr~Rl~hm_I+Y1gj% zips9*64su){vbP0l+XkKk-)KW literal 0 HcmV?d00001 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/contributors b/core/assets/contributors index c84d992f91..774513644c 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -138,4 +138,5 @@ Jerzy Paciorkiewicz YozoZChomutova Qendolin Goobrr +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 a8c354b4d4..6efe28243a 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)), () -> { From 642f1f74af4fb98ead61fbf6cab3f29c35d94c01 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 8 Jun 2022 13:21:24 +0000 Subject: [PATCH 3/5] Automatic bundle update --- core/assets/bundles/bundle_be.properties | 1 + core/assets/bundles/bundle_bg.properties | 1 + core/assets/bundles/bundle_cs.properties | 1 + core/assets/bundles/bundle_da.properties | 1 + core/assets/bundles/bundle_de.properties | 1 + core/assets/bundles/bundle_es.properties | 1 + core/assets/bundles/bundle_et.properties | 1 + core/assets/bundles/bundle_eu.properties | 1 + core/assets/bundles/bundle_fi.properties | 1 + core/assets/bundles/bundle_fil.properties | 1 + core/assets/bundles/bundle_fr.properties | 1 + core/assets/bundles/bundle_hu.properties | 1 + core/assets/bundles/bundle_id_ID.properties | 1 + core/assets/bundles/bundle_it.properties | 1 + core/assets/bundles/bundle_ja.properties | 1 + core/assets/bundles/bundle_ko.properties | 1 + core/assets/bundles/bundle_lt.properties | 1 + core/assets/bundles/bundle_nl.properties | 1 + core/assets/bundles/bundle_nl_BE.properties | 1 + core/assets/bundles/bundle_pl.properties | 1 + core/assets/bundles/bundle_pt_BR.properties | 1 + core/assets/bundles/bundle_pt_PT.properties | 1 + core/assets/bundles/bundle_ro.properties | 1 + core/assets/bundles/bundle_ru.properties | 1 + core/assets/bundles/bundle_sr.properties | 1 + core/assets/bundles/bundle_sv.properties | 1 + core/assets/bundles/bundle_th.properties | 1 + core/assets/bundles/bundle_tk.properties | 1 + core/assets/bundles/bundle_tr.properties | 1 + core/assets/bundles/bundle_uk_UA.properties | 1 + core/assets/bundles/bundle_vi.properties | 1 + core/assets/bundles/bundle_zh_CN.properties | 1 + core/assets/bundles/bundle_zh_TW.properties | 1 + 33 files changed, 33 insertions(+) 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 = 熔渣焚化爐 From f8de42d111381f834d0aab618b84179903fb3d29 Mon Sep 17 00:00:00 2001 From: xem8k5 <69492624+xem8k5@users.noreply.github.com> Date: Wed, 8 Jun 2022 21:22:35 +0800 Subject: [PATCH 4/5] Update contributors (#6866) Co-authored-by: Anuken --- core/assets/contributors | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/contributors b/core/assets/contributors index 774513644c..8775703a21 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -138,5 +138,6 @@ Jerzy Paciorkiewicz YozoZChomutova Qendolin Goobrr +xem8k5小恶魔 BlueWolf [Error_27] From 8bf2ffc3fcc9424eded079d4cf6ccdf0eb66c75f Mon Sep 17 00:00:00 2001 From: SoMall-dumpling <57857764+SoMall-dumpling@users.noreply.github.com> Date: Wed, 8 Jun 2022 21:22:46 +0800 Subject: [PATCH 5/5] tank. (#6860) * . . * actually tank * another. ................................. --- core/src/mindustry/content/SectorPresets.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)