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

pain and suffering of various kinds

Browse Source
This commit is contained in:
Anuken
2018-09-05 20:25:50 -04:00
parent eb3e507a11
commit 2c8962cf5f
86 changed files with 518 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,7 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.OrderedMap;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.ContentLoader;
import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.mindustry.graphics.Palette;
@@ -15,6 +13,7 @@ import io.anuke.ucore.scene.ui.Tooltip;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.scene.utils.UIUtils;
import static io.anuke.mindustry.Vars.content;
import static io.anuke.mindustry.Vars.control;
public class UnlocksDialog extends FloatingDialog{
@@ -35,13 +34,15 @@ public class UnlocksDialog extends FloatingDialog{
table.margin(20);
ScrollPane pane = new ScrollPane(table, "clear-black");
OrderedMap<ContentType, Array<Content>> allContent = ContentLoader.getContentMap();
Array<Content>[] allContent = content.getContentMap();
for(ContentType key : allContent.orderedKeys()){
Array<Content> array = allContent.get(key);
for(int j =0; j< allContent.length; j ++){
ContentType type = ContentType.values()[j];
Array<Content> array = allContent[j];
if(array.size == 0 || !(array.first() instanceof UnlockableContent)) continue;
table.add("$content." + key + ".name").growX().left().color(Palette.accent);
table.add("$content." + type.name() + ".name").growX().left().color(Palette.accent);
table.row();
table.addImage("white").growX().pad(5).padLeft(0).padRight(0).height(3).color(Palette.accent);
table.row();

8
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -105,8 +105,8 @@ public class BlockInventoryFragment extends Fragment{
updateTablePosition();
if(tile.block().hasItems){
for(int i = 0; i < Item.all().size; i++){
boolean has = tile.entity.items.has(Item.getByID(i));
for(int i = 0; i < content.items().size; i++){
boolean has = tile.entity.items.has(content.item(i));
if(has != container.contains(i)){
rebuild(false);
}
@@ -123,8 +123,8 @@ public class BlockInventoryFragment extends Fragment{
if(tile.block().hasItems){
for(int i = 0; i < Item.all().size; i++){
Item item = Item.getByID(i);
for(int i = 0; i < content.items().size; i++){
Item item = content.item(i);
if(!tile.entity.items.has(item)) continue;
container.add(i);

2
core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
View File

@@ -149,7 +149,7 @@ public class DebugFragment extends Fragment{
t.row();
t.addButton("spawn", () -> {
FloatingDialog dialog = new FloatingDialog("debug spawn");
for(UnitType type : UnitType.all()){
for(UnitType type : content.units()){
dialog.content().addImageButton("white", 40, () -> {
BaseUnit unit = type.create(player.getTeam());
unit.setWave();