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

Removed item core restrictions

Browse Source
This commit is contained in:
Anuken
2020-06-29 19:32:15 -04:00
parent 810a59f146
commit df4278a646
11 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/ui/ContentDisplay.java
View File

@@ -84,9 +84,6 @@ public class ContentDisplay{
table.left().defaults().fillX();
table.add(Core.bundle.format("item.corestorable", item.type == ItemType.material ? Core.bundle.format("yes") : Core.bundle.format("no")));
table.row();
table.add(Core.bundle.format("item.explosiveness", (int)(item.explosiveness * 100)));
table.row();
table.add(Core.bundle.format("item.flammability", (int)(item.flammability * 100)));

2
core/src/mindustry/ui/ItemsDisplay.java
View File

@@ -30,7 +30,7 @@ public class ItemsDisplay extends Table{
t.marginRight(30f);
t.left();
for(Item item : content.items()){
if(item.type == ItemType.material && item.unlocked()){
if(item.unlocked()){
t.label(() -> format(item)).left();
t.image(item.icon(Cicon.small)).size(8 * 3).padLeft(4).padRight(4);
t.add(item.localizedName).color(Color.lightGray).left();

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

@@ -106,8 +106,7 @@ public class LoadoutDialog extends BaseDialog{
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.addAll(content.items().select(i -> !stacks.contains(stack -> stack.item == i)).map(i -> new ItemStack(i, 0)));
this.stacks.sort(Structs.comparingInt(s -> s.item.id));
}