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

Fixed #3300

Browse Source
This commit is contained in:
Anuken
2020-11-08 19:54:27 -05:00
parent ccfc1f57cc
commit 23403d0c51
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/type/ItemSeq.java
View File

@@ -55,6 +55,12 @@ public class ItemSeq implements Iterable<ItemStack>, Serializable{
return out; return out;
} }
public void min(int number){
for(Item item : Vars.content.items()){
set(item, Math.min(get(item), number));
}
}
public boolean has(Item item){ public boolean has(Item item){
return values[item.id] > 0; return values[item.id] > 0;
} }

9
core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
View File

@@ -42,6 +42,13 @@ public class LaunchLoadoutDialog extends BaseDialog{
//updates sum requirements //updates sum requirements
Runnable update = () -> { Runnable update = () -> {
int cap = selected.findCore().itemCapacity;
//cap resources based on core type
ItemSeq resources = universe.getLaunchResources();
resources.min(cap);
universe.updateLaunchResources(resources);
total.clear(); total.clear();
selected.requirements().each(total::add); selected.requirements().each(total::add);
universe.getLaunchResources().each(total::add); universe.getLaunchResources().each(total::add);
@@ -79,7 +86,7 @@ public class LaunchLoadoutDialog extends BaseDialog{
ItemSeq stacks = universe.getLaunchResources(); ItemSeq stacks = universe.getLaunchResources();
Seq<ItemStack> out = stacks.toSeq(); Seq<ItemStack> out = stacks.toSeq();
loadout.show(core.itemCapacity, out, UnlockableContent::unlocked, out::clear, () -> {}, () -> { loadout.show(selected.findCore().itemCapacity, out, UnlockableContent::unlocked, out::clear, () -> {}, () -> {
universe.updateLaunchResources(new ItemSeq(out)); universe.updateLaunchResources(new ItemSeq(out));
update.run(); update.run();
rebuildItems.run(); rebuildItems.run();