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

Removed unnecessary tungsten references

Browse Source
This commit is contained in:
Anuken
2018-08-18 23:02:10 -04:00
parent a60ce3c54c
commit b872252771
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/content/Items.java
View File

@@ -8,11 +8,16 @@ import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemType;
public class Items implements ContentList{
public static Item stone, lead, coal, carbide, titanium, thorium, silicon, plastanium, phasematter, surgealloy,
public static Item stone, aluminum, lead, coal, carbide, titanium, thorium, silicon, plastanium, phasematter, surgealloy,
biomatter, sand, blastCompound, pyratite;
@Override
public void load(){
aluminum = new Item("aluminum", Color.valueOf("8e85a2")){{
type = ItemType.material;
hardness = 1;
cost = 0.6f;
}};
lead = new Item("lead", Color.valueOf("8e85a2")){{
type = ItemType.material;

1
core/src/io/anuke/mindustry/content/Recipes.java
View File

@@ -13,7 +13,6 @@ public class Recipes implements ContentList{
@Override
public void load(){
//WALLS
/*
new Recipe(defense, DefenseBlocks.tungstenWall, new ItemStack(Items.tungsten, 12));
new Recipe(defense, DefenseBlocks.tungstenWallLarge, new ItemStack(Items.tungsten, 12 * 4));

2
core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -242,6 +242,8 @@ public class ItemBridge extends Block{
@Override
public boolean acceptItem(Item item, Tile tile, Tile source){
if(tile.getTeamID() != source.getTeamID()) return false;
ItemBridgeEntity entity = tile.entity();
Tile other = world.tile(entity.link);
boolean linked = false;

2
core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
View File

@@ -49,7 +49,7 @@ public class Router extends Block{
public boolean acceptItem(Item item, Tile tile, Tile source){
SplitterEntity entity = tile.entity();
return entity.lastItem == null;
return tile.getTeamID() == source.getTeamID() && entity.lastItem == null;
}
@Override

3
core/src/io/anuke/mindustry/world/blocks/storage/Vault.java
View File

@@ -1,7 +1,6 @@
package io.anuke.mindustry.world.blocks.storage;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Edges;
@@ -68,7 +67,7 @@ public class Vault extends StorageBlock{
}
}
}else{
todump = Items.tungsten;
todump = Item.getByID(0);
if(other.block().acceptItem(todump, other, in) && canDump(tile, other, todump)){
other.block().handleItem(removeItem(tile, null), other, in);