Asteroid variants

core/src/mindustry/content/Planets.java

@@ -1,5 +1,6 @@
 package mindustry.content;
 
+import arc.func.*;
 import arc.graphics.*;
 import arc.math.*;
 import arc.math.geom.*;
@@ -10,6 +11,7 @@ import mindustry.graphics.g3d.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
 import mindustry.maps.planet.*;
 import mindustry.type.*;
+import mindustry.world.*;
 
 public class Planets implements ContentList{
     public static Planet
@@ -20,7 +22,7 @@ public class Planets implements ContentList{
 
     @Override
     public void load(){
-        sun = new Planet("sun", null, 2){{
+        sun = new Planet("sun", null, 4){{
             bloom = true;
             accessible = false;
 
@@ -45,48 +47,26 @@ public class Planets implements ContentList{
             atmosphereRadIn = 0.02f;
             atmosphereRadOut = 0.3f;
             tidalLock = true;
-            orbitSpacing = 0.45f;
+            orbitSpacing = 2f;
             totalRadius += 2.6f;
             lightSrcTo = 0.5f;
             lightDstFrom = 0.2f;
         }};
 
-        float[] offsets = {40, 0, 0, 20};
+        makeAsteroid("gier", erekir, Blocks.ferricStoneWall, Blocks.carbonWall, 0.4f, 7, 1f, gen -> {
-        for(int i = 0; i < 4; i++){
+            gen.min = 25;
-            int fi = i;
+            gen.max = 35;
-            new Planet("gier-" + i, erekir, 0.12f){{
+            gen.carbonChance = 0.6f;
-                hasAtmosphere = false;
+            gen.iceChance = 0f;
-                //for testing only!
+            gen.berylChance = 0.1f;
-                alwaysUnlocked = true;
+        });
-                updateLighting = false;
-                sectors.add(new Sector(this, Ptile.empty));
-                camRadius = 0.68f;
-                minZoom = 0.6f;
-                drawOrbit = false;
-                orbitOffset = offsets[fi];
 
-                generator = new AsteroidGenerator();
+        makeAsteroid("notva", sun, Blocks.ferricStoneWall, Blocks.beryllicStoneWall, 0.55f, 9, 1.3f, gen -> {
-
+            gen.berylChance = 0.8f;
-                meshLoader = () -> {
+            gen.iceChance = 0f;
-                    Seq<GenericMesh> meshes = new Seq<>();
+            gen.carbonChance = 0.01f;
-                    Color color = Blocks.ferricStoneWall.mapColor;
+            gen.max += 2;
-                    Rand rand = new Rand(2);
+        });
-
-                    meshes.add(new NoiseMesh(this, 0, 2, color, radius, 2, 0.55f, 0.45f, 14f));
-                    int am = rand.random(3, 7);
-
-                    //TODO gier variants with different names and different resource distributions
-                    for(int j = 0; j < am; j++){
-                        meshes.add(new MatMesh(
-                            new NoiseMesh(this, j + 1, 1, 0.022f + rand.random(0.039f), 2, 0.6f, 0.38f, 20f,
-                                color, Blocks.carbonWall.mapColor, 3, 0.6f, 0.38f, 0.6f),
-                            new Mat3D().setToTranslation(Tmp.v31.setToRandomDirection(rand).setLength(rand.random(0.44f, 1.4f)))));
-                    }
-
-                    return new MultiMesh(meshes.toArray(GenericMesh.class));
-                };
-            }};
-        }
 
         tantros = new Planet("tantros", sun, 1, 2){{
             generator = new TantrosPlanetGenerator();
@@ -106,5 +86,49 @@ public class Planets implements ContentList{
             startSector = 15;
             alwaysUnlocked = true;
         }};
+
+        makeAsteroid("verlius", sun, Blocks.stoneWall, Blocks.iceWall, 0.5f, 12, 2f, gen -> {
+            gen.berylChance = 0f;
+            gen.iceChance = 0.6f;
+            gen.carbonChance = 0.1f;
+            gen.ferricChance = 0f;
+        });
     }
+
+    private void makeAsteroid(String name, Planet parent, Block base, Block tint, float tintThresh, int pieces, float scale, Cons<AsteroidGenerator> cgen){
+        new Planet(name, parent, 0.12f){{
+            hasAtmosphere = false;
+            alwaysUnlocked = true; //for testing only!
+            updateLighting = false;
+            sectors.add(new Sector(this, Ptile.empty));
+            camRadius = 0.68f * scale;
+            minZoom = 0.6f;
+            drawOrbit = false;
+
+            generator = new AsteroidGenerator();
+            cgen.get((AsteroidGenerator)generator);
+
+            meshLoader = () -> {
+                Seq<GenericMesh> meshes = new Seq<>();
+                Color color = base.mapColor;
+                Rand rand = new Rand(id + 2);
+
+                meshes.add(new NoiseMesh(
+                    this, 0, 2, radius, 2, 0.55f, 0.45f, 14f,
+                    color, tint.mapColor, 3, 0.6f, 0.38f, tintThresh
+                ));
+
+                for(int j = 0; j < pieces; j++){
+                    meshes.add(new MatMesh(
+                        new NoiseMesh(this, j + 1, 1, 0.022f + rand.random(0.039f) * scale, 2, 0.6f, 0.38f, 20f,
+                        color, tint.mapColor, 3, 0.6f, 0.38f, tintThresh),
+                        new Mat3D().setToTranslation(Tmp.v31.setToRandomDirection(rand).setLength(rand.random(0.44f, 1.4f) * scale)))
+                    );
+                }
+
+                return new MultiMesh(meshes.toArray(GenericMesh.class));
+            };
+        }};
+    }
+
 }

core/src/mindustry/maps/planet/AsteroidGenerator.java

@@ -12,11 +12,10 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class AsteroidGenerator extends BlankPlanetGenerator{
-    //TODO nonstatic
+    public int min = 20, max = 30, octaves = 2, foct = 3;
-    public static int min = 20, max = 28, octaves = 2, foct = 3;
+    public float radMin = 12f, radMax = 60f, persistence = 0.4f, scale = 30f, mag = 0.46f, thresh = 1f;
-    public static float radMin = 12f, radMax = 60f, persistence = 0.4f, scale = 30f, mag = 0.46f, thresh = 1f;
+    public float fmag = 0.5f, fscl = 50f, fper = 0.6f;
-    public static float fmag = 0.5f, fscl = 50f, fper = 0.6f;
+    public float stoneChance = 0f, iceChance = 0f, carbonChance = 0f, berylChance = 0f, ferricChance = 1f;
-    public static float iceChance = 0.05f, carbonChance = 0.1f, berylChance = 0.1f;
 
     public float thoriumScl = 1f, copperScale = 1f, leadScale = 1f, graphiteScale = 1f, berylliumScale = 1f;
 
@@ -28,7 +27,8 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
             rand.chance(iceChance) ? Blocks.ice :
             rand.chance(carbonChance) ? Blocks.carbonStone :
             rand.chance(berylChance) ? Blocks.beryllicStone :
-            Blocks.ferricStone
+            rand.chance(ferricChance) ? Blocks.ferricStone :
+            Blocks.stone
         ).asFloor();
 
         for(int x = ax - radius; x <= ax + radius; x++){