Bugfixes / Renamed biomatter / Cleaned up conveyor sprites

core/assets/bundles/bundle.properties

@@ -466,8 +466,8 @@ item.phase-fabric.name = Phase Fabric
 item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
 item.surge-alloy.name = Surge Alloy
 item.surge-alloy.description = An advanced alloy with unique electrical properties.
-item.biomatter.name = Biomatter
-item.biomatter.description = A clump of organic mush; used for conversion into oil or as a basic fuel.
+item.spore-pod.name = Spore Pod
+item.spore-pod.description = Used for conversion into oil, explosives and fuel.
 item.sand.name = Sand
 item.sand.description = A common material that is used extensively in smelting, both in alloying and as a flux.
 item.blast-compound.name = Blast Compound
@@ -603,7 +603,7 @@ block.pulverizer.name = Pulverizer
 block.cryofluidmixer.name = Cryofluid Mixer
 block.melter.name = Melter
 block.incinerator.name = Incinerator
-block.biomattercompressor.name = Biomatter Compressor
+block.spore-press.name = Spore Press
 block.separator.name = Separator
 block.power-node.name = Power Node
 block.power-node-large.name = Large Power Node
@@ -772,7 +772,7 @@ block.blast-mixer.description = Uses oil for transforming pyratite into the less
 block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
 block.melter.description = Melts down scrap into slag for further processing or usage in turrets.
 block.incinerator.description = Gets rid of any excess item or liquid.
-block.biomattercompressor.description = Compresses biomatter in order to retrieve oil.
+block.spore-press.description = Compresses spore pods into oil.
 block.separator.description = Extracts useful minerals from slag.
 block.power-node.description = Transmits power to connected nodes. Up to four power sources, sinks or nodes can be connected. The node will receive power from or supply power to any adjacent blocks.
 block.power-node-large.description = Has a larger radius than the power node and connects to up to six power sources, sinks or nodes.
@@ -793,7 +793,7 @@ block.pneumatic-drill.description = An improved drill which is faster and able t
 block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Additionally, radioactive thorium can be retrieved with this drill.
 block.blast-drill.description = The ultimate drill. Requires large amounts of power.
 block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby.
-block.cultivator.description = Cultivates spores with water in order to obtain biomatter.
+block.cultivator.description = Cultivates tiny concentrations of spores into industry-ready pods.
 block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby.
 block.trident-ship-pad.description = Leave your current vessel and change into a reasonably well armored heavy bomber.\nUse the pad by double tapping while standing on it.
 block.javelin-ship-pad.description = Leave your current vessel and change into a strong and fast interceptor with lightning weapons.\nUse the pad by double tapping while standing on it.

core/src/io/anuke/mindustry/content/Blocks.java

@@ -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);
         }};
 

core/src/io/anuke/mindustry/content/Items.java

@@ -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;
         }};
 

core/src/io/anuke/mindustry/content/TechTree.java

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

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -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));

core/src/io/anuke/mindustry/game/GlobalData.java

@@ -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);

core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java

@@ -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();

tests/src/test/java/power/ItemLiquidGeneratorTests.java

@@ -116,7 +116,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
             tests.add(dynamicTest("03", () -> simulateItemConsumption(inputType, Items.coal, 10, "Excess coal provided")));
             tests.add(dynamicTest("04", () -> simulateItemConsumption(inputType, Items.blastCompound, 1, "Blast compound provided")));
             //dynamicTest("03", () -> simulateItemConsumption(inputType, Items.plastanium, 1, "Plastanium provided")), // Not accepted by generator due to low flammability
-            tests.add(dynamicTest("05", () -> simulateItemConsumption(inputType, Items.biomatter, 1, "Biomatter provided")));
+            tests.add(dynamicTest("05", () -> simulateItemConsumption(inputType, Items.sporePod, 1, "Biomatter provided")));
             tests.add(dynamicTest("06", () -> simulateItemConsumption(inputType, Items.pyratite, 1, "Pyratite provided")));
         }
         DynamicTest[] testArray = new DynamicTest[tests.size()];