mtcontrib/banners
1
0
Fork 1
mirror of https://github.com/pandorabox-io/banners.git synced 2025-07-03 08:40:37 +02:00
Code Issues Releases Wiki Activity

Compare commits

base: mtcontrib:readExistingBanner
Branches Tags
mtcontrib:master mtcontrib:fixModel mtcontrib:readExistingBanner nalc:nalc-1.2-dev nalc:master
nalc:nalc-1.0
..
compare: nalc:master
Branches Tags
nalc:nalc-1.2-dev nalc:master mtcontrib:master mtcontrib:fixModel mtcontrib:readExistingBanner
nalc:nalc-1.0

1 Commits
readExisti ... master

Author SHA1 Message Date
sys4-fr
13e686e827 Ajout message de chargement du mod dans le journal "action" 2018-12-24 03:02:25 +01:00
13 changed files with 1063 additions and 1254 deletions
Expand all files Collapse all files

10
.github/workflows/luacheck.yml vendored
View File

@ -1,10 +0,0 @@
name: luacheck
on: [push, pull_request]
jobs:
luacheck:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- name: Luacheck
uses: lunarmodules/luacheck@master

14
.luacheckrc
View File

@ -1,14 +0,0 @@
globals = {
"banners",
"smartfs",
}
read_globals = {
"core",
"dump",
"factions",
"inventory_plus",
["table"] = { fields = { "insert_all" } },
"unified_inventory",
"vector",
}

4
README.md
View File

