From aee73b4bd25cd81b3ad7a3be248129496166810c Mon Sep 17 00:00:00 2001 From: tacigar Date: Fri, 16 Sep 2016 07:35:13 +0900 Subject: [PATCH 1/3] [UPDATE] change formspec scope --- maidroid_tool/core_writer.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/maidroid_tool/core_writer.lua b/maidroid_tool/core_writer.lua index 09632c0..d688dd1 100644 --- a/maidroid_tool/core_writer.lua +++ b/maidroid_tool/core_writer.lua @@ -28,6 +28,13 @@ local dye_core_map = { }, } + local formspec_inactive = "size[8,9]" + .. "list[current_name;core;2.75,0.5;1,1;]" + .. "list[current_name;fuel;2.75,2.5;1,1;]" + .. "list[current_name;dye;2.75,1.5;1,1;]" + .. "list[current_player;main;0,5;8,1;]" + .. "list[current_player;main;0,6.2;8,3;8]" + -- get_nearest_core_entity returns the nearest core entity. local function get_nearest_core_entity(pos) local all_objects = minetest.get_objects_inside_radius(pos, 1.0) @@ -139,16 +146,9 @@ local dye_core_map = { "maidroid_tool_core_writer_front.png", } - local formspec_string = "size[8,9]" - .. "list[current_name;core;2.75,0.5;1,1;]" - .. "list[current_name;fuel;2.75,2.5;1,1;]" - .. "list[current_name;dye;2.75,1.5;1,1;]" - .. "list[current_player;main;0,5;8,1;]" - .. "list[current_player;main;0,6.2;8,3;8]" - local function on_construct(pos) local meta = minetest.get_meta(pos) - meta:set_string("formspec", formspec_string) + meta:set_string("formspec", formspec_inactive) meta:set_string("output_core", "") meta:set_float("writing_time", -1) From 5767f4c262908e539ed6eb7ba51a7757b8cf7991 Mon Sep 17 00:00:00 2001 From: tacigar Date: Fri, 16 Sep 2016 08:35:22 +0900 Subject: [PATCH 2/3] [UPDATE] formspec inactivate --- maidroid_tool/core_writer.lua | 14 +++++++++++--- .../textures/maidroid_tool_gui_arrow.png | Bin 0 -> 417 bytes .../textures/maidroid_tool_gui_arrow.xcf | Bin 0 -> 1716 bytes .../textures/maidroid_tool_gui_meter.png | Bin 0 -> 246 bytes .../textures/maidroid_tool_gui_meter.xcf | Bin 0 -> 1145 bytes 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 maidroid_tool/textures/maidroid_tool_gui_arrow.png create mode 100644 maidroid_tool/textures/maidroid_tool_gui_arrow.xcf create mode 100644 maidroid_tool/textures/maidroid_tool_gui_meter.png create mode 100644 maidroid_tool/textures/maidroid_tool_gui_meter.xcf diff --git a/maidroid_tool/core_writer.lua b/maidroid_tool/core_writer.lua index d688dd1..e703199 100644 --- a/maidroid_tool/core_writer.lua +++ b/maidroid_tool/core_writer.lua @@ -29,9 +29,17 @@ local dye_core_map = { } local formspec_inactive = "size[8,9]" - .. "list[current_name;core;2.75,0.5;1,1;]" - .. "list[current_name;fuel;2.75,2.5;1,1;]" - .. "list[current_name;dye;2.75,1.5;1,1;]" + .. default.gui_bg + .. default.gui_bg_img + .. default.gui_slots + .. "label[3.75,0;Core]" + .. "list[current_name;core;3.5,0.5;1,1;]" + .. "label[2.75,2;Coal]" + .. "list[current_name;fuel;2.5,2.5;1,1;]" + .. "label[4.75,2;Dye]" + .. "list[current_name;dye;4.5,2.5;1,1;]" + .. "image[3.5,1.5;1,2;maidroid_tool_gui_arrow.png]" + .. "image[3.1,3.5;2,1;maidroid_tool_gui_meter.png^[transformR270]" .. "list[current_player;main;0,5;8,1;]" .. "list[current_player;main;0,6.2;8,3;8]" diff --git a/maidroid_tool/textures/maidroid_tool_gui_arrow.png b/maidroid_tool/textures/maidroid_tool_gui_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..50ff1361146c004bd2a8eca08e0dbf4349f3ddc6 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fRkUGS9+!6!9bvpY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$&cMLP>gnPbl5y|tjJv$83OudekL7d@sTj%6-XZ?|p(VpVR+!c=+vG3nOv-354BP_}@^tlcS?83{1OW9rnScNQ literal 0 HcmV?d00001 diff --git a/maidroid_tool/textures/maidroid_tool_gui_arrow.xcf b/maidroid_tool/textures/maidroid_tool_gui_arrow.xcf new file mode 100644 index 0000000000000000000000000000000000000000..24c585e6f04afecf98e38d7421b3a2ac74deb7e7 GIT binary patch literal 1716 zcmeH`yKdV+5JhK6ilQh{Zz+Dr!j^KO!2W?iND3oGfYjT`5=9fx!;omis#2s1;KFTw zBKf6MK|aFBF^wb~BqRDE$TI)e7!*z5y)@Luz(%56pv!PR@UhYZF$Mxez zQg1ic<4L@X^m+a+bZ+-`W_`n(Wt`}EIk^fqlE0eGHevF2gOdG!*Pot$Q{^18P+xNg z)nEkVM2kN^-TnCT4UQ~%AY33{hJlxPnOe#`gnB#P-|^)gU)k}&j<3PXx_J~~3}wuO_KxD0CldJ zDmP33D%>(YcT5R*>>7nU1$BXqwQOjC9bl*Gz`O7+)Pi~$iY=^R1Is+HG3=vJ#)bmu z@sn^+kRV0<>Kg}jL0t1fq>4&ZU!GP!FfCO1QGMs<(|A6ONB<2{d;)r8^AQ#J5FAjE zyM#Lc+EnHy;ckFB)woKyGoV5(_6c_hc;vD|o`Sl-##%PCKn}1|b>Lli7ivMh3`G{! nuz|%7#7sUKWo#&b9zO{O1qp?$up$bpp$J@d6w^XsxE%Bw>s{IL literal 0 HcmV?d00001 diff --git a/maidroid_tool/textures/maidroid_tool_gui_meter.png b/maidroid_tool/textures/maidroid_tool_gui_meter.png new file mode 100644 index 0000000000000000000000000000000000000000..9c3f5df613698fb95a548afc2daf02c7052d886b GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fRkTbmZ|+k^#P!eY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$4it~_ba4#HxcBz5A=d!|9_9l(zD%#1fB)qg)#?uyF0b%Z z(A!n*`z-RXr2L0@u4!?9m#jL(dY^?=B*1|YFLCfadyd;;&&-#el@jmZpwtDL+*bL_0CSg2ceeOTb$p z-XfeE927)ZyKtm0_xSo=+j6XQJf}qvQm7*-AOap>?E}lg=K!?No`qnbL$CpQ;MjPs zJ3{>!v8%AG8>De8lLBMGlfCmy`h}d*tuAIXzPP;NnZ2r1$G(!T%Jh_TsJ4WY7t2Ue zo<@2)=s2MY(kRWyse+rSiBH4RVWkyjWTpmaovdiB=jm_5t&4o_2RczSs`o;2xhiRL z?oFZ#(n&CrIrpbwn9Jh(fZY8%^_BVA%J*Poz19wqfCu Date: Fri, 16 Sep 2016 10:13:39 +0900 Subject: [PATCH 3/3] [UPDATE] Complete formspec --- maidroid_tool/core_writer.lua | 40 ++++++++++++++++-- .../maidroid_tool_gui_arrow_filled.png | Bin 0 -> 417 bytes .../maidroid_tool_gui_arrow_filled.xcf | Bin 0 -> 1475 bytes .../textures/maidroid_tool_gui_meter.png | Bin 246 -> 275 bytes .../textures/maidroid_tool_gui_meter.xcf | Bin 1145 -> 1375 bytes .../maidroid_tool_gui_meter_filled.png | Bin 0 -> 288 bytes .../maidroid_tool_gui_meter_filled.xcf | Bin 0 -> 1263 bytes 7 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 maidroid_tool/textures/maidroid_tool_gui_arrow_filled.png create mode 100644 maidroid_tool/textures/maidroid_tool_gui_arrow_filled.xcf create mode 100644 maidroid_tool/textures/maidroid_tool_gui_meter_filled.png create mode 100644 maidroid_tool/textures/maidroid_tool_gui_meter_filled.xcf diff --git a/maidroid_tool/core_writer.lua b/maidroid_tool/core_writer.lua index e703199..3023e88 100644 --- a/maidroid_tool/core_writer.lua +++ b/maidroid_tool/core_writer.lua @@ -8,7 +8,7 @@ local dye_core_map = { } -- register a definition of a core writer. -(function() +;(function() local node_box = { type = "fixed", fixed = { @@ -43,6 +43,36 @@ local dye_core_map = { .. "list[current_player;main;0,5;8,1;]" .. "list[current_player;main;0,6.2;8,3;8]" + local function generate_formspec_active(writing_time) + local arrow_percent = (100 / 40) * writing_time + + local merter_percent = 0 + if writing_time % 16 >= 8 then + meter_percent = (8 - (writing_time % 8)) * (100 / 8) + else + meter_percent = (writing_time % 8) * (100 / 8) + end + + return "size[8,9]" + .. default.gui_bg + .. default.gui_bg_img + .. default.gui_slots + .. "label[3.75,0;Core]" + .. "list[current_name;core;3.5,0.5;1,1;]" + .. "label[2.75,2;Coal]" + .. "list[current_name;fuel;2.5,2.5;1,1;]" + .. "label[4.75,2;Dye]" + .. "list[current_name;dye;4.5,2.5;1,1;]" + .. "image[3.5,1.5;1,2;maidroid_tool_gui_arrow.png^[lowpart:" + .. arrow_percent + .. ":maidroid_tool_gui_arrow_filled.png]" + .. "image[3.1,3.5;2,1;maidroid_tool_gui_meter.png^[lowpart:" + .. meter_percent + .. ":maidroid_tool_gui_meter_filled.png^[transformR270]" + .. "list[current_player;main;0,5;8,1;]" + .. "list[current_player;main;0,6.2;8,3;8]" + end + -- get_nearest_core_entity returns the nearest core entity. local function get_nearest_core_entity(pos) local all_objects = minetest.get_objects_inside_radius(pos, 1.0) @@ -75,17 +105,19 @@ local dye_core_map = { local dye_list = inventory:get_list("dye") local writing_time = meta:get_float("writing_time") - local writing_total_time = 20 + local writing_total_time = 40 local output_core = meta:get_string("output_core") -- if writing time is positive, the core writer is active. if writing_time >= 0 then if writing_time <= writing_total_time then meta:set_float("writing_time", writing_time + 1) + meta:set_string("formspec", generate_formspec_active(writing_time)) else -- else place output core to core list. meta:set_float("writing_time", -1) meta:set_string("output_core", "") + meta:set_string("formspec", formspec_inactive) inventory:set_stack("core", 1, ItemStack(output_core)) minetest.swap_node(pos, {name = "maidroid_tool:core_writer"}) @@ -168,14 +200,14 @@ local dye_core_map = { local function on_metadata_inventory_put(pos, listname, index, stack, player) local timer = minetest.get_node_timer(pos) - timer:start(1.0) + timer:start(0.25) local meta = minetest.get_meta(pos) if listname == "core" then local entity_position = { x = pos.x, y = pos.y + 0.65, z = pos.z } - local object = minetest.add_entity(entity_position, "maidroid_tool:core_entity") + minetest.add_entity(entity_position, "maidroid_tool:core_entity") end end diff --git a/maidroid_tool/textures/maidroid_tool_gui_arrow_filled.png b/maidroid_tool/textures/maidroid_tool_gui_arrow_filled.png new file mode 100644 index 0000000000000000000000000000000000000000..625a45b5e87579591ce35ad15118b5b6c44b5bac GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fKz~xo2#|zo*qz0HZvrm#5q4VH#M&W$Yo$~E=o-- zNlj5G&n(GMaQE~LNYP7WXJBAt^>lFz$+-7+h9h5#0*~v`k6i04Tkia4iAlO9*A#ii zCyB>NbM2`oo0Tqp+y8BGlipI3PIr#^40Wy*qCyzbtz#e!PyS*u3n`*DlMls41fBD>WM}p8d|6jYV_-v z>ntBPXCCdz-jCd3DFHLFmI*r));&+(`n|47*Lznf@0_T@ prL49Bv0@oIPPGg*+%Sz9GWqu+3$=dlU}6OcdAjELb72V9QIu zE3ra6MAgGTu8mR=R^4)>Z~lKSXFO*-ak98ocaxc#CG&_73XFh>CJ+Km8+fn25E&31 zV1p6p<=(98V*M2~h_UT(vRW*nWr{wT$=2(2G)|+b`jDhI>gvtgcV?!MEln2VI2y+5 zWNOB+TF_vVZs(EOtmet|+#k&1$!fk@t3f8ib$mTm7cVceIAAXGsdJ=WA4o0c)xV8N zz1!T5C&@Bam&La*xIHwOj}6~1lT;gjfL)mGq&^zJNg(L zaY^^Mth=DY72V=MH$j8zy2ec%fGW4O&s|*x9=lo~Pe5H@VJ{2nunnwCZFm>ng-WQG zBUoY&3rKy>TCgn#?#v% z!F_N>7N3yA$KZ%c+#~#T(4h*q2(JM&sLnOQD*;t%vrl+Ez$2Fh@&wcc7WT5B4%xuU z)P{HAU8sb5If5kiuz=)yVkRG*3Jw%NPoIU2f(%YxSP6yIQ3RehifN-TJO}y>5H@f) literal 0 HcmV?d00001 diff --git a/maidroid_tool/textures/maidroid_tool_gui_meter.png b/maidroid_tool/textures/maidroid_tool_gui_meter.png index 9c3f5df613698fb95a548afc2daf02c7052d886b..3544e13eba068243074cba68ae10a7aa28d851de 100644 GIT binary patch delta 160 zcmV;R0AK(10h0odQwR_MB@h4ANxG3+EPr=NL_t(&-tE^h62Kq`L{Z3iOV7tSwNH^$ zj!yC@tr%dxyE(>)opr_LYWIiU`_hqARUS0~4dm}taHI@lu?(LZh=|okfde>jmI~Ye z4rrjg?Fb3w0=WPOtbiZj2mFR|0S@2*KY)aCfm}cZR`7X8#1Ciy2PRVhHG)Vm%MB6$ O0000H`y_b@HP;T^vI)?!CQi$aTPghxx#cFVpMh-+#GAwfe(_ z%PTw;^mbMIK8rjoDgR-fYg*jjC94jx-e+MI32~NA`Nbfb<=Dy z5j;&MYSe3XLm4EKWX8LBvS)JW^Zsc+j|wszxWs*L3z)@MtgP&I~ diff --git a/maidroid_tool/textures/maidroid_tool_gui_meter_filled.png b/maidroid_tool/textures/maidroid_tool_gui_meter_filled.png new file mode 100644 index 0000000000000000000000000000000000000000..b2276c995bc68b5ac553583c972061da25577fe7 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fK!0MLRe%+`Ki;O^-gkfN8$4is3A@l3U8Z-3i8kIH@}>HSLP_3wus<(DVLWS({obzrKj675kx+>!AsQS)g%TLA<6 zvfxI^1B{$CDLanOlzuJ1d6(6qfjQ~`|AU6y7kUR6Wgf6kxDeaG9I}8l*;1*_fyv?n Y!@S_YcMFWp=71dP>FVdQ&MBb@0KF|=OaK4? literal 0 HcmV?d00001 diff --git a/maidroid_tool/textures/maidroid_tool_gui_meter_filled.xcf b/maidroid_tool/textures/maidroid_tool_gui_meter_filled.xcf new file mode 100644 index 0000000000000000000000000000000000000000..00fa1b265308f4cfbe55d6491cc31c466385fc6d GIT binary patch literal 1263 zcmcgqJx>Bb5Zxn25G8&~W3hz>C@>KJ0P%{8g^4vC9Cynmz!C0@P*K=uVqxn)u+l$a z;V&`%1iSOiu}k&@8Ve_RH*emXnLU;hvOnZw*XO?Mc?`jU20*b3SQZ}pK5>i)I1*7dHquS@I35|}!Vat^R z!Rz`gh?8Za(yBKD8F4vqyIx51f$xW2G=D*wUX*4^dX(-#h4rc#G6xy}-Dvjf?(y^a z4UA>zfmjFVpNWB-;?%mKI1)QHc;4Wf2H!Gx!Qk8Av{y$KgwCVTUxj`bNSWlD0^vXd zKyPM(Ou>N$>IY!t dYOeH$onkhV+GEEyE5=y^xDTTu=RXyj{Q%7=Q?vj8 literal 0 HcmV?d00001