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

Bugfixes / Renamed biomatter / Cleaned up conveyor sprites

Browse Source
This commit is contained in:
Anuken
2019-02-25 22:26:51 -05:00
parent 9c179e559b
commit 0a9b78f013
65 changed files with 1299 additions and 1291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -41,7 +41,7 @@ public class Blocks implements ContentList{
//crafting
siliconSmelter, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
melter, separator, centrifuge, biomatterCompressor, pulverizer, incinerator,
melter, separator, sporePress, pulverizer, incinerator,
//sandbox
powerVoid, powerSource, itemSource, liquidSource, itemVoid,
@@ -412,7 +412,7 @@ public class Blocks implements ContentList{
output = Items.blastCompound;
size = 2;
consumes.items(new ItemStack(Items.pyratite, 1), new ItemStack(Items.biomatter, 1));
consumes.items(new ItemStack(Items.pyratite, 1), new ItemStack(Items.sporePod, 1));
consumes.power(0.40f);
}};
@@ -463,7 +463,7 @@ public class Blocks implements ContentList{
cultivator = new Cultivator("cultivator"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 20, Items.lead, 50, Items.silicon, 20));
output = Items.biomatter;
output = Items.sporePod;
craftTime = 200;
size = 2;
hasLiquids = true;
@@ -474,7 +474,7 @@ public class Blocks implements ContentList{
consumes.liquid(Liquids.water, 0.15f);
}};
biomatterCompressor = new Compressor("biomattercompressor"){{
sporePress = new Compressor("spore-press"){{
requirements(Category.crafting, ItemStack.with(Items.lead, 70, Items.silicon, 60));
liquidCapacity = 60f;
craftTime = 20f;
@@ -484,7 +484,7 @@ public class Blocks implements ContentList{
health = 320;
hasLiquids = true;
consumes.item(Items.biomatter, 1);
consumes.item(Items.sporePod, 1);
consumes.power(0.60f);
}};

4
core/src/io/anuke/mindustry/content/Items.java
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, metaglass;
sporePod, sand, blastCompound, pyratite, metaglass;
@Override
public void load(){
@@ -85,7 +85,7 @@ public class Items implements ContentList{
type = ItemType.material;
}};
biomatter = new Item("biomatter", Color.valueOf("648b55")){{
sporePod = new Item("spore-pod", Color.valueOf("7457ce")){{
flammability = 1.05f;
}};

2
core/src/io/anuke/mindustry/content/TechTree.java
View File

@@ -127,7 +127,7 @@ public class TechTree implements ContentList{
node(siliconSmelter, () -> {
node(biomatterCompressor, () -> {
node(sporePress, () -> {
node(multiPress, () -> {
});

2
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -687,7 +687,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
if(target == null){
isShooting = false;
if(Core.settings.getBool("autotarget")){
target = Units.getClosestTarget(team, x, y, getWeapon().bullet.range());
target = Units.getClosestTarget(team, x, y, getWeapon().bullet.range(), u -> u.getTeam() != Team.none);
if(mech.canHeal && target == null){
target = Geometry.findClosest(x, y, world.indexer.getDamaged(Team.blue));

1
core/src/io/anuke/mindustry/game/GlobalData.java
View File

@@ -44,6 +44,7 @@ public class GlobalData{
}
public void addItem(Item item, int amount){
unlockContent(item);
modified = true;
items.getAndIncrement(item, 0, amount);
state.stats.itemsDelivered.getAndIncrement(item, 0, amount);

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

@@ -179,7 +179,7 @@ public class PlacementFragment extends Fragment{
top.add(new Table()).growX().update(topTable -> {
//don't refresh unnecessarily
if((tileDisplayBlock() == null && lastDisplay == getSelected() && !lastGround)
|| (tileDisplayBlock() != null && lastHover == hoverTile && lastGround))
|| (tileDisplayBlock() != null && lastHover == hoverTile && lastDisplay == tileDisplayBlock() && lastGround))
return;
topTable.clear();