mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 12:38:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor bundle tweaks

Browse Source
This commit is contained in:
Anuken 2022-08-29 14:26:29 -04:00
parent e4fe73b332
commit 0d3c27dd59
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -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.slag-heater.description = Applies heat to structures. Requires slag.
block.phase-heater.description = Applies heat to structures. Requires phase fabric. block.phase-heater.description = Applies heat to structures. Requires phase fabric.
block.heat-redirector.description = Redirects accumulated heat to other blocks. 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.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
block.surge-crucible.description = Forms surge alloy from slag and silicon. 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. block.phase-synthesizer.description = Synthesizes phase fabric from thorium, sand, and ozone. Requires heat.

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@ -346,7 +346,7 @@ public class Turret extends ReloadTurret{
if(!validateTarget()) target = null; if(!validateTarget()) target = null;
float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f; float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f;
if(warmupTarget > 0){ if(warmupTarget > 0 && shootWarmup >= minWarmup && !isControlled()){
warmupHold = 1f; warmupHold = 1f;
} }
if(warmupHold > 0f){ if(warmupHold > 0f){