Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-29 22:11:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

clearmobs command improvement

Browse source
This commit is contained in:
Johannes Fritz 2023-03-14 13:09:12 -05:00 committed by Gitea
parent 9697591dd6
commit a3e6f90b09
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
mods/ENTITIES/mcl_mobs/api.lua
View file

@ -537,8 +537,8 @@ end)
minetest.register_chatcommand("clearmobs", { minetest.register_chatcommand("clearmobs", {
privs = { maphack = true }, privs = { maphack = true },
params = "[<all>|<hostile/passive>|<name>] [<nametagged>|<range>]", params = "[all|monster|passive|<mob name> [<range>|nametagged|tamed]]",
description=S("Removes specified spawned mobs except nametagged and tamed ones. For param2, use nametagged to remove those with a nametag, or range for all mobs in a distance of the current player to be removed."), description = S("Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to include tamed or nametagged mobs, or a range to specify a maximum distance from the player."),
func = function(player, param) func = function(player, param)
local default = false local default = false
if not param or param == "" then if not param or param == "" then
@ -550,6 +550,7 @@ minetest.register_chatcommand("clearmobs",{
local all = false local all = false
local nametagged = false local nametagged = false
local tamed = false
local mob_name, mob_type, range local mob_name, mob_type, range
@ -577,6 +578,8 @@ minetest.register_chatcommand("clearmobs",{
--minetest.log ("unsafe: [" .. unsafe .. "]") --minetest.log ("unsafe: [" .. unsafe .. "]")
if unsafe == "nametagged" then if unsafe == "nametagged" then
nametagged = true nametagged = true
elseif unsafe == "tamed" then
tamed = true
end end
local num = tonumber(unsafe) local num = tonumber(unsafe)
@ -629,14 +632,20 @@ minetest.register_chatcommand("clearmobs",{
end end
--minetest.log("o.nametag: ".. tostring(o.nametag)) --minetest.log("o.nametag: ".. tostring(o.nametag))
if in_range and ( (not o.nametag or o.nametag == "" ) and not o.tamed ) then
--minetest.log("No nametag or tamed. Kill it") if nametagged and o.nametag then
o.object:remove()
elseif nametagged and o.nametag then
--minetest.log("Namedtagged and it has a name tag. Kill it") --minetest.log("Namedtagged and it has a name tag. Kill it")
o.object:remove() o.object:remove()
else end
--minetest.log("Tamed or out of range, do not kill")
if tamed and o.tamed then
--minetest.log("Tamed. Kill it")
o.object:remove()
end
if in_range and (not o.nametag or o.nametag == "") and not o.tamed then
--minetest.log("No nametag or tamed. Kill it")
o.object:remove()
end end
end end
end end

2
mods/ENTITIES/mcl_mobs/locale/template.txt
View file

@ -9,3 +9,5 @@ Before you use the name tag, you need to set a name at an anvil. Then you can us
Only peaceful mobs allowed!= Only peaceful mobs allowed!=
Give names to mobs= Give names to mobs=
Set name at anvil= Set name at anvil=
Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to include tamed or nametagged mobs, or a range to specify a maximum distance from the player.=
Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=