diff --git a/mods/CORE/mcl_init/init.lua b/mods/CORE/mcl_init/init.lua index ddcf1cd67..c785f290d 100644 --- a/mods/CORE/mcl_init/init.lua +++ b/mods/CORE/mcl_init/init.lua @@ -98,6 +98,9 @@ mcl_vars.mg_end_platform_pos = { x = 100, y = mcl_vars.mg_end_min + 74, z = 0 } mcl_vars.mg_realm_barrier_overworld_end_max = mcl_vars.mg_end_max mcl_vars.mg_realm_barrier_overworld_end_min = mcl_vars.mg_end_max - 11 +-- Use MineClone 2-style dungeons +mcl_vars.mg_dungeons = true + -- Set default stack sizes minetest.nodedef_default.stack_max = 64 minetest.craftitemdef_default.stack_max = 64 diff --git a/mods/MAPGEN/mcl_dungeons/depends.txt b/mods/MAPGEN/mcl_dungeons/depends.txt index 2c8ce78be..4c803c72d 100644 --- a/mods/MAPGEN/mcl_dungeons/depends.txt +++ b/mods/MAPGEN/mcl_dungeons/depends.txt @@ -3,4 +3,5 @@ mcl_core mcl_chests mcl_mobs mcl_mobspawners +mcl_mapgen_core mobs_mc diff --git a/mods/MAPGEN/mcl_dungeons/init.lua b/mods/MAPGEN/mcl_dungeons/init.lua index b10f73be1..b270e6527 100644 --- a/mods/MAPGEN/mcl_dungeons/init.lua +++ b/mods/MAPGEN/mcl_dungeons/init.lua @@ -3,6 +3,11 @@ local mg_name = minetest.get_mapgen_setting("mg_name") local pr = PseudoRandom(os.time()) +-- Are dungeons disabled? +if mcl_vars.mg_dungeons == false then + return +end + -- Get loot for dungeon chests local get_loot = function() local loottable = { diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua index afc494869..e292ac25d 100644 --- a/mods/MAPGEN/mcl_mapgen_core/init.lua +++ b/mods/MAPGEN/mcl_mapgen_core/init.lua @@ -1078,6 +1078,10 @@ local function register_mgv6_decorations() end local mg_flags = minetest.settings:get_flags("mg_flags") + +-- Inform other mods of dungeon setting for MCL2-style dungeons +mcl_vars.mg_dungeons = mg_flags.dungeons and not superflat + -- Disable builtin dungeons, we provide our own dungeons mg_flags.dungeons = false