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

More graphite, less beryllium gen

Browse Source
This commit is contained in:
Anuken
2021-12-24 14:55:22 -05:00
parent c628ed9495
commit 88db3b886f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
+3 -3
View File
@@ -2896,7 +2896,7 @@ public class Blocks{
breach = new ItemTurret("breach"){{ breach = new ItemTurret("breach"){{
requirements(Category.turret, with(Items.beryllium, 35, Items.silicon, 20)); requirements(Category.turret, with(Items.beryllium, 35, Items.silicon, 20));
ammo( ammo(
Items.beryllium, new BasicBulletType(7f, 32){{ Items.beryllium, new BasicBulletType(7f, 40){{
width = 8f; width = 8f;
height = 14f; height = 14f;
shootEffect = Fx.colorSpark; shootEffect = Fx.colorSpark;
@@ -2910,7 +2910,7 @@ public class Blocks{
trailLength = 10; trailLength = 10;
hitEffect = despawnEffect = Fx.hitBulletColor; hitEffect = despawnEffect = Fx.hitBulletColor;
}}, }},
Items.tungsten, new BasicBulletType(6.6f, 47){{ Items.tungsten, new BasicBulletType(6.6f, 55){{
width = 9f; width = 9f;
height = 14f; height = 14f;
shootEffect = Fx.tungstenSpark; shootEffect = Fx.tungstenSpark;
@@ -2949,7 +2949,7 @@ public class Blocks{
fracture = new ItemTurret("fracture"){{ fracture = new ItemTurret("fracture"){{
requirements(Category.turret, with(Items.tungsten, 30, Items.graphite, 30, Items.silicon, 35)); requirements(Category.turret, with(Items.tungsten, 30, Items.graphite, 30, Items.silicon, 35));
ammo( ammo(
Items.tungsten, new ContinuousFlameBulletType(50f){{ Items.tungsten, new ContinuousFlameBulletType(55f){{
length = 105f; length = 105f;
shootEffect = Fx.randLifeSpark; shootEffect = Fx.randLifeSpark;
width = 4.5f; width = 4.5f;
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
+5 -5
View File
@@ -188,9 +188,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
if(block != Blocks.air){ if(block != Blocks.air){
//TODO use d4 instead of d8 for no out-of-reach ores? //TODO use d4 instead of d8 for no out-of-reach ores?
if(nearAir(x, y)){ 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; 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; ore = Blocks.wallOreBeryl;
} }
//TODO generate tungsten, or not? //TODO generate tungsten, or not?
@@ -200,12 +200,12 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
} }
}else if(!nearWall(x, y)){ }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; ore = Blocks.oreTungsten;
} }
//TODO design ore generation so it doesn't overlap //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; ore = Blocks.oreThorium;
} }
} }
@@ -261,7 +261,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
spacing = 1; spacing = 1;
shieldScaling = 60; shieldScaling = 60;
unitScaling = 2f; unitScaling = 2f;
healthFraction = 0.2f; healthFraction = 0.1f;
}}); }});
} }
} }