From fabed5a4a0dfdf8ab05df02ea86a5528654f2ee7 Mon Sep 17 00:00:00 2001
From: careeoki <122191047+careeoki@users.noreply.github.com>
Date: Sun, 3 Nov 2024 14:37:49 -0700
Subject: [PATCH] Basalt blocks & Lamp (#764)

* Add basalt blocks, add lamp block

* Tweak lamp top, make torch light warmer, uranium glass light dimmer, lamp cooler

* Minor texture changes

* Tweak torch light

* Less light from uranium glass, tweak lamp

* Tweak torch light
---
 assets/cubyz/blocks/basalt.zig.zon              |   8 ++++++++
 assets/cubyz/blocks/basalt_bricks.zig.zon       |   8 ++++++++
 assets/cubyz/blocks/basalt_tile.zig.zon         |   8 ++++++++
 assets/cubyz/blocks/glass/uranium.zig.zon       |   2 +-
 assets/cubyz/blocks/lamp.zig.zon                |  11 +++++++++++
 assets/cubyz/blocks/textures/basalt.png         | Bin 0 -> 318 bytes
 assets/cubyz/blocks/textures/basalt_bricks.png  | Bin 0 -> 335 bytes
 assets/cubyz/blocks/textures/basalt_tile.png    | Bin 0 -> 316 bytes
 assets/cubyz/blocks/textures/lamp.png           | Bin 0 -> 403 bytes
 .../cubyz/blocks/textures/lamp.png_emission.png | Bin 0 -> 179 bytes
 assets/cubyz/blocks/textures/lamp_top.png       | Bin 0 -> 438 bytes
 .../blocks/textures/lamp_top.png_emission.png   | Bin 0 -> 254 bytes
 .../cubyz/blocks/textures/limestone_bricks.png  | Bin 321 -> 338 bytes
 assets/cubyz/blocks/torch.zig.zon               |   2 +-
 assets/cubyz/ui/button_hovered_outline.png      | Bin 143 -> 139 bytes
 15 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 assets/cubyz/blocks/basalt.zig.zon
 create mode 100644 assets/cubyz/blocks/basalt_bricks.zig.zon
 create mode 100644 assets/cubyz/blocks/basalt_tile.zig.zon
 create mode 100644 assets/cubyz/blocks/lamp.zig.zon
 create mode 100644 assets/cubyz/blocks/textures/basalt.png
 create mode 100644 assets/cubyz/blocks/textures/basalt_bricks.png
 create mode 100644 assets/cubyz/blocks/textures/basalt_tile.png
 create mode 100644 assets/cubyz/blocks/textures/lamp.png
 create mode 100644 assets/cubyz/blocks/textures/lamp.png_emission.png
 create mode 100644 assets/cubyz/blocks/textures/lamp_top.png
 create mode 100644 assets/cubyz/blocks/textures/lamp_top.png_emission.png

diff --git a/assets/cubyz/blocks/basalt.zig.zon b/assets/cubyz/blocks/basalt.zig.zon
new file mode 100644
index 00000000..286b9b8a
--- /dev/null
+++ b/assets/cubyz/blocks/basalt.zig.zon
@@ -0,0 +1,8 @@
+.{
+	.class = .stone,
+	.hardness = 25,
+	.breakingPower = 1,
+	.rotation = .stairs,
+	.model = "cubyz:cube",
+	.texture = "cubyz:basalt",
+}
diff --git a/assets/cubyz/blocks/basalt_bricks.zig.zon b/assets/cubyz/blocks/basalt_bricks.zig.zon
new file mode 100644
index 00000000..059bd6a1
--- /dev/null
+++ b/assets/cubyz/blocks/basalt_bricks.zig.zon
@@ -0,0 +1,8 @@
+.{
+	.class = .stone,
+	.hardness = 25,
+	.breakingPower = 1,
+	.rotation = .stairs,
+	.model = "cubyz:cube",
+	.texture = "cubyz:basalt_bricks",
+}
diff --git a/assets/cubyz/blocks/basalt_tile.zig.zon b/assets/cubyz/blocks/basalt_tile.zig.zon
new file mode 100644
index 00000000..76f45bd8
--- /dev/null
+++ b/assets/cubyz/blocks/basalt_tile.zig.zon
@@ -0,0 +1,8 @@
+.{
+	.class = .stone,
+	.hardness = 25,
+	.breakingPower = 1,
+	.rotation = .stairs,
+	.model = "cubyz:cube",
+	.texture = "cubyz:basalt_tile",
+}
diff --git a/assets/cubyz/blocks/glass/uranium.zig.zon b/assets/cubyz/blocks/glass/uranium.zig.zon
index 5109cf23..d3450a34 100644
--- a/assets/cubyz/blocks/glass/uranium.zig.zon
+++ b/assets/cubyz/blocks/glass/uranium.zig.zon
@@ -7,7 +7,7 @@
 	.transparent = true,
 	.hasBackFace = true,
 	.absorbedLight = 0x4001ff,
-	.emittedLight = 0x80ff00,
+	.emittedLight = 0x214200,
 	.model = "cubyz:cube",
 	.texture = "cubyz:glass/uranium",
 }
