mtcontrib/banners
1
0
Fork 1
mirror of https://github.com/pandorabox-io/banners.git synced 2025-01-06 16:10:32 +01:00
Code Issues Releases Wiki Activity

Limit texture size (#6)

Browse Source 
* whitespace and minetest. -> core.

- use same whitespace style throughout and fix some indents.
- change from minetest. to core. namespace.

* Update Readme: Minetest -> Luanti

* add luacheck

* update optional depends

* luacheck cleanups

- unused arguments
- shaddowed vars
- var redeclarations
- some whitespace involved in above lines

* clean close of file after reading

* avoid duplicate code

save some lines and some extra method calls.

* avoid error: "unknown global"

* stray whitespace fixups

* whitespace: switch all files to same indent character

tabs -> spaces

* refactor weird declaration

* whitespace: two stray spaces

...that slipped through the cracks on previous whitespace edit

* fix shaddowing global table

* reduce amount of times transformation string is calculated

* use ipairs feature

or use the faster repeat-until-loop

* cap max amount of layers

fixes #5

* fix #5 make transform history non-global

fixes #5
transformation history was shared by all users and kept growing as it
was never truely reset. Every time a user
used a banner a white background was dumped on top of the
stack making it possible to crash the server through an
overflow to core.serialize() function.

* minimize metadata size

also changed banners.max_transformations to
banners.max_undo_levels and lowered the value substantially.

* add versioning

* add recoverable per player history with saved colour

* rename update_all -> update_preview_inv

since it isn't updating everything, only
the preview and the inventory item

* dynamically update masks

to reflect the currently selected colour.
This commit is contained in:
Luke aka SwissalpS 2024-11-29 10:45:55 +01:00 committed by GitHub
parent 283b5bec25
commit 8cc1c82717
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 1105 additions and 1039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,10 @@
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

12
.luacheckrc Normal file
View File

@ -0,0 +1,12 @@
globals = {
"banners",
"smartfs",
}
read_globals = {
"core",
"dump",
"factions",
"inventory_plus",
"unified_inventory",
}

4
README.md
View File

@ -1,4 +1,4 @@
###Banners mod for Minetest ###Banners mod for Luanti (formerly Minetest)
This is the banner mod for minetest. This is a banner mod for Luanti.
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)).

123
crafts.lua
View File

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

212
factions.lua
View File

