diff --git a/assets/cubyz/blocks/baobab_planks.zig.zon b/assets/cubyz/blocks/baobab_planks.zig.zon index 0800aed3..48fc4fa6 100644 --- a/assets/cubyz/blocks/baobab_planks.zig.zon +++ b/assets/cubyz/blocks/baobab_planks.zig.zon @@ -3,11 +3,11 @@ .blockHealth = 6, .item = .{ .material = .{ - .density = 0.45, - .strength = 1.0, - .elasticity = 1.2, - .grip = 1.5, - .hardness = 1.9, + .density = 0.3, + .strength = 0.5, + .elasticity = 2.25, + .grip = 9.0, + .hardness = 0.5, .textureRoughness = 0.7, .colors = .{ 0xff8c6f59, 0xffa07f66, 0xffb8917b, 0xffd7b194, 0xffe4c29f, diff --git a/assets/cubyz/blocks/birch_planks.zig.zon b/assets/cubyz/blocks/birch_planks.zig.zon index de663d2b..ace41d06 100644 --- a/assets/cubyz/blocks/birch_planks.zig.zon +++ b/assets/cubyz/blocks/birch_planks.zig.zon @@ -3,11 +3,11 @@ .blockHealth = 6, .item = .{ .material = .{ - .density = 0.59, - .strength = 0.8, - .elasticity = 0.7, - .grip = 1.0, - .hardness = 2.0, + .density = 0.6, + .strength = 0.9, + .elasticity = 2.75, + .grip = 7.75, + .hardness = 1.75, .textureRoughness = 0.7, .colors = .{ 0xff9b7a5b, 0xffbf9872, 0xffdeb287, 0xfff2c89c, 0xffffdfb7, diff --git a/assets/cubyz/blocks/mahogany_planks.zig.zon b/assets/cubyz/blocks/mahogany_planks.zig.zon index 5b20f228..254bbe73 100644 --- a/assets/cubyz/blocks/mahogany_planks.zig.zon +++ b/assets/cubyz/blocks/mahogany_planks.zig.zon @@ -3,11 +3,11 @@ .blockHealth = 6, .item = .{ .material = .{ - .density = 0.55, - .strength = 1.2, - .elasticity = 1.0, - .grip = 1.2, - .hardness = 2.1, + .density = 0.8, + .strength = 1.1, + .elasticity = 2.67, + .grip = 6.5, + .hardness = 2.125, .textureRoughness = 0.7, .colors = .{ 0xff734c2f, 0xff8e5d38, 0xffa26a3f, 0xffbd7e48, 0xffcf9459, diff --git a/assets/cubyz/blocks/oak_planks.zig.zon b/assets/cubyz/blocks/oak_planks.zig.zon index 42801fc7..b82f7020 100644 --- a/assets/cubyz/blocks/oak_planks.zig.zon +++ b/assets/cubyz/blocks/oak_planks.zig.zon @@ -3,10 +3,10 @@ .blockHealth = 6, .item = .{ .material = .{ - .density = 0.64, + .density = 0.7, .strength = 1.0, - .elasticity = 0.9, - .grip = 1.0, + .elasticity = 3.0, + .grip = 7.5, .hardness = 2.0, .textureRoughness = 0.7, .colors = .{ diff --git a/assets/cubyz/blocks/obsidian.zig.zon b/assets/cubyz/blocks/obsidian.zig.zon index c68b3fbd..158e6ce3 100644 --- a/assets/cubyz/blocks/obsidian.zig.zon +++ b/assets/cubyz/blocks/obsidian.zig.zon @@ -7,11 +7,11 @@ }, .item = .{ .material = .{ - .density = 2.5, + .density = 3.0, .strength = 0.5, - .elasticity = 7.0, - .grip = 0.3, - .hardness = 6.0, + .elasticity = 0.5, + .grip = 0.5, + .hardness = 5.25, .textureRoughness = 0.1, .colors = .{ 0xff0F0811, 0xff19121C, 0xff312436, 0xff69486B, 0xff462F47, diff --git a/assets/cubyz/blocks/pine_planks.zig.zon b/assets/cubyz/blocks/pine_planks.zig.zon index da95a336..64523586 100644 --- a/assets/cubyz/blocks/pine_planks.zig.zon +++ b/assets/cubyz/blocks/pine_planks.zig.zon @@ -4,10 +4,10 @@ .item = .{ .material = .{ .density = 0.5, - .strength = 1.2, - .elasticity = 1.1, - .grip = 1.0, - .hardness = 2.0, + .strength = 0.75, + .elasticity = 2.5, + .grip = 8.0, + .hardness = 1.5, .textureRoughness = 0.7, .colors = .{ 0xff533f27, 0xff664c2e, 0xff795a37, 0xff8c6b41, 0xffa37b46, diff --git a/assets/cubyz/blocks/stone.zig.zon b/assets/cubyz/blocks/stone.zig.zon index c9ab446e..6d6c25df 100644 --- a/assets/cubyz/blocks/stone.zig.zon +++ b/assets/cubyz/blocks/stone.zig.zon @@ -7,11 +7,11 @@ }, .item = .{ .material = .{ - .density = 2.4, - .strength = 1.0, - .elasticity = 2.0, - .grip = 0.4, - .hardness = 7.0, + .density = 4.0, + .strength = 3.0, + .elasticity = 1.0, + .grip = 5.0, + .hardness = 4.0, .textureRoughness = 1.0, .colors = .{ 0xff444444, 0xff626262, 0xff7A7876, 0xff878583, 0xff9c9996, diff --git a/assets/cubyz/blocks/void_stone.zig.zon b/assets/cubyz/blocks/void_stone.zig.zon index 4990b410..e538ba1b 100644 --- a/assets/cubyz/blocks/void_stone.zig.zon +++ b/assets/cubyz/blocks/void_stone.zig.zon @@ -1,17 +1,17 @@ .{ .class = .stone, .blockHealth = 30, - .breakingPower = 2, + .breakingPower = 5, .drops = .{ .{.items = .{.auto}}, }, .item = .{ .material = .{ - .density = 3.5, - .strength = 3.0, - .elasticity = 7.0, - .grip = 0.1, - .hardness = 8.5, + .density = 6.0, + .strength = 4.0, + .elasticity = 0.5, + .grip = 3.0, + .hardness = 6.0, .textureRoughness = 2.0, .colors = .{ 0xff030308, 0xff0D0C11, 0xff151420, 0xff1C1A2B, 0xff28253D, diff --git a/assets/cubyz/blocks/willow_planks.zig.zon b/assets/cubyz/blocks/willow_planks.zig.zon index 82f6c172..0c56ffff 100644 --- a/assets/cubyz/blocks/willow_planks.zig.zon +++ b/assets/cubyz/blocks/willow_planks.zig.zon @@ -3,11 +3,11 @@ .blockHealth = 6, .item = .{ .material = .{ - .density = 0.39, - .strength = 1.0, - .elasticity = 0.9, - .grip = 0.9, - .hardness = 2.5, + .density = 0.75, + .strength = 1.1, + .elasticity = 2.875, + .grip = 7.34, + .hardness = 2.125, .textureRoughness = 0.7, .colors = .{ 0xff35281b, 0xff493523, 0xff60462e, 0xff6f5133, 0xff815d39, diff --git a/assets/cubyz/items/diamond.zig.zon b/assets/cubyz/items/diamond.zig.zon index 213bfe81..58acebd0 100644 --- a/assets/cubyz/items/diamond.zig.zon +++ b/assets/cubyz/items/diamond.zig.zon @@ -1,10 +1,10 @@ .{ .texture = "diamond.png", .material = .{ - .density = 3.5, - .strength = -5.0, - .elasticity = 10.0, - .grip = 0.1, + .density = 3.0, + .strength = 9.0, + .elasticity = 0.25, + .grip = 0.25, .hardness = 10.0, .textureRoughness = 0.1, .colors = .{ diff --git a/assets/cubyz/items/iron_ingot.zig.zon b/assets/cubyz/items/iron_ingot.zig.zon index a5697010..12bfa2dd 100644 --- a/assets/cubyz/items/iron_ingot.zig.zon +++ b/assets/cubyz/items/iron_ingot.zig.zon @@ -1,11 +1,11 @@ .{ .texture = "iron_ingot.png", .material = .{ - .density = 7.874, - .strength = 5.0, - .elasticity = 10.0, - .grip = 0.1, - .hardness = 4.0, + .density = 7.5, + .strength = 6.0, + .elasticity = 5.0, + .grip = 2.0, + .hardness = 5.0, .textureRoughness = 0.1, .colors = .{ 0xff69696b, 0xff878484, 0xffa3a3a3, 0xffc2c2c2, 0xffe9e9e9, diff --git a/assets/cubyz/tools/pickaxe.png b/assets/cubyz/tools/pickaxe.png index d9a23a46..6d716772 100644 Binary files a/assets/cubyz/tools/pickaxe.png and b/assets/cubyz/tools/pickaxe.png differ diff --git a/assets/cubyz/tools/pickaxe.zig.zon b/assets/cubyz/tools/pickaxe.zig.zon index 67fe5980..36aedd7c 100644 --- a/assets/cubyz/tools/pickaxe.zig.zon +++ b/assets/cubyz/tools/pickaxe.zig.zon @@ -7,17 +7,27 @@ .{ .source = .strength, .destination = .maxDurability, - .factor = 20, + .factor = 3.33, + }, + .{ + .source = .elasticity, + .destination = .maxDurability, + .factor = 9, + }, + .{ + .source = .grip, + .destination = .maxDurability, + .factor = 9, }, .{ .source = .density, .destination = .swingTime, - .factor = 0.1, + .factor = 0.05, }, .{ .source = .grip, .destination = .swingTime, - .functionType = .inverse, + .functionType = .inverseSquare, .factor = 0.05, }, }, @@ -28,29 +38,23 @@ .{ .source = .strength, .destination = .maxDurability, - .factor = 50, + .factor = 5, + }, + .{ + .source = .elasticity, + .destination = .maxDurability, + .factor = 10, }, .{ .source = .density, .destination = .swingTime, - .factor = 0.02, + .factor = 0.075, }, .{ .source = .elasticity, .destination = .swingTime, - .functionType = .inverseSquare, - .factor = 0.1, - }, - .{ - .source = .density, - .destination = .power, - .factor = 0.2, - }, - .{ - .source = .hardness, - .destination = .power, - .functionType = .squareRoot, - .factor = 0.1, + .functionType = .inverse, + .factor = 0.075, }, }, }, @@ -60,7 +64,12 @@ .{ .source = .strength, .destination = .maxDurability, - .factor = 10, + .factor = 5, + }, + .{ + .source = .elasticity, + .destination = .maxDurability, + .factor = 5, }, .{ .source = .density, @@ -70,19 +79,23 @@ .{ .source = .elasticity, .destination = .swingTime, - .functionType = .inverseSquare, - .factor = 0.1, + .functionType = .inverse, + .factor = 0.025, }, .{ .source = .density, .destination = .power, - .factor = 0.2, + .factor = .05, }, .{ - .source = .hardness, + .source = .strength, .destination = .power, - .functionType = .squareRoot, - .factor = 0.1, + .factor = 0.025, + }, + .{ + .source = .elasticity, + .destination = .power, + .factor = 0.05, }, }, }, @@ -92,28 +105,40 @@ .{ .source = .strength, .destination = .maxDurability, - .factor = 20, + .factor = 6.5, + }, + .{ + .source = .elasticity, + .destination = .maxDurability, + .factor = 5, }, .{ .source = .density, .destination = .swingTime, - .factor = 0.02, + .factor = 0.01, }, .{ .source = .elasticity, .destination = .swingTime, - .functionType = .inverseSquare, - .factor = 0.1, + .functionType = .inverse, + .factor = 0.0125, }, .{ .source = .density, .destination = .power, - .factor = 0.2, + .factor = 0.300, + }, + .{ + .source = .strength, + .destination = .power, + .functionType = .square, + .factor = 0.25, }, .{ .source = .hardness, .destination = .power, - .factor = 0.7, + .functionType = .square, + .factor = 0.25, }, }, }, @@ -121,15 +146,10 @@ .name = .gemSlot, .optional = true, .parameterSets = .{ - .{ - .source = .strength, - .destination = .maxDurability, - .factor = 2, - }, .{ .source = .density, .destination = .swingTime, - .factor = 0.1, + .factor = 0.075, }, }, }, @@ -137,11 +157,6 @@ .name = .binding, .optional = true, .parameterSets = .{ - .{ - .source = .strength, - .destination = .maxDurability, - .factor = 20, - }, .{ .source = .density, .destination = .swingTime, @@ -151,7 +166,7 @@ }, }, .slots = .{ - .gemSlot, .binding, .bridge, .tip, .none, + .gemSlot, .binding, .bridge, .bridge, .none, .binding, .center, .binding, .none, .none, .bridge, .binding, .handle, .none, .none, .tip, .none, .none, .handle, .none, diff --git a/assets/cubyz/tools/pickaxe_overlay.png b/assets/cubyz/tools/pickaxe_overlay.png index 5bee82ef..d94f58d1 100644 Binary files a/assets/cubyz/tools/pickaxe_overlay.png and b/assets/cubyz/tools/pickaxe_overlay.png differ