From 302544bbcb625487c97ede7fb9d3d4051eee35a4 Mon Sep 17 00:00:00 2001 From: Carrie <122191047+careeoki@users.noreply.github.com> Date: Wed, 19 Mar 2025 14:45:12 -0600 Subject: [PATCH] Add cactus flowers, tussock, and cactus top texture (#1195) * Add cactus flowers, tussock, and cactus top texture * minor cactus flower texture tweaks * Gradient cactus flower --- assets/cubyz/biomes/desert/base.zig.zon | 21 +++++++ assets/cubyz/blocks/cactus.zig.zon | 3 + assets/cubyz/blocks/cactus_flower.zig.zon | 20 +++++++ assets/cubyz/blocks/textures/cactus.png | Bin 383 -> 377 bytes .../cubyz/blocks/textures/cactus_flower.png | Bin 0 -> 296 bytes .../blocks/textures/cactus_flower.zig.zon | 3 + .../blocks/textures/cactus_flower_top.png | Bin 0 -> 308 bytes .../blocks/textures/cactus_flower_top.zig.zon | 3 + assets/cubyz/blocks/textures/cactus_top.png | Bin 0 -> 467 bytes assets/cubyz/blocks/textures/tussock.png | Bin 0 -> 340 bytes assets/cubyz/blocks/textures/tussock.zig.zon | 3 + assets/cubyz/blocks/tussock.zig.zon | 17 ++++++ assets/cubyz/items/textures/cactus_flower.png | Bin 0 -> 373 bytes assets/cubyz/items/textures/tussock.png | Bin 0 -> 349 bytes assets/cubyz/models/cactus_flower.obj | 55 ++++++++++++++++++ 15 files changed, 125 insertions(+) create mode 100644 assets/cubyz/blocks/cactus_flower.zig.zon create mode 100644 assets/cubyz/blocks/textures/cactus_flower.png create mode 100644 assets/cubyz/blocks/textures/cactus_flower.zig.zon create mode 100644 assets/cubyz/blocks/textures/cactus_flower_top.png create mode 100644 assets/cubyz/blocks/textures/cactus_flower_top.zig.zon create mode 100644 assets/cubyz/blocks/textures/cactus_top.png create mode 100644 assets/cubyz/blocks/textures/tussock.png create mode 100644 assets/cubyz/blocks/textures/tussock.zig.zon create mode 100644 assets/cubyz/blocks/tussock.zig.zon create mode 100644 assets/cubyz/items/textures/cactus_flower.png create mode 100644 assets/cubyz/items/textures/tussock.png create mode 100644 assets/cubyz/models/cactus_flower.obj diff --git a/assets/cubyz/biomes/desert/base.zig.zon b/assets/cubyz/biomes/desert/base.zig.zon index 4cfa8004..1c4038d0 100644 --- a/assets/cubyz/biomes/desert/base.zig.zon +++ b/assets/cubyz/biomes/desert/base.zig.zon @@ -23,6 +23,27 @@ .height = 2, .height_variation = 3, }, + .{ + .id = "cubyz:simple_tree", + .leaves = "cubyz:air", + .log = "cubyz:cactus", + .top = "cubyz:cactus_flower", + .chance = 0.005, + .type = .round, + .height = 2, + .height_variation = 4, + .leafRadius = 0, + .branched = false, + }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:tussock", + .chance = 0.03, + .width = 4, + .variation = 4, + .density = 0.2, + .priority = 0.1, + }, }, .stoneBlock = "cubyz:sandstone", } diff --git a/assets/cubyz/blocks/cactus.zig.zon b/assets/cubyz/blocks/cactus.zig.zon index c47e75f6..114096f7 100644 --- a/assets/cubyz/blocks/cactus.zig.zon +++ b/assets/cubyz/blocks/cactus.zig.zon @@ -4,6 +4,9 @@ .drops = .{ .{.items = .{.auto}}, }, + .rotation = .log, .model = "cubyz:cube", .texture = "cubyz:cactus", + .texture_top = "cubyz:cactus_top", + .texture_bottom = "cubyz:cactus_top", } diff --git a/assets/cubyz/blocks/cactus_flower.zig.zon b/assets/cubyz/blocks/cactus_flower.zig.zon new file mode 100644 index 00000000..9a76c884 --- /dev/null +++ b/assets/cubyz/blocks/cactus_flower.zig.zon @@ -0,0 +1,20 @@ +.{ + .tags = .{.leaf}, + .blockHealth = 0.2, + .drops = .{ + .{.items = .{.auto}}, + }, + .degradable = true, + .collide = false, + .alwaysViewThrough = true, + .absorbedLight = 0x121012, + .model = "cubyz:cactus_flower", + .rotation = .log, + .texture = "cubyz:cactus_flower", + .texture_top = "cubyz:cactus_flower_top", + .texture_bottom = "cubyz:cactus_flower_top", + .item = .{ + .texture = "cactus_flower.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/textures/cactus.png b/assets/cubyz/blocks/textures/cactus.png index 88a77740d19d37de3e2fac0f61bd9535c80be456..243c68d1f094b0a627e11adc1d6792c8c9f6d0eb 100644 GIT binary patch delta 350 zcmV-k0ipi?0{H@vB!56jL_t(2k!_MOYK1@$hW{O_SGb)hJkJmUk}?+vSf>bSQsfAx z$^o8j%0L>AAmkDvd3_+2f?~H8R=O!h=1m}5jsK3{{4=xW^nUg8P0nqv&qdvq=N8sd zXxAt<=N162GfboJJ9A7u00Q9LW-ZlinI;GR1Tc*r00&WQ0DsIb06=^Z+Ep?Da0UQt z2|%6|42ohyeP>wJ8Nv(g3gD}M6aA73pc@wb4+mV0Z3CcV>e+M@n`zwRJS#%Gax9>| zf^Mkq4BM#NQtQ*`89$AlZjwitjP|1^HoL&Njr*ZysI+N4Q`VVyu_VzndSs<-;q(O4hz>% delta 356 zcmV-q0h|8$0{;S#B!5OpL_t(2k!_NpPQ*YEhX0+q%Vtf*HkW$?5=;e(7r@kE2nN9; zl!O-`RO3i6eS#XEfr`pgD3Z(36*WzBu3f|&b3?+a*?(uh`Db>`)9d-yCr#t>cwaVM zwe4UXSvRNNY&!rr%Q1x5?@YFd00_V|F4j@gRertVEr20J0Dl~$-T;`!1OV}Yb+cpu z;0yrP5r85u8I*cM{m!teGlXZ|4B+GYMf6iDfUrO4I~@G_S$Ip?CbH?&n;{(IA}_6* zITp~df^Mka8Me`MmDYz489#(b7ul^$M*Gndo5o}s7w(7JzSgGoOj&2*$&y4vh|FLc zvf92DJ@tk(>|O5aL8^uQL8_(RNO98hZn{byNP}eg^@?=IdfwBR@TZca<2#6?s55}; z%Nx-J8uo`jAAzatyX|YKETAGUNdxrj{tJ40fBpeCY|K97;8DT=00006o#J&DO#}6K|&gTa2CYb+1U&51~RzBp`}+)EgjmWLvil~I6Hd>&VrhVIK(Iz zF~jF%NHFSNe3tJF@AIBBd~oN#Bi_4W_wpvLWfHffR8|4NHq6+vvx1Xk8>a9aH;}cG z8he2h-t0Lp>&>3bQ!?^8Tc5I?W@2qA>uCTUKYLQ-0?%0g^zLE*|;b4PNShtO!&-G{EtS%Yl+v^WG(S39Tb&A{o0000MolDrRK4VYjt(KEcMcR>h3e z4LBD-Vn)u{|0c2G@bdajyYDrV*yUZ_oIWwKQlDhJE$%d<)ajh%wz#8iPRiD~klWl> z%Mnmi=PXy(0Zag7mEf4sL^fB~hQ)lUG=YETK5B7Le_dA8Z$D}GJ!bQGGs=YoN?Qd) z?nT6Q->bmpzFLkkeX+|jM60+fsT-JF247AfgrO3^Sae932oi)LY4<(5tyLBxunb$> zoJgINc@BdV*LOUON_8=xvMwtC-ddx6oli807135-eo!|jbrk#cywUPrUf(}4)4w2& zoljVnA9}=7xGcje9r^b4dteX?Cdd*bT@aI>c|43fH^0ep!(WJ74deXF>JtC}002ov JPDHLkV1i+Y)lUEb literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/tussock.png b/assets/cubyz/blocks/textures/tussock.png new file mode 100644 index 0000000000000000000000000000000000000000..5c664560cf4194a9b4f7398b7dd2b6a4fb48ac6b GIT binary patch literal 340 zcmV-a0jvIrP)Zq}6o!9i$`A<?xGF+w z0**=}%S-mq0q2So<~|HvMNV9|1jzD|ajxi5NR75BjF9(nvb<#DuAbBuF40xKUT#Q} z7+GGjInV?kq$c}z{+I0=1Aw+EOc;5{@{+k@OaMQXUHfOLunxWhKJ+K*wXP>2+Ty-H z63m|W`t`nMCx=OhhyH{x@~{bfoTWmV#MlHrY;zcS7`n=QejLfkuXVLeVbUaqkQ(b? m2_ZE(2_p~J%MCUk0Qdq!ZMV&oi32?V0000KP)4JHPJ&h_Qc4M0 zYfFrR1k@4-NleQP7##`r=(7ITd2q3?{L@bk{3IX2V zFwg*Cb7zBgt$}IT#4;%Wl!S;@$N_M8bQ$o+^6675>Ui|frE z^=8i#>o+YHBsEY!w47?O>?jFwlrh$pX8}0Ax~8mO2qPW1mbF686ZpsIzJ3I1hjw7R zcTg;mv`=VSHl}5Bd0QL0Eb32o_g5Tiwa?VuC(*Yr92`u`CMm~ROv|W}O!KAd*&pd( zTIyr$b>ILnez|Q~1O8rT>2}=?(Y0IpVWT2m{FFsw(kJ|=23uxC}42w8&eqp zj%R7E0O52(Rn)z|MgYKQIAFP$Q57}HUE~tiwdhvV0BI68^C-}qL@x2iHpjz>*SB}( zQJ~$Sm%#BXL@v1tZ#2+LCb+)3WWCw5dVD_X0ZfNd?jn~hafNA00000NkvXXu0mjf+7O-5 literal 0 HcmV?d00001 diff --git a/assets/cubyz/models/cactus_flower.obj b/assets/cubyz/models/cactus_flower.obj new file mode 100644 index 00000000..39d0e6e0 --- /dev/null +++ b/assets/cubyz/models/cactus_flower.obj @@ -0,0 +1,55 @@ +o unknown +v 1 1 1 +v 1 1 0 +v 0 0 0 +v 0 0 1 +v 0 1 1 +v 0 1 0 +v 1 0 0 +v 1 0 1 +vt 0 0.5 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.5 +vt 0 0.5 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.5 +vt 0 0.5 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.5 +vt 0 0.5 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.5 +vn -0.7071067811865476 0.7071067811865476 0 +vn 0.7071067811865476 -0.7071067811865476 0 +vn -0.7071067811865476 -0.7071067811865476 0 +vn 0.7071067811865476 0.7071067811865476 0 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 4/5/2 3/6/2 2/7/2 1/8/2 +f 5/9/3 6/10/3 7/11/3 8/12/3 +f 8/13/4 7/14/4 6/15/4 5/16/4 +o plane +v 1 0 0.25 +v 1 1 0.25 +v 0 1 0.25 +v 0 0 0.25 +vt 0.25 0 +vt 0.25 0.25 +vt 0 0.25 +vt 0 0 +vn 0 0 1 +f 9/17/5 10/18/5 11/19/5 12/20/5 +o plane +v 0 0 0.25 +v 0 1 0.25 +v 1 1 0.25 +v 1 0 0.25 +vt 0 0 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0 +vn 0 0 -1 +f 13/21/6 14/22/6 15/23/6 16/24/6 \ No newline at end of file