mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-09-12 00:56:53 +02:00
Rename mcl_monster_spawners to mcl_mobspawners.
Sorry for the trouble, but the long name annoyed me. :P
This commit is contained in:
parent
6b07bde2e8
commit
c1c15eb60b
@ -62,7 +62,7 @@ map builders. They can not be obtained in-game or in the creative inventory.
|
|||||||
|
|
||||||
* Barrier: `mcl_core:barrier`
|
* Barrier: `mcl_core:barrier`
|
||||||
* Command Block: `mesecons_commandblock:commandblock_off`
|
* Command Block: `mesecons_commandblock:commandblock_off`
|
||||||
* Monster Spawner (WIP): `mcl_monster_spawners:spawner`
|
* Monster Spawner (WIP): `mcl_mobspawners:spawner`
|
||||||
* Huge mushroom blocks: See `mods/ITEMS/mcl_mushrooms/README.md`
|
* Huge mushroom blocks: See `mods/ITEMS/mcl_mushrooms/README.md`
|
||||||
|
|
||||||
Use the `/giveme` chat command to obtain them. See the in-game help for
|
Use the `/giveme` chat command to obtain them. See the in-game help for
|
||||||
|
@ -2842,6 +2842,8 @@ function mobs:register_egg(mob, desc, background, addegg, no_creative)
|
|||||||
inventory_image = invimg,
|
inventory_image = invimg,
|
||||||
groups = grp,
|
groups = grp,
|
||||||
|
|
||||||
|
_mobs_spawns_mob = mob,
|
||||||
|
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
on_place = function(itemstack, placer, pointed_thing)
|
||||||
|
|
||||||
-- Call on_rightclick if the pointed node defines it
|
-- Call on_rightclick if the pointed node defines it
|
||||||
|
@ -192,7 +192,7 @@ mesecon:register_mvps_stopper("mcl_anvils:anvil")
|
|||||||
mesecon:register_mvps_stopper("mcl_anvils:anvil_damage_1")
|
mesecon:register_mvps_stopper("mcl_anvils:anvil_damage_1")
|
||||||
mesecon:register_mvps_stopper("mcl_anvils:anvil_damage_2")
|
mesecon:register_mvps_stopper("mcl_anvils:anvil_damage_2")
|
||||||
mesecon:register_mvps_stopper("mcl_jukebox:jukebox")
|
mesecon:register_mvps_stopper("mcl_jukebox:jukebox")
|
||||||
mesecon:register_mvps_stopper("mcl_monster_spawners:spawner")
|
mesecon:register_mvps_stopper("mcl_mobspawners:spawner")
|
||||||
mesecon:register_mvps_stopper("signs:sign_yard")
|
mesecon:register_mvps_stopper("signs:sign_yard")
|
||||||
mesecon:register_mvps_stopper("signs:sign_wall")
|
mesecon:register_mvps_stopper("signs:sign_wall")
|
||||||
mesecon:register_mvps_stopper("mesecons_commandblock:commandblock_off")
|
mesecon:register_mvps_stopper("mesecons_commandblock:commandblock_off")
|
||||||
|
@ -10,7 +10,7 @@ placing.
|
|||||||
## Programmer notes
|
## Programmer notes
|
||||||
To set the mob spawned by a monster spawner, first place the monster spawner
|
To set the mob spawned by a monster spawner, first place the monster spawner
|
||||||
(e.g. with `minetest.set_node`), then use the function
|
(e.g. with `minetest.set_node`), then use the function
|
||||||
`mcl_monster_spawner.setup_spawner` to set its attributes. See the comment
|
`mcl_mobspawners.setup_spawner` to set its attributes. See the comment
|
||||||
in `init.lua` for more info.
|
in `init.lua` for more info.
|
||||||
|
|
||||||
## License (code and texture)
|
## License (code and texture)
|
@ -1,6 +1,6 @@
|
|||||||
local S = mobs.intllib
|
local S = mobs.intllib
|
||||||
|
|
||||||
mcl_monster_spawners = {}
|
mcl_mobspawners = {}
|
||||||
|
|
||||||
local default_mob = "mobs_mc:pig"
|
local default_mob = "mobs_mc:pig"
|
||||||
|
|
||||||
@ -15,7 +15,7 @@ end
|
|||||||
local function find_doll(pos)
|
local function find_doll(pos)
|
||||||
for _,obj in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do
|
for _,obj in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do
|
||||||
if not obj:is_player() then
|
if not obj:is_player() then
|
||||||
if obj ~= nil and obj:get_luaentity().name == "mcl_monster_spawners:doll" then
|
if obj ~= nil and obj:get_luaentity().name == "mcl_mobspawners:doll" then
|
||||||
return obj
|
return obj
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -52,7 +52,7 @@ All the arguments are optional!
|
|||||||
* YOffset: Y offset to spawn mobs; 0 to disable (default: 0)
|
* YOffset: Y offset to spawn mobs; 0 to disable (default: 0)
|
||||||
]]
|
]]
|
||||||
|
|
||||||
function mcl_monster_spawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobsInArea, PlayerDistance, YOffset)
|
function mcl_mobspawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMobsInArea, PlayerDistance, YOffset)
|
||||||
-- Activate monster spawner and disable editing functionality
|
-- Activate monster spawner and disable editing functionality
|
||||||
if Mob == nil then Mob = default_mob end
|
if Mob == nil then Mob = default_mob end
|
||||||
if MinLight == nil then MinLight = 0 end
|
if MinLight == nil then MinLight = 0 end
|
||||||
@ -69,7 +69,7 @@ function mcl_monster_spawners.setup_spawner(pos, Mob, MinLight, MaxLight, MaxMob
|
|||||||
meta:set_int("YOffset", YOffset)
|
meta:set_int("YOffset", YOffset)
|
||||||
|
|
||||||
-- Create doll
|
-- Create doll
|
||||||
local doll = minetest.add_entity({x=pos.x, y=pos.y-0.3, z=pos.z}, "mcl_monster_spawners:doll")
|
local doll = minetest.add_entity({x=pos.x, y=pos.y-0.3, z=pos.z}, "mcl_mobspawners:doll")
|
||||||
set_doll_properties(doll, Mob)
|
set_doll_properties(doll, Mob)
|
||||||
|
|
||||||
-- Start spawning very soon
|
-- Start spawning very soon
|
||||||
@ -183,7 +183,7 @@ local spawn_monsters = function(pos, elapsed)
|
|||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_node("mcl_monster_spawners:spawner", {
|
minetest.register_node("mcl_mobspawners:spawner", {
|
||||||
tiles = {"mob_spawner.png"},
|
tiles = {"mob_spawner.png"},
|
||||||
drawtype = "glasslike",
|
drawtype = "glasslike",
|
||||||
paramtype = "light",
|
paramtype = "light",
|
||||||
@ -195,7 +195,7 @@ minetest.register_node("mcl_monster_spawners:spawner", {
|
|||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
drop = "",
|
drop = "",
|
||||||
|
|
||||||
on_construct = mcl_monster_spawners.setup_spawner,
|
on_construct = mcl_mobspawners.setup_spawner,
|
||||||
|
|
||||||
on_destruct = function(pos)
|
on_destruct = function(pos)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
@ -236,7 +236,7 @@ minetest.register_node("mcl_monster_spawners:spawner", {
|
|||||||
and pla and pla >=0 and pla <= 20
|
and pla and pla >=0 and pla <= 20
|
||||||
and yof and yof > -10 and yof < 10 then
|
and yof and yof > -10 and yof < 10 then
|
||||||
|
|
||||||
mcl_monster_spawners.setup_spawner(pos, mob, mlig, xlig, num, pla, yof)
|
mcl_mobspawners.setup_spawner(pos, mob, mlig, xlig, num, pla, yof)
|
||||||
else
|
else
|
||||||
minetest.chat_send_player(name, S("Mob Spawner settings failed!"))
|
minetest.chat_send_player(name, S("Mob Spawner settings failed!"))
|
||||||
minetest.chat_send_player(name,
|
minetest.chat_send_player(name,
|
||||||
@ -283,7 +283,7 @@ doll_def.on_step = function(self, dtime)
|
|||||||
self.timer = self.timer + 0.01
|
self.timer = self.timer + 0.01
|
||||||
local n = minetest.get_node_or_nil(self.object:getpos())
|
local n = minetest.get_node_or_nil(self.object:getpos())
|
||||||
if self.timer > 1 then
|
if self.timer > 1 then
|
||||||
if n and n.name and n.name ~= "mcl_monster_spawners:spawner" then
|
if n and n.name and n.name ~= "mcl_mobspawners:spawner" then
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -291,7 +291,7 @@ end
|
|||||||
|
|
||||||
doll_def.on_punch = function(self, hitter) end
|
doll_def.on_punch = function(self, hitter) end
|
||||||
|
|
||||||
minetest.register_entity("mcl_monster_spawners:doll", doll_def)
|
minetest.register_entity("mcl_mobspawners:doll", doll_def)
|
||||||
|
|
||||||
|
|
||||||
|
|
1
mods/ITEMS/mcl_mobspawners/mod.conf
Normal file
1
mods/ITEMS/mcl_mobspawners/mod.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
name = mcl_mobspawners
|
Before Width: | Height: | Size: 261 B After Width: | Height: | Size: 261 B |
@ -1 +0,0 @@
|
|||||||
name = mcl_monster_spawners
|
|
@ -79,7 +79,7 @@ mcl_torches.register_torch = function(substring, description, doc_items_longdesc
|
|||||||
-- * Piston
|
-- * Piston
|
||||||
-- * Sticky piston
|
-- * Sticky piston
|
||||||
if not def.buildable_to then
|
if not def.buildable_to then
|
||||||
if node.name ~= "mcl_nether:soul_sand" and node.name ~= "mcl_monster_spawners:spawner" and
|
if node.name ~= "mcl_nether:soul_sand" and node.name ~= "mcl_mobspawners:spawner" and
|
||||||
((not def.groups.solid) or (not def.groups.opaque)) then
|
((not def.groups.solid) or (not def.groups.opaque)) then
|
||||||
-- Only allow top placement on these nodes
|
-- Only allow top placement on these nodes
|
||||||
if def.groups.glass or node.name == "mcl_hoppers:hopper" or node.name == "mcl_hoppers:hopper_side" or def.groups.fence or def.groups.wall then
|
if def.groups.glass or node.name == "mcl_hoppers:hopper" or node.name == "mcl_hoppers:hopper_side" or def.groups.fence or def.groups.wall then
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
mcl_init
|
mcl_init
|
||||||
mcl_core
|
mcl_core
|
||||||
mcl_chests
|
mcl_chests
|
||||||
mcl_monster_spawners
|
mcl_mobspawners
|
||||||
mobs_mc
|
mobs_mc
|
||||||
|
@ -329,7 +329,7 @@ minetest.register_on_generated(function(minp, maxp)
|
|||||||
if minetest.registered_nodes[n].is_ground_content then
|
if minetest.registered_nodes[n].is_ground_content then
|
||||||
|
|
||||||
-- ... and place it and select a random mob
|
-- ... and place it and select a random mob
|
||||||
minetest.set_node(sp, {name = "mcl_monster_spawners:spawner"})
|
minetest.set_node(sp, {name = "mcl_mobspawners:spawner"})
|
||||||
local mobs = {
|
local mobs = {
|
||||||
"mobs_mc:zombie",
|
"mobs_mc:zombie",
|
||||||
"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)]
|
local spawner_mob = mobs[math.random(1, #mobs)]
|
||||||
|
|
||||||
mcl_monster_spawners.setup_spawner(sp, spawner_mob)
|
mcl_mobspawners.setup_spawner(sp, spawner_mob)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -11,4 +11,3 @@ gemalde
|
|||||||
signs
|
signs
|
||||||
mcl_observers
|
mcl_observers
|
||||||
doc_identifier
|
doc_identifier
|
||||||
mcl_monster_spawners
|
|
||||||
|
@ -26,7 +26,6 @@ local wip_items = {
|
|||||||
"mcl_observers:observer",
|
"mcl_observers:observer",
|
||||||
"mcl_chests:trapped_chest",
|
"mcl_chests:trapped_chest",
|
||||||
"mcl_core:cobweb",
|
"mcl_core:cobweb",
|
||||||
"mcl_monster_spawners:spawner",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for i=1,#wip_items do
|
for i=1,#wip_items do
|
||||||
|
Loading…
Reference in New Issue
Block a user