Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

News Fixes #18

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

News Fixes #18

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa47498
Add files via upload
Cahrs Nov 4, 2019
9429474
Fixes
Cahrs Nov 4, 2019
9e4642b
add variable number of parameters for node tables, how yay
Cahrs Nov 4, 2019
9d6541b
Bored. Browsing code. find annoying bit. change.
Cahrs Nov 4, 2019
25a92e1
fix if statement
Cahrs Nov 4, 2019
2dbdf4a
Change to stop using keyword "arg".
Cahrs Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions mods/news/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ news.chat_reasons.drown = {

minetest.register_privilege("news_report", {give_to_admin = true})

function news.register_deathmsg_tbl(type, name, msgs)
if not (type or name or msgs) then
function news.register_deathmsg_tbl(type, msgs, ...)
if not type or not msgs or not ... then
return
end

if news.chat_reasons[type] then
news.chat_reasons[type][name] = msgs
for _, tbl in ipairs({...}) do
news.chat_reasons[type][tbl] = msgs
end
end
end

Expand All @@ -42,7 +44,7 @@ minetest.register_on_dieplayer(function(obj, reason)
local news_msg = ""
local reason_msg = ""
local player = obj:get_player_name()
local node = minetest.registered_nodes[reason.node] or nil
local node = minetest.registered_nodes[reason.node]
local num = nil

if reason.type == "node_damage" and node then
Expand Down Expand Up @@ -71,16 +73,18 @@ minetest.register_on_dieplayer(function(obj, reason)
end

news_msg = " BREAKING NEWS: Local player \"" .. player .. "\" " .. reason_msg .. " \"" .. killer .. "\"."
else
elseif reason_msg ~= "" then
news_msg = " BREAKING NEWS: Local player \"" .. player .. "\" " .. reason_msg .. "."
end

local station = "[BBC News]"
station = minetest.colorize("#a8659c", station)
if reason_msg ~= "" then
local station = "[BBC News]"
station = minetest.colorize("#a8659c", station)

news_msg = minetest.colorize("#7f99b1", news_msg)
news_msg = minetest.colorize("#7f99b1", news_msg)

minetest.chat_send_all(station .. news_msg)
minetest.chat_send_all(station .. news_msg)
end
end
end)

Expand Down Expand Up @@ -116,9 +120,9 @@ minetest.register_chatcommand("news", {
end
})

news.register_deathmsg_tbl("nodes", "default:lava_source",
{
local lava_death_msgs = {
"melted into a ball of fire",
"couldn't resist the warm glow of lava",
"dug straight down"
})
"dug straight down",
}
news.register_deathmsg_tbl("nodes", lava_death_msgs, "default:lava_source", "default:lava_flowing")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor annoyance: No newline at the end of the file.