Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Great Ocean Revamp #967

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

The Great Ocean Revamp #967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f89400d
The Great Ocean Revamp
ikabod-kee Jan 26, 2025
afe11b7
Changes + Added Shelf
ikabod-kee Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions assets/cubyz/biomes/beach.zig.zon
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions assets/cubyz/biomes/island.zig.zon
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions assets/cubyz/biomes/island_shelf.zig.zon
View file
Open in desktop

This file was deleted.

22 changes: 8 additions & 14 deletions assets/cubyz/biomes/ocean.zig.zon → assets/cubyz/biomes/ocean/base.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
.{
.properties = .{
.ocean,
.wet,
.antiMountain,
},
.radius = 500,
.minHeight = -100,
.maxHeight = -22,

.radius = 128,
.minHeight = -128,
.maxHeight = -80,
.chance = 10,
.roughness = 15,
.hills = 15,

.rivers = true,

.music = "cubyz:under_the_water_sky",

.ground_structure = .{
"2 to 3 cubyz:gravel",
},
Expand All @@ -38,14 +37,9 @@
},
.transitionBiomes = .{
.{
.id = "cubyz:beach",
.chance = 1,
.width = 1,
.properties = .{.land, .inland},
},
.{
.id = "cubyz:ocean_shelf",
ikabod-kee marked this conversation as resolved.
Show resolved Hide resolved
.id = "cubyz:ocean/beach",
.chance = 1,
.keepOriginalTerrain = 0.1,
.width = 2,
.properties = .{.land, .inland},
},
Expand Down
27 changes: 27 additions & 0 deletions assets/cubyz/biomes/ocean/beach.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.{
.properties = .{
.ocean,
.wet,
},
.minHeight = 2,
.maxHeight = 12,
.chance = 0,
.roughness = 1,
.interpolation = .linear,
.hills = 2,
.music = "cubyz:tides",
.structures = .{
.{
.id = "cubyz:ground_patch",
.block = "cubyz:sand",
.chance = 1,
.width = 4,
.variation = 8,
.depth = 4,
.smoothness = 0.8,
},
ikabod-kee marked this conversation as resolved.
Show resolved Hide resolved
},
.ground_structure = .{
"2 to 4 cubyz:sand",
},
}
38 changes: 38 additions & 0 deletions assets/cubyz/biomes/ocean/cliffs.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
.{
.properties = .{
.ocean,
.wet,
.mountain,
},
.radius = 128,
.minHeight = -1,
.maxHeight = 5,
.chance = 0.25,
.mountains = 50,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cliffs that stick out of the water do appear rather flat/round. Maybe more mountain noise would be good?

.roughness = 15,
.hills = 15,
.music = "cubyz:under_the_water_sky",
.ground_structure = .{
"2 to 3 cubyz:gravel",
},
.structures = .{
.{
.id = "cubyz:ground_patch",
.block = "cubyz:mossy_cobblestone",
.chance = 0.1,
.width = 6,
.variation = 2,
.depth = 2,
.smoothness = 0.2,
},
},
.transitionBiomes = .{
.{
.id = "cubyz:ocean/beach",
.chance = 1,
.keepOriginalTerrain = 0.1,
.width = 2,
.properties = .{.land, .inland},
},
},
}
38 changes: 15 additions & 23 deletions assets/cubyz/biomes/cold_ocean.zig.zon → assets/cubyz/biomes/ocean/shallows.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,45 @@
.{
.properties = .{
.cold,
.ocean,
.wet,
},
.type = .arctic_ocean,
.minHeight = -100,
.maxHeight = -22,
.radius = 500,

.roughness = 20,
.hills = 10,

.radius = 128,
.minHeight = -64,
.maxHeight = -32,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The shallow biome is kind of difficult to see in the rest of the ocean, maybe it should be shallower?

.chance = 10,
.roughness = 15,
.hills = 15,
.music = "cubyz:under_the_water_sky",

.ground_structure = .{
"1 to 2 cubyz:cobblestone",
"2 to 3 cubyz:gravel",
},
.structures = .{
.{
.id = "cubyz:ground_patch",
.block = "cubyz:mossy_cobblestone",
.chance = 0.064,
.chance = 0.1,
.width = 6,
.variation = 2,
.depth = 2,
.smoothness = 0.2,
},
.{
.id = "cubyz:ground_patch",
.block = "cubyz:gravel",
.chance = 0.032,
.block = "cubyz:sand",
.chance = 0.25,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new cliffs look nice, but I think you should make it rarer, the oceans appear to be cluttered with cliffs now.

.width = 6,
.variation = 2,
.variation = 6,
.depth = 2,
.smoothness = 0.2,
},
},
.transitionBiomes = .{
.{
.id = "cubyz:beach",
.chance = 1,
.width = 1,
.properties = .{.land, .inland},
},
.{
.id = "cubyz:ocean_shelf",
.id = "cubyz:ocean/beach",
.chance = 1,
.keepOriginalTerrain = 0.1,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this might break the transition in some cases. But you should test it out if that really is the cause.

.width = 2,
.properties = .{.land, .inland},
},
},
}
}
19 changes: 0 additions & 19 deletions assets/cubyz/biomes/ocean_shelf.zig.zon
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions assets/cubyz/biomes/warm_ocean.zig.zon
View file
Open in desktop

This file was deleted.

Loading