@ -1,4 +1,4 @@
###Banners mod for Luanti (formerly Minetest) ###Banners mod for Minetest
This is a banner mod for Luanti. This is the banner mod for minetest.
The source code is licensed under GPLv3, and the game assets are licensed under Creative Commons 0 (CC0, [https://wiki.creativecommons.org/wiki/CC0](see here)). The source code is licensed under GPLv3, and the game assets are licensed under Creative Commons 0 (CC0, [https://wiki.creativecommons.org/wiki/CC0](see here)).

53
chatcommands.lua
View File

@ -1,53 +0,0 @@
-- Due to some engine troubles there are sometimes stray
-- banner entities and more rarely there are banner nodes without entities.
-- Calling this command fixes both situations.
core.register_chatcommand("banners_fix", {
description = "recreates the banner-visuals in your area",
func = function(name)
local player = core.get_player_by_name(name)
if not player then
return
end
local pos = player:get_pos()
local t1 = core.get_us_time()
local radius = 10
local entity_count = 0
local objects = core.get_objects_inside_radius(pos, radius)
for _, v in ipairs(objects) do
local e = v:get_luaentity()
if e and e.name == "banners:banner_ent" then
entity_count = entity_count + 1
v:remove()
end
end
local pos1 = vector.subtract(pos, radius)
local pos2 = vector.add(pos, radius)
local nodes = {
"banners:wooden_banner",
"banners:steel_banner",
}
if core.get_modpath("factions") then
table.insert_all(nodes, {
"banners:power_banner",
"banners:death_banner",
})
end
local pos_list = core.find_nodes_in_area(pos1, pos2, nodes)
for _, node_pos in ipairs(pos_list) do
core.add_entity(node_pos, "banners:banner_ent")
end
local t2 = core.get_us_time()
local diff = t2 - t1
local millis = diff / 1000
return true, "Removed " .. entity_count .. " banner entities and restored "
.. #pos_list .. " banners in " .. millis .. " ms"
end
})

53
crafts.lua
View File

@ -1,73 +1,78 @@
-- craft recipes -- craft recipes
minetest.register_craft( -- wooden flag pole
-- wooden flag pole {
core.register_craft({
output = "banners:wooden_pole 1", output = "banners:wooden_pole 1",
recipe = { recipe = {
{"", "", "default:stick"}, {"", "", "default:stick"},
{"", "default:stick", ""}, {"", "default:stick", ""},
{"default:stick", "", ""} {"default:stick", "", ""}
} }
}) }
)
-- steel flag pole minetest.register_craft( -- steel flag pole
core.register_craft({ {
output = "banners:steel_pole 1", output = "banners:steel_pole 1",
recipe = { recipe = {
{"", "", "default:steel_ingot"}, {"", "", "default:steel_ingot"},
{ "default:stick", "default:steel_ingot", "default:stick" }, {"", "default:steel_ingot", ""},
{"default:steel_ingot", "", ""} {"default:steel_ingot", "", ""}
} }
}) }
)
-- wooden flag support base minetest.register_craft( -- wooden flag support base
core.register_craft({ {
output = "banners:wooden_base 1", output = "banners:wooden_base 1",
recipe = { recipe = {
{"", "default:stick", ""}, {"", "default:stick", ""},
{"default:stick", "", "default:stick"}, {"default:stick", "", "default:stick"},
{"group:wood", "group:wood", "group:wood"} {"group:wood", "group:wood", "group:wood"}
} }
}) }
)
-- steel support minetest.register_craft( -- steel support
core.register_craft({ {
output = "banners:steel_base", output = "banners:steel_base",
recipe = { recipe = {
{"", "default:steel_ingot", ""}, {"", "default:steel_ingot", ""},
{"default:steel_ingot", "", "default:steel_ingot"}, {"default:steel_ingot", "", "default:steel_ingot"},
{"", "default:steelblock", ""} {"", "default:steelblock", ""}
} }
}) }
)
-- banner sheet minetest.register_craft( -- banner sheet
core.register_craft({ {
output = "banners:banner_sheet 1", output = "banners:banner_sheet 1",
recipe = { recipe = {
{"", "", ""}, {"", "", ""},
{"farming:cotton", "farming:cotton", "farming:cotton"}, {"farming:cotton", "farming:cotton", "farming:cotton"},
{"farming:cotton", "farming:cotton", "farming:cotton"} {"farming:cotton", "farming:cotton", "farming:cotton"}
} }
}) }
)
-- wooden support minetest.register_craft( -- wooden support
core.register_craft({ {
output = "banners:wooden_banner 1", output = "banners:wooden_banner 1",
recipe = { recipe = {
{"", "banners:banner_sheet", ""}, {"", "banners:banner_sheet", ""},
{"", "banners:wooden_pole", ""}, {"", "banners:wooden_pole", ""},
{"", "banners:wooden_base", ""} {"", "banners:wooden_base", ""}
} }
}) }
)
-- steel support minetest.register_craft( -- steel support
core.register_craft({ {
output = "banners:steel_banner 1", output = "banners:steel_banner 1",
recipe = { recipe = {
{"", "banners:banner_sheet", ""}, {"", "banners:banner_sheet", ""},
{"", "banners:steel_pole", ""}, {"", "banners:steel_pole", ""},
{"", "banners:steel_base", ""} {"", "banners:steel_base", ""}
} }
}) }
)

2
depends.txt Normal file
View File

@ -0,0 +1,2 @@
default
farming

1
description.txt Normal file
View File

@ -0,0 +1 @@
Adds customisable banners.

120
factions.lua
View File

@ -1,43 +1,43 @@
banners.power_per_banner = 10. banners.power_per_banner = 10.
-- items -- items
core.register_craftitem("banners:golden_finial", { minetest.register_craftitem("banners:golden_finial", {
groups = {}, groups = {},
description = "Golden finial", description = "Golden finial",
inventory_image = "gold_finial.png", inventory_image = "gold_finial.png",
}) })
core.register_craftitem("banners:silver_pole", { minetest.register_craftitem("banners:silver_pole", {
groups = {}, groups = {},
description = "Silver pole", description = "Silver pole",
inventory_image = "silver_pole.png" inventory_image = "silver_pole.png"
}) })
core.register_craftitem("banners:power_pole", { minetest.register_craftitem("banners:power_pole", {
groups = {}, groups = {},
description = "Power pole", description = "Power pole",
inventory_image = "power_pole.png" inventory_image = "power_pole.png"
}) })
core.register_craftitem("banners:golden_sheet", { minetest.register_craftitem("banners:golden_sheet", {
groups = {}, groups = {},
description = "Golden sheet", description = "Golden sheet",
inventory_image = "golden_sheet.png" inventory_image = "golden_sheet.png"
}) })
core.register_craftitem("banners:death_pole", { minetest.register_craftitem("banners:death_pole", {
groups = {}, groups = {},
description = "Death pole", description = "Death pole",
inventory_image = "death_pole.png" inventory_image = "death_pole.png"
}) })
core.register_craftitem("banners:death_sheet", { minetest.register_craftitem("banners:death_sheet", {
groups = {}, groups = {},
description = "Death sheet", description = "Death sheet",
inventory_image = "death_sheet.png" inventory_image = "death_sheet.png"
}) })
core.register_craftitem("banners:death_base", { minetest.register_craftitem("banners:death_base", {
groups = {}, groups = {},
description = "Death base", description = "Death base",
inventory_image = "death_base.png" inventory_image = "death_base.png"
@ -46,99 +46,107 @@ core.register_craftitem("banners:death_base", {
-- crafts -- crafts
-- silver flag pole minetest.register_craft( -- silver flag pole
core.register_craft({ {
output = "banners:silver_pole 1", output = "banners:silver_pole 1",
recipe = { recipe = {
{"", "", "moreores:silver_ingot"}, {"", "", "moreores:silver_ingot"},
{"", "moreores:silver_ingot", ""}, {"", "moreores:silver_ingot", ""},
{"moreores:silver_ingot", "", ""} {"moreores:silver_ingot", "", ""}
} }
}) }
)
-- death flag pole minetest.register_craft( -- death flag pole
core.register_craft({ {
output = "banners:death_pole 1", output = "banners:death_pole 1",
recipe = { recipe = {
{"", "", "default:diamond"}, {"", "", "default:diamond"},
{"", "default:obsidian", ""}, {"", "default:obsidian", ""},
{"default:obsidian", "", ""} {"default:obsidian", "", ""}
} }
}) }
)
-- golden finial minetest.register_craft( -- golden finial
core.register_craft({ {
output = "banners:golden_finial", output = "banners:golden_finial",
recipe = { recipe = {
{"", "default:gold_ingot", "default:gold_ingot"}, {"", "default:gold_ingot", "default:gold_ingot"},
{"", "default:gold_ingot", "default:gold_ingot"}, {"", "default:gold_ingot", "default:gold_ingot"},
{"default:gold_ingot", "", ""} {"default:gold_ingot", "", ""}
} }
}) }
)
-- power flag pole minetest.register_craft( -- power flag pole
core.register_craft({ {
output = "banners:power_pole 1", output = "banners:power_pole 1",
recipe = { recipe = {
{"", "", ""}, {"", "", ""},
{"", "banners:golden_finial", ""}, {"", "banners:golden_finial", ""},
{"banners:silver_pole", "", ""} {"banners:silver_pole", "", ""}
} }
}) }
)
-- golden sheet minetest.register_craft( -- golden sheet
core.register_craft({ {
output = "banners:golden_sheet 1", output = "banners:golden_sheet 1",
type = "shapeless", type = "shapeless",
recipe = { "default:gold_ingot", "banners:banner_sheet"} recipe = { "default:gold_ingot", "banners:banner_sheet"}
}) }
)
-- death sheet minetest.register_craft( -- death sheet
core.register_craft({ {
output = "banners:death_sheet 1", output = "banners:death_sheet 1",
type = "shapeless", type = "shapeless",
recipe = { "default:obsidian", "banners:banner_sheet"} recipe = { "default:obsidian", "banners:banner_sheet"}
}) }
)
-- death sheet minetest.register_craft( -- death sheet
core.register_craft({ {
output = "banners:death_base 1", output = "banners:death_base 1",
recipe = { recipe = {
{"", "", ""}, {"", "", ""},
{"", "banners:steel_base", ""}, {"", "banners:steel_base", ""},
{"default:obsidian", "default:obsidian", "default:obsidian"} {"default:obsidian", "default:obsidian", "default:obsidian"}
} }
}) }
)
-- power banner minetest.register_craft( -- power banner
core.register_craft({ {
output = "banners:power_banner", output = "banners:power_banner",
recipe = { recipe = {
{"", "banners:golden_sheet", ""}, {"", "banners:golden_sheet", ""},
{"", "banners:power_pole", ""}, {"", "banners:power_pole", ""},
{"", "banners:steel_base", ""} {"", "banners:steel_base", ""}
} }
}) }
)
-- death banner minetest.register_craft( -- death banner
core.register_craft({ {
output = "banners:death_banner", output = "banners:death_banner",
recipe = { recipe = {
{"", "banners:death_sheet", ""}, {"", "banners:death_sheet", ""},
{"", "banners:death_pole", ""}, {"", "banners:death_pole", ""},
{"", "banners:death_base", ""} {"", "banners:death_base", ""}
} }
}) }
)
-- nodes -- nodes
core.register_node("banners:power_banner", { minetest.register_node("banners:power_banner", {
drawtype = "mesh", drawtype = "mesh",
mesh = "banner_support.x", mesh = "banner_support.x",
tiles = {"gold_support.png"}, tiles = {"gold_support.png"},
description = "Power Banner", description = "Power Banner",
groups = {cracky=3}, groups = {cracky=3},
is_ground_content = false,
diggable = true, diggable = true,
stack_max = 1, stack_max = 1,
paramtype = "light", paramtype = "light",
@ -150,10 +158,10 @@ core.register_node("banners:power_banner", {
banners.banner_on_destruct(pos) banners.banner_on_destruct(pos)
end, end,
on_dig = function(pos, n, p) on_dig = function(pos, n, p)
if core.is_protected(pos, p:get_player_name()) then if minetest.is_protected(pos, p:get_player_name()) then
return return
end end
local meta = core.get_meta(pos) local meta = minetest.get_meta(pos)
local facname = meta:get_string("faction") local facname = meta:get_string("faction")
if facname then if facname then
local faction = factions.factions[facname] local faction = factions.factions[facname]
@ -165,13 +173,12 @@ core.register_node("banners:power_banner", {
end, end,
}) })
core.register_node("banners:death_banner", { minetest.register_node("banners:death_banner", {
drawtype = "mesh", drawtype = "mesh",
mesh = "banner_support.x", mesh = "banner_support.x",
tiles = {"death_uv.png"}, tiles = {"death_uv.png"},
description = "Death Banner", description = "Death Banner",
groups = {cracky=3}, groups = {cracky=3},
is_ground_content = false,
diggable = true, diggable = true,
stack_max = 1, stack_max = 1,
paramtype = "light", paramtype = "light",
@ -182,12 +189,11 @@ core.register_node("banners:death_banner", {
on_destruct = function(pos) on_destruct = function(pos)
banners.banner_on_destruct(pos) banners.banner_on_destruct(pos)
end, end,
-- (pos, node, player) on_dig = function(pos, n, p)
on_dig = function(pos, _, player) if minetest.is_protected(pos, p:get_player_name()) then
if core.is_protected(pos, player:get_player_name()) then
return return
end end
local meta = core.get_meta(pos) local meta = minetest.get_meta(pos)
local defending_facname = meta:get_string("faction") local defending_facname = meta:get_string("faction")
local parcelpos = factions.get_parcel_pos(pos) local parcelpos = factions.get_parcel_pos(pos)
if defending_facname then if defending_facname then
@ -196,36 +202,34 @@ core.register_node("banners:death_banner", {
faction:stop_attack(parcelpos) faction:stop_attack(parcelpos)
end end
end end
core.remove_node(pos) minetest.remove_node(pos)
end, end,
}) })
-- (pos, player, itemstack, pointed_thing) banners.after_powerbanner_placed = function(pos, player, itemstack, pointed_thing)
banners.after_powerbanner_placed = function(pos, player, _, pointed_thing) minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
core.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
local faction = factions.players[player:get_player_name()] local faction = factions.players[player:get_player_name()]
if not faction then if not faction then
core.get_meta(pos):set_string("banner", "bg_white.png") minetest.get_meta(pos):set_string("banner", "bg_white.png")
else else
local banner_string = factions.factions[faction].banner local banner_string = factions.factions[faction].banner
core.get_meta(pos):set_string("banner", banner_string) minetest.get_meta(pos):set_string("banner", banner_string)
core.get_meta(pos):set_string("faction", faction) minetest.get_meta(pos):set_string("faction", faction)
factions.factions[faction]:increase_maxpower(banners.power_per_banner) factions.factions[faction]:increase_maxpower(banners.power_per_banner)
end end
core.add_entity(pos, "banners:banner_ent") minetest.add_entity(pos, "banners:banner_ent")
end end
-- (pos, player, itemstack, pointed_thing) banners.after_deathbanner_placed = function(pos, player, itemstack, pointed_thing)
banners.after_deathbanner_placed = function(pos, player, _, pointed_thing) minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
core.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
local attacking_faction = factions.players[player:get_player_name()] local attacking_faction = factions.players[player:get_player_name()]
if attacking_faction then if attacking_faction then
local parcelpos = factions.get_parcel_pos(pos) local parcelpos = factions.get_parcel_pos(pos)
attacking_faction = factions.factions[attacking_faction] attacking_faction = factions.factions[attacking_faction]
attacking_faction:attack_parcel(parcelpos) attacking_faction:attack_parcel(parcelpos)
core.get_meta(pos):set_string("faction", attacking_faction.name) minetest.get_meta(pos):set_string("faction", attacking_faction.name)
end end
core.get_meta(pos):set_string("banner", "death_uv.png") minetest.get_meta(pos):set_string("banner", "death_uv.png")
core.add_entity(pos, "banners:banner_ent") minetest.add_entity(pos, "banners:banner_ent")
end end

311
init.lua
View File

@ -1,9 +1,6 @@
local MP = core.get_modpath("banners") .. "/" dofile(minetest.get_modpath("banners").."/smartfs.lua")
dofile(MP .. "smartfs.lua")
banners = { banners = {}
version = 20241129.1232
}
banners.masks = { banners.masks = {
"bend_left", "bend_left_outline", "bend_left", "bend_left_outline",
@ -31,15 +28,6 @@ banners.masks = {
"star_chevron", "checkered_8_4", "checkered_16_8" "star_chevron", "checkered_8_4", "checkered_16_8"
} }
-- It is now unlikely for the server to crash from too long
-- history since we now trim out garbage when converting to
-- metadata. This limit is now just to avoid run-time
-- memory bloat.
banners.max_undo_levels = 256
-- cache of player histories
local histories = {}
banners.colors = { banners.colors = {
"black", "cyan", "green", "white", "black", "cyan", "green", "white",
"blue", "darkblue", "red", "yellow", "blue", "darkblue", "red", "yellow",
@ -47,91 +35,58 @@ banners.colors = {
"brown", "darkbrown" "brown", "darkbrown"
} }
local valid_masks = {} banners.base_transform = ({texture = "bg_white.png",
local valid_colors = {} mask="mask_background.png"})
do
local i, s
i = #banners.masks
repeat
s = banners.masks[i]
valid_masks[s .. ".png"] = true
i = i - 1
until i == 0
i = #banners.colors banners.creation_form_func = function(state)
repeat
s = banners.colors[i]
valid_colors["bg_" .. s .. ".png"] = true
i = i - 1
until i == 0
end
banners.base_transform = {
texture = "bg_white.png",
mask = "mask_background.png"
}
function banners.creation_form_func(state)
-- helper functions -- helper functions
function state:update_player_inv(transform_string) state.update_player_inv = function(self)
local player = core.get_player_by_name(self.player) local player = minetest.get_player_by_name(self.player)
local newbanner = player:get_wielded_item() local newbanner = player:get_wielded_item()
newbanner:get_meta():set_string("", transform_string) newbanner:set_metadata(state.banner:get_transform_string())
player:set_wielded_item(newbanner) player:set_wielded_item(newbanner)
end end
function state:update_preview(transform_string) state.update_preview = function(self)
self:get("banner_preview"):setImage(transform_string) self:get("banner_preview"):setImage(self.banner:get_transform_string())
self:get("color_indicator"):setImage(self.current_color) self:get("color_indicator"):setImage(self.current_color)
end end
function state:update_preview_inv() state.update_all = function(self)
local transform_string = self.banner:get_transform_string() self:update_preview()
self:update_preview(transform_string) self:update_player_inv()
self:update_player_inv(transform_string)
end end
if histories[state.player] then
-- initialize with saved history
state.banner = histories[state.player]
else
-- initialize with empty banner -- initialize with empty banner
state.banner = banners.Banner:new(nil) state.banner = banners.Banner:new(nil)
state.banner:push_transform(banners.base_transform) state.banner:push_transform(banners.base_transform)
histories[state.player] = state.banner state.current_color = "bg_white.png"
end
state.banner:read_item(state.player)
state.current_color = state.banner.color
state:size(20,10) state:size(20,10)
state:image(3, 0.4, 4, 2, "banner_preview", nil) state:image(3, 0.4, 4, 2, "banner_preview", nil)
state:image(2.4, 0.8, 0.7, 0.7, "color_indicator", state.current_color) state:image(2.4, 0.8, 0.7, 0.7, "color_indicator", state.current_color)
state:update_preview_inv() state:update_all()
-- color indicator -- color indicator
-- undo button -- undo button
state:button(0.5, 0.3, 2, 1, "undo", "Undo"):click(function(_, state2) state:button(0.5, 0.3, 2, 1, "undo", "Undo"):click(function(self, state)
if #state2.banner.transforms > 1 then if #state.banner.transforms > 1 then
state2.banner:pop_transform() state.banner:pop_transform()
state2:update_preview_inv() state:update_all()
end end
end) end)
-- delete button -- delete button
state:button(0.5, 1.3, 2, 1, "delete", "Delete"):click(function(_, state2) state:button(0.5, 1.3, 2, 1, "delete", "Delete"):click(function(self, state)
state2.banner.transforms = { banners.base_transform } state.banner.transforms = {banners.base_transform}
state2:update_preview_inv() state:update_all()
end) end)
-- add banners colors -- add banners colors
local x = 7 local x = 7
local y = .3 local y = .3
for _, color in ipairs(banners.colors) do for i in ipairs(banners.colors) do
local b = state:button(x, y, 1, 1, color, "") local b = state:button(x, y, 1, 1, banners.colors[i], "")
b:setImage("bg_" .. color .. ".png") b:setImage("bg_"..banners.colors[i]..".png")
b:click(function(self, state2) b:click(function(self, state)
state2.current_color = "bg_" .. self.name .. ".png" state.current_color = "bg_"..self.name..".png"
state2:get("color_indicator"):setImage(state2.current_color) state:update_preview()
state2.banner.color = state2.current_color -- todo: update masks or something
-- update masks
for _, mask in ipairs(banners.masks) do
state2:get(mask):setImage("(" .. state2.current_color
.. "^[mask:" .. mask .. ".png^[makealpha:0,0,0)")
end end
end) )
x = x + 1 x = x + 1
if x > 19 then if x > 19 then
y = y + 1 y = y + 1
@ -139,19 +94,16 @@ function banners.creation_form_func(state)
end end
end end
-- add banners buttons -- add banners buttons
x = 1 local x = 1
y = 3 local y = 3
for _, mask in ipairs(banners.masks) do for i in ipairs(banners.masks) do
local b = state:button(x, y, 2, 1, mask, "") local b = state:button(x, y, 2, 1, banners.masks[i], "")
b:setImage("(" .. state.current_color b:setImage(banners.masks[i]..".png")
.. "^[mask:" .. mask .. ".png^[makealpha:0,0,0)") b:click(function(self, state)
b:click(function(self, state2) state.banner:push_transform({texture=state.current_color, mask=self.name..".png"})
state2.banner:push_transform({ state:update_all()
texture = state2.current_color, end
mask = self.name .. ".png" )
})
state2:update_preview_inv()
end)
x = x + 2 x = x + 2
if x > 17.5 then if x > 17.5 then
y = y + 1 y = y + 1
@ -162,132 +114,61 @@ function banners.creation_form_func(state)
end end
banners.creation_form = smartfs.create("banners:banner_creation", banners.creation_form = smartfs.create("banners:banner_creation",
banners.creation_form_func) banners.creation_form_func);
function banners.transform_string_to_table(transform_string)
local mask, parts, texture
local transforms = {}
for part in transform_string:gmatch("%(([^%)]+)%)") do
parts = part:split("^[")
if 3 == #parts then
texture = parts[1]
mask = parts[2]:sub(6)
if valid_masks[mask] and valid_colors[texture] then
table.insert(transforms, {
texture = texture,
mask = mask
})
end
end
end
return transforms
end
function banners.transform_table_to_string(transforms)
local i = #transforms
if 0 == i then return "" end
local final = {}
local used = {}
local transform
-- work backwards to keep resulting data small
repeat
transform = transforms[i]
-- duplicate mask can be trimmed out only use most recent
if not used[transform.mask] then
used[transform.mask] = true
table.insert(final, 1, "(" .. transform.texture
.. "^[mask:" .. transform.mask .. "^[makealpha:0,0,0)")
-- anything before a background is fully covered
if "mask_background.png" == transform.mask then
break
end
end
i = i - 1
until i == 0
return table.concat(final, "^")
end
-- banner definition -- banner definition
banners.Banner = {} banners.Banner = {
transforms = {}
}
function banners.Banner:new(banner) function banners.Banner:new(banner)
banner = banner or { color = "bg_black.png", transforms = {} } banner = banner or {}
setmetatable(banner, self) setmetatable(banner, self)
self.__index = self self.__index = self
return banner return banner
end end
function banners.Banner.push_transform(self, transform)
function banners.Banner:push_transform(transform)
table.insert(self.transforms, transform) table.insert(self.transforms, transform)
if #self.transforms > banners.max_undo_levels then
table.remove(self.transforms, 1)
end end
end function banners.Banner.pop_transform(self)
function banners.Banner:pop_transform()
table.remove(self.transforms) table.remove(self.transforms)
end end
function banners.Banner.get_transform_string(self)
function banners.Banner:get_transform_string() local final = {}
return banners.transform_table_to_string(self.transforms) for i in ipairs(self.transforms) do
table.insert(final, "("..self.transforms[i].texture.."^[mask:"..self.transforms[i].mask.."^[makealpha:0,0,0)")
end end
local ret = table.concat(final, "^")
function banners.Banner:read_item(player_name) return ret
local player = core.get_player_by_name(player_name)
local item = player:get_wielded_item()
if "banners:" ~= item:get_name():sub(1, 8) then return end
local transforms = banners.transform_string_to_table(
item:get_meta():get_string(""))
local total = #transforms
if 0 == total then return end
local i = 1
repeat
self:push_transform(transforms[i])
i = i + 1
until i > total
end end
-- helper function for determining the flag's direction -- helper function for determining the flag's direction
-- (pos, pointed_thing) banners.determine_flag_direction = function(pos, pointed_thing)
function banners.determine_flag_direction(_, pointed_thing)
local above = pointed_thing.above local above = pointed_thing.above
local under = pointed_thing.under local under = pointed_thing.under
local dir = { local dir = {x = under.x - above.x,
x = under.x - above.x,
y = under.y - above.y, y = under.y - above.y,
z = under.z - above.z z = under.z - above.z}
} return minetest.dir_to_wallmounted(dir)
return core.dir_to_wallmounted(dir)
end end
-- (itemstack, player, pointed_thing) banners.banner_on_use = function(itemstack, player, pointed_thing)
function banners.banner_on_use(_, player)
if player.is_player then if player.is_player then
banners.creation_form:show(player:get_player_name()) banners.creation_form:show(player:get_player_name())
end end
end end
function banners.banner_on_dig(pos, node, player) banners.banner_on_dig = function(pos, node, player)
if not player or core.is_protected(pos, player:get_player_name()) then local meta = minetest.get_meta(pos)
return if player then
end
local meta = core.get_meta(pos)
local inventory = player:get_inventory() local inventory = player:get_inventory()
inventory:add_item("main", { inventory:add_item("main", {name=node.name, count=1, wear=0, metadata=meta:get_string("banner")})
name = node.name, end
count = 1, minetest.remove_node(pos)
wear = 0,
metadata = meta:get_string("banner")
})
core.remove_node(pos)
end end
-- (pos, node, player) banners.banner_on_destruct = function(pos, node, player)
function banners.banner_on_destruct(pos) local objects = minetest.get_objects_inside_radius(pos, 0.5)
local objects = core.get_objects_inside_radius(pos, 0.5)
for _,v in ipairs(objects) do for _,v in ipairs(objects) do
local e = v:get_luaentity() local e = v:get_luaentity()
if e and e.name == "banners:banner_ent" then if e and e.name == "banners:banner_ent" then
@ -296,29 +177,23 @@ function banners.banner_on_destruct(pos)
end end
end end
-- (pos, player, itemstack, pointed_thing) banners.banner_after_place = function (pos, player, itemstack, pointed_thing)
function banners.banner_after_place(pos, _, itemstack, pointed_thing) minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
core.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing) minetest.get_meta(pos):set_string("banner", itemstack:get_metadata())
local meta = core.get_meta(pos) minetest.add_entity(pos, "banners:banner_ent")
meta:set_string("banner", itemstack:get_meta():get_string(""))
meta:set_float("version", banners.version)
core.add_entity(pos, "banners:banner_ent")
end end
-- banner entity -- banner entity
local set_banner_texture
function banners:banner_on_activate() set_banner_texture = function (obj, texture)
local pos = self.object:get_pos() obj:set_properties({textures={"banner_uv_text.png^"..texture}})
local meta = core.get_meta(pos)
local banner = meta:get_string("banner")
-- cleanup meta of old banners
if meta:get_float("version") < 20241122 then
meta:set_float("version", banners.version)
banner = banners.transform_table_to_string(
banners.transform_string_to_table(banner))
meta:set_string("banner", banner)
end end
local banner_face = core.get_node(pos).param2
banners.banner_on_activate = function(self)
local pos = self.object:getpos()
local banner = minetest.get_meta(pos):get_string("banner")
local banner_face = minetest.get_node(pos).param2
local yaw = 0. local yaw = 0.
if banner_face == 2 then if banner_face == 2 then
yaw = 0. yaw = 0.
@ -329,28 +204,28 @@ function banners:banner_on_activate()
elseif banner_face == 3 then elseif banner_face == 3 then
yaw = 4.71238898038469 -- 3 * pi / 2 yaw = 4.71238898038469 -- 3 * pi / 2
end end
self.object:set_yaw(yaw) self.object:setyaw(yaw)
self.object:set_properties({ if banner then
textures = { "banner_uv_text.png^" .. banner } set_banner_texture(self.object, banner)
}) end
end end
core.register_entity("banners:banner_ent", { minetest.register_entity("banners:banner_ent",
initial_properties = { {
collisionbox = {0,0,0,0,0,0}, collisionbox = {0,0,0,0,0,0},
visual = "mesh", visual = "mesh",
textures = {"banner_uv_text"}, textures = {"banner_uv_text"},
mesh = "banner_pole.x", mesh = "banner_pole.x",
},
on_activate = banners.banner_on_activate, on_activate = banners.banner_on_activate,
}) }
)
if core.get_modpath("factions") then if minetest.get_modpath("factions") then
dofile(MP .. "factions.lua") dofile(minetest.get_modpath("banners").."/factions.lua")
end end
dofile(MP .. "items.lua") dofile(minetest.get_modpath("banners").."/items.lua")
dofile(MP .. "nodes.lua") dofile(minetest.get_modpath("banners").."/nodes.lua")
dofile(MP .. "crafts.lua") dofile(minetest.get_modpath("banners").."/crafts.lua")
dofile(MP .. "chatcommands.lua")
minetest.log("action", "[banners] loaded.")

31
items.lua
View File

@ -2,35 +2,44 @@
-- items -- items
core.register_craftitem("banners:banner_sheet", { minetest.register_craftitem("banners:banner_sheet",
{
groups = {}, groups = {},
description = "Banner sheet", description = "Banner sheet",
inventory_image = "banner_sheet.png", inventory_image = "banner_sheet.png",
stack_max = 1, stack_max = 1,
metadata = "", metadata = "",
}) }
)
core.register_craftitem("banners:wooden_pole", { minetest.register_craftitem("banners:wooden_pole",
{
groups = {}, groups = {},
description = "Wooden pole", description = "Wooden pole",
inventory_image = "wooden_pole.png" inventory_image = "wooden_pole.png"
}) }
)
core.register_craftitem("banners:wooden_base", { minetest.register_craftitem("banners:wooden_base",
{
groups = {}, groups = {},
description = "Wooden base", description = "Wooden base",
inventory_image = "wooden_base.png" inventory_image = "wooden_base.png"
}) }
)
core.register_craftitem("banners:steel_pole", { minetest.register_craftitem("banners:steel_pole",
{
groups = {}, groups = {},
description = "Steel pole", description = "Steel pole",
inventory_image = "steel_pole.png" inventory_image = "steel_pole.png"
}) }
)
core.register_craftitem("banners:steel_base", { minetest.register_craftitem("banners:steel_base",
{
groups = {}, groups = {},
description = "Steel base", description = "Steel base",
inventory_image = "steel_base.png" inventory_image = "steel_base.png"
}) }
)

4
mod.conf
View File

@ -1,4 +0,0 @@
name = banners
description = Adds customisable banners.
depends = default, farming
optional_depends = factions, inventory_plus, unified_inventory

14
nodes.lua
View File

@ -1,11 +1,11 @@
-- da wooden banner -- da wooden banner
core.register_node("banners:wooden_banner", { minetest.register_node("banners:wooden_banner",
{
drawtype = "mesh", drawtype = "mesh",
mesh = "banner_support.x", mesh = "banner_support.x",
tiles = {"banner_support.png"}, tiles = {"banner_support.png"},
description = "Wooden banner", description = "Wooden banner",
groups = {choppy=2, dig_immediate=2}, groups = {choppy=2, dig_immediate=2},
is_ground_content = false,
diggable = true, diggable = true,
stack_max = 1, stack_max = 1,
paramtype="light", paramtype="light",
@ -22,16 +22,17 @@ core.register_node("banners:wooden_banner", {
on_dig = function(pos, n, p) on_dig = function(pos, n, p)
banners.banner_on_dig(pos, n, p) banners.banner_on_dig(pos, n, p)
end end
}) }
)
-- steel banner -- steel banner
core.register_node("banners:steel_banner", { minetest.register_node("banners:steel_banner",
{
drawtype = "mesh", drawtype = "mesh",
mesh = "banner_support.x", mesh = "banner_support.x",
tiles = {"steel_support.png"}, tiles = {"steel_support.png"},
description = "Steel banner", description = "Steel banner",
groups = {cracky=2}, groups = {cracky=2},
is_ground_content = false,
diggable = true, diggable = true,
stack_max = 1, stack_max = 1,
paramtype = "light", paramtype = "light",
@ -49,5 +50,6 @@ core.register_node("banners:steel_banner", {
banners.banner_on_dig(pos, n, p) banners.banner_on_dig(pos, n, p)
end end
}) }
)

360
smartfs.lua
View File

@ -4,9 +4,6 @@
-- by Rubenwardy -- by Rubenwardy
--------------------------- ---------------------------
local has_inventory_plus = core.get_modpath("inventory_plus") and true or false
local has_unified_inventory = core.get_modpath("unified_inventory") and true or false
smartfs = { smartfs = {
_fdef = {}, _fdef = {},
_edef = {}, _edef = {},
@ -15,7 +12,7 @@ smartfs = {
} }
-- the smartfs() function -- the smartfs() function
function smartfs.__call(_, name) function smartfs.__call(self, name)
return smartfs._fdef[name] return smartfs._fdef[name]
end end
@ -40,7 +37,7 @@ function smartfs.override_load_checks()
smartfs._loaded_override = true smartfs._loaded_override = true
end end
core.after(0, function() minetest.after(0, function()
smartfs.loaded = true smartfs.loaded = true
end) end)
function smartfs.dynamic(name,player) function smartfs.dynamic(name,player)
@ -62,9 +59,9 @@ function smartfs.element(name, data)
end end
function smartfs.inventory_mod() function smartfs.inventory_mod()
if has_unified_inventory then if unified_inventory then
return "unified_inventory" return "unified_inventory"
elseif has_inventory_plus then elseif inventory_plus then
return "inventory_plus" return "inventory_plus"
else else
return nil return nil
@ -72,25 +69,24 @@ function smartfs.inventory_mod()
end end
function smartfs.add_to_inventory(form,icon,title) function smartfs.add_to_inventory(form,icon,title)
if has_unified_inventory then if unified_inventory then
unified_inventory.register_button(form.name, { unified_inventory.register_button(form.name, {
type = "image", type = "image",
image = icon, image = icon,
}) })
unified_inventory.register_page(form.name, { unified_inventory.register_page(form.name, {
-- (player, formspec) get_formspec = function(player, formspec)
get_formspec = function(player)
local name = player:get_player_name() local name = player:get_player_name()
local opened = smartfs._show_(form, name, nil, true) local opened = smartfs._show_(form, name, nil, true)
return {formspec = opened:_getFS_(false)} return {formspec = opened:_getFS_(false)}
end end
}) })
return true return true
elseif has_inventory_plus then elseif inventory_plus then
core.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
inventory_plus.register_button(player, form.name, title) inventory_plus.register_button(player, form.name, title)
end) end)
core.register_on_player_receive_fields(function(player, formname, fields) minetest.register_on_player_receive_fields(function(player, formname, fields)
if formname == "" and fields[form.name] then if formname == "" and fields[form.name] then
local name = player:get_player_name() local name = player:get_player_name()
local opened = smartfs._show_(form, name, nil, true) local opened = smartfs._show_(form, name, nil, true)
@ -124,35 +120,32 @@ function smartfs._makeState_(form, player, params, is_inv)
if self._size and size then if self._size and size then
res = "size["..self._size.w..","..self._size.h.."]" res = "size["..self._size.w..","..self._size.h.."]"
end end
for _, val in pairs(self._ele) do for key,val in pairs(self._ele) do
res = res .. val:build() res = res .. val:build()
end end
return res return res
end, end,
_show_ = function(self) _show_ = function(self)
if self.is_inv then if self.is_inv then
if has_unified_inventory then if unified_inventory then
unified_inventory.set_inventory_formspec( unified_inventory.set_inventory_formspec(minetest.get_player_by_name(self.player), self.def.name)
core.get_player_by_name(self.player), self.def.name) elseif inventory_plus then
elseif has_inventory_plus then inventory_plus.set_inventory_formspec(minetest.get_player_by_name(self.player), self:_getFS_(true))
inventory_plus.set_inventory_formspec(
core.get_player_by_name(self.player), self:_getFS_(true))
end end
else else
local res = self:_getFS_(true) local res = self:_getFS_(true)
core.show_formspec(player, form.name, res) minetest.show_formspec(player,form.name,res)
end end
end, end,
load = function(self, file_name) load = function(self,file)
local file = io.open(file_name, "r") local file = io.open(file, "r")
if file then if file then
local data = core.deserialize(file:read("*all")) local table = minetest.deserialize(file:read("*all"))
file:close() if type(table) == "table" then
if type(data) == "table" then if table.size then
if data.size then self._size = table.size
self._size = data.size
end end
for _, val in pairs(data.ele) do for key,val in pairs(table.ele) do
self:element(val.type,val) self:element(val.type,val)
end end
return true return true
@ -160,7 +153,7 @@ function smartfs._makeState_(form, player, params, is_inv)
end end
return false return false
end, end,
save = function(self, file_name) save = function(self,file)
local res = {ele={}} local res = {ele={}}
if self._size then if self._size then
@ -171,9 +164,9 @@ function smartfs._makeState_(form, player, params, is_inv)
res.ele[key] = val.data res.ele[key] = val.data
end end
local file = io.open(file_name, "w") local file = io.open(file, "w")
if file then if file then
file:write(core.serialize(res)) file:write(minetest.serialize(res))
file:close() file:close()
return true return true
end end
@ -190,92 +183,38 @@ function smartfs._makeState_(form, player, params, is_inv)
end, end,
button = function(self,x,y,w,h,name,text,exitf) button = function(self,x,y,w,h,name,text,exitf)
if exitf == nil then exitf = false end if exitf == nil then exitf = false end
return self:element("button", { return self:element("button",{pos={x=x,y=y},size={w=w,h=h},name=name,value=text,closes=exitf})
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = text,
closes = exitf
})
end, end,
label = function(self,x,y,name,text) label = function(self,x,y,name,text)
return self:element("label", { return self:element("label",{pos={x=x,y=y},name=name,value=text})
pos = { x = x, y = y },
name = name,
value = text
})
end, end,
toggle = function(self,x,y,w,h,name,list) toggle = function(self,x,y,w,h,name,list)
return self:element("toggle", { return self:element("toggle",{pos={x=x,y=y},size={w=w,h=h},name=name,id=1,list=list})
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
id = 1,
list = list
})
end, end,
field = function(self,x,y,w,h,name,label) field = function(self,x,y,w,h,name,label)
return self:element("field", { return self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label})
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = "",
label = label
})
end, end,
pwdfield = function(self,x,y,w,h,name,label) pwdfield = function(self,x,y,w,h,name,label)
local res = self:element("field", { local res = self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label})
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = "",
label = label
})
res:isPassword(true) res:isPassword(true)
return res return res
end, end,
textarea = function(self,x,y,w,h,name,label) textarea = function(self,x,y,w,h,name,label)
local res = self:element("field", { local res = self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label})
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = "",
label = label
})
res:isMultiline(true) res:isMultiline(true)
return res return res
end, end,
image = function(self,x,y,w,h,name,img) image = function(self,x,y,w,h,name,img)
return self:element("image", { return self:element("image",{pos={x=x,y=y},size={w=w,h=h},name=name,value=img})
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = img
})
end, end,
checkbox = function(self,x,y,name,label,selected) checkbox = function(self,x,y,name,label,selected)
return self:element("checkbox", { return self:element("checkbox",{pos={x=x,y=y},name=name,value=selected,label=label})
pos = { x = x, y = y },
name = name,
value = selected,
label = label
})
end, end,
listbox = function(self,x,y,w,h,name,selected,transparent) listbox = function(self,x,y,w,h,name,selected,transparent)
return self:element("list", { return self:element("list", { pos={x=x,y=y}, size={w=w,h=h}, name=name, selected=selected, transparent=transparent })
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
selected = selected,
transparent = transparent
})
end, end,
inventory = function(self,x,y,w,h,name) inventory = function(self,x,y,w,h,name)
return self:element("inventory", { return self:element("inventory", { pos={x=x,y=y}, size={w=w,h=h}, name=name })
pos = { x = x, y = y },
size = { w = w, h = h },
name = name
})
end, end,
element = function(self,typen,data) element = function(self,typen,data)
local type = smartfs._edef[typen] local type = smartfs._edef[typen]
@ -293,8 +232,8 @@ function smartfs._makeState_(form, player, params, is_inv)
name = data.name, name = data.name,
root = self, root = self,
data = data, data = data,
remove = function(self2) remove = function(self)
self2.root._ele[self2.name] = nil self.root._ele[self.name] = nil
end end
} }
@ -326,7 +265,7 @@ end
-- Receive fields from formspec -- Receive fields from formspec
local function _sfs_recieve_(state,name,fields) local function _sfs_recieve_(state,name,fields)
if fields.quit == "true" then if (fields.quit == "true") then
if not state.is_inv then if not state.is_inv then
smartfs.opened[name] = nil smartfs.opened[name] = nil
end end
@ -338,9 +277,9 @@ local function _sfs_recieve_(state, name, fields)
state._ele[key].data.value = val state._ele[key].data.value = val
end end
end end
for _, val in pairs(state._ele) do for key,val in pairs(state._ele) do
if val.submit then if val.submit then
if val:submit(fields) == true then if (val:submit(fields)==true) then
return true return true
end end
end end
@ -348,8 +287,7 @@ local function _sfs_recieve_(state, name, fields)
if state.closed ~= true then if state.closed ~= true then
state:_show_() state:_show_()
else else
core.show_formspec(name, "", minetest.show_formspec(name,"","size[5,1]label[0,0;Formspec closing not yet created!]")
"size[5,1]label[0,0;Formspec closing not yet created!]")
if not state.is_inv then if not state.is_inv then
smartfs.opened[name] = nil smartfs.opened[name] = nil
end end
@ -357,7 +295,7 @@ local function _sfs_recieve_(state, name, fields)
return true return true
end end
core.register_on_player_receive_fields(function(player, formname, fields) minetest.register_on_player_receive_fields(function(player, formname, fields)
local name = player:get_player_name() local name = player:get_player_name()
if smartfs.opened[name] and not smartfs.opened[name].is_inv then if smartfs.opened[name] and not smartfs.opened[name].is_inv then
if smartfs.opened[name].def.name == formname then if smartfs.opened[name].def.name == formname then
@ -380,26 +318,43 @@ end)
smartfs.element("button",{ smartfs.element("button",{
build = function(self) build = function(self)
local common_prefix = self.data.pos.x .. "," .. self.data.pos.y
.. ";" .. self.data.size.w .. "," ..self.data.size.h
local common_sufix = ";" .. self.name
.. ";" .. self.data.value
.. "]"
if self.data.img then if self.data.img then
return "image_button[" return "image_button["..
.. common_prefix self.data.pos.x..","..self.data.pos.y..
.. ";" .. self.data.img ";"..
.. common_sufix self.data.size.w..","..self.data.size.h..
";"..
self.data.img..
";"..
self.name..
";"..
self.data.value..
"]"
else else
if self.data.closes then if self.data.closes then
return "button_exit[" .. common_prefix .. common_sufix return "button_exit["..
self.data.pos.x..","..self.data.pos.y..
";"..
self.data.size.w..","..self.data.size.h..
";"..
self.name..
";"..
self.data.value..
"]"
else else
return "button[" .. common_prefix .. common_sufix return "button["..
self.data.pos.x..","..self.data.pos.y..
";"..
self.data.size.w..","..self.data.size.h..
";"..
self.name..
";"..
self.data.value..
"]"
end end
end end
end, end,
-- (self, fields, state) submit = function(self,fields,state)
submit = function(self, fields)
if fields[self.name] and self._click then if fields[self.name] and self._click then
self:_click(self.root) self:_click(self.root)
end end
@ -411,13 +366,13 @@ smartfs.element("button", {
setPosition = function(self,x,y) setPosition = function(self,x,y)
self.data.pos = {x=x,y=y} self.data.pos = {x=x,y=y}
end, end,
getPosition = function(self) getPosition = function(self,x,y)
return self.data.pos return self.data.pos
end, end,
setSize = function(self,w,h) setSize = function(self,w,h)
self.data.size = {w=w,h=h} self.data.size = {w=w,h=h}
end, end,
getSize = function(self) getSize = function(self,x,y)
return self.data.size return self.data.size
end, end,
onClick = function(self,func) onClick = function(self,func)
@ -445,12 +400,15 @@ smartfs.element("button", {
smartfs.element("toggle",{ smartfs.element("toggle",{
build = function(self) build = function(self)
return "button[" return "button["..
.. self.data.pos.x .. "," .. self.data.pos.y self.data.pos.x..","..self.data.pos.y..
.. ";" .. self.data.size.w .. "," .. self.data.size.h ";"..
.. ";" .. self.name self.data.size.w..","..self.data.size.h..
.. ";" .. self.data.list[self.data.id] ";"..
.. "]" self.name..
";"..
self.data.list[self.data.id]..
"]"
end, end,
submit = function(self,fields) submit = function(self,fields)
if fields[self.name] then if fields[self.name] then
@ -469,13 +427,13 @@ smartfs.element("toggle", {
setPosition = function(self,x,y) setPosition = function(self,x,y)
self.data.pos = {x=x,y=y} self.data.pos = {x=x,y=y}
end, end,
getPosition = function(self) getPosition = function(self,x,y)
return self.data.pos return self.data.pos
end, end,
setSize = function(self,w,h) setSize = function(self,w,h)
self.data.size = {w=w,h=h} self.data.size = {w=w,h=h}
end, end,
getSize = function(self) getSize = function(self,x,y)
return self.data.size return self.data.size
end, end,
setId = function(self,id) setId = function(self,id)
@ -491,15 +449,16 @@ smartfs.element("toggle", {
smartfs.element("label",{ smartfs.element("label",{
build = function(self) build = function(self)
return "label[" return "label["..
.. self.data.pos.x .. "," .. self.data.pos.y self.data.pos.x..","..self.data.pos.y..
.. ";" .. self.data.value ";"..
.. "]" self.data.value..
"]"
end, end,
setPosition = function(self,x,y) setPosition = function(self,x,y)
self.data.pos = {x=x,y=y} self.data.pos = {x=x,y=y}
end, end,
getPosition = function(self) getPosition = function(self,x,y)
return self.data.pos return self.data.pos
end, end,
setText = function(self,text) setText = function(self,text)
@ -512,36 +471,52 @@ smartfs.element("label", {
smartfs.element("field",{ smartfs.element("field",{
build = function(self) build = function(self)
local common = self.data.pos.x .. "," .. self.data.pos.y
.. ";" .. self.data.size.w .. "," .. self.data.size.h
.. ";" .. self.name
.. ";" .. self.data.label
if self.data.ml then if self.data.ml then
return "textarea[" return "textarea["..
.. common self.data.pos.x..","..self.data.pos.y..
.. ";" .. self.data.value ";"..
.. "]" self.data.size.w..","..self.data.size.h..
";"..
self.name..
";"..
self.data.label..
";"..
self.data.value..
"]"
elseif self.data.pwd then elseif self.data.pwd then
return "pwdfield[" return "pwdfield["..
.. common self.data.pos.x..","..self.data.pos.y..
.. "]" ";"..
self.data.size.w..","..self.data.size.h..
";"..
self.name..
";"..
self.data.label..
"]"
else else
return "field[" return "field["..
.. common self.data.pos.x..","..self.data.pos.y..
.. ";" .. self.data.value ";"..
.. "]" self.data.size.w..","..self.data.size.h..
";"..
self.name..
";"..
self.data.label..
";"..
self.data.value..
"]"
end end
end, end,
setPosition = function(self,x,y) setPosition = function(self,x,y)
self.data.pos = {x=x,y=y} self.data.pos = {x=x,y=y}
end, end,
getPosition = function(self) getPosition = function(self,x,y)
return self.data.pos return self.data.pos
end, end,
setSize = function(self,w,h) setSize = function(self,w,h)
self.data.size = {w=w,h=h} self.data.size = {w=w,h=h}
end, end,
getSize = function(self) getSize = function(self,x,y)
return self.data.size return self.data.size
end, end,
setText = function(self,text) setText = function(self,text)
@ -560,22 +535,24 @@ smartfs.element("field", {
smartfs.element("image",{ smartfs.element("image",{
build = function(self) build = function(self)
return "image[" return "image["..
.. self.data.pos.x .. "," .. self.data.pos.y self.data.pos.x..","..self.data.pos.y..
.. ";" .. self.data.size.w .. "," .. self.data.size.h ";"..
.. ";" .. self.data.value self.data.size.w..","..self.data.size.h..
.. "]" ";"..
self.data.value..
"]"
end, end,
setPosition = function(self,x,y) setPosition = function(self,x,y)
self.data.pos = {x=x,y=y} self.data.pos = {x=x,y=y}
end, end,
getPosition = function(self) getPosition = function(self,x,y)
return self.data.pos return self.data.pos
end, end,
setSize = function(self,w,h) setSize = function(self,w,h)
self.data.size = {w=w,h=h} self.data.size = {w=w,h=h}
end, end,
getSize = function(self) getSize = function(self,x,y)
return self.data.size return self.data.size
end, end,
setImage = function(self,text) setImage = function(self,text)
@ -588,26 +565,34 @@ smartfs.element("image", {
smartfs.element("checkbox",{ smartfs.element("checkbox",{
build = function(self) build = function(self)
local out = "checkbox["
.. self.data.pos.x .. "," .. self.data.pos.y
.. ";" .. self.name
.. ";" .. self.data.label
if self.data.value then if self.data.value then
return out .. ";true]" return "checkbox["..
self.data.pos.x..","..self.data.pos.y..
";"..
self.name..
";"..
self.data.label..
";true]"
else else
return out .. ";false]" return "checkbox["..
self.data.pos.x..","..self.data.pos.y..
";"..
self.name..
";"..
self.data.label..
";false]"
end end
end, end,
setPosition = function(self,x,y) setPosition = function(self,x,y)
self.data.pos = {x=x,y=y} self.data.pos = {x=x,y=y}
end, end,
getPosition = function(self) getPosition = function(self,x,y)
return self.data.pos return self.data.pos
end, end,
setSize = function(self,w,h) setSize = function(self,w,h)
self.data.size = {w=w,h=h} self.data.size = {w=w,h=h}
end, end,
getSize = function(self) getSize = function(self,x,y)
return self.data.size return self.data.size
end, end,
setText = function(self,text) setText = function(self,text)
@ -623,14 +608,18 @@ smartfs.element("list", {
if not self.data.items then if not self.data.items then
self.data.items = {} self.data.items = {}
end end
local listformspec = "textlist[" local listformspec = "textlist["..
.. self.data.pos.x .. "," .. self.data.pos.y self.data.pos.x..","..self.data.pos.y..
.. ";" .. self.data.size.w .. "," .. self.data.size.h ";"..
.. ";" .. self.data.name self.data.size.w..","..self.data.size.h..
.. ";" .. table.concat(self.data.items, ",") ";"..
.. ";" .. tostring(self.data.selected or "") self.data.name..
.. ";" .. tostring(self.data.transparent or "false") ";"..
.. "]" table.concat(self.data.items, ",")..
";"..
tostring(self.data.selected or "")..
";"..
tostring(self.data.transparent or "false").."]"
return listformspec return listformspec
end, end,
@ -660,13 +649,13 @@ smartfs.element("list", {
setPosition = function(self,x,y) setPosition = function(self,x,y)
self.data.pos = {x=x,y=y} self.data.pos = {x=x,y=y}
end, end,
getPosition = function(self) getPosition = function(self,x,y)
return self.data.pos return self.data.pos
end, end,
setSize = function(self,w,h) setSize = function(self,w,h)
self.data.size = {w=w,h=h} self.data.size = {w=w,h=h}
end, end,
getSize = function(self) getSize = function(self,x,y)
return self.data.size return self.data.size
end, end,
addItem = function(self, item) addItem = function(self, item)
@ -693,24 +682,28 @@ smartfs.element("list", {
smartfs.element("inventory",{ smartfs.element("inventory",{
build = function(self) build = function(self)
return "list[" return "list["..
.. (self.data.location or "current_player") (self.data.location or "current_player") ..
.. ";" .. self.name ";"..
.. ";" .. self.data.pos.x .. "," .. self.data.pos.y self.name..
.. ";" .. self.data.size.w .. "," .. self.data.size.h ";"..
.. ";" .. (self.data.index or "") self.data.pos.x..","..self.data.pos.y..
.. "]" ";"..
self.data.size.w..","..self.data.size.h..
";"..
(self.data.index or "") ..
"]"
end, end,
setPosition = function(self,x,y) setPosition = function(self,x,y)
self.data.pos = {x=x,y=y} self.data.pos = {x=x,y=y}
end, end,
getPosition = function(self) getPosition = function(self,x,y)
return self.data.pos return self.data.pos
end, end,
setSize = function(self,w,h) setSize = function(self,w,h)
self.data.size = {w=w,h=h} self.data.size = {w=w,h=h}
end, end,
getSize = function(self) getSize = function(self,x,y)
return self.data.size return self.data.size
end, end,
-- available inventory locations -- available inventory locations
@ -768,4 +761,3 @@ smartfs.element("code", {
return self.data.code return self.data.code
end end
}) })