Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features

This commit is contained in:
Anuken
2022-03-01 15:26:46 -05:00

View File

@@ -928,6 +928,7 @@ public class Blocks{
envDisabled = Env.none; envDisabled = Env.none;
itemCapacity = 30; itemCapacity = 30;
drawer = new DrawArcSmelter(); drawer = new DrawArcSmelter();
fogRadius = 3;
researchCost = with(Items.beryllium, 150, Items.graphite, 50); researchCost = with(Items.beryllium, 150, Items.graphite, 50);
consumeItems(with(Items.graphite, 1, Items.sand, 4)); consumeItems(with(Items.graphite, 1, Items.sand, 4));
@@ -1882,6 +1883,7 @@ public class Blocks{
//TODO bad idea? should this just require 1 beryllium? //TODO bad idea? should this just require 1 beryllium?
health = 90; health = 90;
speed = 4f; speed = 4f;
fogRadius = 1;
researchCost = with(Items.beryllium, 5); researchCost = with(Items.beryllium, 5);
}}; }};
@@ -1890,6 +1892,7 @@ public class Blocks{
health = 90; health = 90;
speed = 4f; speed = 4f;
regionRotated1 = 1; regionRotated1 = 1;
fogRadius = 1;
researchCost = with(Items.beryllium, 30); researchCost = with(Items.beryllium, 30);
}}; }};
@@ -1898,6 +1901,7 @@ public class Blocks{
requirements(Category.distribution, with(Items.graphite, 8, Items.beryllium, 8)); requirements(Category.distribution, with(Items.graphite, 8, Items.beryllium, 8));
health = 90; health = 90;
speed = 4f; speed = 4f;
fogRadius = 1;
researchCostMultiplier = 1.5f; researchCostMultiplier = 1.5f;
}}; }};
@@ -1905,6 +1909,7 @@ public class Blocks{
requirements(Category.distribution, with(Items.beryllium, 20)); requirements(Category.distribution, with(Items.beryllium, 20));
health = 90; health = 90;
speed = 4f; speed = 4f;
fogRadius = 1;
researchCostMultiplier = 0.3f; researchCostMultiplier = 0.3f;
}}; }};
@@ -1913,6 +1918,7 @@ public class Blocks{
health = 120; health = 120;
speed = 4f; speed = 4f;
regionRotated1 = 1; regionRotated1 = 1;
fogRadius = 1;
}}; }};
surgeConveyor = new StackConveyor("surge-conveyor"){{ surgeConveyor = new StackConveyor("surge-conveyor"){{
@@ -2285,6 +2291,7 @@ public class Blocks{
health = 90; health = 90;
consumePowerBuffered(1000f); consumePowerBuffered(1000f);
range = 10; range = 10;
fogRadius = 1;
researchCost = with(Items.beryllium, 5); researchCost = with(Items.beryllium, 5);
}}; }};
@@ -2326,6 +2333,7 @@ public class Blocks{
hasLiquids = true; hasLiquids = true;
outputLiquid = new LiquidStack(Liquids.water, 5f / 60f / 9f); outputLiquid = new LiquidStack(Liquids.water, 5f / 60f / 9f);
liquidCapacity = 20f; liquidCapacity = 20f;
fogRadius = 3;
researchCost = with(Items.beryllium, 15); researchCost = with(Items.beryllium, 15);
}}; }};
@@ -2522,6 +2530,7 @@ public class Blocks{
size = 2; size = 2;
attribute = Attribute.sand; attribute = Attribute.sand;
output = Items.sand; output = Items.sand;
fogRadius = 2;
researchCost = with(Items.beryllium, 100, Items.graphite, 40); researchCost = with(Items.beryllium, 100, Items.graphite, 40);
}}; }};
@@ -2532,6 +2541,7 @@ public class Blocks{
tier = 3; tier = 3;
size = 2; size = 2;
range = 4; range = 4;
fogRadius = 2;
researchCost = with(Items.beryllium, 10); researchCost = with(Items.beryllium, 10);
consumeLiquid(Liquids.hydrogen, 0.25f / 60f).boost(); consumeLiquid(Liquids.hydrogen, 0.25f / 60f).boost();
@@ -3670,6 +3680,7 @@ public class Blocks{
plans.add(new UnitPlan(UnitTypes.stell, 60f * 60f * 1.5f, with(Items.beryllium, 100f, Items.silicon, 60f))); plans.add(new UnitPlan(UnitTypes.stell, 60f * 60f * 1.5f, with(Items.beryllium, 100f, Items.silicon, 60f)));
researchCost = with(Items.beryllium, 200, Items.graphite, 80, Items.silicon, 80); researchCost = with(Items.beryllium, 200, Items.graphite, 80, Items.silicon, 80);
regionSuffix = "-dark"; regionSuffix = "-dark";
fogRadius = 3;
consumePower(2f); consumePower(2f);
}}; }};