From d2df31bd6b499560dac82d9c15d937b5e4179ae5 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Sat, 21 Jan 2017 20:38:19 -0700 Subject: [PATCH] Revamp storage module textures, controller colorization --- init.lua | 4 +++ node_controllers.lua | 26 ++++++++-------- node_diggers.lua | 38 ++++++++++++------------ node_storage.lua | 27 ++++++++++++++--- textures/digtron_auto_control_tint.png | Bin 185 -> 0 bytes textures/digtron_combined_storage.png | Bin 574 -> 0 bytes textures/digtron_crossbrace.png | Bin 0 -> 605 bytes textures/digtron_flammable.png | Bin 0 -> 351 bytes textures/digtron_flammable_small.png | Bin 0 -> 238 bytes textures/digtron_fuelstore.png | Bin 581 -> 0 bytes textures/digtron_intermittent.png | Bin 0 -> 507 bytes textures/digtron_intermittent_motor.png | Bin 559 -> 0 bytes textures/digtron_inventory.png | Bin 556 -> 0 bytes textures/digtron_pusher_tint.png | Bin 185 -> 0 bytes textures/digtron_storage.png | Bin 0 -> 399 bytes 15 files changed, 59 insertions(+), 36 deletions(-) delete mode 100644 textures/digtron_auto_control_tint.png delete mode 100644 textures/digtron_combined_storage.png create mode 100644 textures/digtron_crossbrace.png create mode 100644 textures/digtron_flammable.png create mode 100644 textures/digtron_flammable_small.png delete mode 100644 textures/digtron_fuelstore.png create mode 100644 textures/digtron_intermittent.png delete mode 100644 textures/digtron_intermittent_motor.png delete mode 100644 textures/digtron_inventory.png delete mode 100644 textures/digtron_pusher_tint.png create mode 100644 textures/digtron_storage.png diff --git a/init.lua b/init.lua index 6235586..bee5b7e 100644 --- a/init.lua +++ b/init.lua @@ -1,5 +1,9 @@ digtron = {} +digtron.auto_controller_colorize = "#88000030" +digtron.pusher_controller_colorize = "#00880030" +digtron.soft_digger_colorize = "#88880030" + dofile( minetest.get_modpath( "digtron" ) .. "/util.lua" ) dofile( minetest.get_modpath( "digtron" ) .. "/doc.lua" ) dofile( minetest.get_modpath( "digtron" ) .. "/awards.lua" ) diff --git a/node_controllers.lua b/node_controllers.lua index f9912ad..518e97e 100644 --- a/node_controllers.lua +++ b/node_controllers.lua @@ -161,12 +161,12 @@ minetest.register_node("digtron:auto_controller", { is_ground_content = false, -- Aims in the +Z direction by default tiles = { - "digtron_plate.png^[transformR90^digtron_auto_control_tint.png", - "digtron_plate.png^[transformR270^digtron_auto_control_tint.png", - "digtron_plate.png^digtron_axel_side.png^[transformR270^digtron_auto_control_tint.png", - "digtron_plate.png^digtron_axel_side.png^[transformR270^digtron_auto_control_tint.png", - "digtron_plate.png^digtron_auto_control_tint.png", - "digtron_plate.png^digtron_control.png^digtron_auto_control_tint.png", + "digtron_plate.png^[transformR90^[colorize:" .. digtron.auto_controller_colorize, + "digtron_plate.png^[transformR270^[colorize:" .. digtron.auto_controller_colorize, + "digtron_plate.png^digtron_axel_side.png^[transformR270^[colorize:" .. digtron.auto_controller_colorize, + "digtron_plate.png^digtron_axel_side.png^[transformR270^[colorize:" .. digtron.auto_controller_colorize, + "digtron_plate.png^[colorize:" .. digtron.auto_controller_colorize, + "digtron_plate.png^digtron_control.png^[colorize:" .. digtron.auto_controller_colorize, }, drawtype = "nodebox", @@ -222,7 +222,7 @@ minetest.register_node("digtron:auto_controller", { local node = minetest.get_node(pos) local controlling_coordinate = digtron.get_controlling_coordinate(pos, node.param2) - local newpos = pos --digtron.find_new_pos(pos, minetest.get_node(pos).param2) + local newpos = pos local markerpos = {x=newpos.x, y=newpos.y, z=newpos.z} local x_pos = math.floor((newpos[controlling_coordinate]+offset)/slope)*slope - offset markerpos[controlling_coordinate] = x_pos @@ -267,12 +267,12 @@ minetest.register_node("digtron:pusher", { is_ground_content = false, -- Aims in the +Z direction by default tiles = { - "digtron_plate.png^[transformR90^digtron_pusher_tint.png", - "digtron_plate.png^[transformR270^digtron_pusher_tint.png", - "digtron_plate.png^digtron_pusher_tint.png", - "digtron_plate.png^[transformR180^digtron_pusher_tint.png", - "digtron_plate.png^digtron_pusher_tint.png", - "digtron_plate.png^digtron_control.png^digtron_pusher_tint.png", + "digtron_plate.png^[transformR90^[colorize:" .. digtron.pusher_controller_colorize, + "digtron_plate.png^[transformR270^[colorize:" .. digtron.pusher_controller_colorize, + "digtron_plate.png^[colorize:" .. digtron.pusher_controller_colorize, + "digtron_plate.png^[transformR180^[colorize:" .. digtron.pusher_controller_colorize, + "digtron_plate.png^[colorize:" .. digtron.pusher_controller_colorize, + "digtron_plate.png^digtron_control.png^[colorize:" .. digtron.pusher_controller_colorize, }, drawtype = "nodebox", diff --git a/node_diggers.lua b/node_diggers.lua index 19441e9..b0bf59b 100644 --- a/node_diggers.lua +++ b/node_diggers.lua @@ -136,7 +136,7 @@ minetest.register_node("digtron:intermittent_digger", { length = 1.0, }, }, - "digtron_plate.png^digtron_intermittent_motor.png", + "digtron_plate.png^digtron_intermittent.png^digtron_motor.png", }, on_construct = intermittent_on_construct, @@ -193,12 +193,12 @@ minetest.register_node("digtron:soft_digger", { -- Aims in the +Z direction by default tiles = { - "digtron_plate.png^[transformR90^[colorize:#88880030", - "digtron_plate.png^[transformR270^[colorize:#88880030", - "digtron_plate.png^[colorize:#88880030", - "digtron_plate.png^[transformR180^[colorize:#88880030", + "digtron_plate.png^[transformR90^[colorize:" .. digtron.soft_digger_colorize, + "digtron_plate.png^[transformR270^[colorize:" .. digtron.soft_digger_colorize, + "digtron_plate.png^[colorize:" .. digtron.soft_digger_colorize, + "digtron_plate.png^[transformR180^[colorize:" .. digtron.soft_digger_colorize, { - name = "digtron_digger_yb.png^[colorize:#88880030", + name = "digtron_digger_yb.png^[colorize:" .. digtron.soft_digger_colorize, animation = { type = "vertical_frames", aspect_w = 16, @@ -206,7 +206,7 @@ minetest.register_node("digtron:soft_digger", { length = 1.0, }, }, - "digtron_plate.png^digtron_motor.png^[colorize:#88880030", + "digtron_plate.png^digtron_motor.png^[colorize:" .. digtron.soft_digger_colorize, }, execute_dig = function(pos, protected_nodes, nodes_dug, controlling_coordinate, lateral_dig) @@ -248,12 +248,12 @@ minetest.register_node("digtron:intermittent_soft_digger", { -- Aims in the +Z direction by default tiles = { - "digtron_plate.png^[transformR90^[colorize:#88880030", - "digtron_plate.png^[transformR270^[colorize:#88880030", - "digtron_plate.png^[colorize:#88880030", - "digtron_plate.png^[transformR180^[colorize:#88880030", + "digtron_plate.png^[transformR90^[colorize:" .. digtron.soft_digger_colorize, + "digtron_plate.png^[transformR270^[colorize:" .. digtron.soft_digger_colorize, + "digtron_plate.png^[colorize:" .. digtron.soft_digger_colorize, + "digtron_plate.png^[transformR180^[colorize:" .. digtron.soft_digger_colorize, { - name = "digtron_digger_yb.png^[colorize:#88880030", + name = "digtron_digger_yb.png^[colorize:" .. digtron.soft_digger_colorize, animation = { type = "vertical_frames", aspect_w = 16, @@ -261,7 +261,7 @@ minetest.register_node("digtron:intermittent_soft_digger", { length = 1.0, }, }, - "digtron_plate.png^digtron_intermittent_motor.png^[colorize:#88880030", + "digtron_plate.png^digtron_intermittent.png^digtron_motor.png^[colorize:" .. digtron.soft_digger_colorize, }, on_construct = intermittent_on_construct, @@ -398,9 +398,9 @@ minetest.register_node("digtron:dual_soft_digger", { -- Aims in the +Z and -Y direction by default tiles = { - "digtron_plate.png^digtron_motor.png^[colorize:#88880030", + "digtron_plate.png^digtron_motor.png^[colorize:" .. digtron.soft_digger_colorize, { - name = "digtron_digger_yb.png^[colorize:#88880030", + name = "digtron_digger_yb.png^[colorize:" .. digtron.soft_digger_colorize, animation = { type = "vertical_frames", aspect_w = 16, @@ -408,10 +408,10 @@ minetest.register_node("digtron:dual_soft_digger", { length = 1.0, }, }, - "digtron_plate.png^[colorize:#88880030", - "digtron_plate.png^[transformR180^[colorize:#88880030", + "digtron_plate.png^[colorize:" .. digtron.soft_digger_colorize, + "digtron_plate.png^[transformR180^[colorize:" .. digtron.soft_digger_colorize, { - name = "digtron_digger_yb.png^[colorize:#88880030", + name = "digtron_digger_yb.png^[colorize:" .. digtron.soft_digger_colorize, animation = { type = "vertical_frames", aspect_w = 16, @@ -419,7 +419,7 @@ minetest.register_node("digtron:dual_soft_digger", { length = 1.0, }, }, - "digtron_plate.png^digtron_motor.png^[colorize:#88880030", + "digtron_plate.png^digtron_motor.png^[colorize:" .. digtron.soft_digger_colorize, }, -- returns fuel_cost, items_produced diff --git a/node_storage.lua b/node_storage.lua index 18b7668..dd34014 100644 --- a/node_storage.lua +++ b/node_storage.lua @@ -11,7 +11,14 @@ minetest.register_node("digtron:inventory", { drawtype = "nodebox", paramtype = "light", is_ground_content = false, - tiles = {"digtron_plate.png^digtron_inventory.png"}, + tiles = { + "digtron_plate.png^digtron_crossbrace.png", + "digtron_plate.png^digtron_crossbrace.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_storage.png", + }, on_construct = function(pos) local meta = minetest.get_meta(pos) @@ -73,7 +80,14 @@ minetest.register_node("digtron:fuelstore", { drawtype = "nodebox", paramtype = "light", is_ground_content = false, - tiles = {"digtron_plate.png^digtron_fuelstore.png"}, + tiles = { + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable.png^digtron_storage.png", + }, on_construct = function(pos) local meta = minetest.get_meta(pos) @@ -155,8 +169,13 @@ minetest.register_node("digtron:combined_storage", { drawtype = "nodebox", paramtype = "light", is_ground_content = false, - tiles = {"digtron_plate.png^digtron_combined_storage.png"}, - + tiles = { + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable_small.png^[transformR180^digtron_flammable_small.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable_small.png^[transformR180^digtron_flammable_small.png", "digtron_plate.png^digtron_crossbrace.png^digtron_flammable_small.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable_small.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable_small.png^digtron_storage.png", + "digtron_plate.png^digtron_crossbrace.png^digtron_flammable_small.png^digtron_storage.png", + }, on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", diff --git a/textures/digtron_auto_control_tint.png b/textures/digtron_auto_control_tint.png deleted file mode 100644 index 0581f2301efa8b4fac3975db0d8e3caca5f2ab62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPtBR8KF?<#HQA3!15%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dq|npFF~s6@@|%PNgR}(<28IC~ZoCqv30E2pCNVHr&t$mG ScI0vy$OKPUKbLh*2~7Zq|1a7A diff --git a/textures/digtron_combined_storage.png b/textures/digtron_combined_storage.png deleted file mode 100644 index 300789dc189feee6be50f7756d1859f61a2fe03e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmV-E0>S->P)WFU8GbZ8()Nlj2>E@cM*00E*&L_t(I%Z-x1ixWW{ z#XoO;WOvPGlS?CtU?~nlVccd_CD-t z2LqlwMnD0y>vYzakp_e+^2{9B3=G`YQ=-7}9s}A8^pvv1@xTSv5v%~g;S~a> zrH~7hASy(aGYf+(@PN$d5hihlNCGos9mM=l1vruBU1#ldYHd^7$(`1ae&Kj?V+SuE zZaWzAfSh=DH1J`$y#V$f6wZG@0eL4*Zf$tg4dhT^MwZwE8N!6S66OtpM_&e<#Gj|j zX8yKKlu+}tIzn0rxEcpYj_=wQmLV|gMaIs2Efs1Qo`VhG6(?2a8 zDzOZh8LP6<80{61Z={gG43dw#%rYd?-m~@tOh|BBw)^h|Gs=FzUx;j#J5E@mX#fBK M07*qoM6N<$g7DDmSO5S3 diff --git a/textures/digtron_crossbrace.png b/textures/digtron_crossbrace.png new file mode 100644 index 0000000000000000000000000000000000000000..31ccb24624ea520a8a5cef931617f1580a494253 GIT binary patch literal 605 zcmV-j0;2tiP)vP!xv$)0l`jRFZ57_yE3wgHj5; zap3gOLZzdOMNRf4_9R}a4ds+RL7zZy*as+`c2xQb;>4jt<7Ic^4rzLV|7f!p|F;(F zU+DFEM2#W!N23t{KnU@6Fc`>sy-oq3TCL(gi0}JS z2yvsjP9_u8`Hkm!(lkv00F_GR-w{it5&*!q?dUwojj9DfaCbuHA4u=D5 z+m1S&PONF#wWeuTyWQ^lVzIc}Y&Q3XVIWD8;+WJVmSu&EG07N{rfG)RT2_zpA8KK) z>;B&F_ehciuIv8E##pHNe6F_rf>J68A!9;FXLY&N@SeoiTsjYi{>su4ma zXUHo6X)>weI9BFoj4??FiPg4M#DtLPgOH5*DPv4Jj`KMmm3k9GK2l0kNP28Sh$ozL z={U}pqHR9_c?kfT5aRLabo#MeF2AnV>!G@ZypG2sbX~`GyZyOZt+ZCF^{w4*{{mxd r*K9WLi#q33E|&oSj^j*x-{1cQWRu6zd7d$100000NkvXXu0mjf>8c88 literal 0 HcmV?d00001 diff --git a/textures/digtron_flammable.png b/textures/digtron_flammable.png new file mode 100644 index 0000000000000000000000000000000000000000..2ed9811738833f40cabf2b3e30d5b6849b35af5b GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F}`5??_`iK2DP>{XE z)7O>#A)^?Ry0N{#OD0h0pQnpsh{fr%lQ()X2a33y_m(rewyF2_3^jQL4-d_Z=j9qR zoUZKO5XSM7$#uh4kEo0O8_GLd83Q|A9&e1;%%(VF$*BXar$3~+r~iK57nW81c?)L0;QSSov+=9>8YaV{n^}yU8<=gF z`40#cu%1<$;uYgFt1f2c2TQJV&ReX)_RjGS{&nD@hsi(FwgyE58A0ud>lti#6EpsW vbv~{XE z)7O>#A)^>GJ9F;^s{o)-ucwP+h{fr*J&Hn%i41P{jadHeNpv^VQ+yxiI=Q21SIJe= zfSrw!<~NoodZf)$l2E?EduiXy^?ScN`ks~dh+FN(A>)(~zxBMB_nBgrOP5OL6nyLG zDm=3@$Nr}8MN6y0Z`m48t}nDceL?${d;1H{%OZ`}mdn&yN_?&Av5w8Tx1g}~IKw;f gMT-(x*W7=qe*BGrq<+3x0nlL#p00i_>zopr0BDIWFU8GbZ8()Nlj2>E@cM*00F5@bmsAG)HA*e63;K|A@VLIo_77#72Y4>L5$i!=$_Te#ss#E3s<1+ zT#nJ!wXFgBdkCn2)}6tZwW9&nPdxHKaR-O+>3}4NrE)h0o+LwymL;`bC2&6&^8{W2 z3q+Z5P%EWEHPJ`(OJV9z1QC!sON2`tBC^2UnVXnsTL(ep*ZbG(R-I$D@Y!~G_2I`6 z@|RTJ{I!E;4^|!AsWXP{ZsPo$4v>34i?eJ zmLPF)@setotfE4(uRbfRU3YuIP#z4kdRv~u=IE}=yLk}>)3}~># zG)AU74bwrNY0r2V19>tcb{=~x@ggL~N{s0-PKmL#nV$gjvT`*8hV6or)65QVa*52+ zjM*|@Xn9+SwZ+{ztqXP0o&)8d6f(F&j%l4)f$Z8?Ycs%w1UKaC|6VYnZU+1T-Qb-) T!ro%100000NkvXXu0mjf295Bs diff --git a/textures/digtron_intermittent.png b/textures/digtron_intermittent.png new file mode 100644 index 0000000000000000000000000000000000000000..9c68658550e6b34aa0732b2b144a2b05b1af4434 GIT binary patch literal 507 zcmVWFU8GbZ8()Nlj2>E@cM*00Cb~L_t(I%f*w;O9D|8 z#eXx6A8FP&gJwp!hzfF1(4xpyt%8=V>hEn^J0VGwQZmaKU!%@vY8!=`f^pY{$AiN= zhkM^W2mYbbv-6{L;2x+&kaeI6H0OXky9JN}k`V#|NC2HVAcY>}fcJ~z69UU5mPp`# z`n-)iR88ad?jB$VcmjNYrI3KVS156`waTe3(Hl6t7=jJSqc?KM=qjeLOkg}GDB&I} z2isJNFd-juuFzSHQNYY-SMcI-YoCJ*Hq<1BT-TI?!?jKC&gU zw%}3=I8XUZyDhBolw|zZmm&SN?CYx=)M1xEba?0rI!?exFrjA}^UbM%5#~JuFF-!R xOzoLt_3tC3fj7WeAPb)}*NSjJ%Kwo}z5q|zd09Sp7)1a8002ovPDHLkV1nD1%WFU8GbZ8()Nlj2>E@cM*00EOpL_t(I%f*vHOWR-^ z#(zoEHfgM_Blk5O;FV0r9)?_+iI(e ztxa1^Od1<65xQ8&(Fa~$`13qJcwe4BJcCmH`A;fP08T=}Do_N@9tWa-8$c3}LjVR4 z2QD55LcpK_SIfC~)7|!UE*g(-IIiRBxAvzIMcMmtSf~Q8fj@vV2*7M+DzWr-e19ft zWp``0oL;riq#iXdc4SJCeCe!W_WL72z-oSB?fpb@H8SyvpDi2t#V8{QnNCB`)GgP! zv8?TWzZe80MDa`J%{;|Uk8ExcDW0M!$&9NCF+unk^gjWV8_n-w?gcP6;q7IPjx7G+QNcK54lLrUGj<7V`#BTrq002ovPDHLkV1kh1=^p?9 diff --git a/textures/digtron_inventory.png b/textures/digtron_inventory.png deleted file mode 100644 index b3160c4230a9573a5366acfe2f327c4098a038be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 556 zcmV+{0@MA8P)(A@w403B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00EFmL_t(I%Z-vTi&H@q zg}-y>PLfA9FTq9-!BQ+#Q2YTF_G0PpwXm@f*-o+8#$rKsH!gYeX0AmFH!p$pmgk;1 z!<=tmGOr(_ne)BNyuYhk;&aZto%($$e7PV@tVYA8yVf`wkk1_azr10>^z z_Jvi6Bv_QnSuzU2(1arB2o@5T0W-h_H^2hVY*J#gT(IfpY-Y~$WR&%aG`Z}P#7E2Y z%Jj_WbEfyP@Ec%T_pU|9*|_8Cy08SU?vNSWxf#kot(+>cjYI_3ZKo;PTcF-cp+E$b uln@TanbACV)=>0000{XE z)7O>#A)^?RnR20GxhzmfHZvrm#5q4VH#M&W$Yo$~E=o--Nlj5G&n(GMaQE~LNYP7W zXJBAt^>lFzu{izq{6_Cq2ZrMxtphbLKd8Ca-6S=8_5KBxE!V=#|8Bo?XR38fUa$Gi z`$AtF0`w>E;5OPht;R-s9b#a3W5JhqyR6ahm{UhvU4Gu0?`JLBDc}^N=2@h@G$uDX_WEbgexve_6R|)z@`1KcCq2rnz`uQcrK?y!+W}?<=-!);#yqIQdQWbu&Sy r1=pm0?d$Ja)X*aEL*BY1L;o+s57Bu=P4$f)ppf!(^>bP0l+XkKW1yji literal 0 HcmV?d00001