From 338af3512ffd48c30aa24e7fa5ae28af9851c045 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 6 May 2022 11:07:57 +0200 Subject: [PATCH] Add more log messages --- mods/mobs/api.lua | 42 ++++++++++++++++++---------------- mods/rp_achievements/init.lua | 2 ++ mods/rp_default/fertilizer.lua | 1 + mods/rp_default/functions.lua | 2 +- mods/rp_locks/init.lua | 7 +++++- mods/rp_supertools/init.lua | 2 ++ mods/rp_tnt/init.lua | 13 +++++++++-- 7 files changed, 45 insertions(+), 24 deletions(-) diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index 1d2c032..2c589c1 100644 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -70,7 +70,7 @@ end -- Handle death (does not remove mob) local function die_handler(self, killer) local pos = self.object:get_pos() - minetest.log("action", "[mobs] "..self.name.." dies at "..minetest.pos_to_string(vector.round(pos))) + minetest.log("action", "[mobs] "..self.name.." dies at "..minetest.pos_to_string(pos, 1)) local obj = nil local drops_food = false for _,drop in ipairs(self.drops) do @@ -279,7 +279,7 @@ function mobs:register_mob(name, def) local yaw = self.rotate if tmpyaw ~= tmpyaw then -- It's a NaN value - minetest.log("warning", "[mobs] object:get_yaw(): NaN returned (pos="..minetest.pos_to_string(vector.round(self.object_get_pos())).."; entitystring="..self.name..")") + minetest.log("warning", "[mobs] object:get_yaw(): NaN returned (pos="..minetest.pos_to_string(self.object_get_pos(), 1).."; entitystring="..self.name..")") else yaw = yaw + tmpyaw end @@ -371,7 +371,7 @@ function mobs:register_mob(name, def) if self.type == "monster" and peaceful_only then - minetest.log("action", "[mobs] Hostile mob "..self.name.." removed at "..minetest.pos_to_string(vector.round(self.object:get_pos()))) + minetest.log("action", "[mobs] Hostile mob "..self.name.." removed at "..minetest.pos_to_string(self.object:get_pos(), 1)) self.object:remove() return end @@ -390,7 +390,7 @@ function mobs:register_mob(name, def) return end end - minetest.log("action", "[mobs] Mob lifetimer expired, removed "..self.name.." at "..minetest.pos_to_string(self.object:get_pos())) + minetest.log("action", "[mobs] Mob lifetimer expired, removed "..self.name.." at "..minetest.pos_to_string(self.object:get_pos(), 1)) effect(self.object:get_pos(), 15, "tnt_smoke.png") self.object:remove() return @@ -1505,7 +1505,7 @@ function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, inter -- spawn mob half block higher pos.y = pos.y - 0.5 minetest.add_entity(pos, name) - minetest.log("action", "[mobs] Spawned "..name.." at "..minetest.pos_to_string(pos).." on "..node.name.." near "..neighbors[1]) + minetest.log("action", "[mobs] Spawned "..name.." at "..minetest.pos_to_string(pos, 1).." on "..node.name.." near "..neighbors[1]) end }) @@ -1536,7 +1536,7 @@ function mobs:register_arrow(name, def) on_step = function(self, dtime) self.timer = (self.timer or 0) + 1 if self.timer > 150 then - minetest.log("info", "[mobs] Arrow "..self.name.." removed due to timeout at "..minetest.pos_to_string(vector.round(self.object:get_pos()))) + minetest.log("info", "[mobs] Arrow "..self.name.." removed due to timeout at "..minetest.pos_to_string(self.object:get_pos(), 1)) self.object:remove() return end @@ -1555,7 +1555,7 @@ function mobs:register_arrow(name, def) self.lastpos = (self.lastpos or pos) minetest.add_item(self.lastpos, self.object:get_luaentity().name) end - minetest.log("info", "[mobs] Arrow "..self.name.." hit node at "..minetest.pos_to_string(vector.round(self.object:get_pos()))) + minetest.log("info", "[mobs] Arrow "..self.name.." hits node at "..minetest.pos_to_string(self.object:get_pos(), 1)) self.object:remove() return end @@ -1566,7 +1566,7 @@ function mobs:register_arrow(name, def) if self.hit_player and player:is_player() then self.hit_player(self, player) - minetest.log("info", "[mobs] Arrow "..self.name.." hit player at "..minetest.pos_to_string(vector.round(self.object:get_pos()))) + minetest.log("info", "[mobs] Arrow "..self.name.." hits player at "..minetest.pos_to_string(self.object:get_pos(), 1)) self.object:remove() return end @@ -1574,7 +1574,7 @@ function mobs:register_arrow(name, def) and player:get_luaentity().name ~= self.object:get_luaentity().name and player:get_luaentity().name ~= "__builtin:item" then self.hit_mob(self, player) - minetest.log("info", "[mobs] Arrow "..self.name.." hit mob at "..minetest.pos_to_string(vector.round(self.object:get_pos()))) + minetest.log("info", "[mobs] Arrow "..self.name.." hits mob at "..minetest.pos_to_string(self.object:get_pos(), 1)) self.object:remove() return end @@ -1586,41 +1586,43 @@ function mobs:register_arrow(name, def) end -- Spawn Egg -function mobs:register_egg(mob, desc, background) +function mobs:register_egg(mobname, desc, background) local invimg = background local place - if minetest.registered_entities[mob].type == "monster" and peaceful_only then + if minetest.registered_entities[mobname].type == "monster" and peaceful_only then desc = S("@1 (disabled)", desc) invimg = invimg .. "^[multiply:#FF0000" end minetest.register_craftitem( - mob, + mobname, { description = desc, inventory_image = invimg, groups = { spawn_egg = 1 }, on_place = function(itemstack, placer, pointed_thing) - if peaceful_only and minetest.registered_entities[mob].type == "monster" then - minetest.chat_send_player(placer:get_player_name(), minetest.colorize("#FFFF00", S("Hostile mobs are disabled!"))) + local pname = placer:get_player_name() + if peaceful_only and minetest.registered_entities[mobname].type == "monster" then + minetest.chat_send_player(pname, minetest.colorize("#FFFF00", S("Hostile mobs are disabled!"))) return itemstack end local pos = pointed_thing.above if pointed_thing.above then - if minetest.is_protected(pos, placer:get_player_name()) and + if minetest.is_protected(pos, pname) and not minetest.check_player_privs(placer, "protection_bypass") then - minetest.record_protection_violation(pos, placer:get_player_name()) + minetest.record_protection_violation(pos, pname) return itemstack end pos.y = pos.y + 0.5 - local mob = minetest.add_entity(pos, mob) + local mob = minetest.add_entity(pos, mobname) local ent = mob:get_luaentity() if ent.type ~= "monster" then -- set owner - ent.owner = placer:get_player_name() + ent.owner = pname ent.tamed = true end - if not minetest.is_creative_enabled(placer:get_player_name()) then + minetest.log("action", "[mobs] "..pname.." spawns "..mobname.." at "..minetest.pos_to_string(pos, 1)) + if not minetest.is_creative_enabled(pname) then itemstack:take_item() end end @@ -1708,7 +1710,7 @@ function mobs:capture_mob(self, clicker, chance_hand, chance_net, chance_lasso, -- Cuccessful capture.. add to inventory clicker:get_inventory():add_item("main", mobname) - minetest.log("action", "[mobs] Mob "..self.name.." captured at "..minetest.pos_to_string(vector.round(self.object:get_pos()))) + minetest.log("action", "[mobs] Mob "..self.name.." captured by " .. name .. " at "..minetest.pos_to_string(self.object:get_pos(), 1)) self.object:remove() achievements.trigger_achievement(clicker, "ranger") diff --git a/mods/rp_achievements/init.lua b/mods/rp_achievements/init.lua index 38f8ed6..b97074a 100644 --- a/mods/rp_achievements/init.lua +++ b/mods/rp_achievements/init.lua @@ -138,6 +138,8 @@ function achievements.trigger_achievement(player, aname, times) "*** " .. S("@1 has earned the achievement “@2”.", name, achievements.registered_achievements[aname].title))) + + minetest.log("action", "[rp_achievements] " .. name .. " got achievement '"..aname.."'") end, name, aname) end diff --git a/mods/rp_default/fertilizer.lua b/mods/rp_default/fertilizer.lua index 8f12b83..7fdcada 100644 --- a/mods/rp_default/fertilizer.lua +++ b/mods/rp_default/fertilizer.lua @@ -130,6 +130,7 @@ minetest.register_craftitem( end if fertilized then minetest.sound_play({name="rp_default_fertilize", gain=1.0}, {pos=pointed_thing.under}, true) + minetest.log("action", "[rp_default] " .. user:get_player_name() .. " fertilizes " .. undernode.name .. " at " .. minetest.pos_to_string(pointed_thing.under, 0)) end end diff --git a/mods/rp_default/functions.lua b/mods/rp_default/functions.lua index 18c52e5..15855b0 100644 --- a/mods/rp_default/functions.lua +++ b/mods/rp_default/functions.lua @@ -212,7 +212,7 @@ function default.grow_sapling(pos) minetest.after(0, grow, variety) - minetest.log("action", "[rp_default] A " .. variety .. " tree sapling grows at " .. + minetest.log("action", "[rp_default] Sapling of type '" .. variety .. "' grows at " .. minetest.pos_to_string(pos)) return true end diff --git a/mods/rp_locks/init.lua b/mods/rp_locks/init.lua index 58c8187..6143c93 100644 --- a/mods/rp_locks/init.lua +++ b/mods/rp_locks/init.lua @@ -106,7 +106,7 @@ minetest.register_tool( -- TODO: Add graphical effect to show success local burglar = player:get_player_name() - if owner then + if owner ~= nil and owner ~= "" then if owner ~= burglar then minetest.chat_send_player( owner, @@ -120,10 +120,12 @@ minetest.register_tool( burglar, minetest.colorize("#0f0", S("You have broken into your own locked chest!"))) end + minetest.log("action", "[rp_locks] " .. burglar .. " cracked open a locked chest of " .. owner .. " at " .. minetest.pos_to_string(pos, 0)) else minetest.chat_send_player( burglar, minetest.colorize("#0f0", S("You have broken the lock!"))) + minetest.log("action", "[rp_locks] " .. burglar .. " cracked open a locked chest at " .. minetest.pos_to_string(pos, 0)) end achievements.trigger_achievement(player, "burglar") minetest.sound_play({name="locks_unlock",gain=0.8},{pos=pos, max_hear_distance=16}, true) @@ -162,8 +164,10 @@ local put_lock = function(itemstack, putter, pointed_thing) if name ~= "" then meta:set_string("infotext", S(INFOTEXT_OWNED, name)) meta:set_string("lock_owner", name) + minetest.log("action", "[rp_locks] " .. name .. " puts a lock on a chest at " .. minetest.pos_to_string(pos, 0)) else meta:set_string("infotext", S(INFOTEXT_PUBLIC)) + minetest.log("action", "[rp_locks] A lock was put on a chest at " .. minetest.pos_to_string(pos, 0)) end local creative_name if not name or name == "" then @@ -171,6 +175,7 @@ local put_lock = function(itemstack, putter, pointed_thing) else creative_name = name end + if not minetest.is_creative_enabled(creative_name) then itemstack:take_item() end diff --git a/mods/rp_supertools/init.lua b/mods/rp_supertools/init.lua index 739a113..bb9c727 100644 --- a/mods/rp_supertools/init.lua +++ b/mods/rp_supertools/init.lua @@ -60,6 +60,8 @@ minetest.register_craftitem( if not minetest.is_creative_enabled(user:get_player_name()) then itemstack:add_wear(5400) -- 13 uses end + + minetest.log("action", "[rp_supertools] " .. user:get_player_name() .. " used growth tool on "..unode.name.." at "..minetest.pos_to_string(upos)) end return itemstack diff --git a/mods/rp_tnt/init.lua b/mods/rp_tnt/init.lua index fe74214..8e7a0cf 100644 --- a/mods/rp_tnt/init.lua +++ b/mods/rp_tnt/init.lua @@ -156,10 +156,18 @@ local function add_effects(pos, radius) }) end -function tnt.burn(pos) +-- Ignite TNT at pos. +-- igniter: Optional player object of player who ignited it or nil if nobody +function tnt.burn(pos, igniter) local name = minetest.get_node(pos).name if tnt_enable and name == "rp_tnt:tnt" then minetest.set_node(pos, {name = "rp_tnt:tnt_burning"}) + + if igniter then + minetest.log("action", "[rp_tnt] TNT ignited by "..igniter:get_player_name().." at "..minetest.pos_to_string(pos, 0)) + else + minetest.log("action", "[rp_tnt] TNT ignited at "..minetest.pos_to_string(pos, 0)) + end end end @@ -226,6 +234,7 @@ local function rawboom(pos, radius, sound, remove_nodes, is_tnt) end if remove_nodes then local drops = tnt.explode(pos, tnt_radius, sound) + minetest.log("action", "[rp_tnt] TNT exploded at "..minetest.pos_to_string(pos, 0)) entity_physics(pos, tnt_radius) eject_drops(drops, pos, tnt_radius) else @@ -313,7 +322,7 @@ minetest.register_node( item:add_wear(800) puncher:set_wielded_item(item) end - tnt.burn(pos) + tnt.burn(pos, puncher) achievements.trigger_achievement(puncher, "boom") end end,