From b49713396761136fb4db658c2bba957ed720e0cb Mon Sep 17 00:00:00 2001 From: Carrie <122191047+careeoki@users.noreply.github.com> Date: Thu, 6 Mar 2025 12:34:47 -0700 Subject: [PATCH] Mushrooms: Bolete and Toadstool (#1165) * Add bolete and toadstool * Add item textures and add to biomes --- .../cubyz/biomes/autumn/dead_forest.zig.zon | 18 ++++ assets/cubyz/biomes/swamp/base.zig.zon | 18 ++++ assets/cubyz/blocks/bolete.zig.zon | 23 ++++++ .../cubyz/blocks/textures/bolete_bottom.png | Bin 0 -> 288 bytes assets/cubyz/blocks/textures/bolete_side.png | Bin 0 -> 209 bytes assets/cubyz/blocks/textures/bolete_top.png | Bin 0 -> 262 bytes .../blocks/textures/toadstool_bottom.png | Bin 0 -> 322 bytes .../cubyz/blocks/textures/toadstool_side.png | Bin 0 -> 348 bytes .../cubyz/blocks/textures/toadstool_top.png | Bin 0 -> 294 bytes assets/cubyz/blocks/toadstool.zig.zon | 23 ++++++ assets/cubyz/items/textures/bolete.png | Bin 0 -> 295 bytes assets/cubyz/items/textures/toadstool.png | Bin 0 -> 327 bytes assets/cubyz/models/bolete/floor.obj | 78 ++++++++++++++++++ assets/cubyz/models/bolete/shelf.obj | 78 ++++++++++++++++++ assets/cubyz/models/toadstool/floor.obj | 78 ++++++++++++++++++ assets/cubyz/models/toadstool/shelf.obj | 78 ++++++++++++++++++ 16 files changed, 394 insertions(+) create mode 100644 assets/cubyz/blocks/bolete.zig.zon create mode 100644 assets/cubyz/blocks/textures/bolete_bottom.png create mode 100644 assets/cubyz/blocks/textures/bolete_side.png create mode 100644 assets/cubyz/blocks/textures/bolete_top.png create mode 100644 assets/cubyz/blocks/textures/toadstool_bottom.png create mode 100644 assets/cubyz/blocks/textures/toadstool_side.png create mode 100644 assets/cubyz/blocks/textures/toadstool_top.png create mode 100644 assets/cubyz/blocks/toadstool.zig.zon create mode 100644 assets/cubyz/items/textures/bolete.png create mode 100644 assets/cubyz/items/textures/toadstool.png create mode 100644 assets/cubyz/models/bolete/floor.obj create mode 100644 assets/cubyz/models/bolete/shelf.obj create mode 100644 assets/cubyz/models/toadstool/floor.obj create mode 100644 assets/cubyz/models/toadstool/shelf.obj diff --git a/assets/cubyz/biomes/autumn/dead_forest.zig.zon b/assets/cubyz/biomes/autumn/dead_forest.zig.zon index 82c92ba5..0fe76171 100644 --- a/assets/cubyz/biomes/autumn/dead_forest.zig.zon +++ b/assets/cubyz/biomes/autumn/dead_forest.zig.zon @@ -104,5 +104,23 @@ .density = 0.3, .priority = 0.1, }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:bolete", + .chance = 0.035, + .width = 8, + .variation = 4, + .density = 0.08, + .priority = 0.1, + }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:toadstool", + .chance = 0.03, + .width = 8, + .variation = 4, + .density = 0.08, + .priority = 0.1, + }, }, } diff --git a/assets/cubyz/biomes/swamp/base.zig.zon b/assets/cubyz/biomes/swamp/base.zig.zon index a6b72ba3..5ef384ab 100644 --- a/assets/cubyz/biomes/swamp/base.zig.zon +++ b/assets/cubyz/biomes/swamp/base.zig.zon @@ -50,6 +50,24 @@ .density = 0.3, .priority = 0.1, }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:bolete", + .chance = 0.035, + .width = 6, + .variation = 6, + .density = 0.05, + .priority = 0.2, + }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:toadstool", + .chance = 0.03, + .width = 6, + .variation = 6, + .density = 0.05, + .priority = 0.2, + }, .{ .id = "cubyz:simple_tree", .leaves = "cubyz:willow_leaves", diff --git a/assets/cubyz/blocks/bolete.zig.zon b/assets/cubyz/blocks/bolete.zig.zon new file mode 100644 index 00000000..d4f2c215 --- /dev/null +++ b/assets/cubyz/blocks/bolete.zig.zon @@ -0,0 +1,23 @@ +.{ + .tags = .{.wood}, + .blockHealth = 0.2, + .drops = .{ + .{.items = .{.auto}}, + }, + .solid = false, + .viewThrough = true, + .absorbedLight = 0x010101, + .collide= false, + .rotation = .torch, + .model = .{ + .base = "cubyz:bolete/floor", + .side = "cubyz:bolete/shelf", + }, + .texture = "cubyz:bolete_side", + .texture_top = "cubyz:bolete_top", + .texture_bottom = "cubyz:bolete_bottom", + .item = .{ + .texture = "bolete.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/textures/bolete_bottom.png b/assets/cubyz/blocks/textures/bolete_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..6bd4c43ac5eada9d894007ebaf9d68f1d4fdc5a2 GIT binary patch literal 288 zcmV+*0pI?KP)}79)gBvA^?- z{`dUvak2hdTzLZV0f6QArg+v@Q~;kJhOTX*#%_OP`+IuD1)u~5vK5CF$9*kJK*<2- zi;vFP0!p4vYOFYBX8fMO%#4{%>TF^pu-hL85xre&DOBPE^unPR#0N}00{))y-%-y8n&-{9Fl-ol8Fq?synYr1*UjHZCp1(h)F5qTxV|S3f$~d_I=tc%lS3j3^ HP6AGy@o&3b5Ze z)~g96N@;sQBdZ~#%zD+gA!u0|SxuU%DM4-06gA46tQJ^fyd(Wo-QO3yfX}=H2nvAy9*&@LYkJRHZJYL6Zy7^gh1_}IsgCw M07*qoM6N<$f=?P~*8l(j literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/toadstool_bottom.png b/assets/cubyz/blocks/textures/toadstool_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..989116627431730304bbe85e282bc2e50d032a58 GIT binary patch literal 322 zcmV-I0lof-P)1p=5Jle#sSrYO7J(|+X;P&TY?@pkC&)Q-0@o_DpvFzMiP_2^gtHhGDwHBQn0-@`NDgWWN8^*;0ni1z|!rP1T+O@GfzUp8GksC%z znVqdM#JsB#AY4YAr^&BhSm`}C`XfvNeE-5M;n1JXeq)h=8%C-^dIQyc1w5f)!~cP^3_of-YGE7X>$efs0F>S{>awM!~^=P~4m|cPscSTm>f`ielj$ zBqkYhAxIqLqP1tZ$p>z@gL}X4d+)u<>;86bdp?2NM-d6h#_e4N11x~R?Gp*fbQ1G? zcut&TCU*g-MnV!N8DWxsowz5gEG-%fSOD!#9mi?1JHEkjnzTE09(Oi#qYfIaTCsUL z>Ka!rI*5eC_I#$3m^jI1mhlMp-2=iTB}`I2POrZG_z&jZTA9~q)%cl@NJxOWd{{bF zWvt3aBqZ;HOKk^Q0o(J7U@1cvE(Tg-t2zN?>Th%b`!nwkg?{h@g%W<^O(TX$7upNbB`;WI)3&52&f-y^p{`7XyB_ecPGz@nnk<~jo0Vz zJM?k!3${nR6@Oo9x1D9$D|$p);f57|o-s4C3PUGfv%h|w!JhSgP3=}Z3qBVzilrPq zlC?-H;mEWJc6)y~8ZaJY5cX+Kcx|&oyo1+)4G50i7W?(zzW#r&(uvb2y|!>iNC3eS z(Mm&=yyzGI)sG3N*>Upi_?$SSvGK^B0#&Uk4?lmu&ttIOrYldu%Ijg`hmXJgcPQAa jTZ6rG@n|;7UIqr;JK0%(UYE}TdYr-2)z4*}Q$iB}2DNs2 literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/toadstool.zig.zon b/assets/cubyz/blocks/toadstool.zig.zon new file mode 100644 index 00000000..c2e438bb --- /dev/null +++ b/assets/cubyz/blocks/toadstool.zig.zon @@ -0,0 +1,23 @@ +.{ + .tags = .{.wood}, + .blockHealth = 0.2, + .drops = .{ + .{.items = .{.auto}}, + }, + .solid = false, + .viewThrough = true, + .absorbedLight = 0x010101, + .collide= false, + .rotation = .torch, + .model = .{ + .base = "cubyz:toadstool/floor", + .side = "cubyz:toadstool/shelf", + }, + .texture = "cubyz:toadstool_side", + .texture_top = "cubyz:toadstool_top", + .texture_bottom = "cubyz:toadstool_bottom", + .item = .{ + .texture = "toadstool.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/items/textures/bolete.png b/assets/cubyz/items/textures/bolete.png new file mode 100644 index 0000000000000000000000000000000000000000..1b514c43cc1546f668eeb32208154a9d27307975 GIT binary patch literal 295 zcmV+?0oeYDP)_0NUcg-mbHOPPkU9+mR7=y3?CxeU_CrtQ1K7&}$1%w448lSxS&LAVk z$q?eG!SLkOcZOmd24VGrg|a2Jto&T!x!VDsOyl}BM zpFYFcw;#S`Sh(*BBLf2i0~0m_jPxZKZa;j>aQyNE49)L9e@9V^5e6_2;H1vLz`($; zVc$&*IhgHO4VYNy^50fZiQ(bXw+v_RJVQ~84WM`drkR0(f#K|(XACV1j^ovgVE_y~ teEOD3llTV$k?D?% z1I?{f(;{X_=g!^cx4Y-u-}%17f&Z4FYYtA%g1_(jY8v~0paacHo?PJ&SNOkm2zH00 zRIpjeM=-$A%{>6+QYMxvwF{R^nJvf_K8wo+O7yxA9>1^~sgHG!h2@bX!*N{V-DY zLKqUx80x%J1K{ap#P#E|(o9+GwyeN1F97KEhlwyGT)}oW08Ezex`2RYg