From da6563a5b39b30502635e331c3c7bbfb9b22de4b Mon Sep 17 00:00:00 2001 From: cora Date: Thu, 26 May 2022 02:24:56 +0200 Subject: [PATCH] Spawn witch and black cat on witchhut generation --- .../mobs_mc/textures/mobs_mc_cat_black.png | Bin 606 -> 7117 bytes mods/MAPGEN/mcl_structures/init.lua | 19 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_cat_black.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_cat_black.png index d6e54c7a15637a4925a492b852e27071896479d3..a839a6ef37d345362f80c340f500ad42f999b393 100644 GIT binary patch literal 7117 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 diff --git a/mods/MAPGEN/mcl_structures/init.lua b/mods/MAPGEN/mcl_structures/init.lua index 9a1a73281d..2b791aa91a 100644 --- a/mods/MAPGEN/mcl_structures/init.lua +++ b/mods/MAPGEN/mcl_structures/init.lua @@ -280,6 +280,24 @@ function mcl_structures.generate_boulder(pos, rotation, pr) return minetest.place_schematic(newpos, path, rotation) -- don't serialize schematics for registered biome decorations, for MT 5.4.0, https://github.com/minetest/minetest/issues/10995 end +local function spawn_witch(p1,p2) + local c = minetest.find_node_near(p1,15,{"mcl_cauldrons:cauldron"}) + local nn = minetest.find_nodes_in_area(p1,p2,{"mcl_core:sprucewood"}) + if c then + for _,v in pairs(nn) do + local ap = vector.offset(v,0,1,0) + local an = minetest.get_node(ap) + if ap.y == c.y and an.name == "air" then + minetest.add_entity(ap,"mobs_mc:witch"):get_luaentity()._home = c + local cat = minetest.add_entity(ap,"mobs_mc:cat") + cat:set_properties({textures = {"mobs_mc_cat_black.png"}}) + cat:get_luaentity().owner = "witch" --so it's not claimable by players (unless they're named witch hehe) + return + end + end + end +end + local function hut_placement_callback(p1, p2, size, orientation, pr) if not p1 or not p2 then return end local legs = minetest.find_nodes_in_area(p1, p2, "mcl_core:tree") @@ -289,6 +307,7 @@ local function hut_placement_callback(p1, p2, size, orientation, pr) minetest.swap_node(legs[i], {name = "mcl_core:tree", param2 = 2}) end end + spawn_witch(p1,p2) end function mcl_structures.generate_witch_hut(pos, rotation, pr)