diff --git a/assets/cubyz/blocks/basalt.zig.zon b/assets/cubyz/blocks/basalt.zig.zon index e29b73e7d..45526b4c8 100644 --- a/assets/cubyz/blocks/basalt.zig.zon +++ b/assets/cubyz/blocks/basalt.zig.zon @@ -1,6 +1,6 @@ .{ .tags = .{.stone}, - .blockHealth = 20, + .blockHealth = 30, .blockResistance = 1, .drops = .{ .{.items = .{.auto}}, @@ -8,14 +8,20 @@ .item = .{ .material = .{ .density = 3.0, - .strength = 1.3, - .elasticity = 2.5, - .grip = 0.4, - .hardness = 6.0, - .textureRoughness = 2.5, + .strength = 2.5, + .elasticity = 0.75, + .grip = 5.25, + .hardness = 5.5, + .textureRoughness = 5.0, .colors = .{ 0xff282328, 0xff353135, 0xff434041, 0xff4A4849, 0xff605E5F, }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.20, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/coal_ore.zig.zon b/assets/cubyz/blocks/coal_ore.zig.zon index d6f27e889..f410a78e5 100644 --- a/assets/cubyz/blocks/coal_ore.zig.zon +++ b/assets/cubyz/blocks/coal_ore.zig.zon @@ -1,6 +1,6 @@ .{ .tags = .{.stone}, - .blockHealth = 30, + .blockHealth = 60, .blockResistance = 1, .ore = .{ .veins = 10, diff --git a/assets/cubyz/blocks/cobblestone.zig.zon b/assets/cubyz/blocks/cobblestone.zig.zon index 13c3c0298..725a38779 100644 --- a/assets/cubyz/blocks/cobblestone.zig.zon +++ b/assets/cubyz/blocks/cobblestone.zig.zon @@ -4,19 +4,6 @@ .drops = .{ .{.items = .{.auto}}, }, - .item = .{ - .material = .{ - .density = 2.4, - .strength = 1.0, - .elasticity = 2.0, - .grip = 0.4, - .hardness = 7.0, - .textureRoughness = 1.0, - .colors = .{ - 0xff3d3d3d, 0xff535353, 0xff6b6b6b, 0xff81807e, 0xff9c9996, - }, - }, - }, .model = "cubyz:cube", .texture = "cubyz:cobblestone", .rotation = .stairs, diff --git a/assets/cubyz/blocks/diamond_ore.zig.zon b/assets/cubyz/blocks/diamond_ore.zig.zon index 4ac0b8b1a..2741d38fc 100644 --- a/assets/cubyz/blocks/diamond_ore.zig.zon +++ b/assets/cubyz/blocks/diamond_ore.zig.zon @@ -1,6 +1,6 @@ .{ .tags = .{.stone}, - .blockHealth = 50, + .blockHealth = 120, .blockResistance = 10, .ore = .{ .veins = 3, diff --git a/assets/cubyz/blocks/ferrock.zig.zon b/assets/cubyz/blocks/ferrock.zig.zon index 0f76403f0..29aff5207 100644 --- a/assets/cubyz/blocks/ferrock.zig.zon +++ b/assets/cubyz/blocks/ferrock.zig.zon @@ -1,21 +1,27 @@ .{ .tags = .{.stone}, - .blockHealth = 23.75, + .blockHealth = 32.5, .blockResistance = 1, .drops = .{ .{.items = .{.auto}}, }, .item = .{ .material = .{ - .density = 2.6, - .strength = 1.1, - .elasticity = 2.0, - .grip = 0.3, - .hardness = 5.5, - .textureRoughness = 0.5, + .density = 3.25, + .strength = 3.0, + .elasticity = 0.5, + .grip = 0.25, + .hardness = 4.75, + .textureRoughness = 0.75, .colors = .{ 0xff72403C, 0xff905B57, 0xffB77966, 0xffC2846A, 0xffC49B77, }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.20, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/glacite.zig.zon b/assets/cubyz/blocks/glacite.zig.zon index 470a428bc..1145a40d2 100644 --- a/assets/cubyz/blocks/glacite.zig.zon +++ b/assets/cubyz/blocks/glacite.zig.zon @@ -1,21 +1,27 @@ .{ .tags = .{.stone}, - .blockHealth = 22, + .blockHealth = 25, .blockResistance = 1, .drops = .{ .{.items = .{.auto}}, }, .item = .{ .material = .{ - .density = 2.8, - .strength = 1.6, - .elasticity = 3.5, - .grip = 0.4, - .hardness = 7.5, - .textureRoughness = 1.5, + .density = 2.5, + .strength = 1.5, + .elasticity = 0.0, + .grip = 0.0, + .hardness = 2.5, + .textureRoughness = 2.0, .colors = .{ 0xff6E757F, 0xff86898E, 0xffA4A7AA, 0xffB9BCBF, 0xffCACCCE, }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.35, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/gold_ore.zig.zon b/assets/cubyz/blocks/gold_ore.zig.zon index 6f111dfdd..af5d246dd 100644 --- a/assets/cubyz/blocks/gold_ore.zig.zon +++ b/assets/cubyz/blocks/gold_ore.zig.zon @@ -1,6 +1,6 @@ .{ .tags = .{.stone}, - .blockHealth = 40, + .blockHealth = 80, .blockResistance = 10, .ore = .{ .veins = 3, diff --git a/assets/cubyz/blocks/limestone.zig.zon b/assets/cubyz/blocks/limestone.zig.zon index 07f552989..4bd6cb745 100644 --- a/assets/cubyz/blocks/limestone.zig.zon +++ b/assets/cubyz/blocks/limestone.zig.zon @@ -7,15 +7,21 @@ }, .item = .{ .material = .{ - .density = 2.1, - .strength = 0.9, - .elasticity = 1.5, - .grip = 0.5, - .hardness = 4.5, - .textureRoughness = 0.9, + .density = 2.75, + .strength = 2.33, + .elasticity = 0.9, + .grip = 5.5, + .hardness = 3.33, + .textureRoughness = 0.5, .colors = .{ 0xff70583E, 0xff886D52, 0xffAB8D6A, 0xffC09B6E, 0xffCCA780, }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.20, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/marble.zig.zon b/assets/cubyz/blocks/marble.zig.zon index 982aa6db8..de0d813ec 100644 --- a/assets/cubyz/blocks/marble.zig.zon +++ b/assets/cubyz/blocks/marble.zig.zon @@ -6,15 +6,21 @@ }, .item = .{ .material = .{ - .density = 2.7, - .strength = 1.4, - .elasticity = 2.8, - .grip = 0.5, + .density = 2.6, + .strength = 2.6, + .elasticity = 0.0, + .grip = 1.0, .hardness = 4.0, - .textureRoughness = 0.5, + .textureRoughness = 1.0, .colors = .{ 0xffA89B94, 0xffC9C0BB, 0xffECE9E3, 0xffFBF8F1, 0xffECE9E3, }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.20, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/mossy_cobblestone.zig.zon b/assets/cubyz/blocks/mossy_cobblestone.zig.zon index 7538ef736..b3ef0ef89 100644 --- a/assets/cubyz/blocks/mossy_cobblestone.zig.zon +++ b/assets/cubyz/blocks/mossy_cobblestone.zig.zon @@ -1,6 +1,6 @@ .{ .tags = .{.stone}, - .blockHealth = 22.5, + .blockHealth = 25, .drops = .{ .{.items = .{.auto}}, }, diff --git a/assets/cubyz/blocks/obsidian.zig.zon b/assets/cubyz/blocks/obsidian.zig.zon index 14d8b7f18..d0a6e8b1f 100644 --- a/assets/cubyz/blocks/obsidian.zig.zon +++ b/assets/cubyz/blocks/obsidian.zig.zon @@ -16,6 +16,12 @@ .colors = .{ 0xff0F0811, 0xff19121C, 0xff312436, 0xff69486B, 0xff462F47, }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.33, + }, + }, }, }, .rotation = .stairs, diff --git a/assets/cubyz/blocks/sandstone.zig.zon b/assets/cubyz/blocks/sandstone.zig.zon index f166e424c..657abaec8 100644 --- a/assets/cubyz/blocks/sandstone.zig.zon +++ b/assets/cubyz/blocks/sandstone.zig.zon @@ -1,20 +1,26 @@ .{ .tags = .{.stone}, - .blockHealth = 15, + .blockHealth = 20, .drops = .{ .{.items = .{.auto}}, }, .item = .{ .material = .{ - .density = 1.9, - .strength = -0.5, - .elasticity = 0.1, - .grip = 0.7, - .hardness = 5.0, + .density = 2.0, + .strength = 1.0, + .elasticity = 0.25, + .grip = 6.0, + .hardness = 6.5, .textureRoughness = 3.0, .colors = .{ 0xffAF8354, 0xffC89965, 0xffE6B776, 0xffEEC589, 0xffEDD0AD, }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.20, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/stone.zig.zon b/assets/cubyz/blocks/stone.zig.zon index e0f030dc4..0e18e71f7 100644 --- a/assets/cubyz/blocks/stone.zig.zon +++ b/assets/cubyz/blocks/stone.zig.zon @@ -1,14 +1,14 @@ .{ .tags = .{.stone}, - .blockHealth = 25, + .blockHealth = 30, .blockResistance = 1, .drops = .{ .{.items = .{.auto}}, }, .item = .{ .material = .{ - .density = 4.0, - .strength = 3.0, + .density = 3.0, + .strength = 2.5, .elasticity = 1.0, .grip = 5.0, .hardness = 4.0, @@ -16,6 +16,12 @@ .colors = .{ 0xff444444, 0xff626262, 0xff7A7876, 0xff878583, 0xff9c9996, }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.20, + }, + }, }, }, .allowOres = true, diff --git a/assets/cubyz/blocks/void_stone.zig.zon b/assets/cubyz/blocks/void_stone.zig.zon index 372d28495..c802fc6c0 100644 --- a/assets/cubyz/blocks/void_stone.zig.zon +++ b/assets/cubyz/blocks/void_stone.zig.zon @@ -1,6 +1,6 @@ .{ .tags = .{.stone}, - .blockHealth = 30, + .blockHealth = 60, .blockResistance = 5, .drops = .{ .{.items = .{.auto}}, @@ -8,15 +8,19 @@ .item = .{ .material = .{ .density = 6.0, - .strength = 4.0, - .elasticity = 0.5, - .grip = 3.0, - .hardness = 6.0, - .textureRoughness = 2.0, + .strength = 5.0, + .elasticity = 2.0, + .grip = 2.5, + .hardness = 8.0, + .textureRoughness = 1.0, .colors = .{ 0xff030308, 0xff0D0C11, 0xff151420, 0xff1C1A2B, 0xff28253D, }, .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.20, + }, .{ .id = "durable", .strength = 0.1, diff --git a/assets/cubyz/items/diamond.zig.zon b/assets/cubyz/items/diamond.zig.zon index c7520dbd0..c9fb13348 100644 --- a/assets/cubyz/items/diamond.zig.zon +++ b/assets/cubyz/items/diamond.zig.zon @@ -13,7 +13,7 @@ .modifiers = .{ .{ .id = "fragile", - .strength = 0.4, + .strength = 0.5, }, }, }, diff --git a/assets/cubyz/tools/pickaxe.zig.zon b/assets/cubyz/tools/pickaxe.zig.zon index 67f4c409e..7b4e7406a 100644 --- a/assets/cubyz/tools/pickaxe.zig.zon +++ b/assets/cubyz/tools/pickaxe.zig.zon @@ -7,22 +7,17 @@ .{ .source = .strength, .destination = .maxDurability, - .factor = 3.33, + .factor = 7.5, }, .{ .source = .elasticity, .destination = .maxDurability, - .factor = 9, - }, - .{ - .source = .grip, - .destination = .maxDurability, - .factor = 9, + .factor = 15, }, .{ .source = .density, .destination = .swingTime, - .factor = 0.05, + .factor = 0.025, }, .{ .source = .grip, @@ -38,84 +33,18 @@ .{ .source = .strength, .destination = .maxDurability, - .factor = 5, + .factor = 15, }, .{ .source = .elasticity, .destination = .maxDurability, - .factor = 10, + .factor = 15, }, .{ .source = .density, .destination = .swingTime, - .factor = 0.075, - }, - .{ - .source = .elasticity, - .destination = .swingTime, - .functionType = .inverse, - .factor = 0.075, - }, - }, - }, - .{ - .name = .bridge, - .parameterSets = .{ - .{ - .source = .strength, - .destination = .maxDurability, - .factor = 5, - }, - .{ - .source = .elasticity, - .destination = .maxDurability, - .factor = 5, - }, - .{ - .source = .density, - .destination = .swingTime, - .factor = 0.02, - }, - .{ - .source = .elasticity, - .destination = .swingTime, - .functionType = .inverse, - .factor = 0.025, - }, - .{ - .source = .density, - .destination = .damage, - .factor = .05, - }, - .{ - .source = .strength, - .destination = .damage, - .factor = 0.025, - }, - .{ - .source = .elasticity, - .destination = .damage, - .factor = 0.05, - }, - }, - }, - .{ - .name = .tip, - .parameterSets = .{ - .{ - .source = .strength, - .destination = .maxDurability, - .factor = 6.5, - }, - .{ - .source = .elasticity, - .destination = .maxDurability, - .factor = 5, - }, - .{ - .source = .density, - .destination = .swingTime, - .factor = 0.01, + .functionType = .squareRoot, + .factor = 0.0125, }, .{ .source = .elasticity, @@ -126,19 +55,104 @@ .{ .source = .density, .destination = .damage, - .factor = 0.300, + .factor = 0.1, + }, + .{ + .source = .strength, + .destination = .damage, + .factor = 0.1, + }, + .{ + .source = .elasticity, + .destination = .damage, + .functionType = .squareRoot, + .factor = 0.075, + }, + }, + }, + .{ + .name = .bridge, + .parameterSets = .{ + .{ + .source = .strength, + .destination = .maxDurability, + .factor = 15, + }, + .{ + .source = .elasticity, + .destination = .maxDurability, + .factor = 15, + }, + .{ + .source = .density, + .destination = .swingTime, + .functionType = .squareRoot, + .factor = 0.0125, + }, + .{ + .source = .elasticity, + .destination = .swingTime, + .functionType = .inverse, + .factor = 0.0125, + }, + .{ + .source = .density, + .destination = .damage, + .factor = 0.1, + }, + .{ + .source = .strength, + .destination = .damage, + .factor = 0.1, + }, + .{ + .source = .elasticity, + .destination = .damage, + .functionType = .squareRoot, + .factor = 0.075, + }, + }, + }, + .{ + .name = .tip, + .parameterSets = .{ + .{ + .source = .strength, + .destination = .maxDurability, + .factor = 13, + }, + .{ + .source = .elasticity, + .destination = .maxDurability, + .factor = 10, + }, + .{ + .source = .density, + .destination = .swingTime, + .factor = 0.005, + }, + .{ + .source = .elasticity, + .destination = .swingTime, + .functionType = .inverse, + .factor = 0.005, + }, + .{ + .source = .density, + .destination = .damage, + .factor = 0.15, }, .{ .source = .strength, .destination = .damage, .functionType = .square, - .factor = 0.25, + .factor = 0.15, }, .{ .source = .hardness, .destination = .damage, .functionType = .square, - .factor = 0.25, + .factor = 0.15, }, }, }, @@ -149,7 +163,7 @@ .{ .source = .density, .destination = .swingTime, - .factor = 0.075, + .factor = 0.0425, }, }, }, @@ -160,12 +174,12 @@ .{ .source = .strength, .destination = .maxDurability, - .factor = 6.5, + .factor = 13, }, .{ .source = .density, .destination = .swingTime, - .factor = 0.1, + .factor = 0.05, }, }, },