From f9c5e4bb98706c9a2eac454784d56c55dd2ace88 Mon Sep 17 00:00:00 2001 From: Carrie <122191047+careeoki@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:07:44 -0700 Subject: [PATCH] Glimmergills and Glimmergill caves (#1174) * Add glimmergills and glimmergill caves * Lower glimmergill cave height * Formatting --- assets/cubyz/biomes/cave/glimmergill.zig.zon | 51 ++++++++++++ assets/cubyz/blocks/glimmergill.zig.zon | 24 ++++++ .../blocks/textures/glimmergill_bottom.png | Bin 0 -> 263 bytes .../textures/glimmergill_bottom_emission.png | Bin 0 -> 190 bytes .../blocks/textures/glimmergill_side.png | Bin 0 -> 267 bytes .../textures/glimmergill_side_emission.png | Bin 0 -> 180 bytes .../cubyz/blocks/textures/glimmergill_top.png | Bin 0 -> 321 bytes .../textures/glimmergill_top_emission.png | Bin 0 -> 171 bytes assets/cubyz/items/textures/glimmergill.png | Bin 0 -> 345 bytes assets/cubyz/models/glimmergill/floor.obj | 78 ++++++++++++++++++ assets/cubyz/models/glimmergill/shelf.obj | 78 ++++++++++++++++++ 11 files changed, 231 insertions(+) create mode 100644 assets/cubyz/biomes/cave/glimmergill.zig.zon create mode 100644 assets/cubyz/blocks/glimmergill.zig.zon create mode 100644 assets/cubyz/blocks/textures/glimmergill_bottom.png create mode 100644 assets/cubyz/blocks/textures/glimmergill_bottom_emission.png create mode 100644 assets/cubyz/blocks/textures/glimmergill_side.png create mode 100644 assets/cubyz/blocks/textures/glimmergill_side_emission.png create mode 100644 assets/cubyz/blocks/textures/glimmergill_top.png create mode 100644 assets/cubyz/blocks/textures/glimmergill_top_emission.png create mode 100644 assets/cubyz/items/textures/glimmergill.png create mode 100644 assets/cubyz/models/glimmergill/floor.obj create mode 100644 assets/cubyz/models/glimmergill/shelf.obj diff --git a/assets/cubyz/biomes/cave/glimmergill.zig.zon b/assets/cubyz/biomes/cave/glimmergill.zig.zon new file mode 100644 index 00000000..f06ca828 --- /dev/null +++ b/assets/cubyz/biomes/cave/glimmergill.zig.zon @@ -0,0 +1,51 @@ +.{ + .isCave = true, + .maxHeight = -200, + .minHeight = -48250, + .chance = 0.05, + .fogDensity = 2, + + .music = "cubyz:heart-of-the-beast", + + .structures = .{ + .{ + .id = "cubyz:ground_patch", + .block = "cubyz:clay", + .chance = 0.08, + .width = 5, + .variation = 5, + .depth = 3, + .smoothness = 0.3, + }, + .{ + .id = "cubyz:stalagmite", + .block = "cubyz:stone", + .chance = 0.048, + .size = 3, + .size_variation = 6, + }, + .{ + .id = "cubyz:boulder", + .chance = 0.016, + .block = "cubyz:cobblestone", + .size = 4, + .size_variance = 3, + }, + .{ + .id = "cubyz:boulder", + .chance = 0.016, + .block = "cubyz:stone", + .size = 4, + .size_variance = 4, + }, + .{ + .id = "cubyz:flower_patch", + .block = "cubyz:glimmergill", + .chance = 0.35, + .width = 8, + .variation = 4, + .density = 0.06, + .priority = 0.1, + }, + }, +} diff --git a/assets/cubyz/blocks/glimmergill.zig.zon b/assets/cubyz/blocks/glimmergill.zig.zon new file mode 100644 index 00000000..b9f51c8b --- /dev/null +++ b/assets/cubyz/blocks/glimmergill.zig.zon @@ -0,0 +1,24 @@ +.{ + .tags = .{.wood}, + .blockHealth = 0.2, + .drops = .{ + .{.items = .{.auto}}, + }, + .solid = false, + .viewThrough = true, + .absorbedLight = 0x010101, + .emittedLight = 0x392862, + .collide= false, + .rotation = .torch, + .model = .{ + .base = "cubyz:glimmergill/floor", + .side = "cubyz:glimmergill/shelf", + }, + .texture = "cubyz:glimmergill_side", + .texture_top = "cubyz:glimmergill_top", + .texture_bottom = "cubyz:glimmergill_bottom", + .item = .{ + .texture = "glimmergill.png", + }, + .lodReplacement = "cubyz:air", +} diff --git a/assets/cubyz/blocks/textures/glimmergill_bottom.png b/assets/cubyz/blocks/textures/glimmergill_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9684dc6e4ffff0db7f5b60c1f88ff7a69c014bbc GIT binary patch literal 263 zcmV+i0r>ujP)^{86pz|Ql?3tY0{@j8OQ|LLMx;(2n6O;8mD+HT*(4gx#k7p z?oa=x;&%CrA$VwQ(03MP-NqV%$K!o2kifR@tems~vx6cZFSRx)t_YNM3jhc~hy#DY z>;TwBa&#aB0kZ>91w~E114Vw;Swz4N166qr=AD@xcKbtC_vk=ip{N1a#f@YMOe+Lr z>XYr<8LUQ;3ex>~Ooj+p2vQDK2Wc~rwKgECP}Xg%*VAiU^@RWU3qMFmhO=>|D@_0Z N002ovPDHLkV1g@vWyk;k literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/glimmergill_bottom_emission.png b/assets/cubyz/blocks/textures/glimmergill_bottom_emission.png new file mode 100644 index 0000000000000000000000000000000000000000..496838a58725116af68cbba992cf13de9b5303f7 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6T0LDHLo_C~UbGcDq#(lbKwnaF zRyoJ+JO3@p{%>;rG}^Q pDu*5ax-D)#3U|4`XkOk&hN(04RPHV;jRHD|!PC{xWt~$(695ZwOkMy0 literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/glimmergill_side.png b/assets/cubyz/blocks/textures/glimmergill_side.png new file mode 100644 index 0000000000000000000000000000000000000000..adc38f813005f817f4e9a381a0f87360cee8ab4c GIT binary patch literal 267 zcmV+m0rdWfP)dscSQG5k0 z`**`I-^|ba+HM>=YzW{K*oyqeUnM4TTA(KdbL0Mz~Z{KyD%IilK z{(?qOx`GAGaP``#-@LT}_~~0Wt7ElZ>^sxgYN6K1o+y`e0zQ!vU|DWw{{_{iT3kXQ R&k6tl002ovPDHLkV1ikpa8&>R literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/glimmergill_side_emission.png b/assets/cubyz/blocks/textures/glimmergill_side_emission.png new file mode 100644 index 0000000000000000000000000000000000000000..94cf937eb7386e2bc0523eb87fc5262d4ef68ec5 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6sy$sCLo_CCydjqcbO~?%o;m`yqd2F6=nDBf{O*GitF$W|v|63gMEb zuq)FUnAswQmI%$5V3>Gk!iqD}cl|r-nZFvp)Rq5McQfhmw!7jR(#umnzj^oT?TO3p f^|&7FSS9Z^L*c>8lHDReXE1oW`njxgN@xNASO7@r literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/glimmergill_top.png b/assets/cubyz/blocks/textures/glimmergill_top.png new file mode 100644 index 0000000000000000000000000000000000000000..3568e73a12f54f71437e962e28b6421373ec8d88 GIT binary patch literal 321 zcmV-H0lxl;P)OcIuz^6!!}Cr| zKOc2_75-OUG9_Vy{xKtqb{hqcOoie*Kg-K*B<}M#Q6_4BpG!noOk}Oop@mYZt2Z+y zZL5;Ixg_q;BBjMAY!hm7ixsvxm@2L;i&j@GDpy)1J3DdTuHyIoE%D!$AC70>KX*q$ UCP`Rh2GDi}Pgg&ebxsLQ0G}W~y8r+H literal 0 HcmV?d00001 diff --git a/assets/cubyz/items/textures/glimmergill.png b/assets/cubyz/items/textures/glimmergill.png new file mode 100644 index 0000000000000000000000000000000000000000..4c8082d2200520aff589f25edb6e8864b8df8853 GIT binary patch literal 345 zcmV-f0jBYU6o)^h;L_5#h<{ol9c^)`ph)-P)IrEA)OYYftgqnaqKIn-DIK(ENdql`+lDkt z6Vj!F#KnZ>Uv<;pbnoGO-@WI+UuPp;P?{Zo^?vtsmFQVbE)L6boqVChc6m1_`|Cux zcp+aX0U!oF%10+OF51k6h4L+m%QoZR{dm6zz;#UK!a@vs090!&WVw!1+~e%H?WYQY zEWAm0b{&(c=(6x8*oI0`+K=?6&ZRUvezn$OD!MG4F*}D1Y(oWLXlcCkZ$mDz1AtFY zgz%PB!8TNemIe@kGX(%kXAD4Jdq@Q{1()a7e&yg4+Z|!f^h_{FWQhR`V9s=&-)`2z r2|*Cs9sR_GNsRESKLY&f_5YDCSc!1AU=n7000000NkvXXu0mjf4vv|j literal 0 HcmV?d00001 diff --git a/assets/cubyz/models/glimmergill/floor.obj b/assets/cubyz/models/glimmergill/floor.obj new file mode 100644 index 00000000..b575dfe2 --- /dev/null +++ b/assets/cubyz/models/glimmergill/floor.obj @@ -0,0 +1,78 @@ +o unknown +v 1 1 0.25 +v 1 1 0 +v 0 0 0 +v 0 0 0.25 +v 0 1 0.25 +v 0 1 0 +v 1 0 0 +v 1 0 0.25 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +vt 0 0.3125 +vt 0 0.25 +vt 0.25 0.25 +vt 0.25 0.3125 +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 unknown +v 0.75 0.25 0.4375 +v 0.75 0.75 0.4375 +v 0.25 0.75 0.4375 +v 0.25 0.25 0.4375 +v 0.25 0.25 0.25 +v 0.25 0.75 0.25 +v 0.75 0.75 0.25 +v 0.75 0.25 0.25 +vt 0 0.25 +vt 0 0.125 +vt 0.125 0.125 +vt 0.125 0.25 +vt 0.25 0.25 +vt 0.25 0.125 +vt 0.375 0.125 +vt 0.375 0.25 +vt 0.5625 0.109375 +vt 0.5625 0.0625 +vt 0.6875 0.0625 +vt 0.6875 0.109375 +vt 0.8125 0.109375 +vt 0.8125 0.0625 +vt 0.9375 0.0625 +vt 0.9375 0.109375 +vt 0.0625 0.359375 +vt 0.0625 0.3125 +vt 0.1875 0.3125 +vt 0.1875 0.359375 +vt 0.3125 0.359375 +vt 0.3125 0.3125 +vt 0.4375 0.3125 +vt 0.4375 0.359375 +vn 0 0 1 +vn 0 0 -1 +vn 1 0 0 +vn -1 0 0 +vn 0 1 0 +vn 0 -1 0 +f 9/17/5 10/18/5 11/19/5 12/20/5 +f 13/21/6 14/22/6 15/23/6 16/24/6 +f 9/25/7 16/26/7 15/27/7 10/28/7 +f 11/29/8 14/30/8 13/31/8 12/32/8 +f 10/33/9 15/34/9 14/35/9 11/36/9 +f 12/37/10 13/38/10 16/39/10 9/40/10 \ No newline at end of file diff --git a/assets/cubyz/models/glimmergill/shelf.obj b/assets/cubyz/models/glimmergill/shelf.obj new file mode 100644 index 00000000..3bf2ab1b --- /dev/null +++ b/assets/cubyz/models/glimmergill/shelf.obj @@ -0,0 +1,78 @@ +o unknown +v 1.3877787807814457e-16 0.375 0.4375 +v 0.2500000000000001 0.375 0.4375 +v 0.25 0.875 0.4375 +v 1.3877787807814457e-17 0.875 0.4375 +v 1.3877787807814457e-17 0.875 0.25 +v 0.25 0.875 0.25 +v 0.2500000000000001 0.375 0.25 +v 1.3877787807814457e-16 0.375 0.25 +vt 0.125 0 +vt 0.125 0.0625 +vt 0 0.0625 +vt 0 0 +vt 0.25 0 +vt 0.25 0.0625 +vt 0.375 0.0625 +vt 0.375 0 +vt 0.75 0.21875 +vt 0.75 0.171875 +vt 0.8125 0.171875 +vt 0.8125 0.21875 +vt 0.8125 0.21875 +vt 0.8125 0.171875 +vt 0.875 0.171875 +vt 0.875 0.21875 +vt 0 0.46875 +vt 0 0.421875 +vt 0.125 0.421875 +vt 0.125 0.46875 +vn 0 0 1 +vn 0 0 -1 +vn 2.220446049250313e-16 -1 0 +vn -2.220446049250313e-16 1 0 +vn 1 2.220446049250313e-16 0 +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 5/5/2 6/6/2 7/7/2 8/8/2 +f 1/9/3 8/10/3 7/11/3 2/12/3 +f 3/13/4 6/14/4 5/15/4 4/16/4 +f 2/17/5 7/18/5 6/19/5 3/20/5 +o unknown +v 2.0816681711721685e-16 0.125 0.8125 +v 0.1875000000000002 0.125 0.8125 +v 0.1875000000000001 0.5625 0.8125 +v 9.71445146547012e-17 0.5625 0.8125 +v 9.71445146547012e-17 0.5625 0.6875 +v 0.1875000000000001 0.5625 0.6875 +v 0.1875000000000002 0.125 0.6875 +v 2.0816681711721685e-16 0.125 0.6875 +vt 0.109375 0.0625 +vt 0.109375 0.109375 +vt 0 0.109375 +vt 0 0.0625 +vt 0.359375 0.0625 +vt 0.359375 0.109375 +vt 0.25 0.109375 +vt 0.25 0.0625 +vt 0.5 0.25 +vt 0.5 0.21875 +vt 0.546875 0.21875 +vt 0.546875 0.25 +vt 0.8125 0.25 +vt 0.8125 0.21875 +vt 0.859375 0.21875 +vt 0.859375 0.25 +vt 0 0.5 +vt 0 0.46875 +vt 0.109375 0.46875 +vt 0.109375 0.5 +vn 0 0 1 +vn 0 0 -1 +vn 2.220446049250313e-16 -1 0 +vn -2.220446049250313e-16 1 0 +vn 1 2.220446049250313e-16 0 +f 9/21/6 10/22/6 11/23/6 12/24/6 +f 13/25/7 14/26/7 15/27/7 16/28/7 +f 9/29/8 16/30/8 15/31/8 10/32/8 +f 11/33/9 14/34/9 13/35/9 12/36/9 +f 10/37/10 15/38/10 14/39/10 11/40/10 \ No newline at end of file