From a45c0f4a423bf7e1ddd3e1a93e176a2b01985f4a Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 12 Sep 2022 19:47:54 -0400 Subject: [PATCH] Added crystalline stone vent variant --- .../blocks/environment/crystalline-vent1.png | Bin 0 -> 1623 bytes .../blocks/environment/crystalline-vent2.png | Bin 0 -> 1541 bytes core/assets/bundles/bundle.properties | 6 +++--- core/assets/icons/icons.properties | 1 + core/src/mindustry/ai/types/CommandAI.java | 2 +- core/src/mindustry/content/Blocks.java | 7 ++++++- core/src/mindustry/ui/dialogs/ModsDialog.java | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/crystalline-vent1.png create mode 100644 core/assets-raw/sprites/blocks/environment/crystalline-vent2.png diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-vent1.png b/core/assets-raw/sprites/blocks/environment/crystalline-vent1.png new file mode 100644 index 0000000000000000000000000000000000000000..e52120a8226030b2863a1405f320f24f3b01fcb7 GIT binary patch literal 1623 zcmV-d2B`UoP)Px*5lKWrRCt{2T}y5oF$`sbZWF-BK1G*lfT9QJ33AUadV!z^$N|y-N%q+X2GRqx zD;csZN+k8Dp+64@(AqO&&3hz8Y9tNO35()v$shmr_4~ip_fId6i?(kD7P-M5@fB1~z>O!9B8Z@2#c`u1EsE{X`BynjGLen}n?PoVVt z^qJ;5GvRIp5&>$&amb0(oL8PpWcPydo<_XMRRA>k2xvvHginniZUXcgKAZT2S}3X! zhUm8>LM$S{QsgJh><@Y(xCjuL{DdeXzy*jJdL-}^g%bfHfHYo4CclT4IQf0Gj;o1a zt^;NjSEF?R3OCocJ8j|W4o#aOd9V~xf<{6?6fcuzTPhFmwEEQG_w{=7+0|;bbxi(U ziFE8pp@xLi6WoU)BzS#$u9Dj#oI5rbjUyn6mk<%1OAka?e~l21d@Cf^T4G#?%YwuL zXz{*YSINk4-irvS2oVP8#GSCl14;tQSl&9ehmXG>JD*)%TsF^X{eFT+SV{s97h)si z6Y&Hf$WQ2r&}s*V5m6-M6FG*U9+2cqzE8i&g~l3YgeYhh)CxV82O|{w$uO*y=RD=X{Xp)8>B2Wm@kWW;<0TlV@Yk8w7fHn7Tk)M#0 zvW4qgIx*IIsuJd7=jjJt?(1s`g2GNHBGMH62T;Z)>8I`{2XX+;6zw#C}Ig{ zv!M|Yq+z%#fVLlq82@u1MbKtLH7^i(fJ6i?{znWy+9J&}LlTFeDAT#o$i-+0Vilq1 z1+INSMCTBd5Vg}TkYh*RTjQ}0)@2s*Ygo?1tHd2!k7fKeQ636QIEwOY9d5oLKO3Zug?J09@#@_6PY z#EdnpoyV}Z*uRRkh=Lk*~>fUsx6 z`#gkQv;J1hw~#-5zn~r@@o|P1NJG!f_3h?Q0&e`j1gs7q!mqa_iV=!N!i{OW8n4)& zZx@rql4MMtBJ@&B?-?KP5L7PnZ0*sb5yC@+FV~+p|3(&E3FghaTOQ!m*-GabA*Da42f7I5U3Xzl)$u$TY|UP5?@ASJ(SQ*Hk{>)>VBHDYCkgoc*<@?2D# zhF%R=!gDyn>JcrXH0^Drrtr5YMF~SCv?4tGd4T_JiP0Sd*pnlA0g=2&@=OeJj0ymM zBIb?WhDw^9aV7AcqSKrknkH+xw!nye9{$b&-@KdXaLDOdKO#zqW=FSvXk>F&qPSws znjPr&8Y|7h?r0)N$Vc^&kV351815#b&pVw-J`wm$dR#b?Y!$z>7f1~QogGepm0=H> zRryxYv|i|$k}vi;TNF^k2^_rZp~YV4oNf#ulthGxmLEMi0$a9q3rXh?*JK>P_o@E=_L V&^(SchvEPL002ovPDHLkV1mO<=5+u7 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/crystalline-vent2.png b/core/assets-raw/sprites/blocks/environment/crystalline-vent2.png new file mode 100644 index 0000000000000000000000000000000000000000..72ddb58237bf7c12a44080ee55ebe3ba16e2c2e5 GIT binary patch literal 1541 zcmV+g2KxDlP)Px)zez+vRCt{2T}w_QF%T_AvmK;X_Spjx!vS)F9GDYu00s%zvqzD_0hpDMactM$ zpC(U20@Cfc->WLy-;D_JA{YJ2nT z@7K5IYFQ(SGF*jXU{;?B0Dy}SBNc?=W!54NDFB6t9Qgqp5j3z6Vj{!Ce3?`I>MO$kT=_PZ3-N z=t;gcs3LF$_${i9Ge#ob8*aTIsrCOP@&TMYKtjHR_&6+h3wO1>aT#Bj3ebvpfYX?4 z)!?>YNVFO87*6kF(lnkl?Ql}uXXu{e-9`B+bm1?xmPr1G&EXD??YN-I}LkEH=WR%F1G@6#=_w<6Q z2gKx;9+(?<(}$(pAFiQ_ef&6P|9|=Cl3cG=AT`2XuFfr&($JR3$3Cl-OARxUwz4RI zcdy4<)Z@poN^pE#2^Mv_y}tY8a7Xe0EBD+i3tVk)%txCP;?wI(_i($jrDvgvkQKng z`UCj^yT7}y-vc33D~`dvo_ep9H(=M02VxR0*euJ}PtH%Ae2WpXi3fPcd{1EFdMEr&1gIsHdS@SdAw0LostC0QP+W9W z>kpuWIH~brof?x6R0}_&lOI48!P*P50#NhXnDx&>et{ZqT3DXe)g&jqa!R*iCwTQn6>Q~Vr$^!Vlh*b)>f z*3bagkX!UCMX?b+$NcZ`N(i3E0gaJHnX>>yq!Tx}KEHZG#_Ax7{cdkj%#`4YQ1k#w zmb2BN7$d@}jdTk^Yw`l_yfMcMsuME37ObuvaYL-~0FV6mXee2~c8gO0DuBid))a{l!75y5)iJ2i6F>S!vcZn@v>rxC&nMY3yy zvYNG9Y|iU3sb6Xb;_b9Cq_ICW@T#?2hyb8-<5pti1SpXYAQK=LUD&6k#NdbkFuq5` zBGkwSushsabzqa^h?-U+q-_i3eyRYLXGyEhjN|ltEIfijBG#yv$_V#irzcvUA)>txqhl*AMF`+-d$J@y{(evL0Td_aTDA*0P`ABWjUzNE13oM+9uObFH4*%z@i{05*#TKsyTH_3c@Gv^`dbo^YLzp^6Z$ zErI%;fD-8%lD!wFxrLwr>BDontTk)*K3Nw)7lwwNlEgg2!`f4{Seohn0*4lac*JoI z`Q3U!0KQ?U2c%Z-c6hfIvyk6wCAeCErxZK|CO?sNtM1bUAZ%MfvP+mIP zwGD_NP10cmafPt3^ct!0b81Jz=I@dWm9rv0Md|$omT39v^RB4~>2b(j=<&{ZmoKEg zbz>y-ARoZ-b+)tgi~?3CK)@_QtX6;kOo%{$M6i@RZW+DE2WTh&2Q>mYWKo4U3y?ud ro|Gi2=k>y{0$3s^LT}>F7zF100000NkvXXu0mjf0KU-N literal 0 HcmV?d00001 diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 5beb24d84a..9a47a4ca1d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1967,8 +1967,8 @@ block.carbide-crucible.description = Fuses graphite and tungsten into carbide. R block.cyanogen-synthesizer.description = Synthesizes cyanogen from arkycite and graphite. Requires heat. block.slag-incinerator.description = Incinerates non-volatile items or liquids. Requires slag. block.vent-condenser.description = Condenses vent gases into water. Consumes power. -block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power. -block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power. +block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.\nOptionally uses hydrogen to boost efficiency. +block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.\nOptionally uses nitrogen to boost efficiency. block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall. block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water. block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen. @@ -2009,7 +2009,7 @@ block.pyrolysis-generator.description = Generates large amounts of power from ar block.flux-reactor.description = Generates large amounts of power when heated. Requires cyanogen as a stabilizer. Power output and cyanogen requirements are proportional to heat input.\nExplodes if insufficient cyanogen is provided. block.neoplasia-reactor.description = Uses arkycite, water and phase fabric to generate large amounts of power. Produces heat and dangerous neoplasm as a byproduct.\nExplodes violently if neoplasm is not removed from the reactor via conduits. block.build-tower.description = Automatically rebuilds structures in range and assists other units in construction. -block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen. +block.regen-projector.description = Slowly repairs allied structures in a square perimeter. Requires hydrogen.\nOptionally uses phase fabric to boost efficiency. block.reinforced-container.description = Stores a small amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity. block.reinforced-vault.description = Stores a large amount of items. Contents can be retrieved via unloaders. Does not increase core storage capacity. block.tank-fabricator.description = Constructs Stell units. Outputted units can be used directly, or moved into refabricators for upgrading. diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 3e73563e57..927b14172d 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -579,3 +579,4 @@ 63104=flux-reactor|block-flux-reactor-ui 63103=neoplasia-reactor|block-neoplasia-reactor-ui 63102=sand-floor|block-sand-floor-ui +63101=crystalline-vent|block-crystalline-vent-ui diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java index 742038a860..9fdd534af6 100644 --- a/core/src/mindustry/ai/types/CommandAI.java +++ b/core/src/mindustry/ai/types/CommandAI.java @@ -155,7 +155,7 @@ public class CommandAI extends AIController{ } //others have arrived at destination, so this one will too - if(count >= Math.max(3, local.size / 2)){ + if(count >= Math.max(2, local.size / 2)){ targetPos = null; } } diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 85dc1ca29f..5417798bc8 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -49,7 +49,7 @@ public class Blocks{ redmat, bluemat, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, redweed, purbush, yellowCoral, - rhyoliteVent, carbonVent, arkyicVent, yellowStoneVent, redStoneVent, + rhyoliteVent, carbonVent, arkyicVent, yellowStoneVent, redStoneVent, crystallineVent, regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall, arkyicWall, crystallineStoneWall, redStoneWall, redDiamondWall, ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor, yellowStonePlates, iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt, @@ -492,6 +492,11 @@ public class Blocks{ attributes.set(Attribute.steam, 1f); }}; + crystallineVent = new SteamVent("crystalline-vent"){{ + parent = blendGroup = crystallineStone; + attributes.set(Attribute.steam, 1f); + }}; + redmat = new Floor("redmat"); bluemat = new Floor("bluemat"); diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index d99304ca55..322ae96177 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -483,7 +483,7 @@ public class ModsDialog extends BaseDialog{ "[accent]" + mod.name.replace("\n", "") + (installed.contains(mod.repo) ? "\n[lightgray]" + Core.bundle.get("mod.installed") : "") + "\n[lightgray]\uE809 " + mod.stars + - (Version.isAtLeast(mod.minGameVersion) ? mod.subtitle == null ? "" : "\n[lightgray]" + Strings.truncate(mod.subtitle, maxModSubtitleLength) : + (Version.isAtLeast(mod.minGameVersion) ? "" : "\n" + Core.bundle.format("mod.requiresversion", mod.minGameVersion))) .width(358f).wrap().grow().pad(4f, 2f, 4f, 6f).top().left().labelAlign(Align.topLeft);