diff --git a/assets/cubyz/biomes/cave/sky_islands/_defaults.zig.zon b/assets/cubyz/biomes/cave/sky_islands/_defaults.zig.zon index 10a88fbdb1..656c0e2aec 100644 --- a/assets/cubyz/biomes/cave/sky_islands/_defaults.zig.zon +++ b/assets/cubyz/biomes/cave/sky_islands/_defaults.zig.zon @@ -59,7 +59,7 @@ .{ .id = "cubyz:flower_patch", .blocks = .{"cubyz:daffodil"}, - .chance = 0.01, + .chance = 0.008, .width = 6, .variation = 3, .density = 0.1, @@ -67,9 +67,9 @@ }, .{ .id = "cubyz:flower_patch", - .blocks = .{"cubyz:castilleja"}, - .chance = 0.006, - .width = 8, + .blocks = .{"cubyz:lumiflora"}, + .chance = 0.012, + .width = 6, .variation = 3, .density = 0.1, .priority = 0.1, diff --git a/assets/cubyz/blocks/lumiflora.zig.zon b/assets/cubyz/blocks/lumiflora.zig.zon new file mode 100644 index 0000000000..d84c3625c9 --- /dev/null +++ b/assets/cubyz/blocks/lumiflora.zig.zon @@ -0,0 +1,24 @@ +.{ + .tags = .{.cuttable}, + .blockHealth = 0.2, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .emittedLight = 0x7b3843, + .collide = false, + .model = "cubyz:flower/height_8", + .rotation = "cubyz:planar", + .texture = "cubyz:lumiflora", + .texture_top = "cubyz:lumiflora_top", + .texture_bottom = "cubyz:lumiflora_top", + .item = .{ + .texture = "lumiflora.png", + }, + .lodReplacement = "cubyz:air", + .onUpdate = .{ + .type = .checkSupportBlocks, + }, +} diff --git a/assets/cubyz/blocks/textures/lumiflora.png b/assets/cubyz/blocks/textures/lumiflora.png new file mode 100644 index 0000000000..efe9e08fa0 Binary files /dev/null and b/assets/cubyz/blocks/textures/lumiflora.png differ diff --git a/assets/cubyz/blocks/textures/lumiflora.zig.zon b/assets/cubyz/blocks/textures/lumiflora.zig.zon new file mode 100644 index 0000000000..fd3dc59eb2 --- /dev/null +++ b/assets/cubyz/blocks/textures/lumiflora.zig.zon @@ -0,0 +1,3 @@ +.{ + .hasOcclusion = false, +} diff --git a/assets/cubyz/blocks/textures/lumiflora_emission.png b/assets/cubyz/blocks/textures/lumiflora_emission.png new file mode 100644 index 0000000000..ec39b9146e Binary files /dev/null and b/assets/cubyz/blocks/textures/lumiflora_emission.png differ diff --git a/assets/cubyz/blocks/textures/lumiflora_top.png b/assets/cubyz/blocks/textures/lumiflora_top.png new file mode 100644 index 0000000000..2fb878f4d7 Binary files /dev/null and b/assets/cubyz/blocks/textures/lumiflora_top.png differ diff --git a/assets/cubyz/blocks/textures/lumiflora_top.zig.zon b/assets/cubyz/blocks/textures/lumiflora_top.zig.zon new file mode 100644 index 0000000000..fd3dc59eb2 --- /dev/null +++ b/assets/cubyz/blocks/textures/lumiflora_top.zig.zon @@ -0,0 +1,3 @@ +.{ + .hasOcclusion = false, +} diff --git a/assets/cubyz/blocks/textures/lumiflora_top_emission.png b/assets/cubyz/blocks/textures/lumiflora_top_emission.png new file mode 100644 index 0000000000..52621726a2 Binary files /dev/null and b/assets/cubyz/blocks/textures/lumiflora_top_emission.png differ diff --git a/assets/cubyz/blocks/textures/torch/lumi.png b/assets/cubyz/blocks/textures/torch/lumi.png new file mode 100644 index 0000000000..8d62aff132 Binary files /dev/null and b/assets/cubyz/blocks/textures/torch/lumi.png differ diff --git a/assets/cubyz/blocks/textures/torch/lumi_emission.png b/assets/cubyz/blocks/textures/torch/lumi_emission.png new file mode 100644 index 0000000000..c43c48a421 Binary files /dev/null and b/assets/cubyz/blocks/textures/torch/lumi_emission.png differ diff --git a/assets/cubyz/blocks/torch/lumi.zig.zon b/assets/cubyz/blocks/torch/lumi.zig.zon new file mode 100644 index 0000000000..39c11f7df2 --- /dev/null +++ b/assets/cubyz/blocks/torch/lumi.zig.zon @@ -0,0 +1,25 @@ +.{ + .tags = .{.choppable}, + .blockHealth = 0.5, + .drops = .{ + .{.items = .{.auto}}, + }, + .replacable = true, + .emittedLight = 0xc0616a, + .viewThrough = true, + .absorbedLight = 0x010101, + .collide = false, + .rotation = "cubyz:torch", + .onUpdate = .{ + .type = .checkSupportBlocks, + }, + .model = .{ + .base = "cubyz:torch", + .side = "cubyz:torch_side", + }, + .texture = "cubyz:torch/lumi", + .item = .{ + .texture = "torch/lumi.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/items/textures/lumiflora.png b/assets/cubyz/items/textures/lumiflora.png new file mode 100644 index 0000000000..2e505888b5 Binary files /dev/null and b/assets/cubyz/items/textures/lumiflora.png differ diff --git a/assets/cubyz/items/textures/torch/lumi.png b/assets/cubyz/items/textures/torch/lumi.png new file mode 100644 index 0000000000..147108905a Binary files /dev/null and b/assets/cubyz/items/textures/torch/lumi.png differ diff --git a/assets/cubyz/recipes/wood_recipes.zig.zon b/assets/cubyz/recipes/wood_recipes.zig.zon index 6ad46097b4..0c888f2bff 100644 --- a/assets/cubyz/recipes/wood_recipes.zig.zon +++ b/assets/cubyz/recipes/wood_recipes.zig.zon @@ -39,4 +39,8 @@ .inputs = .{"{mod}:planks/{type}", "cubyz:sulfur_ore"}, .output = "8 cubyz:sulfur_torch", }, + .{ + .inputs = .{"{mod}:planks/{type}", "cubyz:lumiflora"}, + .output = "8 cubyz:torch/lumi", + }, }