diff --git a/assets/cubyz/biomes/_migrations.zig.zon b/assets/cubyz/biomes/_migrations.zig.zon index 96489780b9..02a5366000 100644 --- a/assets/cubyz/biomes/_migrations.zig.zon +++ b/assets/cubyz/biomes/_migrations.zig.zon @@ -35,4 +35,7 @@ .{.old = "cave/curl_forest", .new = "cave/rare/curl_forest"}, .{.old = "cave/stone_forest", .new = "cave/rare/stone_forest"}, .{.old = "cave/crystal_forest", .new = "cave/rare/crystal_forest"}, + .{.old = "cave/void/rare/phantasmal/streamer", .new = "cave/void/void_roots"}, + .{.old = "cave/void/rare/phantasmal/starlight", .new = "cave/void/void_roots"}, + .{.old = "cave/rare/phantasmal", .new = "cave/rare/phantasmal/base"}, } diff --git a/assets/cubyz/biomes/cave/rare/phantasmal.zig.zon b/assets/cubyz/biomes/cave/rare/phantasmal.zig.zon deleted file mode 100644 index c11fcf2ca9..0000000000 --- a/assets/cubyz/biomes/cave/rare/phantasmal.zig.zon +++ /dev/null @@ -1,59 +0,0 @@ -.{ - .isCave = true, - .tags = .{.cave_layer}, - .fogDensity = 35, - .fogColor = 0x000C14, - .chance = 0.01, - .maxHeight = -5000, - .music = "cubyz:ikabod/xeric", - .stoneBlock = "cubyz:chalk/black", - - .ground_structure = .{ - "0 to 1 cubyz:obsidian", - }, - .structures = .{ - .{ - .id = "cubyz:sbb", - .structure = "cubyz:phantasmal/phantasmal_pillars", - .placeMode = .degradable, - .chance = 0.1, - }, - .{ - .id = "cubyz:flower_patch", - .blocks = .{"cubyz:glimmergill"}, - .chance = 0.015, - .width = 8, - .variation = 4, - .density = 0.06, - .priority = 0.12, - }, - .{ - .id = "cubyz:boulder", - .chance = 0.008, - .block = "cubyz:basalt/smooth", - .size = 4, - .size_variance = 12, - }, - .{ - .id = "cubyz:sbb", - .structure = "cubyz:mushroom/small/glimmergill", - .placeMode = .degradable, - .chance = 0.03, - }, - .{ - .id = "cubyz:sbb", - .structure = "cubyz:mushroom/big/glimmergill", - .placeMode = .degradable, - .chance = 0.02, - }, - }, - .caveModels = .{ - .{ - .id = "cubyz:partial_sphere", - .minAmount = 1, - .maxAmount = 5, - .minRadius = 30, - .maxRadius = 40, - }, - }, -} diff --git a/assets/cubyz/biomes/cave/void/rare/phantasmal/_defaults.zig.zon b/assets/cubyz/biomes/cave/rare/phantasmal/_defaults.zig.zon similarity index 76% rename from assets/cubyz/biomes/cave/void/rare/phantasmal/_defaults.zig.zon rename to assets/cubyz/biomes/cave/rare/phantasmal/_defaults.zig.zon index 2e254c7d93..70eac05b43 100644 --- a/assets/cubyz/biomes/cave/void/rare/phantasmal/_defaults.zig.zon +++ b/assets/cubyz/biomes/cave/rare/phantasmal/_defaults.zig.zon @@ -1,9 +1,9 @@ .{ .isCave = true, - .tags = .{.root_layer}, - .fogDensity = 10, - .fogColor = 0x272334, - .music = "cubyz:totaldemented/root", + .tags = .{.cave_layer}, + .fogDensity = 35, + .fogColor = 0x000C14, + .music = "cubyz:ikabod/xeric", .stoneBlock = "cubyz:chalk/black", .chance = 0.01, .ground_structure = .{ @@ -19,18 +19,18 @@ .{ .id = "cubyz:flower_patch", .blocks = .{"cubyz:glimmergill"}, - .chance = 0.02, - .width = 10, - .variation = 5, - .density = 0.07, - .priority = 0.13, + .chance = 0.015, + .width = 8, + .variation = 4, + .density = 0.06, + .priority = 0.12, }, .{ .id = "cubyz:boulder", .chance = 0.008, .block = "cubyz:basalt/smooth", .size = 4, - .size_variance = 8, + .size_variance = 12, }, .{ .id = "cubyz:sbb", diff --git a/assets/cubyz/biomes/cave/rare/phantasmal/base.zig.zon b/assets/cubyz/biomes/cave/rare/phantasmal/base.zig.zon new file mode 100644 index 0000000000..4b5652cf7f --- /dev/null +++ b/assets/cubyz/biomes/cave/rare/phantasmal/base.zig.zon @@ -0,0 +1,13 @@ +.{ + .maxHeight = -5000, + + .caveModels = .{ + .{ + .id = "cubyz:partial_sphere", + .minAmount = 1, + .maxAmount = 5, + .minRadius = 30, + .maxRadius = 40, + }, + }, +} diff --git a/assets/cubyz/biomes/cave/void/rare/phantasmal/starlight.zig.zon b/assets/cubyz/biomes/cave/rare/phantasmal/starlight.zig.zon similarity index 58% rename from assets/cubyz/biomes/cave/void/rare/phantasmal/starlight.zig.zon rename to assets/cubyz/biomes/cave/rare/phantasmal/starlight.zig.zon index d116da2077..110e41fb8a 100644 --- a/assets/cubyz/biomes/cave/void/rare/phantasmal/starlight.zig.zon +++ b/assets/cubyz/biomes/cave/rare/phantasmal/starlight.zig.zon @@ -1,18 +1,20 @@ .{ + .maxHeight = -20300, + .structures = .{ .{ .id = "cubyz:sbb", .structure = "cubyz:phantasmal/star/stars", - .chance = 0.05, + .chance = 0.08, }, }, .caveModels = .{ .{ .id = "cubyz:partial_sphere", - .minAmount = 4, - .maxAmount = 6, - .minRadius = 30, - .maxRadius = 40, + .minAmount = 1, + .maxAmount = 4, + .minRadius = 40, + .maxRadius = 50, }, }, } diff --git a/assets/cubyz/biomes/cave/void/rare/phantasmal/streamer.zig.zon b/assets/cubyz/biomes/cave/rare/phantasmal/streamer.zig.zon similarity index 71% rename from assets/cubyz/biomes/cave/void/rare/phantasmal/streamer.zig.zon rename to assets/cubyz/biomes/cave/rare/phantasmal/streamer.zig.zon index 202dfaa3dd..1048c5cba4 100644 --- a/assets/cubyz/biomes/cave/void/rare/phantasmal/streamer.zig.zon +++ b/assets/cubyz/biomes/cave/rare/phantasmal/streamer.zig.zon @@ -1,25 +1,27 @@ .{ + .maxHeight = -30000, + .structures = .{ .{ .id = "cubyz:sbb", .structure = "cubyz:phantasmal/auroras/high", - .chance = 0.03, + .chance = 0.04, .rotation = 0, }, .{ .id = "cubyz:sbb", .structure = "cubyz:phantasmal/auroras/low", .rotation = 0, - .chance = 0.04, + .chance = 0.05, }, }, .caveModels = .{ .{ .id = "cubyz:partial_sphere", - .minAmount = 5, - .maxAmount = 10, - .minRadius = 30, - .maxRadius = 40, + .minAmount = 1, + .maxAmount = 3, + .minRadius = 45, + .maxRadius = 60, }, }, }