From 596d58b5390f2916264a993dad55c0d507f5037f Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Wed, 16 Oct 2019 15:51:18 +0200 Subject: [PATCH] Fix loadout reset --- .../anuke/mindustry/ui/dialogs/LoadoutDialog.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java index fc5b560678..0acbaa7864 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadoutDialog.java @@ -48,6 +48,7 @@ public class LoadoutDialog extends FloatingDialog{ buttons.addImageTextButton("$settings.reset", Icon.refreshSmall, () -> { resetter.run(); + reseed(); updater.run(); setup(); }).size(210f, 64f); @@ -55,10 +56,7 @@ public class LoadoutDialog extends FloatingDialog{ public void show(int capacity, Array stacks, Runnable reseter, Runnable updater, Runnable hider){ this.originalStacks = stacks; - this.stacks = stacks.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)); + reseed(); this.resetter = reseter; this.updater = updater; 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){ if(amount < 1000){ return 100;