Repository navigation
Chalk islands #3670
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.
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
Merged
Merged
Chalk islands #3670
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ec6a72f
yea
careeoki 97c028b
tweak
careeoki a8a4f5a
reduce chance in ocean
careeoki 2c84725
CI
careeoki 1a846e7
Merge branch 'master' of https://github.com/PixelGuys/Cubyz into chal…
careeoki 9b8d01e
Merge branch 'master' of https://github.com/PixelGuys/Cubyz into chal…
careeoki a434dfd
test
careeoki 401ca81
amber:
careeoki afc9a34
more var
careeoki File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| .{ | ||
| .chance = 0.075, | ||
| .climate = .{ | ||
| .cold, | ||
| .ocean, | ||
| }, | ||
| .minHeight = -30, | ||
| .maxHeight = -12, | ||
| .maxHeightLimit = 7, | ||
| .smoothBeaches = true, | ||
| .stoneBlock = "cubyz:chalk/white", | ||
|
|
||
| .radius = 500, | ||
| .roughness = 15, | ||
| .hills = 8, | ||
|
|
||
| .music = "cubyz:totaldemented/tides", | ||
|
|
||
| .ground_structure = .{ | ||
| "1 to 2 cubyz:slate/rough", | ||
| }, | ||
| .structures = .{ | ||
| .{ | ||
| .id = "cubyz:ground_patch", | ||
| .block = "cubyz:gravel", | ||
| .chance = 0.02, | ||
| .width = 10, | ||
| .variation = 5, | ||
| .depth = 2, | ||
| .smoothness = 0.4, | ||
| }, | ||
| }, | ||
| .transitionBiomes = .{ | ||
| .{ | ||
| .id = "cubyz:beach/cold/wide", | ||
| .chance = 0.2, | ||
| .width = 2, | ||
| .climate = .{.land, .inland}, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:beach/cold/base", | ||
| .chance = 1, | ||
| .width = 1, | ||
| .climate = .{.land, .inland}, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:ocean/cold/shelf", | ||
| .chance = 1, | ||
| .width = 3, | ||
| .climate = .{.land, .inland}, | ||
| }, | ||
| }, | ||
| } |
7 changes: 7 additions & 0 deletions
7
assets/cubyz/biomes/ocean/cold/chalk_island/_defaults.zig.zon
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| .{ | ||
| .chance = 0, | ||
| .climate = .{ | ||
| .ocean, | ||
| }, | ||
| .music = "cubyz:totaldemented/tides", | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| .{ | ||
| .interpolation = .none, | ||
| .interpolationWeight = 0.8, | ||
| .minHeight = 50, | ||
| .maxHeight = 56, | ||
|
IntegratedQuantum marked this conversation as resolved.
Outdated
|
||
| .radius = 80, | ||
| .soilCreep = 4, | ||
| .hills = 6, | ||
| .stoneBlock = "cubyz:chalk/white", | ||
| .tags = .{ | ||
| .pine, | ||
| }, | ||
| .ground_structure = .{ | ||
| "cubyz:grass/cold", | ||
| }, | ||
| .structures = .{ | ||
| .{ | ||
| .id = "cubyz:sbb", | ||
| .structure = "cubyz:tree/oak/bush", | ||
| .placeMode = .degradable, | ||
| .chance = 0.01, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:sbb", | ||
| .structure = "cubyz:tree/coniferous/pine/loblolly", | ||
| .placeMode = .degradable, | ||
| .chance = 0.001, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:sbb", | ||
| .structure = "cubyz:tree/coniferous/pine/eastern_white", | ||
| .placeMode = .degradable, | ||
| .chance = 0.001, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:flower_patch", | ||
| .blocks = .{"cubyz:grass/vegetation/cold"}, | ||
| .chance = 0.15, | ||
| .width = 5, | ||
| .variation = 3, | ||
| .density = 0.5, | ||
| .priority = 0.2, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:flower_patch", | ||
| .blocks = .{"cubyz:daisies"}, | ||
| .chance = 0.003, | ||
| .width = 10, | ||
| .variation = 6, | ||
| .density = 0.3, | ||
| .priority = 0.1, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:flower_patch", | ||
| .blocks = .{"cubyz:osier"}, | ||
| .chance = 0.002, | ||
| .width = 9, | ||
| .variation = 5, | ||
| .density = 0.8, | ||
| .priority = 0.1, | ||
| }, | ||
| }, | ||
| .parentBiomes = .{ | ||
| .{ | ||
| .id = "cubyz:ocean/cold/chalk_island/shelf", | ||
| .chance = 1, | ||
| .parentEdgeDistance = 45, | ||
| }, | ||
| }, | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| .{ | ||
|
IntegratedQuantum marked this conversation as resolved.
|
||
| .minHeight = -10, | ||
| .maxHeight = -3, | ||
| .radius = 128, | ||
| .hills = 4, | ||
| .maxSubBiomeCount = 1, | ||
| .stoneBlock = "cubyz:chalk/white", | ||
| .ground_structure = .{ | ||
| "2 to 3 cubyz:gravel", | ||
| }, | ||
| .structures = .{ | ||
| .{ | ||
| .id = "cubyz:ground_patch", | ||
| .block = "cubyz:amber_ore:cubyz:gravel", | ||
|
IntegratedQuantum marked this conversation as resolved.
Outdated
|
||
| .chance = 0.012, | ||
| .width = 1, | ||
| .variation = 2, | ||
| .depth = 1, | ||
| .smoothness = 0.1, | ||
| }, | ||
| }, | ||
| .parentBiomes = .{ | ||
| .{ | ||
| .id = "cubyz:ocean/cold/base", | ||
| .chance = 0.6, | ||
|
IntegratedQuantum marked this conversation as resolved.
Outdated
|
||
| }, | ||
| .{ | ||
| .id = "cubyz:ocean/cold/chalk_archipelago", | ||
| .chance = 15, | ||
| }, | ||
| }, | ||
| } | ||
43 changes: 43 additions & 0 deletions
43
assets/cubyz/biomes/ocean/temperate/chalk_archipelago.zig.zon
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| .{ | ||
| .chance = 0.075, | ||
| .climate = .{ | ||
| .ocean, | ||
| }, | ||
| .radius = 500, | ||
| .minHeight = -30, | ||
| .maxHeight = -12, | ||
| .maxHeightLimit = 7, | ||
| .smoothBeaches = true, | ||
| .stoneBlock = "cubyz:chalk/white", | ||
|
|
||
| .roughness = 15, | ||
| .hills = 8, | ||
|
|
||
| .rivers = true, | ||
|
|
||
| .music = "cubyz:totaldemented/tides", | ||
|
|
||
| .ground_structure = .{ | ||
| "2 to 3 cubyz:sand", | ||
| }, | ||
| .transitionBiomes = .{ | ||
| .{ | ||
| .id = "cubyz:beach/warm/wide", | ||
| .chance = 0.2, | ||
| .width = 2, | ||
| .climate = .{.land, .inland}, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:beach/warm/base", | ||
| .chance = 1, | ||
| .width = 1, | ||
| .climate = .{.land, .inland}, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:ocean/temperate/shelf", | ||
| .chance = 1, | ||
| .width = 3, | ||
| .climate = .{.land, .inland}, | ||
| }, | ||
| }, | ||
| } |
7 changes: 7 additions & 0 deletions
7
assets/cubyz/biomes/ocean/temperate/chalk_island/_defaults.zig.zon
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| .{ | ||
| .chance = 0, | ||
| .climate = .{ | ||
| .ocean, | ||
| }, | ||
| .music = "cubyz:totaldemented/tides", | ||
| } |
64 changes: 64 additions & 0 deletions
64
assets/cubyz/biomes/ocean/temperate/chalk_island/base.zig.zon
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| .{ | ||
| .interpolation = .none, | ||
| .interpolationWeight = 0.8, | ||
| .minHeight = 50, | ||
| .maxHeight = 56, | ||
|
IntegratedQuantum marked this conversation as resolved.
Outdated
|
||
| .radius = 80, | ||
| .soilCreep = 4, | ||
| .hills = 6, | ||
| .stoneBlock = "cubyz:chalk/white", | ||
| .tags = .{ | ||
| .oak, | ||
| }, | ||
| .ground_structure = .{ | ||
| "cubyz:grass/temperate", | ||
| }, | ||
| .structures = .{ | ||
| .{ | ||
| .id = "cubyz:sbb", | ||
| .structure = "cubyz:tree/oak/bush", | ||
| .placeMode = .degradable, | ||
| .chance = 0.01, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:sbb", | ||
| .structure = "cubyz:tree/oak/white", | ||
| .placeMode = .degradable, | ||
| .chance = 0.001, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:flower_patch", | ||
| .blocks = .{"cubyz:grass/vegetation/temperate"}, | ||
| .chance = 0.15, | ||
| .width = 5, | ||
| .variation = 3, | ||
| .density = 0.5, | ||
| .priority = 0.2, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:flower_patch", | ||
| .blocks = .{"cubyz:daisies"}, | ||
| .chance = 0.003, | ||
| .width = 10, | ||
| .variation = 6, | ||
| .density = 0.4, | ||
| .priority = 0.1, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:flower_patch", | ||
| .blocks = .{"cubyz:daisies"}, | ||
| .chance = 0.002, | ||
| .width = 9, | ||
| .variation = 5, | ||
| .density = 0.4, | ||
| .priority = 0.1, | ||
| }, | ||
| }, | ||
| .parentBiomes = .{ | ||
| .{ | ||
| .id = "cubyz:ocean/temperate/chalk_island/shelf", | ||
| .chance = 1, | ||
| .parentEdgeDistance = 45, | ||
| }, | ||
| }, | ||
| } | ||
32 changes: 32 additions & 0 deletions
32
assets/cubyz/biomes/ocean/temperate/chalk_island/shelf.zig.zon
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| .{ | ||
| .minHeight = -10, | ||
| .maxHeight = -3, | ||
| .radius = 128, | ||
| .hills = 4, | ||
| .maxSubBiomeCount = 1, | ||
| .stoneBlock = "cubyz:chalk/white", | ||
| .ground_structure = .{ | ||
| "2 to 3 cubyz:sand", | ||
| }, | ||
| .structures = .{ | ||
| .{ | ||
| .id = "cubyz:ground_patch", | ||
| .block = "cubyz:amber_ore:cubyz:sand", | ||
| .chance = 0.012, | ||
| .width = 1, | ||
| .variation = 2, | ||
| .depth = 1, | ||
| .smoothness = 0.1, | ||
| }, | ||
| }, | ||
| .parentBiomes = .{ | ||
| .{ | ||
| .id = "cubyz:ocean/temperate/base", | ||
| .chance = 0.6, | ||
| }, | ||
| .{ | ||
| .id = "cubyz:ocean/temperate/chalk_archipelago", | ||
| .chance = 15, | ||
| }, | ||
| }, | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.