diff --git a/assets/cubyz/blocks/basalt.zig.zon b/assets/cubyz/blocks/basalt.zig.zon index 558bb81f..16744e26 100644 --- a/assets/cubyz/blocks/basalt.zig.zon +++ b/assets/cubyz/blocks/basalt.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .basalt}, .blockHealth = 30, .blockResistance = 1, .drops = .{ @@ -14,6 +14,18 @@ .colors = .{ 0xff282328, 0xff353135, 0xff434041, 0xff4A4849, 0xff605E5F, }, + .modifiers = .{ + .{ + .id = "good_at", + .strength = 0.5, + .tag = .basalt, + .restriction = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/basalt_bricks.zig.zon b/assets/cubyz/blocks/basalt_bricks.zig.zon index 5d61c710..16129ae6 100644 --- a/assets/cubyz/blocks/basalt_bricks.zig.zon +++ b/assets/cubyz/blocks/basalt_bricks.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .basalt}, .blockHealth = 20, .blockResistance = 1, .drops = .{ diff --git a/assets/cubyz/blocks/basalt_tile.zig.zon b/assets/cubyz/blocks/basalt_tile.zig.zon index 4c92a4e7..a2c046c9 100644 --- a/assets/cubyz/blocks/basalt_tile.zig.zon +++ b/assets/cubyz/blocks/basalt_tile.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .basalt}, .blockHealth = 20, .blockResistance = 1, .drops = .{ diff --git a/assets/cubyz/blocks/basalt_wall.zig.zon b/assets/cubyz/blocks/basalt_wall.zig.zon index 02146f62..c968fa54 100644 --- a/assets/cubyz/blocks/basalt_wall.zig.zon +++ b/assets/cubyz/blocks/basalt_wall.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .basalt}, .blockHealth = 20, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/cobblestone.zig.zon b/assets/cubyz/blocks/cobblestone.zig.zon index 725a3877..47eb8269 100644 --- a/assets/cubyz/blocks/cobblestone.zig.zon +++ b/assets/cubyz/blocks/cobblestone.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .baseStone}, .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/ferrock.zig.zon b/assets/cubyz/blocks/ferrock.zig.zon index 345a5820..3e947d9d 100644 --- a/assets/cubyz/blocks/ferrock.zig.zon +++ b/assets/cubyz/blocks/ferrock.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .ferrock}, .blockHealth = 32.5, .blockResistance = 1, .drops = .{ @@ -14,6 +14,18 @@ .colors = .{ 0xff72403C, 0xff905B57, 0xffB77966, 0xffC2846A, 0xffC49B77, }, + .modifiers = .{ + .{ + .id = "good_at", + .strength = 0.5, + .tag = .ferrock, + .restriction = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/ferrock_bricks.zig.zon b/assets/cubyz/blocks/ferrock_bricks.zig.zon index 0ede0268..519e52c8 100644 --- a/assets/cubyz/blocks/ferrock_bricks.zig.zon +++ b/assets/cubyz/blocks/ferrock_bricks.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .ferrock}, .blockHealth = 23.75, .blockResistance = 1, .drops = .{ diff --git a/assets/cubyz/blocks/ferrock_tiles.zig.zon b/assets/cubyz/blocks/ferrock_tiles.zig.zon index 212b5503..9cb51362 100644 --- a/assets/cubyz/blocks/ferrock_tiles.zig.zon +++ b/assets/cubyz/blocks/ferrock_tiles.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .ferrock}, .blockHealth = 23.75, .blockResistance = 1, .drops = .{ diff --git a/assets/cubyz/blocks/ferrock_wall.zig.zon b/assets/cubyz/blocks/ferrock_wall.zig.zon index 4b8334a3..146b3d98 100644 --- a/assets/cubyz/blocks/ferrock_wall.zig.zon +++ b/assets/cubyz/blocks/ferrock_wall.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .ferrock}, .blockHealth = 23.75, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/glacite.zig.zon b/assets/cubyz/blocks/glacite.zig.zon index 2e807d19..21d4de23 100644 --- a/assets/cubyz/blocks/glacite.zig.zon +++ b/assets/cubyz/blocks/glacite.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .glacite}, .blockHealth = 25, .blockResistance = 1, .drops = .{ @@ -14,6 +14,18 @@ .colors = .{ 0xff6E757F, 0xff86898E, 0xffA4A7AA, 0xffB9BCBF, 0xffCACCCE, }, + .modifiers = .{ + .{ + .id = "good_at", + .strength = 0.5, + .tag = .glacite, + .restriction = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/glacite_bricks.zig.zon b/assets/cubyz/blocks/glacite_bricks.zig.zon index ff5c08ba..70306cf8 100644 --- a/assets/cubyz/blocks/glacite_bricks.zig.zon +++ b/assets/cubyz/blocks/glacite_bricks.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .glacite}, .blockHealth = 22, .blockResistance = 1, .drops = .{ diff --git a/assets/cubyz/blocks/glacite_tile.zig.zon b/assets/cubyz/blocks/glacite_tile.zig.zon index 2c9792e6..4a8f42af 100644 --- a/assets/cubyz/blocks/glacite_tile.zig.zon +++ b/assets/cubyz/blocks/glacite_tile.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .glacite}, .blockHealth = 22, .blockResistance = 1, .drops = .{ diff --git a/assets/cubyz/blocks/glacite_wall.zig.zon b/assets/cubyz/blocks/glacite_wall.zig.zon index bb61ae1b..bc8e9fe0 100644 --- a/assets/cubyz/blocks/glacite_wall.zig.zon +++ b/assets/cubyz/blocks/glacite_wall.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .glacite}, .blockHealth = 22, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/limestone.zig.zon b/assets/cubyz/blocks/limestone.zig.zon index 9d55ef59..75b4b769 100644 --- a/assets/cubyz/blocks/limestone.zig.zon +++ b/assets/cubyz/blocks/limestone.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .limestone}, .blockHealth = 27.5, .blockResistance = 1, .drops = .{ @@ -14,6 +14,18 @@ .colors = .{ 0xff70583E, 0xff886D52, 0xffAB8D6A, 0xffC09B6E, 0xffCCA780, }, + .modifiers = .{ + .{ + .id = "good_at", + .strength = 0.5, + .tag = .limestone, + .restriction = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/limestone_bricks.zig.zon b/assets/cubyz/blocks/limestone_bricks.zig.zon index 355399ba..236197b2 100644 --- a/assets/cubyz/blocks/limestone_bricks.zig.zon +++ b/assets/cubyz/blocks/limestone_bricks.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .limestone}, .blockHealth = 27.5, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/limestone_tiles.zig.zon b/assets/cubyz/blocks/limestone_tiles.zig.zon index 609ff169..dc8a4a7f 100644 --- a/assets/cubyz/blocks/limestone_tiles.zig.zon +++ b/assets/cubyz/blocks/limestone_tiles.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .limestone}, .blockHealth = 27.5, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/limestone_wall.zig.zon b/assets/cubyz/blocks/limestone_wall.zig.zon index 684b954e..d8f4867b 100644 --- a/assets/cubyz/blocks/limestone_wall.zig.zon +++ b/assets/cubyz/blocks/limestone_wall.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .limestone}, .blockHealth = 27.5, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/marble.zig.zon b/assets/cubyz/blocks/marble.zig.zon index 9b80e0d6..4c68db0d 100644 --- a/assets/cubyz/blocks/marble.zig.zon +++ b/assets/cubyz/blocks/marble.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .marble}, .blockHealth = 28, .drops = .{ .{.items = .{.auto}}, @@ -13,6 +13,18 @@ .colors = .{ 0xffA89B94, 0xffC9C0BB, 0xffECE9E3, 0xffFBF8F1, 0xffECE9E3, }, + .modifiers = .{ + .{ + .id = "good_at", + .strength = 0.5, + .tag = .marble, + .restriction = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/marble_bricks.zig.zon b/assets/cubyz/blocks/marble_bricks.zig.zon index a710e8fb..33b3a686 100644 --- a/assets/cubyz/blocks/marble_bricks.zig.zon +++ b/assets/cubyz/blocks/marble_bricks.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .marble}, .blockHealth = 28, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/marble_tile.zig.zon b/assets/cubyz/blocks/marble_tile.zig.zon index ac9260af..d61b2fcb 100644 --- a/assets/cubyz/blocks/marble_tile.zig.zon +++ b/assets/cubyz/blocks/marble_tile.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .marble}, .blockHealth = 28, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/marble_wall.zig.zon b/assets/cubyz/blocks/marble_wall.zig.zon index 59ffd4b1..f7f47714 100644 --- a/assets/cubyz/blocks/marble_wall.zig.zon +++ b/assets/cubyz/blocks/marble_wall.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .marble}, .blockHealth = 28, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/sandstone.zig.zon b/assets/cubyz/blocks/sandstone.zig.zon index 5038d6d6..07d089d8 100644 --- a/assets/cubyz/blocks/sandstone.zig.zon +++ b/assets/cubyz/blocks/sandstone.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .sandstone}, .blockHealth = 20, .drops = .{ .{.items = .{.auto}}, @@ -17,6 +17,24 @@ .{ .id = "fragile", .strength = 0.20, + .restriction = .{ + .id = .not, + .child = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, + }, + }, + .{ + .id = "good_at", + .strength = 0.5, + .tag = .sandstone, + .restriction = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, }, }, }, diff --git a/assets/cubyz/blocks/sandstone_bricks.zig.zon b/assets/cubyz/blocks/sandstone_bricks.zig.zon index 730af362..4a5e5050 100644 --- a/assets/cubyz/blocks/sandstone_bricks.zig.zon +++ b/assets/cubyz/blocks/sandstone_bricks.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .sandstone}, .blockHealth = 15, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/sandstone_tile.zig.zon b/assets/cubyz/blocks/sandstone_tile.zig.zon index a1a42607..52aa29f7 100644 --- a/assets/cubyz/blocks/sandstone_tile.zig.zon +++ b/assets/cubyz/blocks/sandstone_tile.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .sandstone}, .blockHealth = 15, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/sandstone_wall.zig.zon b/assets/cubyz/blocks/sandstone_wall.zig.zon index c71b382a..123191f8 100644 --- a/assets/cubyz/blocks/sandstone_wall.zig.zon +++ b/assets/cubyz/blocks/sandstone_wall.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .sandstone}, .blockHealth = 15, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/stone.zig.zon b/assets/cubyz/blocks/stone.zig.zon index 6585c8d3..48e08472 100644 --- a/assets/cubyz/blocks/stone.zig.zon +++ b/assets/cubyz/blocks/stone.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .baseStone}, .blockHealth = 30, .blockResistance = 1, .drops = .{ @@ -14,6 +14,18 @@ .colors = .{ 0xff444444, 0xff626262, 0xff7A7876, 0xff878583, 0xff9c9996, }, + .modifiers = .{ + .{ + .id = "good_at", + .strength = 0.5, + .tag = .baseStone, + .restriction = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/stone_bricks.zig.zon b/assets/cubyz/blocks/stone_bricks.zig.zon index 83f4ebc0..e55b536a 100644 --- a/assets/cubyz/blocks/stone_bricks.zig.zon +++ b/assets/cubyz/blocks/stone_bricks.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .baseStone}, .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/stone_tile.zig.zon b/assets/cubyz/blocks/stone_tile.zig.zon index c2d366cd..578c84f2 100644 --- a/assets/cubyz/blocks/stone_tile.zig.zon +++ b/assets/cubyz/blocks/stone_tile.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .baseStone}, .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/stone_wall.zig.zon b/assets/cubyz/blocks/stone_wall.zig.zon index 52ba8552..f71b92de 100644 --- a/assets/cubyz/blocks/stone_wall.zig.zon +++ b/assets/cubyz/blocks/stone_wall.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .baseStone}, .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, diff --git a/assets/cubyz/blocks/void_stone.zig.zon b/assets/cubyz/blocks/void_stone.zig.zon index 1aeac32b..f9435e1c 100644 --- a/assets/cubyz/blocks/void_stone.zig.zon +++ b/assets/cubyz/blocks/void_stone.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .voidStone}, .blockHealth = 60, .blockResistance = 5, .drops = .{ @@ -19,6 +19,16 @@ .id = "durable", .strength = 0.1, }, + .{ + .id = "good_at", + .strength = 0.5, + .tag = .voidStone, + .restriction = .{ + .id = .encased, + .tag = .precious, + .amount = 2, + }, + }, }, }, }, diff --git a/assets/cubyz/blocks/void_stone_bricks.zig.zon b/assets/cubyz/blocks/void_stone_bricks.zig.zon index a374041d..d797b1f3 100644 --- a/assets/cubyz/blocks/void_stone_bricks.zig.zon +++ b/assets/cubyz/blocks/void_stone_bricks.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .voidStone}, .blockHealth = 30, .blockResistance = 1, .drops = .{ diff --git a/assets/cubyz/blocks/void_stone_tile.zig.zon b/assets/cubyz/blocks/void_stone_tile.zig.zon index a0749488..27d8ee1c 100644 --- a/assets/cubyz/blocks/void_stone_tile.zig.zon +++ b/assets/cubyz/blocks/void_stone_tile.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .voidStone}, .blockHealth = 30, .blockResistance = 1, .drops = .{ diff --git a/assets/cubyz/blocks/void_stone_wall.zig.zon b/assets/cubyz/blocks/void_stone_wall.zig.zon index 9285487a..640c1089 100644 --- a/assets/cubyz/blocks/void_stone_wall.zig.zon +++ b/assets/cubyz/blocks/void_stone_wall.zig.zon @@ -1,5 +1,5 @@ .{ - .tags = .{.stone}, + .tags = .{.stone, .voidStone}, .blockHealth = 30, .drops = .{ .{.items = .{.auto}},