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

Merge pull request 'clearmobs command improvement' (#3543) from clearmobs into master

Browse source 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3543
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
This commit is contained in:
ancientmarinerdev 2023-03-16 22:24:33 +00:00
commit 583d066587
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -535,11 +535,11 @@ minetest.register_globalstep(function(dtime)
end)
minetest.register_chatcommand("clearmobs",{
privs={maphack=true},
params = "[<all>|<hostile/passive>|<name>] [<nametagged>|<range>]",
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."),
func=function(player, param)
minetest.register_chatcommand("clearmobs", {
privs = { maphack = true },
params = "[all|monster|passive|<mob name> [<range>|nametagged|tamed]]",
description = S("Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player."),
func = function(player, param)
local default = false
if not param or param == "" then
default = true
@ -550,6 +550,7 @@ minetest.register_chatcommand("clearmobs",{
local all = false
local nametagged = false
local tamed = false
local mob_name, mob_type, range
@ -577,6 +578,8 @@ minetest.register_chatcommand("clearmobs",{
--minetest.log ("unsafe: [" .. unsafe .. "]")
if unsafe == "nametagged" then
nametagged = true
elseif unsafe == "tamed" then
tamed = true
end
local num = tonumber(unsafe)
@ -629,14 +632,20 @@ minetest.register_chatcommand("clearmobs",{
end
--minetest.log("o.nametag: ".. tostring(o.nametag))
if in_range and ( (not o.nametag or o.nametag == "" ) and not o.tamed ) then
if nametagged then
if o.nametag then
--minetest.log("Namedtagged and it has a name tag. Kill it")
o.object:remove()
end
elseif tamed then
if o.tamed then
--minetest.log("Tamed. Kill it")
o.object:remove()
end
elseif 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()
elseif nametagged and o.nametag then
--minetest.log("Namedtagged and it has a name tag. Kill it")
o.object:remove()
else
--minetest.log("Tamed or out of range, do not kill")
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!=
Give names to mobs=
Set name at anvil=
Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player.=
Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=