From 0d3c27dd592427355f4c19c68ac0aba615415564 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 29 Aug 2022 14:26:29 -0400 Subject: [PATCH] Minor bundle tweaks --- core/assets/bundles/bundle.properties | 2 +- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 32875ae1ae..710135ed62 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1953,7 +1953,7 @@ block.electric-heater.description = Applies heat to structures. Requires large a block.slag-heater.description = Applies heat to structures. Requires slag. block.phase-heater.description = Applies heat to structures. Requires phase fabric. block.heat-redirector.description = Redirects accumulated heat to other blocks. -block.electrolyzer.description = Converts water into hydrogen and ozone gas. +block.electrolyzer.description = Converts water into hydrogen and ozone gas. Outputs resulting gases in two opposite directions, marked by corresponding colors. block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat. block.surge-crucible.description = Forms surge alloy from slag and silicon. Requires heat. block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat. diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index dcaec29eab..3134e3c5a5 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -346,7 +346,7 @@ public class Turret extends ReloadTurret{ if(!validateTarget()) target = null; float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f; - if(warmupTarget > 0){ + if(warmupTarget > 0 && shootWarmup >= minWarmup && !isControlled()){ warmupHold = 1f; } if(warmupHold > 0f){