diff --git a/assets/cubyz/blocks/lamp.zig.zon b/assets/cubyz/blocks/lamp.zig.zon
new file mode 100644
index 00000000..c9b9a210
--- /dev/null
+++ b/assets/cubyz/blocks/lamp.zig.zon
@@ -0,0 +1,11 @@
+.{
+	.class = .wood,
+	.hardness = 8,
+	.drops = .{
+		.auto,
+	},
+	.emittedLight = 0xd9cab4,
+	.texture = "cubyz:lamp",
+	.texture_top = "cubyz:lamp_top",
+	.texture_bottom = "cubyz:lamp_top",
+}
diff --git a/assets/cubyz/blocks/textures/basalt.png b/assets/cubyz/blocks/textures/basalt.png
new file mode 100644
index 0000000000000000000000000000000000000000..9191e632c7b54303a091a8dcde04cea041d0ac9a
GIT binary patch
literal 318
zcmV-E0m1%>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00036Nkl<ZIE{T%
z?P`QT44ej8Bb2I7Q_8*n^Qgyx*+po7$mFuC)IY}Ae9TPNkH`1VF97JE007&~<6afn
ztipR$Y|HAgu(;Q=2mqej%ZqI{$C<+c03f9tRdPIxP5F=!W4TNI8b7futADd`HuF3(
zlaxA7Y^7u~lyW#8<*<p6a-`PkjM~Ypl;dOoz`;0yab(zfq=Q0Qux-Ril+*epv7nU0
zrRZ>KPN}QR<D1N+oeluwJXN~y<Pfjcm{M2KkIg9|n>ovIp58a{u7J(PdAj&RhGM&2
zz_`+ASV~<b$xWoYt>(z)?kw9s7m4fLmi6*a#BE7Di1$BkBKo1j+w5Kye-*UExJeSt
QoB#j-07*qoM6N<$f_|f#DF6Tf

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/basalt_bricks.png b/assets/cubyz/blocks/textures/basalt_bricks.png
new file mode 100644
index 0000000000000000000000000000000000000000..874efa9ad764e0dbc48d92c72eac71f73c20905e
GIT binary patch
literal 335
zcmV-V0kHmwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003NNkl<ZIE{T%
z%TB~F3>><xeF5$u4!{@f^8aVx*xfB^>}Umt)QOWuSgP{!jK`1OeH>4}=vW8=U!UK2
zdw<1wo<Yn|5vVAL2`Y*hZx{jKJkL<k3?`-?=SHHH?*JgP+Gls(RAd)GR1!gqw+cke
z001V&x~?v|WUyg|uGTGzs8qzQDkiQ8eD0>gr$9{jS=M})Q<$bh6G?Ie+xz0FXvT~_
zVq&*8C14vdtwq_`O22=6s8l?^JfUYcCs~1tWLZ8P;Qu)pJ)q1$Dp-u`?ya>Ugix_A
zm+MY}^}Hx39U59^Z&ox9vehuv9M}(H#+01fHdiUgmV$q@)_Dag;zqvg$DVUKm%Y_z
hnhsbl*L-GT`~k<V&|G_(&j|nk002ovPDHLkV1oQBkiq}}

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/basalt_tile.png b/assets/cubyz/blocks/textures/basalt_tile.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8ca084988dfc619c89ae017ae361d18aa344845
GIT binary patch
literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00034Nkl<ZIE|H)
z&2ob<41_lXq)U>gYy18WkY*Av!$_V?duZ3lh8*IHe`dA*R))jZ$L9~;94RFL!1Nf=
z1Hkw73O9dQASz`|ov0w^=bwR_Z$#X)z|C>GoHs@t0Ob6Hs8%<|n`r1}m97}9g<8!3
zFsB8g0#V(>G`H2j%{Cdg#)33XWv!w$K^mu0$f995?)Ii4Xho!9e@Mu6j93v+zydeN
zFdVDqadz`HLc}^<&M#ktW-&q^(PNa>m=SVbDowXnK>SEWf>ztL2Ye<{wQ*=tzQmN$
z?tjqYbHqkh1kq$pOA(XE&C7Yz_S0i5t~oC-H>fCXxBI_Dk>)$%h`_%He!l`zE@@Q&
O0000<MNUMnLSTaDxQVj>

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/lamp.png b/assets/cubyz/blocks/textures/lamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b0c7fc75a0a7551aa2a33d0e4459be998e193cc
GIT binary patch
literal 403
zcmV;E0c`$>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00046Nkl<ZIE{^y
zu};G<6h%+lENMxkW?&%-QwJpI%m?r-jG6faX2wo@2ofuEh18)^rAF@3!If+hOGqsY
zuHA$t5_ie<eeb?!JAS>p+vyL$a1`Q@BnfShQhHvM27q8V3LAzb4$q9I*cDQlV-s62
zs7gasZg9J(HED(G><~EPY%09?B&Iy4bK*1tKnd+NhsSwJRT^8s9zl3R_8of;5T{W?
zQ$mv@301kVcaUA$V00Zao(y2di37Xk9#)V&Tv&c=BBiuDfTjUpJQ>ixd9j=v-cLG&
zu(Ip^-%E0)Hnhcj0lhY7!7kKueE}sjyXBt4BJVUF7CF1+9woHbf_j2p8}!=p;_Zu!
z-1GXkj-V<H#a0pDM~%u#Xg*(cBiY5{G@|%WRHd;;kW!+A_W!xqDxcV<DWUyb^xQB(
xbD+A=`IP@NP*NFOnw0YNl<NZpAX@G1_yzrpqAgR(L4yDQ002ovPDHLkV1l?`v1kAQ

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/lamp.png_emission.png b/assets/cubyz/blocks/textures/lamp.png_emission.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9af466c27d9392901c1cd28259bb60ea9e534ff
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6sytmBLo_CCy=cgHSV4sO!t@pL
zD__km`Y~sPcL--&Swqk%fzp-i+#CLHR~7SL9&!GuJdgN|19`$4-~L_VIdbIc4fB=>
z8FLCJAMenb5K~<?%e!vL``fFQpOvthGVjMRXE|OGR`%Zhyj)f9&3D_s8kTja9VuAl
eeEPrrYgX4k((2*qLJ2@uFnGH9xvX<aXaWFo5Jr{&

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/lamp_top.png b/assets/cubyz/blocks/textures/lamp_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1c728ca755e20f2da82ad443bc4f6337cd7059b
GIT binary patch
literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004fNkl<ZIE|%~
zF>4z^5QRUT)g0$t&<5Q2kSYaa4z(&$1zhK6q%o*82G?#}3ex1a7*e@#>qcNzlFy9-
zYqFc=AYd!SdFRfuTzRV9H*e<Ny`AY4MX_NkvMk$%00<$x!Mg1NV+=;8lC-X>@h!|+
zD-F9b@pD|F^FO%K3;E2A0XWq+g6SiLD?Q(D^G1O&Mv8T=P=ge|tmyyKbx{k898(%X
z2qbNZI#=|M_xbeg2mRxH`Dz=}xq9_mN!u_rNJ&PsodyCVqZw+@_>pB<<AEzZYLN0g
zp91i>coO2{;)xzp+T0kO$z-xI#x!yd^t%cGR%<6`Yi;epN1}cOopP#gIQ()zZ}?ke
zpa1#{z{S@)dc!@zAFkJ2x(U|OD2VPRqZ!F)CItY!;hx}aE<n;APrt0h#9i?`pW>I5
z++`Bu$hy+Ax&pO0!7nQ@Y<2ZlusBGurfy)ZBwXoVJyUEPvB-)0&?$;y^WkNRK7<gs
g=j}Sb@OQ5Be{WyBR#`3WlmGw#07*qoM6N<$f}=RgU;qFB

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/lamp_top.png_emission.png b/assets/cubyz/blocks/textures/lamp_top.png_emission.png
new file mode 100644
index 0000000000000000000000000000000000000000..e99c0df74b679505014d028bc3f61d00a18506a1
GIT binary patch
literal 254
zcmV<a00IArP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002RNkl<ZIE~Fx
zyAFgf3^V9jDPiG@nE7O8zKEqnN`|{B(S^svaObItQ^$4M0eIs9`X`qG;N^#DnovrC
znFYD7Yj6(lajriSr4%spX%aK1o|6L?8HNEwgj#FV$8iJ^K}676OTzt8fQWA2OGIgU
za^TiP1OT9_(e!=xUPp(&S|c+@c&dtJSpWd@Jg54;@3F=Z@Nlj|thGj6Ra21Z31$`{
zUO_}sfXRUiwAR9=W7{^UD$MNuBRSzsN4VheyZ?TTAB`_>2$w@C{Qv*}07*qoM6N<$
Ef-Ku>ZvX%Q

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/limestone_bricks.png b/assets/cubyz/blocks/textures/limestone_bricks.png
index e46215f32eb02fd2ac0bce73406a97accbcfe701..3615c1a201be54fcb7030d7357a6d6646d21df03 100644
GIT binary patch
delta 311
zcmV-70m%Nr0@4DIB!3x6L_t(Ijg6DRO2a@DMUOCG;}EhCbmP+Q#I=5bf8!7NGyaIs
zO{mF(lxaFi3I$!1H%`VRG~4&)^3LJr>ht6M2SD~Gs@n1Nc+1o`H#f3B0Z`SBQX1~>
z3OauT;Kp8u#dr>c9aGhg+^$B80J&X-rPdE&9*1}Sh$*F^=zlT*3Y&50dYtb;#t4PY
zC~U@7b^y3df4<=Dbv?`cwfW}d`C-vXaFCv-DDgbrYyChe&Dnu6E0+d2-xE7h7qK%l
z#~eEeJK_F6Cq@}BWnSz-%A7ihdk_MqdXU@Ih*yI&R9&@x8213+(Djtk{Nq(8TiJmS
zoGkX>l7C~d2QVqKp0B8-G#F)3Uget#)rTXAq1#Cp=DMHGe*xfn25=M~P)7g&002ov
JPDHLkV1hH9my-Yh

delta 294
zcmV+>0onf20>J{1B!37=L_t(IjkS_7YQsPjL|<URmKU=ZNSiiwasuBb7s_RPf^?~q
z#sq1>VQuZo27^;5|NBeG0T)p_v!nlpxm&-!oB`tQ#M}D^tLF!%zH7RRyAuF)lhj!9
z5rBoCsnP0ydR*NkmVORE@Rb^uey*l{KB#WPOFrT@aZ4zb{(q@09VvGZhX}#<p0D@~
zK>F<Z3vOi|>)L_kTKE}tlL)@T>eeS%&N2&^1W9?)kvy`UxwiByo4B21ZcBIRMeo1p
z?&<OVCgwkPFlHWiB0+-y%V?P`uLQ{sq^o^COz&XOhv9|a9YnN~|J}iuS<V+!0B1*G
sw_uqi)IQV_bsyWK{a@R@)q}720g=c2Ja1EDmjD0&07*qoM6N<$f`s#t4gdfE

diff --git a/assets/cubyz/blocks/torch.zig.zon b/assets/cubyz/blocks/torch.zig.zon
index 2771de32..0e39807a 100644
--- a/assets/cubyz/blocks/torch.zig.zon
+++ b/assets/cubyz/blocks/torch.zig.zon
@@ -5,7 +5,7 @@
 		.auto,
 	},
 	.solid = false,
-	.emittedLight = 0x00a09080,
+	.emittedLight = 0xa58d73,
 	.viewThrough = true,
 	.absorbedLight = 0x010101,
 	.collide= false,
diff --git a/assets/cubyz/ui/button_hovered_outline.png b/assets/cubyz/ui/button_hovered_outline.png
index 03522b5aae26defeba7ed24037c0eae90b46187c..429c655b2468f0a7e08e445d293c1b598288372b 100644
GIT binary patch
delta 110
zcmV-!0FnQX0gC~UBxh1dL_t&tnQhFW5r8ldMZtF&N;r|!1D#L<EzkyvhGH_wpwST+
z)JK413s?h?BtB+lgCx~`##5x^h9m_5PZ1wiJI)S304TY!EtC3nzs2AA030bGII`Ol
Q0{{R307*qoM6N<$g36L8S^xk5

delta 114
zcmV-&0FD2P0gnNYBx_blL_t&tnQhFW4S+BdMbY~kMyP02hk=zC0K*y#!v-}?8q723
z3KD`U2FV%V7=WbCC#7VAq<-%UJ_bszNa_y2$ABMKJI)4x11Pz&%~NmJ1AzUVFZ&K3
U-uO%%G5`Po07*qoM6N<$g5JU`g#Z8m