mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 04:44:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Recipe display for reconstructors

Browse Source
This commit is contained in:
Anuken 2020-10-18 11:53:36 -04:00
parent ef58111cc3
commit ce6292cc53
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -305,7 +305,7 @@ project(":core"){
compileOnly project(":annotations") compileOnly project(":annotations")
annotationProcessor project(":annotations") annotationProcessor project(":annotations")
annotationProcessor 'com.github.Anuken:jabel:40eec868af' annotationProcessor 'com.github.Anuken:jabel:34e4c172e65b3928cd9eabe1993654ea79c409cd'
} }
} }

2
core/src/mindustry/content/Blocks.java
View File

@ -1353,7 +1353,7 @@ public class Blocks implements ContentList{
size = 5; size = 5;
unitCapModifier = 20; unitCapModifier = 20;
researchCostMultiplier = 0.06f; researchCostMultiplier = 0.05f;
}}; }};
vault = new StorageBlock("vault"){{ vault = new StorageBlock("vault"){{

2
core/src/mindustry/world/Block.java
View File

@ -617,7 +617,7 @@ public class Block extends UnlockableContent{
public ItemStack[] researchRequirements(){ public ItemStack[] researchRequirements(){
ItemStack[] out = new ItemStack[requirements.length]; ItemStack[] out = new ItemStack[requirements.length];
for(int i = 0; i < out.length; i++){ for(int i = 0; i < out.length; i++){
int quantity = 40 + Mathf.round(Mathf.pow(requirements[i].amount, 1.25f) * 20 * researchCostMultiplier, 10); int quantity = 40 + Mathf.round(Mathf.pow(requirements[i].amount, 1.15f) * 20 * researchCostMultiplier, 10);
out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity)); out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity));
} }

16
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@ -64,6 +64,22 @@ public class Reconstructor extends UnitBlock{
super.setStats(); super.setStats();
stats.add(BlockStat.productionTime, constructTime / 60f, StatUnit.seconds); stats.add(BlockStat.productionTime, constructTime / 60f, StatUnit.seconds);
stats.add(BlockStat.output, table -> {
table.row();
for(var upgrade : upgrades){
float size = 8*3;
if(upgrade[0].unlockedNow() && upgrade[1].unlockedNow()){
table.image(upgrade[0].icon(Cicon.small)).size(size).padRight(4).padLeft(10).scaling(Scaling.fit).right();
table.add(upgrade[0].localizedName).left();
table.add("[lightgray] -> ");
table.image(upgrade[1].icon(Cicon.small)).size(size).padRight(4).scaling(Scaling.fit);
table.add(upgrade[1].localizedName).left();
table.row();
}
}
});
} }
@Override @Override