diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index cf24e670d4..9ddebf16a4 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2896,7 +2896,7 @@ public class Blocks{ breach = new ItemTurret("breach"){{ requirements(Category.turret, with(Items.beryllium, 35, Items.silicon, 20)); ammo( - Items.beryllium, new BasicBulletType(7f, 32){{ + Items.beryllium, new BasicBulletType(7f, 40){{ width = 8f; height = 14f; shootEffect = Fx.colorSpark; @@ -2910,7 +2910,7 @@ public class Blocks{ trailLength = 10; hitEffect = despawnEffect = Fx.hitBulletColor; }}, - Items.tungsten, new BasicBulletType(6.6f, 47){{ + Items.tungsten, new BasicBulletType(6.6f, 55){{ width = 9f; height = 14f; shootEffect = Fx.tungstenSpark; @@ -2949,7 +2949,7 @@ public class Blocks{ fracture = new ItemTurret("fracture"){{ requirements(Category.turret, with(Items.tungsten, 30, Items.graphite, 30, Items.silicon, 35)); ammo( - Items.tungsten, new ContinuousFlameBulletType(50f){{ + Items.tungsten, new ContinuousFlameBulletType(55f){{ length = 105f; shootEffect = Fx.randLifeSpark; width = 4.5f; diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 8d4040724b..5dbad79057 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -188,9 +188,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ if(block != Blocks.air){ //TODO use d4 instead of d8 for no out-of-reach ores? if(nearAir(x, y)){ - if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.59f){ + if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.52f){ block = Blocks.graphiticWall; - }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 36f, 1f) > 0.66f){ + }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 38f, 1f) > 0.68f){ ore = Blocks.wallOreBeryl; } //TODO generate tungsten, or not? @@ -200,12 +200,12 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ } }else if(!nearWall(x, y)){ - if(noise(x + 150, y + x*2 + 100, 4, 0.8f, 60f, 1f) > 0.75f/* && floor == Blocks.yellowStone*/){ + if(noise(x + 150, y + x*2 + 100, 4, 0.8f, 55f, 1f) > 0.76f/* && floor == Blocks.yellowStone*/){ ore = Blocks.oreTungsten; } //TODO design ore generation so it doesn't overlap - if(noise(x + 999, y + 600, 4, 0.63f, 50f, 1f) < 0.21f/* && floor == Blocks.yellowStone*/){ + if(noise(x + 999, y + 600, 4, 0.63f, 50f, 1f) < 0.2f/* && floor == Blocks.yellowStone*/){ ore = Blocks.oreThorium; } } @@ -261,7 +261,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ spacing = 1; shieldScaling = 60; unitScaling = 2f; - healthFraction = 0.2f; + healthFraction = 0.1f; }}); } }