From b333d22bbcec29173a4955e4b4ea008dccc23926 Mon Sep 17 00:00:00 2001 From: Carrie <122191047+careeoki@users.noreply.github.com> Date: Fri, 30 May 2025 12:40:44 -0600 Subject: [PATCH] Add sickle (#1550) resolves #1547 The sickle, balanced to the best of my ability. It breaks `.leaf` and `.cloth` tagged blocks. A metal sickle lets you get rid of floating leaves or clear a grassy field super quickly. ![449059994-d2c01e85-3d92-471b-a4e3-e766d7dfb00b](https://github.com/user-attachments/assets/428afbc0-e337-4cb6-9469-e02acdbcadda) ![449060984-db0d1f5d-5f2f-4cd0-b4e1-bffd1046be09](https://github.com/user-attachments/assets/b5d5d517-c3c0-4442-82b4-8dfa07508a19) ![449060868-712ecad3-f6ef-432c-8269-de34c59ba154](https://github.com/user-attachments/assets/3d2528ed-62e5-44ed-a3bf-d19b37877216) ![image](https://github.com/user-attachments/assets/e4d52853-501c-44dc-a933-8855b1b91c79) --- assets/cubyz/tools/sickle.png | Bin 0 -> 216 bytes assets/cubyz/tools/sickle.zig.zon | 91 ++++++++++++++++++++++++++ assets/cubyz/tools/sickle_overlay.png | Bin 0 -> 136 bytes 3 files changed, 91 insertions(+) create mode 100644 assets/cubyz/tools/sickle.png create mode 100644 assets/cubyz/tools/sickle.zig.zon create mode 100644 assets/cubyz/tools/sickle_overlay.png diff --git a/assets/cubyz/tools/sickle.png b/assets/cubyz/tools/sickle.png new file mode 100644 index 0000000000000000000000000000000000000000..7e4ad1d8a2a279c0517cd81c795127c85ec4f452 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^F3W0Lo9mtPP)j;tjOamAIhGf z;08o59C{8ovUU0)n>4E0tXNMI8qUufU zdlp^Txl?n?MKk|Xi^N>tCazs@G%Cb%`pgWQlhZ4wPgIfB7PC1zlk?recvs1q`FV-n z29KKU+wPieIKps#F3aB%W3%uRkMv#GyX!X`(qvk3W!qeb?s~HcYWa#6b&uwhEx!PC ODubu1pUXO@geCx!rBSH> literal 0 HcmV?d00001 diff --git a/assets/cubyz/tools/sickle.zig.zon b/assets/cubyz/tools/sickle.zig.zon new file mode 100644 index 000000000..62fbc5e56 --- /dev/null +++ b/assets/cubyz/tools/sickle.zig.zon @@ -0,0 +1,91 @@ +.{ + .blockTags = .{.leaf, .cloth}, + .disabled = .{ + 1, 0, 0, 0, 1, + 0, 0, 0, 0, 0, + 0, 1, 1, 0, 0, + 1, 1, 1, 0, 1, + 1, 1, 1, 1, 0, + }, + .optional = .{ + 0, 1, 1, 1, 0, + 1, 0, 0, 0, 1, + 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + }, + .parameters = .{ + .{ + .source = .density, + .destination = .swingTime, + .matrix = .{ + 0x0, 2.5, 2.0, 1.5, 0x0, + 2.5, 1.5, 1.5, 1.5, 1.0, + 2.0, 0x0, 0x0, 1.0, 1.0, + 0x0, 0x0, 0x0, 1.0, 0x0, + 0x0, 0x0, 0x0, 0x0, 1.0, + }, + .factor = 0.25, + }, + .{ + .source = .density, + .destination = .damage, + .matrix = .{ + 0x0, 2.5, 2.0, 2.0, 0x0, + 2.5, 1.5, 1.5, 1.0, 1.5, + 1.5, 0x0, 0x0, 0.5, 1.0, + 0x0, 0x0, 0x0, 0.0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0.0, + }, + .factor = 0.8, + }, + .{ + .source = .hardness, + .destination = .maxDurability, + .matrix = .{ + 0x0, 0.5, 1.0, 1.5, 0x0, + 0.5, 1.0, 1.5, 2.0, 1.5, + 1.0, 0x0, 0x0, 1.5, 1.0, + 0x0, 0x0, 0x0, 1.0, 0x0, + 0x0, 0x0, 0x0, 0x0, 1.0, + }, + .factor = 120, + }, + .{ + .source = .hardness, + .destination = .damage, + .matrix = .{ + 0x0, 0.0, 0.0, 0.0, 0x0, + 0.0, 0.5, 0.0, 0.0, 0.0, + 1.0, 0x0, 0x0, 0.0, 0.0, + 0x0, 0x0, 0x0, 0.0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0.0, + }, + .factor = 0.7, + }, + .{ + .source = .elasticity, + .destination = .maxDurability, + .matrix = .{ + 0x0, 0.0, 0.5, 1.0, 0x0, + 0.0, 0.5, 1.0, 2.0, 1.0, + 0.5, 0x0, 0x0, 2.0, 0.5, + 0x0, 0x0, 0x0, 2.0, 0x0, + 0x0, 0x0, 0x0, 0x0, 1.5, + }, + .factor = 120, + }, + .{ + .source = .elasticity, + .destination = .swingTime, + .matrix = .{ + 0x0, 1.0, 0.5, 0.5, 0x0, + 1.5, 1.5, 1.0, 1.0, 0.5, + 2.0, 0x0, 0x0, 0.0, 0.5, + 0x0, 0x0, 0x0, 0.0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0.0, + }, + .factor = -1.0, + }, + }, +} diff --git a/assets/cubyz/tools/sickle_overlay.png b/assets/cubyz/tools/sickle_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..73f48e6b394f4fd13ea4095903fa8f675cbebc8f GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`{+=$5Ar`&K2@3=a9!*-2knp4b z%=W~DgbxQ7$vGcjTlJA+)*Uew=8cjpm;cGPv&hsWZ20+~aktf>Srd61H_q(1+HzjN kh8rKN-Et3i41{%%a>FVdQ&MBb@0APhLUjP6A literal 0 HcmV?d00001