diff --git a/assets/cubyz/biomes/savannah/fields/_defaults.zig.zon b/assets/cubyz/biomes/savannah/fields/_defaults.zig.zon new file mode 100644 index 0000000000..b12a952b92 --- /dev/null +++ b/assets/cubyz/biomes/savannah/fields/_defaults.zig.zon @@ -0,0 +1,52 @@ +.{ + .fogDensity = 1.5, + .fogColor = 0xe9f2e2, + .properties = .{ + .hot, + .dry, + }, + .tags = .{ + .baobab, + .cactus, + }, + .minHeightLimit = 7, + .minHeight = 30, + .maxHeight = 64, + .maxHeightLimit = 42, + .smoothBeaches = true, + .minRadius = 256, + .maxRadius = 320, + .hills = 8, + .validPlayerSpawn = true, + .music = "cubyz:mischol/desert_firefly", + .structures = .{ + .{ + .id = "cubyz:ground_patch", + .block = "cubyz:dirt", + .chance = 0.07, + .width = 5, + .variation = 4, + .depth = 2, + .smoothness = 0.4, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:grass/vegetation/dry"}, + .chance = 0.2, + .width = 5, + .variation = 8, + .density = 0.4, + .priority = 0.1, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:tussock"}, + .chance = 0.03, + .width = 4, + .variation = 2, + .density = 0.2, + .priority = 0.1, + }, + }, + .stoneBlock = "cubyz:sandstone/rough", +} diff --git a/assets/cubyz/biomes/savannah/fields/arid.zig.zon b/assets/cubyz/biomes/savannah/fields/arid.zig.zon new file mode 100644 index 0000000000..ed4526c7b5 --- /dev/null +++ b/assets/cubyz/biomes/savannah/fields/arid.zig.zon @@ -0,0 +1,57 @@ +.{ + .ground_structure = .{ + "cubyz:grass/arid", + "1 to 2 cubyz:sand", + }, + .chance = 0, + .minRadius = 25, + .maxRadius = 50, + .keepOriginalTerrain = 1, + .parentBiomes = .{ + .{ + .id = "cubyz:savannah/fields/base", + .chance = 4, + }, + }, + .structures = .{ + .{ + .id = "cubyz:sbb", + .structure = "cubyz:tree/baobab/young", + .placeMode = .degradable, + .chance = 0.01, + }, + .{ + .id = "cubyz:sbb", + .structure = "cubyz:tree/baobab/young", + .placeMode = .degradable, + .chance = 0.015, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:grass/vegetation/dry"}, + .chance = 0.05, + .width = 3, + .variation = 4, + .density = 0.3, + .priority = 0.1, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:grass/vegetation/arid"}, + .chance = 0.2, + .width = 5, + .variation = 8, + .density = 0.35, + .priority = 0.1, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:tussock"}, + .chance = 0.02, + .width = 5, + .variation = 3, + .density = 0.2, + .priority = 0.1, + }, + }, +} diff --git a/assets/cubyz/biomes/savannah/fields/base.zig.zon b/assets/cubyz/biomes/savannah/fields/base.zig.zon new file mode 100644 index 0000000000..7e3adf262b --- /dev/null +++ b/assets/cubyz/biomes/savannah/fields/base.zig.zon @@ -0,0 +1,54 @@ +.{ + .ground_structure = .{ + "cubyz:grass/dry", + "1 to 2 cubyz:dirt", + }, + .structures = .{ + .{ + .id = "cubyz:sbb", + .structure = "cubyz:tree/baobab/young", + .placeMode = .degradable, + .chance = 0.02, + }, + .{ + .id = "cubyz:sbb", + .structure = "cubyz:tree/baobab/grandidieri", + .placeMode = .degradable, + .chance = 0.005, + }, + .{ + .id = "cubyz:simple_vegetation", + .block = "cubyz:cactus", + .chance = 0.01, + .height = 1, + .height_variation = 3, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:grass/vegetation/dry"}, + .chance = 0.2, + .width = 5, + .variation = 8, + .density = 0.4, + .priority = 0.1, + }, + .{ + .id = "cubyz:ground_patch", + .block = "cubyz:grass/arid", + .chance = 0.1, + .width = 6, + .variation = 4, + .depth = 1, + .smoothness = 0.4, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:grass/vegetation/arid"}, + .chance = 0.2, + .width = 5, + .variation = 8, + .density = 0.35, + .priority = 0.1, + }, + }, +} diff --git a/assets/cubyz/biomes/savannah/fields/bushy.zig.zon b/assets/cubyz/biomes/savannah/fields/bushy.zig.zon new file mode 100644 index 0000000000..d6ef58bbae --- /dev/null +++ b/assets/cubyz/biomes/savannah/fields/bushy.zig.zon @@ -0,0 +1,64 @@ +.{ + .ground_structure = .{ + "cubyz:grass/dry", + "1 to 2 cubyz:dirt", + }, + .chance = 0, + .minRadius = 20, + .maxRadius = 45, + .keepOriginalTerrain = 1, + .parentBiomes = .{ + .{ + .id = "cubyz:savannah/fields/base", + .chance = 5, + }, + }, + .structures = .{ + .{ + .id = "cubyz:sbb", + .structure = "cubyz:tree/baobab/young", + .placeMode = .degradable, + .chance = 0.015, + }, + .{ + .id = "cubyz:sbb", + .structure = "cubyz:tree/baobab/bush", + .placeMode = .degradable, + .chance = 0.2, + }, + .{ + .id = "cubyz:simple_vegetation", + .block = "cubyz:cactus", + .chance = 0.01, + .height = 1, + .height_variation = 3, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:grass/vegetation/dry"}, + .chance = 0.2, + .width = 5, + .variation = 8, + .density = 0.4, + .priority = 0.1, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:grass/vegetation/arid"}, + .chance = 0.1, + .width = 5, + .variation = 6, + .density = 0.3, + .priority = 0.1, + }, + .{ + .id = "cubyz:flower_patch", + .blocks = .{"cubyz:marigold"}, + .chance = 0.03, + .width = 5, + .variation = 3, + .density = 0.2, + .priority = 0.1, + }, + }, +} diff --git a/assets/cubyz/blocks/grass/arid.zig.zon b/assets/cubyz/blocks/grass/arid.zig.zon new file mode 100644 index 0000000000..04a2b46341 --- /dev/null +++ b/assets/cubyz/blocks/grass/arid.zig.zon @@ -0,0 +1,7 @@ +.{ + .drops = .{ + .{.items = .{"cubyz:sand"}}, + }, + .texture = "cubyz:grass/arid", + .texture_bottom = "cubyz:sand", +} diff --git a/assets/cubyz/blocks/grass/vegetation/arid.zig.zon b/assets/cubyz/blocks/grass/vegetation/arid.zig.zon new file mode 100644 index 0000000000..891cc405f7 --- /dev/null +++ b/assets/cubyz/blocks/grass/vegetation/arid.zig.zon @@ -0,0 +1,6 @@ +.{ + .texture = "cubyz:grass/vegetation/arid", + .item = .{ + .texture = "grass_vegetation/arid.png", + }, +} diff --git a/assets/cubyz/blocks/textures/grass/arid.png b/assets/cubyz/blocks/textures/grass/arid.png new file mode 100644 index 0000000000..0dc64cbd3b Binary files /dev/null and b/assets/cubyz/blocks/textures/grass/arid.png differ diff --git a/assets/cubyz/blocks/textures/grass/vegetation/arid.png b/assets/cubyz/blocks/textures/grass/vegetation/arid.png new file mode 100644 index 0000000000..496a9babf3 Binary files /dev/null and b/assets/cubyz/blocks/textures/grass/vegetation/arid.png differ diff --git a/assets/cubyz/blocks/textures/grass/vegetation/arid.zig.zon b/assets/cubyz/blocks/textures/grass/vegetation/arid.zig.zon new file mode 100644 index 0000000000..fd3dc59eb2 --- /dev/null +++ b/assets/cubyz/blocks/textures/grass/vegetation/arid.zig.zon @@ -0,0 +1,3 @@ +.{ + .hasOcclusion = false, +} diff --git a/assets/cubyz/blocks/textures/tussock.png b/assets/cubyz/blocks/textures/tussock.png index 5c664560cf..24647861a1 100644 Binary files a/assets/cubyz/blocks/textures/tussock.png and b/assets/cubyz/blocks/textures/tussock.png differ diff --git a/assets/cubyz/items/textures/grass_vegetation/arid.png b/assets/cubyz/items/textures/grass_vegetation/arid.png new file mode 100644 index 0000000000..b291aaa5ec Binary files /dev/null and b/assets/cubyz/items/textures/grass_vegetation/arid.png differ diff --git a/assets/cubyz/recipes/grass_recipes.zig.zon b/assets/cubyz/recipes/grass_recipes.zig.zon index b5d39103a7..13a009c0a0 100644 --- a/assets/cubyz/recipes/grass_recipes.zig.zon +++ b/assets/cubyz/recipes/grass_recipes.zig.zon @@ -23,6 +23,10 @@ .inputs = .{"cubyz:clay", "cubyz:grass_seeds"}, .output = "cubyz:grass/dew", }, + .{ + .inputs = .{"cubyz:sand", "cubyz:grass_seeds"}, + .output = "cubyz:grass/arid", + }, .{ .inputs = .{"cubyz:aerosoil", "cubyz:grass_seeds"}, .output = "cubyz:grass/sky",