From 52cfe9f2779df9c15a931fec33507ccc355964f3 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 27 Jan 2015 23:14:05 +0100 Subject: [PATCH] Add intermediate button state for sorttube enabler Image supplied by VanessaE. --- common.lua | 4 +++- textures/pipeworks_button_interm.png | Bin 0 -> 5770 bytes tubes.lua | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 textures/pipeworks_button_interm.png diff --git a/common.lua b/common.lua index 9be13d0..1ee734f 100755 --- a/common.lua +++ b/common.lua @@ -129,15 +129,17 @@ function fs_helpers.cycling_button(meta, base, meta_name, values) local val = values[current_value + 1] local text local texture_name = nil + local addopts = nil --when we get a table, we know the caller wants an image_button if type(val) == "table" then text = val["text"] texture_name = val["texture"] + addopts = val["addopts"] else text = val end local field = "fs_helpers_cycling:"..new_value..":"..meta_name - return base..";"..(texture_name and texture_name..";" or "")..field..";"..minetest.formspec_escape(text).."]" + return base..";"..(texture_name and texture_name..";" or "")..field..";"..minetest.formspec_escape(text)..(addopts and ";"..addopts or "").."]" end --------- diff --git a/textures/pipeworks_button_interm.png b/textures/pipeworks_button_interm.png new file mode 100644 index 0000000000000000000000000000000000000000..7541a2e01870e015d45881fb0ca72db13190082f GIT binary patch literal 5770 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 DT0i6; literal 0 HcmV?d00001 diff --git a/tubes.lua b/tubes.lua index 39323a2..1afe237 100755 --- a/tubes.lua +++ b/tubes.lua @@ -253,7 +253,7 @@ if pipeworks.enable_mese_tube then for i = 0, 5 do buttons_formspec = buttons_formspec .. fs_helpers.cycling_button(meta, "image_button[7,"..(i)..";1,1", "l"..(i+1).."s", - {{text="",texture="pipeworks_button_off.png"}, {text="",texture="pipeworks_button_on.png"}}) + {{text="",texture="pipeworks_button_off.png", addopts="false;false;pipeworks_button_interm.png"}, {text="",texture="pipeworks_button_on.png", addopts="false;false;pipeworks_button_interm.png"}}) end meta:set_string("formspec", "size[8,11]"..