@ -1,43 +1,43 @@
banners.power_per_banner = 10. banners.power_per_banner = 10.
-- items -- items
minetest.register_craftitem("banners:golden_finial", { core.register_craftitem("banners:golden_finial", {
groups = {}, groups = {},
description = "Golden finial", description = "Golden finial",
inventory_image = "gold_finial.png", inventory_image = "gold_finial.png",
}) })
minetest.register_craftitem("banners:silver_pole", { core.register_craftitem("banners:silver_pole", {
groups = {}, groups = {},
description = "Silver pole", description = "Silver pole",
inventory_image = "silver_pole.png" inventory_image = "silver_pole.png"
}) })
minetest.register_craftitem("banners:power_pole", { core.register_craftitem("banners:power_pole", {
groups = {}, groups = {},
description = "Power pole", description = "Power pole",
inventory_image = "power_pole.png" inventory_image = "power_pole.png"
}) })
minetest.register_craftitem("banners:golden_sheet", { core.register_craftitem("banners:golden_sheet", {
groups = {}, groups = {},
description = "Golden sheet", description = "Golden sheet",
inventory_image = "golden_sheet.png" inventory_image = "golden_sheet.png"
}) })
minetest.register_craftitem("banners:death_pole", { core.register_craftitem("banners:death_pole", {
groups = {}, groups = {},
description = "Death pole", description = "Death pole",
inventory_image = "death_pole.png" inventory_image = "death_pole.png"
}) })
minetest.register_craftitem("banners:death_sheet", { core.register_craftitem("banners:death_sheet", {
groups = {}, groups = {},
description = "Death sheet", description = "Death sheet",
inventory_image = "death_sheet.png" inventory_image = "death_sheet.png"
}) })
minetest.register_craftitem("banners:death_base", { core.register_craftitem("banners:death_base", {
groups = {}, groups = {},
description = "Death base", description = "Death base",
inventory_image = "death_base.png" inventory_image = "death_base.png"
@ -46,107 +46,98 @@ minetest.register_craftitem("banners:death_base", {
-- crafts -- crafts
minetest.register_craft( -- silver flag pole -- 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", "", "" }
}
} }
) })
minetest.register_craft( -- death flag pole -- 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", "", "" }
}
} }
) })
minetest.register_craft( -- golden finial -- 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", "", "" }
}
} }
) })
minetest.register_craft( -- power flag pole -- 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", "", "" }
}
} }
) })
minetest.register_craft( -- golden sheet -- 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" }
} })
)
minetest.register_craft( -- death sheet -- 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" }
} })
)
minetest.register_craft( -- death sheet -- 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" }
}
} }
) })
minetest.register_craft( -- power banner -- 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", "" }
}
} }
) })
minetest.register_craft( -- death banner -- 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
minetest.register_node("banners:power_banner", { core.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, is_ground_content = false,
diggable = true, diggable = true,
stack_max = 1, stack_max = 1,
@ -154,15 +145,15 @@ minetest.register_node("banners:power_banner", {
paramtype2 = "facedir", paramtype2 = "facedir",
after_place_node = function (pos, player, itemstack, pointed_thing) after_place_node = function (pos, player, itemstack, pointed_thing)
banners.after_powerbanner_placed(pos, player, itemstack, pointed_thing) banners.after_powerbanner_placed(pos, player, itemstack, pointed_thing)
end, end,
on_destruct = function(pos) on_destruct = function(pos)
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 minetest.is_protected(pos, p:get_player_name()) then if core.is_protected(pos, p:get_player_name()) then
return return
end end
local meta = minetest.get_meta(pos) local meta = core.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]
@ -174,12 +165,12 @@ minetest.register_node("banners:power_banner", {
end, end,
}) })
minetest.register_node("banners:death_banner", { core.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, is_ground_content = false,
diggable = true, diggable = true,
stack_max = 1, stack_max = 1,
@ -187,15 +178,16 @@ minetest.register_node("banners:death_banner", {
paramtype2 = "facedir", paramtype2 = "facedir",
after_place_node = function (pos, player, itemstack, pointed_thing) after_place_node = function (pos, player, itemstack, pointed_thing)
banners.after_deathbanner_placed(pos, player, itemstack, pointed_thing) banners.after_deathbanner_placed(pos, player, itemstack, pointed_thing)
end, end,
on_destruct = function(pos) on_destruct = function(pos)
banners.banner_on_destruct(pos) banners.banner_on_destruct(pos)
end, end,
on_dig = function(pos, n, p) -- (pos, node, player)
if minetest.is_protected(pos, p:get_player_name()) then on_dig = function(pos, _, player)
if core.is_protected(pos, player:get_player_name()) then
return return
end end
local meta = minetest.get_meta(pos) local meta = core.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
@ -204,34 +196,36 @@ minetest.register_node("banners:death_banner", {
faction:stop_attack(parcelpos) faction:stop_attack(parcelpos)
end end
end end
minetest.remove_node(pos) core.remove_node(pos)
end, end,
}) })
banners.after_powerbanner_placed = function(pos, player, itemstack, pointed_thing) -- (pos, player, itemstack, pointed_thing)
minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing) banners.after_powerbanner_placed = function(pos, player, _, 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
minetest.get_meta(pos):set_string("banner", "bg_white.png") core.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
minetest.get_meta(pos):set_string("banner", banner_string) core.get_meta(pos):set_string("banner", banner_string)
minetest.get_meta(pos):set_string("faction", faction) core.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
minetest.add_entity(pos, "banners:banner_ent") core.add_entity(pos, "banners:banner_ent")
end end
banners.after_deathbanner_placed = function(pos, player, itemstack, pointed_thing) -- (pos, player, itemstack, pointed_thing)
minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing) banners.after_deathbanner_placed = function(pos, player, _, 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)
minetest.get_meta(pos):set_string("faction", attacking_faction.name) core.get_meta(pos):set_string("faction", attacking_faction.name)
end end
minetest.get_meta(pos):set_string("banner", "death_uv.png") core.get_meta(pos):set_string("banner", "death_uv.png")
minetest.add_entity(pos, "banners:banner_ent") core.add_entity(pos, "banners:banner_ent")
end end

229
init.lua
View File

@ -1,6 +1,9 @@
dofile(minetest.get_modpath("banners").."/smartfs.lua") local MP = core.get_modpath("banners") .. "/"
dofile(MP .. "smartfs.lua")
banners = {} banners = {
version = 20241128.1533
}
banners.masks = { banners.masks = {
"bend_left", "bend_left_outline", "bend_left", "bend_left_outline",
@ -28,6 +31,15 @@ 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",
@ -35,58 +47,71 @@ banners.colors = {
"brown", "darkbrown" "brown", "darkbrown"
} }
banners.base_transform = ({texture = "bg_white.png", banners.base_transform = {
mask="mask_background.png"}) texture = "bg_white.png",
mask = "mask_background.png"
}
banners.creation_form_func = function(state) banners.creation_form_func = function(state)
-- helper functions -- helper functions
state.update_player_inv = function(self) state.update_player_inv = function(self, transform_string)
local player = minetest.get_player_by_name(self.player) local player = core.get_player_by_name(self.player)
local newbanner = player:get_wielded_item() local newbanner = player:get_wielded_item()
newbanner:get_meta():set_string("", state.banner:get_transform_string()) newbanner:get_meta():set_string("", transform_string)
player:set_wielded_item(newbanner) player:set_wielded_item(newbanner)
end end
state.update_preview = function(self) state.update_preview = function(self, transform_string)
self:get("banner_preview"):setImage(self.banner:get_transform_string()) self:get("banner_preview"):setImage(transform_string)
self:get("color_indicator"):setImage(self.current_color) self:get("color_indicator"):setImage(self.current_color)
end end
state.update_all = function(self) state.update_preview_inv = function(self)
self:update_preview() local transform_string = self.banner:get_transform_string()
self:update_player_inv() self:update_preview(transform_string)
self:update_player_inv(transform_string)
end end
-- initialize with empty banner if histories[state.player] then
state.banner = banners.Banner:new(nil) -- initialize with saved history
state.banner:push_transform(banners.base_transform) state.banner = histories[state.player]
state.current_color = "bg_white.png" else
state:size(20,10) -- initialize with empty banner
state.banner = banners.Banner:new(nil)
state.banner:push_transform(banners.base_transform)
histories[state.player] = state.banner
end
state.current_color = state.banner.color
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_all() state:update_preview_inv()
-- color indicator -- color indicator
-- undo button -- undo button
state:button(0.5, 0.3, 2, 1, "undo", "Undo"):click(function(self, state) state:button(0.5, 0.3, 2, 1, "undo", "Undo"):click(function(_, state2)
if #state.banner.transforms > 1 then if #state2.banner.transforms > 1 then
state.banner:pop_transform() state2.banner:pop_transform()
state:update_all() state2:update_preview_inv()
end end
end) end)
-- delete button -- delete button
state:button(0.5, 1.3, 2, 1, "delete", "Delete"):click(function(self, state) state:button(0.5, 1.3, 2, 1, "delete", "Delete"):click(function(_, state2)
state.banner.transforms = {banners.base_transform} state2.banner.transforms = { banners.base_transform }
state:update_all() state2:update_preview_inv()
end) end)
-- add banners colors -- add banners colors
local x = 7 local x = 7
local y = .3 local y = .3
for i in ipairs(banners.colors) do for _, color in ipairs(banners.colors) do
local b = state:button(x, y, 1, 1, banners.colors[i], "") local b = state:button(x, y, 1, 1, color, "")
b:setImage("bg_"..banners.colors[i]..".png") b:setImage("bg_" .. color .. ".png")
b:click(function(self, state) b:click(function(self, state2)
state.current_color = "bg_"..self.name..".png" state2.current_color = "bg_" .. self.name .. ".png"
state:update_preview() state2:get("color_indicator"):setImage(state2.current_color)
-- todo: update masks or something state2.banner.color = state2.current_color
end -- 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)
x = x + 1 x = x + 1
if x > 19 then if x > 19 then
y = y + 1 y = y + 1
@ -94,16 +119,19 @@ banners.creation_form_func = function(state)
end end
end end
-- add banners buttons -- add banners buttons
local x = 1 x = 1
local y = 3 y = 3
for i in ipairs(banners.masks) do for _, mask in ipairs(banners.masks) do
local b = state:button(x, y, 2, 1, banners.masks[i], "") local b = state:button(x, y, 2, 1, mask, "")
b:setImage(banners.masks[i]..".png") b:setImage("(" .. state.current_color
b:click(function(self, state) .. "^[mask:" .. mask .. ".png^[makealpha:0,0,0)")
state.banner:push_transform({texture=state.current_color, mask=self.name..".png"}) b:click(function(self, state2)
state:update_all() state2.banner:push_transform({
end texture = state2.current_color,
) 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
@ -114,63 +142,90 @@ banners.creation_form_func = function(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)
-- banner definition -- banner definition
banners.Banner = { banners.Banner = {}
transforms = {}
}
function banners.Banner:new(banner) function banners.Banner:new(banner)
banner = banner or {} banner = banner or { color = "bg_black.png", transforms = {} }
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(self, 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(self)
table.remove(self.transforms) table.remove(self.transforms)
end end
function banners.Banner.get_transform_string(self) function banners.Banner.get_transform_string(self)
local final = {} local final = {}
for i in ipairs(self.transforms) do local used = {}
table.insert(final, "("..self.transforms[i].texture.."^[mask:"..self.transforms[i].mask.."^[makealpha:0,0,0)") local transform
end -- work backwards to keep resulting data small
local i = #self.transforms
repeat
transform = self.transforms[i]
-- same mask can be trimmed out only using 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
local ret = table.concat(final, "^") local ret = table.concat(final, "^")
return ret return ret
end end
-- helper function for determining the flag's direction -- helper function for determining the flag's direction
banners.determine_flag_direction = function(pos, pointed_thing) -- (pos, pointed_thing)
banners.determine_flag_direction = function(_, pointed_thing)
local above = pointed_thing.above local above = pointed_thing.above
local under = pointed_thing.under local under = pointed_thing.under
local dir = {x = under.x - above.x, local dir = {
y = under.y - above.y, x = under.x - above.x,
z = under.z - above.z} y = under.y - above.y,
return minetest.dir_to_wallmounted(dir) z = under.z - above.z
}
return core.dir_to_wallmounted(dir)
end end
banners.banner_on_use = function(itemstack, player, pointed_thing) -- (itemstack, player, pointed_thing)
banners.banner_on_use = function(_, 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
banners.banner_on_dig = function(pos, node, player) banners.banner_on_dig = function(pos, node, player)
if not player or minetest.is_protected(pos, player:get_player_name()) then if not player or core.is_protected(pos, player:get_player_name()) then
return return
end end
local meta = minetest.get_meta(pos) local meta = core.get_meta(pos)
local inventory = player:get_inventory() local inventory = player:get_inventory()
inventory:add_item("main", {name=node.name, count=1, wear=0, metadata=meta:get_string("banner")}) inventory:add_item("main", {
minetest.remove_node(pos) name = node.name,
count = 1,
wear = 0,
metadata = meta:get_string("banner")
})
core.remove_node(pos)
end end
banners.banner_on_destruct = function(pos, node, player) -- (pos, node, player)
local objects = minetest.get_objects_inside_radius(pos, 0.5) banners.banner_on_destruct = function(pos)
for _,v in ipairs(objects) do local objects = core.get_objects_inside_radius(pos, 0.5)
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
v:remove() v:remove()
@ -178,23 +233,23 @@ banners.banner_on_destruct = function(pos, node, player)
end end
end end
banners.banner_after_place = function (pos, player, itemstack, pointed_thing) -- (pos, player, itemstack, pointed_thing)
minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing) banners.banner_after_place = function(pos, _, itemstack, pointed_thing)
minetest.get_meta(pos):set_string("banner", itemstack:get_meta():get_string("")) core.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
minetest.add_entity(pos, "banners:banner_ent") core.get_meta(pos):set_string("banner", itemstack:get_meta():get_string(""))
core.add_entity(pos, "banners:banner_ent")
end end
-- banner entity -- banner entity
local set_banner_texture local set_banner_texture = function(obj, texture)
set_banner_texture = function (obj, texture) obj:set_properties({ textures = { "banner_uv_text.png^" .. texture } })
obj:set_properties({textures={"banner_uv_text.png^"..texture}})
end end
banners.banner_on_activate = function(self) banners.banner_on_activate = function(self)
local pos = self.object:get_pos() local pos = self.object:get_pos()
local banner = minetest.get_meta(pos):get_string("banner") local banner = core.get_meta(pos):get_string("banner")
local banner_face = minetest.get_node(pos).param2 local banner_face = core.get_node(pos).param2
local yaw = 0. local yaw = 0.
if banner_face == 2 then if banner_face == 2 then
yaw = 0. yaw = 0.
@ -211,21 +266,25 @@ banners.banner_on_activate = function(self)
end end
end end
minetest.register_entity("banners:banner_ent", { core.register_entity("banners:banner_ent", {
initial_properties = { 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 minetest.get_modpath("factions") then core.register_on_leaveplayer(function(player)
dofile(minetest.get_modpath("banners").."/factions.lua") histories[player:get_player_name()] = nil
end)
if core.get_modpath("factions") then
dofile(MP .. "factions.lua")
end end
dofile(minetest.get_modpath("banners").."/items.lua") dofile(MP .. "items.lua")
dofile(minetest.get_modpath("banners").."/nodes.lua") dofile(MP .. "nodes.lua")
dofile(minetest.get_modpath("banners").."/crafts.lua") dofile(MP .. "crafts.lua")

65
items.lua
View File

@ -2,44 +2,35 @@
-- items -- items
minetest.register_craftitem("banners:banner_sheet", core.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 = "", })
}
)
minetest.register_craftitem("banners:wooden_pole", core.register_craftitem("banners:wooden_pole", {
{ groups = {},
groups = {}, description = "Wooden pole",
description = "Wooden pole", inventory_image = "wooden_pole.png"
inventory_image = "wooden_pole.png" })
}
)
minetest.register_craftitem("banners:wooden_base", core.register_craftitem("banners:wooden_base", {
{ groups = {},
groups = {}, description = "Wooden base",
description = "Wooden base", inventory_image = "wooden_base.png"
inventory_image = "wooden_base.png" })
}
)
minetest.register_craftitem("banners:steel_pole", core.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", {
groups = {},
description = "Steel base",
inventory_image = "steel_base.png"
})
minetest.register_craftitem("banners:steel_base",
{
groups = {},
description = "Steel base",
inventory_image = "steel_base.png"
}
)

3
mod.conf
View File

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

100
nodes.lua
View File

@ -1,57 +1,53 @@
-- da wooden banner -- da wooden banner
minetest.register_node("banners:wooden_banner", core.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,
is_ground_content = false, diggable = true,
diggable = true, stack_max = 1,
stack_max = 1, paramtype = "light",
paramtype="light", paramtype2 = "facedir",
paramtype2="facedir", after_place_node = function (pos, player, itemstack, pointed_thing)
after_place_node = function (pos, player, itemstack, pointed_thing) banners.banner_after_place(pos, player, itemstack, pointed_thing)
banners.banner_after_place(pos, player, itemstack, pointed_thing) end,
end, on_destruct = function(pos)
on_destruct = function(pos) banners.banner_on_destruct(pos)
banners.banner_on_destruct(pos) end,
end, on_use = function(i, p, pt)
on_use = function(i, p, pt) banners.banner_on_use(i, p, pt)
banners.banner_on_use(i, p, pt) end,
end, 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
minetest.register_node("banners:steel_banner", core.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,
is_ground_content = false, diggable = true,
diggable = true, stack_max = 1,
stack_max = 1, paramtype = "light",
paramtype = "light", paramtype2 = "facedir",
paramtype2 = "facedir", after_place_node = function (pos, player, itemstack, pointed_thing)
after_place_node = function (pos, player, itemstack, pointed_thing) banners.banner_after_place(pos, player, itemstack, pointed_thing)
banners.banner_after_place(pos, player, itemstack, pointed_thing) end,
end, on_destruct = function(pos)
on_destruct = function(pos) banners.banner_on_destruct(pos)
banners.banner_on_destruct(pos) end,
end, on_use = function(i, p, pt)
on_use = function(i, p, pt) banners.banner_on_use(i, p, pt)
banners.banner_on_use(i, p, pt) end,
end, 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
} })
)

1386
smartfs.lua
View File

File diff suppressed because it is too large Load Diff