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 0000000000..e52120a822 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-vent1.png differ 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 0000000000..72ddb58237 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crystalline-vent2.png differ 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);