From 3c0d699fd1f07fda1c0b0b01ee77b30692a066ed Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 19 Aug 2019 18:06:55 +0200 Subject: [PATCH] Rename global pyramids table --- init.lua | 10 +++++----- mummy.lua | 2 +- room.lua | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/init.lua b/init.lua index 877f779..9109c7d 100644 --- a/init.lua +++ b/init.lua @@ -1,4 +1,4 @@ -pyramids = {} +tsm_pyramids = {} dofile(minetest.get_modpath("tsm_pyramids").."/mummy.lua") dofile(minetest.get_modpath("tsm_pyramids").."/nodes.lua") @@ -15,7 +15,7 @@ local chest_stuff = { } -function pyramids.fill_chest(pos) +function tsm_pyramids.fill_chest(pos) minetest.after(2, function() local n = minetest.get_node(pos) if n and n.name and n.name == "default:chest" then @@ -45,7 +45,7 @@ end local function add_spawner(pos) minetest.set_node(pos, {name="tsm_pyramids:spawner_mummy"}) - if not minetest.setting_getbool("only_peaceful_mobs") then pyramids.spawn_mummy({x=pos.x,y=pos.y,z=pos.z-2},2) end + if not minetest.setting_getbool("only_peaceful_mobs") then tsm_pyramids.spawn_mummy({x=pos.x,y=pos.y,z=pos.z-2},2) end end local function can_replace(pos) @@ -104,8 +104,8 @@ local function make(pos, brick, sandstone, stone, sand, ptype) end end - pyramids.make_room(pos, ptype) - minetest.after(2, pyramids.make_traps, pos, ptype) + tsm_pyramids.make_room(pos, ptype) + minetest.after(2, tsm_pyramids.make_traps, pos, ptype) add_spawner({x=pos.x+11,y=pos.y+2, z=pos.z+17}) make_entrance({x=pos.x,y=pos.y, z=pos.z}, brick) end diff --git a/mummy.lua b/mummy.lua index 6b5e6b3..80e967e 100644 --- a/mummy.lua +++ b/mummy.lua @@ -321,7 +321,7 @@ minetest.register_craftitem("tsm_pyramids:spawn_egg", { }) -function pyramids.spawn_mummy (pos, number) +function tsm_pyramids.spawn_mummy (pos, number) for i=0,number do minetest.add_entity(pos,"tsm_pyramids:mummy") end diff --git a/room.lua b/room.lua index d972b69..b1dc1fc 100644 --- a/room.lua +++ b/room.lua @@ -55,7 +55,7 @@ local function replace2(str, iy, code_table) return out..code_table[str] end -function pyramids.make_room(pos, stype) +function tsm_pyramids.make_room(pos, stype) local code_table = code_sandstone if stype == "desert" then code_table = code_desert @@ -76,7 +76,7 @@ function pyramids.make_room(pos, stype) local p2 = 0 if n_str == "c" then if ix < 3 then p2 = 1 else p2 = 3 end - pyramids.fill_chest({x=hole.x+ix,y=hole.y-iy,z=hole.z+iz}) + tsm_pyramids.fill_chest({x=hole.x+ix,y=hole.y-iy,z=hole.z+iz}) end minetest.set_node({x=hole.x+ix,y=hole.y-iy,z=hole.z+iz}, {name=replace(n_str, iy, code_table, deco), param2=p2}) end @@ -84,7 +84,7 @@ function pyramids.make_room(pos, stype) end end -function pyramids.make_traps(pos, stype) +function tsm_pyramids.make_traps(pos, stype) local code_table = code_sandstone if stype == "desert" then code_table = code_desert