From 2a2b599d5dee07cdab2e8a7c64aaf80e8f7f27a0 Mon Sep 17 00:00:00 2001 From: Carrie <122191047+careeoki@users.noreply.github.com> Date: Sat, 15 Feb 2025 01:15:46 -0700 Subject: [PATCH] Hibiscus, Trumpet Lily, and Dandelions (#1044) * Add hibiscus, trumpet lily, dandelions, tweak daffodil, and give flowers planar rotation * Add item textures for new flowers * Add new flowers to biomes --- assets/cubyz/biomes/grassland.zig.zon | 9 ++++++++ assets/cubyz/biomes/jungle(TODO).zig.zon | 9 ++++++++ assets/cubyz/biomes/taiga.zig.zon | 18 ++++++++++++++++ assets/cubyz/blocks/castilleja.zig.zon | 1 + assets/cubyz/blocks/daffodil.zig.zon | 1 + assets/cubyz/blocks/dandelions.zig.zon | 18 ++++++++++++++++ assets/cubyz/blocks/hibiscus.zig.zon | 20 ++++++++++++++++++ assets/cubyz/blocks/textures/daffodil.png | Bin 259 -> 260 bytes assets/cubyz/blocks/textures/daffodil_top.png | Bin 220 -> 231 bytes assets/cubyz/blocks/textures/dandelions.png | Bin 0 -> 228 bytes assets/cubyz/blocks/textures/hibiscus.png | Bin 0 -> 329 bytes assets/cubyz/blocks/textures/hibiscus.zig.zon | 3 +++ assets/cubyz/blocks/textures/hibiscus_top.png | Bin 0 -> 294 bytes .../blocks/textures/hibiscus_top.zig.zon | 3 +++ assets/cubyz/blocks/textures/trumpet_lily.png | Bin 0 -> 238 bytes .../blocks/textures/trumpet_lily.zig.zon | 3 +++ .../blocks/textures/trumpet_lily_top.png | Bin 0 -> 212 bytes .../blocks/textures/trumpet_lily_top.zig.zon | 3 +++ assets/cubyz/blocks/trumpet_lily.zig.zon | 20 ++++++++++++++++++ assets/cubyz/items/textures/daisies.png | Bin 441 -> 448 bytes assets/cubyz/items/textures/dandelions.png | Bin 0 -> 421 bytes assets/cubyz/items/textures/hibiscus.png | Bin 0 -> 448 bytes assets/cubyz/items/textures/trumpet_lily.png | Bin 0 -> 363 bytes 23 files changed, 108 insertions(+) create mode 100644 assets/cubyz/blocks/dandelions.zig.zon create mode 100644 assets/cubyz/blocks/hibiscus.zig.zon create mode 100644 assets/cubyz/blocks/textures/dandelions.png create mode 100644 assets/cubyz/blocks/textures/hibiscus.png create mode 100644 assets/cubyz/blocks/textures/hibiscus.zig.zon create mode 100644 assets/cubyz/blocks/textures/hibiscus_top.png create mode 100644 assets/cubyz/blocks/textures/hibiscus_top.zig.zon create mode 100644 assets/cubyz/blocks/textures/trumpet_lily.png create mode 100644 assets/cubyz/blocks/textures/trumpet_lily.zig.zon create mode 100644 assets/cubyz/blocks/textures/trumpet_lily_top.png create mode 100644 assets/cubyz/blocks/textures/trumpet_lily_top.zig.zon create mode 100644 assets/cubyz/blocks/trumpet_lily.zig.zon create mode 100644 assets/cubyz/items/textures/dandelions.png create mode 100644 assets/cubyz/items/textures/hibiscus.png create mode 100644 assets/cubyz/items/textures/trumpet_lily.png diff --git a/assets/cubyz/biomes/grassland.zig.zon b/assets/cubyz/biomes/grassland.zig.zon index 6e51333e9..f4da9b253 100644 --- a/assets/cubyz/biomes/grassland.zig.zon +++ b/assets/cubyz/biomes/grassland.zig.zon @@ -52,5 +52,14 @@ .density = 0.3, .priority = 0.1, }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:dandelions", + .chance = 0.0008, + .width = 6, + .variation = 4, + .density = 0.3, + .priority = 0.1, + }, }, } diff --git a/assets/cubyz/biomes/jungle(TODO).zig.zon b/assets/cubyz/biomes/jungle(TODO).zig.zon index 8ede7315d..87e4a2365 100644 --- a/assets/cubyz/biomes/jungle(TODO).zig.zon +++ b/assets/cubyz/biomes/jungle(TODO).zig.zon @@ -59,5 +59,14 @@ .height = 1, .height_variation = 0, }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:hibiscus", + .chance = 0.007, + .width = 8, + .variation = 3, + .density = 0.1, + .priority = 0.1, + }, }, } diff --git a/assets/cubyz/biomes/taiga.zig.zon b/assets/cubyz/biomes/taiga.zig.zon index cc50b05aa..5f918f848 100644 --- a/assets/cubyz/biomes/taiga.zig.zon +++ b/assets/cubyz/biomes/taiga.zig.zon @@ -26,5 +26,23 @@ .height_variation = 5, .branched = false, }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:vetch", + .chance = 0.01, + .width = 6, + .variation = 3, + .density = 0.1, + .priority = 0.1, + }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:trumpet_lily", + .chance = 0.007, + .width = 8, + .variation = 3, + .density = 0.1, + .priority = 0.1, + }, }, } diff --git a/assets/cubyz/blocks/castilleja.zig.zon b/assets/cubyz/blocks/castilleja.zig.zon index 930abc1e3..2d6ffe710 100644 --- a/assets/cubyz/blocks/castilleja.zig.zon +++ b/assets/cubyz/blocks/castilleja.zig.zon @@ -9,6 +9,7 @@ .absorbedLight = 0x000000, .collide = false, .model = "cubyz:flower/height_10", + .rotation = .planar, .texture = "cubyz:castilleja", .texture_top = "cubyz:castilleja_top", .texture_bottom = "cubyz:castilleja_top", diff --git a/assets/cubyz/blocks/daffodil.zig.zon b/assets/cubyz/blocks/daffodil.zig.zon index 3c4c979e7..2921931aa 100644 --- a/assets/cubyz/blocks/daffodil.zig.zon +++ b/assets/cubyz/blocks/daffodil.zig.zon @@ -9,6 +9,7 @@ .absorbedLight = 0x000000, .collide = false, .model = "cubyz:flower/height_8", + .rotation = .planar, .texture = "cubyz:daffodil", .texture_top = "cubyz:daffodil_top", .texture_bottom = "cubyz:daffodil_top", diff --git a/assets/cubyz/blocks/dandelions.zig.zon b/assets/cubyz/blocks/dandelions.zig.zon new file mode 100644 index 000000000..e20348afe --- /dev/null +++ b/assets/cubyz/blocks/dandelions.zig.zon @@ -0,0 +1,18 @@ +.{ + .class = .leaf, + .blockHealth = 1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .collide = false, + .alwaysViewThrough = true, + .absorbedLight = 0x121012, + .model = "cubyz:plane", + .rotation = .carpet, + .texture = "cubyz:dandelions", + .item= .{ + .texture = "dandelions.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/hibiscus.zig.zon b/assets/cubyz/blocks/hibiscus.zig.zon new file mode 100644 index 000000000..224a8c910 --- /dev/null +++ b/assets/cubyz/blocks/hibiscus.zig.zon @@ -0,0 +1,20 @@ +.{ + .class = .leaf, + .blockHealth = 1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .collide = false, + .model = "cubyz:flower/height_8", + .rotation = .planar, + .texture = "cubyz:hibiscus", + .texture_top = "cubyz:hibiscus_top", + .texture_bottom = "cubyz:hibiscus_top", + .item = .{ + .texture = "hibiscus.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/textures/daffodil.png b/assets/cubyz/blocks/textures/daffodil.png index bc04d2dcac7fc50dc31c73d2b8d91c724c2f4e36..6ea39768664c29bf128e819d2c44ace921ae7f1f 100644 GIT binary patch delta 201 zcmV;)05<=F0)zsPB!A0EL_t(IjbmUK1p^Nl@kxG~rThQ&i?0llMnVi+K4-A1Wg=vQ zq>&KApJzWwcfq$UCjU95*cliY7#O}k`^oU<*-r+(w99y1j1>emX#K}0&w?(HG+pOE z0|NuYhnN2t)-_yX6cESnORP=`YS8*GAkM__;pIOD0dXdVd6AFPx7J;Efj7JoW!DLv~NPiB&BCx?fM*Z92kF00000NkvXXu0mjf DIVD!{>K@;e2cWZ?w4PssD!=vU}1^tZD(ikyDLSI`<*~0000zDf#>i5o^7vS zA;>oNg3YcVrZZt7ur><*YyyI1UNy|TH}f6?J%X;GJ8c{Q*BwE=^>V#Urxvc(7JxX5 zc&$Gd4ZNo(bK=>OMq7^3&}d7XMZZO;WZ{e|Nkzitd?OVJqeS)Li{Banpw% zBDjbb6{o);6f`wzjLv%g?{E(M@cU{aEo;8JW=a|gfFw$s;O=}JKpE3!9iFciPi9jk z4TUnsnu;Q?Ih}Xx_2CIjnrxOE@dI1+FOx17yTJQegFL(fa0YCM}2d72=0000EkO@5pE6^b}FeM{kx%yN@*usv2+~nHhpTE0*06?~yC>TNq z1^^I}Bl^@+e={f;%2uCBX~`UFa!nhAHwv(;3hE=_g~m~w2CPdr|}nRR_L-M5pi ere&V)+m$yow_`cd@kgEj0000Cg|wE7-F8F*D}IZmH2jX zrFXU*0EX`$c=Z|pa+QYk_#5BqriT5!MqLATwvgm4hTArH!7rP2~yIl*cjT{iXRwoN=) btUcm4u!?KkVstI800000NkvXXu0mjf*cg{? literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/hibiscus.zig.zon b/assets/cubyz/blocks/textures/hibiscus.zig.zon new file mode 100644 index 000000000..fd3dc59eb --- /dev/null +++ b/assets/cubyz/blocks/textures/hibiscus.zig.zon @@ -0,0 +1,3 @@ +.{ + .hasOcclusion = false, +} diff --git a/assets/cubyz/blocks/textures/hibiscus_top.png b/assets/cubyz/blocks/textures/hibiscus_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1efd5e08bcc44a265291ebba6b796fdd833233c8 GIT binary patch literal 294 zcmV+>0oneEP)_wR>WSaLxJ#sGoePKTuyDP(&4|c0Z0GgrTX}$C~ z1p#X@(HV#Dqw6h($07*qoM6N<$f+1IdBme*a literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/hibiscus_top.zig.zon b/assets/cubyz/blocks/textures/hibiscus_top.zig.zon new file mode 100644 index 000000000..fd3dc59eb --- /dev/null +++ b/assets/cubyz/blocks/textures/hibiscus_top.zig.zon @@ -0,0 +1,3 @@ +.{ + .hasOcclusion = false, +} diff --git a/assets/cubyz/blocks/textures/trumpet_lily.png b/assets/cubyz/blocks/textures/trumpet_lily.png new file mode 100644 index 0000000000000000000000000000000000000000..75868e623545be330ae8c0964b82578ac17d3d56 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`TRmMILo9le6C_x-u>U_F`Tw~3 z`3~<#cfZ^JkKh0Q%!gN>%h^C6*V2$p(NB!$tIrM|fk!EcBBD=H6M#VA@zW!#B-b@&;tyfu6{1-oD!MGXn<-%GisduOL7+5145D4?Cf+)69O~*A= z8=A`R|NnEp{OQH|8be0|0p2M~JGKdEFVK+f0lIW%t@qyE>6v9fXEJ!Y`njxgN@xNA D6WLHq literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/trumpet_lily_top.zig.zon b/assets/cubyz/blocks/textures/trumpet_lily_top.zig.zon new file mode 100644 index 000000000..fd3dc59eb --- /dev/null +++ b/assets/cubyz/blocks/textures/trumpet_lily_top.zig.zon @@ -0,0 +1,3 @@ +.{ + .hasOcclusion = false, +} diff --git a/assets/cubyz/blocks/trumpet_lily.zig.zon b/assets/cubyz/blocks/trumpet_lily.zig.zon new file mode 100644 index 000000000..5b24d0707 --- /dev/null +++ b/assets/cubyz/blocks/trumpet_lily.zig.zon @@ -0,0 +1,20 @@ +.{ + .class = .leaf, + .blockHealth = 1, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .viewThrough = true, + .absorbedLight = 0x000000, + .collide = false, + .model = "cubyz:flower/height_10", + .rotation = .planar, + .texture = "cubyz:trumpet_lily", + .texture_top = "cubyz:trumpet_lily_top", + .texture_bottom = "cubyz:trumpet_lily_top", + .item = .{ + .texture = "trumpet_lily.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/items/textures/daisies.png b/assets/cubyz/items/textures/daisies.png index a4e11df2b9ee29ed87b105a1338bde2e3f7e6856..ceab30aa8573d1b699db6aedf458e553066d5b37 100644 GIT binary patch delta 422 zcmV;X0a^aJ1Hc22B!7oVL_t(IjkS@#OG053hM%jsi4ZOoq;SD5k~BCqG&Dt{OS3q1 zadDCw`~#%rPAzd8!r2Om95e(6+sZkWEE~EFMW8{5)M?0T*$-=|cl$ohbIyC-1OF+* z%!*-VWmL`BC|Hk1`meVpNqt56adJGFmQJ@PvX7izT4I=4>3?*4(&_djo=gup8ggLU zZPXgnty>6Nl#3PgXoR|TOSn48YQh4LEhD7>INrlPO+}AJ2xtMeH+KfGnaKfA4O=u@ z*WYKL`loQ`UFgvsW+unt(gFZJO{H9{(5N*4u%`nI1rkrDWi=5SOa^f0T~xys0Oeu@ zdqum+kc0lG0DqX796n7&?c2VpHSuXG%ky)u`Sf%6bjB?srG#QZY1I`xcTU#*MM?(+ z0$PCO`8nKq7ftW!p#IZML$RRD&WtfW;o$z}nfBci^|MC+Hr93lC><2OUcr_PpBz5` zaDI590F<Qv}m^4qSAgeb|P|{q@uF2x(tBZ?0oGd;MZ_hgZx?b*BJ1h=ncOKv@C3kdWrx5002ov JPDHLkV1iY)#R&ia diff --git a/assets/cubyz/items/textures/dandelions.png b/assets/cubyz/items/textures/dandelions.png new file mode 100644 index 0000000000000000000000000000000000000000..c928dc934d4973630c23c39b23eb963933f85b1f GIT binary patch literal 421 zcmV;W0b2fvP)+EuRWD^ly_6N-)t3Bj=JK8_(uII|R%MZl z1<4h|cD-}b@VEk;9rS0zzRwlI=xu}0oW#buM41u9?=)Lo)QU#6W&(~Aev;?!qzeJm zibg0UL2U&0Iww#on%OBO0dU~)5sCXaoDn=+eE@KMq2YXj#|fyHvZAB*060xcD2)M| zTLGF%pH^3JB!(noK{{&BhKvC$t?jRhjO<724q41haeMQ@S#*kpWkD<-L2n!OBwjZF zV4IstpNwoq70X8^0-l(_>K>i-^7itH)*aHg*8#ZOo(7;=Gnn`V%RC=9nN6i{8y_#9 zJOI^%ECBZqEpsI9Lum}qUwgLkCyiy$>Y97>TeGWHc9+D;?$X50|Czo38rq`H6i07A P00000NkvXXu0mjf9`U%v literal 0 HcmV?d00001 diff --git a/assets/cubyz/items/textures/hibiscus.png b/assets/cubyz/items/textures/hibiscus.png new file mode 100644 index 0000000000000000000000000000000000000000..911aa3d8743e35aabf869739321ad17de0e3fb12 GIT binary patch literal 448 zcmV;x0YCnUP)*(F7c~IN^#%a7s!qu7^W1R2Yp5G0x?z&ozH-chkumm{*F~?^1xV#{Ql)gy zOREilymA7-WHdx#eu|CN1qZ|hu$~Z90@U_W0KBx?6t5q7YZ`VQo*7tX-7xK0@o%0#f;$R3IZN-98u@18{tSUb73J zW#eKm_5?t)^}$XNbR|H@?{lqgm4l{b;{qT&+R3*0{LR+=jD5cwtJvq8gOcO|^n=ux zOtbYt{q~)SxnaV}5CGSgIuB=6H=uU|RUPE+?#p4eV3ygDftHO6H6{}t{{-Ot_!Xcl qj*2?(J-tT;(`!-3FWN8st$qNiOPXo5H!g+%0000ih>>;wUo2-lIr;4m3Bn5!O>@ED3Nb40I*-}rO*83tFJY$>J-Pf?$^cFsyKlpTf zanf41zimTcIs^E7h0$aT0NCagHY@HJKax%afYUP