Crater tweaks and volcano random radius additions

Author: voidsong-dragonfly

src/main/java/zmaster587/advancedRocketry/world/decoration/MapGenCrater.java

@@ -201,7 +201,7 @@ private int getRadius(int base, int x, int z, int bumps, int[] random) {
 
 		//Then we want to add some sin-function bumps to it, as determined by the bumps
 		//They increase theta each time because then we can get different-placed perturbations
-		//An example graph for this is here: https://www.desmos.com/calculator/2dqaekywth
+		//An example graph for this is here: https://www.desmos.com/calculator/5ojoqscuxv
 		int extras = 0;
 		for (int i = 2; i < Math.min(5, bumps) + 2; i++){
 			extras += random[i-2] * base * Math.sin(i * radians) * 0.0075;

src/main/java/zmaster587/advancedRocketry/world/decoration/MapGenCraterHuge.java

@@ -64,8 +64,9 @@ protected void recursiveGenerate(World world, int chunkX, int chunkZ, int p_1807
 			int[] sinCoefficients = {rand.nextInt(10) + 1, rand.nextInt(10) + 1, rand.nextInt(10) + 1, rand.nextInt(10) + 1, rand.nextInt(10) + 1};
 			//Radius determination, with heavy weight towards smaller craters
 			int baseRadius = getBaseRadius(rand.nextInt(400));
-			//Perturbation # calculation
+			//Perturbation # calculation && center spire boolean
 			int numBulges = rand.nextInt(5) + 1;
+			boolean spire = rand.nextInt(4) == 0;
 
 			//Turn the coordinates from chunk stuff into their actual values
 			int xCoord = -chunkX + p_180701_4_;
@@ -103,7 +104,7 @@ protected void recursiveGenerate(World world, int chunkX, int chunkZ, int p_1807
 							//Standard inversePartialSquareRadius & blockRadius stuff
 							int distancesSquared = ((xCoord * 16) + x) * ((xCoord * 16) + x) + ((zCoord * 16) + z) * ((zCoord * 16) + z);
 							int blockRadius = (int)Math.sqrt(distancesSquared);
-							int inversePartialSquareRadius = (radius*radius - distancesSquared) / (radius * 4);
+							int inversePartialSquareRadius = (int)((radius*radius - distancesSquared) / (baseRadius * ((baseRadius > 256) ? 4 : (baseRadius > 128) ? 3 : 2.25)));
 							int inverseRadius = radius - blockRadius;
 
 							//Places filler blocks to excavate the crater
@@ -119,16 +120,16 @@ protected void recursiveGenerate(World world, int chunkX, int chunkZ, int p_1807
 								//The graph of this function and the old one can be found here https://www.desmos.com/calculator/x02rgy2wlf
 								for (int dist = -1; dist < 9 * ridgeSize * ((1 - inverseRadius)/(0.8 * radius + (inverseRadius - 1) * (inverseRadius - 1))) - 1.06; dist++) {
 									//Place the bank thrown up by the impact, and have some of the farthest be dispersed
-									if (y + dist < 255 && inverseRadius > -0.5 * radius)
+									if (y + dist < 255 && inverseRadius > -0.75 * radius)
 										chunkPrimerIn.setBlockState(x, y + dist, z, this.getBlockToPlace(world, chunkX, chunkZ, ores));
-									else if (y + dist < 255 && inverseRadius >= -0.625 * radius  && !(rand.nextInt(inverseRadius + (int)(radius * 0.625) + 1) == 0))
+									else if (y + dist < 255 && inverseRadius >= -0.875 * radius  && !(rand.nextInt(inverseRadius + (int)(radius * 0.875) + 1) == 0))
 										chunkPrimerIn.setBlockState(x, y + dist, z, this.getBlockToPlace(world, chunkX, chunkZ, ores));
-									else if (y + dist < 255 && inverseRadius < -0.625 * radius  && rand.nextInt(Math.abs(inverseRadius + (int)(radius * 0.625)) + 1) == 0)
+									else if (y + dist < 255 && inverseRadius < -0.875 * radius  && rand.nextInt(Math.abs(inverseRadius + (int)(radius * 0.875)) + 1) == 0)
 										chunkPrimerIn.setBlockState(x, y + dist, z, this.getBlockToPlace(world, chunkX, chunkZ, ores));
 
 									//Ejecta blocks on top, then ejecta blocks below farther out
 									if (rand.nextInt(Math.abs(inverseRadius) + 1) == 0) {
-										if (inverseRadius < -0.25 * radius && inverseRadius > -1.5 * radius)
+										if (inverseRadius < -0.375 * radius && inverseRadius > -1.5 * radius)
 											chunkPrimerIn.setBlockState(x, y + dist + 1, z, this.getBlockToPlace(world, chunkX, chunkZ, ores));
 										else if (inverseRadius < -1.5 * radius)
 											chunkPrimerIn.setBlockState(x, y + dist + 1+ rand.nextInt(2), z, this.getBlockToPlace(world, chunkX, chunkZ, ores));
@@ -145,8 +146,8 @@ else if (inverseRadius < -1.5 * radius)
 
 							//Place spire in the center of the bowl
 							//An example of this graph is https://www.desmos.com/calculator/nn5xmzyu6i
-							if (blockRadius < 0.1 * radius) {
-								for (int dist = 0; dist < (-0.015625 * blockRadius * blockRadius) + radius/16; dist++) {
+							if (blockRadius < 0.25 * radius && spire) {
+								for (int dist = 0; dist < Math.pow(Math.abs(-(radius/16.0) + blockRadius/4.0), 1.25); dist++) {
 									chunkPrimerIn.setBlockState(x, y + Math.min(dist, 16) - 27, z, this.getBlockToPlaceRich(world, chunkX, chunkZ, ores));
 								}
 
@@ -215,7 +216,7 @@ private int getRadius(int base, int x, int z, int bumps, int[] random) {
 
 		//Then we want to add some sin-function bumps to it, as determined by the bumps
 		//They increase theta each time because then we can get different-placed perturbations
-		//An example graph for this is here: https://www.desmos.com/calculator/z4dsa5k1qv
+		//An example graph for this is here: https://www.desmos.com/calculator/5ojoqscuxv
 		int extras = 0;
 		for (int i = 2; i < Math.min(5, bumps) + 2; i++){
 			extras += random[i-2] * base * Math.sin(i * radians) * 0.0075;

src/main/java/zmaster587/advancedRocketry/world/decoration/MapGenCraterSmall.java

@@ -152,7 +152,7 @@ private int getRadius(int base, int x, int z, int bumps, int[] random) {
 
 		//Then we want to add some sin-function bumps to it, as determined by the bumps
 		//They increase theta each time because then we can get different-placed perturbations
-		//An example graph for this is here: https://www.desmos.com/calculator/2dqaekywth
+		//An example graph for this is here: https://www.desmos.com/calculator/5ojoqscuxv
 		int extras = 0;
 		for (int i = 2; i < Math.min(5, bumps) + 2; i++){
 			extras += random[i-2] * base * Math.sin(i * radians) * 0.0125;

src/main/java/zmaster587/advancedRocketry/world/decoration/MapGenVolcano.java

@@ -20,36 +20,38 @@ public MapGenVolcano(int chancePerChunk) {
 
 
 	@Override
-	protected void recursiveGenerate(World world, int chunkX,
-			int chunkZ, int p_180701_4_, int p_180701_5_,
-			ChunkPrimer chunkPrimerIn) {
+	protected void recursiveGenerate(World world, int chunkX, int chunkZ, int p_180701_4_, int p_180701_5_, ChunkPrimer chunkPrimerIn) {
 
 		chancePerChunk = 15;
 
 		if(rand.nextInt(chancePerChunk) == Math.abs(chunkX) % chancePerChunk && rand.nextInt(chancePerChunk) == Math.abs(chunkZ) % chancePerChunk) {
 
+			//Standard coefficient stuff
 			int size = 64;
 			int sizeDeviation = rand.nextInt(8); // 0 -> 8
-			int baseHeight = 40;
+			int baseHeight = 25;
 			int lavaNodeHeight = 25;
+			//Random coefficients for the sin functions
+			int[] sinCoefficients = {rand.nextInt(10) + 1, rand.nextInt(10) + 1, rand.nextInt(10) + 1, rand.nextInt(10) + 1, rand.nextInt(10) + 1};
+			int numBumps = rand.nextInt(5) + 1;
 
 			int xCoord = -chunkX + p_180701_4_;
 			int zCoord =  -chunkZ + p_180701_5_;
-			int crackle;
 
 			for(int x = 15; x >= 0; x--) {
 				for(int z = 15; z >= 0; z--) {
 
-					//Do some roughness
-					crackle = rand.nextInt(2);
-
 					int xCoordNew = (xCoord*16)+x;
 					int zCoordNew = (zCoord*16)+z;
 
+					//Radius determination based on random functions
 					int x2 = xCoordNew*xCoordNew;
 					int z2 = zCoordNew*zCoordNew;
-					double radius = Math.sqrt(x2 + z2);
-					double func = 1/(Math.pow(1.028, radius-(size-sizeDeviation)*3)) + 
+					double radius = getRadius(Math.sqrt(x2 + z2), xCoordNew, zCoordNew,  numBumps, sinCoefficients);
+					//Do some roughness
+					int crackle = rand.nextInt(2);
+
+					double func = 1/(Math.pow(1.028, radius-(size-sizeDeviation)*3)) +
 							+ baseHeight
 							- 8/(Math.pow(1.09, radius-((size-sizeDeviation)/2.6)))
 							-Math.pow(1.7, radius - size*.9);
@@ -64,7 +66,7 @@ else if(underSurface)
 							chunkPrimerIn.setBlockState(x, y, z, blockCasing.getDefaultState());
 
 
-						double sphereradius = x2+z2+(y - lavaNodeHeight)*(y - lavaNodeHeight);
+						double sphereradius = (radius * radius) + (y - lavaNodeHeight)*(y - lavaNodeHeight);
 						if(sphereradius < 23*23)
 							chunkPrimerIn.setBlockState(x, y, z, blockEnrichedLava.getDefaultState());
 						else if(sphereradius < 25*25)
@@ -78,4 +80,21 @@ else if(sphereradius < 25*25)
 			}
 		}
 	}
+
+	//Very fun function for fancy radius
+	//Int[] MUST be the same size as max bumps or larger!
+	private double getRadius(double base, int x, int z, int bumps, int[] random) {
+		//We need to start this out with polar coordinates
+		double radians = Math.atan2(x, z);
+
+		//Then we want to add some sin-function bumps to it, as determined by the bumps
+		//They increase theta each time because then we can get different-placed perturbations
+		//An example graph for this is here: https://www.desmos.com/calculator/5ojoqscuxv
+		int extras = 0;
+		for (int i = 2; i < Math.min(5, bumps) + 2; i++){
+			extras += random[i-2] * base * Math.sin(i * radians) * 0.0125;
+		}
+
+		return base + extras;
+	}
 }

src/main/resources/assets/advancedrocketry/models/block/models/nuclearrocketmotor.obj

@@ -403,7 +403,7 @@ f 30/38/37 25/32/37 24/52/38
 f 15/47/40 34/42/41 30/38/41
 f 24/52/43 25/32/44 27/34/44
 f 14/54/14 7/7/14 5/55/14
-usemtl Material.002
+usemtl Material
 f 41/68/47 46/69/47 57/70/47
 f 42/71/48 41/68/48 50/72/48
 f 43/73/49 42/74/49 52/75/49