MTSR/xdecor-libre
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Improved Work Table formspec (with more shapes to cut and storage)

Browse Source
This commit is contained in:
jp 2015-08-22 18:24:00 +02:00
parent f0b023225b
commit c35ed36b53
3 changed files with 81 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -9,4 +9,4 @@
##### Special thanks to Gambit for the textures from PixelBox ##### ##### Special thanks to Gambit for the textures from PixelBox #####
![Preview](http://i.imgur.com/q892y2g.png) ![Preview](http://i.imgur.com/q892y2g.png)
![Preview2](http://i.imgur.com/4G5gIZs.png) ![Preview2](http://i.imgur.com/w9jIRrg.png)

BIN
textures/hammer_layout.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 B

102
worktable.lua
View File

@ -1,4 +1,6 @@
local worktable = {} local worktable = {}
local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots
local concat = table.concat
local material = { local material = {
"cloud", -- Only used for the formspec display. "cloud", -- Only used for the formspec display.
@ -17,33 +19,75 @@ local def = { -- Node name, nodebox shape.
{"nanoslab", {-.5,-.5,-.5,0,-.4375,0}}, {"nanoslab", {-.5,-.5,-.5,0,-.4375,0}},
{"micropanel", {-.5,-.5,-.5,.5,-.4375,0}}, {"micropanel", {-.5,-.5,-.5,.5,-.4375,0}},
{"microslab", {-.5,-.5,-.5,.5,-.4375,.5}}, {"microslab", {-.5,-.5,-.5,.5,-.4375,.5}},
{"thinstair", {{-.5,-.0625,-.5,.5,0,0},{-.5,.4375,0,.5,.5,.5}}},
{"cube", {-.5,-.5,0,0,0,.5}},
{"panel", {-.5,-.5,-.5,.5,0,0}}, {"panel", {-.5,-.5,-.5,.5,0,0}},
{"slab", {-.5,-.5,-.5,.5,0,.5}}, {"slab", {-.5,-.5,-.5,.5,0,.5}},
{"doublepanel", {{-.5,-.5,-.5,.5,0,0},{-.5,0,0,.5,.5,.5}}},
{"halfstair", {{-.5,-.5,-.5,0,0,.5},{-.5,0,0,0,.5,.5}}},
{"outerstair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,0,.5,.5}}}, {"outerstair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,0,.5,.5}}},
{"stair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5}}}, {"stair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5}}},
{"innerstair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5},{-.5,0,-.5,0,.5,0}}} {"innerstair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5},{-.5,0,-.5,0,.5,0}}}
} }
function worktable.crafting(pos)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local f = {"size[8,7;]"..xbg..
"list[current_player;main;0,3.3;8,4;]"..
"image[5,1;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
"list[current_player;craft;2,0;3,3;]"..
"list[current_player;craftpreview;6,1;1,1;]"}
local formspec = concat(f)
return formspec
end
function worktable.storage(pos)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local f = "size[8,7]"..xbg..
"list[context;storage;0,0;8,2;]list[current_player;main;0,3.25;8,4;]"
inv:set_size("storage", 8*2)
return f
end
function worktable.construct(pos) function worktable.construct(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local row1, row2, row3 = {}, {}, {}
local nodebtn = {} for i = 1, 4 do
for i = 1, #def do row1[#row1+1] = "item_image_button["..(i-1)..
nodebtn[#nodebtn+1] = "item_image_button["..(i-1).. ",0;1,1;xdecor:"..def[i][1].."_cloud;"..def[i][1]..";]"
",0.5;1,1;xdecor:"..def[i][1].."_cloud;"..def[i][1]..";]"
end end
nodebtn = table.concat(nodebtn) row1 = concat(row1)
for j = 5, 8 do
row2[#row2+1] = "item_image_button["..(j-5)..
",1;1,1;xdecor:"..def[j][1].."_cloud;"..def[j][1]..";]"
end
row2 = concat(row2)
for k = 9, 12 do
row3[#row3+1] = "item_image_button["..(k-9)..
",2;1,1;xdecor:"..def[k][1].."_cloud;"..def[k][1]..";]"
end
row3 = concat(row3)
local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots local fs = {"size[8,7;]"..xbg..
meta:set_string("formspec", "size[8,7;]"..xbg.. row1..row2..row3..
"label[0,0;Cut your material into...]"..nodebtn.. "label[4,1.23;Cut]".."box[3.95,1;1.05,0.9;#555555]"..
"label[0,1.5;Input]".."list[current_name;input;0,2;1,1;]".. "label[4,2.23;Repair]".."box[3.95,2;1.05,0.9;#555555]"..
"image[1,2;1,1;xdecor_saw.png]".. "image[6,1;1,1;xdecor_saw.png]".."image[6,2;1,1;xdecor_anvil.png]"..
"label[2,1.5;Output]".."list[current_name;output;2,2;1,1;]".. "image[7,2;1,1;hammer_layout.png]"..
"label[5,1.5;Tool]".."list[current_name;tool;5,2;1,1;]".. "list[current_name;input;5,1;1,1;]".."list[current_name;output;7,1;1,1;]"..
"image[6,2;1,1;xdecor_anvil.png]".. "list[current_name;tool;5,2;1,1;]".."list[current_name;hammer;7,2;1,1;]"..
"label[6.8,1.5;Hammer]".."list[current_name;hammer;7,2;1,1;]".. "button[4,0;2,1;craft;Crafting]"..
"list[current_player;main;0,3.25;8,4;]") "button[6,0;2,1;storage;Storage]"..
"list[current_player;main;0,3.25;8,4;]"}
local formspec = concat(fs)
meta:set_string("formspec", formspec)
meta:set_string("infotext", "Work Table") meta:set_string("infotext", "Work Table")
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -53,7 +97,7 @@ function worktable.construct(pos)
inv:set_size("hammer", 1) inv:set_size("hammer", 1)
end end
function worktable.fields(pos, _, fields, _) function worktable.fields(pos, _, fields, sender)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
local inputstack = inv:get_stack("input", 1) local inputstack = inv:get_stack("input", 1)
@ -76,13 +120,21 @@ function worktable.fields(pos, _, fields, _)
inv:set_stack("input", 1, inputstack) inv:set_stack("input", 1, inputstack)
end end
end end
if fields["storage"] then
local player = sender:get_player_name()
minetest.show_formspec(player, "xdecor:worktable", worktable.storage(pos))
end
if fields["craft"] then
local player = sender:get_player_name()
minetest.show_formspec(player, "xdecor:worktable", worktable.crafting(pos))
end
end end
function worktable.anz(n) function worktable.anz(n)
if n == "nanoslab" or n == "micropanel" then return 16 if n == "nanoslab" or n == "micropanel" then return 16
elseif n == "microslab" then return 8 elseif n == "microslab" or n == "thinstair" then return 8
elseif n == "panel" then return 4 elseif n == "panel" or n == "cube" then return 4
elseif n == "slab" then return 2 elseif n == "slab" or n == "halfstair" or n == "doublepanel" then return 2
else return 1 end else return 1 end
end end
@ -91,7 +143,8 @@ function worktable.dig(pos, _)
local inv = meta:get_inventory() local inv = meta:get_inventory()
if not inv:is_empty("input") or not inv:is_empty("output") or not if not inv:is_empty("input") or not inv:is_empty("output") or not
inv:is_empty("hammer") or not inv:is_empty("tool") then inv:is_empty("hammer") or not inv:is_empty("tool") or not
inv:is_empty("storage") then
return false return false
end end
return true return true
@ -100,7 +153,7 @@ end
function worktable.put(_, listname, _, stack, _) function worktable.put(_, listname, _, stack, _)
local stackname = stack:get_name() local stackname = stack:get_name()
local count = stack:get_count() local count = stack:get_count()
local mat = table.concat(material) local mat = concat(material)
if listname == "output" then return 0 end if listname == "output" then return 0 end
if listname == "input" then if listname == "input" then
@ -120,6 +173,11 @@ function worktable.put(_, listname, _, stack, _)
return count return count
end end
function worktable.move(_, from_list, _, to_list, _, count, _)
if from_list == "storage" and to_list == "storage" then
return count else return 0 end
end
xdecor.register("worktable", { xdecor.register("worktable", {
description = "Work Table", description = "Work Table",
groups = {cracky=2, choppy=2}, groups = {cracky=2, choppy=2},
@ -133,7 +191,7 @@ xdecor.register("worktable", {
on_construct = worktable.construct, on_construct = worktable.construct,
on_receive_fields = worktable.fields, on_receive_fields = worktable.fields,
allow_metadata_inventory_put = worktable.put, allow_metadata_inventory_put = worktable.put,
allow_metadata_inventory_move = function(_,_,_,_,_,_,_) return 0 end allow_metadata_inventory_move = worktable.move
}) })
local function description(m, w) local function description(m, w)