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

Core launch capacity tweaks

Browse Source
This commit is contained in:
Anuken
2022-01-28 14:00:03 -05:00
parent 27bb848832
commit ac68edda40
6 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

7
core/src/mindustry/world/blocks/campaign/LaunchPad.java
View File

@@ -56,6 +56,9 @@ public class LaunchPad extends Block{
super.setBars();
bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
//TODO is "bar.launchcooldown" the right terminology?
bars.add("progress", (LaunchPadBuild build) -> new Bar(() -> Core.bundle.get("bar.launchcooldown"), () -> Pal.ammo, () -> Mathf.clamp(build.launchCounter / launchTime)));
}
@Override
@@ -73,8 +76,8 @@ public class LaunchPad extends Block{
@Override
public boolean shouldConsume(){
//TODO do not consume after reload / disable?
return true;
//TODO add launch costs, maybe legacy version
return launchCounter < launchTime && enabled;
}
@Override