2018-12-30 00:09:58 +01:00
|
|
|
--
|
2019-01-07 23:08:42 +01:00
|
|
|
-- Minetest advmarkers mod
|
2018-12-30 00:09:58 +01:00
|
|
|
--
|
2019-10-17 08:09:19 +02:00
|
|
|
-- © 2019 by luk3yx
|
2018-12-30 00:09:58 +01:00
|
|
|
--
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
advmarkers = {
|
2019-10-15 06:55:00 +02:00
|
|
|
dated_death_markers = false
|
2019-07-13 22:56:07 +02:00
|
|
|
}
|
2018-12-30 00:09:58 +01:00
|
|
|
|
|
|
|
-- Get the mod storage
|
|
|
|
local storage = minetest.get_mod_storage()
|
2019-01-07 23:08:42 +01:00
|
|
|
local hud = {}
|
2020-06-03 02:14:48 +02:00
|
|
|
local use_sscsm = false
|
2019-01-07 23:08:42 +01:00
|
|
|
advmarkers.last_coords = {}
|
2018-12-30 00:09:58 +01:00
|
|
|
|
2020-11-22 06:49:19 +01:00
|
|
|
local abs, type = math.abs, type
|
|
|
|
|
2018-12-30 00:09:58 +01:00
|
|
|
-- Convert positions to/from strings
|
|
|
|
local function pos_to_string(pos)
|
|
|
|
if type(pos) == 'table' then
|
|
|
|
pos = minetest.pos_to_string(vector.round(pos))
|
|
|
|
end
|
|
|
|
if type(pos) == 'string' then
|
|
|
|
return pos
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-11-22 07:19:03 +01:00
|
|
|
local function dir_ok(n)
|
|
|
|
return type(n) == 'number' and abs(n) < 31000
|
|
|
|
end
|
2018-12-30 00:09:58 +01:00
|
|
|
local function string_to_pos(pos)
|
|
|
|
if type(pos) == 'string' then
|
|
|
|
pos = minetest.string_to_pos(pos)
|
|
|
|
end
|
2020-11-22 07:19:03 +01:00
|
|
|
if type(pos) == 'table' and dir_ok(pos.x) and dir_ok(pos.y) and
|
|
|
|
dir_ok(pos.z) then
|
2018-12-30 00:09:58 +01:00
|
|
|
return vector.round(pos)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-01-07 23:08:42 +01:00
|
|
|
local get_player_by_name = minetest.get_player_by_name
|
|
|
|
local get_connected_players = minetest.get_connected_players
|
|
|
|
if minetest.get_modpath('cloaking') then
|
|
|
|
get_player_by_name = cloaking.get_player_by_name
|
|
|
|
get_connected_players = cloaking.get_connected_players
|
|
|
|
end
|
|
|
|
|
2020-10-09 06:23:29 +02:00
|
|
|
-- Adds compatibility alias and coerces the first argument to a player object
|
|
|
|
local is_player = minetest.is_player
|
|
|
|
local function add_compat_function(func_name)
|
|
|
|
local func = assert(advmarkers[func_name])
|
|
|
|
local function wrapper(player, ...)
|
|
|
|
if not is_player(player) then
|
|
|
|
player = get_player_by_name(player)
|
|
|
|
if not player then return end
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
return func(player, ...)
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
|
|
|
|
advmarkers[func_name] = wrapper
|
|
|
|
advmarkers[func_name:gsub('waypoint', 'marker')] = wrapper
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
|
|
|
|
2018-12-30 00:09:58 +01:00
|
|
|
-- Set the HUD position
|
2019-01-07 23:08:42 +01:00
|
|
|
function advmarkers.set_hud_pos(player, pos, title)
|
2020-10-09 06:23:29 +02:00
|
|
|
local name = player:get_player_name()
|
2018-12-30 00:09:58 +01:00
|
|
|
pos = string_to_pos(pos)
|
2020-10-09 06:23:29 +02:00
|
|
|
if not pos then return end
|
2019-01-07 23:08:42 +01:00
|
|
|
if not title then
|
|
|
|
title = pos.x .. ', ' .. pos.y .. ', ' .. pos.z
|
|
|
|
end
|
2020-02-13 06:16:21 +01:00
|
|
|
if hud[name] then
|
|
|
|
player:hud_change(hud[name], 'name', title)
|
|
|
|
player:hud_change(hud[name], 'world_pos', pos)
|
2019-01-07 23:08:42 +01:00
|
|
|
else
|
2020-02-13 06:16:21 +01:00
|
|
|
hud[name] = player:hud_add({
|
2019-01-07 23:08:42 +01:00
|
|
|
hud_elem_type = 'waypoint',
|
|
|
|
name = title,
|
|
|
|
text = 'm',
|
|
|
|
number = 0xbf360c,
|
|
|
|
world_pos = pos
|
|
|
|
})
|
|
|
|
end
|
2020-02-13 06:16:21 +01:00
|
|
|
minetest.chat_send_player(name, 'Waypoint set to ' ..
|
|
|
|
minetest.colorize('#bf360c', title))
|
2019-01-07 23:08:42 +01:00
|
|
|
return true
|
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('set_hud_pos')
|
2019-01-07 23:08:42 +01:00
|
|
|
|
|
|
|
-- Get and save player storage
|
2020-10-09 06:23:29 +02:00
|
|
|
local function get_storage(player)
|
|
|
|
local raw = player:get_meta():get_string('advmarkers:waypoints') or ''
|
|
|
|
local version = raw:sub(1, 1)
|
|
|
|
if version == '0' then
|
|
|
|
-- Player meta: 0{"Marker name": {"x": 1, "y": 2, "z": 3}}
|
|
|
|
return minetest.parse_json(raw:sub(2))
|
|
|
|
elseif version == '' then
|
|
|
|
-- Mod storage: return {["marker-Marker name"] = "(1,2,3)"}
|
|
|
|
local pname = player:get_player_name()
|
|
|
|
local res = {}
|
|
|
|
raw = minetest.deserialize(storage:get_string(pname))
|
|
|
|
if raw then
|
|
|
|
for name, pos in pairs(raw) do
|
|
|
|
if name:sub(1, 7) == 'marker-' then
|
|
|
|
res[name:sub(8)] = string_to_pos(pos)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return res
|
|
|
|
end
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
|
|
|
|
2020-10-09 06:23:29 +02:00
|
|
|
local function save_storage(player, markers)
|
|
|
|
local name = player:get_player_name()
|
|
|
|
local meta = player:get_meta()
|
|
|
|
if next(markers) then
|
|
|
|
meta:set_string('advmarkers:waypoints', '0' ..
|
|
|
|
minetest.write_json(markers))
|
2019-01-07 23:08:42 +01:00
|
|
|
else
|
2020-10-09 06:23:29 +02:00
|
|
|
meta:set_string('advmarkers:waypoints', '')
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
storage:set_string(name, '')
|
2020-06-03 02:14:48 +02:00
|
|
|
|
|
|
|
if use_sscsm and sscsm.has_sscsms_enabled(name) then
|
2020-10-09 06:23:29 +02:00
|
|
|
sscsm.com_send(name, 'advmarkers:update', markers)
|
2020-06-03 02:14:48 +02:00
|
|
|
end
|
|
|
|
|
2018-12-30 00:09:58 +01:00
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Add a waypoint
|
|
|
|
function advmarkers.set_waypoint(player, pos, name)
|
2019-01-07 23:08:42 +01:00
|
|
|
local data = get_storage(player)
|
2020-10-09 06:23:29 +02:00
|
|
|
data[tostring(name)] = string_to_pos(pos)
|
2019-01-07 23:08:42 +01:00
|
|
|
return save_storage(player, data)
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('set_waypoint')
|
2018-12-30 00:09:58 +01:00
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Delete a waypoint
|
|
|
|
function advmarkers.delete_waypoint(player, name)
|
2019-01-07 23:08:42 +01:00
|
|
|
local data = get_storage(player)
|
2020-10-09 06:23:29 +02:00
|
|
|
data[name] = nil
|
2019-01-07 23:08:42 +01:00
|
|
|
return save_storage(player, data)
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('delete_waypoint')
|
2018-12-30 00:09:58 +01:00
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Get a waypoint
|
|
|
|
function advmarkers.get_waypoint(player, name)
|
2020-10-09 06:23:29 +02:00
|
|
|
return get_storage(player)[name]
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('get_waypoint')
|
2018-12-30 00:09:58 +01:00
|
|
|
|
2020-10-09 06:23:29 +02:00
|
|
|
-- Rename a waypoint
|
2019-07-13 22:56:07 +02:00
|
|
|
function advmarkers.rename_waypoint(player, oldname, newname)
|
2018-12-30 09:10:02 +01:00
|
|
|
oldname, newname = tostring(oldname), tostring(newname)
|
2019-07-13 22:56:07 +02:00
|
|
|
local pos = advmarkers.get_waypoint(player, oldname)
|
|
|
|
if not pos or not advmarkers.set_waypoint(player, pos, newname) then
|
2019-01-07 23:08:42 +01:00
|
|
|
return
|
|
|
|
end
|
2018-12-30 09:10:02 +01:00
|
|
|
if oldname ~= newname then
|
2019-07-13 22:56:07 +02:00
|
|
|
advmarkers.delete_waypoint(player, oldname)
|
2018-12-30 09:10:02 +01:00
|
|
|
end
|
|
|
|
return true
|
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('rename_waypoint')
|
2018-12-30 09:10:02 +01:00
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Get waypoint names
|
2020-10-09 06:23:29 +02:00
|
|
|
function advmarkers.get_waypoint_names(player, sorted)
|
|
|
|
local data = get_storage(player)
|
2019-07-13 22:56:07 +02:00
|
|
|
local res = {}
|
2020-10-09 06:23:29 +02:00
|
|
|
for name, _ in pairs(data) do
|
|
|
|
table.insert(res, name)
|
2019-07-13 22:56:07 +02:00
|
|
|
end
|
|
|
|
if sorted or sorted == nil then table.sort(res) end
|
|
|
|
return res
|
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('get_waypoint_names')
|
2019-07-13 22:56:07 +02:00
|
|
|
|
|
|
|
-- Display a waypoint
|
|
|
|
function advmarkers.display_waypoint(player, name)
|
|
|
|
return advmarkers.set_hud_pos(player, advmarkers.get_waypoint(player, name),
|
2019-01-07 23:08:42 +01:00
|
|
|
name)
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('display_waypoint')
|
2018-12-30 00:09:58 +01:00
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Export waypoints
|
2019-01-07 23:08:42 +01:00
|
|
|
function advmarkers.export(player, raw)
|
2020-10-09 06:23:29 +02:00
|
|
|
local s = {}
|
|
|
|
for name, pos in pairs(get_storage(player)) do
|
|
|
|
s['marker-' .. name] = pos_to_string(pos)
|
|
|
|
end
|
|
|
|
|
2019-01-07 09:45:41 +01:00
|
|
|
if raw == 'M' then
|
2018-12-30 04:36:22 +01:00
|
|
|
s = minetest.compress(minetest.serialize(s))
|
|
|
|
s = 'M' .. minetest.encode_base64(s)
|
2019-01-07 09:45:41 +01:00
|
|
|
elseif not raw then
|
|
|
|
s = minetest.compress(minetest.write_json(s))
|
|
|
|
s = 'J' .. minetest.encode_base64(s)
|
2018-12-30 04:36:22 +01:00
|
|
|
end
|
|
|
|
return s
|
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('export')
|
2018-12-30 04:36:22 +01:00
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Import waypoints - Note that this won't import strings made by older
|
|
|
|
-- versions of the CSM.
|
2019-01-07 23:08:42 +01:00
|
|
|
function advmarkers.import(player, s)
|
2018-12-30 04:36:22 +01:00
|
|
|
if type(s) ~= 'table' then
|
2019-01-07 23:08:42 +01:00
|
|
|
if s:sub(1, 1) ~= 'J' then return end
|
2018-12-30 04:36:22 +01:00
|
|
|
s = minetest.decode_base64(s:sub(2))
|
|
|
|
local success, msg = pcall(minetest.decompress, s)
|
|
|
|
if not success then return end
|
2019-01-07 23:08:42 +01:00
|
|
|
s = minetest.parse_json(msg)
|
2020-10-09 06:23:29 +02:00
|
|
|
if type(s) ~= 'table' then return end
|
2018-12-30 04:36:22 +01:00
|
|
|
end
|
|
|
|
|
2020-10-09 06:23:29 +02:00
|
|
|
-- Parse the exported table
|
|
|
|
local data = get_storage(player)
|
|
|
|
for field, pos in pairs(s) do
|
|
|
|
if type(field) == 'string' and type(pos) == 'string' and
|
|
|
|
field:sub(1, 7) == 'marker-' then
|
|
|
|
pos = string_to_pos(pos)
|
|
|
|
if pos then
|
2018-12-30 04:36:22 +01:00
|
|
|
-- Prevent collisions
|
2020-10-09 06:23:29 +02:00
|
|
|
local name = field:sub(8)
|
2018-12-30 04:36:22 +01:00
|
|
|
local c = 0
|
2020-10-09 06:23:29 +02:00
|
|
|
while data[name] and not vector.equals(data[name], pos) and
|
|
|
|
c < 50 do
|
2018-12-30 04:36:22 +01:00
|
|
|
name = name .. '_'
|
|
|
|
c = c + 1
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Sanity check
|
|
|
|
if c < 50 then
|
2020-10-09 06:23:29 +02:00
|
|
|
data[name] = string_to_pos(pos)
|
2018-12-30 04:36:22 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
return save_storage(player, data)
|
2018-12-30 04:36:22 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('import')
|
2018-12-30 04:36:22 +01:00
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Get the waypoints formspec
|
2018-12-30 00:09:58 +01:00
|
|
|
local formspec_list = {}
|
2019-01-07 23:08:42 +01:00
|
|
|
local selected_name = {}
|
|
|
|
function advmarkers.display_formspec(player)
|
2020-10-09 06:23:29 +02:00
|
|
|
local pname = player:get_player_name()
|
2018-12-30 00:09:58 +01:00
|
|
|
local formspec = 'size[5.25,8]' ..
|
2019-07-13 22:56:07 +02:00
|
|
|
'label[0,0;Waypoint list]' ..
|
2018-12-30 09:10:02 +01:00
|
|
|
'button_exit[0,7.5;1.3125,0.5;display;Display]' ..
|
|
|
|
'button[1.3125,7.5;1.3125,0.5;teleport;Teleport]' ..
|
|
|
|
'button[2.625,7.5;1.3125,0.5;rename;Rename]' ..
|
|
|
|
'button[3.9375,7.5;1.3125,0.5;delete;Delete]' ..
|
2018-12-30 00:09:58 +01:00
|
|
|
'textlist[0,0.75;5,6;marker;'
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Iterate over all the waypoints
|
2018-12-30 00:09:58 +01:00
|
|
|
local selected = 1
|
2020-10-09 06:23:29 +02:00
|
|
|
formspec_list[pname] = advmarkers.get_waypoint_names(player)
|
2019-07-13 22:56:07 +02:00
|
|
|
|
2020-10-09 06:23:29 +02:00
|
|
|
for id, name in ipairs(formspec_list[pname]) do
|
2019-07-13 22:56:07 +02:00
|
|
|
if id > 1 then formspec = formspec .. ',' end
|
2020-10-09 06:23:29 +02:00
|
|
|
if not selected_name[pname] then selected_name[pname] = name end
|
|
|
|
if name == selected_name[pname] then selected = id end
|
2019-07-13 22:56:07 +02:00
|
|
|
formspec = formspec .. '##' .. minetest.formspec_escape(name)
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Close the text list and display the selected waypoint position
|
2018-12-30 00:09:58 +01:00
|
|
|
formspec = formspec .. ';' .. tostring(selected) .. ']'
|
2020-10-09 06:23:29 +02:00
|
|
|
local pos = selected_name[pname] and
|
|
|
|
advmarkers.get_waypoint(player, selected_name[pname])
|
|
|
|
if pos then
|
|
|
|
formspec = formspec .. 'label[0,6.75;Waypoint position: ' ..
|
|
|
|
minetest.formspec_escape(tostring(pos.x) .. ', ' ..
|
|
|
|
tostring(pos.y) .. ', ' .. tostring(pos.z)) .. ']'
|
2018-12-30 00:09:58 +01:00
|
|
|
else
|
|
|
|
-- Draw over the buttons
|
2020-10-09 06:23:29 +02:00
|
|
|
formspec = formspec ..
|
|
|
|
'button_exit[0,7.5;5.25,0.5;quit;Close dialog]' ..
|
2019-07-13 22:56:07 +02:00
|
|
|
'label[0,6.75;No waypoints. Add one with "/add_wp".]'
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
-- Display the formspec
|
2020-10-09 06:23:29 +02:00
|
|
|
return minetest.show_formspec(pname, 'advmarkers-ssm', formspec)
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('display_formspec')
|
2019-01-07 23:08:42 +01:00
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Get waypoint position
|
2019-01-07 23:08:42 +01:00
|
|
|
function advmarkers.get_chatcommand_pos(player, pos)
|
2020-10-09 06:23:29 +02:00
|
|
|
local pname = player:get_player_name()
|
2019-01-07 23:08:42 +01:00
|
|
|
|
|
|
|
-- Validate the position
|
|
|
|
if pos == 'h' or pos == 'here' then
|
2020-10-09 06:23:29 +02:00
|
|
|
pos = player:get_pos()
|
2019-01-07 23:08:42 +01:00
|
|
|
elseif pos == 't' or pos == 'there' then
|
|
|
|
if not advmarkers.last_coords[pname] then
|
2020-11-22 06:49:19 +01:00
|
|
|
return false, 'No "there" position found!'
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
|
|
|
pos = advmarkers.last_coords[pname]
|
|
|
|
else
|
|
|
|
pos = string_to_pos(pos)
|
|
|
|
if not pos then
|
|
|
|
return false, 'Invalid position!'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return pos
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
add_compat_function('get_chatcommand_pos')
|
2018-12-30 00:09:58 +01:00
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
local function register_chatcommand_alias(old, ...)
|
|
|
|
local def = assert(minetest.registered_chatcommands[old])
|
|
|
|
def.name = nil
|
|
|
|
for i = 1, select('#', ...) do
|
|
|
|
minetest.register_chatcommand(select(i, ...), table.copy(def))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Open the waypoints GUI
|
2018-12-30 00:09:58 +01:00
|
|
|
minetest.register_chatcommand('mrkr', {
|
|
|
|
params = '',
|
|
|
|
description = 'Open the advmarkers GUI',
|
2019-01-07 23:08:42 +01:00
|
|
|
func = function(pname, param)
|
2020-06-03 02:14:48 +02:00
|
|
|
if param == '' then
|
2019-07-14 00:20:04 +02:00
|
|
|
advmarkers.display_formspec(pname)
|
|
|
|
else
|
2019-01-07 23:08:42 +01:00
|
|
|
local pos, err = advmarkers.get_chatcommand_pos(pname, param)
|
|
|
|
if not pos then
|
|
|
|
return false, err
|
|
|
|
end
|
|
|
|
if not advmarkers.set_hud_pos(pname, pos) then
|
2019-07-13 22:56:07 +02:00
|
|
|
return false, 'Error setting the waypoint!'
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2018-12-30 00:09:58 +01:00
|
|
|
})
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
register_chatcommand_alias('mrkr', 'wp', 'wps', 'waypoint', 'waypoints')
|
|
|
|
|
|
|
|
-- Add a waypoint
|
2018-12-30 00:09:58 +01:00
|
|
|
minetest.register_chatcommand('add_mrkr', {
|
2018-12-30 05:53:36 +01:00
|
|
|
params = '<pos / "here" / "there"> <name>',
|
2019-07-13 22:56:07 +02:00
|
|
|
description = 'Adds a waypoint.',
|
2019-01-07 23:08:42 +01:00
|
|
|
func = function(pname, param)
|
|
|
|
-- Get the parameters
|
2018-12-30 00:09:58 +01:00
|
|
|
local s, e = param:find(' ')
|
2018-12-30 05:53:36 +01:00
|
|
|
if not s or not e then
|
2019-01-07 23:08:42 +01:00
|
|
|
return false, 'Invalid syntax! See /help add_mrkr for more info.'
|
2018-12-30 05:53:36 +01:00
|
|
|
end
|
2020-10-09 06:23:29 +02:00
|
|
|
local raw_pos = param:sub(1, s - 1)
|
2018-12-30 00:09:58 +01:00
|
|
|
local name = param:sub(e + 1)
|
|
|
|
|
2019-01-07 23:08:42 +01:00
|
|
|
-- Get the position
|
2020-10-09 06:23:29 +02:00
|
|
|
local pos, err = advmarkers.get_chatcommand_pos(pname, raw_pos)
|
2019-01-07 23:08:42 +01:00
|
|
|
if not pos then
|
|
|
|
return false, err
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
-- Validate the name
|
|
|
|
if not name or #name < 1 then
|
|
|
|
return false, 'Invalid name!'
|
|
|
|
end
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Set the waypoint
|
|
|
|
return advmarkers.set_waypoint(pname, pos, name), 'Done!'
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
|
|
|
})
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
register_chatcommand_alias('add_mrkr', 'add_wp', 'add_waypoint')
|
|
|
|
|
2018-12-30 00:09:58 +01:00
|
|
|
-- Set the HUD
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
2020-10-09 06:23:29 +02:00
|
|
|
local pname = player:get_player_name()
|
2018-12-30 04:36:22 +01:00
|
|
|
if formname == 'advmarkers-ignore' then
|
|
|
|
return true
|
2019-01-07 23:08:42 +01:00
|
|
|
elseif formname ~= 'advmarkers-ssm' then
|
2018-12-30 04:36:22 +01:00
|
|
|
return
|
|
|
|
end
|
2018-12-30 00:09:58 +01:00
|
|
|
local name = false
|
|
|
|
if fields.marker then
|
|
|
|
local event = minetest.explode_textlist_event(fields.marker)
|
|
|
|
if event.index then
|
2019-01-07 23:08:42 +01:00
|
|
|
name = formspec_list[pname][event.index]
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
|
|
|
else
|
2019-01-07 23:08:42 +01:00
|
|
|
name = selected_name[pname]
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
if name then
|
|
|
|
if fields.display then
|
2019-07-13 22:56:07 +02:00
|
|
|
if not advmarkers.display_waypoint(player, name) then
|
|
|
|
minetest.chat_send_player(pname, 'Error displaying waypoint!')
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
2018-12-30 09:10:02 +01:00
|
|
|
elseif fields.rename then
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.show_formspec(pname, 'advmarkers-ssm', 'size[6,3]' ..
|
2019-07-13 22:56:07 +02:00
|
|
|
'label[0.35,0.2;Rename waypoint]' ..
|
2018-12-30 09:15:27 +01:00
|
|
|
'field[0.3,1.3;6,1;new_name;New name;' ..
|
2018-12-30 09:10:02 +01:00
|
|
|
minetest.formspec_escape(name) .. ']' ..
|
|
|
|
'button[0,2;3,1;cancel;Cancel]' ..
|
|
|
|
'button[3,2;3,1;rename_confirm;Rename]')
|
|
|
|
elseif fields.rename_confirm then
|
|
|
|
if fields.new_name and #fields.new_name > 0 then
|
2019-07-13 22:56:07 +02:00
|
|
|
if advmarkers.rename_waypoint(pname, name, fields.new_name) then
|
2019-01-07 23:08:42 +01:00
|
|
|
selected_name[pname] = fields.new_name
|
2018-12-30 09:10:02 +01:00
|
|
|
else
|
2019-07-13 22:56:07 +02:00
|
|
|
minetest.chat_send_player(pname, 'Error renaming waypoint!')
|
2018-12-30 09:10:02 +01:00
|
|
|
end
|
2019-01-07 23:08:42 +01:00
|
|
|
advmarkers.display_formspec(pname)
|
2018-12-30 09:10:02 +01:00
|
|
|
else
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.chat_send_player(pname,
|
2019-07-13 22:56:07 +02:00
|
|
|
'Please enter a new name for the waypoint.'
|
2018-12-30 09:10:02 +01:00
|
|
|
)
|
|
|
|
end
|
|
|
|
elseif fields.teleport then
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.show_formspec(pname, 'advmarkers-ssm', 'size[6,2.2]' ..
|
2018-12-30 09:10:02 +01:00
|
|
|
'label[0.35,0.25;' .. minetest.formspec_escape(
|
2019-07-13 22:56:07 +02:00
|
|
|
'Teleport to a waypoint\n - ' .. name
|
2018-12-30 09:10:02 +01:00
|
|
|
) .. ']' ..
|
2019-01-07 23:08:42 +01:00
|
|
|
'button[0,1.25;3,1;cancel;Cancel]' ..
|
|
|
|
'button_exit[3,1.25;3,1;teleport_confirm;Teleport]')
|
|
|
|
elseif fields.teleport_confirm then
|
2018-12-30 09:10:02 +01:00
|
|
|
-- Teleport with /teleport
|
2019-07-13 22:56:07 +02:00
|
|
|
local pos = advmarkers.get_waypoint(pname, name)
|
2019-01-07 23:08:42 +01:00
|
|
|
if not pos then
|
2020-10-09 06:23:29 +02:00
|
|
|
minetest.chat_send_player(pname,
|
|
|
|
'Error teleporting to waypoint!')
|
2019-01-07 23:08:42 +01:00
|
|
|
elseif minetest.check_player_privs(pname, 'teleport') then
|
|
|
|
player:set_pos(pos)
|
2019-07-13 22:56:07 +02:00
|
|
|
minetest.chat_send_player(pname, 'Teleported to waypoint "' ..
|
2019-01-07 23:08:42 +01:00
|
|
|
name .. '".')
|
2018-12-30 09:10:02 +01:00
|
|
|
else
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.chat_send_player(pname, 'Insufficient privileges!')
|
2018-12-30 09:10:02 +01:00
|
|
|
end
|
2018-12-30 00:09:58 +01:00
|
|
|
elseif fields.delete then
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.show_formspec(pname, 'advmarkers-ssm', 'size[6,2]' ..
|
2020-10-09 06:23:29 +02:00
|
|
|
'label[0.35,0.25;Are you sure you want to delete this ' ..
|
|
|
|
'waypoint?]' ..
|
2018-12-30 00:09:58 +01:00
|
|
|
'button[0,1;3,1;cancel;Cancel]' ..
|
|
|
|
'button[3,1;3,1;delete_confirm;Delete]')
|
|
|
|
elseif fields.delete_confirm then
|
2019-07-13 22:56:07 +02:00
|
|
|
advmarkers.delete_waypoint(pname, name)
|
2019-01-07 23:08:42 +01:00
|
|
|
selected_name[pname] = nil
|
|
|
|
advmarkers.display_formspec(pname)
|
2018-12-30 00:09:58 +01:00
|
|
|
elseif fields.cancel then
|
2019-01-07 23:08:42 +01:00
|
|
|
advmarkers.display_formspec(pname)
|
|
|
|
elseif name ~= selected_name[pname] then
|
|
|
|
selected_name[pname] = name
|
|
|
|
if not fields.quit then
|
|
|
|
advmarkers.display_formspec(pname)
|
|
|
|
end
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
|
|
|
elseif fields.display or fields.delete then
|
2019-07-13 22:56:07 +02:00
|
|
|
minetest.chat_send_player(pname, 'Please select a waypoint.')
|
2018-12-30 00:09:58 +01:00
|
|
|
end
|
|
|
|
return true
|
|
|
|
end)
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
-- Auto-add waypoints on death.
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.register_on_dieplayer(function(player)
|
2019-07-13 22:56:07 +02:00
|
|
|
local name
|
|
|
|
if advmarkers.dated_death_markers then
|
|
|
|
name = os.date('Death on %Y-%m-%d %H:%M:%S')
|
|
|
|
else
|
|
|
|
name = 'Death waypoint'
|
|
|
|
end
|
2019-01-07 23:08:42 +01:00
|
|
|
local pos = player:get_pos()
|
|
|
|
advmarkers.last_coords[player] = pos
|
2019-07-13 22:56:07 +02:00
|
|
|
advmarkers.set_waypoint(player, pos, name)
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.chat_send_player(player:get_player_name(),
|
2019-07-13 22:56:07 +02:00
|
|
|
'Added waypoint "' .. name .. '".')
|
2018-12-30 00:09:58 +01:00
|
|
|
end)
|
2018-12-30 04:36:22 +01:00
|
|
|
|
|
|
|
-- Allow string exporting
|
|
|
|
minetest.register_chatcommand('mrkr_export', {
|
2019-01-07 23:08:42 +01:00
|
|
|
params = '',
|
2019-07-13 22:56:07 +02:00
|
|
|
description = 'Exports an advmarkers string containing all your waypoints.',
|
2019-01-07 23:08:42 +01:00
|
|
|
func = function(name, param)
|
2019-01-07 09:45:41 +01:00
|
|
|
local export
|
|
|
|
if param == 'old' then
|
2019-01-07 23:08:42 +01:00
|
|
|
export = advmarkers.export(name, 'M')
|
2019-01-07 09:45:41 +01:00
|
|
|
else
|
2019-01-07 23:08:42 +01:00
|
|
|
export = advmarkers.export(name)
|
2019-01-07 09:45:41 +01:00
|
|
|
end
|
2019-01-07 23:08:42 +01:00
|
|
|
minetest.show_formspec(name, 'advmarkers-ignore',
|
2019-07-13 22:56:07 +02:00
|
|
|
'field[_;Your waypoint export string;' ..
|
2019-01-07 09:45:41 +01:00
|
|
|
minetest.formspec_escape(export) .. ']')
|
2018-12-30 04:36:22 +01:00
|
|
|
end
|
|
|
|
})
|
|
|
|
|
2019-07-13 22:56:07 +02:00
|
|
|
register_chatcommand_alias('mrkr_export', 'wp_export', 'waypoint_export')
|
|
|
|
|
2018-12-30 04:36:22 +01:00
|
|
|
-- String importing
|
|
|
|
minetest.register_chatcommand('mrkr_import', {
|
|
|
|
params = '<advmarkers string>',
|
|
|
|
description = 'Imports an advmarkers string. This will not overwrite ' ..
|
2019-07-13 22:56:07 +02:00
|
|
|
'existing waypoints that have the same name.',
|
2019-01-07 23:08:42 +01:00
|
|
|
func = function(name, param)
|
|
|
|
if advmarkers.import(name, param) then
|
2019-07-13 22:56:07 +02:00
|
|
|
return true, 'Waypoints imported!'
|
2018-12-30 04:36:22 +01:00
|
|
|
else
|
|
|
|
return false, 'Invalid advmarkers string!'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
})
|
2018-12-30 05:13:39 +01:00
|
|
|
|
2020-10-09 06:23:29 +02:00
|
|
|
register_chatcommand_alias('mrkr_import', 'wp_import', 'waypoint_import')
|
2019-07-13 22:56:07 +02:00
|
|
|
|
2020-11-22 06:49:19 +01:00
|
|
|
-- Find co-ordinates sent in chat messages
|
|
|
|
local function get_coords(msg)
|
|
|
|
if msg:byte(1) == 1 or #msg > 1000 then return end
|
|
|
|
local pos = msg:match('%-?[0-9%.]+, *%-?[0-9%.]+, *%-?[0-9%.]+')
|
|
|
|
if pos then
|
|
|
|
return string_to_pos(pos)
|
2019-01-07 23:08:42 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Get global co-ords
|
2020-10-09 06:23:29 +02:00
|
|
|
table.insert(minetest.registered_on_chat_messages, 1, function(_, msg)
|
2019-01-08 22:05:51 +01:00
|
|
|
if msg:sub(1, 1) == '/' then return end
|
2020-11-22 06:49:19 +01:00
|
|
|
local pos = get_coords(msg)
|
2019-01-07 23:08:42 +01:00
|
|
|
if pos then
|
|
|
|
advmarkers.last_coords = {}
|
|
|
|
for _, player in ipairs(get_connected_players()) do
|
|
|
|
advmarkers.last_coords[player:get_player_name()] = pos
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end)
|
|
|
|
|
|
|
|
-- Override chat_send_player to get PMed co-ords etc
|
|
|
|
local old_chat_send_player = minetest.chat_send_player
|
|
|
|
function minetest.chat_send_player(name, msg, ...)
|
|
|
|
if type(name) == 'string' and type(msg) == 'string' and
|
2020-11-22 06:49:19 +01:00
|
|
|
get_player_by_name(name) then
|
2019-01-07 23:08:42 +01:00
|
|
|
local pos = get_coords(msg)
|
2018-12-30 05:13:39 +01:00
|
|
|
if pos then
|
2019-01-07 23:08:42 +01:00
|
|
|
advmarkers.last_coords[name] = pos
|
2018-12-30 05:13:39 +01:00
|
|
|
end
|
|
|
|
end
|
2019-01-07 23:08:42 +01:00
|
|
|
return old_chat_send_player(name, msg, ...)
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Clean up variables if a player leaves
|
|
|
|
minetest.register_on_leaveplayer(function(player)
|
2020-02-13 06:16:21 +01:00
|
|
|
local name = player:get_player_name()
|
|
|
|
hud[name] = nil
|
|
|
|
formspec_list[name] = nil
|
|
|
|
selected_name[name] = nil
|
|
|
|
advmarkers.last_coords[name] = nil
|
2018-12-30 05:13:39 +01:00
|
|
|
end)
|
|
|
|
|
2019-01-07 23:08:42 +01:00
|
|
|
-- Add '/mrkrthere'
|
2018-12-30 05:13:39 +01:00
|
|
|
minetest.register_chatcommand('mrkrthere', {
|
|
|
|
params = '',
|
2019-01-07 23:08:42 +01:00
|
|
|
description = 'Alias for "/mrkr there".',
|
2020-10-09 06:23:29 +02:00
|
|
|
func = function(name, _)
|
2019-01-07 23:08:42 +01:00
|
|
|
return minetest.registered_chatcommands['mrkr'].func(name, 'there')
|
2018-12-30 05:13:39 +01:00
|
|
|
end
|
|
|
|
})
|
2019-07-14 00:20:04 +02:00
|
|
|
|
2020-02-13 06:16:21 +01:00
|
|
|
minetest.register_chatcommand('clrmrkr', {
|
|
|
|
params = '',
|
|
|
|
description = 'Hides the displayed waypoint.',
|
2020-10-09 06:23:29 +02:00
|
|
|
func = function(name, _)
|
2020-02-13 06:16:21 +01:00
|
|
|
local player = minetest.get_player_by_name(name)
|
|
|
|
if not hud[name] or not player then
|
2020-10-09 06:23:29 +02:00
|
|
|
return false, 'No waypoint is currently being displayed!'
|
2020-02-13 06:16:21 +01:00
|
|
|
end
|
|
|
|
player:hud_remove(hud[name])
|
|
|
|
hud[name] = nil
|
|
|
|
return true, 'Hidden the currently displayed waypoint.'
|
|
|
|
end,
|
|
|
|
})
|
|
|
|
|
|
|
|
register_chatcommand_alias('clrmrkr', 'clear_marker', 'clrwp',
|
|
|
|
'clear_waypoint')
|
|
|
|
|
2019-07-14 00:20:04 +02:00
|
|
|
-- SSCSM support
|
2020-06-03 02:14:48 +02:00
|
|
|
if not minetest.global_exists('sscsm') or not sscsm.register then
|
|
|
|
return
|
|
|
|
end
|
|
|
|
|
|
|
|
if not sscsm.register_on_com_receive then
|
|
|
|
minetest.log('warning', '[advmarkers] The SSCSM mod is outdated!')
|
|
|
|
return
|
2019-07-14 00:20:04 +02:00
|
|
|
end
|
2020-06-03 02:14:48 +02:00
|
|
|
|
|
|
|
use_sscsm = true
|
|
|
|
sscsm.register({
|
|
|
|
name = 'advmarkers',
|
|
|
|
file = minetest.get_modpath('advmarkers') .. '/sscsm.lua',
|
|
|
|
})
|
|
|
|
|
|
|
|
-- SSCSM communication
|
2020-11-22 06:49:19 +01:00
|
|
|
sscsm.register_on_com_receive('advmarkers:delete', function(name, param)
|
|
|
|
if type(param) == 'string' then
|
|
|
|
advmarkers.delete_waypoint(name, param)
|
2020-06-03 02:14:48 +02:00
|
|
|
end
|
2020-11-22 06:49:19 +01:00
|
|
|
end)
|
2020-06-03 02:14:48 +02:00
|
|
|
|
2020-11-22 06:49:19 +01:00
|
|
|
sscsm.register_on_com_receive('advmarkers:set', function(name, param)
|
|
|
|
if type(param) == 'table' and type(param.name) == 'string' and
|
|
|
|
type(param.pos) == 'string' then
|
|
|
|
local pos = string_to_pos(param.pos)
|
|
|
|
if pos then
|
|
|
|
advmarkers.set_waypoint(name, pos, param.name)
|
2020-06-03 02:14:48 +02:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end)
|
|
|
|
|
2020-11-22 06:49:19 +01:00
|
|
|
sscsm.register_on_com_receive('advmarkers:display', function(name, param)
|
|
|
|
if type(param) ~= 'string' or
|
|
|
|
not advmarkers.display_waypoint(name, param) then
|
|
|
|
minetest.chat_send_player(name, 'Error displaying waypoint!')
|
|
|
|
end
|
|
|
|
end)
|
|
|
|
|
2020-06-03 02:14:48 +02:00
|
|
|
-- Send waypoint list once SSCSMs are loaded.
|
|
|
|
sscsm.register_on_sscsms_loaded(function(name)
|
2020-10-09 06:23:29 +02:00
|
|
|
local player = minetest.get_player_by_name(name)
|
|
|
|
sscsm.com_send(name, 'advmarkers:update', get_storage(player))
|
2020-06-03 02:14:48 +02:00
|
|
|
end)
|