From eab3099a880c384c847b99721d5d8ec2683bf4e9 Mon Sep 17 00:00:00 2001 From: mruncreative Date: Sun, 21 Apr 2024 22:15:33 +0200 Subject: [PATCH] moved gate textures to base mesecon mod, made delayer look like a gate, removed dependency of gates on delayer --- .../textures/jeija_gate_off.png | Bin .../textures/jeija_gate_on.png | Bin .../textures/jeija_gate_side.png | Bin mesecons_delayer/init.lua | 22 ++++++++++++++---- mesecons_delayer/textures/jeija_delayer.png | Bin 0 -> 156 bytes .../textures/mesecons_delayer_1.png | Bin 335 -> 338 bytes .../textures/mesecons_delayer_2.png | Bin 334 -> 337 bytes .../textures/mesecons_delayer_3.png | Bin 336 -> 339 bytes .../textures/mesecons_delayer_4.png | Bin 331 -> 334 bytes .../textures/mesecons_delayer_off.png | Bin 385 -> 0 bytes .../textures/mesecons_delayer_on.png | Bin 508 -> 0 bytes mesecons_gates/mod.conf | 2 +- 12 files changed, 19 insertions(+), 5 deletions(-) rename {mesecons_gates => mesecons}/textures/jeija_gate_off.png (100%) rename {mesecons_gates => mesecons}/textures/jeija_gate_on.png (100%) rename {mesecons_gates => mesecons}/textures/jeija_gate_side.png (100%) create mode 100644 mesecons_delayer/textures/jeija_delayer.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_off.png delete mode 100644 mesecons_delayer/textures/mesecons_delayer_on.png diff --git a/mesecons_gates/textures/jeija_gate_off.png b/mesecons/textures/jeija_gate_off.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_off.png rename to mesecons/textures/jeija_gate_off.png diff --git a/mesecons_gates/textures/jeija_gate_on.png b/mesecons/textures/jeija_gate_on.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_on.png rename to mesecons/textures/jeija_gate_on.png diff --git a/mesecons_gates/textures/jeija_gate_side.png b/mesecons/textures/jeija_gate_side.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_side.png rename to mesecons/textures/jeija_gate_side.png diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua index 7607bff..98ec48f 100644 --- a/mesecons_delayer/init.lua +++ b/mesecons_delayer/init.lua @@ -38,7 +38,10 @@ local def = { }, node_box = { type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(1/16), 0.5} + fixed = { + { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab + { -6/16, -7/16, -6/16, 6/16, -6/16, 6/16 } + }, }, paramtype = "light", paramtype2 = "facedir", @@ -60,11 +63,16 @@ end local off_state = { description = S("Delayer"), + inventory_image = "jeija_gate_off.png^jeija_delayer.png", + wield_image = "jeija_gate_off.png^jeija_delayer.png", tiles = { - "jeija_microcontroller_bottom.png^mesecons_delayer_off.png^mesecons_delayer_"..tostring(i)..".png", + "jeija_microcontroller_bottom.png^jeija_gate_off.png^jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png", "jeija_microcontroller_bottom.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", }, - wield_image = "jeija_microcontroller_bottom.png^mesecons_delayer_off.png^mesecons_delayer_1.png", groups = off_groups, on_punch = function(pos, node, puncher) if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then @@ -98,9 +106,15 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), off_state) -- Activated delayer definition defaults local on_state = { description = S("You hacker you"), + inventory_image = "jeija_gate_on.png^jeija_delayer.png", + wield_image = "jeija_gate_on.png^jeija_delayer.png", tiles = { - "jeija_microcontroller_bottom.png^mesecons_delayer_on.png^mesecons_delayer_"..tostring(i)..".png", + "jeija_microcontroller_bottom.png^jeija_gate_on.png^jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png", "jeija_microcontroller_bottom.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", }, groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1}, on_punch = function(pos, node, puncher) diff --git a/mesecons_delayer/textures/jeija_delayer.png b/mesecons_delayer/textures/jeija_delayer.png new file mode 100644 index 0000000000000000000000000000000000000000..451f1c4d04d837feffe56169d24134d12d78f4a9 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0R?H{{R2qeE0k%Ad9gi z$S;_|;n|HeAcwQSBeIx*fm;}a85w5HkpK$nc)B=-a9mGLXkcC!x>`&@Sli)<(o$9) unQoH?ouzE73LBYDyo%bw5NjyIz+n4QfhlJI literal 0 HcmV?d00001 diff --git a/mesecons_delayer/textures/mesecons_delayer_1.png b/mesecons_delayer/textures/mesecons_delayer_1.png index f1e49d2d8393ada85d1c8a0e3dcdd4a45fb57b44..973d6849938b0ba73a6da9a6fdd46ab9b5fa5db2 100644 GIT binary patch delta 58 zcmX@lbctz#3dfBApAc6D28M~6S6SSbbg)ilV$_!lYnaL!+c4FHnSs@SL1f#d315LK O7(8A5T-G@yGywn-5fQ!s delta 55 zcmcb_be?H~3hUJXpAgrHI#*fb3={k&voh+-U2ABSjBQ}u&&I%zopr0R2)BumAu6 delta 54 zcmcb}bdG6)3hUJXpAgrHI#*c))zQ1_owF2L2yQLnbo-fv2mV J%Q~loCIAE$5vKqE diff --git a/mesecons_delayer/textures/mesecons_delayer_3.png b/mesecons_delayer/textures/mesecons_delayer_3.png index a9c017af9f4e5c157fc441bba151903220b6fca5..c8bf24e5efcc65248fee69546a7e27d85e81a023 100644 GIT binary patch delta 59 zcmcb>beU;_3dfBApAc6D28M~6S6SSbbg)ilV$_!pYnaOF+tAu-!py*OkwJ)S&FsfO OB@CXfelF{r5}E)dj}hwt delta 56 zcmcc2bb)Dt3hUJXpAgrHI#*fb3={k&voh+-Uu$TU^lg|axu1=JS&@NHSKDu<^%>Q1_q`N47}&kCwyc80#8>z Jmvv4FO#uJn5(5AL diff --git a/mesecons_delayer/textures/mesecons_delayer_off.png b/mesecons_delayer/textures/mesecons_delayer_off.png deleted file mode 100644 index 8c9df5ba11962074eb2032bc19d629a2a45a1d33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfr2wB0R|W<~Ak+LBgBt^bmls1! ztafZHLqY;`S{iS5HbY)sUVeUlVIf0dVPR2`RB>@}NeM$q33EwFNhuJNNtTtBm6w-S zRPa|+R8&@0R#jD1S6A26Fx1r4)YdZ8*4Eb5G1S%R)Ya+L)z#J4Gt}4f*4NiJG&D3e zGBh?eHZ?UhH#fJmw6wMgwze9ywzjsl3ADAfb#!!ebqRKLb@ld&_Vw{hny5c{GTY?I z7E`B~Pn#w(V}{0z8Lo5Ya4lZUy<~~i(xu)THdt-mY_@r`$NTq;yB;QA26~CHB*-tA z!Qt7BG$4nwz$3Dlfq`2Xgc%uT&5-~KdU(1xhDcmaPFNsSP*}9V_1Wzkmb+igQvT7` zlvA~C-M484jLhK%25sCC&MYAhnZlOoyjizStc%0h<%UJ<*&h?uCO#DiUo=mh;lOV$ VhllHgM1f{9c)I$ztaD0e0ss-Ri|YUY diff --git a/mesecons_delayer/textures/mesecons_delayer_on.png b/mesecons_delayer/textures/mesecons_delayer_on.png deleted file mode 100644 index d25a814b179198c6ee1ddc1c95bded12fc48ee6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 508 zcmV8PEq3pa*n4uclm43q?HwN;j=< z^+GXWGI`|9>peEN2DCdrPNhTpiMTTDK#Cj9=KblquSk+7MrjH_sqle(enz` zb;HjI*-Sie)|wpbfBDC*@^+P<@g-34ExhkqZaBa^pZ8ZqgV`)I*tx0Y#AD-gmW^N0 zd-%>MO?eT9l((w@v|3+r+ya7~7`!Wf8k^M7VdZ=gV%r9P;>kM7wiAFMgu({*$rM#y(5pjuj?5i6+X1*q0>6i%CqZ)I~zD yllUyk|63;e?}3!fpw-G{S|Su!9gNNLES^84ajmEt`{a560000