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

Fix loadout reset

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2019-10-16 15:51:18 +02:00
committed by GitHub
parent af3067c08b
commit 596d58b539
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java
View File

@@ -48,6 +48,7 @@ public class LoadoutDialog extends FloatingDialog{
buttons.addImageTextButton("$settings.reset", Icon.refreshSmall, () -> { buttons.addImageTextButton("$settings.reset", Icon.refreshSmall, () -> {
resetter.run(); resetter.run();
reseed();
updater.run(); updater.run();
setup(); setup();
}).size(210f, 64f); }).size(210f, 64f);
@@ -55,10 +56,7 @@ public class LoadoutDialog extends FloatingDialog{
public void show(int capacity, Array<ItemStack> stacks, Runnable reseter, Runnable updater, Runnable hider){ public void show(int capacity, Array<ItemStack> stacks, Runnable reseter, Runnable updater, Runnable hider){
this.originalStacks = stacks; this.originalStacks = stacks;
this.stacks = stacks.map(ItemStack::copy); reseed();
this.stacks.addAll(content.items().select(i -> i.type == ItemType.material &&
!stacks.contains(stack -> stack.item == i)).map(i -> new ItemStack(i, 0)));
this.stacks.sort(Structs.comparingInt(s -> s.item.id));
this.resetter = reseter; this.resetter = reseter;
this.updater = updater; this.updater = updater;
this.capacity = capacity; this.capacity = capacity;
@@ -110,6 +108,13 @@ public class LoadoutDialog extends FloatingDialog{
} }
} }
private void reseed(){
this.stacks = originalStacks.map(ItemStack::copy);
this.stacks.addAll(content.items().select(i -> i.type == ItemType.material &&
!stacks.contains(stack -> stack.item == i)).map(i -> new ItemStack(i, 0)));
this.stacks.sort(Structs.comparingInt(s -> s.item.id));
}
private int step(int amount){ private int step(int amount){
if(amount < 1000){ if(amount < 1000){
return 100; return 100;