From 256655df83d65e03d668459b7132d2f0275b3589 Mon Sep 17 00:00:00 2001 From: PrairieWind Date: Wed, 14 Dec 2022 20:13:08 -0700 Subject: [PATCH 1/2] Add bookshelves and anvils as structure constructed nodes --- mods/MAPGEN/mcl_structures/pillager_outpost.lua | 8 +++++++- mods/MAPGEN/mcl_structures/woodland_mansion.lua | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mods/MAPGEN/mcl_structures/pillager_outpost.lua b/mods/MAPGEN/mcl_structures/pillager_outpost.lua index 719672044..9b72071f0 100644 --- a/mods/MAPGEN/mcl_structures/pillager_outpost.lua +++ b/mods/MAPGEN/mcl_structures/pillager_outpost.lua @@ -17,6 +17,7 @@ mcl_structures.register_structure("pillager_outpost",{ y_max = mcl_vars.mg_overworld_max, y_min = 1, biomes = { "Desert", "Plains", "Savanna", "IcePlains", "Taiga" }, + construct_nodes = {"mcl_anvils:anvil_damage_2"}, filenames = { modpath.."/schematics/mcl_structures_pillager_outpost.mts", modpath.."/schematics/mcl_structures_pillager_outpost_2.mts" @@ -67,7 +68,12 @@ mcl_structures.register_structure("pillager_outpost",{ mcl_structures.spawn_mobs("mobs_mc:pillager",spawnon,p1,p2,pr,5) mcl_structures.spawn_mobs("mobs_mc:parrot",{"mesecons_pressureplates:pressure_plate_stone_off"},p1,p2,pr,3) mcl_structures.spawn_mobs("mobs_mc:iron_golem",{"mesecons_button:button_stone_off"},p1,p2,pr,1) - mcl_structures.construct_nodes(p1,p2,{"group:wall"}) + for _,n in pairs(minetest.find_nodes_in_area(p1,p2,{"group:wall"})) do + local def = minetest.registered_nodes[minetest.get_node(n).name:gsub("_%d+$","")] + if def and def.on_construct then + def.on_construct(n) + end + end end }) diff --git a/mods/MAPGEN/mcl_structures/woodland_mansion.lua b/mods/MAPGEN/mcl_structures/woodland_mansion.lua index c4d494871..5429e4892 100644 --- a/mods/MAPGEN/mcl_structures/woodland_mansion.lua +++ b/mods/MAPGEN/mcl_structures/woodland_mansion.lua @@ -20,7 +20,7 @@ mcl_structures.register_structure("woodland_cabin",{ modpath.."/schematics/mcl_structures_woodland_cabin.mts", modpath.."/schematics/mcl_structures_woodland_outpost.mts", }, - construct_nodes = {"mcl_barrels:barrel_closed"}, + construct_nodes = {"mcl_barrels:barrel_closed","mcl_books:bookshelf"}, after_place = function(p,def,pr) local p1=vector.offset(p,-def.sidelen,-1,-def.sidelen) local p2=vector.offset(p,def.sidelen,def.sidelen,def.sidelen) From 0a2f57476e98b0e6a8addc83428c37c92e0303c2 Mon Sep 17 00:00:00 2001 From: PrairieWind Date: Thu, 15 Dec 2022 18:44:56 -0700 Subject: [PATCH 2/2] Update Woodland Outpost Schematic Switched double chest with barrels so that they work correctly --- .../mcl_structures_woodland_outpost.mts | Bin 3210 -> 3195 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/MAPGEN/mcl_structures/schematics/mcl_structures_woodland_outpost.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_woodland_outpost.mts index dac927b66762f163abca557a8f30112d0e96235c..8ee1daffae50c4825170f5b4b95c180c037dcc71 100644 GIT binary patch delta 1847 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 AhyVZp