1
0
Fork 0

Slightly improved first two functions in init.lua, added protection support.

This commit is contained in:
LissoBone 2023-09-18 15:54:40 +09:00
parent 4fa5c94515
commit b56598a477
1 changed files with 76 additions and 53 deletions

View File

@ -15,30 +15,37 @@ Codezeilen und schreibe das auch nicht dran.
]]--
local protector = minetest.get_modpath ("protector")
-- Detect stopping colors.
function tga_encoder.image:detect_stop_colors(icon, pos, stop_colors)
local x = pos.x
local z = pos.z
for i_z = 1,#icon do
for i_x = 1,#icon[i_z] do
if stop_colors[self.pixels[z + i_z][x + i_x][1]] then
return true
end
end
end
end
-- blit an icon into the image unless its rect overlaps pixels that
-- have any of the stop_colors, treating a nil pixel as transparent
function tga_encoder.image:blit_icon(icon, pos, stop_colors)
local x = pos.x
local z = pos.z
local overlap = false
for i_z = 1,#icon do
for i_x = 1,#icon[i_z] do
local color = self.pixels[z + i_z][x + i_x][1]
if stop_colors[color] then
overlap = true
break
end
end
if overlap then
break
end
end
if overlap then
-- Just as the comment above says, exit IMMEDIATELY if there
-- are stop_colors present in the image.
if self:detect_stop_colors(icon, pos, stop_colors) then
return
end
for i_z = 1,#icon do
for i_x = 1,#icon[i_z] do
local color = icon[i_z][i_x][1]
if color then
self.pixels[z + i_z][x + i_x] = { color }
end
@ -65,11 +72,11 @@ local worldpath = minetest.get_worldpath()
local textures_dir = worldpath .. "/xmaps/"
minetest.mkdir(textures_dir)
xmaps.get_map_filename = function(map_id)
function xmaps.get_map_filename(map_id)
return "xmaps_map_texture_" .. map_id .. ".tga"
end
xmaps.create_map_item = function(pos, properties)
function xmaps.create_map_item(pos, properties)
properties = properties or {}
local itemstack = ItemStack("xmaps:map")
@ -78,6 +85,8 @@ xmaps.create_map_item = function(pos, properties)
local map_id = tostring(os.time() + math.random())
meta:set_string("xmaps:id", map_id)
-- Size is defined above
-- I love this, it's so clever
local minp = vector.multiply(vector.floor(vector.divide(pos, size)), size)
meta:set_string("xmaps:minp", minetest.pos_to_string(minp))
@ -511,7 +520,7 @@ xmaps.load_map_item = function(itemstack)
)
end
else
-- no texture file could be a world download
-- no texture file -> could be a world download
-- so we look for missing texture in item meta
-- and write that to the map texture file here
if texture_item_meta_exists then
@ -843,10 +852,16 @@ minetest.register_entity(
}
)
end,
on_punch = function(self)
-- TODO: implement protection
on_punch = function(self, puncher)
-- Protection implemented.
local pos = self.object:get_pos()
if protector then
if minetest.is_protected (pos, puncher) then
return
end
end
local itemstring = self._itemstring
if pos and itemstring then
minetest.add_item(
pos,
@ -865,7 +880,7 @@ minetest.register_craftitem(
inventory_image = "xmaps_map.tga",
groups = { not_in_creative_inventory = 1 },
on_place = function(itemstack, player, pointed_thing)
if "node" ~= pointed_thing.type then
if pointed_thing.type ~= "node" then
return
end
@ -875,7 +890,10 @@ minetest.register_craftitem(
end
local node_pos = pointed_thing.under
if protector and minetest.is_protected (pointed_thing.above, player)
then
return
end
local direction = vector.normalize(
vector.subtract(
node_pos,
@ -928,6 +946,10 @@ if minetest.registered_items["map:mapping_kit"] then
{
on_place = function(itemstack, player, pointed_thing)
local pos = pointed_thing.under
if protector and minetest.is_protected (pointed_thing.above, player)
then
return
end
if pos then
local map = xmaps.create_map_item(
pos,
@ -939,6 +961,7 @@ if minetest.registered_items["map:mapping_kit"] then
on_secondary_use = function(itemstack, player, pointed_thing)
local pos = player:get_pos()
if pos then
local map = xmaps.create_map_item(pos)
return map
end