Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-09-22 13:01:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: attributecrafter yield string format (#12675)

Browse Source 
* Bugfix: attributecrafter yield string format

* imports
This commit is contained in:
EggleEgg
2026-09-17 16:51:59 +02:00
committed by GitHub
parent 088486c1ad
commit bfa31bf184
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1304,7 +1304,7 @@ bar.cargounitcap = Cargo Unit Cap Reached
bar.drillspeed = Drill Speed: {0}/s
bar.pumpspeed = Pump Speed: {0}/s
bar.efficiency = Efficiency: {0}%
bar.yield = Yield: +{0}%
bar.yield = Yield: {0}%
bar.boost = Boost: +{0}%
bar.powerbuffer = Batteries: {0}/{1}
bar.powerbalance = Power: {0}/s

18
core/src/mindustry/world/blocks/production/AttributeCrafter.java
View File

@@ -11,11 +11,15 @@ import mindustry.world.meta.*;
/** A crafter that gains efficiency from attribute tiles. */
public class AttributeCrafter extends GenericCrafter{
public Attribute attribute = Attribute.heat;
/** Base efficiency of the crafter. */
public float baseEfficiency = 1f;
/** Maximum efficiency/output boost from attributes. */
public float maxBoost = 1f;
/** Minimum efficiency required to place this block. */
public float minEfficiency = -1f;
public boolean displayEfficiency = true;
public boolean displayScaledOutput = true;
/** Whether to show this bar in the UI. */
public boolean displayEfficiency = true, displayScaledOutput = true;
/** Whether liquid consumption scales with efficiency. */
public boolean scaleLiquidConsumption = false;
/** Scaled output (yield) multiplier, scales with attribute. <=0 to disable. */
public float outputScale = 0f;
@@ -34,12 +38,10 @@ public class AttributeCrafter extends GenericCrafter{
drawPlaceText(
(displayEfficiency && boostScale > 0f ?
Core.bundle.format("bar.efficiency",
(int)((baseEfficiency + Math.min(maxBoost, boostScale * sumAttribute(attribute, x, y))) * 100f))
Core.bundle.format("bar.efficiency", (int)((baseEfficiency + Math.min(maxBoost, boostScale * sumAttribute(attribute, x, y))) * 100f))
: "") +
(displayScaledOutput && outputScale > 0f ? "\n" +
Core.bundle.format("bar.yield",
(int)(Math.min(maxBoost, outputScale * sumAttribute(attribute, x, y)) * 100f))
(displayScaledOutput && outputScale > 0f ?
"\n" + Core.bundle.format("bar.yield", (int)((1f + Math.min(maxBoost, outputScale * sumAttribute(attribute, x, y))) * 100f))
: ""), x, y, valid);
}
@@ -59,7 +61,7 @@ public class AttributeCrafter extends GenericCrafter{
if(displayScaledOutput && outputScale > 0f){
addBar("yield", (AttributeCrafterBuild entity) ->
new Bar(
() -> Core.bundle.format("bar.yield", (int)((entity.outputMultiplier() - baseEfficiency) * 100)),
() -> Core.bundle.format("bar.yield", (int)(entity.outputMultiplier() * 100)),
() -> Pal.lightOrange,
entity::outputMultiplier));
}