Rename: mcl_monster_spawner to mcl_monster_spawners

This commit is contained in:
Wuzzy 2017-05-25 05:52:47 +02:00
parent 83150f43ea
commit 8abe53c6e1
11 changed files with 16 additions and 16 deletions

@ -62,7 +62,7 @@ map builders. They can not be obtained in-game or in the creative inventory.
* Barrier: `mcl_core:barrier`
* Command Block: `mesecons_commandblock:commandblock_off`
* Monster Spawner (WIP): `mcl_monster_spawner:spawner`
* Monster Spawner (WIP): `mcl_monster_spawners:spawner`
* Huge mushroom blocks: See `mods/ITEMS/mcl_mushrooms/README.md`
Use the `/giveme` chat command to obtain them. See the in-game help for

@ -1 +0,0 @@
name = mcl_monster_spawner

@ -1,6 +1,6 @@
local S = mobs.intllib
mcl_monster_spawner = {}
mcl_monster_spawners = {}
local default_mob = "mobs_mc:pig"
@ -15,7 +15,7 @@ end
local function find_doll(pos)
for _,obj in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do
if not obj:is_player() then
if obj ~= nil and obj:get_luaentity().name == "mcl_monster_spawner:doll" then
if obj ~= nil and obj:get_luaentity().name == "mcl_monster_spawners:doll" then
return obj
end
end
@ -52,7 +52,7 @@ All the arguments are optional!
* YOffset: Y offset to spawn mobs; 0 to disable (default: 0)
]]
function mcl_monster_spawner.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobsInArea, PlayerDistance, YOffset)
function mcl_monster_spawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobsInArea, PlayerDistance, YOffset)
-- Activate monster spawner and disable editing functionality
if Mob == nil then Mob = default_mob end
if MinLight == nil then MinLight = 0 end
@ -69,7 +69,7 @@ function mcl_monster_spawner.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobs
meta:set_int("YOffset", YOffset)
-- Create doll
local doll = minetest.add_entity({x=pos.x, y=pos.y-0.3, z=pos.z}, "mcl_monster_spawner:doll")
local doll = minetest.add_entity({x=pos.x, y=pos.y-0.3, z=pos.z}, "mcl_monster_spawners:doll")
set_doll_properties(doll, Mob)
-- Start spawning very soon
@ -183,7 +183,7 @@ local spawn_monsters = function(pos, elapsed)
end
minetest.register_node("mcl_monster_spawner:spawner", {
minetest.register_node("mcl_monster_spawners:spawner", {
tiles = {"mob_spawner.png"},
drawtype = "glasslike",
paramtype = "light",
@ -195,7 +195,7 @@ minetest.register_node("mcl_monster_spawner:spawner", {
is_ground_content = false,
drop = "",
on_construct = mcl_monster_spawner.setup_spawner,
on_construct = mcl_monster_spawners.setup_spawner,
on_destruct = function(pos)
local meta = minetest.get_meta(pos)
@ -236,7 +236,7 @@ minetest.register_node("mcl_monster_spawner:spawner", {
and pla and pla >=0 and pla <= 20
and yof and yof > -10 and yof < 10 then
mcl_monster_spawner.setup_spawner(pos, mob, mlig, xlig, num, pla, yof)
mcl_monster_spawners.setup_spawner(pos, mob, mlig, xlig, num, pla, yof)
else
minetest.chat_send_player(name, S("Mob Spawner settings failed!"))
minetest.chat_send_player(name,
@ -283,7 +283,7 @@ doll_def.on_step = function(self, dtime)
self.timer = self.timer + 0.01
local n = minetest.get_node_or_nil(self.object:getpos())
if self.timer > 1 then
if n and n.name and n.name ~= "mcl_monster_spawner:spawner" then
if n and n.name and n.name ~= "mcl_monster_spawners:spawner" then
self.object:remove()
end
end
@ -291,7 +291,7 @@ end
doll_def.on_punch = function(self, hitter) end
minetest.register_entity("mcl_monster_spawner:doll", doll_def)
minetest.register_entity("mcl_monster_spawners:doll", doll_def)

@ -0,0 +1 @@
name = mcl_monster_spawners

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 261 B

@ -1,4 +1,4 @@
mcl_init
mcl_core
mcl_chests
mcl_monster_spawner
mcl_monster_spawners

@ -329,7 +329,7 @@ minetest.register_on_generated(function(minp, maxp)
if minetest.registered_nodes[n].is_ground_content then
-- ... and place it and select a random mob
minetest.set_node(sp, {name = "mcl_monster_spawner:spawner"})
minetest.set_node(sp, {name = "mcl_monster_spawners:spawner"})
local mobs = {
"mobs_mc:zombie",
"mobs_mc:zombie",
@ -338,7 +338,7 @@ minetest.register_on_generated(function(minp, maxp)
}
local spawner_mob = mobs[math.random(1, #mobs)]
mcl_monster_spawner.setup_spawner(sp, spawner_mob)
mcl_monster_spawners.setup_spawner(sp, spawner_mob)
end
end

@ -11,4 +11,4 @@ gemalde
signs
mcl_observers
doc_identifier
mcl_monster_spawner
mcl_monster_spawners

@ -26,7 +26,7 @@ local wip_items = {
"mcl_observers:observer",
"mcl_chests:trapped_chest",
"mcl_core:cobweb",
"mcl_monster_spawner:spawner",
"mcl_monster_spawners:spawner",
}
for i=1,#wip_items do