This commit is contained in:
Anuken 2019-01-17 19:28:25 -05:00
parent bd6cfa6461
commit 22a6c4e8af
6 changed files with 325 additions and 317 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 608 KiB

After

Width:  |  Height:  |  Size: 609 KiB

View File

@ -7,7 +7,7 @@ import io.anuke.mindustry.type.ItemType;
public class Items implements ContentList{
public static Item scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium, phasefabric, surgealloy,
biomatter, sand, blastCompound, pyratite, bioglass;
biomatter, sand, blastCompound, pyratite, metaglass;
@Override
public void load(){
@ -26,6 +26,11 @@ public class Items implements ContentList{
genOre = true;
}};
metaglass = new Item("metaglass", Color.valueOf("648b55")){{
type = ItemType.material;
cost = 2f;
}};
graphite = new Item("graphite", Color.valueOf("b2c6d2")){{
type = ItemType.material;
cost = 1.3f;
@ -99,10 +104,5 @@ public class Items implements ContentList{
flammability = 0.7f;
explosiveness = 0.2f;
}};
bioglass = new Item("bioglass", Color.valueOf("648b55")){{
type = ItemType.material;
cost = 2f;
}};
}
}

View File

@ -51,11 +51,12 @@ public class ApplicationTests{
BundleLoader.load();
content.load();
content.initialize(Content::init);
add(logic = new Logic());
add(world = new World());
add(netServer = new NetServer());
content.initialize(Content::init);
}
@Override