Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display item consumption rate

Browse Source
This commit is contained in:
MEEPofFaith
2024-03-25 11:00:24 -07:00
parent a3a7598e6d
commit faf78b6e77
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/consumers/ConsumeItemCharged.java
View File

@@ -19,7 +19,7 @@ public class ConsumeItemCharged extends ConsumeItemFilter{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.charge, filter)); stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.charge, stats.timePeriod, filter));
} }
@Override @Override

2
core/src/mindustry/world/consumers/ConsumeItemExplosive.java
View File

@@ -18,7 +18,7 @@ public class ConsumeItemExplosive extends ConsumeItemFilter{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.explosiveness, filter)); stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.explosiveness, stats.timePeriod, filter));
} }
@Override @Override

2
core/src/mindustry/world/consumers/ConsumeItemFilter.java
View File

@@ -66,7 +66,7 @@ public class ConsumeItemFilter extends Consume{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, stats.timePeriod < 0 ? StatValues.items(filter) : StatValues.items(stats.timePeriod, filter)); stats.add(booster ? Stat.booster : Stat.input, StatValues.items(stats.timePeriod, filter));
} }
@Override @Override

2
core/src/mindustry/world/consumers/ConsumeItemFlammable.java
View File

@@ -18,7 +18,7 @@ public class ConsumeItemFlammable extends ConsumeItemFilter{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.flammability, filter)); stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.flammability, stats.timePeriod, filter));
} }
@Override @Override

2
core/src/mindustry/world/consumers/ConsumeItemRadioactive.java
View File

@@ -18,7 +18,7 @@ public class ConsumeItemRadioactive extends ConsumeItemFilter{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.radioactivity, filter)); stats.add(booster ? Stat.booster : Stat.input, StatValues.itemEffMultiplier(i -> i.radioactivity, stats.timePeriod, filter));
} }
@Override @Override

4
core/src/mindustry/world/meta/StatValues.java
View File

@@ -292,7 +292,7 @@ public class StatValues{
}; };
} }
public static StatValue itemEffMultiplier(Floatf<Item> efficiency, Boolf<Item> filter){ public static StatValue itemEffMultiplier(Floatf<Item> efficiency, float timePeriod, Boolf<Item> filter){
return table -> { return table -> {
table.getCells().peek().growX(); //Expand the spacer on the row above to push everything to the left table.getCells().peek().growX(); //Expand the spacer on the row above to push everything to the left
table.row(); table.row();
@@ -300,7 +300,7 @@ public class StatValues{
for(Item item : content.items().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden())){ for(Item item : content.items().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden())){
c.table(Styles.grayPanel, b -> { c.table(Styles.grayPanel, b -> {
b.image(item.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit); b.image(item.uiIcon).size(40).pad(10f).left().scaling(Scaling.fit);
b.add(item.localizedName).left().grow(); b.add(item.localizedName + (timePeriod > 0 ? "\n[lightgray]" + Strings.autoFixed(1f / (timePeriod / 60f), 2) + StatUnit.perSecond.localized() : "")).left().grow();
b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().pad(10f).padRight(15f); b.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().pad(10f).padRight(15f);
}).growX().pad(5).row(); }).growX().pad(5).row();
} }