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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2021-01-07 15:18:49 -05:00
commit 4c2f330e51
3 changed files with 19 additions and 1 deletions
core
assets/bundles
bundle.properties
src/mindustry/ui/dialogs
LaunchLoadoutDialog.javaLoadoutDialog.java

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

@ -287,6 +287,7 @@ cancel = Cancel
openlink = Open Link
copylink = Copy Link
back = Back
max = Max
crash.export = Export Crash Logs
crash.none = No crash logs found.
crash.exported = Crash logs exported.

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

@ -86,7 +86,10 @@ public class LaunchLoadoutDialog extends BaseDialog{
ItemSeq stacks = universe.getLaunchResources();
Seq<ItemStack> out = stacks.toSeq();
loadout.show(selected.findCore().itemCapacity, out, UnlockableContent::unlocked, out::clear, () -> {}, () -> {
ItemSeq realItems = sitems.copy();
selected.requirements().each(realItems::remove);
loadout.show(selected.findCore().itemCapacity, realItems, out, UnlockableContent::unlocked, out::clear, () -> {}, () -> {
universe.updateLaunchResources(new ItemSeq(out));
update.run();
rebuildItems.run();

14
core/src/mindustry/ui/dialogs/LoadoutDialog.java
View File

@ -22,6 +22,7 @@ public class LoadoutDialog extends BaseDialog{
private Boolf<Item> validator = i -> true;
private Table items;
private int capacity;
private @Nullable ItemSeq total;
public LoadoutDialog(){
super("@configure");
@ -46,6 +47,8 @@ public class LoadoutDialog extends BaseDialog{
buttons.button("@back", Icon.left, this::hide).size(210f, 64f);
buttons.button("@max", Icon.export, this::maxItems).size(210f, 64f);
buttons.button("@settings.reset", Icon.refresh, () -> {
resetter.run();
reseed();
@ -54,12 +57,23 @@ public class LoadoutDialog extends BaseDialog{
}).size(210f, 64f);
}
public void maxItems() {
for(ItemStack stack : stacks){
stack.amount = total == null ? capacity : Math.min(capacity, total.get(stack.item));
}
}
public void show(int capacity, Seq<ItemStack> stacks, Boolf<Item> validator, Runnable reseter, Runnable updater, Runnable hider){
show(capacity, null, stacks, validator, reseter, updater, hider);
}
public void show(int capacity, ItemSeq total, Seq<ItemStack> stacks, Boolf<Item> validator, Runnable reseter, Runnable updater, Runnable hider){
this.originalStacks = stacks;
this.validator = validator;
this.resetter = reseter;
this.updater = updater;
this.capacity = capacity;
this.total = total;
this.hider = hider;
reseed();
show();