From b7ff8fd73fe26838672e3ff908bc6e4212d24cae Mon Sep 17 00:00:00 2001 From: Carrie Date: Mon, 31 Mar 2025 16:54:38 -0600 Subject: [PATCH 1/3] Add meteorite and kamacite --- assets/cubyz/blocks/kamacite.zig.zon | 35 ++++++++++++++++++ assets/cubyz/blocks/meteorite_block.zig.zon | 11 ++++++ assets/cubyz/blocks/meteorite_ore.zig.zon | 14 +++++++ assets/cubyz/blocks/textures/kamacite.png | Bin 0 -> 331 bytes .../cubyz/blocks/textures/meteorite_block.png | Bin 0 -> 392 bytes .../textures/meteorite_block_reflectivity.png | Bin 0 -> 224 bytes .../cubyz/blocks/textures/meteorite_ore.png | Bin 0 -> 349 bytes .../textures/meteorite_ore_reflectivity.png | Bin 0 -> 217 bytes assets/cubyz/items/meteorite_ingot.zig.zon | 14 +++++++ .../cubyz/items/textures/meteorite_ingot.png | Bin 0 -> 371 bytes assets/cubyz/items/textures/raw_meteorite.png | Bin 0 -> 337 bytes 11 files changed, 74 insertions(+) create mode 100644 assets/cubyz/blocks/kamacite.zig.zon create mode 100644 assets/cubyz/blocks/meteorite_block.zig.zon create mode 100644 assets/cubyz/blocks/meteorite_ore.zig.zon create mode 100644 assets/cubyz/blocks/textures/kamacite.png create mode 100644 assets/cubyz/blocks/textures/meteorite_block.png create mode 100644 assets/cubyz/blocks/textures/meteorite_block_reflectivity.png create mode 100644 assets/cubyz/blocks/textures/meteorite_ore.png create mode 100644 assets/cubyz/blocks/textures/meteorite_ore_reflectivity.png create mode 100644 assets/cubyz/items/meteorite_ingot.zig.zon create mode 100644 assets/cubyz/items/textures/meteorite_ingot.png create mode 100644 assets/cubyz/items/textures/raw_meteorite.png diff --git a/assets/cubyz/blocks/kamacite.zig.zon b/assets/cubyz/blocks/kamacite.zig.zon new file mode 100644 index 00000000..bbef7392 --- /dev/null +++ b/assets/cubyz/blocks/kamacite.zig.zon @@ -0,0 +1,35 @@ +.{ + .tags = .{.stone}, + .blockHealth = 80, + .blockResistance = 20, + .drops = .{ + .{.items = .{.auto}}, + }, + .item = .{ + .material = .{ + .density = 6.0, + .strength = 5.0, + .elasticity = 2.0, + .grip = 2.5, + .hardness = 8.0, + .textureRoughness = 1.0, + .colors = .{ + 0xff030308, 0xff0D0C11, 0xff151420, 0xff1C1A2B, 0xff28253D, + }, + .modifiers = .{ + .{ + .id = "fragile", + .strength = 0.20, + }, + .{ + .id = "durable", + .strength = 0.1, + }, + }, + }, + }, + .allowOres = true, + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:kamacite", +} diff --git a/assets/cubyz/blocks/meteorite_block.zig.zon b/assets/cubyz/blocks/meteorite_block.zig.zon new file mode 100644 index 00000000..603f85c8 --- /dev/null +++ b/assets/cubyz/blocks/meteorite_block.zig.zon @@ -0,0 +1,11 @@ +.{ + .tags = .{.stone}, + .blockHealth = 40, + .blockResistance = 1, + .drops = .{ + .{.items = .{.auto}}, + }, + .rotation = .stairs, + .model = "cubyz:cube", + .texture = "cubyz:meteorite_block", +} diff --git a/assets/cubyz/blocks/meteorite_ore.zig.zon b/assets/cubyz/blocks/meteorite_ore.zig.zon new file mode 100644 index 00000000..104b2ed4 --- /dev/null +++ b/assets/cubyz/blocks/meteorite_ore.zig.zon @@ -0,0 +1,14 @@ +.{ + .tags = .{.stone}, + .blockHealth = 40, + .blockResistance = 20, + .drops = .{ + .{.items = .{.auto}}, + }, + .rotation = .ore, + .model = "cubyz:cube", + .texture = "cubyz:meteorite_ore", + .item = .{ + .texture = "raw_meteorite.png", + }, +} diff --git a/assets/cubyz/blocks/textures/kamacite.png b/assets/cubyz/blocks/textures/kamacite.png new file mode 100644 index 0000000000000000000000000000000000000000..bb00cf46230bf87247baf5aed0c45240e7c93677 GIT binary patch literal 331 zcmV-R0kr;!P)|xpd887|=f4pZ=@gNm46HrjG`hZ84gx9xs__tt}?|&!hKq@V+3n2G)hQ7n(m=(;DwhWFz9%b(phC2%^ z`TrKIbXDfx0bp9#lTGEaI4=i#HHB15TW2-zev$84B`cfmTXrR3$spget;+vspI_f4 dm+e6X`~gf1(SRE-1;YRU002ovPDHLkV1j|nlcfLv literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/meteorite_block.png b/assets/cubyz/blocks/textures/meteorite_block.png new file mode 100644 index 0000000000000000000000000000000000000000..d973f07a78c0cee18e4fbf9197ab465c7371ad50 GIT binary patch literal 392 zcmV;30eAk1P)md}uW(1O`l7gHpu+>Sr-P^s}m#@!{-+gU( zc5cH2fc(o{&iT@k?`y+tm>7M)IuF1U0suxSDqS-A5J6G{FwTw)p#8Z5Q0X!Pg(wAl z_gAJ6sB{@?vuDyPU2xO&>jhky;%?#899BT-DuAsmX_lp)j8YE;Ti>EK&LG`w3NlL34L#%R*cBS1 z6xR7@XIJP&frKPomvnl6eOr;IGg=0jtZ^G2S)B|loykf;>PuLy^GqSo4L#k^NAQ*e zAd?vgIF%}e-O$Ikdk&U0=F;(4H!&!3j&*}kDuUBIK$66iUCyr1tD%W}*^1QW=S#~t mJM1(+u!~H9_CH|hAHW|83+a}^1?sW@0000;3IB8$xI3WZb7M%U$<7c{u_3j|N9hdJ?xb#F9LxRpwko%B&80$2_cn_~z7 literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/meteorite_ore.png b/assets/cubyz/blocks/textures/meteorite_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..c48115ac3dc96f697679f8a08b5805a16cf386cf GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKU{vvRaSXBOO-@*#{=&QWf4tzs z|MHPNoHIAC+4Z14KI>0Cn~Z~#&jd&RNI};g&e)0jW|=VW(lz+-=xQ|^5QtQYFzemj zd%ob~wO}^GIL0+?dw%_CO#FZIv__K7i8+0u(vsRrfBx_P`+-&O+H|S^@j$a0fk1Ip zDO2*QcH=G^WwYhWsx1DeCnO{Yh&@OwFuj&m@$;ed;qLJFl3i)~M*{kH8{(|!}CGHVOsNUhBPg`{fl;YD1iLW&n;ZT qpsboyY;=;%z`!A?A>(-v6T{LY4Z-EB7VZEB8-u5-pUXO@geCwOgo| zQx5g)&nVUvty`L*_t9_XD%R~^<`(}>J>j=_yW7U@_Al;C$zpYje&ydSXIIg%ah2iw Q1avEdr>mdKI;Vst07Wua&j0`b literal 0 HcmV?d00001 diff --git a/assets/cubyz/items/meteorite_ingot.zig.zon b/assets/cubyz/items/meteorite_ingot.zig.zon new file mode 100644 index 00000000..b798e0c6 --- /dev/null +++ b/assets/cubyz/items/meteorite_ingot.zig.zon @@ -0,0 +1,14 @@ +.{ + .texture = "meteorite_ingot.png", + .material = .{ + .density = 12.0, + .strength = 3.0, + .elasticity = 15.0, + .grip = 2.0, + .hardness = 6.0, + .textureRoughness = 0.2, + .colors = .{ + 0xff5c423e, 0xff6c4f46, 0xff7d5954, 0xff8e655f, 0xffa67b70, + }, + }, +} diff --git a/assets/cubyz/items/textures/meteorite_ingot.png b/assets/cubyz/items/textures/meteorite_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..f83b9cafab10b87d5cdfea8488ab1d62231796d3 GIT binary patch literal 371 zcmV-(0gV2MP)4qH5Qd*X4q{YXgrL$>EJDSD5WRTwP%uBj-|0V)LM!wjwv^VBXlp6!MAOZ_ni+nZ(z}xIACXy&{461Zaa(cUt zi5N*>rCh+VOMAc%(AzZt%gqjed^RN_W)i6VAO@;*4!vDVH!5S{*d;z!tI+gXZg|_M zqy0cSQ5g&E2eB?3yF}4eye~A9#awbGz+^F}U9U+}s`>#cV{zkL0WcViPy8~YU@#if z>vkwk_f-Ijwvya(vy)96nre70H>{KkGH0*b*{^H*Az)-&1owxJ06e_B8U{eKdL4Rh zL)O%;*An5or-^{E5q>U2GSzJ19uFlXHbU zxKSZczINeW2 j=HYnIPtx@*_ Date: Thu, 3 Apr 2025 14:01:05 -0600 Subject: [PATCH 2/3] Add recipes and tweak textures --- .../cubyz/blocks/textures/meteorite_block.png | Bin 392 -> 394 bytes .../textures/meteorite_block_reflectivity.png | Bin 224 -> 226 bytes assets/cubyz/items/textures/meteorite_ingot.png | Bin 371 -> 368 bytes assets/cubyz/recipes/special_recipes.zig.zon | 8 ++++++++ 4 files changed, 8 insertions(+) diff --git a/assets/cubyz/blocks/textures/meteorite_block.png b/assets/cubyz/blocks/textures/meteorite_block.png index d973f07a78c0cee18e4fbf9197ab465c7371ad50..daf90851f1bf3186beef01827c5a5c73d4e0a897 100644 GIT binary patch delta 367 zcmV-#0g(QP1BwHXB!5v!L_t(Ijct?5Zi6roMNd&Ai~*6yB8s~0uXWe&>DOf&Q5GQ} zV`Hz{1s%uG&c?E4?&ZvQc=`Nz|K2wx|HUv`03aSN{N@REo># zz%bgFGj5IsQ*dOduqqVB&6G+3V7;fkKUT)pdum-!>jHpXbbp(Dbe96T%ULRg^-Eo? z3yckmfpIg|`-m)t*83KLtmX>sY(H-dd*MFgE;g7fgWm_YX~T06)`v7Yn-H)B6Ab N002ovPDHLkV1n%+v2XwY delta 365 zcmV-z0h0cT1Be5VB!5pyL_t(Ijct;#a)U4sL|+(Y5Rw^e8atCVzm_iFldp5@Ar!%8 z1d^zdf}AX{)k(VD+r8VDug{O)eQkJlZo>qC{L5X=`O=c_Yr}1r7=6Gx55N=x07fY) zT{8L*K~e)S&W;SA{kZ~A=`sR^C2XVNQOa(`+Lk;poab$)dRu+vPQ zvWsNvJe4k2Rz%S_JI2`o&0T@W5r7bi&u-}B`>xO&>jhky;%?#899BT-DuAsmX_lp) zj8YE;Ti>EK&LG`w3NlL34L#%R*cBS16xR7@XIJP&frKPomvnl6eOr;IGg=0jtZ^G2 zS)B|loykf;>Sjw=t@BJF&<#D^&`0o=1R#?c2so80h27A{w|fqjHRjUsST`{!a*lO_ zQ7VGdJV27flwHoQ(5s<|eA$ZB=I2YxI6Le#Kd_5Tfc8IN=^wx!2@C0#!UgKG00000 LNkvXXu0mjf*Y>Fh diff --git a/assets/cubyz/blocks/textures/meteorite_block_reflectivity.png b/assets/cubyz/blocks/textures/meteorite_block_reflectivity.png index 5d641d70298caa17a2a3dbf94bd8669219fb4263..637a4394dad1e3e3d7e8d1bd7fb2b30be73e4f3d 100644 GIT binary patch delta 198 zcmV;%06G8Q0pbCWB!8(%L_t(2kxh|762%}0Lm%Ms-~Y0|k}gPXopHnrBr(QM#k)38 zJ^?OPu>l!Ol8uaj$SGq=ns##&1d!9$Ku{zgHw)-t81gU!KqE^nOdaMCn*xHgCtqZ} zppIA%CX*h(wg=7qnjsO}LYK41I({Koo@=MzXSQD(`)*FPL`8gkT0+ePjp(Vlr+ zjKBg>o}KCbd{(n?|Ku^|l19WNc{#ynCGh{;Z@a=-`Chn=i2wiq07*qoM6N<$f}qq_ APyhe` delta 196 zcmV;#06YKU0pJ0UB!8z#L_t(2kyX)Ai^L!d1mJHQD;(VG{r{hNU>kNHbk!Cl#tbu) z>Fe)(THl3pRQOj;my}3^kc^IW&=BL~7&Ivajzu5p1jXREJD}rpV@RpV&Ja_vA+^az z=?vBGq;6sy%l-GZDz|dYr9w>iIT??0Iw1T^iG>@qa#G+BRQaOR^lqCGF;0Q?S{c`=CO{aWcYj*|-akG8DA_p?F;9Uy zj546g7ty<|bfXFuu2bc8vx!Z==fzi@Had)?6IHO#VU+2@b*fYx#X8U|f|b-vfJLyP z-)>1!T*C-eu()(D0GQ0?NBc7OhskWtXgHv{`67}zvspET3O~C4F}0{ zEnmd(5FStO08Y4lcr*-vZnF{lUPqp(-)rdd(4$>m)KvS}F nXF=J)VWQh?$iF`a{#kqhgbSnga5@L}00000NkvXXu0mjfy;z|n delta 344 zcmV-e0jK`(0`mfpB!4#cV{zkL0WcViPy8~YU@#if>vkwk_f-Ijwvya(vy)96nre70H>{KkGH0*b z*{^H*Az)-&1X1^gj{rQpycz~Tvw9tRZbR18uGbRbyQhhOu@QbQMC5Q~=fD#W4n-ml qo~N_3pm=b6(X3v}zrO_j+4%;L3#0a~6v%%70000 Date: Thu, 3 Apr 2025 14:39:09 -0600 Subject: [PATCH 3/3] Tweak meteorite values --- assets/cubyz/items/meteorite_ingot.zig.zon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/cubyz/items/meteorite_ingot.zig.zon b/assets/cubyz/items/meteorite_ingot.zig.zon index b798e0c6..85fe983e 100644 --- a/assets/cubyz/items/meteorite_ingot.zig.zon +++ b/assets/cubyz/items/meteorite_ingot.zig.zon @@ -2,8 +2,8 @@ .texture = "meteorite_ingot.png", .material = .{ .density = 12.0, - .strength = 3.0, - .elasticity = 15.0, + .strength = 5.0, + .elasticity = 13.0, .grip = 2.0, .hardness = 6.0, .textureRoughness = 0.2,